diff --git a/modules/gui/pymod/data_viewer_proxy.hh b/modules/gui/pymod/data_viewer_proxy.hh
index aaf21719c825022cacd4206e4266764965016d71..39a5f6c838962281eae1b39defdf1888cd9f523c 100644
--- a/modules/gui/pymod/data_viewer_proxy.hh
+++ b/modules/gui/pymod/data_viewer_proxy.hh
@@ -24,8 +24,8 @@
   Authors: Ansgar Philippsen, Andreas Schenk
 */
 
-#ifndef IPLT_GUI_DATA_VIEWER_PROXY_H
-#define IPLT_GUI_DATA_VIEWER_PROXY_H
+#ifndef IMG_GUI_DATA_VIEWER_PROXY_H
+#define IMG_GUI_DATA_VIEWER_PROXY_H
 
 #include <boost/shared_ptr.hpp>
 
diff --git a/modules/gui/src/data_viewer/data_viewer.hh b/modules/gui/src/data_viewer/data_viewer.hh
index c53ffcb0deb72fb34dcc2edf6589ff37425a0a79..9130159a04555595629ef347f427a2b5c404c95c 100644
--- a/modules/gui/src/data_viewer/data_viewer.hh
+++ b/modules/gui/src/data_viewer/data_viewer.hh
@@ -22,8 +22,8 @@
   Authors: Ansgar Philippsen, Andreas Schenk
 */
 
-#ifndef IPLT_GUI_DATA_VIEWER_H
-#define IPLT_GUI_DATA_VIEWER_H
+#ifndef IMG_GUI_DATA_VIEWER_H
+#define IMG_GUI_DATA_VIEWER_H
 
 #include <map>
 
diff --git a/modules/gui/src/data_viewer/data_viewer_panel.hh b/modules/gui/src/data_viewer/data_viewer_panel.hh
index 93633bb6f46de5801af00745d9994923cc3be5b9..3d3e6e960699c096393d2e65357a737870c78c8d 100644
--- a/modules/gui/src/data_viewer/data_viewer_panel.hh
+++ b/modules/gui/src/data_viewer/data_viewer_panel.hh
@@ -17,8 +17,8 @@
 // along with this library; if not, write to the Free Software Foundation, Inc.,
 // 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 //------------------------------------------------------------------------------
-#ifndef IPLT_DATA_VIEWER_PANEL_HH
-#define IPLT_DATA_VIEWER_PANEL_HH
+#ifndef IMG_DATA_VIEWER_PANEL_HH
+#define IMG_DATA_VIEWER_PANEL_HH
 
 #include <ost/gui/module_config.hh>
 #include "data_viewer_panel_base.hh"
diff --git a/modules/gui/src/data_viewer/draw_overlay.hh b/modules/gui/src/data_viewer/draw_overlay.hh
index 8c9ef182b2eeefc5f8080049198483d45433a859..efdbc1a58503d9f26c6f7b25bf0b29403bcc25b2 100644
--- a/modules/gui/src/data_viewer/draw_overlay.hh
+++ b/modules/gui/src/data_viewer/draw_overlay.hh
@@ -22,8 +22,8 @@
   Authors: Ansgar Philippsen, Andreas Schenk
 */
 
-#ifndef IPLT_GUI_DRAW_OVERLAY_H
-#define IPLT_GUI_DRAW_OVERLAY_H
+#ifndef IMG_GUI_DRAW_OVERLAY_H
+#define IMG_GUI_DRAW_OVERLAY_H
 
 #include <ost/img/image_handle.hh>
 
diff --git a/modules/gui/src/data_viewer/drawing_functions.hh b/modules/gui/src/data_viewer/drawing_functions.hh
index 4bc62784c86e6788da7935591ef625d7855e7ed9..c27e66345bf8287afee3c2ed3330ddbbd85026cf 100644
--- a/modules/gui/src/data_viewer/drawing_functions.hh
+++ b/modules/gui/src/data_viewer/drawing_functions.hh
@@ -22,8 +22,8 @@
   Authors: Andreas Schenk, Ansgar Philippsen
 */
 
-#ifndef IPLT_GUI_DRAWING_FUNCTIONS_HH_
-#define IPLT_GUI_DRAWING_FUNCTIONS_HH_
+#ifndef IMG_GUI_DRAWING_FUNCTIONS_HH_
+#define IMG_GUI_DRAWING_FUNCTIONS_HH_
 
 #include <QPainter>
 #include <QPoint>
diff --git a/modules/gui/src/data_viewer/img2qt.hh b/modules/gui/src/data_viewer/img2qt.hh
index 4c8b9bd8beb8d5c3c138c745cc526e1dd8d0482c..6c6d2b9ce54a4259acaf4dbcc15d4678a84cf8c9 100644
--- a/modules/gui/src/data_viewer/img2qt.hh
+++ b/modules/gui/src/data_viewer/img2qt.hh
@@ -23,8 +23,8 @@
   Author: Ansgar Philippsen
 */
 
-#ifndef IPLT_GUI_IMG2QT_HH
-#define IPLT_GUI_IMG2QT_HH
+#ifndef IMG_GUI_IMG2QT_HH
+#define IMG_GUI_IMG2QT_HH
 
 #include <ost/geom/geom.hh>
 #include <ost/img/normalizer_impl.hh>
diff --git a/modules/gui/src/data_viewer/info_panel.hh b/modules/gui/src/data_viewer/info_panel.hh
index 0c40bc31d672f6e792c853f4381a8a8628e16e61..388248dabacfb1f2d2467bec2f6819add3e429cf 100644
--- a/modules/gui/src/data_viewer/info_panel.hh
+++ b/modules/gui/src/data_viewer/info_panel.hh
@@ -22,8 +22,8 @@
   Authors: Ansgar Philippsen, Andreas Schenk
 */
 
-#ifndef IPLT_GUI_DATAVIEWER_INFO_PANEL_H_
-#define IPLT_GUI_DATAVIEWER_INFO_PANEL_H_
+#ifndef IMG_GUI_DATAVIEWER_INFO_PANEL_H_
+#define IMG_GUI_DATAVIEWER_INFO_PANEL_H_
 
 #include <QWidget>
 #include <QLabel>
diff --git a/modules/gui/src/data_viewer/mask_overlay.hh b/modules/gui/src/data_viewer/mask_overlay.hh
index bb1014cdffd9fcfd80fb7a8b426832f1d96f302a..e274f315756060af5001d610e550b42f410a1e83 100644
--- a/modules/gui/src/data_viewer/mask_overlay.hh
+++ b/modules/gui/src/data_viewer/mask_overlay.hh
@@ -22,8 +22,8 @@
   Authors: Ansgar Philippsen, Andreas Schenk
 */
 
-#ifndef IPLT_GUI_MASK_OVERLAY_HH_
-#define IPLT_GUI_MASK_OVERLAY_HH_
+#ifndef IMG_GUI_MASK_OVERLAY_HH_
+#define IMG_GUI_MASK_OVERLAY_HH_
 
 #include <ost/geom/geom.hh>
 #include <ost/img/image_handle.hh>
diff --git a/modules/gui/src/data_viewer/overlay.hh b/modules/gui/src/data_viewer/overlay.hh
index 17f1be68db5aadb789d43172532dbde016ebf076..76486b8fea803a463d2fba6046ede04779ca1627 100644
--- a/modules/gui/src/data_viewer/overlay.hh
+++ b/modules/gui/src/data_viewer/overlay.hh
@@ -23,8 +23,8 @@
 */
 
 
-#ifndef IPLT_GUI_OVERLAY_HH
-#define IPLT_GUI_OVERLAY_HH
+#ifndef IMG_GUI_OVERLAY_HH
+#define IMG_GUI_OVERLAY_HH
 
 #include "overlay_base.hh"
 #include "overlay_manager.hh"
diff --git a/modules/gui/src/data_viewer/overlay_base.hh b/modules/gui/src/data_viewer/overlay_base.hh
index dd33e9d8764f3bd7827d0a82394535d74479e28b..edef14985af6d488413334b98837c37ab90de75b 100644
--- a/modules/gui/src/data_viewer/overlay_base.hh
+++ b/modules/gui/src/data_viewer/overlay_base.hh
@@ -22,8 +22,8 @@
   Authors: Ansgar Philippsen, Andreas Schenk
 */
 
-#ifndef IPLT_GUI_OVERLAY_BASE_H
-#define IPLT_GUI_OVERLAY_BASE_H
+#ifndef IMG_GUI_OVERLAY_BASE_H
+#define IMG_GUI_OVERLAY_BASE_H
 
 #include <QObject>
 #include <QEvent>
diff --git a/modules/gui/src/data_viewer/overlay_base_fw.hh b/modules/gui/src/data_viewer/overlay_base_fw.hh
index c198b10f5b2e9f41e3719ce1105c7e697f04674f..e568434a2548fe33dad1efe6a8a024f7c1ede374 100644
--- a/modules/gui/src/data_viewer/overlay_base_fw.hh
+++ b/modules/gui/src/data_viewer/overlay_base_fw.hh
@@ -22,8 +22,8 @@
   Authors: Andreas Schenk, Ansgar Philippsen
 */
 
-#ifndef IPLT_GUI_OVERLAY_BASE_FW_H
-#define IPLT_GUI_OVERLAY_BASE_FW_H
+#ifndef IMG_GUI_OVERLAY_BASE_FW_H
+#define IMG_GUI_OVERLAY_BASE_FW_H
 
 #include <boost/shared_ptr.hpp>
 
diff --git a/modules/gui/src/data_viewer/overlay_manager.hh b/modules/gui/src/data_viewer/overlay_manager.hh
index 1a0a654d88cb1f7c87cfa78d9524ba72032ed162..033d78663ce99f5fa37a26f87cc022716f8a03cf 100644
--- a/modules/gui/src/data_viewer/overlay_manager.hh
+++ b/modules/gui/src/data_viewer/overlay_manager.hh
@@ -22,8 +22,8 @@
   Authors: Ansgar Philippsen, Andreas Schenk
 */
 
-#ifndef IPLT_GUI_OVERLAY_MANAGER_HH
-#define IPLT_GUI_OVERLAY_MANAGER_HH
+#ifndef IMG_GUI_OVERLAY_MANAGER_HH
+#define IMG_GUI_OVERLAY_MANAGER_HH
 
 #include <vector>
 #include <list>
diff --git a/modules/gui/src/data_viewer/overlay_manager_fw.hh b/modules/gui/src/data_viewer/overlay_manager_fw.hh
index 0b7ee9daa30b3ec077b3f7e3887a98c3632d73ed..4c2e25d14202e6eaafeac005571acdaf63159ce7 100644
--- a/modules/gui/src/data_viewer/overlay_manager_fw.hh
+++ b/modules/gui/src/data_viewer/overlay_manager_fw.hh
@@ -22,8 +22,8 @@
   Authors: Ansgar Philippsen
 */
 
-#ifndef IPLT_GUI_OVERLAY_MANAGER_FW_HH
-#define IPLT_GUI_OVERLAY_MANAGER_FW_HH
+#ifndef IMG_GUI_OVERLAY_MANAGER_FW_HH
+#define IMG_GUI_OVERLAY_MANAGER_FW_HH
 
 #include <boost/shared_ptr.hpp>
 
diff --git a/modules/gui/src/data_viewer/overlay_manager_gui.hh b/modules/gui/src/data_viewer/overlay_manager_gui.hh
index 83a4b1b63651aed8b5384233ed777d2556eef87c..b12adca5a74c99a32ccbdd79ccadff8dfbdb1595 100644
--- a/modules/gui/src/data_viewer/overlay_manager_gui.hh
+++ b/modules/gui/src/data_viewer/overlay_manager_gui.hh
@@ -23,8 +23,8 @@
   Authors: Ansgar Philippsen, Andreas Schenk
 */
 
-#ifndef IPLT_OV_GUI_OVDIALOG_H
-#define IPLT_OV_GUI_OVDIALOG_H
+#ifndef IMG_OV_GUI_OVDIALOG_H
+#define IMG_OV_GUI_OVDIALOG_H
 
 #include <QWidget>
 #include <QRadioButton>
diff --git a/modules/gui/src/data_viewer/overlay_manager_observer.hh b/modules/gui/src/data_viewer/overlay_manager_observer.hh
index fad9b719894d002ab6013b0ae7337f875632c7cc..4c2de7267720c96dc042b7ef3ce4f5537a29d05b 100644
--- a/modules/gui/src/data_viewer/overlay_manager_observer.hh
+++ b/modules/gui/src/data_viewer/overlay_manager_observer.hh
@@ -22,8 +22,8 @@
   Authors: Ansgar Philippsen
 */
 
-#ifndef IPLT_GUI_OVERLAY_MANAGER_OBSERVER_H
-#define IPLT_GUI_OVERLAY_MANAGER_OBSERVER_H
+#ifndef IMG_GUI_OVERLAY_MANAGER_OBSERVER_H
+#define IMG_GUI_OVERLAY_MANAGER_OBSERVER_H
 
 #include "overlay_manager_fw.hh"
 
