diff --git a/Modules/Applications/AppDimensionalityReduction/include/otbDimensionalityReductionTrainAutoencoder.txx b/Modules/Applications/AppDimensionalityReduction/include/otbDimensionalityReductionTrainAutoencoder.txx
index fff6561a21a752e7b7f97ebb0a6faf0f981b004a..3e9107a9a8aa5dbf0ea2579d110ecc8cfda49880 100644
--- a/Modules/Applications/AppDimensionalityReduction/include/otbDimensionalityReductionTrainAutoencoder.txx
+++ b/Modules/Applications/AppDimensionalityReduction/include/otbDimensionalityReductionTrainAutoencoder.txx
@@ -17,8 +17,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#ifndef cbTrainAutoencoder_txx
-#define cbTrainAutoencoder_txx
+#ifndef otbDimensionalityReductionTrainAutoencoder_txx
+#define otbDimensionalityReductionTrainAutoencoder_txx
 
 #include "otbTrainDimensionalityReductionApplicationBase.h"
 #include "otbAutoencoderModel.h"
diff --git a/Modules/Applications/AppDimensionalityReduction/include/otbDimensionalityReductionTrainPCA.txx b/Modules/Applications/AppDimensionalityReduction/include/otbDimensionalityReductionTrainPCA.txx
index 7778c252034ff85dcc66222c28fb060aa7b0666c..b04bd41eae9c78bfecf46f32ebf5f998ad2aed60 100644
--- a/Modules/Applications/AppDimensionalityReduction/include/otbDimensionalityReductionTrainPCA.txx
+++ b/Modules/Applications/AppDimensionalityReduction/include/otbDimensionalityReductionTrainPCA.txx
@@ -17,8 +17,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#ifndef cbTrainPCA_txx
-#define cbTrainPCA_txx
+#ifndef otbDimensionalityReductionTrainPCA_txx
+#define otbDimensionalityReductionTrainPCA_txx
 
 #include "otbTrainDimensionalityReductionApplicationBase.h"
 #include "otbPCAModel.h"
diff --git a/Modules/Applications/AppDimensionalityReduction/include/otbDimensionalityReductionTrainSOM.txx b/Modules/Applications/AppDimensionalityReduction/include/otbDimensionalityReductionTrainSOM.txx
index 2beb312157d3ed15149c7ec722ccc8dbff85d229..2cfeb1ad30f266d2545ec145a875ce643bd71154 100644
--- a/Modules/Applications/AppDimensionalityReduction/include/otbDimensionalityReductionTrainSOM.txx
+++ b/Modules/Applications/AppDimensionalityReduction/include/otbDimensionalityReductionTrainSOM.txx
@@ -17,8 +17,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#ifndef cbTrainSOM_txx
-#define cbTrainSOM_txx
+#ifndef otbDimensionalityReductionTrainSOM_txx
+#define otbDimensionalityReductionTrainSOM_txx
 #include "otbTrainDimensionalityReductionApplicationBase.h"
 #include "otbSOMModel.h"
 
diff --git a/Modules/Applications/AppDimensionalityReduction/include/otbTrainDimensionalityReductionApplicationBase.h b/Modules/Applications/AppDimensionalityReduction/include/otbTrainDimensionalityReductionApplicationBase.h
index dfec205de242cc001bedd3d44637f0c37ca17e13..85c12a4fb8bc19b9c3f66a36e04582ec18176030 100644
--- a/Modules/Applications/AppDimensionalityReduction/include/otbTrainDimensionalityReductionApplicationBase.h
+++ b/Modules/Applications/AppDimensionalityReduction/include/otbTrainDimensionalityReductionApplicationBase.h
@@ -17,8 +17,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#ifndef cbLearningApplicationBaseDR_h
-#define cbLearningApplicationBaseDR_h
+#ifndef otbTrainDimensionalityReductionApplicationBase_h
+#define otbTrainDimensionalityReductionApplicationBase_h
 
 #include "otbConfigure.h"
 