diff --git a/modules/gui/src/data_viewer/pointlist_overlay.hh b/modules/gui/src/data_viewer/pointlist_overlay.hh
index fd107f330eba7251db88b0b05359ef2f0a0b168e..1095f2191f448dc4d9ac5fa318d59719a817b292 100644
--- a/modules/gui/src/data_viewer/pointlist_overlay.hh
+++ b/modules/gui/src/data_viewer/pointlist_overlay.hh
@@ -22,8 +22,8 @@
   Authors: Andreas Schenk, Ansgar Philippsen
 */
 
-#ifndef IPLT_POINTLIST_OVERLAY_HH
-#define IPLT_POINTLIST_OVERLAY_HH
+#ifndef IMG_POINTLIST_OVERLAY_HH
+#define IMG_POINTLIST_OVERLAY_HH
 
 #include <ost/img/point_list.hh>
 
diff --git a/modules/gui/src/data_viewer/pointlist_overlay_base.hh b/modules/gui/src/data_viewer/pointlist_overlay_base.hh
index d8433890a0b20049378ac9828d7095eefbaf42f5..dc8b3da07a5501951a995788ee21ce6e6a09729e 100644
--- a/modules/gui/src/data_viewer/pointlist_overlay_base.hh
+++ b/modules/gui/src/data_viewer/pointlist_overlay_base.hh
@@ -23,8 +23,8 @@
   Authors: Ansgar Philippsen, Andreas Schenk
 */
 
-#ifndef IPLT_POINTLIST_OVERLAY_BASE_HH
-#define IPLT_POINTLIST_OVERLAY_BASE_HH
+#ifndef IMG_POINTLIST_OVERLAY_BASE_HH
+#define IMG_POINTLIST_OVERLAY_BASE_HH
 
 #include <QColor>
 #include <QAction>
diff --git a/modules/gui/src/data_viewer/strategies.hh b/modules/gui/src/data_viewer/strategies.hh
index 5d6c99971706c5c4b1c6b99df35272ea12675b87..a6abb3d3866c843b53e0dfe5f658e8fe633d0f63 100644
--- a/modules/gui/src/data_viewer/strategies.hh
+++ b/modules/gui/src/data_viewer/strategies.hh
@@ -22,8 +22,8 @@
     Authors: Andreas Schenk, Ansgar Philippsen
 */
 
-#ifndef IPLT_GUI_STRATEGIES_HH_
-#define IPLT_GUI_STRATEGIES_HH_
+#ifndef IMG_GUI_STRATEGIES_HH_
+#define IMG_GUI_STRATEGIES_HH_
 
 #include <QPainter>
 #include <QPoint>
diff --git a/modules/gui/src/data_viewer/strategies_fw.hh b/modules/gui/src/data_viewer/strategies_fw.hh
index 22f03f77cc1082ed392cfafa9c938161922727b5..78aba1887683d93ff98afc7a56b2aa724b2dd366 100644
--- a/modules/gui/src/data_viewer/strategies_fw.hh
+++ b/modules/gui/src/data_viewer/strategies_fw.hh
@@ -18,8 +18,8 @@
 // 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 //------------------------------------------------------------------------------
 
-#ifndef IPLT_GUI_STRATEGIES_FW_H
-#define IPLT_GUI_STRATEGIES_FW_HH
+#ifndef IMG_GUI_STRATEGIES_FW_H
+#define IMG_GUI_STRATEGIES_FW_HH
 
 #include <boost/shared_ptr.hpp>
 
diff --git a/modules/gui/src/data_viewer/viewer_normalizer.hh b/modules/gui/src/data_viewer/viewer_normalizer.hh
index a4223a1c6f485d0fffa5236631a7b5544f6d56b4..a185516ff0333d0b20e91337b16043f24fde2cae 100644
--- a/modules/gui/src/data_viewer/viewer_normalizer.hh
+++ b/modules/gui/src/data_viewer/viewer_normalizer.hh
@@ -23,8 +23,8 @@
   Authors: Ansgar Philippsen, Andreas Schenk
 */
 
-#ifndef IPLT_GUI_VIEWER_NORMALIZER_HH
-#define IPLT_GUI_VIEWER_NORMALIZER_HH
+#ifndef IMG_GUI_VIEWER_NORMALIZER_HH
+#define IMG_GUI_VIEWER_NORMALIZER_HH
 
 
 #include <boost/shared_ptr.hpp>
diff --git a/modules/img/alg/src/alg_mirror.hh b/modules/img/alg/src/alg_mirror.hh
index 1826a0e2c46e9246a0b1a0b60fdf37cbc8391814..d984359202cc82c34aa5013ac932989c9d47f53f 100644
--- a/modules/img/alg/src/alg_mirror.hh
+++ b/modules/img/alg/src/alg_mirror.hh
@@ -18,8 +18,8 @@
 // 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 //------------------------------------------------------------------------------
 
-#ifndef IPLT_ALG_TRANSFORM_MIRROR_HH
-#define IPLT_ALG_TRANSFORM_MIRROR_HH
+#ifndef IMG_ALG_TRANSFORM_MIRROR_HH
+#define IMG_ALG_TRANSFORM_MIRROR_HH
 
 #include <ost/img/image_state.hh>
 #include <ost/img/value_util.hh>
diff --git a/modules/img/alg/src/alg_shift.hh b/modules/img/alg/src/alg_shift.hh
index 993f363fb21a1d1ea2350eb43d2743870511e171..014484bd075f990af5dfe568d358215ccf728dd8 100644
--- a/modules/img/alg/src/alg_shift.hh
+++ b/modules/img/alg/src/alg_shift.hh
@@ -18,8 +18,8 @@
 // 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 //------------------------------------------------------------------------------
 
-#ifndef IPLT_ALG_TRANSFORM_SHIFT_HH
-#define IPLT_ALG_TRANSFORM_SHIFT_HH
+#ifndef IMG_ALG_TRANSFORM_SHIFT_HH
+#define IMG_ALG_TRANSFORM_SHIFT_HH
 
 #include <ost/img/image_state.hh>
 #include <ost/img/value_util.hh>
diff --git a/modules/img/alg/src/alg_transform.hh b/modules/img/alg/src/alg_transform.hh
index 35116a18094d6cf53f82cf14daf315ebb93fef81..be066cf1ca3839bb13f38faddc8e0fff61310994 100644
--- a/modules/img/alg/src/alg_transform.hh
+++ b/modules/img/alg/src/alg_transform.hh
@@ -18,8 +18,8 @@
 // 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 //------------------------------------------------------------------------------
 
-#ifndef IPLT_ALG_TRANSFORM_ALG_TRANSFORM_HH
-#define IPLT_ALG_TRANSFORM_ALG_TRANSFORM__HH
+#ifndef IMG_ALG_TRANSFORM_ALG_TRANSFORM_HH
+#define IMG_ALG_TRANSFORM_ALG_TRANSFORM__HH
 
 #include <ost/img/image_state.hh>
 #include <ost/img/value_util.hh>
diff --git a/modules/img/alg/src/anisotropic.hh b/modules/img/alg/src/anisotropic.hh
index 4a9e22a954bc21941991df52f18b3b9fa890ddec..7bf9ea53a046457483d1d00ff9bf1fb295c9ff92 100644
--- a/modules/img/alg/src/anisotropic.hh
+++ b/modules/img/alg/src/anisotropic.hh
@@ -22,8 +22,8 @@
   authors: Giani Signorell, Ansgar Philippsen
 */
 
-#ifndef IPLT_ALG_FILTER_ANISOTROPIC_H
-#define IPLT_ALG_FILTER_ANISOTROPIC_H
+#ifndef IMG_ALG_FILTER_ANISOTROPIC_H
+#define IMG_ALG_FILTER_ANISOTROPIC_H
 
 #include "gaussian.hh"
 
diff --git a/modules/img/alg/src/auto_correlate.hh b/modules/img/alg/src/auto_correlate.hh
index 9b72a6dc7975a65ee0bf69164fd31733a82d3481..54237203276bd11f493e96006cfe6c69bf4fc446 100644
--- a/modules/img/alg/src/auto_correlate.hh
+++ b/modules/img/alg/src/auto_correlate.hh
@@ -18,8 +18,8 @@
 // 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 //------------------------------------------------------------------------------
 
-#ifndef IPLT_ALG_AUTOCORRELATE_HH
-#define IPLT_ALG_AUTOCORRELATE_HH
+#ifndef IMG_ALG_AUTOCORRELATE_HH
+#define IMG_ALG_AUTOCORRELATE_HH
 
 #include <ost/img/image_state.hh>
 #include <ost/img/alg/module_config.hh>
diff --git a/modules/img/alg/src/clear.hh b/modules/img/alg/src/clear.hh
index f44f54f5c0cc084cf88cfaafe33b38c166a8a4c0..ec15cf3379d8664af5b4b0ba79e0b2264e350953 100644
--- a/modules/img/alg/src/clear.hh
+++ b/modules/img/alg/src/clear.hh
@@ -18,8 +18,8 @@
 // 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 //------------------------------------------------------------------------------
 
-#ifndef IPLT_ALG_CLEAR_HH
-#define IPLT_ALG_CLEAR_HH
+#ifndef IMG_ALG_CLEAR_HH
+#define IMG_ALG_CLEAR_HH
 
 #include <ost/img/image.hh>
 #include <ost/img/image_state.hh>
diff --git a/modules/img/alg/src/conjugate.hh b/modules/img/alg/src/conjugate.hh
index 640b161951ce1446bfccdadaad5a07a8f050e4f8..49a86341f6a0cdaae445817051ad36bfb85665d0 100644
--- a/modules/img/alg/src/conjugate.hh
+++ b/modules/img/alg/src/conjugate.hh
@@ -18,8 +18,8 @@
 // 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 //------------------------------------------------------------------------------
 
-#ifndef IPLT_ALG_COMMON_CONJ_HH
-#define IPLT_ALG_COMMON_CONJ_HH
+#ifndef IMG_ALG_COMMON_CONJ_HH
+#define IMG_ALG_COMMON_CONJ_HH
 
 #include <ost/img/image.hh>
 #include <ost/img/image_state.hh>
diff --git a/modules/img/alg/src/convolute.hh b/modules/img/alg/src/convolute.hh
index 06d831e8b233c47c8ab111224090eeb6c8c78fa3..32b7cdae88079237aac9128a64f2ea5c6978d33b 100644
--- a/modules/img/alg/src/convolute.hh
+++ b/modules/img/alg/src/convolute.hh
@@ -18,8 +18,8 @@
 // 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 //------------------------------------------------------------------------------
 
-#ifndef IPLT_ALG_CONVOLUTE_HH
-#define IPLT_ALG_CONVOLUTE_HH
+#ifndef IMG_ALG_CONVOLUTE_HH
+#define IMG_ALG_CONVOLUTE_HH
 
 #include <ost/img/image_state.hh>
 #include <ost/img/alg/module_config.hh>
diff --git a/modules/img/alg/src/correlate.hh b/modules/img/alg/src/correlate.hh
index e328b2818c3f6e4832d589dba75a708eaf51b21e..0a2210ccdbd22c5750c2e3d3e0fdaa1f49f6fb97 100644
--- a/modules/img/alg/src/correlate.hh
+++ b/modules/img/alg/src/correlate.hh
@@ -18,8 +18,8 @@
 // 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 //------------------------------------------------------------------------------
 
-#ifndef IPLT_ALG_CORRELATE_HH
-#define IPLT_ALG_CORRELATE_HH
+#ifndef IMG_ALG_CORRELATE_HH
+#define IMG_ALG_CORRELATE_HH
 
 #include <ost/img/image_state.hh>
 #include <ost/img/alg/module_config.hh>
diff --git a/modules/img/alg/src/cross_correlate.hh b/modules/img/alg/src/cross_correlate.hh
index 57f2d1183777356d2b8c180b16381c22535437c7..a6338438083312f34e3f8ad86178a2a86fc46c60 100644
--- a/modules/img/alg/src/cross_correlate.hh
+++ b/modules/img/alg/src/cross_correlate.hh
@@ -21,8 +21,8 @@
 /*
   author: Andreas Schenk
 */
-#ifndef IPLT_ALG_CROSS_CORRELATE_HH
-#define IPLT_ALG_CROSS_CORRELATE_HH
+#ifndef IMG_ALG_CROSS_CORRELATE_HH
+#define IMG_ALG_CROSS_CORRELATE_HH
 
 #include <ost/img/algorithm.hh>
 #include <ost/img/alg/module_config.hh>
diff --git a/modules/img/alg/src/custom_transformer.hh b/modules/img/alg/src/custom_transformer.hh
index f12533d815bca71f800bf1dee508a4a99bfd34d4..d96cb17ed6894547cb20b15d3f7604a48fba6bc6 100644
--- a/modules/img/alg/src/custom_transformer.hh
+++ b/modules/img/alg/src/custom_transformer.hh
@@ -24,8 +24,8 @@
   Author: Ansgar Philippsen
 */
 
-#ifndef IPLT_CUSTOM_TRANSFORMER_IMPL_HH
-#define IPLT_CUSTOM_TRANSFORMER_IMPL_HH
+#ifndef IMG_CUSTOM_TRANSFORMER_IMPL_HH
+#define IMG_CUSTOM_TRANSFORMER_IMPL_HH
 
 #include <ost/message.hh>
 
diff --git a/modules/img/alg/src/density_slice.hh b/modules/img/alg/src/density_slice.hh
index 315de118fc667f1d0cd6664973feeec42a5d48df..c2d353a676fb08d9b41cc366c20ece33dd23d891 100644
--- a/modules/img/alg/src/density_slice.hh
+++ b/modules/img/alg/src/density_slice.hh
@@ -22,8 +22,8 @@
   Author: Andreas Schenk
 */
 
-#ifndef IPLT_ALG_DENSITY_SLICE_HH
-#define IPLT_ALG_DENSITY_SLICE_HH
+#ifndef IMG_ALG_DENSITY_SLICE_HH
+#define IMG_ALG_DENSITY_SLICE_HH
 
 #include <ost/img/image_state.hh>
 #include <ost/img/image_state/image_state_algorithm.hh>
diff --git a/modules/img/alg/src/dft.hh b/modules/img/alg/src/dft.hh
index 4c6aff95af1744a533d61f6e24b3d890ab4b291e..fd94d68e913744e2f992874d1d5a243b4a046056 100644
--- a/modules/img/alg/src/dft.hh
+++ b/modules/img/alg/src/dft.hh
@@ -18,8 +18,8 @@
 // 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 //------------------------------------------------------------------------------
 
-#ifndef IPLT_ALG_DFT_HH
-#define IPLT_ALG_DFT_HH
+#ifndef IMG_ALG_DFT_HH
+#define IMG_ALG_DFT_HH
 
 #include <ost/img/algorithm.hh>
 #include <ost/img/image_state.hh>
diff --git a/modules/img/alg/src/discrete_shrink.hh b/modules/img/alg/src/discrete_shrink.hh
index cfd13b108c7006ffbb2e3530d693edc9d78b99a5..a794bd82e4809fe8d1cc2c3e1f29a80e759698fa 100644
--- a/modules/img/alg/src/discrete_shrink.hh
+++ b/modules/img/alg/src/discrete_shrink.hh
@@ -18,8 +18,8 @@
 // 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 //------------------------------------------------------------------------------
 
-#ifndef IPLT_ALG_DISCRETE_SHRINK_HH
-#define IPLT_ALG_DISCRETE_SHRINK_HH
+#ifndef IMG_ALG_DISCRETE_SHRINK_HH
+#define IMG_ALG_DISCRETE_SHRINK_HH
 
 #include <ost/img/image.hh>
 #include <ost/img/image_state.hh>
diff --git a/modules/img/alg/src/fft.hh b/modules/img/alg/src/fft.hh
index 59f1774ef9efbe8bd9d24e689686cad6705f1f51..465a6e58bf7f422b59c44b50d2487a7d8b09f927 100644
--- a/modules/img/alg/src/fft.hh
+++ b/modules/img/alg/src/fft.hh
@@ -18,8 +18,8 @@
 // 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 //------------------------------------------------------------------------------
 
-#ifndef IPLT_ALG_FFT_HH
-#define IPLT_ALG_FFT_HH
+#ifndef IMG_ALG_FFT_HH
+#define IMG_ALG_FFT_HH
 
 #include <ost/message.hh>
 
diff --git a/modules/img/alg/src/fftw_helper.hh b/modules/img/alg/src/fftw_helper.hh
index c080a5dbbc276dec0a81d6ffb9faefba33af9554..ab130188bc0d8a004cd32b4b73a5df6712fd17c0 100644
--- a/modules/img/alg/src/fftw_helper.hh
+++ b/modules/img/alg/src/fftw_helper.hh
@@ -19,8 +19,8 @@
 /*
 Author: Juergen Haas
 */
-#ifndef IPLT_ALG_FFTW_HELPER_HH
-#define IPLT_ALG_FFTW_HELPER_HH
+#ifndef IMG_ALG_FFTW_HELPER_HH
+#define IMG_ALG_FFTW_HELPER_HH
 
 #include <ost/config.hh>
 
diff --git a/modules/img/alg/src/fill.hh b/modules/img/alg/src/fill.hh
index 27f88107f605e4ddedf23ac9723b56792d16396f..be6b9ae09d1d8286f3d4d87fb9e5d7cab2921583 100644
--- a/modules/img/alg/src/fill.hh
+++ b/modules/img/alg/src/fill.hh
@@ -18,8 +18,8 @@
 // 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 //------------------------------------------------------------------------------
 
-#ifndef IPLT_ALG_FILL_HH
-#define IPLT_ALG_FILL_HH
+#ifndef IMG_ALG_FILL_HH
+#define IMG_ALG_FILL_HH
 
 #include <ost/img/image.hh>
 #include <ost/img/image_state.hh>
diff --git a/modules/img/alg/src/filter.hh b/modules/img/alg/src/filter.hh
index 5f43083088344d8380f8d62b3dc1d9881c774540..b7be07ecf96935d22733762a3bba54bafa1f4149 100644
--- a/modules/img/alg/src/filter.hh
+++ b/modules/img/alg/src/filter.hh
@@ -24,8 +24,8 @@
   Author: Ansgar Philippsen
 */
 
-#ifndef IPLT_ALG_FILTER_H
-#define IPLT_ALG_FILTER_H
+#ifndef IMG_ALG_FILTER_H
+#define IMG_ALG_FILTER_H
 
 #include "gaussian.hh"
 #include "gaussian_gradient_magnitude.hh"
diff --git a/modules/img/alg/src/fourier_filters.hh b/modules/img/alg/src/fourier_filters.hh
index 1d8f14cf6118912c49f44ce86fe7b8cd9ffa2ffd..12ea0999518bb5cd30a82fbd648bdc882866ab50 100644
--- a/modules/img/alg/src/fourier_filters.hh
+++ b/modules/img/alg/src/fourier_filters.hh
@@ -23,8 +23,8 @@
 */
 
 
-#ifndef IPLT_ALG_FILTER_FOURIER_FILTERS_H
-#define IPLT_ALG_FILTER_FOURIER_FILTERS_H
+#ifndef IMG_ALG_FILTER_FOURIER_FILTERS_H
+#define IMG_ALG_FILTER_FOURIER_FILTERS_H
 
 #include <ost/img/algorithm.hh>
 #include <ost/img/image_state.hh>
diff --git a/modules/img/alg/src/gaussian.hh b/modules/img/alg/src/gaussian.hh
index 4be921f60a28decebd7dc789ad356540528d1f78..6bfa922d7a6259ec6b8b6e8f72f8c9323254be65 100644
--- a/modules/img/alg/src/gaussian.hh
+++ b/modules/img/alg/src/gaussian.hh
@@ -27,9 +27,9 @@
 
 
 
-#ifndef IPLT_ALG_FILTER_GAUSSIAN_H
+#ifndef IMG_ALG_FILTER_GAUSSIAN_H
 
-#define IPLT_ALG_FILTER_GAUSSIAN_H
+#define IMG_ALG_FILTER_GAUSSIAN_H
 
 
 
diff --git a/modules/img/alg/src/gaussian_gradient_magnitude.hh b/modules/img/alg/src/gaussian_gradient_magnitude.hh
index bd9ce6a7ba1aed20886a9971ef86afebff4ebf89..dd72f474fd0a39f459705c76a6857ec58be86362 100644
--- a/modules/img/alg/src/gaussian_gradient_magnitude.hh
+++ b/modules/img/alg/src/gaussian_gradient_magnitude.hh
@@ -22,8 +22,8 @@
   Authors: Giani Signorell, Ansgar Philippsen, Valerio Mariani
 */
 
-#ifndef IPLT_ALG_FILTER_GAUSSIAN_GRADIENT_MAGNITUDE_H
-#define IPLT_ALG_FILTER_GAUSSIAN_GRADIENT_MAGNITUDE_H
+#ifndef IMG_ALG_FILTER_GAUSSIAN_GRADIENT_MAGNITUDE_H
+#define IMG_ALG_FILTER_GAUSSIAN_GRADIENT_MAGNITUDE_H
 
 #include <ost/img/algorithm.hh>
 #include <ost/img/image_state.hh>
diff --git a/modules/img/alg/src/gaussian_laplacian.hh b/modules/img/alg/src/gaussian_laplacian.hh
index c38e0d151e3011d3103317a111bd7c3387f32457..5d724dac495165c129ca2ee945a0e8ca14ace287 100644
--- a/modules/img/alg/src/gaussian_laplacian.hh
+++ b/modules/img/alg/src/gaussian_laplacian.hh
@@ -22,8 +22,8 @@
   Authors: Giani Signorell, Ansgar Philippsen, Valerio Mariani
 */
 
-#ifndef IPLT_ALG_FILTER_GAUSSIAN_LAPLACIAN_H
-#define IPLT_ALG_FILTER_GAUSSIAN_LAPLACIAN_H
+#ifndef IMG_ALG_FILTER_GAUSSIAN_LAPLACIAN_H
+#define IMG_ALG_FILTER_GAUSSIAN_LAPLACIAN_H
 
 #include <ost/img/algorithm.hh>
 #include <ost/img/image_state.hh>
diff --git a/modules/img/alg/src/line_average.hh b/modules/img/alg/src/line_average.hh
index 3067c46f2d201ea4f65e6db19c3361ff4dff1a42..c3123493fd4286761f12a03c7b095ca5d8106cf4 100644
--- a/modules/img/alg/src/line_average.hh
+++ b/modules/img/alg/src/line_average.hh
@@ -17,8 +17,8 @@
 // along with this library; if not, write to the Free Software Foundation, Inc.,
 // 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 //------------------------------------------------------------------------------
-#ifndef IPLT_ALG_LINE_AVERAGE_HH
-#define IPLT_ALG_LINE_AVERAGE_HH
+#ifndef IMG_ALG_LINE_AVERAGE_HH
+#define IMG_ALG_LINE_AVERAGE_HH
 
 #include <ost/img/extent.hh>
 #include <ost/img/image_state.hh>
diff --git a/modules/img/alg/src/line_iterator.hh b/modules/img/alg/src/line_iterator.hh
index 84a23e1a3081413512e43c5fe0d5987e8f244108..fdc941f62b6134923fed30fde0e16ce367f8b70a 100644
--- a/modules/img/alg/src/line_iterator.hh
+++ b/modules/img/alg/src/line_iterator.hh
@@ -22,8 +22,8 @@
   Authors: Ansgar Philippsen, Giani Signorell
 */
 
-#ifndef IPLT_ALG_FILTER_LINE_ITERATOR_H
-#define IPLT_ALG_FILTER_LINE_ITERATOR_H
+#ifndef IMG_ALG_FILTER_LINE_ITERATOR_H
+#define IMG_ALG_FILTER_LINE_ITERATOR_H
 
 #include <ost/img/alg/module_config.hh>
 #include <ost/img/extent.hh>
diff --git a/modules/img/alg/src/local_sigma_threshold.hh b/modules/img/alg/src/local_sigma_threshold.hh
index e3e45c98a3830b01eadf39427b1d3af3981028cf..e5ad49dce0c4e85535242a7528b26d4c1cd286ea 100644
--- a/modules/img/alg/src/local_sigma_threshold.hh
+++ b/modules/img/alg/src/local_sigma_threshold.hh
@@ -17,8 +17,8 @@
 // along with this library; if not, write to the Free Software Foundation, Inc.,
 // 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 //------------------------------------------------------------------------------
-#ifndef IPLT_ALG_COMMON_LOCAL_SIGMA_THRES
-#define IPLT_ALG_COMMON_LOCAL_SIGMA_THRES
+#ifndef IMG_ALG_COMMON_LOCAL_SIGMA_THRES
+#define IMG_ALG_COMMON_LOCAL_SIGMA_THRES
 
 #include <ost/img/image_state.hh>
 #include <ost/img/image_state/image_state_algorithm.hh>
diff --git a/modules/img/alg/src/negate.hh b/modules/img/alg/src/negate.hh
index d2fea62077184a488cb575c8ccf4eeb3946a4afe..64db574f303e77746af1bfef71a4a06879720f71 100644
--- a/modules/img/alg/src/negate.hh
+++ b/modules/img/alg/src/negate.hh
@@ -18,8 +18,8 @@
 // 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 //------------------------------------------------------------------------------
 
-#ifndef IPLT_ALG_NEGATE_HH
-#define IPLT_ALG_NEGATE_HH
+#ifndef IMG_ALG_NEGATE_HH
+#define IMG_ALG_NEGATE_HH
 
 #include <ost/img/image.hh>
 #include <ost/img/image_state.hh>
diff --git a/modules/img/alg/src/norm.hh b/modules/img/alg/src/norm.hh
index 3bffb6f7fa351472b9bd4a01679d1d159434c320..1f9baf9e82bc20f61ea5cff740a03f3adcdb7292 100644
--- a/modules/img/alg/src/norm.hh
+++ b/modules/img/alg/src/norm.hh
@@ -22,8 +22,8 @@
   Author: Ansgar Philippsen
 */
 
-#ifndef IPLT_NORM_IMPL_H
-#define IPLT_NORM_IMPL_H
+#ifndef IMG_NORM_IMPL_H
+#define IMG_NORM_IMPL_H
 
 // TODO: apply actual normalization to image
 
diff --git a/modules/img/alg/src/norm_linear.hh b/modules/img/alg/src/norm_linear.hh
index 7b1668928010ae83f375721d96d1a047643fb40b..0fd1058dc73687826edabba190f17355fd7d4ac0 100644
--- a/modules/img/alg/src/norm_linear.hh
+++ b/modules/img/alg/src/norm_linear.hh
@@ -22,8 +22,8 @@
   Authors: Ansgar Philippsen, Andreas Schenk
 */
 