diff --git a/Modules/Applications/AppDimensionalityReduction/include/otbTrainDimensionalityReductionApplicationBase.txx b/Modules/Applications/AppDimensionalityReduction/include/otbTrainDimensionalityReductionApplicationBase.txx
index 54251e59287a06343cbf717b460f1206a7759d58..d99b51caaeac76fa35846a1436885a876dd17d04 100644
--- a/Modules/Applications/AppDimensionalityReduction/include/otbTrainDimensionalityReductionApplicationBase.txx
+++ b/Modules/Applications/AppDimensionalityReduction/include/otbTrainDimensionalityReductionApplicationBase.txx
@@ -17,8 +17,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#ifndef cbLearningApplicationBaseDR_txx
-#define cbLearningApplicationBaseDR_txx
+#ifndef otbTrainDimensionalityReductionApplicationBase_txx
+#define otbTrainDimensionalityReductionApplicationBase_txx
 
 #include "otbTrainDimensionalityReductionApplicationBase.h"
 
diff --git a/Modules/Learning/DimensionalityReductionLearning/include/otbAutoencoderModel.h b/Modules/Learning/DimensionalityReductionLearning/include/otbAutoencoderModel.h
index 44e98f578e9b38f9492a7e8c2d51d0fac7a6fc90..de0a221283ed5a5ee5cb0a4913fc618fe3e6c0f9 100644
--- a/Modules/Learning/DimensionalityReductionLearning/include/otbAutoencoderModel.h
+++ b/Modules/Learning/DimensionalityReductionLearning/include/otbAutoencoderModel.h
@@ -17,8 +17,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#ifndef AutoencoderModel_h
-#define AutoencoderModel_h
+#ifndef otbAutoencoderModel_h
+#define otbAutoencoderModel_h
 
 #include "otbMachineLearningModelTraits.h"
 #include "otbMachineLearningModel.h"
diff --git a/Modules/Learning/DimensionalityReductionLearning/include/otbAutoencoderModel.txx b/Modules/Learning/DimensionalityReductionLearning/include/otbAutoencoderModel.txx
index 176ffb7de52ac1f185e91f2f134907e4f6411b13..5f0708e5b4b5d87399ba6d008903e25afdc1486a 100644
--- a/Modules/Learning/DimensionalityReductionLearning/include/otbAutoencoderModel.txx
+++ b/Modules/Learning/DimensionalityReductionLearning/include/otbAutoencoderModel.txx
@@ -17,8 +17,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#ifndef AutoencoderModel_txx
-#define AutoencoderModel_txx
+#ifndef otbAutoencoderModel_txx
+#define otbAutoencoderModel_txx
 
 #include "otbAutoencoderModel.h"
 
diff --git a/Modules/Learning/DimensionalityReductionLearning/include/otbAutoencoderModelFactory.h b/Modules/Learning/DimensionalityReductionLearning/include/otbAutoencoderModelFactory.h
index ca411f0e707437fa3f75886e876f56721cf87702..eacd2901ef15c81e8e9d27afb112cb0654dbf486 100644
--- a/Modules/Learning/DimensionalityReductionLearning/include/otbAutoencoderModelFactory.h
+++ b/Modules/Learning/DimensionalityReductionLearning/include/otbAutoencoderModelFactory.h
@@ -17,8 +17,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#ifndef AutoencoderModelFactory_h
-#define AutoencoderModelFactory_h
+#ifndef otbAutoencoderModelFactory_h
+#define otbAutoencoderModelFactory_h
 
 
 //#include <shark/Models/TiedAutoencoder.h>
diff --git a/Modules/Learning/DimensionalityReductionLearning/include/otbAutoencoderModelFactory.txx b/Modules/Learning/DimensionalityReductionLearning/include/otbAutoencoderModelFactory.txx
index 53201871abf2721f551d29bea4e3797d7b1a5879..0d66ea86e00e806bb8aa05f5fff5e55fcec946a8 100644
--- a/Modules/Learning/DimensionalityReductionLearning/include/otbAutoencoderModelFactory.txx
+++ b/Modules/Learning/DimensionalityReductionLearning/include/otbAutoencoderModelFactory.txx
@@ -17,8 +17,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#ifndef AutoencoderModelFactory_txx
-#define AutoencoderModelFactory_txx
+#ifndef otbAutoencoderModelFactory_txx
+#define otbAutoencoderModelFactory_txx
 
 
 #include "otbAutoencoderModelFactory.h"