-#ifndef IPLT_NORM_LINEAR_H
-#define IPLT_NORM_LINEAR_H
+#ifndef IMG_NORM_LINEAR_H
+#define IMG_NORM_LINEAR_H
 
 #include <ost/img/normalizer_impl.hh>
 #include <ost/img/alg/module_config.hh>
diff --git a/modules/img/alg/src/norm_log.hh b/modules/img/alg/src/norm_log.hh
index 5861348476317f9697a8a75b984c2897066a0ba6..e1e22a921754e74950a1265bdeea56095b56e24b 100644
--- a/modules/img/alg/src/norm_log.hh
+++ b/modules/img/alg/src/norm_log.hh
@@ -22,8 +22,8 @@
   Authors: Ansgar Philippsen, Andreas Schenk
 */
 
-#ifndef IPLT_NORM_LOG_H
-#define IPLT_NORM_LOG_H
+#ifndef IMG_NORM_LOG_H
+#define IMG_NORM_LOG_H
 
 #include <ost/img/normalizer_impl.hh>
 #include <ost/img/alg/module_config.hh>
diff --git a/modules/img/alg/src/polar.hh b/modules/img/alg/src/polar.hh
index 28aa496ea82b53989a3bc60bf562aa3968c2b95f..5ba7625ec3b44c8d47aead48bb985dca851e1156 100644
--- a/modules/img/alg/src/polar.hh
+++ b/modules/img/alg/src/polar.hh
@@ -17,8 +17,8 @@
 // along with this library; if not, write to the Free Software Foundation, Inc.,
 // 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 //------------------------------------------------------------------------------
-#ifndef IPLT_ALG_POLAR_HH
-#define IPLT_ALG_POLAR_HH
+#ifndef IMG_ALG_POLAR_HH
+#define IMG_ALG_POLAR_HH
 
 #include <ost/base.hh>
 #include <ost/img/algorithm.hh>
diff --git a/modules/img/alg/src/power_spectrum.hh b/modules/img/alg/src/power_spectrum.hh
index 49cffa5ebb8e8c35abba0819b436e2a4bd94c549..39816afc8ddd2e99c9942ff55f97c6da061dcc1c 100644
--- a/modules/img/alg/src/power_spectrum.hh
+++ b/modules/img/alg/src/power_spectrum.hh
@@ -18,8 +18,8 @@
 // 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 //------------------------------------------------------------------------------
 
-#ifndef IPLT_ALG_POWERSPECTRUM_HH
-#define IPLT_ALG_POWERSPECTRUM_HH
+#ifndef IMG_ALG_POWERSPECTRUM_HH
+#define IMG_ALG_POWERSPECTRUM_HH
 
 #include <ost/img/image_state.hh>
 
diff --git a/modules/img/alg/src/randomize.hh b/modules/img/alg/src/randomize.hh
index 06d088ecd50761ebb2e830f1cd71d6bc938777e3..7394135006184a2ea8d9d603229f21b91e85c7ce 100644
--- a/modules/img/alg/src/randomize.hh
+++ b/modules/img/alg/src/randomize.hh
@@ -18,8 +18,8 @@
 // 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 //------------------------------------------------------------------------------
 
-#ifndef IPLT_ALG_RANDOMIZE_HH
-#define IPLT_ALG_RANDOMIZE_HH
+#ifndef IMG_ALG_RANDOMIZE_HH
+#define IMG_ALG_RANDOMIZE_HH
 
 #include <ost/img/image_state.hh>
 #include <ost/img/value_util.hh>
diff --git a/modules/img/alg/src/rscrosscorr.hh b/modules/img/alg/src/rscrosscorr.hh
index 4a4e7a29744d874c330145aae6d33b94a3726232..77b87381f02cabbc8ca4c2675dd37fd5edce5dd3 100644
--- a/modules/img/alg/src/rscrosscorr.hh
+++ b/modules/img/alg/src/rscrosscorr.hh
@@ -1,5 +1,5 @@
-#ifndef IPLT_ALG_REAL_SPACE_CROSSCORR_HH
-#define IPLT_ALG_REAL_SPACE_CROSSCORR_HH
+#ifndef IMG_ALG_REAL_SPACE_CROSSCORR_HH
+#define IMG_ALG_REAL_SPACE_CROSSCORR_HH
 
 #include <ost/img/image.hh>
 
diff --git a/modules/img/alg/src/stat.hh b/modules/img/alg/src/stat.hh
index 37f98ccef6355e68d52ea2be281d482568a21a62..a2050fb990d0e355d350cfa982c4d0c147a92cf9 100644
--- a/modules/img/alg/src/stat.hh
+++ b/modules/img/alg/src/stat.hh
@@ -22,8 +22,8 @@
   Authors: Andreas Schenk, Ansgar Philippsen
 */
 
-#ifndef IPLT_ALG_STAT_H
-#define IPLT_ALG_STAT_H
+#ifndef IMG_ALG_STAT_H
+#define IMG_ALG_STAT_H
 
 #include <iosfwd>
 
diff --git a/modules/img/alg/src/stat_min_max.hh b/modules/img/alg/src/stat_min_max.hh
index 6b0d0d9919661b8d01e7f6243351cf2f7d6d334c..1b61ecf9bb9ae40c7b058a1825ed4470b8e31da6 100644
--- a/modules/img/alg/src/stat_min_max.hh
+++ b/modules/img/alg/src/stat_min_max.hh
@@ -22,8 +22,8 @@
   Authors: Andreas Schenk, Ansgar Philippsen
 */
 
-#ifndef IPLT_ALG_STAT_MIN_MAX_H
-#define IPLT_ALG_STAT_MIN_MAX_H
+#ifndef IMG_ALG_STAT_MIN_MAX_H
+#define IMG_ALG_STAT_MIN_MAX_H
 
 #include <iosfwd>
 
diff --git a/modules/img/alg/src/transcendentals.hh b/modules/img/alg/src/transcendentals.hh
index 34e695a13e10ec3dc4cd84029de63c3b4a7738bb..27f51c816913814ffa695efcf323f5389e24e2e7 100644
--- a/modules/img/alg/src/transcendentals.hh
+++ b/modules/img/alg/src/transcendentals.hh
@@ -28,15 +28,15 @@
   Author: Ansgar Philippsen
 */
 
-#ifndef IPLT_ALG_TRANS_HH
-#define IPLT_ALG_TRANS_HH
+#ifndef IMG_ALG_TRANS_HH
+#define IMG_ALG_TRANS_HH
 
 #include <ost/img/image.hh>
 #include <ost/img/image_state.hh>
 #include <ost/img/alg/module_config.hh>
 
 
-#define IPLT_ALG_TRANSCENDENTALS_BLOCK(FF,NN,SS)                               \
+#define IMG_ALG_TRANSCENDENTALS_BLOCK(FF,NN,SS)                               \
 struct FF {					                                                           \
   FF() {}                                                                      \
   ~FF() {}                                                                     \
@@ -60,13 +60,13 @@ typedef ImageStateConstModIPAlgorithm<FF> NN;
 
 namespace ost { namespace img { namespace alg {
 
-IPLT_ALG_TRANSCENDENTALS_BLOCK(CosFnc,Cos,std::cos)
-IPLT_ALG_TRANSCENDENTALS_BLOCK(ExpFnc,Exp,std::exp)
-IPLT_ALG_TRANSCENDENTALS_BLOCK(LogFnc,Log,std::log)
-IPLT_ALG_TRANSCENDENTALS_BLOCK(Log10Fnc,Log10,std::log)
-IPLT_ALG_TRANSCENDENTALS_BLOCK(SinFnc,Sin,std::sin)
-IPLT_ALG_TRANSCENDENTALS_BLOCK(SqrtFnc,Sqrt,std::sqrt)
-IPLT_ALG_TRANSCENDENTALS_BLOCK(TanFnc,Tan,std::tan)
+IMG_ALG_TRANSCENDENTALS_BLOCK(CosFnc,Cos,std::cos)
+IMG_ALG_TRANSCENDENTALS_BLOCK(ExpFnc,Exp,std::exp)
+IMG_ALG_TRANSCENDENTALS_BLOCK(LogFnc,Log,std::log)
+IMG_ALG_TRANSCENDENTALS_BLOCK(Log10Fnc,Log10,std::log)
+IMG_ALG_TRANSCENDENTALS_BLOCK(SinFnc,Sin,std::sin)
+IMG_ALG_TRANSCENDENTALS_BLOCK(SqrtFnc,Sqrt,std::sqrt)
+IMG_ALG_TRANSCENDENTALS_BLOCK(TanFnc,Tan,std::tan)
 
 
 struct PowFnc {
@@ -90,7 +90,7 @@ typedef ImageStateConstModIPAlgorithm<PowFnc> Pow;
 
 }}} // ns
 
-#undef IPLT_ALG_TRANSCENDENTALS_BLOCK
+#undef IMG_ALG_TRANSCENDENTALS_BLOCK
 
 
 #endif
diff --git a/modules/img/alg/src/transform.hh b/modules/img/alg/src/transform.hh
index ffce44d5403bc03efd502f793f8be79f387a7e7e..9f5665daf7cb4a3226216e9eec06855678e83909 100644
--- a/modules/img/alg/src/transform.hh
+++ b/modules/img/alg/src/transform.hh
@@ -18,8 +18,8 @@
 // 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 //------------------------------------------------------------------------------
 
-#ifndef IPLT_ALG_TRANSFORM_HH
-#define IPLT_ALG_TRANSFORM_HH
+#ifndef IMG_ALG_TRANSFORM_HH
+#define IMG_ALG_TRANSFORM_HH
 
 #include "alg_transform.hh"
 #include "alg_shift.hh"
diff --git a/modules/img/alg/src/transform_fw.hh b/modules/img/alg/src/transform_fw.hh
index c5f4416b6499728a00a1348b3890d489887a7555..fe10c3edbb1eecd081dd9ac154bd139d35f7f70e 100644
--- a/modules/img/alg/src/transform_fw.hh
+++ b/modules/img/alg/src/transform_fw.hh
@@ -24,7 +24,7 @@
   Author: Ansgar Philippsen
 */
 
-#ifndef IPLT_ALG_TRANSFORM_FW_H
-#define IPLT_ALG_TRANSFORM_FW_H
+#ifndef IMG_ALG_TRANSFORM_FW_H
+#define IMG_ALG_TRANSFORM_FW_H
 
 #endif
diff --git a/modules/img/alg/src/transformations.hh b/modules/img/alg/src/transformations.hh
index f2226a0fd76e4134943606274199f8e32ad2e6a9..937bbbb45d96309f9c92cc9bc6897116398f3042 100644
--- a/modules/img/alg/src/transformations.hh
+++ b/modules/img/alg/src/transformations.hh
@@ -24,8 +24,8 @@
   Author: Ansgar Philippsen
 */
 
-#ifndef IPLT_TRANSFORMATION_IMPL_HH
-#define IPLT_TRANSFORMATION_IMPL_HH
+#ifndef IMG_TRANSFORMATION_IMPL_HH
+#define IMG_TRANSFORMATION_IMPL_HH
 
 #include <ost/img/alg/module_config.hh>
 #include "transformation_base.hh"
diff --git a/modules/img/alg/tests/test_utils.hh b/modules/img/alg/tests/test_utils.hh
index cffaea498a40c74e5dd9ed755b7d956ac936add9..0eb527642969ec65b7b8087ecb7b9f91666f59e8 100644
--- a/modules/img/alg/tests/test_utils.hh
+++ b/modules/img/alg/tests/test_utils.hh
@@ -22,8 +22,8 @@
   Author: Ansgar Philippsen
 */
 
-#ifndef IPLT_TEST_UTILS
-#define IPLT_TEST_UTILS
+#ifndef IMG_TEST_UTILS
+#define IMG_TEST_UTILS
 
 #include <iostream>
 
diff --git a/modules/img/base/src/algorithm.hh b/modules/img/base/src/algorithm.hh
index 1fd3edc3dfd76650fa24594cb4b60abaeeb62025..8e36c9f21a30fbbd2eb290141e17f6f6395e12b1 100644
--- a/modules/img/base/src/algorithm.hh
+++ b/modules/img/base/src/algorithm.hh
@@ -25,8 +25,8 @@
   Author: Ansgar Philippsen
 */
 
-#ifndef IPLT_ALGORITHM_H
-#define IPLT_ALGORITHM_H
+#ifndef IMG_ALGORITHM_H
+#define IMG_ALGORITHM_H
 
 #include <ost/img/module_config.hh>
 #include "data.hh"
diff --git a/modules/img/base/src/base.hh b/modules/img/base/src/base.hh
index 606b5883633729c0338c026db56fa618c11453f1..5c86b2aa0144ee4ff051b7f586cde20461e34831 100644
--- a/modules/img/base/src/base.hh
+++ b/modules/img/base/src/base.hh
@@ -26,8 +26,8 @@
   Author: Ansgar Philippsen
 */
 
-#ifndef IPLT_BASE_H
-#define IPLT_BASE_H
+#ifndef IMG_BASE_H
+#define IMG_BASE_H
 
 #include <string>
 #include <cmath>
diff --git a/modules/img/base/src/data.hh b/modules/img/base/src/data.hh
index ecfecff13109a898f33da6154070d43544fa602b..7031c314a9f1f0e515457e616782d9364995e805 100644
--- a/modules/img/base/src/data.hh
+++ b/modules/img/base/src/data.hh
@@ -24,8 +24,8 @@
   Author: Ansgar Philippsen
 */
 
-#ifndef IPLT_DATA_H
-#define IPLT_DATA_H
+#ifndef IMG_DATA_H
+#define IMG_DATA_H
 
 #include <cmath>
 
diff --git a/modules/img/base/src/data_algorithm.hh b/modules/img/base/src/data_algorithm.hh
index 2eaab697e2a632538486402719967007f4b49f9d..8445b21b19ac0bb001898ebd16c74768b5342edc 100644
--- a/modules/img/base/src/data_algorithm.hh
+++ b/modules/img/base/src/data_algorithm.hh
@@ -24,8 +24,8 @@
   Author: Ansgar Philippsen
 */
 
-#ifndef IPLT_DATA_ALG_H
-#define IPLT_DATA_ALG_H
+#ifndef IMG_DATA_ALG_H
+#define IMG_DATA_ALG_H
 
 #include <ost/img/module_config.hh>
 #include "function_fw.hh"
diff --git a/modules/img/base/src/data_observer.hh b/modules/img/base/src/data_observer.hh
index fb384bf5d994c29ddffbb104b558342fb564de86..72e72271f49067177f238239b9c4d6ef2768f580 100644
--- a/modules/img/base/src/data_observer.hh
+++ b/modules/img/base/src/data_observer.hh
@@ -24,8 +24,8 @@
   Author: Ansgar Philippsen
 */
 
-#ifndef IPLT_DATA_OBSERVER
-#define IPLT_DATA_OBSERVER
+#ifndef IMG_DATA_OBSERVER
+#define IMG_DATA_OBSERVER
 
 #include <boost/ref.hpp>
 
diff --git a/modules/img/base/src/data_types.hh b/modules/img/base/src/data_types.hh
index b8316fc9482f62acc171d7e96507b32f4cb01aa9..52a5285e9abf357d51e5b540cbb5295973733908 100644
--- a/modules/img/base/src/data_types.hh
+++ b/modules/img/base/src/data_types.hh
@@ -24,8 +24,8 @@
   Author: Ansgar Philippsen
 */
 
-#ifndef IPLT_DATA_TYPES_H
-#define IPLT_DATA_TYPES_H
+#ifndef IMG_DATA_TYPES_H
+#define IMG_DATA_TYPES_H
 
 #include <ost/base.hh>
 
diff --git a/modules/img/base/src/debug.hh b/modules/img/base/src/debug.hh
index b388238ea702048ffe0c5298ce3071b831fcf087..dd980cd0b9780f5608777a186da8a56266d8c5e0 100644
--- a/modules/img/base/src/debug.hh
+++ b/modules/img/base/src/debug.hh
@@ -22,8 +22,8 @@
   Author: Ansgar Philippsen
 */
 
-#ifndef IPLT_DEBUG_H
-#define IPLT_DEBUG_H
+#ifndef IMG_DEBUG_H
+#define IMG_DEBUG_H
 
 #include <iostream>
 #include <ctime>
diff --git a/modules/img/base/src/extent.hh b/modules/img/base/src/extent.hh
index e80f6c35589f992c4727dfc8265463cabebbece7..5f89c5ee80588877219e199d7e717a5bb4124bc6 100644
--- a/modules/img/base/src/extent.hh
+++ b/modules/img/base/src/extent.hh
@@ -24,8 +24,8 @@
   Author: Ansgar Philippsen
 */
 
-#ifndef IPLT_EXTENT_H
-#define IPLT_EXTENT_H
+#ifndef IMG_EXTENT_H
+#define IMG_EXTENT_H
 
 #include <ost/message.hh>
 #include <iosfwd>
diff --git a/modules/img/base/src/extent_iterator.hh b/modules/img/base/src/extent_iterator.hh
index 277326b4ee8e7dea65156920ee1dea46601e1aa5..26365e408895c8c1fa7177c1b6285998d5b32bc8 100644
--- a/modules/img/base/src/extent_iterator.hh
+++ b/modules/img/base/src/extent_iterator.hh
@@ -24,8 +24,8 @@
   Author: Ansgar Philippsen
 */
 
-#ifndef IPLT_EXTENT_ITERATOR_H
-#define IPLT_EXTENT_ITERATOR_H
+#ifndef IMG_EXTENT_ITERATOR_H
+#define IMG_EXTENT_ITERATOR_H
 
 #include "point.hh"
 #include "data.hh"
diff --git a/modules/img/base/src/function.hh b/modules/img/base/src/function.hh
index 2672ae8df0cb33eb2a7f5d34b56f69e97f9ec49a..5537e7051f285d702f6c7754e528d46b2c103d9b 100644
--- a/modules/img/base/src/function.hh
+++ b/modules/img/base/src/function.hh
@@ -26,8 +26,8 @@
   Author: Ansgar Philippsen
 */
 
-#ifndef IPLT_FUNCTION_H
-#define IPLT_FUNCTION_H
+#ifndef IMG_FUNCTION_H
+#define IMG_FUNCTION_H
 
 #include "function_base.hh"
 #include "function_impl.hh"
diff --git a/modules/img/base/src/function_base.hh b/modules/img/base/src/function_base.hh
index 7f679a741c4010c32650b456b922b79d6d278a59..efb654bd21874c9ad75af499c57d45653d2063fa 100644
--- a/modules/img/base/src/function_base.hh
+++ b/modules/img/base/src/function_base.hh
@@ -24,8 +24,8 @@
   Author: Ansgar Philippsen
 */
 
-#ifndef IPLT_FUNCTION_BASE_H
-#define IPLT_FUNCTION_BASE_H
+#ifndef IMG_FUNCTION_BASE_H
+#define IMG_FUNCTION_BASE_H
 
 #include "data.hh"
 #include "data_observer.hh"
diff --git a/modules/img/base/src/function_fw.hh b/modules/img/base/src/function_fw.hh
index de1bd30837f8fdcf5fe15fec382304e1b3fdfddf..df183d2dc07d361150e4c5756ea29add333052a6 100644
--- a/modules/img/base/src/function_fw.hh
+++ b/modules/img/base/src/function_fw.hh
@@ -24,8 +24,8 @@
   Author: Ansgar Philippsen
 */
 
-#ifndef IPLT_FUNCTION_FW_H
-#define IPLT_FUNCTION_FW_H
+#ifndef IMG_FUNCTION_FW_H
+#define IMG_FUNCTION_FW_H
 
 #include <ost/img/module_config.hh>
 
diff --git a/modules/img/base/src/function_impl.hh b/modules/img/base/src/function_impl.hh
index 1048c02ee274651540e93c7b71a1e6ea8e1a8dda..553b215d5a60d0416a802c5adda477179668b11b 100644
--- a/modules/img/base/src/function_impl.hh
+++ b/modules/img/base/src/function_impl.hh
@@ -25,8 +25,8 @@
   Author: Ansgar Philippsen
 */
 
-#ifndef IPLT_FUNCTION_IMPL_H
-#define IPLT_FUNCTION_IMPL_H
+#ifndef IMG_FUNCTION_IMPL_H
+#define IMG_FUNCTION_IMPL_H
 
 #include <ost/img/module_config.hh>
 #include "function_base.hh"
diff --git a/modules/img/base/src/image.hh b/modules/img/base/src/image.hh
index 503e340ab126a7432db9859c3e00dbce44bb0e08..8b31ce8cb909f6e1ac9c1b7c1b341211711a4dd6 100644
--- a/modules/img/base/src/image.hh
+++ b/modules/img/base/src/image.hh
@@ -25,8 +25,8 @@
   Author: Ansgar Philippsen
 */
 
-#ifndef IPLT_IMAGE_H
-#define IPLT_IMAGE_H
+#ifndef IMG_IMAGE_H
+#define IMG_IMAGE_H
 
 
 #include <ost/img/module_config.hh>
diff --git a/modules/img/base/src/image_factory.hh b/modules/img/base/src/image_factory.hh
index 03a56b24ade11904bb5f81192acd9c6c2f5635d0..6f7862a97f6e20f6125a3bf0ec9834cb8eddfff5 100644
--- a/modules/img/base/src/image_factory.hh
+++ b/modules/img/base/src/image_factory.hh
@@ -25,8 +25,8 @@
   Author: Ansgar Philippsen
 */
 
-#ifndef IPLT_IMAGE_FACTORY_HH
-#define IPLT_IMAGE_FACTORY_HH
+#ifndef IMG_IMAGE_FACTORY_HH
+#define IMG_IMAGE_FACTORY_HH
 
 #include <ost/img/module_config.hh>
 #include "extent.hh"
diff --git a/modules/img/base/src/image_fw.hh b/modules/img/base/src/image_fw.hh
index ed8e1e1d873672cf4907f8b8fc18c1cb55b29fe8..3c528e89d8ba6f1c8d679999cd77b2a9f9107571 100644
--- a/modules/img/base/src/image_fw.hh
+++ b/modules/img/base/src/image_fw.hh
@@ -25,8 +25,8 @@
   Author: Ansgar Philippsen
 */
 
-#ifndef IPLT_IMAGE_FW_H
-#define IPLT_IMAGE_FW_H
+#ifndef IMG_IMAGE_FW_H
+#define IMG_IMAGE_FW_H
 
 #include <ost/img/module_config.hh>
 
diff --git a/modules/img/base/src/image_handle.hh b/modules/img/base/src/image_handle.hh
index 2bd86943379635492e204659df21c217d2bce573..6119392551ca8b31717a03d8653f682f43bcd923 100644
--- a/modules/img/base/src/image_handle.hh
+++ b/modules/img/base/src/image_handle.hh
@@ -26,8 +26,8 @@
   Author: Ansgar Philippsen
 */
 
-#ifndef IPLT_IMAGE_HANDLE_H
-#define IPLT_IMAGE_HANDLE_H
+#ifndef IMG_IMAGE_HANDLE_H
+#define IMG_IMAGE_HANDLE_H
 
 #include <boost/shared_ptr.hpp>
 
diff --git a/modules/img/base/src/image_handle_fw.hh b/modules/img/base/src/image_handle_fw.hh
index fc1844ed8516e550285fc43684c974852e0ec794..810e921ee9074b8c0bdceded2dee8ab24d285c15 100644
--- a/modules/img/base/src/image_handle_fw.hh
+++ b/modules/img/base/src/image_handle_fw.hh
@@ -24,8 +24,8 @@
   Author: Ansgar Philippsen
 */
 
-#ifndef IPLT_IMAGE_HANDLE_FW_H
-#define IPLT_IMAGE_HANDLE_FW_H
+#ifndef IMG_IMAGE_HANDLE_FW_H
+#define IMG_IMAGE_HANDLE_FW_H
 
 namespace ost { namespace img {
   class ImageHandle;
diff --git a/modules/img/base/src/image_impl.hh b/modules/img/base/src/image_impl.hh
index 96880f534d23ca3a0feb311fdacea086bd5da16f..6748728c2f3f3cdfb8ec919a0cc8408cfd03d403 100644
--- a/modules/img/base/src/image_impl.hh
+++ b/modules/img/base/src/image_impl.hh
@@ -24,8 +24,8 @@
   Author: Ansgar Philippsen
 */
 
-#ifndef IPLT_IMAGE_IMPL_H
-#define IPLT_IMAGE_IMPL_H
+#ifndef IMG_IMAGE_IMPL_H
+#define IMG_IMAGE_IMPL_H
 
 #include <boost/shared_ptr.hpp>
 
diff --git a/modules/img/base/src/image_list.hh b/modules/img/base/src/image_list.hh
index f47c04dc97ecc05ba5ea62afdb97a490761755ba..c49a3284454bb7120025f5d186ef14fd9ea60a9c 100644
--- a/modules/img/base/src/image_list.hh
+++ b/modules/img/base/src/image_list.hh
@@ -22,8 +22,8 @@
   Author:Andreas Schenk
 */
 
-#ifndef IPLT_IMAGE_LIST_HH
-#define IPLT_IMAGE_LIST_HH
+#ifndef IMG_IMAGE_LIST_HH
+#define IMG_IMAGE_LIST_HH
 
 
 #include <ost/img/image.hh>
diff --git a/modules/img/base/src/image_state.hh b/modules/img/base/src/image_state.hh
index 35c0ec7b32a96b0d8c157ca13767fa9838422cc1..a6d4a0d5a40745af17682dc1eb305c2a27f0ebda 100644
--- a/modules/img/base/src/image_state.hh
+++ b/modules/img/base/src/image_state.hh
@@ -24,8 +24,8 @@
   Author: Ansgar Philippsen
 */
 
-#ifndef IPLT_IMAGE_STATE_H
-#define IPLT_IMAGE_STATE_H
+#ifndef IMG_IMAGE_STATE_H
+#define IMG_IMAGE_STATE_H
 
 
 #include "image_state/image_state_def.hh"
diff --git a/modules/img/base/src/image_state/binop.cc b/modules/img/base/src/image_state/binop.cc
index 6ebd30fc8c11376816a0af1625fbfba3b9cb45b6..53521ed7fa230b02d4f58b097322e34560e740db 100644
--- a/modules/img/base/src/image_state/binop.cc
+++ b/modules/img/base/src/image_state/binop.cc
@@ -22,7 +22,7 @@
   Author: Ansgar Philippsen
 */
 
-#ifndef IPLT_IMAGE_STATE_INST_H
+#ifndef IMG_IMAGE_STATE_INST_H
 #error "binop.cc must be included from image_state_inst.hh"
 #endif
 
diff --git a/modules/img/base/src/image_state/binop.hh b/modules/img/base/src/image_state/binop.hh
index 7c039fd7de88f4b0ce6c1e5e157e23c12cfbf340..c3d2d3e5da75babb689a239df21883bf416856a4 100644
--- a/modules/img/base/src/image_state/binop.hh
+++ b/modules/img/base/src/image_state/binop.hh
@@ -22,8 +22,8 @@
   Author: Ansgar Philippsen
 */
 
-#ifndef IPLT_IMAGE_STATE_BINOP_HH
-#define IPLT_IMAGE_STATE_BINOP_HH
+#ifndef IMG_IMAGE_STATE_BINOP_HH
+#define IMG_IMAGE_STATE_BINOP_HH
 
 #include "dispatch.hh"
 
diff --git a/modules/img/base/src/image_state/dispatch.hh b/modules/img/base/src/image_state/dispatch.hh
index 88f4061c6b0871006a30a90ebaca1a16462abcd7..4268854a36742f5a02575d2bf6f8b6b0b12641b7 100644
--- a/modules/img/base/src/image_state/dispatch.hh
+++ b/modules/img/base/src/image_state/dispatch.hh
@@ -22,8 +22,8 @@
   Author: Ansgar Philippsen
 */
 
-#ifndef IPLT_IMAGE_STATE_DISPATCH_HH
-#define IPLT_IMAGE_STATE_DISPATCH_HH
+#ifndef IMG_IMAGE_STATE_DISPATCH_HH
+#define IMG_IMAGE_STATE_DISPATCH_HH
 
 #include <ost/message.hh>
 #include <string>
diff --git a/modules/img/base/src/image_state/dispatch_fw.hh b/modules/img/base/src/image_state/dispatch_fw.hh
index bd6990944e296339ce4be8a339ec2f9aa05931ac..ef5b5eb06caed328b0f26b2dfea352b179434212 100644
--- a/modules/img/base/src/image_state/dispatch_fw.hh
+++ b/modules/img/base/src/image_state/dispatch_fw.hh
@@ -18,8 +18,8 @@
 // 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 //------------------------------------------------------------------------------
 
-#ifndef IPLT_IMAGE_STATE_DISPATCH_FW_HH
-#define IPLT_IMAGE_STATE_DISPATCH_FW_HH
+#ifndef IMG_IMAGE_STATE_DISPATCH_FW_HH
+#define IMG_IMAGE_STATE_DISPATCH_FW_HH
 
 namespace ost { namespace img { namespace image_state { namespace dispatch {
 
diff --git a/modules/img/base/src/image_state/image_state.hh b/modules/img/base/src/image_state/image_state.hh
index 644218a7e24bd05216fdba1745b48eba3e01833b..7354ad28d58d3934efc3fe0290e4e8e02a3a81e3 100644
--- a/modules/img/base/src/image_state/image_state.hh
+++ b/modules/img/base/src/image_state/image_state.hh
@@ -24,8 +24,8 @@
   Author: Ansgar Philippsen
 */
 
-#ifndef IPLT_IMAGE_STATE_DETAIL_H
-#define IPLT_IMAGE_STATE_DETAIL_H
+#ifndef IMG_IMAGE_STATE_DETAIL_H
+#define IMG_IMAGE_STATE_DETAIL_H
 
 #include "image_state_base.hh"
 #include "image_state_impl.hh"
diff --git a/modules/img/base/src/image_state/image_state_algorithm.hh b/modules/img/base/src/image_state/image_state_algorithm.hh
index c7fbbadab0cc9e9fd2255df241ba09edaf8625a2..bd1e1f3f17e422335e17bf20f45756671e793ff4 100644
--- a/modules/img/base/src/image_state/image_state_algorithm.hh
+++ b/modules/img/base/src/image_state/image_state_algorithm.hh
@@ -22,8 +22,8 @@
   Author: Ansgar Philippsen
 */
 
-#ifndef IPLT_IMAGE_STATE_ALGORITHM_HH
-#define IPLT_IMAGE_STATE_ALGORITHM_HH
+#ifndef IMG_IMAGE_STATE_ALGORITHM_HH
+#define IMG_IMAGE_STATE_ALGORITHM_HH
 
 #include <ost/img/image.hh>
 #include <ost/img/data_algorithm.hh>
diff --git a/modules/img/base/src/image_state/image_state_def.hh b/modules/img/base/src/image_state/image_state_def.hh
index 745079083af52b8c8b33b7ef2ab02ae9b3505ab4..b4f44921e56d9df4ff90fa82d6c72a707c86fbad 100644
--- a/modules/img/base/src/image_state/image_state_def.hh
+++ b/modules/img/base/src/image_state/image_state_def.hh
@@ -24,8 +24,8 @@
   Author: Ansgar Philippsen
 */
 
-#ifndef IPLT_IMAGE_STATE_DEF_H
-#define IPLT_IMAGE_STATE_DEF_H
+#ifndef IMG_IMAGE_STATE_DEF_H
+#define IMG_IMAGE_STATE_DEF_H
 
 #include <ost/base.hh>
 
diff --git a/modules/img/base/src/image_state/image_state_factory.hh b/modules/img/base/src/image_state/image_state_factory.hh
index 0e9dd4f31938b73b3b639da7e1efe890d9601c3d..3a72f34fd34c9bd207bb6a03e5c05680fa621af9 100644
--- a/modules/img/base/src/image_state/image_state_factory.hh
+++ b/modules/img/base/src/image_state/image_state_factory.hh
@@ -24,8 +24,8 @@
   Author: Ansgar Philippsen
 */
 
-#ifndef IPLT_IMAGE_STATE_FACTORY_H
-#define IPLT_IMAGE_STATE_FACTORY_H
+#ifndef IMG_IMAGE_STATE_FACTORY_H
+#define IMG_IMAGE_STATE_FACTORY_H
 
 #include <ost/img/data_types.hh>
 #include <ost/img/extent.hh>
diff --git a/modules/img/base/src/image_state/image_state_fft.hh b/modules/img/base/src/image_state/image_state_fft.hh
index 32010527100bc5ddf32c4f747b4b6bd1218d1c51..b86518c33063cf48fa8b7e3cd92e112842c6bb8b 100644
--- a/modules/img/base/src/image_state/image_state_fft.hh
+++ b/modules/img/base/src/image_state/image_state_fft.hh
@@ -24,8 +24,8 @@
   Author: Ansgar Philippsen
 */
 
-#ifndef IPLT_IMAGE_STATE_FFT_H
-#define IPLT_IMAGE_STATE_FFT_H
+#ifndef IMG_IMAGE_STATE_FFT_H
+#define IMG_IMAGE_STATE_FFT_H
 
 #include <ost/message.hh>
 
diff --git a/modules/img/base/src/image_state/image_state_fw.hh b/modules/img/base/src/image_state/image_state_fw.hh
index bd7b29cf29896732e50de9537394ed4d7b49f7ec..c1eb67f60c812a6dc8aecab7e824d80606794bdc 100644
--- a/modules/img/base/src/image_state/image_state_fw.hh
+++ b/modules/img/base/src/image_state/image_state_fw.hh
@@ -24,8 +24,8 @@
   Author: Ansgar Philippsen
 */
 
-#ifndef IPLT_IMAGE_STATE_DETAIL_FW
-#define IPLT_IMAGE_STATE_DETAIL_FW
+#ifndef IMG_IMAGE_STATE_DETAIL_FW
+#define IMG_IMAGE_STATE_DETAIL_FW
 
 #include "image_state_factory.hh"
 #include "image_state_visitor_fw.hh"
diff --git a/modules/img/base/src/image_state/image_state_impl.cc b/modules/img/base/src/image_state/image_state_impl.cc
index f31adf013d83ce2bbfa2a95c6fa06c9f5a028564..190728a105dd5977f6d85640a8f80ff83584c7bb 100644
--- a/modules/img/base/src/image_state/image_state_impl.cc
+++ b/modules/img/base/src/image_state/image_state_impl.cc
@@ -29,7 +29,7 @@
 */
 
 
-#ifndef IPLT_IMAGE_STATE_INST_H
+#ifndef IMG_IMAGE_STATE_INST_H
 #error "image_state_impl.cc must be included from image_state_inst.hh"
 #endif
 
diff --git a/modules/img/base/src/image_state/image_state_inst.hh b/modules/img/base/src/image_state/image_state_inst.hh
index 3364d57a3f18af5e4bad7dc2ba3aaabf56db668f..216d7219d598d27f287f431f81e3c2e124e7353d 100644
--- a/modules/img/base/src/image_state/image_state_inst.hh
+++ b/modules/img/base/src/image_state/image_state_inst.hh
@@ -24,8 +24,8 @@
   Author: Ansgar Philippsen
 */
 
-#ifndef IPLT_IMAGE_STATE_INST_H
-#define IPLT_IMAGE_STATE_INST_H
+#ifndef IMG_IMAGE_STATE_INST_H
+#define IMG_IMAGE_STATE_INST_H
 
 /*
   At this point the various template instantiations
diff --git a/modules/img/base/src/image_state/image_state_visitor.hh b/modules/img/base/src/image_state/image_state_visitor.hh
index 5926a09e7dfa49e981baf7d71c736d0ce3594e70..0f08c745eab590b630dcd3fcb35d30eda0f993b6 100644
--- a/modules/img/base/src/image_state/image_state_visitor.hh
+++ b/modules/img/base/src/image_state/image_state_visitor.hh
@@ -22,8 +22,8 @@
   Author: Ansgar Philippsen
 */
 
-#ifndef IPLT_IMAGE_STATE_VISITOR_HH
-#define IPLT_IMAGE_STATE_VISITOR_HH
+#ifndef IMG_IMAGE_STATE_VISITOR_HH
+#define IMG_IMAGE_STATE_VISITOR_HH
 
 #include <ost/img/data_algorithm.hh>
 #include "image_state_impl.hh"
diff --git a/modules/img/base/src/image_state/image_state_visitor_fw.hh b/modules/img/base/src/image_state/image_state_visitor_fw.hh
index f7f1652d26b0728925d7611d0bec717204e520f2..5e8a2512418b59b8b04b92686941eb8c5b0730c9 100644
--- a/modules/img/base/src/image_state/image_state_visitor_fw.hh
+++ b/modules/img/base/src/image_state/image_state_visitor_fw.hh
@@ -24,8 +24,8 @@
   Author: Ansgar Philippsen
 */
 
-#ifndef IPLT_IMAGE_STATE_VISITOR_FW_H
-#define IPLT_IMAGE_STATE_VISITOR_FW_H
+#ifndef IMG_IMAGE_STATE_VISITOR_FW_H
+#define IMG_IMAGE_STATE_VISITOR_FW_H
 
 namespace ost { namespace img { namespace image_state {
 
diff --git a/modules/img/base/src/image_state/index.hh b/modules/img/base/src/image_state/index.hh
index beee95d5283838039a85272d17d42282c4cc9d15..6133adae5e7da5d90848e2659508d771c3ccac6e 100644
--- a/modules/img/base/src/image_state/index.hh
+++ b/modules/img/base/src/image_state/index.hh
@@ -24,8 +24,8 @@
   Author: Ansgar Philippsen
 */
 
-#ifndef IPLT_INDEX_H
-#define IPLT_INDEX_H
+#ifndef IMG_INDEX_H
+#define IMG_INDEX_H
 
 #include <iosfwd>
 
diff --git a/modules/img/base/src/image_state/type_fw.hh b/modules/img/base/src/image_state/type_fw.hh
index 1c71b921fb5d989790fb8b174797547a8705095c..ace9050462876aefa04e826f80da4997866dd066 100644
--- a/modules/img/base/src/image_state/type_fw.hh
+++ b/modules/img/base/src/image_state/type_fw.hh
@@ -24,8 +24,8 @@
   Author: Ansgar Philippsen
 */
 
-#ifndef IPLT_IMAGE_STATE_TYPE_FW_H
-#define IPLT_IMAGE_STATE_TYPE_FW_H
+#ifndef IMG_IMAGE_STATE_TYPE_FW_H
+#define IMG_IMAGE_STATE_TYPE_FW_H
 
 namespace ost { namespace img {
 
diff --git a/modules/img/base/src/image_state/value_holder.cc b/modules/img/base/src/image_state/value_holder.cc
index e9c96743fa542fe7b025fafa2a40768b5d33d89d..c9245e4235acdec0199eda246b34640e81fd59ea 100644
--- a/modules/img/base/src/image_state/value_holder.cc
+++ b/modules/img/base/src/image_state/value_holder.cc
@@ -24,7 +24,7 @@
   Author: Ansgar Philippsen
 */
 
-#ifndef IPLT_IMAGE_STATE_INST_H
+#ifndef IMG_IMAGE_STATE_INST_H
 #error "value_holder.cc must be included from image_state_inst.hh"
 #endif
 
diff --git a/modules/img/base/src/image_state_fw.hh b/modules/img/base/src/image_state_fw.hh
index 3e8ab9c38eaf204b58f765e686073a48d994ce98..849427159750dbf3b01cf07f9261d5b68a3ab3aa 100644
--- a/modules/img/base/src/image_state_fw.hh
+++ b/modules/img/base/src/image_state_fw.hh
@@ -24,8 +24,8 @@
   Author: Ansgar Philippsen 
 */
 
-#ifndef IPLT_IMAGE_STATE_FW_H
-#define IPLT_IMAGE_STATE_FW_H
+#ifndef IMG_IMAGE_STATE_FW_H
+#define IMG_IMAGE_STATE_FW_H
 
 #include "image_state/image_state_factory.hh"
 #include "image_state/image_state_visitor_fw.hh"
diff --git a/modules/img/base/src/mask.hh b/modules/img/base/src/mask.hh
index 798f062ed03d1da9345fc422f24276b55fe0cc7c..a3bea792e6c1857b0b942d9942b17dcc26c81012 100644
--- a/modules/img/base/src/mask.hh
+++ b/modules/img/base/src/mask.hh
@@ -22,8 +22,8 @@
   Authors: Andreas Schenk, Ansgar Philippsen
 */
 
-#ifndef IPLT_MASK_HH_
-#define IPLT_MASK_HH_
+#ifndef IMG_MASK_HH_
+#define IMG_MASK_HH_
 
 #include <ost/message.hh> 
 #include "polygon_mask.hh" 
diff --git a/modules/img/base/src/normalizer_fw.hh b/modules/img/base/src/normalizer_fw.hh
index e401a927892867ba33fb65741d5af00aa2d448e3..75b9af8d9363d466c286abe6555e7b0e27766782 100644
--- a/modules/img/base/src/normalizer_fw.hh
+++ b/modules/img/base/src/normalizer_fw.hh
@@ -22,8 +22,8 @@
   Author: Ansgar Philippsen
 */
 
-#ifndef IPLT_NORMALIZER_FW_HH
-#define IPLT_NORMALIZER_FW_HH
+#ifndef IMG_NORMALIZER_FW_HH
+#define IMG_NORMALIZER_FW_HH
 
 #include <boost/shared_ptr.hpp>
 
diff --git a/modules/img/base/src/normalizer_impl.hh b/modules/img/base/src/normalizer_impl.hh
index 633b68ca9ffa6374e120f90e0ffadc1625100009..838875cdda856db1a5a5360d5a18aa28344e5c00 100644
--- a/modules/img/base/src/normalizer_impl.hh
+++ b/modules/img/base/src/normalizer_impl.hh
@@ -24,8 +24,8 @@
   Authors: Ansgar Philippsen, Andreas Schenk
 */
 
-#ifndef IPLT_NORMALIZER_IMPL_H
-#define IPLT_NORMALIZER_IMPL_H
+#ifndef IMG_NORMALIZER_IMPL_H
+#define IMG_NORMALIZER_IMPL_H
 
 #include <boost/shared_ptr.hpp>
 
diff --git a/modules/img/base/src/null_data.hh b/modules/img/base/src/null_data.hh
index c492851d42be2ffe899380c8f31392cfaf94fbf6..fff15d6f40d3e7a172db02aa48e93f05f8cbeffe 100644
--- a/modules/img/base/src/null_data.hh
+++ b/modules/img/base/src/null_data.hh
@@ -24,8 +24,8 @@
   Author: Ansgar Philippsen
 */
 
-#ifndef IPLT_NULL_DATA_H
-#define IPLT_NULL_DATA_H
+#ifndef IMG_NULL_DATA_H
+#define IMG_NULL_DATA_H
 
 #include "data.hh"
 #include "pixel_sampling.hh"
diff --git a/modules/img/base/src/null_function.hh b/modules/img/base/src/null_function.hh
index b7a570012f200f569a18022bdb862159ac00bb17..29087c848b96ea83f105f46e7419a78c1908d63c 100644
--- a/modules/img/base/src/null_function.hh
+++ b/modules/img/base/src/null_function.hh
@@ -24,8 +24,8 @@
   Author: Ansgar Philippsen
 */
 
-#ifndef IPLT_NULL_FUNCTION_H
-#define IPLT_NULL_FUNCTION_H
+#ifndef IMG_NULL_FUNCTION_H
+#define IMG_NULL_FUNCTION_H
 
 #include "function_base.hh"
 
diff --git a/modules/img/base/src/observable.hh b/modules/img/base/src/observable.hh
index 97f49358f4bff75edaff86c6e682f87041a5991f..77c00411005a728c07fa6e822e277515ef5e7efc 100644
--- a/modules/img/base/src/observable.hh
+++ b/modules/img/base/src/observable.hh
@@ -24,8 +24,8 @@
   Author: Ansgar Philippsen
 */
 
-#ifndef IPLT_OBSERVABLE_H
-#define IPLT_OBSERVABLE_H
+#ifndef IMG_OBSERVABLE_H
+#define IMG_OBSERVABLE_H
 
 #include <list>
 #include "extent.hh" 
diff --git a/modules/img/base/src/paste_impl.hh b/modules/img/base/src/paste_impl.hh
index 2e403076facceb3684c225323e6f233b357c800c..91ae6c4d86a87927596a8ae71a6744cb0fd95658 100644
--- a/modules/img/base/src/paste_impl.hh
+++ b/modules/img/base/src/paste_impl.hh
@@ -18,8 +18,8 @@
 // 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 //------------------------------------------------------------------------------
 
-#ifndef IPLT_PASTE_IMPL_HH
-#define IPLT_PASTE_IMPL_HH
+#ifndef IMG_PASTE_IMPL_HH
+#define IMG_PASTE_IMPL_HH
 
 #include "image_state/image_state_algorithm.hh"
 
diff --git a/modules/img/base/src/peak.hh b/modules/img/base/src/peak.hh
index 3ec8c780c70c92e362b2837f32c56871331328c0..a58c467bf17f902cb30f61e94ec7c9a4ae061fd9 100644
--- a/modules/img/base/src/peak.hh
+++ b/modules/img/base/src/peak.hh
@@ -22,8 +22,8 @@
   Author: Ansgar Philippsen
 */
 
-#ifndef IPLT_ALG_PEAK_LIST_HH
-#define IPLT_ALG_PEAK_LIST_HH
+#ifndef IMG_ALG_PEAK_LIST_HH
+#define IMG_ALG_PEAK_LIST_HH
 
 #include <vector>
 
diff --git a/modules/img/base/src/physical_units.hh b/modules/img/base/src/physical_units.hh
index f0b676d128588efbf278e03d3e7f99393fdd2e23..f2e5ca615f436d8515f740bcbdd416b07de23979 100644
--- a/modules/img/base/src/physical_units.hh
+++ b/modules/img/base/src/physical_units.hh
@@ -17,8 +17,8 @@
 // along with this library; if not, write to the Free Software Foundation, Inc.,
 // 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 //------------------------------------------------------------------------------
-#ifndef IPLT_PHYSICS_UNITS_HH
-#define IPLT_PHYSICS_UNITS_HH
+#ifndef IMG_PHYSICS_UNITS_HH
+#define IMG_PHYSICS_UNITS_HH
 
 #include <boost/mpl/vector_c.hpp>
 #include<boost/mpl/placeholders.hpp>
diff --git a/modules/img/base/src/pixel_sampling.hh b/modules/img/base/src/pixel_sampling.hh
index 77949c9c1390799d7ea15c9d0ded2db546060d89..02da611b73e4578e4ffe59a5b1d9de8400391efc 100644
--- a/modules/img/base/src/pixel_sampling.hh
+++ b/modules/img/base/src/pixel_sampling.hh
@@ -24,8 +24,8 @@
   Author: Ansgar Philippsen
 */
 
-#ifndef IPLT_PIXEL_SAMPLING_H
-#define IPLT_PIXEL_SAMPLING_H
+#ifndef IMG_PIXEL_SAMPLING_H
+#define IMG_PIXEL_SAMPLING_H
 
 #include <ost/img/module_config.hh>
 #include <ost/img/data_types.hh>
diff --git a/modules/img/base/src/point.hh b/modules/img/base/src/point.hh
index 217477d099e4a40d13e4786fe547342279589cfd..abbd8a9036a2075053a986e4f8fe05d57a8528ca 100644
--- a/modules/img/base/src/point.hh
+++ b/modules/img/base/src/point.hh
@@ -28,8 +28,8 @@
   TODO: use boost operator
 */
 
-#ifndef IPLT_POINT_H
-#define IPLT_POINT_H
+#ifndef IMG_POINT_H
+#define IMG_POINT_H
 
 #include <vector>
 #include <iosfwd>
diff --git a/modules/img/base/src/raster_image/raster_image.hh b/modules/img/base/src/raster_image/raster_image.hh
index e92255771aa79cd2b2e2a98a854bae10f47a0c9f..8840d742d12f4e0ae9f70089a48e74861ef54675 100644
--- a/modules/img/base/src/raster_image/raster_image.hh
+++ b/modules/img/base/src/raster_image/raster_image.hh
@@ -24,8 +24,8 @@
   Author: Ansgar Philippsen, Andreas Schenk
 */
 
-#ifndef IPLT_RASTER_IMAGE_H
-#define IPLT_RASTER_IMAGE_H
+#ifndef IMG_RASTER_IMAGE_H
+#define IMG_RASTER_IMAGE_H
 
 #include <ost/base.hh>
 #include <ost/img/vecmat.hh>
diff --git a/modules/img/base/src/size.hh b/modules/img/base/src/size.hh
index 539eda53269b5ac7316ea89a8163609581ec4f42..1ae38ce9d9a1f88e856ed106cf6f54a3eba03e27 100644
--- a/modules/img/base/src/size.hh
+++ b/modules/img/base/src/size.hh
@@ -24,8 +24,8 @@
   Author: Ansgar Philippsen
 */
 
-#ifndef IPLT_SIZE_H
-#define IPLT_SIZE_H
+#ifndef IMG_SIZE_H
+#define IMG_SIZE_H
 
 #include <iosfwd>
 
diff --git a/modules/img/base/src/util.cc b/modules/img/base/src/util.cc
index 3b2638ed37ce5d35394a48fb39b8f10674da182d..2aa4955d88e2d2b2704c11b781ad802ad0648c37 100644
--- a/modules/img/base/src/util.cc
+++ b/modules/img/base/src/util.cc
@@ -22,7 +22,7 @@
   Author: Ansgar Philippsen
 */
 
-#ifndef IPLT_UTIL_H
+#ifndef IMG_UTIL_H
 #error "util.cc must be included from util.hh"
 #endif
 
diff --git a/modules/img/base/src/util.hh b/modules/img/base/src/util.hh
index 79132af88eeb9b49444fe947ee50b4ea9e188318..adf577b6a271036b6d0b2a544becda06649b1f2b 100644
--- a/modules/img/base/src/util.hh
+++ b/modules/img/base/src/util.hh
@@ -24,8 +24,8 @@
   Author: Ansgar Philippsen
 */
 
-#ifndef IPLT_UTIL_H
-#define IPLT_UTIL_H
+#ifndef IMG_UTIL_H
+#define IMG_UTIL_H
 
 #include <cmath>
 
diff --git a/modules/img/base/src/value_util.hh b/modules/img/base/src/value_util.hh
index 01785d6db6ac56f5002a4014a0c8622b30089ce7..b17e42cff6c9277e74cec1b73498d5fbeb7cd2a9 100644
--- a/modules/img/base/src/value_util.hh
+++ b/modules/img/base/src/value_util.hh
@@ -24,8 +24,8 @@
   Author: Ansgar Philippsen
 */
 
-#ifndef IPLT_VALUE_UTIL_H
-#define IPLT_VALUE_UTIL_H
+#ifndef IMG_VALUE_UTIL_H
+#define IMG_VALUE_UTIL_H
 
 #include <time.h>
 #include <boost/random.hpp>
diff --git a/modules/img/base/src/vecmat.hh b/modules/img/base/src/vecmat.hh
index 8e70a64ff12c85be42fc722b63042d4cc67589ad..0fe9d299dbd292e8365aa8e41a45292fcc72d8e4 100644
--- a/modules/img/base/src/vecmat.hh
+++ b/modules/img/base/src/vecmat.hh
@@ -24,8 +24,8 @@
   Author: Ansgar Philippsen
 */
 
-#ifndef IPLT_VECMAT_H
-#define IPLT_VECMAT_H
+#ifndef IMG_VECMAT_H
+#define IMG_VECMAT_H
 
 #include <cmath>
 #include <vector>
diff --git a/modules/img/base/src/version.hh b/modules/img/base/src/version.hh
index d095e109ac87c746eff57c32c5fe4e8eee9f8239..f893148f7ffa6f0ba61657238373a869178a6b56 100644
--- a/modules/img/base/src/version.hh
+++ b/modules/img/base/src/version.hh
@@ -24,8 +24,8 @@
   Author: Ansgar Philippsen
 */
 
-#ifndef IPLT_VERSION_H
-#define IPLT_VERSION_H
+#ifndef IMG_VERSION_H
+#define IMG_VERSION_H
 
 #include <ost/img/module_config.hh>
 
diff --git a/modules/img/base/tests/test_data.hh b/modules/img/base/tests/test_data.hh
index 44c29ff48e0fd1d5168670114ecd1dee3cbf37a0..1e72598ed44f55149966c54c00db0cb97c3774ce 100644
--- a/modules/img/base/tests/test_data.hh
+++ b/modules/img/base/tests/test_data.hh
@@ -22,8 +22,8 @@
   Author: Ansgar Philippsen
 */
 
-#ifndef IPLT_TEST_DATA_H
-#define IPLT_TEST_DATA_H
+#ifndef IMG_TEST_DATA_H
+#define IMG_TEST_DATA_H
 
 #include <boost/test/unit_test.hpp>
 using boost::unit_test_framework::test_suite;
diff --git a/modules/img/base/tests/test_extent.hh b/modules/img/base/tests/test_extent.hh
index edd04671c0c5e1121b946023f0fa84b81e6fbd1a..4d452b217fcdf65fa3575a2f6e97bba4bf614143 100644
--- a/modules/img/base/tests/test_extent.hh
+++ b/modules/img/base/tests/test_extent.hh
@@ -22,8 +22,8 @@
   Author: Ansgar Philippsen
 */
 
-#ifndef IPLT_TEST_EXTENT_H
-#define IPLT_TEST_EXTENT_H
+#ifndef IMG_TEST_EXTENT_H
+#define IMG_TEST_EXTENT_H
 
 #include <boost/test/unit_test.hpp>
 using boost::unit_test_framework::test_suite;
diff --git a/modules/img/base/tests/test_function.hh b/modules/img/base/tests/test_function.hh
index 3b968f717efaa9422dedf7895c4344aa749f81ef..4e1d05295235e98e903d9fc13c9fb0722e4e81c0 100644
--- a/modules/img/base/tests/test_function.hh
+++ b/modules/img/base/tests/test_function.hh
@@ -22,8 +22,8 @@
   Author: Ansgar Philippsen
 */
 
-#ifndef IPLT_TEST_FUNCTION_H
-#define IPLT_TEST_FUNCTION_H
+#ifndef IMG_TEST_FUNCTION_H
+#define IMG_TEST_FUNCTION_H
 
 #include <boost/test/unit_test.hpp>
 using boost::unit_test_framework::test_suite;
diff --git a/modules/img/base/tests/test_image.hh b/modules/img/base/tests/test_image.hh
index e79f738d99d5230a7576bb1646e4c3ff21bb3ad4..7120d2338049bc2fde17056142de4f54b578b8a4 100644
--- a/modules/img/base/tests/test_image.hh
+++ b/modules/img/base/tests/test_image.hh
@@ -22,8 +22,8 @@
   Author: Ansgar Philippsen
 */
 
-#ifndef IPLT_TEST_IMAGE_H
-#define IPLT_TEST_IMAGE_H
+#ifndef IMG_TEST_IMAGE_H
+#define IMG_TEST_IMAGE_H
 
 #include <boost/test/unit_test.hpp>
 using boost::unit_test_framework::test_suite;
diff --git a/modules/img/base/tests/test_image_factory.hh b/modules/img/base/tests/test_image_factory.hh
index 920d83bbca5e4110af9f9e381d2f9449c8cd36ee..6912f13698ff1e40e8d59b13828f6754bdbed2ff 100644
--- a/modules/img/base/tests/test_image_factory.hh
+++ b/modules/img/base/tests/test_image_factory.hh
@@ -22,8 +22,8 @@
   Author: Ansgar Philippsen
 */
 
-#ifndef IPLT_TEST_IMAGE_FACTORY_H
-#define IPLT_TEST_IMAGE_FACTORY_H
+#ifndef IMG_TEST_IMAGE_FACTORY_H
+#define IMG_TEST_IMAGE_FACTORY_H
 
 #include <boost/test/unit_test.hpp>
 using boost::unit_test_framework::test_suite;
diff --git a/modules/img/base/tests/test_image_impl.hh b/modules/img/base/tests/test_image_impl.hh
index c75c98493049278e11abcf4bb897baff04f5dd37..5cbee44f54b4a79912dea0f9e5e1367933c50bf4 100644
--- a/modules/img/base/tests/test_image_impl.hh
+++ b/modules/img/base/tests/test_image_impl.hh
@@ -22,8 +22,8 @@
   Author: Ansgar Philippsen
 */
 
-#ifndef IPLT_TEST_IMAGE_IMPL_H
-#define IPLT_TEST_IMAGE_IMPL_H
+#ifndef IMG_TEST_IMAGE_IMPL_H
+#define IMG_TEST_IMAGE_IMPL_H
 
 #include <boost/test/unit_test.hpp>
 using boost::unit_test_framework::test_suite;
diff --git a/modules/img/base/tests/test_image_state_visitor.hh b/modules/img/base/tests/test_image_state_visitor.hh
index 77e5f6e3c1dab58c4d9495651ecf2633525a2c68..6cbe26de8d8c8239de6c7314b8165be603c8a1e0 100644
--- a/modules/img/base/tests/test_image_state_visitor.hh
+++ b/modules/img/base/tests/test_image_state_visitor.hh
@@ -22,8 +22,8 @@
   Author: Ansgar Philippsen
 */
 
-#ifndef IPLT_TEST_IMAGE_STATE_VISITOR_H
-#define IPLT_TEST_IMAGE_STATE_VISITOR_H
+#ifndef IMG_TEST_IMAGE_STATE_VISITOR_H
+#define IMG_TEST_IMAGE_STATE_VISITOR_H
 
 #include <boost/test/unit_test.hpp>
 using boost::unit_test_framework::test_suite;
diff --git a/modules/img/base/tests/test_index.hh b/modules/img/base/tests/test_index.hh
index f47680ac7344406737340f06feebf25ec416eaa8..5056c4db244ab049ab24716b44c3fa1f8f511c3b 100644
--- a/modules/img/base/tests/test_index.hh
+++ b/modules/img/base/tests/test_index.hh
@@ -22,8 +22,8 @@
   Author: Ansgar Philippsen
 */
 
-#ifndef IPLT_TEST_INDEX_H
-#define IPLT_TEST_INDEX_H
+#ifndef IMG_TEST_INDEX_H
+#define IMG_TEST_INDEX_H
 
 #include <boost/test/unit_test.hpp>
 using boost::unit_test_framework::test_suite;
diff --git a/modules/img/base/tests/test_point.hh b/modules/img/base/tests/test_point.hh
index 24d81a83bd05bfff4da16f99f71790f6808c6d84..1c5d20a57c13051b61c071c1ff601eb826cafaea 100644
--- a/modules/img/base/tests/test_point.hh
+++ b/modules/img/base/tests/test_point.hh
@@ -22,8 +22,8 @@
   Author: Ansgar Philippsen
 */
 
-#ifndef IPLT_TEST_POINT_H
-#define IPLT_TEST_POINT_H
+#ifndef IMG_TEST_POINT_H
+#define IMG_TEST_POINT_H
 
 #include <boost/test/unit_test.hpp>
 using boost::unit_test_framework::test_suite;
diff --git a/modules/img/base/tests/test_sampling.hh b/modules/img/base/tests/test_sampling.hh
index db2eead87b5cee90625aac88e1ff9b4b81052a82..6854438fc682e33aa5e41c68f0e8674c48a0b18c 100644
--- a/modules/img/base/tests/test_sampling.hh
+++ b/modules/img/base/tests/test_sampling.hh
@@ -22,8 +22,8 @@
   Author: Ansgar Philippsen
 */
 
-#ifndef IPLT_TEST_SAMPLING_H
-#define IPLT_TEST_SAMPLING_H
+#ifndef IMG_TEST_SAMPLING_H
+#define IMG_TEST_SAMPLING_H
 
 #include <boost/test/unit_test.hpp>
 using boost::unit_test_framework::test_suite;
diff --git a/modules/img/base/tests/test_size.hh b/modules/img/base/tests/test_size.hh
index ee4120b41062cb811952fe3e6b662e281eea02b5..2a35c3e850a796277e5b2a6dbd24c20d04531f33 100644
--- a/modules/img/base/tests/test_size.hh
+++ b/modules/img/base/tests/test_size.hh
@@ -22,8 +22,8 @@
   Author: Ansgar Philippsen
 */
 
-#ifndef IPLT_TEST_SIZE_H
-#define IPLT_TEST_SIZE_H
+#ifndef IMG_TEST_SIZE_H
+#define IMG_TEST_SIZE_H
 
 #include <boost/test/unit_test.hpp>
 using boost::unit_test_framework::test_suite;
diff --git a/modules/img/base/tests/test_transform.hh b/modules/img/base/tests/test_transform.hh
index 335fd3fbb563a4a6b3a7c4da7bd46328f483bb9a..cf6b002f7a3d806d4066f8da4d39f19d8206caf7 100644
--- a/modules/img/base/tests/test_transform.hh
+++ b/modules/img/base/tests/test_transform.hh
@@ -22,8 +22,8 @@
   Author: Ansgar Philippsen
 */
 
-#ifndef IPLT_TEST_TRANSFORM_H
-#define IPLT_TEST_TRANSFORM_H
+#ifndef IMG_TEST_TRANSFORM_H
+#define IMG_TEST_TRANSFORM_H
 
 #include <boost/test/unit_test.hpp>
 using boost::unit_test_framework::test_suite;
diff --git a/modules/img/base/tests/test_utils.hh b/modules/img/base/tests/test_utils.hh
index a563940698f6f87158cac9bf5d4c272d2842854a..47bfb6c01bc18ed00b7f07eb8b0bfc29a66b5c3b 100644
--- a/modules/img/base/tests/test_utils.hh
+++ b/modules/img/base/tests/test_utils.hh
@@ -22,8 +22,8 @@
   Author: Ansgar Philippsen
 */
 
-#ifndef IPLT_TEST_UTILS
-#define IPLT_TEST_UTILS
+#ifndef IMG_TEST_UTILS
+#define IMG_TEST_UTILS
 
 #include <iostream>
 
diff --git a/modules/img/base/tests/test_value_holder.hh b/modules/img/base/tests/test_value_holder.hh
index f07bc7b08f072e5e27a7877425de0665450908a1..6f2de7bb260a8336120a13bad16af087872b09c8 100644
--- a/modules/img/base/tests/test_value_holder.hh
+++ b/modules/img/base/tests/test_value_holder.hh
@@ -22,8 +22,8 @@
   Author: Ansgar Philippsen
 */
 
-#ifndef IPLT_TEST_VALUE_HOLDER_H
-#define IPLT_TEST_VALUE_HOLDER_H
+#ifndef IMG_TEST_VALUE_HOLDER_H
+#define IMG_TEST_VALUE_HOLDER_H
 
 #include <boost/test/unit_test.hpp>
 using boost::unit_test_framework::test_suite;
diff --git a/modules/io/src/img/image_format.hh b/modules/io/src/img/image_format.hh
index 5428337cd443aefd530b3213c958f68d87de0757..5b5e2a9be462cddc1d33bc5c90a2c2e4b6a13b85 100644
--- a/modules/io/src/img/image_format.hh
+++ b/modules/io/src/img/image_format.hh
@@ -24,8 +24,8 @@
   Author: Andreas Schenk
 */
 
-#ifndef IPLT_IMAGE_FORMAT_H
-#define IPLT_IMAGE_FORMAT_H
+#ifndef IMG_IMAGE_FORMAT_H
+#define IMG_IMAGE_FORMAT_H
 
 #include <ost/img/data_types.hh>
 #include <ost/base.hh>
diff --git a/modules/io/src/img/image_format_conversion.cc b/modules/io/src/img/image_format_conversion.cc
index b64a612b2a39ac25ecb35b6aa238ab862cca9058..54c29bcb2ffd39da918cf9bb8db07eca10b80153 100644
--- a/modules/io/src/img/image_format_conversion.cc
+++ b/modules/io/src/img/image_format_conversion.cc
@@ -24,7 +24,7 @@
   Author: Ansgar Philippsen
 */
 
-#ifndef IPLT_IMAGE_FORMAT_H
+#ifndef IMG_IMAGE_FORMAT_H
 #error "image_format_conversion.cc must be included from image_format.hh"
 #endif
 
diff --git a/modules/io/src/img/image_io_plugin.hh b/modules/io/src/img/image_io_plugin.hh
index 316de18eb2e6122ec317586a14798a49fc4c799f..aadbf0b9b71d79aba07bb801cb7d497b390d9142 100644
--- a/modules/io/src/img/image_io_plugin.hh
+++ b/modules/io/src/img/image_io_plugin.hh
@@ -25,8 +25,8 @@
   Authors: Ansgar Philippsen, Andreas Schenk
 */
 
-#ifndef IPLT_IMAGE_IO_PLUGIN
-#define IPLT_IMAGE_IO_PLUGIN
+#ifndef IMG_IMAGE_IO_PLUGIN
+#define IMG_IMAGE_IO_PLUGIN
 
 #include <boost/filesystem/operations.hpp>
 #include <boost/shared_ptr.hpp>