diff --git a/Modules/Learning/DimensionalityReductionLearning/include/otbDimensionalityReductionModelFactory.h b/Modules/Learning/DimensionalityReductionLearning/include/otbDimensionalityReductionModelFactory.h
index 8e80633c01034279ebfea1bc1e1e443baa9755d9..21c1d8a04a520b491e81a8e26feec2714df0e1ea 100644
--- a/Modules/Learning/DimensionalityReductionLearning/include/otbDimensionalityReductionModelFactory.h
+++ b/Modules/Learning/DimensionalityReductionLearning/include/otbDimensionalityReductionModelFactory.h
@@ -17,8 +17,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#ifndef DimensionalityReductionModelFactory_h
-#define DimensionalityReductionModelFactory_h
+#ifndef otbDimensionalityReductionModelFactory_h
+#define otbDimensionalityReductionModelFactory_h
 
 //#include "DimensionalityReductionModel.h"
 #include "otbMachineLearningModelFactoryBase.h"
diff --git a/Modules/Learning/DimensionalityReductionLearning/include/otbDimensionalityReductionModelFactory.txx b/Modules/Learning/DimensionalityReductionLearning/include/otbDimensionalityReductionModelFactory.txx
index 5a9b9b7740bebc06856a6c0ad1b330ff297a7fa8..65280436ca2d1bb405cf91f6a8001860c4e3e3d1 100644
--- a/Modules/Learning/DimensionalityReductionLearning/include/otbDimensionalityReductionModelFactory.txx
+++ b/Modules/Learning/DimensionalityReductionLearning/include/otbDimensionalityReductionModelFactory.txx
@@ -17,8 +17,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#ifndef DimensionalityReductionModelFactory_txx
-#define DimensionalityReductionModelFactory_txx
+#ifndef otbDimensionalityReductionModelFactory_txx
+#define otbDimensionalityReductionModelFactory_txx
 
 #include "otbDimensionalityReductionModelFactory.h"
 #include "otbConfigure.h"
diff --git a/Modules/Learning/DimensionalityReductionLearning/include/otbImageDimensionalityReductionFilter.h b/Modules/Learning/DimensionalityReductionLearning/include/otbImageDimensionalityReductionFilter.h
index a8689153522d38acbbee6f8f11ecfb3fbe9e3dc3..67bf3d2e4ed7965fa21fda00de9f4a0f0afe43a6 100644
--- a/Modules/Learning/DimensionalityReductionLearning/include/otbImageDimensionalityReductionFilter.h
+++ b/Modules/Learning/DimensionalityReductionLearning/include/otbImageDimensionalityReductionFilter.h
@@ -17,8 +17,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#ifndef ImageDimensionalityReduction_h
-#define ImageDimensionalityReduction_h
+#ifndef otbImageDimensionalityReduction_h
+#define otbImageDimensionalityReduction_h
 
 #include "itkImageToImageFilter.h"
 //#include "DimensionalityReductionModel.h"
diff --git a/Modules/Learning/DimensionalityReductionLearning/include/otbImageDimensionalityReductionFilter.txx b/Modules/Learning/DimensionalityReductionLearning/include/otbImageDimensionalityReductionFilter.txx
index 8cc87642f42999f1ae4bff686413ed5d4b6db434..8f7a7156215014ca07bdd962651aeaa06feca858 100644
--- a/Modules/Learning/DimensionalityReductionLearning/include/otbImageDimensionalityReductionFilter.txx
+++ b/Modules/Learning/DimensionalityReductionLearning/include/otbImageDimensionalityReductionFilter.txx
@@ -17,8 +17,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#ifndef otbImageClassificationFilter_txx
-#define otbImageClassificationFilter_txx
+#ifndef otbImageDimensionalityReductionFilter_txx
+#define otbImageDimensionalityReductionFilter_txx
 
 #include "otbImageDimensionalityReductionFilter.h"
 #include "itkImageRegionIterator.h"
diff --git a/Modules/Learning/DimensionalityReductionLearning/include/otbPCAModel.h b/Modules/Learning/DimensionalityReductionLearning/include/otbPCAModel.h
index b2b191155ee22ca3253991eb899855e2bfbfed5c..f9cc9142701fcb18c64df2a116e3eae6a455e946 100644
--- a/Modules/Learning/DimensionalityReductionLearning/include/otbPCAModel.h
+++ b/Modules/Learning/DimensionalityReductionLearning/include/otbPCAModel.h
@@ -17,8 +17,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#ifndef PCAModel_h
-#define PCAModel_h
+#ifndef otbPCAModel_h
+#define otbPCAModel_h
 
 #include "otbMachineLearningModelTraits.h"
 #include "otbMachineLearningModel.h"
diff --git a/Modules/Learning/DimensionalityReductionLearning/include/otbPCAModel.txx b/Modules/Learning/DimensionalityReductionLearning/include/otbPCAModel.txx
index 4d37df2003184274aec2b396185db056416007da..063b54f4f493a1ae54e72b3d5b3bd730b0b7692a 100644
--- a/Modules/Learning/DimensionalityReductionLearning/include/otbPCAModel.txx
+++ b/Modules/Learning/DimensionalityReductionLearning/include/otbPCAModel.txx
@@ -17,8 +17,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#ifndef PCAModel_txx
-#define PCAModel_txx
+#ifndef otbPCAModel_txx
+#define otbPCAModel_txx
 
 #include "otbPCAModel.h"
 
diff --git a/Modules/Learning/DimensionalityReductionLearning/include/otbPCAModelFactory.h b/Modules/Learning/DimensionalityReductionLearning/include/otbPCAModelFactory.h
index c7c376ecd84e4d06db73a3367d4da85d593e7661..8e044713f30d1066bcee19a00362e1f0613f48d7 100644
--- a/Modules/Learning/DimensionalityReductionLearning/include/otbPCAModelFactory.h
+++ b/Modules/Learning/DimensionalityReductionLearning/include/otbPCAModelFactory.h
@@ -17,8 +17,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#ifndef PCAModelFactory_h
-#define PCAModelFactory_h
+#ifndef otbPCAModelFactory_h
+#define otbPCAModelFactory_h
 
 
 #include "itkObjectFactoryBase.h"
diff --git a/Modules/Learning/DimensionalityReductionLearning/include/otbPCAModelFactory.txx b/Modules/Learning/DimensionalityReductionLearning/include/otbPCAModelFactory.txx
index 05c59b292e5a95b424be63f42b1fab3e842480f4..aeafff621de714ed92394f4e66b7cfb718c81225 100644
--- a/Modules/Learning/DimensionalityReductionLearning/include/otbPCAModelFactory.txx
+++ b/Modules/Learning/DimensionalityReductionLearning/include/otbPCAModelFactory.txx
@@ -17,8 +17,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#ifndef PCAFactory_txx
-#define PCAFactory_txx
+#ifndef otbPCAFactory_txx
+#define otbPCAFactory_txx
 
 
 #include "otbPCAModelFactory.h"
diff --git a/Modules/Learning/DimensionalityReductionLearning/include/otbSOMModel.h b/Modules/Learning/DimensionalityReductionLearning/include/otbSOMModel.h
index 62b013eda52d1c8b06dbf0b336a68ba5307d4c63..1025ab0e6c9728f403a61dfea7d5e4e9a4e8616b 100644
--- a/Modules/Learning/DimensionalityReductionLearning/include/otbSOMModel.h
+++ b/Modules/Learning/DimensionalityReductionLearning/include/otbSOMModel.h
@@ -17,8 +17,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#ifndef SOMModel_h
-#define SOMModel_h
+#ifndef otbSOMModel_h
+#define otbSOMModel_h
 
 //#include "DimensionalityReductionModel.h"
 #include "otbSOMMap.h"
diff --git a/Modules/Learning/DimensionalityReductionLearning/include/otbSOMModelFactory.txx b/Modules/Learning/DimensionalityReductionLearning/include/otbSOMModelFactory.txx
index 0f87ffcde35b603cbf69e164898f90063771e287..bcef5c92a418194ea7698d5f0d733bbb11692bf7 100644
--- a/Modules/Learning/DimensionalityReductionLearning/include/otbSOMModelFactory.txx
+++ b/Modules/Learning/DimensionalityReductionLearning/include/otbSOMModelFactory.txx
@@ -17,8 +17,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#ifndef SOMFactory_txx
-#define SOMFactory_txx
+#ifndef otbSOMFactory_txx
+#define otbSOMFactory_txx
 
 
 #include "otbSOMModelFactory.h"