From 82842d151f50c1f9bae34e95dd031131f734734e Mon Sep 17 00:00:00 2001
From: Manuel Grizonnet <manuel.grizonnet@cnes.fr>
Date: Mon, 13 Jun 2016 15:43:26 +0200
Subject: [PATCH] ENH: Remove double underscore in header guards (.txx &
 __otb*_h form)

Used the following command:

find . \( -iname *.txx -and ! -path *ThirdParty* \) -exec perl -pi -w -e 's/__otb(.*)_txx/otb$1_txx/g;' {} \;
find . \( -iname *.h -and ! -path *ThirdParty* \) -exec perl -pi -w -e 's/__otb(.*)_h/otb$1_h/g;' {} \;

Fixes many, but not all, clang -Wreserved-id-macro warnings.
---
 Modules/Adapters/BoostAdapters/include/otbBoostDox.h        | 6 +++---
 Modules/Adapters/BoostAdapters/include/otbJoinContainer.h   | 6 +++---
 Modules/Adapters/CurlAdapters/include/otbCurlHelper.h       | 4 ++--
 .../Adapters/CurlAdapters/include/otbCurlHelperInterface.h  | 4 ++--
 Modules/Adapters/CurlAdapters/include/otbCurlHelperStub.h   | 4 ++--
 .../Adapters/GdalAdapters/include/otbGdalDataTypeBridge.h   | 4 ++--
 Modules/Adapters/GdalAdapters/include/otbGeometriesSet.h    | 6 +++---
 Modules/Adapters/GdalAdapters/include/otbGeometriesSource.h | 6 +++---
 .../GdalAdapters/include/otbGeometriesToGeometriesFilter.h  | 6 +++---
 Modules/Adapters/GdalAdapters/include/otbImageReference.h   | 6 +++---
 Modules/Adapters/GdalAdapters/include/otbOGR.h              | 6 +++---
 .../Adapters/GdalAdapters/include/otbOGRDataSourceWrapper.h | 6 +++---
 .../GdalAdapters/include/otbOGRDataSourceWrapper.txx        | 6 +++---
 Modules/Adapters/GdalAdapters/include/otbOGRDriversInit.h   | 6 +++---
 .../Adapters/GdalAdapters/include/otbOGRFeatureWrapper.h    | 6 +++---
 .../Adapters/GdalAdapters/include/otbOGRFeatureWrapper.txx  | 6 +++---
 Modules/Adapters/GdalAdapters/include/otbOGRFieldWrapper.h  | 6 +++---
 .../Adapters/GdalAdapters/include/otbOGRFieldWrapper.txx    | 6 +++---
 .../Adapters/GdalAdapters/include/otbOGRGeometriesVisitor.h | 6 +++---
 .../Adapters/GdalAdapters/include/otbOGRGeometryWrapper.h   | 6 +++---
 Modules/Adapters/GdalAdapters/include/otbOGRHelpers.h       | 6 +++---
 Modules/Adapters/GdalAdapters/include/otbOGRLayerWrapper.h  | 6 +++---
 Modules/Adapters/GdalAdapters/include/otbOGRVersionProxy.h  | 4 ++--
 .../Adapters/OSSIMAdapters/include/otbDEMConvertAdapter.h   | 4 ++--
 Modules/Adapters/OSSIMAdapters/include/otbDEMHandler.h      | 4 ++--
 Modules/Adapters/OSSIMAdapters/include/otbDateTimeAdapter.h | 4 ++--
 .../Adapters/OSSIMAdapters/include/otbEllipsoidAdapter.h    | 4 ++--
 .../OSSIMAdapters/include/otbFilterFunctionValues.h         | 4 ++--
 .../include/otbGeometricSarSensorModelAdapter.h             | 4 ++--
 .../Adapters/OSSIMAdapters/include/otbImageKeywordlist.h    | 6 +++---
 .../OSSIMAdapters/include/otbMapProjectionAdapter.h         | 4 ++--
 Modules/Adapters/OSSIMAdapters/include/otbMetaDataKey.h     | 4 ++--
 .../OSSIMAdapters/include/otbPlatformPositionAdapter.h      | 4 ++--
 .../Adapters/OSSIMAdapters/include/otbRPCSolverAdapter.h    | 4 ++--
 .../Adapters/OSSIMAdapters/include/otbSensorModelAdapter.h  | 4 ++--
 Modules/Adapters/OpenThreadsAdapters/include/otbThreads.h   | 4 ++--
 .../AppClassification/include/otbLearningApplicationBase.h  | 4 ++--
 .../include/otbLearningApplicationBase.txx                  | 4 ++--
 .../AppClassification/include/otbTrainBoost.txx             | 4 ++--
 .../AppClassification/include/otbTrainDecisionTree.txx      | 4 ++--
 .../include/otbTrainGradientBoostedTree.txx                 | 4 ++--
 .../Applications/AppClassification/include/otbTrainKNN.txx  | 4 ++--
 .../AppClassification/include/otbTrainLibSVM.txx            | 4 ++--
 .../AppClassification/include/otbTrainNeuralNetwork.txx     | 4 ++--
 .../AppClassification/include/otbTrainNormalBayes.txx       | 4 ++--
 .../AppClassification/include/otbTrainRandomForests.txx     | 4 ++--
 .../Applications/AppClassification/include/otbTrainSVM.txx  | 4 ++--
 .../include/otbCommandLineArgumentParser.h                  | 6 +++---
 Modules/Core/Common/include/otbChannelSelectorFunctor.h     | 4 ++--
 Modules/Core/Common/include/otbCommandProgressUpdate.h      | 4 ++--
 Modules/Core/Common/include/otbCommandProgressUpdate.txx    | 4 ++--
 .../Core/Common/include/otbComplexToIntensityImageFilter.h  | 4 ++--
 .../Core/Common/include/otbComplexToVectorImageCastFilter.h | 4 ++--
 Modules/Core/Common/include/otbDecimateImageFilter.h        | 4 ++--
 Modules/Core/Common/include/otbDecimateImageFilter.txx      | 4 ++--
 Modules/Core/Common/include/otbDotProductImageFilter.h      | 4 ++--
 Modules/Core/Common/include/otbDotProductImageFilter.txx    | 4 ++--
 Modules/Core/Common/include/otbFilterWatcherBase.h          | 4 ++--
 Modules/Core/Common/include/otbFunctionToImageFilter.h      | 4 ++--
 Modules/Core/Common/include/otbFunctionToImageFilter.txx    | 4 ++--
 .../Common/include/otbImageAndVectorImageOperationFilter.h  | 4 ++--
 .../include/otbImageAndVectorImageOperationFilter.txx       | 4 ++--
 .../Core/Common/include/otbImageRegionAdaptativeSplitter.h  | 4 ++--
 .../Common/include/otbImageRegionAdaptativeSplitter.txx     | 4 ++--
 .../otbImageRegionNonUniformMultidimensionalSplitter.h      | 4 ++--
 .../otbImageRegionNonUniformMultidimensionalSplitter.txx    | 4 ++--
 .../Core/Common/include/otbImageRegionSquareTileSplitter.h  | 4 ++--
 .../Common/include/otbImageRegionSquareTileSplitter.txx     | 4 ++--
 Modules/Core/Common/include/otbImageRegionTileMapSplitter.h | 4 ++--
 .../Core/Common/include/otbImageRegionTileMapSplitter.txx   | 4 ++--
 .../include/otbImageToModulusAndDirectionImageFilter.h      | 4 ++--
 .../include/otbImageToModulusAndDirectionImageFilter.txx    | 4 ++--
 .../Common/include/otbImaginaryImageToComplexImageFilter.h  | 4 ++--
 Modules/Core/Common/include/otbImportImageFilter.h          | 4 ++--
 Modules/Core/Common/include/otbImportImageFilter.txx        | 4 ++--
 Modules/Core/Common/include/otbImportVectorImageFilter.h    | 4 ++--
 Modules/Core/Common/include/otbImportVectorImageFilter.txx  | 4 ++--
 Modules/Core/Common/include/otbMacro.h                      | 4 ++--
 Modules/Core/Common/include/otbMath.h                       | 4 ++--
 Modules/Core/Common/include/otbModelComponentBase.h         | 4 ++--
 Modules/Core/Common/include/otbModelComponentBase.txx       | 4 ++--
 .../Core/Common/include/otbQuaternaryFunctorImageFilter.h   | 4 ++--
 .../Core/Common/include/otbQuaternaryFunctorImageFilter.txx | 4 ++--
 Modules/Core/Common/include/otbRGBAPixelConverter.h         | 4 ++--
 Modules/Core/Common/include/otbRGBAPixelConverter.txx       | 4 ++--
 Modules/Core/Common/include/otbRectangle.h                  | 4 ++--
 Modules/Core/Common/include/otbRectangle.txx                | 4 ++--
 Modules/Core/Common/include/otbStandardFilterWatcher.h      | 4 ++--
 .../Core/Common/include/otbStandardOneLineFilterWatcher.h   | 4 ++--
 Modules/Core/Common/include/otbStandardWriterWatcher.h      | 4 ++--
 .../Common/include/otbSubsampledImageRegionConstIterator.h  | 4 ++--
 .../include/otbSubsampledImageRegionConstIterator.txx       | 4 ++--
 .../Core/Common/include/otbSubsampledImageRegionIterator.h  | 4 ++--
 Modules/Core/Common/include/otbSystem.h                     | 4 ++--
 Modules/Core/Common/include/otbUnaryFunctorImageFilter.h    | 4 ++--
 .../include/otbUnaryFunctorNeighborhoodVectorImageFilter.h  | 4 ++--
 .../otbUnaryFunctorNeighborhoodVectorImageFilter.txx        | 4 ++--
 .../Core/Common/include/otbUnaryFunctorVectorImageFilter.h  | 4 ++--
 .../Common/include/otbUnaryFunctorVectorImageFilter.txx     | 4 ++--
 .../otbUnaryFunctorWithIndexWithOutputSizeImageFilter.h     | 4 ++--
 .../otbUnaryFunctorWithIndexWithOutputSizeImageFilter.txx   | 4 ++--
 .../Core/Common/include/otbUniformAlphaBlendingFunctor.h    | 4 ++--
 Modules/Core/Common/include/otbUtils.h                      | 4 ++--
 .../Core/Common/include/otbVariableLengthVectorConverter.h  | 4 ++--
 .../Common/include/otbVariableLengthVectorConverter.txx     | 4 ++--
 .../Core/Common/include/otbVectorImageToASImageAdaptor.h    | 4 ++--
 .../Core/Common/include/otbVectorImageToASPixelAccessor.h   | 4 ++--
 Modules/Core/Common/include/otbWriterWatcherBase.h          | 4 ++--
 .../ComplexImage/include/otbAmplitudePhaseToRGBFunctor.h    | 4 ++--
 Modules/Core/ImageBase/include/otbConvertPixelBuffer.h      | 6 +++---
 Modules/Core/ImageBase/include/otbConvertPixelBuffer.txx    | 4 ++--
 .../Core/ImageBase/include/otbDefaultConvertPixelTraits.h   | 4 ++--
 Modules/Core/ImageBase/include/otbExtractROI.h              | 4 ++--
 Modules/Core/ImageBase/include/otbExtractROI.txx            | 4 ++--
 Modules/Core/ImageBase/include/otbExtractROIBase.h          | 4 ++--
 Modules/Core/ImageBase/include/otbExtractROIBase.txx        | 4 ++--
 Modules/Core/ImageBase/include/otbImage.h                   | 4 ++--
 Modules/Core/ImageBase/include/otbImage.txx                 | 4 ++--
 Modules/Core/ImageBase/include/otbImageFunctionAdaptor.h    | 4 ++--
 Modules/Core/ImageBase/include/otbImageFunctionAdaptor.txx  | 4 ++--
 Modules/Core/ImageBase/include/otbImageIOBase.h             | 6 +++---
 .../include/otbImageOfVectorsToMonoChannelExtractROI.h      | 4 ++--
 .../include/otbImageOfVectorsToMonoChannelExtractROI.txx    | 4 ++--
 Modules/Core/ImageBase/include/otbMetaImageFunction.h       | 4 ++--
 Modules/Core/ImageBase/include/otbMetaImageFunction.txx     | 4 ++--
 Modules/Core/ImageBase/include/otbMultiChannelExtractROI.h  | 4 ++--
 .../Core/ImageBase/include/otbMultiChannelExtractROI.txx    | 4 ++--
 .../ImageBase/include/otbMultiToMonoChannelExtractROI.h     | 4 ++--
 .../ImageBase/include/otbMultiToMonoChannelExtractROI.txx   | 4 ++--
 Modules/Core/ImageBase/include/otbRemoteSensingRegion.h     | 4 ++--
 Modules/Core/ImageBase/include/otbVectorImage.h             | 4 ++--
 Modules/Core/ImageBase/include/otbVectorImage.txx           | 4 ++--
 .../Interpolation/include/otbBCOInterpolateImageFunction.h  | 4 ++--
 .../include/otbBCOInterpolateImageFunction.txx              | 4 ++--
 .../include/otbBSplineDecompositionImageFilter.h            | 4 ++--
 .../include/otbBSplineDecompositionImageFilter.txx          | 4 ++--
 .../include/otbBSplineInterpolateImageFunction.h            | 4 ++--
 .../include/otbBSplineInterpolateImageFunction.txx          | 4 ++--
 .../include/otbGenericInterpolateImageFunction.h            | 4 ++--
 .../include/otbGenericInterpolateImageFunction.txx          | 4 ++--
 .../include/otbProlateInterpolateImageFunction.h            | 4 ++--
 .../include/otbProlateInterpolateImageFunction.txx          | 4 ++--
 Modules/Core/Interpolation/include/otbStreamingTraits.h     | 4 ++--
 Modules/Core/Interpolation/include/otbStreamingTraits.txx   | 4 ++--
 .../otbWindowedSincInterpolateImageBlackmanFunction.h       | 4 ++--
 .../include/otbWindowedSincInterpolateImageCosineFunction.h | 4 ++--
 .../include/otbWindowedSincInterpolateImageFunctionBase.h   | 4 ++--
 .../include/otbWindowedSincInterpolateImageFunctionBase.txx | 4 ++--
 .../otbWindowedSincInterpolateImageGaussianFunction.h       | 4 ++--
 .../otbWindowedSincInterpolateImageHammingFunction.h        | 4 ++--
 .../otbWindowedSincInterpolateImageLanczosFunction.h        | 4 ++--
 .../include/otbWindowedSincInterpolateImageWelchFunction.h  | 4 ++--
 Modules/Core/LabelMap/include/otbAttributesMapLabelObject.h | 4 ++--
 .../include/otbAttributesMapLabelObjectWithClassLabel.h     | 4 ++--
 .../include/otbAttributesMapOpeningLabelMapFilter.h         | 6 +++---
 .../include/otbAttributesMapOpeningLabelMapFilter.txx       | 4 ++--
 .../include/otbBandsStatisticsAttributesLabelMapFilter.h    | 4 ++--
 .../include/otbBandsStatisticsAttributesLabelMapFilter.txx  | 4 ++--
 .../include/otbImageToLabelMapWithAttributesFilter.h        | 4 ++--
 .../include/otbImageToLabelMapWithAttributesFilter.txx      | 4 ++--
 .../LabelMap/include/otbKMeansAttributesLabelMapFilter.h    | 4 ++--
 .../LabelMap/include/otbKMeansAttributesLabelMapFilter.txx  | 4 ++--
 .../include/otbLabelImageToLabelMapWithAdjacencyFilter.h    | 4 ++--
 .../include/otbLabelImageToLabelMapWithAdjacencyFilter.txx  | 4 ++--
 .../include/otbLabelMapFeaturesFunctorImageFilter.h         | 4 ++--
 Modules/Core/LabelMap/include/otbLabelMapSource.h           | 6 +++---
 Modules/Core/LabelMap/include/otbLabelMapSource.txx         | 4 ++--
 .../LabelMap/include/otbLabelMapToAttributeImageFilter.h    | 4 ++--
 .../LabelMap/include/otbLabelMapToAttributeImageFilter.txx  | 4 ++--
 .../Core/LabelMap/include/otbLabelMapToLabelImageFilter.h   | 4 ++--
 .../Core/LabelMap/include/otbLabelMapToLabelImageFilter.txx | 4 ++--
 .../Core/LabelMap/include/otbLabelMapToSampleListFilter.h   | 4 ++--
 .../Core/LabelMap/include/otbLabelMapToSampleListFilter.txx | 4 ++--
 Modules/Core/LabelMap/include/otbLabelMapWithAdjacency.h    | 4 ++--
 .../otbLabelMapWithClassLabelToClassLabelImageFilter.h      | 4 ++--
 .../otbLabelMapWithClassLabelToClassLabelImageFilter.txx    | 4 ++--
 .../otbLabelMapWithClassLabelToLabeledSampleListFilter.h    | 4 ++--
 .../otbLabelMapWithClassLabelToLabeledSampleListFilter.txx  | 4 ++--
 Modules/Core/LabelMap/include/otbLabelObjectFieldsFunctor.h | 4 ++--
 .../Core/LabelMap/include/otbLabelObjectToPolygonFunctor.h  | 4 ++--
 .../LabelMap/include/otbLabelObjectToPolygonFunctor.txx     | 4 ++--
 .../include/otbLabelObjectWithClassLabelFieldsFunctor.h     | 4 ++--
 Modules/Core/LabelMap/include/otbMergeLabelObjectFunctor.h  | 4 ++--
 .../LabelMap/include/otbMinMaxAttributesLabelMapFilter.h    | 4 ++--
 .../LabelMap/include/otbMinMaxAttributesLabelMapFilter.txx  | 4 ++--
 .../LabelMap/include/otbNormalizeAttributesLabelMapFilter.h | 4 ++--
 .../include/otbNormalizeAttributesLabelMapFilter.txx        | 4 ++--
 .../LabelMap/include/otbShapeAttributesLabelMapFilter.h     | 4 ++--
 .../LabelMap/include/otbShapeAttributesLabelMapFilter.txx   | 4 ++--
 .../include/otbStatisticsAttributesLabelMapFilter.h         | 4 ++--
 .../include/otbStatisticsAttributesLabelMapFilter.txx       | 4 ++--
 Modules/Core/Metadata/include/otbBandName.h                 | 4 ++--
 .../Metadata/include/otbDefaultImageMetadataInterface.h     | 4 ++--
 .../include/otbDefaultImageMetadataInterfaceFactory.h       | 4 ++--
 .../Metadata/include/otbFormosatImageMetadataInterface.h    | 4 ++--
 .../include/otbFormosatImageMetadataInterfaceFactory.h      | 4 ++--
 .../Core/Metadata/include/otbIkonosImageMetadataInterface.h | 4 ++--
 .../include/otbIkonosImageMetadataInterfaceFactory.h        | 4 ++--
 .../Core/Metadata/include/otbImageMetadataInterfaceBase.h   | 4 ++--
 .../Metadata/include/otbImageMetadataInterfaceFactory.h     | 4 ++--
 Modules/Core/Metadata/include/otbNoDataHelper.h             | 4 ++--
 .../include/otbOpticalDefaultImageMetadataInterface.h       | 4 ++--
 .../otbOpticalDefaultImageMetadataInterfaceFactory.h        | 4 ++--
 .../Metadata/include/otbOpticalImageMetadataInterface.h     | 4 ++--
 .../include/otbOpticalImageMetadataInterfaceFactory.h       | 4 ++--
 .../Metadata/include/otbPleiadesImageMetadataInterface.h    | 4 ++--
 .../include/otbPleiadesImageMetadataInterfaceFactory.h      | 4 ++--
 .../Metadata/include/otbQuickBirdImageMetadataInterface.h   | 4 ++--
 .../include/otbQuickBirdImageMetadataInterfaceFactory.h     | 4 ++--
 .../Metadata/include/otbRadarsat2ImageMetadataInterface.h   | 4 ++--
 .../include/otbRadarsat2ImageMetadataInterfaceFactory.h     | 4 ++--
 .../Metadata/include/otbSarDefaultImageMetadataInterface.h  | 4 ++--
 .../include/otbSarDefaultImageMetadataInterfaceFactory.h    | 4 ++--
 .../Core/Metadata/include/otbSarImageMetadataInterface.h    | 4 ++--
 .../Metadata/include/otbSarImageMetadataInterfaceFactory.h  | 4 ++--
 .../Metadata/include/otbSentinel1ImageMetadataInterface.h   | 4 ++--
 .../include/otbSentinel1ImageMetadataInterfaceFactory.h     | 4 ++--
 .../Core/Metadata/include/otbSpot6ImageMetadataInterface.h  | 4 ++--
 .../include/otbSpot6ImageMetadataInterfaceFactory.h         | 4 ++--
 .../Core/Metadata/include/otbSpotImageMetadataInterface.h   | 4 ++--
 .../Metadata/include/otbSpotImageMetadataInterfaceFactory.h | 4 ++--
 .../Metadata/include/otbTerraSarImageMetadataInterface.h    | 4 ++--
 .../include/otbTerraSarImageMetadataInterfaceFactory.h      | 4 ++--
 .../Metadata/include/otbWorldView2ImageMetadataInterface.h  | 4 ++--
 .../include/otbWorldView2ImageMetadataInterfaceFactory.h    | 4 ++--
 Modules/Core/ObjectList/include/otbImageList.h              | 4 ++--
 Modules/Core/ObjectList/include/otbImageList.txx            | 4 ++--
 Modules/Core/ObjectList/include/otbImageListSource.h        | 4 ++--
 Modules/Core/ObjectList/include/otbImageListSource.txx      | 4 ++--
 Modules/Core/ObjectList/include/otbImageListToImageFilter.h | 4 ++--
 .../Core/ObjectList/include/otbImageListToImageFilter.txx   | 4 ++--
 .../ObjectList/include/otbImageListToImageListApplyFilter.h | 4 ++--
 .../include/otbImageListToImageListApplyFilter.txx          | 4 ++--
 .../Core/ObjectList/include/otbImageListToImageListFilter.h | 4 ++--
 .../ObjectList/include/otbImageListToImageListFilter.txx    | 4 ++--
 .../ObjectList/include/otbImageListToSingleImageFilter.h    | 4 ++--
 .../ObjectList/include/otbImageListToSingleImageFilter.txx  | 4 ++--
 .../ObjectList/include/otbImageListToVectorImageFilter.h    | 4 ++--
 .../ObjectList/include/otbImageListToVectorImageFilter.txx  | 4 ++--
 Modules/Core/ObjectList/include/otbImageToImageListFilter.h | 4 ++--
 .../Core/ObjectList/include/otbImageToImageListFilter.txx   | 4 ++--
 Modules/Core/ObjectList/include/otbObjectList.h             | 4 ++--
 Modules/Core/ObjectList/include/otbObjectList.txx           | 4 ++--
 Modules/Core/ObjectList/include/otbObjectListSource.h       | 4 ++--
 Modules/Core/ObjectList/include/otbObjectListSource.txx     | 4 ++--
 .../ObjectList/include/otbObjectListToObjectListFilter.h    | 4 ++--
 .../ObjectList/include/otbObjectListToObjectListFilter.txx  | 4 ++--
 .../include/otbUnaryFunctorObjectListBooleanFilter.h        | 4 ++--
 .../include/otbUnaryFunctorObjectListBooleanFilter.txx      | 4 ++--
 .../ObjectList/include/otbUnaryFunctorObjectListFilter.h    | 4 ++--
 .../ObjectList/include/otbUnaryFunctorObjectListFilter.txx  | 4 ++--
 .../ObjectList/include/otbVectorImageToImageListFilter.h    | 4 ++--
 .../ObjectList/include/otbVectorImageToImageListFilter.txx  | 4 ++--
 Modules/Core/PointSet/include/otbImageToPointSetFilter.h    | 4 ++--
 Modules/Core/PointSet/include/otbImageToPointSetFilter.txx  | 4 ++--
 .../Core/PointSet/include/otbPointSetAndValuesFunction.h    | 4 ++--
 Modules/Core/PointSet/include/otbPointSetExtractROI.h       | 4 ++--
 Modules/Core/PointSet/include/otbPointSetExtractROI.txx     | 4 ++--
 Modules/Core/PointSet/include/otbPointSetFunction.h         | 4 ++--
 Modules/Core/PointSet/include/otbPointSetFunction.txx       | 4 ++--
 Modules/Core/PointSet/include/otbPointSetSource.h           | 4 ++--
 Modules/Core/PointSet/include/otbPointSetSource.txx         | 4 ++--
 Modules/Core/PointSet/include/otbPointSetToPointSetFilter.h | 4 ++--
 .../Core/PointSet/include/otbPointSetToPointSetFilter.txx   | 4 ++--
 Modules/Core/PointSet/include/otbRandomPointSetSource.h     | 4 ++--
 Modules/Core/PointSet/include/otbRandomPointSetSource.txx   | 4 ++--
 Modules/Core/PointSet/include/otbSimplePointCountStrategy.h | 4 ++--
 .../PointSet/include/otbThresholdImageToPointSetFilter.h    | 4 ++--
 .../PointSet/include/otbThresholdImageToPointSetFilter.txx  | 4 ++--
 Modules/Core/PointSet/include/otbTransformPointSetFilter.h  | 4 ++--
 .../Core/PointSet/include/otbTransformPointSetFilter.txx    | 4 ++--
 .../SpatialObjects/include/otbDrawLineSpatialObjectFilter.h | 4 ++--
 .../include/otbDrawLineSpatialObjectFilter.txx              | 4 ++--
 .../include/otbDrawLineSpatialObjectListFilter.h            | 4 ++--
 .../include/otbDrawLineSpatialObjectListFilter.txx          | 4 ++--
 .../include/otbImageToLineSpatialObjectListFilter.h         | 4 ++--
 .../include/otbImageToLineSpatialObjectListFilter.txx       | 4 ++--
 Modules/Core/SpatialObjects/include/otbLineSpatialObject.h  | 4 ++--
 .../Core/SpatialObjects/include/otbLineSpatialObject.txx    | 4 ++--
 .../Core/SpatialObjects/include/otbLineSpatialObjectList.h  | 4 ++--
 .../include/otbLineSpatialObjectListToPointSetFilter.h      | 4 ++--
 .../include/otbLineSpatialObjectListToPointSetFilter.txx    | 4 ++--
 .../Core/SpatialObjects/include/otbSpatialObjectSource.h    | 4 ++--
 .../Core/SpatialObjects/include/otbSpatialObjectSource.txx  | 4 ++--
 .../include/otbSpatialObjectToImageDrawingFilter.h          | 4 ++--
 .../include/otbSpatialObjectToImageDrawingFilter.txx        | 4 ++--
 .../include/otbNumberOfDivisionsStrippedStreamingManager.h  | 4 ++--
 .../otbNumberOfDivisionsStrippedStreamingManager.txx        | 4 ++--
 .../include/otbNumberOfDivisionsTiledStreamingManager.h     | 4 ++--
 .../include/otbNumberOfDivisionsTiledStreamingManager.txx   | 4 ++--
 .../include/otbNumberOfLinesStrippedStreamingManager.h      | 4 ++--
 .../include/otbNumberOfLinesStrippedStreamingManager.txx    | 4 ++--
 .../include/otbPersistentFilterStreamingDecorator.h         | 4 ++--
 .../include/otbPersistentFilterStreamingDecorator.txx       | 4 ++--
 Modules/Core/Streaming/include/otbPersistentImageFilter.h   | 4 ++--
 .../Streaming/include/otbPipelineMemoryPrintCalculator.h    | 4 ++--
 .../include/otbRAMDrivenAdaptativeStreamingManager.h        | 4 ++--
 .../include/otbRAMDrivenAdaptativeStreamingManager.txx      | 4 ++--
 .../include/otbRAMDrivenStrippedStreamingManager.h          | 4 ++--
 .../include/otbRAMDrivenStrippedStreamingManager.txx        | 4 ++--
 .../Streaming/include/otbRAMDrivenTiledStreamingManager.h   | 4 ++--
 .../Streaming/include/otbRAMDrivenTiledStreamingManager.txx | 4 ++--
 .../Core/Streaming/include/otbStreamingImageVirtualWriter.h | 4 ++--
 .../Streaming/include/otbStreamingImageVirtualWriter.txx    | 4 ++--
 Modules/Core/Streaming/include/otbStreamingManager.h        | 4 ++--
 Modules/Core/Streaming/include/otbStreamingManager.txx      | 4 ++--
 .../include/otbTileDimensionTiledStreamingManager.h         | 4 ++--
 .../include/otbTileDimensionTiledStreamingManager.txx       | 4 ++--
 Modules/Core/Transform/include/otbCompositeTransform.h      | 4 ++--
 Modules/Core/Transform/include/otbCompositeTransform.txx    | 4 ++--
 Modules/Core/Transform/include/otbForwardSensorModel.h      | 4 ++--
 Modules/Core/Transform/include/otbForwardSensorModel.txx    | 4 ++--
 Modules/Core/Transform/include/otbGenericMapProjection.h    | 4 ++--
 Modules/Core/Transform/include/otbGenericMapProjection.txx  | 4 ++--
 Modules/Core/Transform/include/otbGenericRSTransform.h      | 4 ++--
 Modules/Core/Transform/include/otbGenericRSTransform.txx    | 4 ++--
 .../Core/Transform/include/otbGeoInformationConversion.h    | 4 ++--
 Modules/Core/Transform/include/otbGeocentricTransform.h     | 4 ++--
 Modules/Core/Transform/include/otbGeocentricTransform.txx   | 4 ++--
 .../Transform/include/otbImageToGenericRSOutputParameters.h | 4 ++--
 .../include/otbImageToGenericRSOutputParameters.txx         | 4 ++--
 .../Core/Transform/include/otbInverseLogPolarTransform.h    | 4 ++--
 .../Core/Transform/include/otbInverseLogPolarTransform.txx  | 4 ++--
 Modules/Core/Transform/include/otbInverseSensorModel.h      | 4 ++--
 Modules/Core/Transform/include/otbInverseSensorModel.txx    | 4 ++--
 Modules/Core/Transform/include/otbLogPolarTransform.h       | 4 ++--
 Modules/Core/Transform/include/otbLogPolarTransform.txx     | 4 ++--
 Modules/Core/Transform/include/otbSensorModelBase.h         | 4 ++--
 Modules/Core/Transform/include/otbSensorModelBase.txx       | 4 ++--
 .../Core/Transform/include/otbStreamingWarpImageFilter.h    | 4 ++--
 .../Core/Transform/include/otbStreamingWarpImageFilter.txx  | 4 ++--
 Modules/Core/Transform/include/otbTransform.h               | 4 ++--
 Modules/Core/VectorDataBase/include/otbDataNode.h           | 4 ++--
 Modules/Core/VectorDataBase/include/otbDataNode.txx         | 4 ++--
 .../Core/VectorDataBase/include/otbDataNodeFunctionBase.h   | 4 ++--
 .../Core/VectorDataBase/include/otbDataNodeImageFunction.h  | 4 ++--
 .../VectorDataBase/include/otbDataNodeImageFunction.txx     | 4 ++--
 .../VectorDataBase/include/otbDataNodeVectorDataFunction.h  | 4 ++--
 .../include/otbDataNodeVectorDataFunction.txx               | 4 ++--
 .../VectorDataBase/include/otbGISConnectionImplementation.h | 4 ++--
 .../include/otbPolyLineParametricPathWithValue.h            | 4 ++--
 .../include/otbPolyLineParametricPathWithValue.txx          | 4 ++--
 Modules/Core/VectorDataBase/include/otbPolygon.h            | 4 ++--
 Modules/Core/VectorDataBase/include/otbPolygon.txx          | 4 ++--
 Modules/Core/VectorDataBase/include/otbVectorData.h         | 4 ++--
 Modules/Core/VectorDataBase/include/otbVectorData.txx       | 4 ++--
 Modules/Core/VectorDataBase/include/otbVectorDataIOBase.h   | 6 +++---
 .../Core/VectorDataBase/include/otbVectorDataKeywordlist.h  | 4 ++--
 .../Core/VectorDataBase/include/otbVectorDataProperties.h   | 4 ++--
 .../Core/VectorDataBase/include/otbVectorDataProperties.txx | 4 ++--
 Modules/Core/VectorDataBase/include/otbVectorDataSource.h   | 6 +++---
 Modules/Core/VectorDataBase/include/otbVectorDataSource.txx | 4 ++--
 .../CloudDetection/include/otbCloudDetectionFilter.h        | 4 ++--
 .../CloudDetection/include/otbCloudDetectionFilter.txx      | 4 ++--
 .../CloudDetection/include/otbCloudDetectionFunctor.h       | 4 ++--
 .../CloudDetection/include/otbCloudEstimatorFilter.h        | 4 ++--
 .../CloudDetection/include/otbCloudEstimatorFilter.txx      | 4 ++--
 .../CloudDetection/include/otbCloudEstimatorFunctor.h       | 4 ++--
 .../include/otbDescriptorsListSampleGenerator.h             | 4 ++--
 .../include/otbDescriptorsListSampleGenerator.txx           | 4 ++--
 .../ObjectDetection/include/otbFlusserMomentsIFFactory.h    | 4 ++--
 .../ObjectDetection/include/otbFlusserMomentsIFFactory.txx  | 4 ++--
 .../include/otbFourierMellinDescriptorsIFFactory.h          | 4 ++--
 .../include/otbFourierMellinDescriptorsIFFactory.txx        | 4 ++--
 .../ObjectDetection/include/otbHaralickTexturesIFFactory.h  | 4 ++--
 .../include/otbHaralickTexturesIFFactory.txx                | 4 ++--
 .../include/otbLabeledSampleLocalizationGenerator.h         | 4 ++--
 .../include/otbLabeledSampleLocalizationGenerator.txx       | 4 ++--
 .../ObjectDetection/include/otbLocalHistogramIFFactory.h    | 4 ++--
 .../ObjectDetection/include/otbLocalHistogramIFFactory.txx  | 4 ++--
 .../ObjectDetection/include/otbMultiChannelIFFactory.h      | 4 ++--
 .../include/otbRadiometricMomentsIFFactory.h                | 4 ++--
 .../include/otbRadiometricMomentsIFFactory.txx              | 4 ++--
 .../include/otbStandardMetaImageFunctionBuilder.h           | 4 ++--
 .../include/otbStandardMetaImageFunctionBuilder.txx         | 4 ++--
 .../RoadExtraction/include/otbBreakAngularPathListFilter.h  | 4 ++--
 .../include/otbBreakAngularPathListFilter.txx               | 4 ++--
 .../RoadExtraction/include/otbGenericRoadExtractionFilter.h | 4 ++--
 .../include/otbGenericRoadExtractionFilter.txx              | 4 ++--
 .../RoadExtraction/include/otbImageToPathListAlignFilter.h  | 4 ++--
 .../include/otbImageToPathListAlignFilter.txx               | 4 ++--
 .../RoadExtraction/include/otbLikelihoodPathListFilter.h    | 4 ++--
 .../RoadExtraction/include/otbLikelihoodPathListFilter.txx  | 4 ++--
 .../RoadExtraction/include/otbLinkPathListFilter.h          | 4 ++--
 .../RoadExtraction/include/otbLinkPathListFilter.txx        | 4 ++--
 .../include/otbModulusAndDirectionImageToImageFilter.h      | 4 ++--
 .../include/otbModulusAndDirectionImageToImageFilter.txx    | 4 ++--
 .../include/otbNeighborhoodScalarProductFilter.h            | 4 ++--
 .../include/otbNeighborhoodScalarProductFilter.txx          | 4 ++--
 .../include/otbNonMaxRemovalByDirectionFilter.h             | 4 ++--
 .../RoadExtraction/include/otbParallelLinePathListFilter.h  | 4 ++--
 .../include/otbParallelLinePathListFilter.txx               | 4 ++--
 .../include/otbRemoveIsolatedByDirectionFilter.h            | 4 ++--
 .../include/otbRemoveTortuousPathListFilter.h               | 4 ++--
 .../RoadExtraction/include/otbRemoveWrongDirectionFilter.h  | 4 ++--
 .../RoadExtraction/include/otbRoadExtractionFilter.h        | 4 ++--
 .../RoadExtraction/include/otbRoadExtractionFilter.txx      | 4 ++--
 .../RoadExtraction/include/otbSimplifyPathListFilter.h      | 4 ++--
 .../include/otbVectorDataToRoadDescriptionFilter.h          | 4 ++--
 .../include/otbVectorDataToRoadDescriptionFilter.txx        | 4 ++--
 .../UrbanArea/include/otbUrbanAreaDetectionImageFilter.h    | 4 ++--
 .../UrbanArea/include/otbUrbanAreaDetectionImageFilter.txx  | 4 ++--
 Modules/Feature/Corner/include/otbHarrisImageFilter.h       | 4 ++--
 Modules/Feature/Corner/include/otbHarrisImageFilter.txx     | 4 ++--
 .../Feature/Corner/include/otbHarrisImageToPointSetFilter.h | 4 ++--
 .../Corner/include/otbHarrisImageToPointSetFilter.txx       | 4 ++--
 .../otbLineSpatialObjectListToRightAnglePointSetFilter.h    | 4 ++--
 .../otbLineSpatialObjectListToRightAnglePointSetFilter.txx  | 4 ++--
 .../include/otbVectorDataToRightAngleVectorDataFilter.h     | 4 ++--
 .../include/otbVectorDataToRightAngleVectorDataFilter.txx   | 4 ++--
 .../Feature/Density/include/otbKeyPointDensityImageFilter.h | 4 ++--
 .../Density/include/otbKeyPointDensityImageFilter.txx       | 4 ++--
 .../include/otbPointSetDensityEpanechnikovFunction.h        | 4 ++--
 .../include/otbPointSetDensityEpanechnikovFunction.txx      | 4 ++--
 .../Feature/Density/include/otbPointSetDensityFunction.h    | 4 ++--
 .../Feature/Density/include/otbPointSetDensityFunction.txx  | 4 ++--
 .../Density/include/otbPointSetDensityGaussianFunction.h    | 4 ++--
 .../Density/include/otbPointSetDensityGaussianFunction.txx  | 4 ++--
 .../Density/include/otbPointSetToDensityImageFilter.h       | 4 ++--
 .../Density/include/otbPointSetToDensityImageFilter.txx     | 4 ++--
 .../include/otbForwardFourierMellinTransformImageFilter.h   | 4 ++--
 .../include/otbForwardFourierMellinTransformImageFilter.txx | 4 ++--
 .../include/otbFourierMellinDescriptorsImageFunction.h      | 4 ++--
 .../include/otbFourierMellinDescriptorsImageFunction.txx    | 4 ++--
 .../Descriptors/include/otbHessianToScalarImageFilter.h     | 4 ++--
 .../otbHistogramOfOrientedGradientCovariantImageFunction.h  | 4 ++--
 ...otbHistogramOfOrientedGradientCovariantImageFunction.txx | 4 ++--
 .../include/otbImageToHessianDeterminantImageFilter.h       | 4 ++--
 .../include/otbImageToHessianDeterminantImageFilter.txx     | 4 ++--
 .../Descriptors/include/otbImageToSIFTKeyPointSetFilter.h   | 4 ++--
 .../Descriptors/include/otbImageToSIFTKeyPointSetFilter.txx | 4 ++--
 .../Descriptors/include/otbImageToSURFKeyPointSetFilter.h   | 4 ++--
 .../Descriptors/include/otbImageToSURFKeyPointSetFilter.txx | 4 ++--
 .../Descriptors/include/otbKeyPointSetsMatchingFilter.h     | 4 ++--
 .../Descriptors/include/otbKeyPointSetsMatchingFilter.txx   | 4 ++--
 Modules/Feature/Descriptors/include/otbLandmark.h           | 4 ++--
 .../Feature/Descriptors/include/otbSiftFastImageFilter.h    | 4 ++--
 .../Feature/Descriptors/include/otbSiftFastImageFilter.txx  | 4 ++--
 .../Edge/include/otbAssociativeSymmetricalSumImageFilter.h  | 4 ++--
 .../include/otbAssymmetricFusionOfLineDetectorImageFilter.h | 4 ++--
 .../otbAssymmetricFusionOfLineDetectorImageFilter.txx       | 4 ++--
 Modules/Feature/Edge/include/otbEdgeDensityImageFilter.h    | 4 ++--
 Modules/Feature/Edge/include/otbEdgeDensityImageFilter.txx  | 4 ++--
 Modules/Feature/Edge/include/otbEdgeDetectorImageFilter.h   | 4 ++--
 Modules/Feature/Edge/include/otbEdgeDetectorImageFilter.txx | 4 ++--
 .../Feature/Edge/include/otbExtractSegmentsImageFilter.h    | 4 ++--
 .../Feature/Edge/include/otbExtractSegmentsImageFilter.txx  | 4 ++--
 Modules/Feature/Edge/include/otbFillGapsFilter.h            | 4 ++--
 .../Edge/include/otbHorizontalSobelVectorImageFilter.h      | 6 +++---
 .../Edge/include/otbHoughTransform2DLinesImageFilter.h      | 4 ++--
 .../Edge/include/otbHoughTransform2DLinesImageFilter.txx    | 4 ++--
 .../Edge/include/otbLineCorrelationDetectorImageFilter.h    | 4 ++--
 .../Edge/include/otbLineCorrelationDetectorImageFilter.txx  | 4 ++--
 .../Feature/Edge/include/otbLineDetectorImageFilterBase.h   | 4 ++--
 .../Feature/Edge/include/otbLineDetectorImageFilterBase.txx | 4 ++--
 .../Feature/Edge/include/otbLineRatioDetectorImageFilter.h  | 4 ++--
 .../Edge/include/otbLineRatioDetectorImageFilter.txx        | 4 ++--
 Modules/Feature/Edge/include/otbLineSegmentDetector.h       | 4 ++--
 Modules/Feature/Edge/include/otbLineSegmentDetector.txx     | 4 ++--
 Modules/Feature/Edge/include/otbLocalHoughFilter.h          | 4 ++--
 Modules/Feature/Edge/include/otbLocalHoughFilter.txx        | 4 ++--
 .../Edge/include/otbPersistentVectorizationImageFilter.h    | 4 ++--
 .../Edge/include/otbPersistentVectorizationImageFilter.txx  | 4 ++--
 .../include/otbPixelSuppressionByDirectionImageFilter.h     | 4 ++--
 .../include/otbPixelSuppressionByDirectionImageFilter.txx   | 4 ++--
 Modules/Feature/Edge/include/otbSobelVectorImageFilter.h    | 6 +++---
 .../Feature/Edge/include/otbStreamingLineSegmentDetector.h  | 4 ++--
 .../Edge/include/otbStreamingLineSegmentDetector.txx        | 4 ++--
 .../Feature/Edge/include/otbTouziEdgeDetectorImageFilter.h  | 4 ++--
 .../Edge/include/otbTouziEdgeDetectorImageFilter.txx        | 4 ++--
 .../Edge/include/otbVerticalSobelVectorImageFilter.h        | 6 +++---
 .../Feature/Moments/include/otbComplexMomentPathFunction.h  | 4 ++--
 .../Moments/include/otbComplexMomentPathFunction.txx        | 4 ++--
 .../Moments/include/otbComplexMomentsImageFunction.h        | 4 ++--
 .../Moments/include/otbComplexMomentsImageFunction.txx      | 4 ++--
 .../Moments/include/otbFlusserMomentsImageFunction.h        | 4 ++--
 .../Moments/include/otbFlusserMomentsImageFunction.txx      | 4 ++--
 Modules/Feature/Moments/include/otbFlusserPathFunction.h    | 4 ++--
 Modules/Feature/Moments/include/otbFlusserPathFunction.txx  | 4 ++--
 .../Moments/include/otbGeometricMomentPathFunction.h        | 4 ++--
 Modules/Feature/Moments/include/otbHuMomentsImageFunction.h | 4 ++--
 .../Feature/Moments/include/otbHuMomentsImageFunction.txx   | 4 ++--
 Modules/Feature/Moments/include/otbHuPathFunction.h         | 4 ++--
 Modules/Feature/Moments/include/otbHuPathFunction.txx       | 4 ++--
 .../Feature/Moments/include/otbRadiometricMomentsFunctor.h  | 4 ++--
 .../Moments/include/otbRadiometricMomentsImageFilter.h      | 4 ++--
 .../Moments/include/otbRadiometricMomentsImageFilter.txx    | 4 ++--
 .../Moments/include/otbRadiometricMomentsImageFunction.h    | 4 ++--
 .../Moments/include/otbRadiometricMomentsImageFunction.txx  | 4 ++--
 Modules/Feature/Moments/include/otbRealMomentPathFunction.h | 4 ++--
 .../Feature/Moments/include/otbRealMomentsImageFunction.h   | 4 ++--
 .../Feature/Moments/include/otbRealMomentsImageFunction.txx | 4 ++--
 .../Feature/SeamCarving/include/otbAddCarvingPathFilter.h   | 4 ++--
 .../Feature/SeamCarving/include/otbAddCarvingPathFilter.txx | 4 ++--
 .../SeamCarving/include/otbImageToCarvingPathFilter.h       | 4 ++--
 .../SeamCarving/include/otbImageToCarvingPathFilter.txx     | 4 ++--
 .../SeamCarving/include/otbRemoveCarvingPathFilter.h        | 4 ++--
 .../SeamCarving/include/otbRemoveCarvingPathFilter.txx      | 4 ++--
 .../Textures/include/otbGreyLevelCooccurrenceIndexedList.h  | 4 ++--
 .../include/otbGreyLevelCooccurrenceIndexedList.txx         | 4 ++--
 .../Textures/include/otbHaralickTexturesImageFunction.h     | 4 ++--
 .../Textures/include/otbHaralickTexturesImageFunction.txx   | 4 ++--
 Modules/Feature/Textures/include/otbSFSTexturesFunctor.h    | 4 ++--
 .../Feature/Textures/include/otbSFSTexturesImageFilter.h    | 4 ++--
 .../Feature/Textures/include/otbSFSTexturesImageFilter.txx  | 4 ++--
 .../include/otbScalarImageToAdvancedTexturesFilter.h        | 4 ++--
 .../include/otbScalarImageToAdvancedTexturesFilter.txx      | 4 ++--
 .../include/otbScalarImageToHigherOrderTexturesFilter.h     | 4 ++--
 .../include/otbScalarImageToHigherOrderTexturesFilter.txx   | 4 ++--
 .../Textures/include/otbScalarImageToPanTexTextureFilter.h  | 4 ++--
 .../include/otbScalarImageToPanTexTextureFilter.txx         | 4 ++--
 .../Textures/include/otbScalarImageToTexturesFilter.h       | 4 ++--
 .../Textures/include/otbScalarImageToTexturesFilter.txx     | 4 ++--
 Modules/Feature/Textures/include/otbTextureImageFunction.h  | 4 ++--
 .../Feature/Textures/include/otbTextureImageFunction.txx    | 4 ++--
 .../otbBinaryFunctorNeighborhoodJoinHistogramImageFilter.h  | 4 ++--
 ...otbBinaryFunctorNeighborhoodJoinHistogramImageFilter.txx | 4 ++--
 Modules/Filtering/ChangeDetection/include/otbCBAMI.h        | 4 ++--
 .../ChangeDetection/include/otbCBAMIChangeDetector.h        | 4 ++--
 .../ChangeDetection/include/otbCorrelationChangeDetector.h  | 4 ++--
 .../Filtering/ChangeDetection/include/otbCrossCorrelation.h | 4 ++--
 .../Filtering/ChangeDetection/include/otbJoinHistogramMI.h  | 4 ++--
 .../ChangeDetection/include/otbJoinHistogramMIImageFilter.h | 4 ++--
 .../include/otbKullbackLeiblerDistanceImageFilter.h         | 4 ++--
 .../include/otbKullbackLeiblerDistanceImageFilter.txx       | 4 ++--
 .../include/otbKullbackLeiblerProfileImageFilter.h          | 4 ++--
 .../include/otbKullbackLeiblerProfileImageFilter.txx        | 4 ++--
 .../otbKullbackLeiblerSupervizedDistanceImageFilter.h       | 4 ++--
 .../otbKullbackLeiblerSupervizedDistanceImageFilter.txx     | 4 ++--
 Modules/Filtering/ChangeDetection/include/otbLHMI.h         | 4 ++--
 .../ChangeDetection/include/otbLHMIChangeDetector.h         | 4 ++--
 .../Filtering/ChangeDetection/include/otbMeanDifference.h   | 4 ++--
 .../ChangeDetection/include/otbMeanDifferenceImageFilter.h  | 4 ++--
 Modules/Filtering/ChangeDetection/include/otbMeanRatio.h    | 4 ++--
 .../ChangeDetection/include/otbMeanRatioImageFilter.h       | 4 ++--
 .../include/otbMultivariateAlterationDetectorImageFilter.h  | 4 ++--
 .../otbMultivariateAlterationDetectorImageFilter.txx        | 4 ++--
 .../Filtering/ColorMap/include/otbReliefColormapFunctor.h   | 4 ++--
 .../Filtering/ColorMap/include/otbReliefColormapFunctor.txx | 4 ++--
 .../ColorMap/include/otbScalarToRainbowRGBPixelFunctor.h    | 4 ++--
 .../ColorMap/include/otbScalarToRainbowRGBPixelFunctor.txx  | 4 ++--
 .../Convolution/include/otbConvolutionImageFilter.h         | 4 ++--
 .../Convolution/include/otbConvolutionImageFilter.txx       | 4 ++--
 .../Filtering/Convolution/include/otbGaborFilterGenerator.h | 4 ++--
 .../Convolution/include/otbGaborFilterGenerator.txx         | 4 ++--
 .../include/otbOverlapSaveConvolutionImageFilter.h          | 4 ++--
 .../include/otbOverlapSaveConvolutionImageFilter.txx        | 4 ++--
 .../Filtering/DEM/include/otbDEMCaracteristicsExtractor.h   | 4 ++--
 .../Filtering/DEM/include/otbDEMCaracteristicsExtractor.txx | 4 ++--
 Modules/Filtering/DEM/include/otbDEMToImageGenerator.h      | 4 ++--
 Modules/Filtering/DEM/include/otbDEMToImageGenerator.txx    | 4 ++--
 .../include/otbAngularProjectionBinaryImageFilter.h         | 4 ++--
 .../include/otbAngularProjectionBinaryImageFilter.txx       | 4 ++--
 .../include/otbAngularProjectionImageFilter.h               | 4 ++--
 .../include/otbAngularProjectionImageFilter.txx             | 4 ++--
 .../include/otbAngularProjectionSetImageFilter.h            | 4 ++--
 .../include/otbAngularProjectionSetImageFilter.txx          | 4 ++--
 .../include/otbEstimateInnerProductPCAImageFilter.h         | 4 ++--
 .../include/otbEstimateInnerProductPCAImageFilter.txx       | 4 ++--
 .../DimensionalityReduction/include/otbFastICAImageFilter.h | 4 ++--
 .../include/otbFastICAImageFilter.txx                       | 4 ++--
 .../include/otbFastICAInternalOptimizerVectorImageFilter.h  | 4 ++--
 .../otbFastICAInternalOptimizerVectorImageFilter.txx        | 4 ++--
 .../include/otbInnerProductPCAImageFilter.h                 | 4 ++--
 .../include/otbInnerProductPCAImageFilter.txx               | 4 ++--
 .../include/otbLocalActivityVectorImageFilter.h             | 6 +++---
 .../DimensionalityReduction/include/otbMNFImageFilter.h     | 4 ++--
 .../DimensionalityReduction/include/otbMNFImageFilter.txx   | 6 +++---
 .../include/otbMaximumAutocorrelationFactorImageFilter.h    | 4 ++--
 .../include/otbMaximumAutocorrelationFactorImageFilter.txx  | 4 ++--
 .../DimensionalityReduction/include/otbNAPCAImageFilter.h   | 4 ++--
 .../DimensionalityReduction/include/otbNAPCAImageFilter.txx | 4 ++--
 .../include/otbNormalizeInnerProductPCAImageFilter.h        | 4 ++--
 .../include/otbNormalizeInnerProductPCAImageFilter.txx      | 4 ++--
 .../DimensionalityReduction/include/otbPCAImageFilter.h     | 6 +++---
 .../DimensionalityReduction/include/otbPCAImageFilter.txx   | 6 +++---
 .../include/otbSparseWvltToAngleMapperListFilter.h          | 4 ++--
 .../include/otbSparseWvltToAngleMapperListFilter.txx        | 4 ++--
 .../Filtering/ImageManipulation/include/otbAffineFunctor.h  | 4 ++--
 .../ImageManipulation/include/otbAlphaBlendingFunctor.h     | 4 ++--
 .../ImageManipulation/include/otbAmplitudeFunctor.h         | 4 ++--
 .../include/otbBinaryFunctorNeighborhoodImageFilter.h       | 4 ++--
 .../include/otbBinaryFunctorNeighborhoodImageFilter.txx     | 4 ++--
 .../include/otbBinaryFunctorNeighborhoodVectorImageFilter.h | 4 ++--
 .../otbBinaryFunctorNeighborhoodVectorImageFilter.txx       | 4 ++--
 .../include/otbBinaryImageDensityFunction.h                 | 4 ++--
 .../include/otbBinaryImageDensityFunction.txx               | 4 ++--
 .../include/otbBinaryImageMinimalBoundingRegionCalculator.h | 4 ++--
 .../otbBinaryImageMinimalBoundingRegionCalculator.txx       | 4 ++--
 .../include/otbBinaryImageToDensityImageFilter.h            | 4 ++--
 .../include/otbBinaryImageToDensityImageFilter.txx          | 4 ++--
 .../include/otbBinarySpectralAngleFunctor.h                 | 4 ++--
 .../ImageManipulation/include/otbBoxAndWhiskerImageFilter.h | 4 ++--
 .../include/otbBoxAndWhiskerImageFilter.txx                 | 4 ++--
 .../include/otbChangeInformationImageFilter.h               | 4 ++--
 .../include/otbChangeInformationImageFilter.txx             | 4 ++--
 .../ImageManipulation/include/otbChangeLabelImageFilter.h   | 4 ++--
 .../ImageManipulation/include/otbChangeLabelImageFilter.txx | 4 ++--
 .../ImageManipulation/include/otbChangeNoDataValueFilter.h  | 4 ++--
 .../ImageManipulation/include/otbClampImageFilter.h         | 4 ++--
 .../ImageManipulation/include/otbClampImageFilter.txx       | 4 ++--
 .../ImageManipulation/include/otbClampVectorImageFilter.h   | 4 ++--
 .../ImageManipulation/include/otbClampVectorImageFilter.txx | 4 ++--
 .../include/otbConcatenateScalarValueImageFilter.h          | 4 ++--
 .../include/otbConcatenateScalarValueImageFilter.txx        | 4 ++--
 .../include/otbConcatenateVectorImageFilter.h               | 4 ++--
 .../include/otbConcatenateVectorImageFilter.txx             | 4 ++--
 .../include/otbEuclideanDistanceMetricWithMissingValue.h    | 4 ++--
 .../otbEuclideanDistanceMetricWithMissingValuePow2.h        | 4 ++--
 .../otbEuclideanDistanceMetricWithMissingValuePow2.txx      | 4 ++--
 .../include/otbFlexibleDistanceWithMissingValue.h           | 4 ++--
 .../include/otbFlexibleDistanceWithMissingValue.txx         | 4 ++--
 .../include/otbFunctionWithNeighborhoodToImageFilter.h      | 4 ++--
 .../include/otbFunctionWithNeighborhoodToImageFilter.txx    | 4 ++--
 .../ImageManipulation/include/otbGridResampleImageFilter.h  | 4 ++--
 .../include/otbGridResampleImageFilter.txx                  | 4 ++--
 .../ImageManipulation/include/otbHillShadingFilter.h        | 4 ++--
 .../ImageManipulation/include/otbHillShadingFunctor.h       | 4 ++--
 .../ImageManipulation/include/otbImageToNoDataMaskFilter.h  | 4 ++--
 .../include/otbImageToVectorImageCastFilter.h               | 4 ++--
 .../include/otbLocalGradientVectorImageFilter.h             | 6 +++---
 .../include/otbLog10ThresholdedImageFilter.h                | 4 ++--
 .../ImageManipulation/include/otbMatrixImageFilter.h        | 4 ++--
 .../ImageManipulation/include/otbMatrixImageFilter.txx      | 4 ++--
 .../Filtering/ImageManipulation/include/otbMeanFunctor.h    | 4 ++--
 .../include/otbMultiplyByScalarImageFilter.h                | 4 ++--
 .../include/otbNRIBandImagesToOneNComplexBandsImage.h       | 4 ++--
 .../include/otbNRIBandImagesToOneNComplexBandsImage.txx     | 4 ++--
 .../include/otbOneRIBandImageToOneComplexBandImage.h        | 4 ++--
 .../include/otbOneRIBandImageToOneComplexBandImage.txx      | 4 ++--
 .../ImageManipulation/include/otbPerBandVectorImageFilter.h | 4 ++--
 .../include/otbPerBandVectorImageFilter.txx                 | 4 ++--
 .../Filtering/ImageManipulation/include/otbPhaseFunctor.h   | 4 ++--
 .../ImageManipulation/include/otbPrintableImageFilter.h     | 4 ++--
 .../ImageManipulation/include/otbPrintableImageFilter.txx   | 4 ++--
 .../include/otbRealAndImaginaryImageToComplexImageFilter.h  | 4 ++--
 .../include/otbRealImageToComplexImageFilter.h              | 4 ++--
 .../ImageManipulation/include/otbShiftScaleImageAdaptor.h   | 4 ++--
 .../include/otbShiftScaleVectorImageFilter.h                | 4 ++--
 .../include/otbShiftScaleVectorImageFilter.txx              | 4 ++--
 .../include/otbSpectralAngleDistanceImageFilter.h           | 4 ++--
 .../include/otbSpectralAngleDistanceImageFilter.txx         | 4 ++--
 .../ImageManipulation/include/otbSpectralAngleFunctor.h     | 4 ++--
 .../ImageManipulation/include/otbSqrtSpectralAngleFunctor.h | 4 ++--
 .../include/otbStreamingInnerProductVectorImageFilter.h     | 4 ++--
 .../include/otbStreamingInnerProductVectorImageFilter.txx   | 4 ++--
 .../include/otbStreamingMatrixTransposeMatrixImageFilter.h  | 4 ++--
 .../otbStreamingMatrixTransposeMatrixImageFilter.txx        | 4 ++--
 .../include/otbStreamingResampleImageFilter.h               | 4 ++--
 .../include/otbStreamingResampleImageFilter.txx             | 4 ++--
 .../include/otbStreamingShrinkImageFilter.h                 | 4 ++--
 .../include/otbStreamingShrinkImageFilter.txx               | 4 ++--
 .../include/otbThresholdVectorImageFilter.h                 | 4 ++--
 .../include/otbThresholdVectorImageFilter.txx               | 4 ++--
 .../ImageManipulation/include/otbTileImageFilter.h          | 4 ++--
 .../ImageManipulation/include/otbTileImageFilter.txx        | 4 ++--
 .../include/otbTwoNRIBandsImageToNComplexBandsImage.h       | 4 ++--
 .../include/otbTwoNRIBandsImageToNComplexBandsImage.txx     | 4 ++--
 .../include/otbUnaryFunctorNeighborhoodImageFilter.h        | 4 ++--
 .../include/otbUnaryFunctorNeighborhoodImageFilter.txx      | 4 ++--
 .../otbUnaryFunctorNeighborhoodWithOffsetImageFilter.h      | 4 ++--
 .../otbUnaryFunctorNeighborhoodWithOffsetImageFilter.txx    | 4 ++--
 .../include/otbUnaryFunctorWithIndexImageFilter.h           | 4 ++--
 .../include/otbUnaryFunctorWithIndexImageFilter.txx         | 4 ++--
 .../include/otbUnaryImageFunctorWithVectorImageFilter.h     | 4 ++--
 .../include/otbUnaryImageFunctorWithVectorImageFilter.txx   | 4 ++--
 .../include/otbVectorImageTo3DScalarImageFilter.h           | 4 ++--
 .../include/otbVectorImageTo3DScalarImageFilter.txx         | 4 ++--
 .../include/otbVectorImageToAmplitudeImageFilter.h          | 4 ++--
 .../include/otbVectorRescaleIntensityImageFilter.h          | 4 ++--
 .../include/otbVectorRescaleIntensityImageFilter.txx        | 4 ++--
 Modules/Filtering/ImageNoise/include/otbFrostImageFilter.h  | 4 ++--
 .../Filtering/ImageNoise/include/otbFrostImageFilter.txx    | 4 ++--
 .../Filtering/ImageNoise/include/otbGammaMAPImageFilter.h   | 4 ++--
 .../Filtering/ImageNoise/include/otbGammaMAPImageFilter.txx | 4 ++--
 Modules/Filtering/ImageNoise/include/otbKuanImageFilter.h   | 4 ++--
 Modules/Filtering/ImageNoise/include/otbKuanImageFilter.txx | 4 ++--
 Modules/Filtering/ImageNoise/include/otbLeeImageFilter.h    | 4 ++--
 Modules/Filtering/ImageNoise/include/otbLeeImageFilter.txx  | 4 ++--
 .../Filtering/MathParser/include/otbBandMathImageFilter.h   | 4 ++--
 .../Filtering/MathParser/include/otbBandMathImageFilter.txx | 4 ++--
 .../Filtering/MathParser/include/otbMaskMuParserFilter.h    | 4 ++--
 .../Filtering/MathParser/include/otbMaskMuParserFilter.txx  | 4 ++--
 .../Filtering/MathParser/include/otbMaskMuParserFunctor.h   | 4 ++--
 .../Filtering/MathParser/include/otbMaskMuParserFunctor.txx | 4 ++--
 .../Filtering/MathParser/include/otbOBIAMuParserFunctor.h   | 4 ++--
 Modules/Filtering/MathParser/include/otbParser.h            | 4 ++--
 .../include/otbParserConditionDataNodeFeatureFunction.h     | 4 ++--
 .../include/otbParserConditionDataNodeFeatureFunction.txx   | 4 ++--
 .../Filtering/MathParserX/include/otbBandMathXImageFilter.h | 4 ++--
 .../MathParserX/include/otbBandMathXImageFilter.txx         | 4 ++--
 Modules/Filtering/MathParserX/include/otbParserX.h          | 4 ++--
 Modules/Filtering/MathParserX/include/otbParserXPlugins.h   | 4 ++--
 .../include/otbMorphologicalPyramidAnalysisFilter.h         | 4 ++--
 .../include/otbMorphologicalPyramidAnalysisFilter.txx       | 4 ++--
 .../include/otbMorphologicalPyramidMRToMSConverter.h        | 4 ++--
 .../include/otbMorphologicalPyramidMRToMSConverter.txx      | 4 ++--
 .../include/otbMorphologicalPyramidResampler.h              | 4 ++--
 .../include/otbMorphologicalPyramidResampler.txx            | 4 ++--
 .../include/otbMorphologicalPyramidSegmentationFilter.h     | 4 ++--
 .../include/otbMorphologicalPyramidSegmentationFilter.txx   | 4 ++--
 .../include/otbMorphologicalPyramidSegmenter.h              | 4 ++--
 .../include/otbMorphologicalPyramidSegmenter.txx            | 4 ++--
 .../include/otbMorphologicalPyramidSynthesisFilter.h        | 4 ++--
 .../include/otbMorphologicalPyramidSynthesisFilter.txx      | 4 ++--
 Modules/Filtering/Path/include/otbClosePathFunctor.h        | 4 ++--
 Modules/Filtering/Path/include/otbCompacityPathFunction.h   | 4 ++--
 Modules/Filtering/Path/include/otbCompacityPathFunction.txx | 4 ++--
 Modules/Filtering/Path/include/otbDrawPathFilter.h          | 4 ++--
 Modules/Filtering/Path/include/otbDrawPathFilter.txx        | 4 ++--
 Modules/Filtering/Path/include/otbDrawPathListFilter.h      | 4 ++--
 Modules/Filtering/Path/include/otbDrawPathListFilter.txx    | 4 ++--
 .../Path/include/otbImageFittingPolygonListFilter.h         | 4 ++--
 .../Path/include/otbImageFittingPolygonListFilter.txx       | 4 ++--
 Modules/Filtering/Path/include/otbImageToEdgePathFilter.h   | 4 ++--
 Modules/Filtering/Path/include/otbImageToEdgePathFilter.txx | 4 ++--
 Modules/Filtering/Path/include/otbImageToPathFilter.h       | 4 ++--
 Modules/Filtering/Path/include/otbImageToPathFilter.txx     | 4 ++--
 Modules/Filtering/Path/include/otbImageToPathListFilter.h   | 4 ++--
 Modules/Filtering/Path/include/otbImageToPathListFilter.txx | 4 ++--
 Modules/Filtering/Path/include/otbOrientationPathFunction.h | 4 ++--
 .../Filtering/Path/include/otbOrientationPathFunction.txx   | 4 ++--
 Modules/Filtering/Path/include/otbPathFunction.h            | 4 ++--
 Modules/Filtering/Path/include/otbPathFunction.txx          | 4 ++--
 Modules/Filtering/Path/include/otbPathLengthFunctor.h       | 4 ++--
 Modules/Filtering/Path/include/otbPathListSource.h          | 4 ++--
 .../Path/include/otbPathListToHistogramGenerator.h          | 4 ++--
 .../Path/include/otbPathListToHistogramGenerator.txx        | 4 ++--
 .../Filtering/Path/include/otbPathListToPathListFilter.h    | 4 ++--
 Modules/Filtering/Path/include/otbPathMeanDistanceFunctor.h | 4 ++--
 .../Filtering/Path/include/otbPolyLineImageConstIterator.h  | 4 ++--
 .../Path/include/otbPolyLineImageConstIterator.txx          | 4 ++--
 Modules/Filtering/Path/include/otbPolyLineImageIterator.h   | 4 ++--
 .../include/otbRegionImageToRectangularPathListFilter.h     | 4 ++--
 .../include/otbRegionImageToRectangularPathListFilter.txx   | 4 ++--
 .../Filtering/Path/include/otbVectorizationPathListFilter.h | 4 ++--
 .../Path/include/otbVectorizationPathListFilter.txx         | 4 ++--
 .../include/otbMultiChannelsPolarimetricSynthesisFilter.h   | 4 ++--
 .../include/otbMultiChannelsPolarimetricSynthesisFilter.txx | 4 ++--
 Modules/Filtering/Polarimetry/include/otbPolarimetricData.h | 4 ++--
 .../Polarimetry/include/otbPolarimetricSynthesisFunctor.h   | 4 ++--
 .../Filtering/Polarimetry/include/otbSinclairImageFilter.h  | 4 ++--
 .../Polarimetry/include/otbSinclairImageFilter.txx          | 4 ++--
 .../Polarimetry/include/otbSinclairReciprocalImageFilter.h  | 4 ++--
 .../include/otbSinclairReciprocalImageFilter.txx            | 4 ++--
 .../include/otbSinclairToCircularCovarianceMatrixFunctor.h  | 4 ++--
 .../include/otbSinclairToCoherencyMatrixFunctor.h           | 4 ++--
 .../include/otbSinclairToCovarianceMatrixFunctor.h          | 4 ++--
 .../Polarimetry/include/otbSinclairToMuellerMatrixFunctor.h | 4 ++--
 ...otbSinclairToReciprocalCircularCovarianceMatrixFunctor.h | 4 ++--
 .../include/otbSinclairToReciprocalCoherencyMatrixFunctor.h | 4 ++--
 .../otbSinclairToReciprocalCovarianceMatrixFunctor.h        | 4 ++--
 .../Filtering/Projection/include/otbEckert4MapProjection.h  | 4 ++--
 .../Projection/include/otbEckert4MapProjection.txx          | 4 ++--
 .../Projection/include/otbGCPsToRPCSensorModelImageFilter.h | 4 ++--
 .../include/otbGCPsToRPCSensorModelImageFilter.txx          | 4 ++--
 .../Projection/include/otbGenericRSResampleImageFilter.h    | 4 ++--
 .../Projection/include/otbGenericRSResampleImageFilter.txx  | 4 ++--
 .../Filtering/Projection/include/otbGeographicalDistance.h  | 4 ++--
 .../Projection/include/otbGeographicalDistance.txx          | 4 ++--
 .../Projection/include/otbGeometriesProjectionFilter.h      | 6 +++---
 .../Projection/include/otbGroundSpacingImageFunction.h      | 4 ++--
 .../Projection/include/otbGroundSpacingImageFunction.txx    | 4 ++--
 .../Projection/include/otbImageToEnvelopeVectorDataFilter.h | 4 ++--
 .../include/otbImageToEnvelopeVectorDataFilter.txx          | 4 ++--
 .../Projection/include/otbImportGeoInformationImageFilter.h | 4 ++--
 .../include/otbImportGeoInformationImageFilter.txx          | 4 ++--
 .../Projection/include/otbLambert2EtenduProjection.h        | 4 ++--
 .../Projection/include/otbLambert3CartoSudProjection.h      | 4 ++--
 .../Filtering/Projection/include/otbLambert93Projection.h   | 4 ++--
 .../include/otbLambertConformalConicMapProjection.h         | 4 ++--
 .../include/otbLambertConformalConicMapProjection.txx       | 4 ++--
 .../include/otbLeastSquareAffineTransformEstimator.h        | 4 ++--
 .../include/otbLeastSquareAffineTransformEstimator.txx      | 4 ++--
 .../Projection/include/otbMapProjectionDeprecated.h         | 4 ++--
 .../Projection/include/otbMapProjectionDeprecated.txx       | 4 ++--
 Modules/Filtering/Projection/include/otbMapProjections.h    | 4 ++--
 .../Filtering/Projection/include/otbMollweidMapProjection.h | 4 ++--
 .../Projection/include/otbMollweidMapProjection.txx         | 4 ++--
 .../Projection/include/otbOrthoRectificationFilter.h        | 4 ++--
 .../Projection/include/otbOrthoRectificationFilter.txx      | 4 ++--
 .../include/otbPhysicalToRPCSensorModelImageFilter.h        | 4 ++--
 .../include/otbPhysicalToRPCSensorModelImageFilter.txx      | 4 ++--
 .../include/otbPleiadesPToXSAffineTransformCalculator.h     | 4 ++--
 .../Projection/include/otbProjectiveProjectionImageFilter.h | 4 ++--
 .../include/otbProjectiveProjectionImageFilter.txx          | 4 ++--
 Modules/Filtering/Projection/include/otbROIdataConversion.h | 4 ++--
 .../Filtering/Projection/include/otbROIdataConversion.txx   | 4 ++--
 Modules/Filtering/Projection/include/otbRationalTransform.h | 4 ++--
 .../Filtering/Projection/include/otbSVY21MapProjection.h    | 4 ++--
 .../Projection/include/otbSinusoidalMapProjection.h         | 4 ++--
 .../Projection/include/otbSinusoidalMapProjection.txx       | 4 ++--
 Modules/Filtering/Projection/include/otbTileMapTransform.h  | 4 ++--
 .../Filtering/Projection/include/otbTileMapTransform.txx    | 4 ++--
 .../Projection/include/otbTransMercatorMapProjection.h      | 4 ++--
 .../Projection/include/otbTransMercatorMapProjection.txx    | 4 ++--
 Modules/Filtering/Projection/include/otbUtmMapProjection.h  | 4 ++--
 .../Filtering/Projection/include/otbUtmMapProjection.txx    | 4 ++--
 .../include/otbVectorDataIntoImageProjectionFilter.h        | 4 ++--
 .../include/otbVectorDataIntoImageProjectionFilter.txx      | 4 ++--
 .../Projection/include/otbVectorDataProjectionFilter.h      | 4 ++--
 .../Projection/include/otbVectorDataProjectionFilter.txx    | 4 ++--
 .../Projection/include/otbVectorDataTransformFilter.h       | 4 ++--
 .../Projection/include/otbVectorDataTransformFilter.txx     | 4 ++--
 .../Smoothing/include/otbMeanShiftSmoothingImageFilter.txx  | 4 ++--
 .../Statistics/include/otbConcatenateSampleListFilter.h     | 4 ++--
 .../Statistics/include/otbConcatenateSampleListFilter.txx   | 4 ++--
 .../include/otbContinuousMinimumMaximumImageCalculator.h    | 4 ++--
 .../include/otbContinuousMinimumMaximumImageCalculator.txx  | 4 ++--
 .../include/otbGaussianAdditiveNoiseSampleListFilter.h      | 4 ++--
 .../include/otbGaussianAdditiveNoiseSampleListFilter.txx    | 4 ++--
 .../Statistics/include/otbHistogramStatisticsFunction.h     | 4 ++--
 .../Statistics/include/otbHistogramStatisticsFunction.txx   | 4 ++--
 .../Filtering/Statistics/include/otbListSampleGenerator.h   | 4 ++--
 .../Filtering/Statistics/include/otbListSampleGenerator.txx | 4 ++--
 Modules/Filtering/Statistics/include/otbListSampleSource.h  | 4 ++--
 .../Filtering/Statistics/include/otbListSampleSource.txx    | 4 ++--
 .../include/otbListSampleToBalancedListSampleFilter.h       | 4 ++--
 .../include/otbListSampleToBalancedListSampleFilter.txx     | 4 ++--
 .../include/otbListSampleToHistogramListGenerator.h         | 4 ++--
 .../include/otbListSampleToHistogramListGenerator.txx       | 4 ++--
 .../Statistics/include/otbListSampleToListSampleFilter.h    | 4 ++--
 .../Statistics/include/otbListSampleToListSampleFilter.txx  | 4 ++--
 .../otbListSampleToVariableDimensionHistogramGenerator.h    | 4 ++--
 .../otbListSampleToVariableDimensionHistogramGenerator.txx  | 4 ++--
 .../Statistics/include/otbLocalHistogramImageFunction.h     | 4 ++--
 .../Statistics/include/otbLocalHistogramImageFunction.txx   | 4 ++--
 .../Statistics/include/otbNormalizeVectorImageFilter.h      | 6 +++---
 .../Statistics/include/otbNormalizeVectorImageFilter.txx    | 6 +++---
 .../Statistics/include/otbShiftScaleSampleListFilter.h      | 4 ++--
 .../Statistics/include/otbShiftScaleSampleListFilter.txx    | 4 ++--
 .../Statistics/include/otbStreamingCompareImageFilter.h     | 4 ++--
 .../Statistics/include/otbStreamingCompareImageFilter.txx   | 4 ++--
 .../include/otbStreamingHistogramVectorImageFilter.h        | 4 ++--
 .../include/otbStreamingHistogramVectorImageFilter.txx      | 4 ++--
 .../Statistics/include/otbStreamingMinMaxImageFilter.h      | 4 ++--
 .../Statistics/include/otbStreamingMinMaxImageFilter.txx    | 4 ++--
 .../include/otbStreamingMinMaxVectorImageFilter.h           | 4 ++--
 .../include/otbStreamingMinMaxVectorImageFilter.txx         | 4 ++--
 .../Statistics/include/otbStreamingStatisticsImageFilter.h  | 4 ++--
 .../include/otbStreamingStatisticsImageFilter.txx           | 4 ++--
 .../include/otbStreamingStatisticsMapFromLabelImageFilter.h | 4 ++--
 .../otbStreamingStatisticsMapFromLabelImageFilter.txx       | 4 ++--
 .../include/otbStreamingStatisticsVectorImageFilter.h       | 4 ++--
 .../include/otbStreamingStatisticsVectorImageFilter.txx     | 4 ++--
 .../Filtering/Statistics/include/otbVarianceImageFilter.h   | 4 ++--
 .../Filtering/Statistics/include/otbVarianceImageFilter.txx | 4 ++--
 .../include/otbVectorImageToIntensityImageFilter.h          | 4 ++--
 .../include/otbVectorImageToIntensityImageFilter.txx        | 4 ++--
 .../Statistics/include/otbVectorImageToMatrixImageFilter.h  | 4 ++--
 .../include/otbVectorImageToMatrixImageFilter.txx           | 4 ++--
 .../include/otbEnvelopeSavitzkyGolayInterpolationFunctor.h  | 4 ++--
 .../include/otbSavitzkyGolayInterpolationFunctor.h          | 4 ++--
 Modules/Filtering/TimeSeries/include/otbTimeSeries.h        | 4 ++--
 .../include/otbTimeSeriesLeastSquareFittingFunctor.h        | 4 ++--
 .../include/otbConcatenateVectorDataFilter.h                | 4 ++--
 .../include/otbConcatenateVectorDataFilter.txx              | 4 ++--
 .../include/otbCorrectPolygonFunctor.h                      | 4 ++--
 .../include/otbDBOverlapDataNodeFeatureFunction.h           | 4 ++--
 .../include/otbDBOverlapDataNodeFeatureFunction.txx         | 4 ++--
 .../include/otbPolygonCompacityFunctor.h                    | 4 ++--
 ...metryHomogenousWithNeighborhoodDataNodeFeatureFunction.h | 4 ++--
 ...tryHomogenousWithNeighborhoodDataNodeFeatureFunction.txx | 4 ++--
 .../VectorDataManipulation/include/otbSimplifyPathFunctor.h | 4 ++--
 .../include/otbSpectralAngleDataNodeFeatureFunction.h       | 4 ++--
 .../include/otbSpectralAngleDataNodeFeatureFunction.txx     | 4 ++--
 .../VectorDataManipulation/include/otbVectorDataAdapter.h   | 4 ++--
 .../VectorDataManipulation/include/otbVectorDataAdapter.txx | 4 ++--
 .../include/otbVectorDataExtractROI.h                       | 4 ++--
 .../include/otbVectorDataExtractROI.txx                     | 4 ++--
 .../include/otbVectorDataToRandomLineGenerator.h            | 4 ++--
 .../include/otbVectorDataToRandomLineGenerator.txx          | 4 ++--
 .../include/otbVectorDataToSpecificDescriptionFilterBase.h  | 4 ++--
 .../otbVectorDataToSpecificDescriptionFilterBase.txx        | 4 ++--
 .../include/otbVectorDataToVectorDataFilter.h               | 4 ++--
 .../include/otbVectorDataToVectorDataFilter.txx             | 4 ++--
 .../VectorDataRendering/include/otbMapnikAdapter.h          | 4 ++--
 .../VectorDataRendering/include/otbVectorDataStyle.h        | 4 ++--
 .../include/otbVectorDataToImageFilter.h                    | 4 ++--
 .../include/otbVectorDataToImageFilter.txx                  | 4 ++--
 .../VectorDataRendering/include/otbVectorDataToMapFilter.h  | 4 ++--
 .../include/otbVectorDataToMapFilter.txx                    | 4 ++--
 Modules/Filtering/Wavelet/include/otbSubsampleImageFilter.h | 4 ++--
 .../Filtering/Wavelet/include/otbSubsampleImageFilter.txx   | 4 ++--
 Modules/Filtering/Wavelet/include/otbWaveletFilterBank.h    | 4 ++--
 Modules/Filtering/Wavelet/include/otbWaveletFilterBank.txx  | 4 ++--
 Modules/Filtering/Wavelet/include/otbWaveletGenerator.h     | 4 ++--
 .../Filtering/Wavelet/include/otbWaveletHighPassOperator.h  | 4 ++--
 .../Filtering/Wavelet/include/otbWaveletLowPassOperator.h   | 4 ++--
 Modules/Filtering/Wavelet/include/otbWaveletOperator.h      | 4 ++--
 Modules/Filtering/Wavelet/include/otbWaveletOperatorBase.h  | 4 ++--
 .../Filtering/Wavelet/include/otbWaveletOperatorBase.txx    | 4 ++--
 .../Wavelet/include/otbWaveletPacketDecompositionCosts.h    | 4 ++--
 .../Filtering/Wavelet/include/otbWaveletPacketTransform.h   | 4 ++--
 .../Filtering/Wavelet/include/otbWaveletPacketTransform.txx | 4 ++--
 Modules/Filtering/Wavelet/include/otbWaveletTransform.h     | 4 ++--
 Modules/Filtering/Wavelet/include/otbWaveletTransform.txx   | 4 ++--
 .../Fusion/Fuzzy/include/otbFuzzyDescriptorsModelManager.h  | 4 ++--
 Modules/Fusion/Fuzzy/include/otbFuzzyVariable.h             | 4 ++--
 Modules/Fusion/Fuzzy/include/otbFuzzyVariable.txx           | 4 ++--
 .../include/otbNeighborhoodMajorityVotingImageFilter.h      | 4 ++--
 .../include/otbNeighborhoodMajorityVotingImageFilter.txx    | 4 ++--
 .../Fusion/PanSharpening/include/otbBayesianFusionFilter.h  | 4 ++--
 .../PanSharpening/include/otbBayesianFusionFilter.txx       | 4 ++--
 Modules/Fusion/PanSharpening/include/otbFusionImageBase.h   | 4 ++--
 .../include/otbLmvmPanSharpeningFusionImageFilter.h         | 4 ++--
 .../include/otbLmvmPanSharpeningFusionImageFilter.txx       | 4 ++--
 .../include/otbSimpleRcsPanSharpeningFusionImageFilter.h    | 4 ++--
 .../include/otbSimpleRcsPanSharpeningFusionImageFilter.txx  | 4 ++--
 .../AnomalyDetection/include/otbLocalRxDetectorFilter.h     | 4 ++--
 .../AnomalyDetection/include/otbLocalRxDetectorFilter.txx   | 4 ++--
 .../include/otbLocalRxDetectorNonThreadFilter.h             | 4 ++--
 .../include/otbLocalRxDetectorNonThreadFilter.txx           | 4 ++--
 .../include/otbEigenvalueLikelihoodMaximisation.h           | 4 ++--
 .../include/otbEigenvalueLikelihoodMaximisation.txx         | 4 ++--
 .../EndmembersExtraction/include/otbVcaImageFilter.h        | 6 +++---
 .../EndmembersExtraction/include/otbVcaImageFilter.txx      | 4 ++--
 .../EndmembersExtraction/include/otbVirtualDimensionality.h | 4 ++--
 .../include/otbVirtualDimensionality.txx                    | 4 ++--
 .../Unmixing/include/otbISRAUnmixingImageFilter.h           | 4 ++--
 .../Unmixing/include/otbISRAUnmixingImageFilter.txx         | 4 ++--
 .../Hyperspectral/Unmixing/include/otbMDMDNMFImageFilter.h  | 4 ++--
 .../Unmixing/include/otbMDMDNMFImageFilter.txx              | 4 ++--
 .../Unmixing/include/otbNCLSUnmixingImageFilter.h           | 4 ++--
 .../Unmixing/include/otbNCLSUnmixingImageFilter.txx         | 4 ++--
 .../Unmixing/include/otbSparseUnmixingImageFilter.h         | 4 ++--
 .../Unmixing/include/otbSparseUnmixingImageFilter.txx       | 4 ++--
 .../include/otbUnConstrainedLeastSquareImageFilter.h        | 4 ++--
 .../include/otbUnConstrainedLeastSquareImageFilter.txx      | 4 ++--
 Modules/IO/Carto/include/otbCoordinateToName.h              | 4 ++--
 Modules/IO/Carto/include/otbImageToOSMVectorDataGenerator.h | 4 ++--
 .../IO/Carto/include/otbImageToOSMVectorDataGenerator.txx   | 4 ++--
 Modules/IO/Carto/include/otbMapFileProductWriter.h          | 4 ++--
 Modules/IO/Carto/include/otbMapFileProductWriter.txx        | 4 ++--
 Modules/IO/Carto/include/otbOSMDataToVectorDataGenerator.h  | 4 ++--
 Modules/IO/Carto/include/otbPlaceNameToLonLat.h             | 4 ++--
 Modules/IO/Carto/include/otbWorldFile.h                     | 4 ++--
 .../IO/ExtendedFilename/include/otbExtendedFilenameHelper.h | 6 +++---
 .../include/otbExtendedFilenameToReaderOptions.h            | 6 +++---
 .../include/otbExtendedFilenameToWriterOptions.h            | 6 +++---
 Modules/IO/IOBSQ/include/otbBSQImageIO.h                    | 6 +++---
 Modules/IO/IOBSQ/include/otbBSQImageIOFactory.h             | 4 ++--
 Modules/IO/IOGDAL/include/otbGDALImageIO.h                  | 6 +++---
 Modules/IO/IOGDAL/include/otbGDALImageIOFactory.h           | 4 ++--
 Modules/IO/IOGDAL/include/otbOGRIOHelper.h                  | 4 ++--
 Modules/IO/IOGDAL/include/otbOGRVectorDataIO.h              | 6 +++---
 Modules/IO/IOGDAL/include/otbOGRVectorDataIOFactory.h       | 4 ++--
 Modules/IO/IOJPEG2000/include/otbJPEG2000ImageIO.h          | 6 +++---
 Modules/IO/IOJPEG2000/include/otbJPEG2000ImageIOFactory.h   | 4 ++--
 Modules/IO/IOKML/include/otbKMLVectorDataIO.h               | 6 +++---
 Modules/IO/IOKML/include/otbKMLVectorDataIOFactory.h        | 4 ++--
 Modules/IO/IOLUM/include/otbLUMImageIO.h                    | 6 +++---
 Modules/IO/IOLUM/include/otbLUMImageIOFactory.h             | 4 ++--
 Modules/IO/IOMSTAR/include/otbMSTARImageIO.h                | 6 +++---
 Modules/IO/IOMSTAR/include/otbMSTARImageIOFactory.h         | 4 ++--
 Modules/IO/IOMW/include/otbMWImageIO.h                      | 6 +++---
 Modules/IO/IOMW/include/otbMWImageIOFactory.h               | 4 ++--
 Modules/IO/IOONERA/include/otbONERAImageIO.h                | 6 +++---
 Modules/IO/IOONERA/include/otbONERAImageIOFactory.h         | 4 ++--
 Modules/IO/IORAD/include/otbRADImageIO.h                    | 6 +++---
 Modules/IO/IORAD/include/otbRADImageIOFactory.h             | 4 ++--
 Modules/IO/IOTileMap/include/otbTileMapImageIO.h            | 6 +++---
 Modules/IO/IOTileMap/include/otbTileMapImageIOFactory.h     | 4 ++--
 Modules/IO/IOTileMap/include/otbTileMapImageIOHelper.h      | 4 ++--
 Modules/IO/IOXML/include/otbStatisticsXMLFileReader.h       | 4 ++--
 Modules/IO/IOXML/include/otbStatisticsXMLFileReader.txx     | 4 ++--
 Modules/IO/IOXML/include/otbStatisticsXMLFileWriter.h       | 4 ++--
 Modules/IO/IOXML/include/otbStatisticsXMLFileWriter.txx     | 4 ++--
 Modules/IO/ImageIO/include/otbImageFileReader.h             | 6 +++---
 Modules/IO/ImageIO/include/otbImageFileReader.txx           | 4 ++--
 Modules/IO/ImageIO/include/otbImageFileWriter.h             | 4 ++--
 Modules/IO/ImageIO/include/otbImageFileWriter.txx           | 4 ++--
 Modules/IO/ImageIO/include/otbImageIOFactory.h              | 4 ++--
 Modules/IO/ImageIO/include/otbImageSeriesFileReader.h       | 4 ++--
 Modules/IO/ImageIO/include/otbImageSeriesFileReader.txx     | 4 ++--
 Modules/IO/ImageIO/include/otbImageSeriesFileReaderBase.h   | 4 ++--
 Modules/IO/ImageIO/include/otbImageSeriesFileReaderBase.txx | 4 ++--
 .../IO/ImageIO/include/otbScalarBufferToImageFileWriter.h   | 4 ++--
 Modules/IO/KMZWriter/include/otbKmzProductWriter.h          | 4 ++--
 Modules/IO/KMZWriter/include/otbKmzProductWriter.txx        | 4 ++--
 Modules/IO/TestKernel/include/otbDifferenceImageFilter.h    | 4 ++--
 Modules/IO/TestKernel/include/otbDifferenceImageFilter.txx  | 4 ++--
 Modules/IO/TestKernel/include/otbTestHelper.h               | 4 ++--
 Modules/IO/TestKernel/include/otbTestMain.h                 | 4 ++--
 Modules/IO/VectorDataIO/include/otbVectorDataFileReader.h   | 6 +++---
 Modules/IO/VectorDataIO/include/otbVectorDataFileReader.txx | 4 ++--
 Modules/IO/VectorDataIO/include/otbVectorDataFileWriter.h   | 6 +++---
 Modules/IO/VectorDataIO/include/otbVectorDataFileWriter.txx | 4 ++--
 Modules/IO/VectorDataIO/include/otbVectorDataIOFactory.h    | 4 ++--
 .../include/otbConfusionMatrixToMassOfBelief.h              | 4 ++--
 .../include/otbConfusionMatrixToMassOfBelief.txx            | 4 ++--
 .../include/otbDSFusionOfClassifiersImageFilter.h           | 4 ++--
 .../include/otbDSFusionOfClassifiersImageFilter.txx         | 4 ++--
 .../DempsterShafer/include/otbJointMassOfBeliefFilter.h     | 4 ++--
 .../DempsterShafer/include/otbJointMassOfBeliefFilter.txx   | 4 ++--
 Modules/Learning/DempsterShafer/include/otbMassOfBelief.h   | 4 ++--
 Modules/Learning/DempsterShafer/include/otbMassOfBelief.txx | 4 ++--
 .../DempsterShafer/include/otbStandardDSCostFunction.h      | 4 ++--
 .../DempsterShafer/include/otbStandardDSCostFunction.txx    | 4 ++--
 .../include/otbVectorDataToDSValidatedVectorDataFilter.h    | 4 ++--
 .../include/otbVectorDataToDSValidatedVectorDataFilter.txx  | 4 ++--
 Modules/Learning/LearningBase/include/otbDecisionTree.h     | 4 ++--
 Modules/Learning/LearningBase/include/otbDecisionTree.txx   | 4 ++--
 .../LearningBase/include/otbGaussianModelComponent.h        | 4 ++--
 .../LearningBase/include/otbGaussianModelComponent.txx      | 4 ++--
 .../include/otbKMeansImageClassificationFilter.h            | 4 ++--
 .../include/otbKMeansImageClassificationFilter.txx          | 4 ++--
 Modules/Learning/LearningBase/include/otbSEMClassifier.h    | 4 ++--
 Modules/Learning/LearningBase/include/otbSEMClassifier.txx  | 4 ++--
 Modules/Learning/Markov/include/otbMRFEnergy.h              | 4 ++--
 Modules/Learning/Markov/include/otbMRFEnergyEdgeFidelity.h  | 4 ++--
 .../Markov/include/otbMRFEnergyFisherClassification.h       | 4 ++--
 Modules/Learning/Markov/include/otbMRFEnergyGaussian.h      | 4 ++--
 .../Markov/include/otbMRFEnergyGaussianClassification.h     | 4 ++--
 Modules/Learning/Markov/include/otbMRFEnergyPotts.h         | 4 ++--
 Modules/Learning/Markov/include/otbMRFOptimizer.h           | 4 ++--
 Modules/Learning/Markov/include/otbMRFOptimizerICM.h        | 4 ++--
 Modules/Learning/Markov/include/otbMRFOptimizerMetropolis.h | 4 ++--
 Modules/Learning/Markov/include/otbMRFSampler.h             | 4 ++--
 Modules/Learning/Markov/include/otbMRFSamplerMAP.h          | 4 ++--
 Modules/Learning/Markov/include/otbMRFSamplerRandom.h       | 4 ++--
 Modules/Learning/Markov/include/otbMRFSamplerRandomMAP.h    | 4 ++--
 .../Learning/Markov/include/otbMarkovRandomFieldFilter.h    | 4 ++--
 .../Learning/Markov/include/otbMarkovRandomFieldFilter.txx  | 4 ++--
 .../SOM/include/otbCzihoSOMLearningBehaviorFunctor.h        | 4 ++--
 .../SOM/include/otbCzihoSOMNeighborhoodBehaviorFunctor.h    | 4 ++--
 Modules/Learning/SOM/include/otbPeriodicSOM.h               | 4 ++--
 Modules/Learning/SOM/include/otbPeriodicSOM.txx             | 4 ++--
 Modules/Learning/SOM/include/otbSOM.h                       | 4 ++--
 Modules/Learning/SOM/include/otbSOM.txx                     | 4 ++--
 Modules/Learning/SOM/include/otbSOMActivationBuilder.h      | 4 ++--
 Modules/Learning/SOM/include/otbSOMActivationBuilder.txx    | 4 ++--
 Modules/Learning/SOM/include/otbSOMClassifier.h             | 4 ++--
 Modules/Learning/SOM/include/otbSOMClassifier.txx           | 4 ++--
 .../Learning/SOM/include/otbSOMImageClassificationFilter.h  | 4 ++--
 .../SOM/include/otbSOMImageClassificationFilter.txx         | 4 ++--
 .../Learning/SOM/include/otbSOMLearningBehaviorFunctor.h    | 4 ++--
 Modules/Learning/SOM/include/otbSOMMap.h                    | 4 ++--
 Modules/Learning/SOM/include/otbSOMMap.txx                  | 4 ++--
 Modules/Learning/SOM/include/otbSOMWithMissingValue.h       | 4 ++--
 Modules/Learning/SOM/include/otbSOMWithMissingValue.txx     | 4 ++--
 Modules/Learning/SOM/include/otbSOMbasedImageFilter.h       | 4 ++--
 Modules/Learning/SOM/include/otbSOMbasedImageFilter.txx     | 4 ++--
 .../SVMLearning/include/otbExhaustiveExponentialOptimizer.h | 4 ++--
 .../Learning/SVMLearning/include/otbLabelMapSVMClassifier.h | 4 ++--
 .../SVMLearning/include/otbLabelMapSVMClassifier.txx        | 4 ++--
 .../SVMLearning/include/otbObjectDetectionClassifier.h      | 4 ++--
 .../SVMLearning/include/otbObjectDetectionClassifier.txx    | 4 ++--
 Modules/Learning/SVMLearning/include/otbSVMClassifier.h     | 4 ++--
 Modules/Learning/SVMLearning/include/otbSVMClassifier.txx   | 4 ++--
 .../SVMLearning/include/otbSVMCrossValidationCostFunction.h | 4 ++--
 .../include/otbSVMCrossValidationCostFunction.txx           | 4 ++--
 .../SVMLearning/include/otbSVMImageClassificationFilter.h   | 4 ++--
 .../SVMLearning/include/otbSVMImageClassificationFilter.txx | 4 ++--
 .../include/otbSVMImageClassificationWithRuleFilter.h       | 4 ++--
 .../include/otbSVMImageClassificationWithRuleFilter.txx     | 4 ++--
 .../SVMLearning/include/otbSVMImageModelEstimator.h         | 4 ++--
 .../SVMLearning/include/otbSVMImageModelEstimator.txx       | 4 ++--
 Modules/Learning/SVMLearning/include/otbSVMMarginSampler.h  | 4 ++--
 .../Learning/SVMLearning/include/otbSVMMarginSampler.txx    | 4 ++--
 Modules/Learning/SVMLearning/include/otbSVMModel.h          | 4 ++--
 Modules/Learning/SVMLearning/include/otbSVMModel.txx        | 4 ++--
 Modules/Learning/SVMLearning/include/otbSVMModelEstimator.h | 4 ++--
 .../Learning/SVMLearning/include/otbSVMModelEstimator.txx   | 4 ++--
 .../SVMLearning/include/otbSVMPointSetModelEstimator.h      | 4 ++--
 .../SVMLearning/include/otbSVMPointSetModelEstimator.txx    | 4 ++--
 .../SVMLearning/include/otbSVMSampleListModelEstimator.h    | 4 ++--
 .../SVMLearning/include/otbSVMSampleListModelEstimator.txx  | 4 ++--
 .../Sampling/include/otbOGRDataToClassStatisticsFilter.h    | 4 ++--
 .../Sampling/include/otbOGRDataToClassStatisticsFilter.txx  | 4 ++--
 .../Sampling/include/otbPolygonClassStatisticsAccumulator.h | 4 ++--
 .../include/otbPolygonClassStatisticsAccumulator.txx        | 4 ++--
 .../Supervised/include/otbBoostMachineLearningModel.h       | 4 ++--
 .../Supervised/include/otbBoostMachineLearningModel.txx     | 4 ++--
 .../include/otbBoostMachineLearningModelFactory.h           | 4 ++--
 .../Supervised/include/otbConfusionMatrixCalculator.h       | 4 ++--
 .../Supervised/include/otbConfusionMatrixCalculator.txx     | 4 ++--
 .../Supervised/include/otbConfusionMatrixMeasurements.h     | 4 ++--
 .../Supervised/include/otbConfusionMatrixMeasurements.txx   | 4 ++--
 Modules/Learning/Supervised/include/otbCvRTreesWrapper.h    | 4 ++--
 .../include/otbDecisionTreeMachineLearningModel.h           | 4 ++--
 .../include/otbDecisionTreeMachineLearningModel.txx         | 4 ++--
 .../include/otbDecisionTreeMachineLearningModelFactory.h    | 4 ++--
 .../include/otbGradientBoostedTreeMachineLearningModel.h    | 4 ++--
 .../include/otbGradientBoostedTreeMachineLearningModel.txx  | 4 ++--
 .../otbGradientBoostedTreeMachineLearningModelFactory.h     | 4 ++--
 .../Supervised/include/otbImageClassificationFilter.h       | 4 ++--
 .../Supervised/include/otbImageClassificationFilter.txx     | 4 ++--
 .../include/otbKNearestNeighborsMachineLearningModel.h      | 4 ++--
 .../include/otbKNearestNeighborsMachineLearningModel.txx    | 4 ++--
 .../otbKNearestNeighborsMachineLearningModelFactory.h       | 4 ++--
 .../Supervised/include/otbLibSVMMachineLearningModel.h      | 4 ++--
 .../Supervised/include/otbLibSVMMachineLearningModel.txx    | 4 ++--
 .../include/otbLibSVMMachineLearningModelFactory.h          | 4 ++--
 .../Learning/Supervised/include/otbMachineLearningModel.h   | 4 ++--
 .../Learning/Supervised/include/otbMachineLearningModel.txx | 4 ++--
 .../Supervised/include/otbMachineLearningModelFactory.h     | 4 ++--
 .../Supervised/include/otbMachineLearningModelFactoryBase.h | 4 ++--
 .../include/otbNeuralNetworkMachineLearningModel.h          | 4 ++--
 .../include/otbNeuralNetworkMachineLearningModel.txx        | 4 ++--
 .../include/otbNeuralNetworkMachineLearningModelFactory.h   | 4 ++--
 .../Supervised/include/otbNormalBayesMachineLearningModel.h | 4 ++--
 .../include/otbNormalBayesMachineLearningModel.txx          | 4 ++--
 .../include/otbNormalBayesMachineLearningModelFactory.h     | 4 ++--
 Modules/Learning/Supervised/include/otbOpenCVUtils.h        | 4 ++--
 .../include/otbRandomForestsMachineLearningModel.h          | 4 ++--
 .../include/otbRandomForestsMachineLearningModel.txx        | 4 ++--
 .../include/otbRandomForestsMachineLearningModelFactory.h   | 4 ++--
 .../Learning/Supervised/include/otbRequiresOpenCVCheck.h    | 4 ++--
 .../Supervised/include/otbSVMMachineLearningModel.h         | 4 ++--
 .../Supervised/include/otbSVMMachineLearningModel.txx       | 4 ++--
 .../Supervised/include/otbSVMMachineLearningModelFactory.h  | 4 ++--
 Modules/OBIA/RCC8/include/otbImageListToRCC8GraphFilter.h   | 4 ++--
 Modules/OBIA/RCC8/include/otbImageListToRCC8GraphFilter.txx | 4 ++--
 .../include/otbImageMultiSegmentationToRCC8GraphFilter.h    | 4 ++--
 .../include/otbImageMultiSegmentationToRCC8GraphFilter.txx  | 4 ++--
 Modules/OBIA/RCC8/include/otbImageToImageRCC8Calculator.h   | 4 ++--
 Modules/OBIA/RCC8/include/otbImageToImageRCC8Calculator.txx | 4 ++--
 Modules/OBIA/RCC8/include/otbPolygonListToRCC8GraphFilter.h | 4 ++--
 .../OBIA/RCC8/include/otbPolygonListToRCC8GraphFilter.txx   | 4 ++--
 .../OBIA/RCC8/include/otbPolygonToPolygonRCC8Calculator.h   | 4 ++--
 .../OBIA/RCC8/include/otbPolygonToPolygonRCC8Calculator.txx | 4 ++--
 Modules/OBIA/RCC8/include/otbRCC8Edge.h                     | 4 ++--
 Modules/OBIA/RCC8/include/otbRCC8EdgeIterator.h             | 4 ++--
 Modules/OBIA/RCC8/include/otbRCC8EdgeIterator.txx           | 4 ++--
 Modules/OBIA/RCC8/include/otbRCC8Graph.h                    | 4 ++--
 Modules/OBIA/RCC8/include/otbRCC8Graph.txx                  | 4 ++--
 Modules/OBIA/RCC8/include/otbRCC8GraphFileReader.h          | 4 ++--
 Modules/OBIA/RCC8/include/otbRCC8GraphFileReader.txx        | 4 ++--
 Modules/OBIA/RCC8/include/otbRCC8GraphFileWriter.h          | 4 ++--
 Modules/OBIA/RCC8/include/otbRCC8GraphFileWriter.txx        | 4 ++--
 Modules/OBIA/RCC8/include/otbRCC8GraphSource.h              | 4 ++--
 Modules/OBIA/RCC8/include/otbRCC8GraphSource.txx            | 4 ++--
 Modules/OBIA/RCC8/include/otbRCC8InEdgeIterator.h           | 4 ++--
 Modules/OBIA/RCC8/include/otbRCC8InEdgeIterator.txx         | 4 ++--
 Modules/OBIA/RCC8/include/otbRCC8OutEdgeIterator.h          | 4 ++--
 Modules/OBIA/RCC8/include/otbRCC8OutEdgeIterator.txx        | 4 ++--
 Modules/OBIA/RCC8/include/otbRCC8Value.h                    | 4 ++--
 Modules/OBIA/RCC8/include/otbRCC8VertexBase.h               | 4 ++--
 Modules/OBIA/RCC8/include/otbRCC8VertexBase.txx             | 4 ++--
 Modules/OBIA/RCC8/include/otbRCC8VertexIterator.h           | 4 ++--
 Modules/OBIA/RCC8/include/otbRCC8VertexIterator.txx         | 4 ++--
 Modules/OBIA/RCC8/include/otbRCC8VertexWithCompacity.h      | 4 ++--
 Modules/OBIA/RCC8/include/otbRCC8VertexWithCompacity.txx    | 4 ++--
 Modules/OBIA/RCC8/include/otbRCC8VertexWithRegionCenter.h   | 4 ++--
 Modules/OBIA/RCC8/include/otbRCC8VertexWithRegionCenter.txx | 4 ++--
 .../Radiometry/Indices/include/otbBuiltUpIndicesFunctor.h   | 4 ++--
 .../Radiometry/Indices/include/otbGAndRIndexImageFilter.h   | 4 ++--
 .../Radiometry/Indices/include/otbGAndRIndexImageFilter.txx | 4 ++--
 Modules/Radiometry/Indices/include/otbLandsatTMIndices.h    | 4 ++--
 .../Indices/include/otbMultiChannelGAndRIndexImageFilter.h  | 4 ++--
 .../include/otbMultiChannelRAndBAndNIRIndexImageFilter.h    | 4 ++--
 .../include/otbMultiChannelRAndGAndNIRIndexImageFilter.h    | 4 ++--
 .../include/otbMultiChannelRAndNIRIndexImageFilter.h        | 4 ++--
 .../Indices/include/otbMultiChannelRadiometricImageFilter.h | 4 ++--
 .../Indices/include/otbNDVIDataNodeFeatureFunction.h        | 4 ++--
 .../Indices/include/otbNDVIDataNodeFeatureFunction.txx      | 4 ++--
 .../Indices/include/otbRAndBAndNIRIndexImageFilter.h        | 4 ++--
 .../Indices/include/otbRAndBAndNIRIndexImageFilter.txx      | 4 ++--
 .../Indices/include/otbRAndGAndNIRIndexImageFilter.h        | 4 ++--
 .../Indices/include/otbRAndGAndNIRIndexImageFilter.txx      | 4 ++--
 .../Radiometry/Indices/include/otbRAndNIRIndexImageFilter.h | 4 ++--
 .../Indices/include/otbRAndNIRIndexImageFilter.txx          | 4 ++--
 Modules/Radiometry/Indices/include/otbSoilIndicesFunctor.h  | 4 ++--
 .../Indices/include/otbVegetationIndicesFunctor.h           | 4 ++--
 Modules/Radiometry/Indices/include/otbWaterIndicesFunctor.h | 4 ++--
 .../Indices/include/otbWaterSqrtSpectralAngleImageFilter.h  | 4 ++--
 .../include/otbLandsatTMSpectralRuleBasedClassifier.h       | 4 ++--
 .../Radiometry/OpticalCalibration/include/otbAeronetData.h  | 4 ++--
 .../OpticalCalibration/include/otbAeronetFileReader.h       | 4 ++--
 .../include/otbAtmosphericCorrectionParameters.h            | 4 ++--
 .../include/otbAtmosphericRadiativeTerms.h                  | 4 ++--
 .../include/otbImageMetadataCorrectionParameters.h          | 4 ++--
 .../include/otbImageToLuminanceImageFilter.h                | 4 ++--
 .../include/otbImageToReflectanceImageFilter.h              | 4 ++--
 .../include/otbLuminanceToImageImageFilter.h                | 4 ++--
 .../include/otbLuminanceToReflectanceImageFilter.h          | 4 ++--
 ...iometryCorrectionParametersToAtmosphericRadiativeTerms.h | 4 ++--
 .../include/otbReflectanceToImageImageFilter.h              | 4 ++--
 .../include/otbReflectanceToLuminanceImageFilter.h          | 4 ++--
 .../include/otbReflectanceToSurfaceReflectanceImageFilter.h | 4 ++--
 .../otbReflectanceToSurfaceReflectanceImageFilter.txx       | 4 ++--
 .../Radiometry/OpticalCalibration/include/otbSIXSTraits.h   | 4 ++--
 .../include/otbSpectralSensitivityReader.h                  | 4 ++--
 .../otbSurfaceAdjacencyEffectCorrectionSchemeFilter.h       | 4 ++--
 .../otbSurfaceAdjacencyEffectCorrectionSchemeFilter.txx     | 4 ++--
 Modules/Radiometry/OpticalCalibration/include/otbVarSol.h   | 4 ++--
 .../OpticalCalibration/include/otbWavelengthSpectralBands.h | 4 ++--
 .../SARCalibration/include/otbSarBrightnessFunction.h       | 4 ++--
 .../SARCalibration/include/otbSarBrightnessFunction.txx     | 4 ++--
 .../SARCalibration/include/otbSarBrightnessFunctor.h        | 4 ++--
 .../SARCalibration/include/otbSarBrightnessToImageFilter.h  | 4 ++--
 .../include/otbSarBrightnessToImageFilter.txx               | 4 ++--
 .../SARCalibration/include/otbSarParametricMapFunction.h    | 4 ++--
 .../SARCalibration/include/otbSarParametricMapFunction.txx  | 4 ++--
 .../include/otbSarRadiometricCalibrationFunction.h          | 4 ++--
 .../include/otbSarRadiometricCalibrationFunction.txx        | 4 ++--
 .../include/otbSarRadiometricCalibrationToImageFilter.h     | 4 ++--
 .../include/otbSarRadiometricCalibrationToImageFilter.txx   | 4 ++--
 .../SARCalibration/include/otbTerraSarBrightnessFunctor.h   | 4 ++--
 .../SARCalibration/include/otbTerraSarBrightnessFunctor.txx | 4 ++--
 .../include/otbTerraSarBrightnessImageFilter.h              | 4 ++--
 .../include/otbTerraSarBrightnessImageFilter.txx            | 4 ++--
 .../Radiometry/Simulation/include/otbAtmosphericEffects.h   | 4 ++--
 .../Radiometry/Simulation/include/otbAtmosphericEffects.txx | 4 ++--
 Modules/Radiometry/Simulation/include/otbDataSpecP5B.h      | 6 +++---
 .../Simulation/include/otbImageSimulationMethod.h           | 4 ++--
 .../Simulation/include/otbImageSimulationMethod.txx         | 4 ++--
 .../Simulation/include/otbLabelMapToSimulatedImageFilter.h  | 4 ++--
 .../include/otbLabelMapToSimulatedImageFilter.txx           | 4 ++--
 .../Simulation/include/otbLabelToProSailParameters.h        | 4 ++--
 .../Simulation/include/otbLabelToProSailParameters.txx      | 4 ++--
 .../Simulation/include/otbLabelToSimulationParametersBase.h | 4 ++--
 Modules/Radiometry/Simulation/include/otbLeafParameters.h   | 4 ++--
 .../Radiometry/Simulation/include/otbProSailParameters.h    | 4 ++--
 Modules/Radiometry/Simulation/include/otbProspectModel.h    | 4 ++--
 .../Simulation/include/otbReduceSpectralResponse.h          | 4 ++--
 .../Simulation/include/otbReduceSpectralResponse.txx        | 4 ++--
 .../include/otbReduceSpectralResponseClassifierRAndNIR.h    | 4 ++--
 .../include/otbReduceSpectralResponseClassifierRAndNIR.txx  | 4 ++--
 Modules/Radiometry/Simulation/include/otbSailModel.h        | 4 ++--
 Modules/Radiometry/Simulation/include/otbSatelliteRSR.h     | 4 ++--
 Modules/Radiometry/Simulation/include/otbSatelliteRSR.txx   | 4 ++--
 .../Radiometry/Simulation/include/otbSimulationStep1Base.h  | 4 ++--
 .../Radiometry/Simulation/include/otbSimulationStep2Base.h  | 4 ++--
 .../Radiometry/Simulation/include/otbSpatialisationFilter.h | 4 ++--
 .../Simulation/include/otbSpatialisationFilter.txx          | 4 ++--
 Modules/Radiometry/Simulation/include/otbSpectralResponse.h | 4 ++--
 .../Radiometry/Simulation/include/otbSpectralResponse.txx   | 4 ++--
 .../include/otbSurfaceReflectanceToReflectanceFilter.h      | 4 ++--
 .../include/otbSurfaceReflectanceToReflectanceFilter.txx    | 4 ++--
 .../DisparityMap/include/otbDisparityMapEstimationMethod.h  | 4 ++--
 .../include/otbDisparityMapEstimationMethod.txx             | 4 ++--
 .../DisparityMap/include/otbDisparityMapMedianFilter.h      | 4 ++--
 .../DisparityMap/include/otbDisparityMapMedianFilter.txx    | 4 ++--
 .../DisparityMap/include/otbDisparityMapTo3DFilter.h        | 4 ++--
 .../DisparityMap/include/otbDisparityMapTo3DFilter.txx      | 4 ++--
 .../DisparityMap/include/otbDisparityMapToDEMFilter.h       | 4 ++--
 .../DisparityMap/include/otbDisparityMapToDEMFilter.txx     | 4 ++--
 .../DisparityMap/include/otbDisparityTranslateFilter.h      | 4 ++--
 .../DisparityMap/include/otbDisparityTranslateFilter.txx    | 4 ++--
 .../DisparityMap/include/otbFineRegistrationImageFilter.h   | 4 ++--
 .../DisparityMap/include/otbFineRegistrationImageFilter.txx | 4 ++--
 .../DisparityMap/include/otbMultiDisparityMapTo3DFilter.h   | 4 ++--
 .../DisparityMap/include/otbMultiDisparityMapTo3DFilter.txx | 4 ++--
 .../DisparityMap/include/otbNCCRegistrationFilter.h         | 4 ++--
 .../DisparityMap/include/otbNCCRegistrationFilter.txx       | 4 ++--
 .../DisparityMap/include/otbNCCRegistrationFunction.h       | 4 ++--
 .../DisparityMap/include/otbNCCRegistrationFunction.txx     | 4 ++--
 .../include/otbPixelWiseBlockMatchingImageFilter.h          | 4 ++--
 .../include/otbPixelWiseBlockMatchingImageFilter.txx        | 4 ++--
 .../DisparityMap/include/otbSubPixelDisparityImageFilter.h  | 4 ++--
 .../include/otbSubPixelDisparityImageFilter.txx             | 4 ++--
 .../otbBSplinesInterpolateDisplacementFieldGenerator.h      | 4 ++--
 .../otbBSplinesInterpolateDisplacementFieldGenerator.txx    | 4 ++--
 ...BSplinesInterpolateTransformDisplacementFieldGenerator.h | 4 ++--
 ...plinesInterpolateTransformDisplacementFieldGenerator.txx | 4 ++--
 ...arestPointsLinearInterpolateDisplacementFieldGenerator.h | 4 ++--
 ...estPointsLinearInterpolateDisplacementFieldGenerator.txx | 4 ++--
 ...tTransformsLinearInterpolateDisplacementFieldGenerator.h | 4 ++--
 ...ransformsLinearInterpolateDisplacementFieldGenerator.txx | 4 ++--
 .../include/otbNearestPointDisplacementFieldGenerator.h     | 4 ++--
 .../include/otbNearestPointDisplacementFieldGenerator.txx   | 4 ++--
 .../include/otbNearestTransformDisplacementFieldGenerator.h | 4 ++--
 .../otbNearestTransformDisplacementFieldGenerator.txx       | 4 ++--
 .../include/otbPointSetToDisplacementFieldGenerator.h       | 4 ++--
 .../include/otbPointSetToDisplacementFieldGenerator.txx     | 4 ++--
 .../otbPointSetWithTransformToDisplacementFieldGenerator.h  | 4 ++--
 ...otbPointSetWithTransformToDisplacementFieldGenerator.txx | 4 ++--
 .../Stereo/include/otbAdhesionCorrectionFilter.h            | 4 ++--
 .../Stereo/include/otbAdhesionCorrectionFilter.txx          | 4 ++--
 .../Stereo/include/otbBijectionCoherencyFilter.txx          | 4 ++--
 .../Registration/Stereo/include/otbLineOfSightOptimizer.h   | 4 ++--
 .../Registration/Stereo/include/otbLineOfSightOptimizer.txx | 4 ++--
 .../Registration/Stereo/include/otbMulti3DMapToDEMFilter.h  | 4 ++--
 .../Stereo/include/otbMulti3DMapToDEMFilter.txx             | 4 ++--
 .../include/otbStereoSensorModelToElevationMapFilter.h      | 4 ++--
 .../include/otbStereoSensorModelToElevationMapFilter.txx    | 4 ++--
 .../include/otbStereorectificationDisplacementFieldSource.h | 4 ++--
 .../otbStereorectificationDisplacementFieldSource.txx       | 4 ++--
 .../CCOBIA/include/otbConnectedComponentMuParserFunctor.h   | 4 ++--
 .../CCOBIA/include/otbLabelObjectOpeningMuParserFilter.h    | 4 ++--
 .../CCOBIA/include/otbLabelObjectOpeningMuParserFilter.txx  | 4 ++--
 ...ngConnectedComponentSegmentationOBIAToVectorDataFilter.h | 4 ++--
 ...ConnectedComponentSegmentationOBIAToVectorDataFilter.txx | 4 ++--
 .../Conversion/include/otbLabelImageRegionMergingFilter.h   | 4 ++--
 .../Conversion/include/otbLabelImageRegionMergingFilter.txx | 4 ++--
 .../Conversion/include/otbLabelImageRegionPruningFilter.h   | 4 ++--
 .../Conversion/include/otbLabelImageRegionPruningFilter.txx | 4 ++--
 .../Conversion/include/otbLabelImageToOGRDataSourceFilter.h | 4 ++--
 .../include/otbLabelImageToOGRDataSourceFilter.txx          | 4 ++--
 .../Conversion/include/otbLabelImageToVectorDataFilter.h    | 4 ++--
 .../Conversion/include/otbLabelImageToVectorDataFilter.txx  | 4 ++--
 .../Conversion/include/otbLabelMapToVectorDataFilter.h      | 4 ++--
 .../Conversion/include/otbLabelMapToVectorDataFilter.txx    | 4 ++--
 .../Conversion/include/otbOGRDataSourceToLabelImageFilter.h | 4 ++--
 .../Conversion/include/otbPersistentImageToOGRDataFilter.h  | 4 ++--
 .../include/otbPersistentImageToOGRDataFilter.txx           | 4 ++--
 .../Conversion/include/otbPersistentImageToOGRLayerFilter.h | 4 ++--
 .../include/otbPersistentImageToOGRLayerFilter.txx          | 4 ++--
 .../include/otbPersistentImageToVectorDataFilter.h          | 4 ++--
 .../include/otbPersistentImageToVectorDataFilter.txx        | 4 ++--
 .../Conversion/include/otbRasterizeVectorDataFilter.h       | 4 ++--
 .../Conversion/include/otbVectorDataToLabelImageFilter.h    | 4 ++--
 .../Conversion/include/otbVectorDataToLabelImageFilter.txx  | 4 ++--
 .../Conversion/include/otbVectorDataToLabelMapFilter.h      | 4 ++--
 .../Conversion/include/otbVectorDataToLabelMapFilter.txx    | 4 ++--
 .../include/otbVectorDataToLabelMapWithAttributesFilter.h   | 4 ++--
 .../include/otbVectorDataToLabelMapWithAttributesFilter.txx | 4 ++--
 .../Labelling/include/otbLabelToBoundaryImageFilter.h       | 4 ++--
 .../Labelling/include/otbLabeledOutputAccessor.h            | 4 ++--
 .../include/otbLabelizeConfidenceConnectedImageFilter.h     | 4 ++--
 .../include/otbLabelizeConfidenceConnectedImageFilter.txx   | 4 ++--
 .../include/otbLabelizeConnectedThresholdImageFilter.h      | 4 ++--
 .../include/otbLabelizeConnectedThresholdImageFilter.txx    | 4 ++--
 .../Labelling/include/otbLabelizeImageFilterBase.h          | 4 ++--
 .../Labelling/include/otbLabelizeImageFilterBase.txx        | 4 ++--
 .../include/otbLabelizeNeighborhoodConnectedImageFilter.h   | 4 ++--
 .../include/otbLabelizeNeighborhoodConnectedImageFilter.txx | 4 ++--
 .../Labelling/include/otbRelabelComponentImageFilter.h      | 4 ++--
 .../Labelling/include/otbRelabelComponentImageFilter.txx    | 4 ++--
 .../otbMeanShiftConnectedComponentSegmentationFilter.h      | 4 ++--
 .../otbMeanShiftConnectedComponentSegmentationFilter.txx    | 4 ++--
 .../MeanShift/include/otbMeanShiftSegmentationFilter.h      | 4 ++--
 .../MeanShift/include/otbMeanShiftSegmentationFilter.txx    | 4 ++--
 .../Segmentation/Metrics/include/otbHooverInstanceFilter.h  | 4 ++--
 .../Metrics/include/otbHooverInstanceFilter.txx             | 4 ++--
 .../Segmentation/Metrics/include/otbHooverMatrixFilter.h    | 4 ++--
 .../Segmentation/Metrics/include/otbHooverMatrixFilter.txx  | 4 ++--
 .../include/otbClosingOpeningMorphologicalFilter.h          | 4 ++--
 .../include/otbClosingOpeningMorphologicalFilter.txx        | 4 ++--
 .../include/otbConvexOrConcaveClassificationFilter.h        | 4 ++--
 .../include/otbGeodesicMorphologyDecompositionImageFilter.h | 4 ++--
 .../otbGeodesicMorphologyDecompositionImageFilter.txx       | 4 ++--
 ...otbGeodesicMorphologyIterativeDecompositionImageFilter.h | 4 ++--
 ...bGeodesicMorphologyIterativeDecompositionImageFilter.txx | 4 ++--
 .../include/otbGeodesicMorphologyLevelingFilter.h           | 4 ++--
 .../MorphologicalProfiles/include/otbImageToProfileFilter.h | 4 ++--
 .../include/otbImageToProfileFilter.txx                     | 4 ++--
 .../include/otbMorphologicalClosingProfileFilter.h          | 4 ++--
 .../include/otbMorphologicalOpeningProfileFilter.h          | 4 ++--
 .../include/otbMorphologicalProfilesSegmentationFilter.h    | 4 ++--
 .../include/otbMorphologicalProfilesSegmentationFilter.txx  | 4 ++--
 .../otbMultiScaleConvexOrConcaveClassificationFilter.h      | 4 ++--
 .../include/otbOpeningClosingMorphologicalFilter.h          | 4 ++--
 .../include/otbOpeningClosingMorphologicalFilter.txx        | 4 ++--
 .../otbProfileDerivativeToMultiScaleCharacteristicsFilter.h | 4 ++--
 ...tbProfileDerivativeToMultiScaleCharacteristicsFilter.txx | 4 ++--
 .../include/otbProfileToProfileDerivativeFilter.h           | 4 ++--
 .../include/otbProfileToProfileDerivativeFilter.txx         | 4 ++--
 .../include/otbOGRLayerStreamStitchingFilter.h              | 4 ++--
 .../include/otbOGRLayerStreamStitchingFilter.txx            | 4 ++--
 .../include/otbStreamingImageToOGRLayerSegmentationFilter.h | 4 ++--
 .../otbStreamingImageToOGRLayerSegmentationFilter.txx       | 4 ++--
 .../Watersheds/include/otbWatershedSegmentationFilter.h     | 4 ++--
 .../Watersheds/include/otbWatershedSegmentationFilter.txx   | 4 ++--
 Modules/ThirdParty/Boost/src/otbBoostDox.h                  | 6 +++---
 Modules/ThirdParty/ITK/include/otbWarpImageFilter.h         | 4 ++--
 Modules/ThirdParty/ITK/include/otbWarpImageFilter.txx       | 4 ++--
 Modules/ThirdParty/SiftFast/src/otb_siftfast.h              | 2 +-
 .../include/otbWrapperAddProcessToWatchEvent.h              | 4 ++--
 .../ApplicationEngine/include/otbWrapperApplication.h       | 6 +++---
 .../include/otbWrapperApplicationFactory.h                  | 6 +++---
 .../include/otbWrapperApplicationFactoryBase.h              | 4 ++--
 .../include/otbWrapperApplicationHtmlDocGenerator.h         | 4 ++--
 .../include/otbWrapperApplicationRegistry.h                 | 6 +++---
 .../ApplicationEngine/include/otbWrapperChoiceParameter.h   | 4 ++--
 .../include/otbWrapperComplexInputImageParameter.h          | 4 ++--
 .../include/otbWrapperComplexInputImageParameter.txx        | 4 ++--
 .../include/otbWrapperComplexOutputImageParameter.h         | 4 ++--
 .../include/otbWrapperDirectoryParameter.h                  | 4 ++--
 .../include/otbWrapperDocExampleStructure.h                 | 4 ++--
 .../include/otbWrapperElevationParametersHandler.h          | 6 +++---
 .../ApplicationEngine/include/otbWrapperEmptyParameter.h    | 4 ++--
 .../include/otbWrapperInputFilenameListParameter.h          | 4 ++--
 .../include/otbWrapperInputFilenameParameter.h              | 4 ++--
 .../include/otbWrapperInputImageListParameter.h             | 4 ++--
 .../include/otbWrapperInputImageParameter.h                 | 4 ++--
 .../include/otbWrapperInputImageParameter.txx               | 4 ++--
 .../include/otbWrapperInputProcessXMLParameter.h            | 4 ++--
 .../include/otbWrapperInputVectorDataListParameter.h        | 4 ++--
 .../include/otbWrapperInputVectorDataParameter.h            | 4 ++--
 .../ApplicationEngine/include/otbWrapperListViewParameter.h | 4 ++--
 .../Wrappers/ApplicationEngine/include/otbWrapperMacros.h   | 4 ++--
 .../include/otbWrapperMapProjectionParametersHandler.h      | 6 +++---
 .../include/otbWrapperNumericalParameter.h                  | 4 ++--
 .../include/otbWrapperOutputFilenameParameter.h             | 4 ++--
 .../include/otbWrapperOutputImageParameter.h                | 4 ++--
 .../include/otbWrapperOutputProcessXMLParameter.h           | 4 ++--
 .../include/otbWrapperOutputVectorDataParameter.h           | 4 ++--
 .../ApplicationEngine/include/otbWrapperParameter.h         | 4 ++--
 .../ApplicationEngine/include/otbWrapperParameterGroup.h    | 4 ++--
 .../ApplicationEngine/include/otbWrapperParameterKey.h      | 6 +++---
 .../ApplicationEngine/include/otbWrapperRAMParameter.h      | 4 ++--
 .../ApplicationEngine/include/otbWrapperRadiusParameter.h   | 4 ++--
 .../include/otbWrapperStringListParameter.h                 | 4 ++--
 .../ApplicationEngine/include/otbWrapperStringParameter.h   | 4 ++--
 Modules/Wrappers/ApplicationEngine/include/otbWrapperTags.h | 6 +++---
 .../Wrappers/ApplicationEngine/include/otbWrapperTypes.h    | 6 +++---
 .../src/otbWrapperInputImageParameterMacros.h               | 4 ++--
 .../CommandLine/include/otbWrapperCommandLineLauncher.h     | 6 +++---
 .../CommandLine/include/otbWrapperCommandLineParser.h       | 6 +++---
 Modules/Wrappers/QtWidget/include/otbQtApplication.h        | 4 ++--
 .../Wrappers/QtWidget/include/otbQtFileSelectionWidget.h    | 4 ++--
 Modules/Wrappers/QtWidget/include/otbQtLogOutput.h          | 4 ++--
 .../Wrappers/QtWidget/include/otbQtStringSelectionWidget.h  | 4 ++--
 .../QtWidget/include/otbWrapperQtWidgetChoiceParameter.h    | 4 ++--
 .../include/otbWrapperQtWidgetComplexInputImageParameter.h  | 4 ++--
 .../include/otbWrapperQtWidgetComplexOutputImageParameter.h | 4 ++--
 .../QtWidget/include/otbWrapperQtWidgetDirectoryParameter.h | 4 ++--
 .../QtWidget/include/otbWrapperQtWidgetEmptyParameter.h     | 4 ++--
 .../QtWidget/include/otbWrapperQtWidgetFloatParameter.h     | 4 ++--
 .../include/otbWrapperQtWidgetInputFilenameListParameter.h  | 4 ++--
 .../include/otbWrapperQtWidgetInputFilenameParameter.h      | 4 ++--
 .../include/otbWrapperQtWidgetInputImageListParameter.h     | 4 ++--
 .../include/otbWrapperQtWidgetInputImageParameter.h         | 4 ++--
 .../include/otbWrapperQtWidgetInputProcessXMLParameter.h    | 4 ++--
 .../otbWrapperQtWidgetInputVectorDataListParameter.h        | 4 ++--
 .../include/otbWrapperQtWidgetInputVectorDataParameter.h    | 4 ++--
 .../QtWidget/include/otbWrapperQtWidgetIntParameter.h       | 4 ++--
 .../QtWidget/include/otbWrapperQtWidgetListViewParameter.h  | 4 ++--
 Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetModel.h | 4 ++--
 .../include/otbWrapperQtWidgetOutputFilenameParameter.h     | 4 ++--
 .../include/otbWrapperQtWidgetOutputImageParameter.h        | 4 ++--
 .../include/otbWrapperQtWidgetOutputProcessXMLParameter.h   | 4 ++--
 .../include/otbWrapperQtWidgetOutputVectorDataParameter.h   | 4 ++--
 .../QtWidget/include/otbWrapperQtWidgetParameterBase.h      | 4 ++--
 .../QtWidget/include/otbWrapperQtWidgetParameterFactory.h   | 4 ++--
 .../QtWidget/include/otbWrapperQtWidgetParameterGroup.h     | 4 ++--
 .../QtWidget/include/otbWrapperQtWidgetParameterLabel.h     | 4 ++--
 .../QtWidget/include/otbWrapperQtWidgetProgressReport.h     | 4 ++--
 .../QtWidget/include/otbWrapperQtWidgetRAMParameter.h       | 4 ++--
 .../include/otbWrapperQtWidgetSimpleProgressReport.h        | 4 ++--
 .../include/otbWrapperQtWidgetStringListParameter.h         | 4 ++--
 .../QtWidget/include/otbWrapperQtWidgetStringParameter.h    | 4 ++--
 Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetView.h  | 4 ++--
 Modules/Wrappers/SWIG/src/otbWrapperSWIGIncludes.h          | 4 ++--
 1437 files changed, 2940 insertions(+), 2940 deletions(-)

diff --git a/Modules/Adapters/BoostAdapters/include/otbBoostDox.h b/Modules/Adapters/BoostAdapters/include/otbBoostDox.h
index d019018f2b..368507c105 100644
--- a/Modules/Adapters/BoostAdapters/include/otbBoostDox.h
+++ b/Modules/Adapters/BoostAdapters/include/otbBoostDox.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbBoostDox_h
-#define __otbBoostDox_h
+#ifndef otbBoostDox_h
+#define otbBoostDox_h
 
 /**\defgroup boost Boost alike helpers
  * \ingroup  Thematic
@@ -27,4 +27,4 @@
 namespace boost { }
 //@}
 
-#endif // __otbBoostDox_h
+#endif // otbBoostDox_h
diff --git a/Modules/Adapters/BoostAdapters/include/otbJoinContainer.h b/Modules/Adapters/BoostAdapters/include/otbJoinContainer.h
index fd315afa9d..e08ad8d5d1 100644
--- a/Modules/Adapters/BoostAdapters/include/otbJoinContainer.h
+++ b/Modules/Adapters/BoostAdapters/include/otbJoinContainer.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbJoinContainer_h
-#define __otbJoinContainer_h
+#ifndef otbJoinContainer_h
+#define otbJoinContainer_h
 
 // #include <iosfwd>
 #include <string>
@@ -61,4 +61,4 @@ std::ostream & Join(std::ostream &os, TRange const& range, std::string const& se
 // #include "otbJoinContainer.txx"
 #endif
 
-#endif // __otbJoinContainer_h
+#endif // otbJoinContainer_h
diff --git a/Modules/Adapters/CurlAdapters/include/otbCurlHelper.h b/Modules/Adapters/CurlAdapters/include/otbCurlHelper.h
index ceeac5f173..e3b5ad2c41 100644
--- a/Modules/Adapters/CurlAdapters/include/otbCurlHelper.h
+++ b/Modules/Adapters/CurlAdapters/include/otbCurlHelper.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbCurlHelper_h
-#define __otbCurlHelper_h
+#ifndef otbCurlHelper_h
+#define otbCurlHelper_h
 
 #include "otbCurlHelperInterface.h"
 
diff --git a/Modules/Adapters/CurlAdapters/include/otbCurlHelperInterface.h b/Modules/Adapters/CurlAdapters/include/otbCurlHelperInterface.h
index 14b1472dd7..127eb5386a 100644
--- a/Modules/Adapters/CurlAdapters/include/otbCurlHelperInterface.h
+++ b/Modules/Adapters/CurlAdapters/include/otbCurlHelperInterface.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbCurlHelperInterface_h
-#define __otbCurlHelperInterface_h
+#ifndef otbCurlHelperInterface_h
+#define otbCurlHelperInterface_h
 
 #include <iosfwd>
 #include "itkObject.h"
diff --git a/Modules/Adapters/CurlAdapters/include/otbCurlHelperStub.h b/Modules/Adapters/CurlAdapters/include/otbCurlHelperStub.h
index 546aba961d..95bca476b9 100644
--- a/Modules/Adapters/CurlAdapters/include/otbCurlHelperStub.h
+++ b/Modules/Adapters/CurlAdapters/include/otbCurlHelperStub.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbCurlHelperStub_h
-#define __otbCurlHelperStub_h
+#ifndef otbCurlHelperStub_h
+#define otbCurlHelperStub_h
 
 #include "otbCurlHelperInterface.h"
 
diff --git a/Modules/Adapters/GdalAdapters/include/otbGdalDataTypeBridge.h b/Modules/Adapters/GdalAdapters/include/otbGdalDataTypeBridge.h
index d30d3687b0..348287dc6b 100644
--- a/Modules/Adapters/GdalAdapters/include/otbGdalDataTypeBridge.h
+++ b/Modules/Adapters/GdalAdapters/include/otbGdalDataTypeBridge.h
@@ -16,8 +16,8 @@
 
 =========================================================================*/
 
-#ifndef __otbGdalDataTypeBridge_h
-#define __otbGdalDataTypeBridge_h
+#ifndef otbGdalDataTypeBridge_h
+#define otbGdalDataTypeBridge_h
 
 #include <typeinfo>
 #include "gdal.h"
diff --git a/Modules/Adapters/GdalAdapters/include/otbGeometriesSet.h b/Modules/Adapters/GdalAdapters/include/otbGeometriesSet.h
index 4026c1afd9..9a438174e5 100644
--- a/Modules/Adapters/GdalAdapters/include/otbGeometriesSet.h
+++ b/Modules/Adapters/GdalAdapters/include/otbGeometriesSet.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbGeometriesSet_h
-#define __otbGeometriesSet_h
+#ifndef otbGeometriesSet_h
+#define otbGeometriesSet_h
 
 #include <boost/variant.hpp>
 // #include "otbOGRLayerWrapper.h"
@@ -172,4 +172,4 @@ private:
 // #include "otbGeometriesSet.txx"
 #endif
 
-#endif // __otbGeometriesSet_h
+#endif // otbGeometriesSet_h
diff --git a/Modules/Adapters/GdalAdapters/include/otbGeometriesSource.h b/Modules/Adapters/GdalAdapters/include/otbGeometriesSource.h
index 01e13bea82..8d782b1dcd 100644
--- a/Modules/Adapters/GdalAdapters/include/otbGeometriesSource.h
+++ b/Modules/Adapters/GdalAdapters/include/otbGeometriesSource.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbGeometriesSource_h
-#define __otbGeometriesSource_h
+#ifndef otbGeometriesSource_h
+#define otbGeometriesSource_h
 
 #include <boost/noncopyable.hpp>
 #include "itkProcessObject.h"
@@ -135,4 +135,4 @@ protected:
   };
 } // end namespace otb
 
-#endif // __otbGeometriesSource_h
+#endif // otbGeometriesSource_h
diff --git a/Modules/Adapters/GdalAdapters/include/otbGeometriesToGeometriesFilter.h b/Modules/Adapters/GdalAdapters/include/otbGeometriesToGeometriesFilter.h
index b487ba34ba..90b37c80ca 100644
--- a/Modules/Adapters/GdalAdapters/include/otbGeometriesToGeometriesFilter.h
+++ b/Modules/Adapters/GdalAdapters/include/otbGeometriesToGeometriesFilter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbGeometriesToGeometriesFilter_h
-#define __otbGeometriesToGeometriesFilter_h
+#ifndef otbGeometriesToGeometriesFilter_h
+#define otbGeometriesToGeometriesFilter_h
 
 /**\ingroup GeometriesFilters
  * \file    otbGeometriesToGeometriesFilter.h
@@ -391,4 +391,4 @@ protected:
 #include "otbGeometriesToGeometriesFilter.txx"
 #endif
 
-#endif // __otbGeometriesToGeometriesFilter_h
+#endif // otbGeometriesToGeometriesFilter_h
diff --git a/Modules/Adapters/GdalAdapters/include/otbImageReference.h b/Modules/Adapters/GdalAdapters/include/otbImageReference.h
index c9dc8af300..8212dccd31 100644
--- a/Modules/Adapters/GdalAdapters/include/otbImageReference.h
+++ b/Modules/Adapters/GdalAdapters/include/otbImageReference.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbImageReference_h
-#define __otbImageReference_h
+#ifndef otbImageReference_h
+#define otbImageReference_h
 
 #include "itkPoint.h"
 
@@ -173,4 +173,4 @@ private:
 // #include "otbImageReference.txx"
 #endif
 
-#endif // __otbImageReference_h
+#endif // otbImageReference_h
diff --git a/Modules/Adapters/GdalAdapters/include/otbOGR.h b/Modules/Adapters/GdalAdapters/include/otbOGR.h
index b92578e42f..c24fe24118 100644
--- a/Modules/Adapters/GdalAdapters/include/otbOGR.h
+++ b/Modules/Adapters/GdalAdapters/include/otbOGR.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbOGR_h
-#define __otbOGR_h
+#ifndef otbOGR_h
+#define otbOGR_h
 
 namespace otb {
   /**\defgroup gGeometry Geometry
@@ -43,4 +43,4 @@ namespace otb {
  */
 
 
-#endif // __otbOGR_h
+#endif // otbOGR_h
diff --git a/Modules/Adapters/GdalAdapters/include/otbOGRDataSourceWrapper.h b/Modules/Adapters/GdalAdapters/include/otbOGRDataSourceWrapper.h
index ac9845e882..512111e942 100644
--- a/Modules/Adapters/GdalAdapters/include/otbOGRDataSourceWrapper.h
+++ b/Modules/Adapters/GdalAdapters/include/otbOGRDataSourceWrapper.h
@@ -16,8 +16,8 @@
 
 =========================================================================*/
 
-#ifndef __otbOGRDataSourceWrapper_h
-#define __otbOGRDataSourceWrapper_h
+#ifndef otbOGRDataSourceWrapper_h
+#define otbOGRDataSourceWrapper_h
 
 #include <string>
 
@@ -563,4 +563,4 @@ namespace boost { namespace foreach {
 #include "otbOGRDataSourceWrapper.txx"
 #endif
 
-#endif // __otbOGRDataSourceWrapper_h
+#endif // otbOGRDataSourceWrapper_h
diff --git a/Modules/Adapters/GdalAdapters/include/otbOGRDataSourceWrapper.txx b/Modules/Adapters/GdalAdapters/include/otbOGRDataSourceWrapper.txx
index 3ae9e89704..445cb1b3fa 100644
--- a/Modules/Adapters/GdalAdapters/include/otbOGRDataSourceWrapper.txx
+++ b/Modules/Adapters/GdalAdapters/include/otbOGRDataSourceWrapper.txx
@@ -21,8 +21,8 @@
  * \internal this file is meant to be included by otbOGRDataSourceWrapper.h
  */
 
-#ifndef __otbOGRDataSourceWrapper_txx
-#define __otbOGRDataSourceWrapper_txx
+#ifndef otbOGRDataSourceWrapper_txx
+#define otbOGRDataSourceWrapper_txx
 
 /*===========================================================================*/
 /*===============================[ Includes ]================================*/
@@ -127,4 +127,4 @@ Value otb::ogr::DataSource::layer_iter<Value>::dereference() const
 }
 
 
-#endif // __otbOGRDataSourceWrapper_txx
+#endif // otbOGRDataSourceWrapper_txx
diff --git a/Modules/Adapters/GdalAdapters/include/otbOGRDriversInit.h b/Modules/Adapters/GdalAdapters/include/otbOGRDriversInit.h
index 6db81d417a..58ac052a78 100644
--- a/Modules/Adapters/GdalAdapters/include/otbOGRDriversInit.h
+++ b/Modules/Adapters/GdalAdapters/include/otbOGRDriversInit.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbOGRDriversInit_h
-#define __otbOGRDriversInit_h
+#ifndef otbOGRDriversInit_h
+#define otbOGRDriversInit_h
 
 #include <boost/noncopyable.hpp>
 
@@ -57,4 +57,4 @@ private:
 
 } } // end namespace otb::ogr
 
-#endif // __otbOGRDriversInit_h
+#endif // otbOGRDriversInit_h
diff --git a/Modules/Adapters/GdalAdapters/include/otbOGRFeatureWrapper.h b/Modules/Adapters/GdalAdapters/include/otbOGRFeatureWrapper.h
index 593fdd67eb..a88ee2924c 100644
--- a/Modules/Adapters/GdalAdapters/include/otbOGRFeatureWrapper.h
+++ b/Modules/Adapters/GdalAdapters/include/otbOGRFeatureWrapper.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbOGRFeatureWrapper_h
-#define __otbOGRFeatureWrapper_h
+#ifndef otbOGRFeatureWrapper_h
+#define otbOGRFeatureWrapper_h
 
 // #include <iosfwd> // std::ostream&
 #if defined(__GNUC__) || defined(__clang__)
@@ -365,4 +365,4 @@ private:
 #include "otbOGRFeatureWrapper.txx"
 #endif
 
-#endif // __otbOGRFeatureWrapper_h
+#endif // otbOGRFeatureWrapper_h
diff --git a/Modules/Adapters/GdalAdapters/include/otbOGRFeatureWrapper.txx b/Modules/Adapters/GdalAdapters/include/otbOGRFeatureWrapper.txx
index fbc144de6a..3c0031b807 100644
--- a/Modules/Adapters/GdalAdapters/include/otbOGRFeatureWrapper.txx
+++ b/Modules/Adapters/GdalAdapters/include/otbOGRFeatureWrapper.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbOGRFeatureWrapper_txx
-#define __otbOGRFeatureWrapper_txx
+#ifndef otbOGRFeatureWrapper_txx
+#define otbOGRFeatureWrapper_txx
 
 /*===========================================================================*/
 /*===============================[ Includes ]================================*/
@@ -205,4 +205,4 @@ void otb::ogr::Feature::CheckInvariants() const
   assert(m_Feature && "OGRFeature can't be null");
 }
 
-#endif // __otbOGRFeatureWrapper_txx
+#endif // otbOGRFeatureWrapper_txx
diff --git a/Modules/Adapters/GdalAdapters/include/otbOGRFieldWrapper.h b/Modules/Adapters/GdalAdapters/include/otbOGRFieldWrapper.h
index 2f1ad0cced..8a6ef18401 100644
--- a/Modules/Adapters/GdalAdapters/include/otbOGRFieldWrapper.h
+++ b/Modules/Adapters/GdalAdapters/include/otbOGRFieldWrapper.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbOGRFieldWrapper_h
-#define __otbOGRFieldWrapper_h
+#ifndef otbOGRFieldWrapper_h
+#define otbOGRFieldWrapper_h
 
 #include <string>
 #include <boost/shared_ptr.hpp>
@@ -212,4 +212,4 @@ private:
 #include "otbOGRFieldWrapper.txx"
 #endif
 
-#endif // __otbOGRFieldWrapper_h
+#endif // otbOGRFieldWrapper_h
diff --git a/Modules/Adapters/GdalAdapters/include/otbOGRFieldWrapper.txx b/Modules/Adapters/GdalAdapters/include/otbOGRFieldWrapper.txx
index e7e0dd2673..c464afbb67 100644
--- a/Modules/Adapters/GdalAdapters/include/otbOGRFieldWrapper.txx
+++ b/Modules/Adapters/GdalAdapters/include/otbOGRFieldWrapper.txx
@@ -16,8 +16,8 @@
 
 =========================================================================*/
 
-#ifndef __otbOGRFieldWrapper_txx
-#define __otbOGRFieldWrapper_txx
+#ifndef otbOGRFieldWrapper_txx
+#define otbOGRFieldWrapper_txx
 
 /*===========================================================================*/
 /*===============================[ Includes ]================================*/
@@ -479,4 +479,4 @@ OGRField & otb::ogr::Field::ogr()
   return *f;
 }
 
-#endif // __otbOGRFieldWrapper_txx
+#endif // otbOGRFieldWrapper_txx
diff --git a/Modules/Adapters/GdalAdapters/include/otbOGRGeometriesVisitor.h b/Modules/Adapters/GdalAdapters/include/otbOGRGeometriesVisitor.h
index 9547a5124d..f1f051da90 100644
--- a/Modules/Adapters/GdalAdapters/include/otbOGRGeometriesVisitor.h
+++ b/Modules/Adapters/GdalAdapters/include/otbOGRGeometriesVisitor.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbOGRGeometriesVisitor_h
-#define __otbOGRGeometriesVisitor_h
+#ifndef otbOGRGeometriesVisitor_h
+#define otbOGRGeometriesVisitor_h
 
 #include <boost/mpl/assert.hpp>
 #include <boost/type_traits/is_same.hpp>
@@ -94,4 +94,4 @@ TResult apply(TGeometry * geometry, TFunctor functor)
 // #include "otbOGRGeometriesVisitor.txx"
 #endif
 
-#endif // __otbOGRGeometriesVisitor_h
+#endif // otbOGRGeometriesVisitor_h
diff --git a/Modules/Adapters/GdalAdapters/include/otbOGRGeometryWrapper.h b/Modules/Adapters/GdalAdapters/include/otbOGRGeometryWrapper.h
index a25576a023..261809f14c 100644
--- a/Modules/Adapters/GdalAdapters/include/otbOGRGeometryWrapper.h
+++ b/Modules/Adapters/GdalAdapters/include/otbOGRGeometryWrapper.h
@@ -15,8 +15,8 @@
  PURPOSE. See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbOGRGeometryWrapper_h
-#define __otbOGRGeometryWrapper_h
+#ifndef otbOGRGeometryWrapper_h
+#define otbOGRGeometryWrapper_h
 
 #if defined(__GNUC__) || defined(__clang__)
 #pragma GCC diagnostic push
@@ -159,4 +159,4 @@ UniqueGeometryPtr SimplifyPreserveTopology(OGRGeometry const& g, double toleranc
 // #include "otbOGRGeometryWrapper.txx"
 #endif
 
-#endif // __otbOGRGeometryWrapper_h
+#endif // otbOGRGeometryWrapper_h
diff --git a/Modules/Adapters/GdalAdapters/include/otbOGRHelpers.h b/Modules/Adapters/GdalAdapters/include/otbOGRHelpers.h
index 08c23f22aa..f15f249b1d 100644
--- a/Modules/Adapters/GdalAdapters/include/otbOGRHelpers.h
+++ b/Modules/Adapters/GdalAdapters/include/otbOGRHelpers.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbOGRHelpers_h
-#define __otbOGRHelpers_h
+#ifndef otbOGRHelpers_h
+#define otbOGRHelpers_h
 
 #include <string>
 #include <vector>
@@ -95,4 +95,4 @@ private:
 } // ogr namespace
 } // end namespace otb
 
-#endif // __otbOGRHelpers_h
+#endif // otbOGRHelpers_h
diff --git a/Modules/Adapters/GdalAdapters/include/otbOGRLayerWrapper.h b/Modules/Adapters/GdalAdapters/include/otbOGRLayerWrapper.h
index ece2c4180b..b26ebbce56 100644
--- a/Modules/Adapters/GdalAdapters/include/otbOGRLayerWrapper.h
+++ b/Modules/Adapters/GdalAdapters/include/otbOGRLayerWrapper.h
@@ -15,8 +15,8 @@ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbOGRLayerWrapper_h
-#define __otbOGRLayerWrapper_h
+#ifndef otbOGRLayerWrapper_h
+#define otbOGRLayerWrapper_h
 
 // #include <iosfwd> // std::ostream&
 #if defined(__GNUC__) || defined(__clang__)
@@ -548,4 +548,4 @@ inline bool operator!=(Layer const& lhs, Layer const& rhs)
 // #include "otbLayerWrapper.txx"
 #endif
 
-#endif // __otbOGRLayerWrapper_h
+#endif // otbOGRLayerWrapper_h
diff --git a/Modules/Adapters/GdalAdapters/include/otbOGRVersionProxy.h b/Modules/Adapters/GdalAdapters/include/otbOGRVersionProxy.h
index 6db10d56d4..4e59235e7b 100644
--- a/Modules/Adapters/GdalAdapters/include/otbOGRVersionProxy.h
+++ b/Modules/Adapters/GdalAdapters/include/otbOGRVersionProxy.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbOGRVersionProxy_h
-#define __otbOGRVersionProxy_h
+#ifndef otbOGRVersionProxy_h
+#define otbOGRVersionProxy_h
 
 #include <string>
 #include <vector>
diff --git a/Modules/Adapters/OSSIMAdapters/include/otbDEMConvertAdapter.h b/Modules/Adapters/OSSIMAdapters/include/otbDEMConvertAdapter.h
index e821d7fe7b..778e20acda 100644
--- a/Modules/Adapters/OSSIMAdapters/include/otbDEMConvertAdapter.h
+++ b/Modules/Adapters/OSSIMAdapters/include/otbDEMConvertAdapter.h
@@ -16,8 +16,8 @@
 
 =========================================================================*/
 
-#ifndef __otbDEMConvertAdapter_h
-#define __otbDEMConvertAdapter_h
+#ifndef otbDEMConvertAdapter_h
+#define otbDEMConvertAdapter_h
 
 #include "itkObject.h"
 #include "itkObjectFactory.h"
diff --git a/Modules/Adapters/OSSIMAdapters/include/otbDEMHandler.h b/Modules/Adapters/OSSIMAdapters/include/otbDEMHandler.h
index 7f6efa7fbc..75a94d9e85 100644
--- a/Modules/Adapters/OSSIMAdapters/include/otbDEMHandler.h
+++ b/Modules/Adapters/OSSIMAdapters/include/otbDEMHandler.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbDEMHandler_h
-#define __otbDEMHandler_h
+#ifndef otbDEMHandler_h
+#define otbDEMHandler_h
 
 #include <iostream>
 #include <cstdio>
diff --git a/Modules/Adapters/OSSIMAdapters/include/otbDateTimeAdapter.h b/Modules/Adapters/OSSIMAdapters/include/otbDateTimeAdapter.h
index 67c6bb6016..f8c3548078 100644
--- a/Modules/Adapters/OSSIMAdapters/include/otbDateTimeAdapter.h
+++ b/Modules/Adapters/OSSIMAdapters/include/otbDateTimeAdapter.h
@@ -15,8 +15,8 @@
  PURPOSE.  See the above copyright notices for more information.
 
  =========================================================================*/
-#ifndef __otbDateTimeAdapter_h
-#define __otbDateTimeAdapter_h
+#ifndef otbDateTimeAdapter_h
+#define otbDateTimeAdapter_h
 
 #include "itkObject.h"
 #include "itkObjectFactory.h"
diff --git a/Modules/Adapters/OSSIMAdapters/include/otbEllipsoidAdapter.h b/Modules/Adapters/OSSIMAdapters/include/otbEllipsoidAdapter.h
index 05eecad8f9..29def359e0 100644
--- a/Modules/Adapters/OSSIMAdapters/include/otbEllipsoidAdapter.h
+++ b/Modules/Adapters/OSSIMAdapters/include/otbEllipsoidAdapter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbEllipsoidAdapter_h
-#define __otbEllipsoidAdapter_h
+#ifndef otbEllipsoidAdapter_h
+#define otbEllipsoidAdapter_h
 
 #include "itkObject.h"
 #include "itkObjectFactory.h"
diff --git a/Modules/Adapters/OSSIMAdapters/include/otbFilterFunctionValues.h b/Modules/Adapters/OSSIMAdapters/include/otbFilterFunctionValues.h
index 0a72158a8f..e46abcb177 100644
--- a/Modules/Adapters/OSSIMAdapters/include/otbFilterFunctionValues.h
+++ b/Modules/Adapters/OSSIMAdapters/include/otbFilterFunctionValues.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbFilterFunctionValues_h
-#define __otbFilterFunctionValues_h
+#ifndef otbFilterFunctionValues_h
+#define otbFilterFunctionValues_h
 
 #include <vector>
 #include <iostream>
diff --git a/Modules/Adapters/OSSIMAdapters/include/otbGeometricSarSensorModelAdapter.h b/Modules/Adapters/OSSIMAdapters/include/otbGeometricSarSensorModelAdapter.h
index 4c1801ad71..5ba88992bc 100644
--- a/Modules/Adapters/OSSIMAdapters/include/otbGeometricSarSensorModelAdapter.h
+++ b/Modules/Adapters/OSSIMAdapters/include/otbGeometricSarSensorModelAdapter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbGeometricSarSensorModelAdapter_h
-#define __otbGeometricSarSensorModelAdapter_h
+#ifndef otbGeometricSarSensorModelAdapter_h
+#define otbGeometricSarSensorModelAdapter_h
 
 #include <vector>
 
diff --git a/Modules/Adapters/OSSIMAdapters/include/otbImageKeywordlist.h b/Modules/Adapters/OSSIMAdapters/include/otbImageKeywordlist.h
index 868a13a1df..a97ac2ea4e 100644
--- a/Modules/Adapters/OSSIMAdapters/include/otbImageKeywordlist.h
+++ b/Modules/Adapters/OSSIMAdapters/include/otbImageKeywordlist.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbImageKeywordlist_h
-#define __otbImageKeywordlist_h
+#ifndef otbImageKeywordlist_h
+#define otbImageKeywordlist_h
 
 #include <iostream>
 #include <map>
@@ -164,4 +164,4 @@ ImageKeywordlist
 
 } //namespace otb
 
-#endif // __otbImageKeywordlist_h
+#endif // otbImageKeywordlist_h
diff --git a/Modules/Adapters/OSSIMAdapters/include/otbMapProjectionAdapter.h b/Modules/Adapters/OSSIMAdapters/include/otbMapProjectionAdapter.h
index 50366a012e..4cbcb6968d 100644
--- a/Modules/Adapters/OSSIMAdapters/include/otbMapProjectionAdapter.h
+++ b/Modules/Adapters/OSSIMAdapters/include/otbMapProjectionAdapter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbMapProjectionAdapter_h
-#define __otbMapProjectionAdapter_h
+#ifndef otbMapProjectionAdapter_h
+#define otbMapProjectionAdapter_h
 
 #include <string>
 #include <map>
diff --git a/Modules/Adapters/OSSIMAdapters/include/otbMetaDataKey.h b/Modules/Adapters/OSSIMAdapters/include/otbMetaDataKey.h
index d1a031b553..4eb938e392 100644
--- a/Modules/Adapters/OSSIMAdapters/include/otbMetaDataKey.h
+++ b/Modules/Adapters/OSSIMAdapters/include/otbMetaDataKey.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbMetaDataKey_h
-#define __otbMetaDataKey_h
+#ifndef otbMetaDataKey_h
+#define otbMetaDataKey_h
 
 #include <string>
 #include <vector>
diff --git a/Modules/Adapters/OSSIMAdapters/include/otbPlatformPositionAdapter.h b/Modules/Adapters/OSSIMAdapters/include/otbPlatformPositionAdapter.h
index 47e57f0670..85e7b755b8 100644
--- a/Modules/Adapters/OSSIMAdapters/include/otbPlatformPositionAdapter.h
+++ b/Modules/Adapters/OSSIMAdapters/include/otbPlatformPositionAdapter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbPlatformPositionAdapter_h
-#define __otbPlatformPositionAdapter_h
+#ifndef otbPlatformPositionAdapter_h
+#define otbPlatformPositionAdapter_h
 
 #include <vector>
 
diff --git a/Modules/Adapters/OSSIMAdapters/include/otbRPCSolverAdapter.h b/Modules/Adapters/OSSIMAdapters/include/otbRPCSolverAdapter.h
index 3fe64808ca..4a21143cc7 100644
--- a/Modules/Adapters/OSSIMAdapters/include/otbRPCSolverAdapter.h
+++ b/Modules/Adapters/OSSIMAdapters/include/otbRPCSolverAdapter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbRPCSolverAdapter_h
-#define __otbRPCSolverAdapter_h
+#ifndef otbRPCSolverAdapter_h
+#define otbRPCSolverAdapter_h
 
 #include <vector>
 
diff --git a/Modules/Adapters/OSSIMAdapters/include/otbSensorModelAdapter.h b/Modules/Adapters/OSSIMAdapters/include/otbSensorModelAdapter.h
index af899c1fa6..75f1799e51 100644
--- a/Modules/Adapters/OSSIMAdapters/include/otbSensorModelAdapter.h
+++ b/Modules/Adapters/OSSIMAdapters/include/otbSensorModelAdapter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbSensorModelAdapter_h
-#define __otbSensorModelAdapter_h
+#ifndef otbSensorModelAdapter_h
+#define otbSensorModelAdapter_h
 
 #include "otbDEMHandler.h"
 
diff --git a/Modules/Adapters/OpenThreadsAdapters/include/otbThreads.h b/Modules/Adapters/OpenThreadsAdapters/include/otbThreads.h
index b486567871..507ac20281 100644
--- a/Modules/Adapters/OpenThreadsAdapters/include/otbThreads.h
+++ b/Modules/Adapters/OpenThreadsAdapters/include/otbThreads.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbThreads_h
-#define __otbThreads_h
+#ifndef otbThreads_h
+#define otbThreads_h
 
 namespace otb
 {
diff --git a/Modules/Applications/AppClassification/include/otbLearningApplicationBase.h b/Modules/Applications/AppClassification/include/otbLearningApplicationBase.h
index c7edff5f5c..c6f372a9d1 100644
--- a/Modules/Applications/AppClassification/include/otbLearningApplicationBase.h
+++ b/Modules/Applications/AppClassification/include/otbLearningApplicationBase.h
@@ -14,8 +14,8 @@
  PURPOSE.  See the above copyright notices for more information.
 
  =========================================================================*/
-#ifndef __otbLearningApplicationBase_h
-#define __otbLearningApplicationBase_h
+#ifndef otbLearningApplicationBase_h
+#define otbLearningApplicationBase_h
 
 #include "otbConfigure.h"
 
diff --git a/Modules/Applications/AppClassification/include/otbLearningApplicationBase.txx b/Modules/Applications/AppClassification/include/otbLearningApplicationBase.txx
index e8f6b74b78..418d340c8c 100644
--- a/Modules/Applications/AppClassification/include/otbLearningApplicationBase.txx
+++ b/Modules/Applications/AppClassification/include/otbLearningApplicationBase.txx
@@ -14,8 +14,8 @@
  PURPOSE.  See the above copyright notices for more information.
 
  =========================================================================*/
-#ifndef __otbLearningApplicationBase_txx
-#define __otbLearningApplicationBase_txx
+#ifndef otbLearningApplicationBase_txx
+#define otbLearningApplicationBase_txx
 
 #include "otbLearningApplicationBase.h"
 // only need this filter as a dummy process object
diff --git a/Modules/Applications/AppClassification/include/otbTrainBoost.txx b/Modules/Applications/AppClassification/include/otbTrainBoost.txx
index 5e99db8f2e..fbd99531a4 100644
--- a/Modules/Applications/AppClassification/include/otbTrainBoost.txx
+++ b/Modules/Applications/AppClassification/include/otbTrainBoost.txx
@@ -14,8 +14,8 @@
  PURPOSE.  See the above copyright notices for more information.
 
  =========================================================================*/
-#ifndef __otbTrainBoost_txx
-#define __otbTrainBoost_txx
+#ifndef otbTrainBoost_txx
+#define otbTrainBoost_txx
 #include "otbLearningApplicationBase.h"
 
 namespace otb
diff --git a/Modules/Applications/AppClassification/include/otbTrainDecisionTree.txx b/Modules/Applications/AppClassification/include/otbTrainDecisionTree.txx
index 285ae198e8..61cd1a34be 100644
--- a/Modules/Applications/AppClassification/include/otbTrainDecisionTree.txx
+++ b/Modules/Applications/AppClassification/include/otbTrainDecisionTree.txx
@@ -14,8 +14,8 @@
  PURPOSE.  See the above copyright notices for more information.
 
  =========================================================================*/
-#ifndef __otbTrainDecisionTree_txx
-#define __otbTrainDecisionTree_txx
+#ifndef otbTrainDecisionTree_txx
+#define otbTrainDecisionTree_txx
 #include "otbLearningApplicationBase.h"
 
 namespace otb
diff --git a/Modules/Applications/AppClassification/include/otbTrainGradientBoostedTree.txx b/Modules/Applications/AppClassification/include/otbTrainGradientBoostedTree.txx
index 9bc2bcdd9e..bcf5caa861 100644
--- a/Modules/Applications/AppClassification/include/otbTrainGradientBoostedTree.txx
+++ b/Modules/Applications/AppClassification/include/otbTrainGradientBoostedTree.txx
@@ -14,8 +14,8 @@
  PURPOSE.  See the above copyright notices for more information.
 
  =========================================================================*/
-#ifndef __otbTrainGradientBoostedTree_txx
-#define __otbTrainGradientBoostedTree_txx
+#ifndef otbTrainGradientBoostedTree_txx
+#define otbTrainGradientBoostedTree_txx
 #include "otbLearningApplicationBase.h"
 
 namespace otb
diff --git a/Modules/Applications/AppClassification/include/otbTrainKNN.txx b/Modules/Applications/AppClassification/include/otbTrainKNN.txx
index 10ad85822c..fdf10cdf28 100644
--- a/Modules/Applications/AppClassification/include/otbTrainKNN.txx
+++ b/Modules/Applications/AppClassification/include/otbTrainKNN.txx
@@ -14,8 +14,8 @@
  PURPOSE.  See the above copyright notices for more information.
 
  =========================================================================*/
-#ifndef __otbTrainKNN_txx
-#define __otbTrainKNN_txx
+#ifndef otbTrainKNN_txx
+#define otbTrainKNN_txx
 #include "otbLearningApplicationBase.h"
 
 namespace otb
diff --git a/Modules/Applications/AppClassification/include/otbTrainLibSVM.txx b/Modules/Applications/AppClassification/include/otbTrainLibSVM.txx
index 774121472a..f89b714156 100644
--- a/Modules/Applications/AppClassification/include/otbTrainLibSVM.txx
+++ b/Modules/Applications/AppClassification/include/otbTrainLibSVM.txx
@@ -14,8 +14,8 @@
  PURPOSE.  See the above copyright notices for more information.
 
  =========================================================================*/
-#ifndef __otbTrainLibSVM_txx
-#define __otbTrainLibSVM_txx
+#ifndef otbTrainLibSVM_txx
+#define otbTrainLibSVM_txx
 #include "otbLearningApplicationBase.h"
 
 namespace otb
diff --git a/Modules/Applications/AppClassification/include/otbTrainNeuralNetwork.txx b/Modules/Applications/AppClassification/include/otbTrainNeuralNetwork.txx
index 559f30e33b..ee7bf43d47 100644
--- a/Modules/Applications/AppClassification/include/otbTrainNeuralNetwork.txx
+++ b/Modules/Applications/AppClassification/include/otbTrainNeuralNetwork.txx
@@ -14,8 +14,8 @@
  PURPOSE.  See the above copyright notices for more information.
 
  =========================================================================*/
-#ifndef __otbTrainNeuralNetwork_txx
-#define __otbTrainNeuralNetwork_txx
+#ifndef otbTrainNeuralNetwork_txx
+#define otbTrainNeuralNetwork_txx
 #include <boost/lexical_cast.hpp>
 #include "otbLearningApplicationBase.h"
 
diff --git a/Modules/Applications/AppClassification/include/otbTrainNormalBayes.txx b/Modules/Applications/AppClassification/include/otbTrainNormalBayes.txx
index d5f3cce8e3..e0a45d4c6f 100644
--- a/Modules/Applications/AppClassification/include/otbTrainNormalBayes.txx
+++ b/Modules/Applications/AppClassification/include/otbTrainNormalBayes.txx
@@ -14,8 +14,8 @@
  PURPOSE.  See the above copyright notices for more information.
 
  =========================================================================*/
-#ifndef __otbTrainNormalBayes_txx
-#define __otbTrainNormalBayes_txx
+#ifndef otbTrainNormalBayes_txx
+#define otbTrainNormalBayes_txx
 #include "otbLearningApplicationBase.h"
 
 namespace otb
diff --git a/Modules/Applications/AppClassification/include/otbTrainRandomForests.txx b/Modules/Applications/AppClassification/include/otbTrainRandomForests.txx
index 88f3b7cf96..669b4562b6 100644
--- a/Modules/Applications/AppClassification/include/otbTrainRandomForests.txx
+++ b/Modules/Applications/AppClassification/include/otbTrainRandomForests.txx
@@ -14,8 +14,8 @@
  PURPOSE.  See the above copyright notices for more information.
 
  =========================================================================*/
-#ifndef __otbTrainRandomForests_txx
-#define __otbTrainRandomForests_txx
+#ifndef otbTrainRandomForests_txx
+#define otbTrainRandomForests_txx
 #include "otbLearningApplicationBase.h"
 
 namespace otb
diff --git a/Modules/Applications/AppClassification/include/otbTrainSVM.txx b/Modules/Applications/AppClassification/include/otbTrainSVM.txx
index 58e2ee4401..d36c28dd05 100644
--- a/Modules/Applications/AppClassification/include/otbTrainSVM.txx
+++ b/Modules/Applications/AppClassification/include/otbTrainSVM.txx
@@ -14,8 +14,8 @@
  PURPOSE.  See the above copyright notices for more information.
 
  =========================================================================*/
-#ifndef __otbTrainSVM_txx
-#define __otbTrainSVM_txx
+#ifndef otbTrainSVM_txx
+#define otbTrainSVM_txx
 #include "otbLearningApplicationBase.h"
 
 namespace otb
diff --git a/Modules/Core/CommandLineParser/include/otbCommandLineArgumentParser.h b/Modules/Core/CommandLineParser/include/otbCommandLineArgumentParser.h
index 4b252f5a4f..3a524c0496 100644
--- a/Modules/Core/CommandLineParser/include/otbCommandLineArgumentParser.h
+++ b/Modules/Core/CommandLineParser/include/otbCommandLineArgumentParser.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbCommandLineArgumentParser_h
-#define __otbCommandLineArgumentParser_h
+#ifndef otbCommandLineArgumentParser_h
+#define otbCommandLineArgumentParser_h
 
 #include <iostream>
 #include <vector>
@@ -287,4 +287,4 @@ private:
 
 }
 
-#endif // __otbCommandLineArgumentParser_h_
+#endif // otbCommandLineArgumentParser_h_
diff --git a/Modules/Core/Common/include/otbChannelSelectorFunctor.h b/Modules/Core/Common/include/otbChannelSelectorFunctor.h
index 802938bbd0..d344226245 100644
--- a/Modules/Core/Common/include/otbChannelSelectorFunctor.h
+++ b/Modules/Core/Common/include/otbChannelSelectorFunctor.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbChannelSelectorFunctor_h
-#define __otbChannelSelectorFunctor_h
+#ifndef otbChannelSelectorFunctor_h
+#define otbChannelSelectorFunctor_h
 #include <cassert>
 
 #include "itkVariableLengthVector.h"
diff --git a/Modules/Core/Common/include/otbCommandProgressUpdate.h b/Modules/Core/Common/include/otbCommandProgressUpdate.h
index 4fd0842f39..3053bde813 100644
--- a/Modules/Core/Common/include/otbCommandProgressUpdate.h
+++ b/Modules/Core/Common/include/otbCommandProgressUpdate.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbCommandProgressUpdate_h
-#define __otbCommandProgressUpdate_h
+#ifndef otbCommandProgressUpdate_h
+#define otbCommandProgressUpdate_h
 
 #include "itkCommand.h"
 #include <sstream>
diff --git a/Modules/Core/Common/include/otbCommandProgressUpdate.txx b/Modules/Core/Common/include/otbCommandProgressUpdate.txx
index a722def497..79fa731f74 100644
--- a/Modules/Core/Common/include/otbCommandProgressUpdate.txx
+++ b/Modules/Core/Common/include/otbCommandProgressUpdate.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbCommandProgressUpdate_txx
-#define __otbCommandProgressUpdate_txx
+#ifndef otbCommandProgressUpdate_txx
+#define otbCommandProgressUpdate_txx
 
 #include "otbCommandProgressUpdate.h"
 
diff --git a/Modules/Core/Common/include/otbComplexToIntensityImageFilter.h b/Modules/Core/Common/include/otbComplexToIntensityImageFilter.h
index a91f59ad4b..8a8e1a522a 100644
--- a/Modules/Core/Common/include/otbComplexToIntensityImageFilter.h
+++ b/Modules/Core/Common/include/otbComplexToIntensityImageFilter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbComplexToIntensityImageFilter_h
-#define __otbComplexToIntensityImageFilter_h
+#ifndef otbComplexToIntensityImageFilter_h
+#define otbComplexToIntensityImageFilter_h
 
 #include "itkUnaryFunctorImageFilter.h"
 #include "vnl/vnl_math.h"
diff --git a/Modules/Core/Common/include/otbComplexToVectorImageCastFilter.h b/Modules/Core/Common/include/otbComplexToVectorImageCastFilter.h
index 0cb2d45d07..de60929a4f 100644
--- a/Modules/Core/Common/include/otbComplexToVectorImageCastFilter.h
+++ b/Modules/Core/Common/include/otbComplexToVectorImageCastFilter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbComplexToVectorImageCastFilter_h
-#define __otbComplexToVectorImageCastFilter_h
+#ifndef otbComplexToVectorImageCastFilter_h
+#define otbComplexToVectorImageCastFilter_h
 
 #include "itkUnaryFunctorImageFilter.h"
 #include "vnl/vnl_math.h"
diff --git a/Modules/Core/Common/include/otbDecimateImageFilter.h b/Modules/Core/Common/include/otbDecimateImageFilter.h
index a171a7670e..8974d23bca 100644
--- a/Modules/Core/Common/include/otbDecimateImageFilter.h
+++ b/Modules/Core/Common/include/otbDecimateImageFilter.h
@@ -18,8 +18,8 @@
 
 =========================================================================*/
 
-#ifndef __otbDecimateImageFilter_h
-#define __otbDecimateImageFilter_h
+#ifndef otbDecimateImageFilter_h
+#define otbDecimateImageFilter_h
 
 #include "itkImageToImageFilter.h"
 #include "itkImage.h"
diff --git a/Modules/Core/Common/include/otbDecimateImageFilter.txx b/Modules/Core/Common/include/otbDecimateImageFilter.txx
index cfe08abf4e..ea97be241e 100644
--- a/Modules/Core/Common/include/otbDecimateImageFilter.txx
+++ b/Modules/Core/Common/include/otbDecimateImageFilter.txx
@@ -18,8 +18,8 @@
 
 =========================================================================*/
 
-#ifndef __otbDecimateImageFilter_txx
-#define __otbDecimateImageFilter_txx
+#ifndef otbDecimateImageFilter_txx
+#define otbDecimateImageFilter_txx
 
 #include "otbDecimateImageFilter.h"
 
diff --git a/Modules/Core/Common/include/otbDotProductImageFilter.h b/Modules/Core/Common/include/otbDotProductImageFilter.h
index 1441a8a66e..b97be6154e 100644
--- a/Modules/Core/Common/include/otbDotProductImageFilter.h
+++ b/Modules/Core/Common/include/otbDotProductImageFilter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbDotProductImageFilter_h
-#define __otbDotProductImageFilter_h
+#ifndef otbDotProductImageFilter_h
+#define otbDotProductImageFilter_h
 
 #include "itkMacro.h"
 #include "otbUnaryFunctorImageFilter.h"
diff --git a/Modules/Core/Common/include/otbDotProductImageFilter.txx b/Modules/Core/Common/include/otbDotProductImageFilter.txx
index 1c56622a98..5b017f95c9 100644
--- a/Modules/Core/Common/include/otbDotProductImageFilter.txx
+++ b/Modules/Core/Common/include/otbDotProductImageFilter.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbDotProductImageFilter_txx
-#define __otbDotProductImageFilter_txx
+#ifndef otbDotProductImageFilter_txx
+#define otbDotProductImageFilter_txx
 
 #include "otbDotProductImageFilter.h"
 
diff --git a/Modules/Core/Common/include/otbFilterWatcherBase.h b/Modules/Core/Common/include/otbFilterWatcherBase.h
index 66a01f0857..e9d74750b4 100644
--- a/Modules/Core/Common/include/otbFilterWatcherBase.h
+++ b/Modules/Core/Common/include/otbFilterWatcherBase.h
@@ -18,8 +18,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbFilterWatcherBase_h
-#define __otbFilterWatcherBase_h
+#ifndef otbFilterWatcherBase_h
+#define otbFilterWatcherBase_h
 
 #include "itkCommand.h"
 #include "itkProcessObject.h"
diff --git a/Modules/Core/Common/include/otbFunctionToImageFilter.h b/Modules/Core/Common/include/otbFunctionToImageFilter.h
index fa2353835d..5cea5d28a9 100644
--- a/Modules/Core/Common/include/otbFunctionToImageFilter.h
+++ b/Modules/Core/Common/include/otbFunctionToImageFilter.h
@@ -18,8 +18,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbFunctionToImageFilter_h
-#define __otbFunctionToImageFilter_h
+#ifndef otbFunctionToImageFilter_h
+#define otbFunctionToImageFilter_h
 
 #include "itkInPlaceImageFilter.h"
 #include "itkImageFunction.h"
diff --git a/Modules/Core/Common/include/otbFunctionToImageFilter.txx b/Modules/Core/Common/include/otbFunctionToImageFilter.txx
index e9110eb9b0..553a76a8ce 100644
--- a/Modules/Core/Common/include/otbFunctionToImageFilter.txx
+++ b/Modules/Core/Common/include/otbFunctionToImageFilter.txx
@@ -18,8 +18,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbFunctionToImageFilter_txx
-#define __otbFunctionToImageFilter_txx
+#ifndef otbFunctionToImageFilter_txx
+#define otbFunctionToImageFilter_txx
 
 #include "otbFunctionToImageFilter.h"
 #include "itkImageRegionConstIterator.h"
diff --git a/Modules/Core/Common/include/otbImageAndVectorImageOperationFilter.h b/Modules/Core/Common/include/otbImageAndVectorImageOperationFilter.h
index d8ec5e0952..5eb8fac75e 100644
--- a/Modules/Core/Common/include/otbImageAndVectorImageOperationFilter.h
+++ b/Modules/Core/Common/include/otbImageAndVectorImageOperationFilter.h
@@ -19,8 +19,8 @@
 
 =========================================================================*/
 
-#ifndef __otbImageAndVectorImageOperationFilter_h
-#define __otbImageAndVectorImageOperationFilter_h
+#ifndef otbImageAndVectorImageOperationFilter_h
+#define otbImageAndVectorImageOperationFilter_h
 
 #include "itkBinaryFunctorImageFilter.h"
 #include "itkImageToImageFilter.h"
diff --git a/Modules/Core/Common/include/otbImageAndVectorImageOperationFilter.txx b/Modules/Core/Common/include/otbImageAndVectorImageOperationFilter.txx
index 86febca379..83c4db4d7e 100644
--- a/Modules/Core/Common/include/otbImageAndVectorImageOperationFilter.txx
+++ b/Modules/Core/Common/include/otbImageAndVectorImageOperationFilter.txx
@@ -18,8 +18,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbImageAndVectorImageOperationFilter_txx
-#define __otbImageAndVectorImageOperationFilter_txx
+#ifndef otbImageAndVectorImageOperationFilter_txx
+#define otbImageAndVectorImageOperationFilter_txx
 
 #include "otbImageAndVectorImageOperationFilter.h"
 #include "itkObjectFactory.h"
diff --git a/Modules/Core/Common/include/otbImageRegionAdaptativeSplitter.h b/Modules/Core/Common/include/otbImageRegionAdaptativeSplitter.h
index 57384fd469..fc4cad3cde 100644
--- a/Modules/Core/Common/include/otbImageRegionAdaptativeSplitter.h
+++ b/Modules/Core/Common/include/otbImageRegionAdaptativeSplitter.h
@@ -16,8 +16,8 @@
 
 =========================================================================*/
 
-#ifndef __otbImageRegionAdaptativeSplitter_h
-#define __otbImageRegionAdaptativeSplitter_h
+#ifndef otbImageRegionAdaptativeSplitter_h
+#define otbImageRegionAdaptativeSplitter_h
 
 #include "itkRegion.h"
 #include "itkImageRegionSplitter.h"
diff --git a/Modules/Core/Common/include/otbImageRegionAdaptativeSplitter.txx b/Modules/Core/Common/include/otbImageRegionAdaptativeSplitter.txx
index ef5b28192b..a76b3ce040 100644
--- a/Modules/Core/Common/include/otbImageRegionAdaptativeSplitter.txx
+++ b/Modules/Core/Common/include/otbImageRegionAdaptativeSplitter.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbImageRegionAdaptativeSplitter_txx
-#define __otbImageRegionAdaptativeSplitter_txx
+#ifndef otbImageRegionAdaptativeSplitter_txx
+#define otbImageRegionAdaptativeSplitter_txx
 
 #include "otbImageRegionAdaptativeSplitter.h"
 #include "otbMath.h"
diff --git a/Modules/Core/Common/include/otbImageRegionNonUniformMultidimensionalSplitter.h b/Modules/Core/Common/include/otbImageRegionNonUniformMultidimensionalSplitter.h
index 31120be9c7..c257af0f53 100644
--- a/Modules/Core/Common/include/otbImageRegionNonUniformMultidimensionalSplitter.h
+++ b/Modules/Core/Common/include/otbImageRegionNonUniformMultidimensionalSplitter.h
@@ -18,8 +18,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbImageRegionNonUniformMultidimensionalSplitter_h
-#define __otbImageRegionNonUniformMultidimensionalSplitter_h
+#ifndef otbImageRegionNonUniformMultidimensionalSplitter_h
+#define otbImageRegionNonUniformMultidimensionalSplitter_h
 
 #include "itkRegion.h"
 #include "itkObjectFactory.h"
diff --git a/Modules/Core/Common/include/otbImageRegionNonUniformMultidimensionalSplitter.txx b/Modules/Core/Common/include/otbImageRegionNonUniformMultidimensionalSplitter.txx
index 8ad23750e6..29cc47d2f1 100644
--- a/Modules/Core/Common/include/otbImageRegionNonUniformMultidimensionalSplitter.txx
+++ b/Modules/Core/Common/include/otbImageRegionNonUniformMultidimensionalSplitter.txx
@@ -18,8 +18,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbImageRegionNonUniformMultidimensionalSplitter_txx
-#define __otbImageRegionNonUniformMultidimensionalSplitter_txx
+#ifndef otbImageRegionNonUniformMultidimensionalSplitter_txx
+#define otbImageRegionNonUniformMultidimensionalSplitter_txx
 #include "otbImageRegionNonUniformMultidimensionalSplitter.h"
 
 namespace otb
diff --git a/Modules/Core/Common/include/otbImageRegionSquareTileSplitter.h b/Modules/Core/Common/include/otbImageRegionSquareTileSplitter.h
index 7058757c60..534c30f62a 100644
--- a/Modules/Core/Common/include/otbImageRegionSquareTileSplitter.h
+++ b/Modules/Core/Common/include/otbImageRegionSquareTileSplitter.h
@@ -16,8 +16,8 @@
 
 =========================================================================*/
 
-#ifndef __otbImageRegionSquareTileSplitter_h
-#define __otbImageRegionSquareTileSplitter_h
+#ifndef otbImageRegionSquareTileSplitter_h
+#define otbImageRegionSquareTileSplitter_h
 
 #include "itkRegion.h"
 #include "itkImageRegionSplitter.h"
diff --git a/Modules/Core/Common/include/otbImageRegionSquareTileSplitter.txx b/Modules/Core/Common/include/otbImageRegionSquareTileSplitter.txx
index a964c82dd4..50b0eb884c 100644
--- a/Modules/Core/Common/include/otbImageRegionSquareTileSplitter.txx
+++ b/Modules/Core/Common/include/otbImageRegionSquareTileSplitter.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbImageRegionSquareTileSplitter_txx
-#define __otbImageRegionSquareTileSplitter_txx
+#ifndef otbImageRegionSquareTileSplitter_txx
+#define otbImageRegionSquareTileSplitter_txx
 
 #include "otbImageRegionSquareTileSplitter.h"
 #include "otbMath.h"
diff --git a/Modules/Core/Common/include/otbImageRegionTileMapSplitter.h b/Modules/Core/Common/include/otbImageRegionTileMapSplitter.h
index 69aa70fa0e..a7e5fca0e7 100644
--- a/Modules/Core/Common/include/otbImageRegionTileMapSplitter.h
+++ b/Modules/Core/Common/include/otbImageRegionTileMapSplitter.h
@@ -16,8 +16,8 @@
 
 =========================================================================*/
 
-#ifndef __otbImageRegionTileMapSplitter_h
-#define __otbImageRegionTileMapSplitter_h
+#ifndef otbImageRegionTileMapSplitter_h
+#define otbImageRegionTileMapSplitter_h
 
 #include "itkRegion.h"
 #include "itkImageRegionSplitter.h"
diff --git a/Modules/Core/Common/include/otbImageRegionTileMapSplitter.txx b/Modules/Core/Common/include/otbImageRegionTileMapSplitter.txx
index 77c81c95fe..0928c6ea79 100644
--- a/Modules/Core/Common/include/otbImageRegionTileMapSplitter.txx
+++ b/Modules/Core/Common/include/otbImageRegionTileMapSplitter.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbImageRegionTileMapSplitter_txx
-#define __otbImageRegionTileMapSplitter_txx
+#ifndef otbImageRegionTileMapSplitter_txx
+#define otbImageRegionTileMapSplitter_txx
 
 #include "otbImageRegionTileMapSplitter.h"
 #include "otbMath.h"
diff --git a/Modules/Core/Common/include/otbImageToModulusAndDirectionImageFilter.h b/Modules/Core/Common/include/otbImageToModulusAndDirectionImageFilter.h
index e0fe3a64ff..975866a508 100644
--- a/Modules/Core/Common/include/otbImageToModulusAndDirectionImageFilter.h
+++ b/Modules/Core/Common/include/otbImageToModulusAndDirectionImageFilter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbImageToModulusAndDirectionImageFilter_h
-#define __otbImageToModulusAndDirectionImageFilter_h
+#ifndef otbImageToModulusAndDirectionImageFilter_h
+#define otbImageToModulusAndDirectionImageFilter_h
 
 #include "itkImageToImageFilter.h"
 
diff --git a/Modules/Core/Common/include/otbImageToModulusAndDirectionImageFilter.txx b/Modules/Core/Common/include/otbImageToModulusAndDirectionImageFilter.txx
index e5542f28ed..0f7b6eadce 100644
--- a/Modules/Core/Common/include/otbImageToModulusAndDirectionImageFilter.txx
+++ b/Modules/Core/Common/include/otbImageToModulusAndDirectionImageFilter.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbImageToModulusAndDirectionImageFilter_txx
-#define __otbImageToModulusAndDirectionImageFilter_txx
+#ifndef otbImageToModulusAndDirectionImageFilter_txx
+#define otbImageToModulusAndDirectionImageFilter_txx
 
 #include "otbImageToModulusAndDirectionImageFilter.h"
 #include "itkProcessObject.h"
diff --git a/Modules/Core/Common/include/otbImaginaryImageToComplexImageFilter.h b/Modules/Core/Common/include/otbImaginaryImageToComplexImageFilter.h
index e1718630dd..fb75b24f5f 100644
--- a/Modules/Core/Common/include/otbImaginaryImageToComplexImageFilter.h
+++ b/Modules/Core/Common/include/otbImaginaryImageToComplexImageFilter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbImaginaryImageToComplexImageFilter_h
-#define __otbImaginaryImageToComplexImageFilter_h
+#ifndef otbImaginaryImageToComplexImageFilter_h
+#define otbImaginaryImageToComplexImageFilter_h
 
 #include "itkUnaryFunctorImageFilter.h"
 #include "vnl/vnl_math.h"
diff --git a/Modules/Core/Common/include/otbImportImageFilter.h b/Modules/Core/Common/include/otbImportImageFilter.h
index a2c78cc462..6876435f17 100644
--- a/Modules/Core/Common/include/otbImportImageFilter.h
+++ b/Modules/Core/Common/include/otbImportImageFilter.h
@@ -19,8 +19,8 @@
 
 =========================================================================*/
 
-#ifndef __otbImportImageFilter_h
-#define __otbImportImageFilter_h
+#ifndef otbImportImageFilter_h
+#define otbImportImageFilter_h
 
 #include "itkImageSource.h"
 
diff --git a/Modules/Core/Common/include/otbImportImageFilter.txx b/Modules/Core/Common/include/otbImportImageFilter.txx
index 4b41af2ef0..452f84591f 100644
--- a/Modules/Core/Common/include/otbImportImageFilter.txx
+++ b/Modules/Core/Common/include/otbImportImageFilter.txx
@@ -18,8 +18,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbImportImageFilter_txx
-#define __otbImportImageFilter_txx
+#ifndef otbImportImageFilter_txx
+#define otbImportImageFilter_txx
 
 #include "otbImportImageFilter.h"
 #include "itkObjectFactory.h"
diff --git a/Modules/Core/Common/include/otbImportVectorImageFilter.h b/Modules/Core/Common/include/otbImportVectorImageFilter.h
index be1f381e91..63f53628b4 100644
--- a/Modules/Core/Common/include/otbImportVectorImageFilter.h
+++ b/Modules/Core/Common/include/otbImportVectorImageFilter.h
@@ -19,8 +19,8 @@
 
 =========================================================================*/
 
-#ifndef __otbImportVectorImageFilter_h
-#define __otbImportVectorImageFilter_h
+#ifndef otbImportVectorImageFilter_h
+#define otbImportVectorImageFilter_h
 
 #include "itkImageSource.h"
 
diff --git a/Modules/Core/Common/include/otbImportVectorImageFilter.txx b/Modules/Core/Common/include/otbImportVectorImageFilter.txx
index de232f24e0..9db82edd63 100644
--- a/Modules/Core/Common/include/otbImportVectorImageFilter.txx
+++ b/Modules/Core/Common/include/otbImportVectorImageFilter.txx
@@ -18,8 +18,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbImportVectorImageFilter_txx
-#define __otbImportVectorImageFilter_txx
+#ifndef otbImportVectorImageFilter_txx
+#define otbImportVectorImageFilter_txx
 
 #include "otbImportVectorImageFilter.h"
 #include "itkObjectFactory.h"
diff --git a/Modules/Core/Common/include/otbMacro.h b/Modules/Core/Common/include/otbMacro.h
index 7b1b06d187..9d745248c9 100644
--- a/Modules/Core/Common/include/otbMacro.h
+++ b/Modules/Core/Common/include/otbMacro.h
@@ -22,8 +22,8 @@
  * to interface to instance variables in a standard fashion.
  */
 
-#ifndef __otbMacro_h
-#define __otbMacro_h
+#ifndef otbMacro_h
+#define otbMacro_h
 
 #include "itkMacro.h"
 #include "itkObject.h"
diff --git a/Modules/Core/Common/include/otbMath.h b/Modules/Core/Common/include/otbMath.h
index 3e2fecdbbc..3e769eb823 100644
--- a/Modules/Core/Common/include/otbMath.h
+++ b/Modules/Core/Common/include/otbMath.h
@@ -16,8 +16,8 @@
 
 =========================================================================*/
 
-#ifndef __otbMath_h
-#define __otbMath_h
+#ifndef otbMath_h
+#define otbMath_h
 
 /**
  * otbMath.h defines standard math macros, constants, and other
diff --git a/Modules/Core/Common/include/otbModelComponentBase.h b/Modules/Core/Common/include/otbModelComponentBase.h
index 5d2ef2af6f..3476680584 100644
--- a/Modules/Core/Common/include/otbModelComponentBase.h
+++ b/Modules/Core/Common/include/otbModelComponentBase.h
@@ -17,8 +17,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbModelComponentBase_h
-#define __otbModelComponentBase_h
+#ifndef otbModelComponentBase_h
+#define otbModelComponentBase_h
 
 #include <vnl/vnl_vector.h>
 #include <vnl/vnl_matrix.h>
diff --git a/Modules/Core/Common/include/otbModelComponentBase.txx b/Modules/Core/Common/include/otbModelComponentBase.txx
index c150f29ed7..843ad7834a 100644
--- a/Modules/Core/Common/include/otbModelComponentBase.txx
+++ b/Modules/Core/Common/include/otbModelComponentBase.txx
@@ -17,8 +17,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbModelComponentBase_txx
-#define __otbModelComponentBase_txx
+#ifndef otbModelComponentBase_txx
+#define otbModelComponentBase_txx
 
 #include <iostream>
 
diff --git a/Modules/Core/Common/include/otbQuaternaryFunctorImageFilter.h b/Modules/Core/Common/include/otbQuaternaryFunctorImageFilter.h
index 0dd78cac31..8ea5b23527 100644
--- a/Modules/Core/Common/include/otbQuaternaryFunctorImageFilter.h
+++ b/Modules/Core/Common/include/otbQuaternaryFunctorImageFilter.h
@@ -18,8 +18,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbQuaternaryFunctorImageFilter_h
-#define __otbQuaternaryFunctorImageFilter_h
+#ifndef otbQuaternaryFunctorImageFilter_h
+#define otbQuaternaryFunctorImageFilter_h
 
 #include "itkInPlaceImageFilter.h"
 #include "itkImageRegionIteratorWithIndex.h"
diff --git a/Modules/Core/Common/include/otbQuaternaryFunctorImageFilter.txx b/Modules/Core/Common/include/otbQuaternaryFunctorImageFilter.txx
index b4d6cee9b7..9a36abbc56 100644
--- a/Modules/Core/Common/include/otbQuaternaryFunctorImageFilter.txx
+++ b/Modules/Core/Common/include/otbQuaternaryFunctorImageFilter.txx
@@ -18,8 +18,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbQuaternaryFunctorImageFilter_txx
-#define __otbQuaternaryFunctorImageFilter_txx
+#ifndef otbQuaternaryFunctorImageFilter_txx
+#define otbQuaternaryFunctorImageFilter_txx
 
 #include "otbQuaternaryFunctorImageFilter.h"
 #include "itkImageRegionIterator.h"
diff --git a/Modules/Core/Common/include/otbRGBAPixelConverter.h b/Modules/Core/Common/include/otbRGBAPixelConverter.h
index d20406bcaf..5dc1cb2718 100644
--- a/Modules/Core/Common/include/otbRGBAPixelConverter.h
+++ b/Modules/Core/Common/include/otbRGBAPixelConverter.h
@@ -16,8 +16,8 @@
 
 =========================================================================*/
 
-#ifndef __otbRGBAPixelConverter_h
-#define __otbRGBAPixelConverter_h
+#ifndef otbRGBAPixelConverter_h
+#define otbRGBAPixelConverter_h
 
 #include "itkProcessObject.h"
 #include "itkRGBAPixel.h"
diff --git a/Modules/Core/Common/include/otbRGBAPixelConverter.txx b/Modules/Core/Common/include/otbRGBAPixelConverter.txx
index 4914870fab..7d72c642c6 100644
--- a/Modules/Core/Common/include/otbRGBAPixelConverter.txx
+++ b/Modules/Core/Common/include/otbRGBAPixelConverter.txx
@@ -16,8 +16,8 @@
 
 =========================================================================*/
 
-#ifndef __otbRGBAPixelConverter_txx
-#define __otbRGBAPixelConverter_txx
+#ifndef otbRGBAPixelConverter_txx
+#define otbRGBAPixelConverter_txx
 
 
 namespace otb
diff --git a/Modules/Core/Common/include/otbRectangle.h b/Modules/Core/Common/include/otbRectangle.h
index 6717ed679a..7dd144e85d 100644
--- a/Modules/Core/Common/include/otbRectangle.h
+++ b/Modules/Core/Common/include/otbRectangle.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbRectangle_h
-#define __otbRectangle_h
+#ifndef otbRectangle_h
+#define otbRectangle_h
 
 #include "itkImageRegion.h"
 
diff --git a/Modules/Core/Common/include/otbRectangle.txx b/Modules/Core/Common/include/otbRectangle.txx
index c50a4b19e9..7b8e4b8739 100644
--- a/Modules/Core/Common/include/otbRectangle.txx
+++ b/Modules/Core/Common/include/otbRectangle.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbRectangle_txx
-#define __otbRectangle_txx
+#ifndef otbRectangle_txx
+#define otbRectangle_txx
 
 #include "otbRectangle.h"
 
diff --git a/Modules/Core/Common/include/otbStandardFilterWatcher.h b/Modules/Core/Common/include/otbStandardFilterWatcher.h
index 4a3258f7df..8bced112e2 100644
--- a/Modules/Core/Common/include/otbStandardFilterWatcher.h
+++ b/Modules/Core/Common/include/otbStandardFilterWatcher.h
@@ -18,8 +18,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbStandardFilterWatcher_h
-#define __otbStandardFilterWatcher_h
+#ifndef otbStandardFilterWatcher_h
+#define otbStandardFilterWatcher_h
 
 #include "otbFilterWatcherBase.h"
 
diff --git a/Modules/Core/Common/include/otbStandardOneLineFilterWatcher.h b/Modules/Core/Common/include/otbStandardOneLineFilterWatcher.h
index e5123d6dcc..453249db3a 100644
--- a/Modules/Core/Common/include/otbStandardOneLineFilterWatcher.h
+++ b/Modules/Core/Common/include/otbStandardOneLineFilterWatcher.h
@@ -18,8 +18,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbStandardOneLineFilterWatcher_h
-#define __otbStandardOneLineFilterWatcher_h
+#ifndef otbStandardOneLineFilterWatcher_h
+#define otbStandardOneLineFilterWatcher_h
 
 #include "otbFilterWatcherBase.h"
 
diff --git a/Modules/Core/Common/include/otbStandardWriterWatcher.h b/Modules/Core/Common/include/otbStandardWriterWatcher.h
index 60d4134824..77a3f092e0 100644
--- a/Modules/Core/Common/include/otbStandardWriterWatcher.h
+++ b/Modules/Core/Common/include/otbStandardWriterWatcher.h
@@ -18,8 +18,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbStandardWriterWatcher_h
-#define __otbStandardWriterWatcher_h
+#ifndef otbStandardWriterWatcher_h
+#define otbStandardWriterWatcher_h
 
 #include "otbWriterWatcherBase.h"
 
diff --git a/Modules/Core/Common/include/otbSubsampledImageRegionConstIterator.h b/Modules/Core/Common/include/otbSubsampledImageRegionConstIterator.h
index 3d95fe5b3f..475166e9d7 100644
--- a/Modules/Core/Common/include/otbSubsampledImageRegionConstIterator.h
+++ b/Modules/Core/Common/include/otbSubsampledImageRegionConstIterator.h
@@ -18,8 +18,8 @@
 
 =========================================================================*/
 
-#ifndef __otbSubsampledImageRegionConstIterator_h
-#define __otbSubsampledImageRegionConstIterator_h
+#ifndef otbSubsampledImageRegionConstIterator_h
+#define otbSubsampledImageRegionConstIterator_h
 
 #include "itkImageRegionConstIterator.h"
 
diff --git a/Modules/Core/Common/include/otbSubsampledImageRegionConstIterator.txx b/Modules/Core/Common/include/otbSubsampledImageRegionConstIterator.txx
index 6fed1404d3..a5cf8550ee 100644
--- a/Modules/Core/Common/include/otbSubsampledImageRegionConstIterator.txx
+++ b/Modules/Core/Common/include/otbSubsampledImageRegionConstIterator.txx
@@ -18,8 +18,8 @@
 
 =========================================================================*/
 
-#ifndef __otbSubsampledImageRegionConstIterator_txx
-#define __otbSubsampledImageRegionConstIterator_txx
+#ifndef otbSubsampledImageRegionConstIterator_txx
+#define otbSubsampledImageRegionConstIterator_txx
 
 #include "otbSubsampledImageRegionConstIterator.h"
 
diff --git a/Modules/Core/Common/include/otbSubsampledImageRegionIterator.h b/Modules/Core/Common/include/otbSubsampledImageRegionIterator.h
index 0fa6f96678..ebb3a505e7 100644
--- a/Modules/Core/Common/include/otbSubsampledImageRegionIterator.h
+++ b/Modules/Core/Common/include/otbSubsampledImageRegionIterator.h
@@ -18,8 +18,8 @@
 
 =========================================================================*/
 
-#ifndef __otbSubsampledImageRegionIterator_h
-#define __otbSubsampledImageRegionIterator_h
+#ifndef otbSubsampledImageRegionIterator_h
+#define otbSubsampledImageRegionIterator_h
 
 #include "otbSubsampledImageRegionConstIterator.h"
 
diff --git a/Modules/Core/Common/include/otbSystem.h b/Modules/Core/Common/include/otbSystem.h
index eecd10785a..ad2277e363 100644
--- a/Modules/Core/Common/include/otbSystem.h
+++ b/Modules/Core/Common/include/otbSystem.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbSystem_h
-#define __otbSystem_h
+#ifndef otbSystem_h
+#define otbSystem_h
 
 #include <string>
 #include <vector>
diff --git a/Modules/Core/Common/include/otbUnaryFunctorImageFilter.h b/Modules/Core/Common/include/otbUnaryFunctorImageFilter.h
index 2a6235feaf..c8112f9bc1 100644
--- a/Modules/Core/Common/include/otbUnaryFunctorImageFilter.h
+++ b/Modules/Core/Common/include/otbUnaryFunctorImageFilter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbUnaryFunctorImageFilter_h
-#define __otbUnaryFunctorImageFilter_h
+#ifndef otbUnaryFunctorImageFilter_h
+#define otbUnaryFunctorImageFilter_h
 
 #include "itkUnaryFunctorImageFilter.h"
 
diff --git a/Modules/Core/Common/include/otbUnaryFunctorNeighborhoodVectorImageFilter.h b/Modules/Core/Common/include/otbUnaryFunctorNeighborhoodVectorImageFilter.h
index 4db8be94e6..2882667a9a 100644
--- a/Modules/Core/Common/include/otbUnaryFunctorNeighborhoodVectorImageFilter.h
+++ b/Modules/Core/Common/include/otbUnaryFunctorNeighborhoodVectorImageFilter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbUnaryFunctorNeighborhoodVectorImageFilter_h
-#define __otbUnaryFunctorNeighborhoodVectorImageFilter_h
+#ifndef otbUnaryFunctorNeighborhoodVectorImageFilter_h
+#define otbUnaryFunctorNeighborhoodVectorImageFilter_h
 
 #include "itkInPlaceImageFilter.h"
 #include "itkImageRegionIteratorWithIndex.h"
diff --git a/Modules/Core/Common/include/otbUnaryFunctorNeighborhoodVectorImageFilter.txx b/Modules/Core/Common/include/otbUnaryFunctorNeighborhoodVectorImageFilter.txx
index 1784c56d2c..4a408eabb9 100644
--- a/Modules/Core/Common/include/otbUnaryFunctorNeighborhoodVectorImageFilter.txx
+++ b/Modules/Core/Common/include/otbUnaryFunctorNeighborhoodVectorImageFilter.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbUnaryFunctorNeighborhoodVectorImageFilter_txx
-#define __otbUnaryFunctorNeighborhoodVectorImageFilter_txx
+#ifndef otbUnaryFunctorNeighborhoodVectorImageFilter_txx
+#define otbUnaryFunctorNeighborhoodVectorImageFilter_txx
 
 #include "otbUnaryFunctorNeighborhoodVectorImageFilter.h"
 #include "itkImageRegionIterator.h"
diff --git a/Modules/Core/Common/include/otbUnaryFunctorVectorImageFilter.h b/Modules/Core/Common/include/otbUnaryFunctorVectorImageFilter.h
index 638cb1341c..f403a7cb4d 100644
--- a/Modules/Core/Common/include/otbUnaryFunctorVectorImageFilter.h
+++ b/Modules/Core/Common/include/otbUnaryFunctorVectorImageFilter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbUnaryFunctorVectorImageFilter_h
-#define __otbUnaryFunctorVectorImageFilter_h
+#ifndef otbUnaryFunctorVectorImageFilter_h
+#define otbUnaryFunctorVectorImageFilter_h
 
 #include "itkInPlaceImageFilter.h"
 
diff --git a/Modules/Core/Common/include/otbUnaryFunctorVectorImageFilter.txx b/Modules/Core/Common/include/otbUnaryFunctorVectorImageFilter.txx
index 9a0b2287ff..3aeab94964 100644
--- a/Modules/Core/Common/include/otbUnaryFunctorVectorImageFilter.txx
+++ b/Modules/Core/Common/include/otbUnaryFunctorVectorImageFilter.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbUnaryFunctorVectorImageFilter_txx
-#define __otbUnaryFunctorVectorImageFilter_txx
+#ifndef otbUnaryFunctorVectorImageFilter_txx
+#define otbUnaryFunctorVectorImageFilter_txx
 
 #include "otbUnaryFunctorVectorImageFilter.h"
 #include "itkImageRegionIterator.h"
diff --git a/Modules/Core/Common/include/otbUnaryFunctorWithIndexWithOutputSizeImageFilter.h b/Modules/Core/Common/include/otbUnaryFunctorWithIndexWithOutputSizeImageFilter.h
index acb981b118..8df5d5d58b 100644
--- a/Modules/Core/Common/include/otbUnaryFunctorWithIndexWithOutputSizeImageFilter.h
+++ b/Modules/Core/Common/include/otbUnaryFunctorWithIndexWithOutputSizeImageFilter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbUnaryFunctorWithIndexWithOutputSizeImageFilter_h
-#define __otbUnaryFunctorWithIndexWithOutputSizeImageFilter_h
+#ifndef otbUnaryFunctorWithIndexWithOutputSizeImageFilter_h
+#define otbUnaryFunctorWithIndexWithOutputSizeImageFilter_h
 
 #include "itkImageToImageFilter.h"
 #include "itkImageRegionConstIteratorWithIndex.h"
diff --git a/Modules/Core/Common/include/otbUnaryFunctorWithIndexWithOutputSizeImageFilter.txx b/Modules/Core/Common/include/otbUnaryFunctorWithIndexWithOutputSizeImageFilter.txx
index 3dcf939a74..b2d9fd057d 100644
--- a/Modules/Core/Common/include/otbUnaryFunctorWithIndexWithOutputSizeImageFilter.txx
+++ b/Modules/Core/Common/include/otbUnaryFunctorWithIndexWithOutputSizeImageFilter.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbUnaryFunctorWithIndexWithOutputSizeImageFilter_txx
-#define __otbUnaryFunctorWithIndexWithOutputSizeImageFilter_txx
+#ifndef otbUnaryFunctorWithIndexWithOutputSizeImageFilter_txx
+#define otbUnaryFunctorWithIndexWithOutputSizeImageFilter_txx
 
 #include "otbUnaryFunctorWithIndexWithOutputSizeImageFilter.h"
 #include "itkImageRegionIterator.h"
diff --git a/Modules/Core/Common/include/otbUniformAlphaBlendingFunctor.h b/Modules/Core/Common/include/otbUniformAlphaBlendingFunctor.h
index fe69507c8c..155766d3a9 100644
--- a/Modules/Core/Common/include/otbUniformAlphaBlendingFunctor.h
+++ b/Modules/Core/Common/include/otbUniformAlphaBlendingFunctor.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbUniformAlphaBlendingFunctor_h
-#define __otbUniformAlphaBlendingFunctor_h
+#ifndef otbUniformAlphaBlendingFunctor_h
+#define otbUniformAlphaBlendingFunctor_h
 
 #include "itkMacro.h"
 #include "itkNumericTraits.h"
diff --git a/Modules/Core/Common/include/otbUtils.h b/Modules/Core/Common/include/otbUtils.h
index 0894276c62..1784646cd1 100644
--- a/Modules/Core/Common/include/otbUtils.h
+++ b/Modules/Core/Common/include/otbUtils.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbUtils_h
-#define __otbUtils_h
+#ifndef otbUtils_h
+#define otbUtils_h
 
 #include "itkMacro.h"
 
diff --git a/Modules/Core/Common/include/otbVariableLengthVectorConverter.h b/Modules/Core/Common/include/otbVariableLengthVectorConverter.h
index 9814d61eb2..525abe5fb9 100644
--- a/Modules/Core/Common/include/otbVariableLengthVectorConverter.h
+++ b/Modules/Core/Common/include/otbVariableLengthVectorConverter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbVariableLengthVectorConverter_h
-#define __otbVariableLengthVectorConverter_h
+#ifndef otbVariableLengthVectorConverter_h
+#define otbVariableLengthVectorConverter_h
 
 #include "itkProcessObject.h"
 #include "itkVariableLengthVector.h"
diff --git a/Modules/Core/Common/include/otbVariableLengthVectorConverter.txx b/Modules/Core/Common/include/otbVariableLengthVectorConverter.txx
index d689c40636..c3514174fa 100644
--- a/Modules/Core/Common/include/otbVariableLengthVectorConverter.txx
+++ b/Modules/Core/Common/include/otbVariableLengthVectorConverter.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbVariableLengthVectorConverter_txx
-#define __otbVariableLengthVectorConverter_txx
+#ifndef otbVariableLengthVectorConverter_txx
+#define otbVariableLengthVectorConverter_txx
 
 #include "otbVariableLengthVectorConverter.h"
 #include <complex>
diff --git a/Modules/Core/Common/include/otbVectorImageToASImageAdaptor.h b/Modules/Core/Common/include/otbVectorImageToASImageAdaptor.h
index cfa49e3fb6..f1dce6e69f 100644
--- a/Modules/Core/Common/include/otbVectorImageToASImageAdaptor.h
+++ b/Modules/Core/Common/include/otbVectorImageToASImageAdaptor.h
@@ -16,8 +16,8 @@
 
 =========================================================================*/
 
-#ifndef __otbVectorImageToASImageAdaptor_h
-#define __otbVectorImageToASImageAdaptor_h
+#ifndef otbVectorImageToASImageAdaptor_h
+#define otbVectorImageToASImageAdaptor_h
 
 #include "itkImageAdaptor.h"
 #include "otbVectorImageToASPixelAccessor.h"
diff --git a/Modules/Core/Common/include/otbVectorImageToASPixelAccessor.h b/Modules/Core/Common/include/otbVectorImageToASPixelAccessor.h
index 4fefbcaf8f..ee9be8bb39 100644
--- a/Modules/Core/Common/include/otbVectorImageToASPixelAccessor.h
+++ b/Modules/Core/Common/include/otbVectorImageToASPixelAccessor.h
@@ -16,8 +16,8 @@
 
 =========================================================================*/
 
-#ifndef __otbVectorImageToASPixelAccessor_h
-#define __otbVectorImageToASPixelAccessor_h
+#ifndef otbVectorImageToASPixelAccessor_h
+#define otbVectorImageToASPixelAccessor_h
 
 #include "itkVector.h"
 
diff --git a/Modules/Core/Common/include/otbWriterWatcherBase.h b/Modules/Core/Common/include/otbWriterWatcherBase.h
index 657733eedf..eacefa4534 100644
--- a/Modules/Core/Common/include/otbWriterWatcherBase.h
+++ b/Modules/Core/Common/include/otbWriterWatcherBase.h
@@ -18,8 +18,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbWriterWatcherBase_h
-#define __otbWriterWatcherBase_h
+#ifndef otbWriterWatcherBase_h
+#define otbWriterWatcherBase_h
 
 #include "itkCommand.h"
 #include "itkProcessObject.h"
diff --git a/Modules/Core/ComplexImage/include/otbAmplitudePhaseToRGBFunctor.h b/Modules/Core/ComplexImage/include/otbAmplitudePhaseToRGBFunctor.h
index 9d034f0162..b80f6781f5 100644
--- a/Modules/Core/ComplexImage/include/otbAmplitudePhaseToRGBFunctor.h
+++ b/Modules/Core/ComplexImage/include/otbAmplitudePhaseToRGBFunctor.h
@@ -16,8 +16,8 @@
 
 =========================================================================*/
 
-#ifndef __otbAmplitudePhaseToRGBFunctor_h
-#define __otbAmplitudePhaseToRGBFunctor_h
+#ifndef otbAmplitudePhaseToRGBFunctor_h
+#define otbAmplitudePhaseToRGBFunctor_h
 
 #include "otbScalarToRainbowRGBPixelFunctor.h"
 #include "otbMath.h"
diff --git a/Modules/Core/ImageBase/include/otbConvertPixelBuffer.h b/Modules/Core/ImageBase/include/otbConvertPixelBuffer.h
index 371e34f1ed..faf5785716 100644
--- a/Modules/Core/ImageBase/include/otbConvertPixelBuffer.h
+++ b/Modules/Core/ImageBase/include/otbConvertPixelBuffer.h
@@ -14,8 +14,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbConvertPixelBuffer_h
-#define __otbConvertPixelBuffer_h
+#ifndef otbConvertPixelBuffer_h
+#define otbConvertPixelBuffer_h
 
 #include <complex>
 #include "itkObject.h"
@@ -81,4 +81,4 @@ private:
 #include "otbConvertPixelBuffer.txx"
 #endif
 
-#endif // __otbConvertPixelBuffer_h
+#endif // otbConvertPixelBuffer_h
diff --git a/Modules/Core/ImageBase/include/otbConvertPixelBuffer.txx b/Modules/Core/ImageBase/include/otbConvertPixelBuffer.txx
index 3590e52c2b..892da66630 100644
--- a/Modules/Core/ImageBase/include/otbConvertPixelBuffer.txx
+++ b/Modules/Core/ImageBase/include/otbConvertPixelBuffer.txx
@@ -14,8 +14,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbConvertPixelBuffer_txx
-#define __otbConvertPixelBuffer_txx
+#ifndef otbConvertPixelBuffer_txx
+#define otbConvertPixelBuffer_txx
 #include "otbConvertPixelBuffer.h"
 
 #include "itkConvertPixelBuffer.h"
diff --git a/Modules/Core/ImageBase/include/otbDefaultConvertPixelTraits.h b/Modules/Core/ImageBase/include/otbDefaultConvertPixelTraits.h
index 343bfc1acb..ec20f86e69 100644
--- a/Modules/Core/ImageBase/include/otbDefaultConvertPixelTraits.h
+++ b/Modules/Core/ImageBase/include/otbDefaultConvertPixelTraits.h
@@ -15,8 +15,8 @@
 
 =========================================================================*/
 
-#ifndef __otbDefaultConvertPixelTraits_h
-#define __otbDefaultConvertPixelTraits_h
+#ifndef otbDefaultConvertPixelTraits_h
+#define otbDefaultConvertPixelTraits_h
 
 #include "itkOffset.h"
 #include "itkVector.h"
diff --git a/Modules/Core/ImageBase/include/otbExtractROI.h b/Modules/Core/ImageBase/include/otbExtractROI.h
index fb8edc42fa..2cefc79e28 100644
--- a/Modules/Core/ImageBase/include/otbExtractROI.h
+++ b/Modules/Core/ImageBase/include/otbExtractROI.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbExtractROI_h
-#define __otbExtractROI_h
+#ifndef otbExtractROI_h
+#define otbExtractROI_h
 
 #include "otbExtractROIBase.h"
 #include "otbImage.h"
diff --git a/Modules/Core/ImageBase/include/otbExtractROI.txx b/Modules/Core/ImageBase/include/otbExtractROI.txx
index 21f24f8a1f..afac3e8cd1 100644
--- a/Modules/Core/ImageBase/include/otbExtractROI.txx
+++ b/Modules/Core/ImageBase/include/otbExtractROI.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbExtractROI_txx
-#define __otbExtractROI_txx
+#ifndef otbExtractROI_txx
+#define otbExtractROI_txx
 
 #include "otbExtractROI.h"
 #include "itkImageRegionIterator.h"
diff --git a/Modules/Core/ImageBase/include/otbExtractROIBase.h b/Modules/Core/ImageBase/include/otbExtractROIBase.h
index 7d22920634..c1c81ab290 100644
--- a/Modules/Core/ImageBase/include/otbExtractROIBase.h
+++ b/Modules/Core/ImageBase/include/otbExtractROIBase.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbExtractROIBase_h
-#define __otbExtractROIBase_h
+#ifndef otbExtractROIBase_h
+#define otbExtractROIBase_h
 
 #include "itkImageToImageFilter.h"
 #include "itkSmartPointer.h"
diff --git a/Modules/Core/ImageBase/include/otbExtractROIBase.txx b/Modules/Core/ImageBase/include/otbExtractROIBase.txx
index deb23dcd3b..d335c04720 100644
--- a/Modules/Core/ImageBase/include/otbExtractROIBase.txx
+++ b/Modules/Core/ImageBase/include/otbExtractROIBase.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbExtractROIBase_txx
-#define __otbExtractROIBase_txx
+#ifndef otbExtractROIBase_txx
+#define otbExtractROIBase_txx
 
 #include "otbExtractROIBase.h"
 #include "itkImageRegionIterator.h"
diff --git a/Modules/Core/ImageBase/include/otbImage.h b/Modules/Core/ImageBase/include/otbImage.h
index 2f2dc5316d..84f06761ce 100644
--- a/Modules/Core/ImageBase/include/otbImage.h
+++ b/Modules/Core/ImageBase/include/otbImage.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbImage_h
-#define __otbImage_h
+#ifndef otbImage_h
+#define otbImage_h
 
 #if defined(__GNUC__) || defined(__clang__)
 #pragma GCC diagnostic push
diff --git a/Modules/Core/ImageBase/include/otbImage.txx b/Modules/Core/ImageBase/include/otbImage.txx
index 8c081b502b..0ab4bbb26e 100644
--- a/Modules/Core/ImageBase/include/otbImage.txx
+++ b/Modules/Core/ImageBase/include/otbImage.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbImage_txx
-#define __otbImage_txx
+#ifndef otbImage_txx
+#define otbImage_txx
 
 
 #include "otbImage.h"
diff --git a/Modules/Core/ImageBase/include/otbImageFunctionAdaptor.h b/Modules/Core/ImageBase/include/otbImageFunctionAdaptor.h
index b668c93ad6..4b832dbbc3 100644
--- a/Modules/Core/ImageBase/include/otbImageFunctionAdaptor.h
+++ b/Modules/Core/ImageBase/include/otbImageFunctionAdaptor.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbImageFunctionAdaptor_h
-#define __otbImageFunctionAdaptor_h
+#ifndef otbImageFunctionAdaptor_h
+#define otbImageFunctionAdaptor_h
 
 #include "itkImageFunction.h"
 
diff --git a/Modules/Core/ImageBase/include/otbImageFunctionAdaptor.txx b/Modules/Core/ImageBase/include/otbImageFunctionAdaptor.txx
index b9abf06cf8..eec6f683d9 100644
--- a/Modules/Core/ImageBase/include/otbImageFunctionAdaptor.txx
+++ b/Modules/Core/ImageBase/include/otbImageFunctionAdaptor.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbImageFunctionAdaptor_txx
-#define __otbImageFunctionAdaptor_txx
+#ifndef otbImageFunctionAdaptor_txx
+#define otbImageFunctionAdaptor_txx
 
 #include "otbImageFunctionAdaptor.h"
 
diff --git a/Modules/Core/ImageBase/include/otbImageIOBase.h b/Modules/Core/ImageBase/include/otbImageIOBase.h
index 41b5d5fa37..9e7ecba118 100644
--- a/Modules/Core/ImageBase/include/otbImageIOBase.h
+++ b/Modules/Core/ImageBase/include/otbImageIOBase.h
@@ -14,8 +14,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbImageIOBase_h
-#define __otbImageIOBase_h
+#ifndef otbImageIOBase_h
+#define otbImageIOBase_h
 
 #include "itkLightProcessObject.h"
 #include "itkIndent.h"
@@ -547,4 +547,4 @@ private:
 
 } // end namespace itk
 
-#endif // __otbImageIOBase_h
+#endif // otbImageIOBase_h
diff --git a/Modules/Core/ImageBase/include/otbImageOfVectorsToMonoChannelExtractROI.h b/Modules/Core/ImageBase/include/otbImageOfVectorsToMonoChannelExtractROI.h
index 3a4083bc9a..dc518cea36 100644
--- a/Modules/Core/ImageBase/include/otbImageOfVectorsToMonoChannelExtractROI.h
+++ b/Modules/Core/ImageBase/include/otbImageOfVectorsToMonoChannelExtractROI.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbImageOfVectorsToMonoChannelExtractROI_h
-#define __otbImageOfVectorsToMonoChannelExtractROI_h
+#ifndef otbImageOfVectorsToMonoChannelExtractROI_h
+#define otbImageOfVectorsToMonoChannelExtractROI_h
 
 #include "otbExtractROIBase.h"
 #include "otbImage.h"
diff --git a/Modules/Core/ImageBase/include/otbImageOfVectorsToMonoChannelExtractROI.txx b/Modules/Core/ImageBase/include/otbImageOfVectorsToMonoChannelExtractROI.txx
index d00fb440a2..9381f15b3c 100644
--- a/Modules/Core/ImageBase/include/otbImageOfVectorsToMonoChannelExtractROI.txx
+++ b/Modules/Core/ImageBase/include/otbImageOfVectorsToMonoChannelExtractROI.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbImageOfVectorsToMonoChannelExtractROI_txx
-#define __otbImageOfVectorsToMonoChannelExtractROI_txx
+#ifndef otbImageOfVectorsToMonoChannelExtractROI_txx
+#define otbImageOfVectorsToMonoChannelExtractROI_txx
 
 #include "otbImageOfVectorsToMonoChannelExtractROI.h"
 
diff --git a/Modules/Core/ImageBase/include/otbMetaImageFunction.h b/Modules/Core/ImageBase/include/otbMetaImageFunction.h
index ac8337f057..a378c43740 100644
--- a/Modules/Core/ImageBase/include/otbMetaImageFunction.h
+++ b/Modules/Core/ImageBase/include/otbMetaImageFunction.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbMetaImageFunction_h
-#define __otbMetaImageFunction_h
+#ifndef otbMetaImageFunction_h
+#define otbMetaImageFunction_h
 
 #include "itkFunctionBase.h"
 #include "itkPoint.h"
diff --git a/Modules/Core/ImageBase/include/otbMetaImageFunction.txx b/Modules/Core/ImageBase/include/otbMetaImageFunction.txx
index 448cde0b32..26bae0c5c4 100644
--- a/Modules/Core/ImageBase/include/otbMetaImageFunction.txx
+++ b/Modules/Core/ImageBase/include/otbMetaImageFunction.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbMetaImageFunction_txx
-#define __otbMetaImageFunction_txx
+#ifndef otbMetaImageFunction_txx
+#define otbMetaImageFunction_txx
 
 #include "otbMetaImageFunction.h"
 #include "otbImageFunctionAdaptor.h"
diff --git a/Modules/Core/ImageBase/include/otbMultiChannelExtractROI.h b/Modules/Core/ImageBase/include/otbMultiChannelExtractROI.h
index 59b54b713c..687e984b53 100644
--- a/Modules/Core/ImageBase/include/otbMultiChannelExtractROI.h
+++ b/Modules/Core/ImageBase/include/otbMultiChannelExtractROI.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbMultiChannelExtractROI_h
-#define __otbMultiChannelExtractROI_h
+#ifndef otbMultiChannelExtractROI_h
+#define otbMultiChannelExtractROI_h
 
 #include "otbExtractROIBase.h"
 #include "otbVectorImage.h"
diff --git a/Modules/Core/ImageBase/include/otbMultiChannelExtractROI.txx b/Modules/Core/ImageBase/include/otbMultiChannelExtractROI.txx
index 5d10b1ba71..5a7540f6d1 100644
--- a/Modules/Core/ImageBase/include/otbMultiChannelExtractROI.txx
+++ b/Modules/Core/ImageBase/include/otbMultiChannelExtractROI.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbMultiChannelExtractROI_txx
-#define __otbMultiChannelExtractROI_txx
+#ifndef otbMultiChannelExtractROI_txx
+#define otbMultiChannelExtractROI_txx
 
 #include "otbMultiChannelExtractROI.h"
 
diff --git a/Modules/Core/ImageBase/include/otbMultiToMonoChannelExtractROI.h b/Modules/Core/ImageBase/include/otbMultiToMonoChannelExtractROI.h
index e53bf01bde..f2bd46bfc4 100644
--- a/Modules/Core/ImageBase/include/otbMultiToMonoChannelExtractROI.h
+++ b/Modules/Core/ImageBase/include/otbMultiToMonoChannelExtractROI.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbMultiToMonoChannelExtractROI_h
-#define __otbMultiToMonoChannelExtractROI_h
+#ifndef otbMultiToMonoChannelExtractROI_h
+#define otbMultiToMonoChannelExtractROI_h
 
 #include "otbExtractROIBase.h"
 #include "otbImage.h"
diff --git a/Modules/Core/ImageBase/include/otbMultiToMonoChannelExtractROI.txx b/Modules/Core/ImageBase/include/otbMultiToMonoChannelExtractROI.txx
index 095008aef1..1bb293b83f 100644
--- a/Modules/Core/ImageBase/include/otbMultiToMonoChannelExtractROI.txx
+++ b/Modules/Core/ImageBase/include/otbMultiToMonoChannelExtractROI.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbMultiToMonoChannelExtractROI_txx
-#define __otbMultiToMonoChannelExtractROI_txx
+#ifndef otbMultiToMonoChannelExtractROI_txx
+#define otbMultiToMonoChannelExtractROI_txx
 
 #include "otbMultiToMonoChannelExtractROI.h"
 
diff --git a/Modules/Core/ImageBase/include/otbRemoteSensingRegion.h b/Modules/Core/ImageBase/include/otbRemoteSensingRegion.h
index 93e73353aa..66e3c6b443 100644
--- a/Modules/Core/ImageBase/include/otbRemoteSensingRegion.h
+++ b/Modules/Core/ImageBase/include/otbRemoteSensingRegion.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbRemoteSensingRegion_h
-#define __otbRemoteSensingRegion_h
+#ifndef otbRemoteSensingRegion_h
+#define otbRemoteSensingRegion_h
 
 #include <algorithm>
 #include <iomanip>
diff --git a/Modules/Core/ImageBase/include/otbVectorImage.h b/Modules/Core/ImageBase/include/otbVectorImage.h
index 7dea7e9d8b..b696965755 100644
--- a/Modules/Core/ImageBase/include/otbVectorImage.h
+++ b/Modules/Core/ImageBase/include/otbVectorImage.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbVectorImage_h
-#define __otbVectorImage_h
+#ifndef otbVectorImage_h
+#define otbVectorImage_h
 
 #if defined(__GNUC__) || defined(__clang__)
 #pragma GCC diagnostic push
diff --git a/Modules/Core/ImageBase/include/otbVectorImage.txx b/Modules/Core/ImageBase/include/otbVectorImage.txx
index af176c9e7b..be15ec5b0e 100644
--- a/Modules/Core/ImageBase/include/otbVectorImage.txx
+++ b/Modules/Core/ImageBase/include/otbVectorImage.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbVectorImage_txx
-#define __otbVectorImage_txx
+#ifndef otbVectorImage_txx
+#define otbVectorImage_txx
 
 
 #include "otbVectorImage.h"
diff --git a/Modules/Core/Interpolation/include/otbBCOInterpolateImageFunction.h b/Modules/Core/Interpolation/include/otbBCOInterpolateImageFunction.h
index 926674fc4d..ef781a794d 100644
--- a/Modules/Core/Interpolation/include/otbBCOInterpolateImageFunction.h
+++ b/Modules/Core/Interpolation/include/otbBCOInterpolateImageFunction.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbBCOInterpolateImageFunction_h
-#define __otbBCOInterpolateImageFunction_h
+#ifndef otbBCOInterpolateImageFunction_h
+#define otbBCOInterpolateImageFunction_h
 
 #include "itkInterpolateImageFunction.h"
 #include "vnl/vnl_vector.h"
diff --git a/Modules/Core/Interpolation/include/otbBCOInterpolateImageFunction.txx b/Modules/Core/Interpolation/include/otbBCOInterpolateImageFunction.txx
index 91cda29083..89572aad83 100644
--- a/Modules/Core/Interpolation/include/otbBCOInterpolateImageFunction.txx
+++ b/Modules/Core/Interpolation/include/otbBCOInterpolateImageFunction.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbBCOInterpolateImageFunction_txx
-#define __otbBCOInterpolateImageFunction_txx
+#ifndef otbBCOInterpolateImageFunction_txx
+#define otbBCOInterpolateImageFunction_txx
 
 #include "otbBCOInterpolateImageFunction.h"
 
diff --git a/Modules/Core/Interpolation/include/otbBSplineDecompositionImageFilter.h b/Modules/Core/Interpolation/include/otbBSplineDecompositionImageFilter.h
index 7ed58cddc0..2b55bc86b4 100644
--- a/Modules/Core/Interpolation/include/otbBSplineDecompositionImageFilter.h
+++ b/Modules/Core/Interpolation/include/otbBSplineDecompositionImageFilter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbBSplineDecompositionImageFilter_h
-#define __otbBSplineDecompositionImageFilter_h
+#ifndef otbBSplineDecompositionImageFilter_h
+#define otbBSplineDecompositionImageFilter_h
 
 #include <vector>
 
diff --git a/Modules/Core/Interpolation/include/otbBSplineDecompositionImageFilter.txx b/Modules/Core/Interpolation/include/otbBSplineDecompositionImageFilter.txx
index 6436db191d..c614e4b53d 100644
--- a/Modules/Core/Interpolation/include/otbBSplineDecompositionImageFilter.txx
+++ b/Modules/Core/Interpolation/include/otbBSplineDecompositionImageFilter.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbBSplineDecompositionImageFilter_txx
-#define __otbBSplineDecompositionImageFilter_txx
+#ifndef otbBSplineDecompositionImageFilter_txx
+#define otbBSplineDecompositionImageFilter_txx
 #include "otbBSplineDecompositionImageFilter.h"
 #include "itkImageRegionConstIteratorWithIndex.h"
 #include "itkImageRegionIterator.h"
diff --git a/Modules/Core/Interpolation/include/otbBSplineInterpolateImageFunction.h b/Modules/Core/Interpolation/include/otbBSplineInterpolateImageFunction.h
index 4077c302c7..0d9fabd8f7 100644
--- a/Modules/Core/Interpolation/include/otbBSplineInterpolateImageFunction.h
+++ b/Modules/Core/Interpolation/include/otbBSplineInterpolateImageFunction.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbBSplineInterpolateImageFunction_h
-#define __otbBSplineInterpolateImageFunction_h
+#ifndef otbBSplineInterpolateImageFunction_h
+#define otbBSplineInterpolateImageFunction_h
 
 #include <vector>
 
diff --git a/Modules/Core/Interpolation/include/otbBSplineInterpolateImageFunction.txx b/Modules/Core/Interpolation/include/otbBSplineInterpolateImageFunction.txx
index 3aa1274b92..930151d251 100644
--- a/Modules/Core/Interpolation/include/otbBSplineInterpolateImageFunction.txx
+++ b/Modules/Core/Interpolation/include/otbBSplineInterpolateImageFunction.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbBSplineInterpolateImageFunction_txx
-#define __otbBSplineInterpolateImageFunction_txx
+#ifndef otbBSplineInterpolateImageFunction_txx
+#define otbBSplineInterpolateImageFunction_txx
 #include "itkBSplineInterpolateImageFunction.h"
 #include "itkImageLinearIteratorWithIndex.h"
 #include "itkImageRegionConstIteratorWithIndex.h"
diff --git a/Modules/Core/Interpolation/include/otbGenericInterpolateImageFunction.h b/Modules/Core/Interpolation/include/otbGenericInterpolateImageFunction.h
index ee4b5dbbd5..f62a3f5a1d 100644
--- a/Modules/Core/Interpolation/include/otbGenericInterpolateImageFunction.h
+++ b/Modules/Core/Interpolation/include/otbGenericInterpolateImageFunction.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbGenericInterpolateImageFunction_h
-#define __otbGenericInterpolateImageFunction_h
+#ifndef otbGenericInterpolateImageFunction_h
+#define otbGenericInterpolateImageFunction_h
 
 #include "itkInterpolateImageFunction.h"
 #include "itkConstNeighborhoodIterator.h"
diff --git a/Modules/Core/Interpolation/include/otbGenericInterpolateImageFunction.txx b/Modules/Core/Interpolation/include/otbGenericInterpolateImageFunction.txx
index 2fc1e462c9..28322f2850 100644
--- a/Modules/Core/Interpolation/include/otbGenericInterpolateImageFunction.txx
+++ b/Modules/Core/Interpolation/include/otbGenericInterpolateImageFunction.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbGenericInterpolateImageFunction_txx
-#define __otbGenericInterpolateImageFunction_txx
+#ifndef otbGenericInterpolateImageFunction_txx
+#define otbGenericInterpolateImageFunction_txx
 #include "otbGenericInterpolateImageFunction.h"
 #include "vnl/vnl_math.h"
 
diff --git a/Modules/Core/Interpolation/include/otbProlateInterpolateImageFunction.h b/Modules/Core/Interpolation/include/otbProlateInterpolateImageFunction.h
index 16bdc3fc8e..c2a3dbd1af 100644
--- a/Modules/Core/Interpolation/include/otbProlateInterpolateImageFunction.h
+++ b/Modules/Core/Interpolation/include/otbProlateInterpolateImageFunction.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbProlateInterpolateImageFunction_h
-#define __otbProlateInterpolateImageFunction_h
+#ifndef otbProlateInterpolateImageFunction_h
+#define otbProlateInterpolateImageFunction_h
 
 #include "otbGenericInterpolateImageFunction.h"
 #include "itkSize.h"
diff --git a/Modules/Core/Interpolation/include/otbProlateInterpolateImageFunction.txx b/Modules/Core/Interpolation/include/otbProlateInterpolateImageFunction.txx
index cb842d40d4..1f4bfb7ed4 100644
--- a/Modules/Core/Interpolation/include/otbProlateInterpolateImageFunction.txx
+++ b/Modules/Core/Interpolation/include/otbProlateInterpolateImageFunction.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbProlateInterpolateImageFunction_txx
-#define __otbProlateInterpolateImageFunction_txx
+#ifndef otbProlateInterpolateImageFunction_txx
+#define otbProlateInterpolateImageFunction_txx
 
 #include "otbProlateInterpolateImageFunction.h"
 
diff --git a/Modules/Core/Interpolation/include/otbStreamingTraits.h b/Modules/Core/Interpolation/include/otbStreamingTraits.h
index 0318e1f575..829e753f79 100644
--- a/Modules/Core/Interpolation/include/otbStreamingTraits.h
+++ b/Modules/Core/Interpolation/include/otbStreamingTraits.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbStreamingTraits_h
-#define __otbStreamingTraits_h
+#ifndef otbStreamingTraits_h
+#define otbStreamingTraits_h
 
 #include "otbMacro.h"
 
diff --git a/Modules/Core/Interpolation/include/otbStreamingTraits.txx b/Modules/Core/Interpolation/include/otbStreamingTraits.txx
index 3654c47c69..62ff2adaa1 100644
--- a/Modules/Core/Interpolation/include/otbStreamingTraits.txx
+++ b/Modules/Core/Interpolation/include/otbStreamingTraits.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbStreamingTraits_txx
-#define __otbStreamingTraits_txx
+#ifndef otbStreamingTraits_txx
+#define otbStreamingTraits_txx
 
 #include "otbStreamingTraits.h"
 
diff --git a/Modules/Core/Interpolation/include/otbWindowedSincInterpolateImageBlackmanFunction.h b/Modules/Core/Interpolation/include/otbWindowedSincInterpolateImageBlackmanFunction.h
index 855f42fdb3..f47676a261 100644
--- a/Modules/Core/Interpolation/include/otbWindowedSincInterpolateImageBlackmanFunction.h
+++ b/Modules/Core/Interpolation/include/otbWindowedSincInterpolateImageBlackmanFunction.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbWindowedSincInterpolateImageBlackmanFunction_h
-#define __otbWindowedSincInterpolateImageBlackmanFunction_h
+#ifndef otbWindowedSincInterpolateImageBlackmanFunction_h
+#define otbWindowedSincInterpolateImageBlackmanFunction_h
 
 #include "otbWindowedSincInterpolateImageFunctionBase.h"
 #include "vnl/vnl_math.h"
diff --git a/Modules/Core/Interpolation/include/otbWindowedSincInterpolateImageCosineFunction.h b/Modules/Core/Interpolation/include/otbWindowedSincInterpolateImageCosineFunction.h
index 891ad8d91a..fbe960fbc4 100644
--- a/Modules/Core/Interpolation/include/otbWindowedSincInterpolateImageCosineFunction.h
+++ b/Modules/Core/Interpolation/include/otbWindowedSincInterpolateImageCosineFunction.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbWindowedSincInterpolateImageCosineFunction_h
-#define __otbWindowedSincInterpolateImageCosineFunction_h
+#ifndef otbWindowedSincInterpolateImageCosineFunction_h
+#define otbWindowedSincInterpolateImageCosineFunction_h
 
 #include "otbWindowedSincInterpolateImageFunctionBase.h"
 #include "vnl/vnl_math.h"
diff --git a/Modules/Core/Interpolation/include/otbWindowedSincInterpolateImageFunctionBase.h b/Modules/Core/Interpolation/include/otbWindowedSincInterpolateImageFunctionBase.h
index 7490727f41..852566f39a 100644
--- a/Modules/Core/Interpolation/include/otbWindowedSincInterpolateImageFunctionBase.h
+++ b/Modules/Core/Interpolation/include/otbWindowedSincInterpolateImageFunctionBase.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbWindowedSincInterpolateImageFunctionBase_h
-#define __otbWindowedSincInterpolateImageFunctionBase_h
+#ifndef otbWindowedSincInterpolateImageFunctionBase_h
+#define otbWindowedSincInterpolateImageFunctionBase_h
 
 #include "otbGenericInterpolateImageFunction.h"
 #include "itkSize.h"
diff --git a/Modules/Core/Interpolation/include/otbWindowedSincInterpolateImageFunctionBase.txx b/Modules/Core/Interpolation/include/otbWindowedSincInterpolateImageFunctionBase.txx
index 2a2b35b11c..e0b88818d8 100644
--- a/Modules/Core/Interpolation/include/otbWindowedSincInterpolateImageFunctionBase.txx
+++ b/Modules/Core/Interpolation/include/otbWindowedSincInterpolateImageFunctionBase.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbWindowedSincInterpolateImageFunctionBase_txx
-#define __otbWindowedSincInterpolateImageFunctionBase_txx
+#ifndef otbWindowedSincInterpolateImageFunctionBase_txx
+#define otbWindowedSincInterpolateImageFunctionBase_txx
 
 #include "otbWindowedSincInterpolateImageFunctionBase.h"
 
diff --git a/Modules/Core/Interpolation/include/otbWindowedSincInterpolateImageGaussianFunction.h b/Modules/Core/Interpolation/include/otbWindowedSincInterpolateImageGaussianFunction.h
index e6afcf9aff..eabcaa326f 100644
--- a/Modules/Core/Interpolation/include/otbWindowedSincInterpolateImageGaussianFunction.h
+++ b/Modules/Core/Interpolation/include/otbWindowedSincInterpolateImageGaussianFunction.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbWindowedSincInterpolateImageGaussianFunction_h
-#define __otbWindowedSincInterpolateImageGaussianFunction_h
+#ifndef otbWindowedSincInterpolateImageGaussianFunction_h
+#define otbWindowedSincInterpolateImageGaussianFunction_h
 
 #include "otbWindowedSincInterpolateImageFunctionBase.h"
 #include "vnl/vnl_math.h"
diff --git a/Modules/Core/Interpolation/include/otbWindowedSincInterpolateImageHammingFunction.h b/Modules/Core/Interpolation/include/otbWindowedSincInterpolateImageHammingFunction.h
index bca9d953a6..b7d10e1a95 100644
--- a/Modules/Core/Interpolation/include/otbWindowedSincInterpolateImageHammingFunction.h
+++ b/Modules/Core/Interpolation/include/otbWindowedSincInterpolateImageHammingFunction.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbWindowedSincInterpolateImageHammingFunction_h
-#define __otbWindowedSincInterpolateImageHammingFunction_h
+#ifndef otbWindowedSincInterpolateImageHammingFunction_h
+#define otbWindowedSincInterpolateImageHammingFunction_h
 
 #include "otbWindowedSincInterpolateImageFunctionBase.h"
 #include "vnl/vnl_math.h"
diff --git a/Modules/Core/Interpolation/include/otbWindowedSincInterpolateImageLanczosFunction.h b/Modules/Core/Interpolation/include/otbWindowedSincInterpolateImageLanczosFunction.h
index 1c5793d14e..eafa59a11f 100644
--- a/Modules/Core/Interpolation/include/otbWindowedSincInterpolateImageLanczosFunction.h
+++ b/Modules/Core/Interpolation/include/otbWindowedSincInterpolateImageLanczosFunction.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbWindowedSincInterpolateImageLanczosFunction_h
-#define __otbWindowedSincInterpolateImageLanczosFunction_h
+#ifndef otbWindowedSincInterpolateImageLanczosFunction_h
+#define otbWindowedSincInterpolateImageLanczosFunction_h
 
 #include "otbWindowedSincInterpolateImageFunctionBase.h"
 #include "vnl/vnl_math.h"
diff --git a/Modules/Core/Interpolation/include/otbWindowedSincInterpolateImageWelchFunction.h b/Modules/Core/Interpolation/include/otbWindowedSincInterpolateImageWelchFunction.h
index dad775d0df..19e3df3355 100644
--- a/Modules/Core/Interpolation/include/otbWindowedSincInterpolateImageWelchFunction.h
+++ b/Modules/Core/Interpolation/include/otbWindowedSincInterpolateImageWelchFunction.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbWindowedSincInterpolateImageWelchFunction_h
-#define __otbWindowedSincInterpolateImageWelchFunction_h
+#ifndef otbWindowedSincInterpolateImageWelchFunction_h
+#define otbWindowedSincInterpolateImageWelchFunction_h
 
 #include "otbWindowedSincInterpolateImageFunctionBase.h"
 #include "vnl/vnl_math.h"
diff --git a/Modules/Core/LabelMap/include/otbAttributesMapLabelObject.h b/Modules/Core/LabelMap/include/otbAttributesMapLabelObject.h
index 5e016c5d8a..ccc6977901 100644
--- a/Modules/Core/LabelMap/include/otbAttributesMapLabelObject.h
+++ b/Modules/Core/LabelMap/include/otbAttributesMapLabelObject.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbAttributesMapLabelObject_h
-#define __otbAttributesMapLabelObject_h
+#ifndef otbAttributesMapLabelObject_h
+#define otbAttributesMapLabelObject_h
 
 #if defined(__GNUC__) || defined(__clang__)
 #pragma GCC diagnostic push
diff --git a/Modules/Core/LabelMap/include/otbAttributesMapLabelObjectWithClassLabel.h b/Modules/Core/LabelMap/include/otbAttributesMapLabelObjectWithClassLabel.h
index 2a3495a2e5..88d8321fc1 100644
--- a/Modules/Core/LabelMap/include/otbAttributesMapLabelObjectWithClassLabel.h
+++ b/Modules/Core/LabelMap/include/otbAttributesMapLabelObjectWithClassLabel.h
@@ -15,8 +15,8 @@ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbAttributesMapLabelObjectWithClassLabel_h
-#define __otbAttributesMapLabelObjectWithClassLabel_h
+#ifndef otbAttributesMapLabelObjectWithClassLabel_h
+#define otbAttributesMapLabelObjectWithClassLabel_h
 
 #include "otbAttributesMapLabelObject.h"
 
diff --git a/Modules/Core/LabelMap/include/otbAttributesMapOpeningLabelMapFilter.h b/Modules/Core/LabelMap/include/otbAttributesMapOpeningLabelMapFilter.h
index 4f0e3a9af1..9e9e0d5262 100644
--- a/Modules/Core/LabelMap/include/otbAttributesMapOpeningLabelMapFilter.h
+++ b/Modules/Core/LabelMap/include/otbAttributesMapOpeningLabelMapFilter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbAttributesMapOpeningLabelMapFilter_h
-#define __otbAttributesMapOpeningLabelMapFilter_h
+#ifndef otbAttributesMapOpeningLabelMapFilter_h
+#define otbAttributesMapOpeningLabelMapFilter_h
 
 #include "otbAttributesMapLabelObject.h"
 #include "itkAttributeOpeningLabelMapFilter.h"
@@ -94,4 +94,4 @@ private:
 #include "otbAttributesMapOpeningLabelMapFilter.txx"
 #endif
 
-#endif // __otbAttributesMapOpeningLabelMapFilter_h
+#endif // otbAttributesMapOpeningLabelMapFilter_h
diff --git a/Modules/Core/LabelMap/include/otbAttributesMapOpeningLabelMapFilter.txx b/Modules/Core/LabelMap/include/otbAttributesMapOpeningLabelMapFilter.txx
index 05b9416768..7d96664293 100644
--- a/Modules/Core/LabelMap/include/otbAttributesMapOpeningLabelMapFilter.txx
+++ b/Modules/Core/LabelMap/include/otbAttributesMapOpeningLabelMapFilter.txx
@@ -16,8 +16,8 @@
 
 =========================================================================*/
 
-#ifndef __otbAttributesMapOpeningLabelMapFilter_txx
-#define __otbAttributesMapOpeningLabelMapFilter_txx
+#ifndef otbAttributesMapOpeningLabelMapFilter_txx
+#define otbAttributesMapOpeningLabelMapFilter_txx
 
 #include "otbAttributesMapOpeningLabelMapFilter.h"
 
diff --git a/Modules/Core/LabelMap/include/otbBandsStatisticsAttributesLabelMapFilter.h b/Modules/Core/LabelMap/include/otbBandsStatisticsAttributesLabelMapFilter.h
index 563a8473bd..2f15a40958 100644
--- a/Modules/Core/LabelMap/include/otbBandsStatisticsAttributesLabelMapFilter.h
+++ b/Modules/Core/LabelMap/include/otbBandsStatisticsAttributesLabelMapFilter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbBandsStatisticsAttributesLabelMapFilter_h
-#define __otbBandsStatisticsAttributesLabelMapFilter_h
+#ifndef otbBandsStatisticsAttributesLabelMapFilter_h
+#define otbBandsStatisticsAttributesLabelMapFilter_h
 
 #include "otbStatisticsAttributesLabelMapFilter.h"
 #include "otbMultiToMonoChannelExtractROI.h"
diff --git a/Modules/Core/LabelMap/include/otbBandsStatisticsAttributesLabelMapFilter.txx b/Modules/Core/LabelMap/include/otbBandsStatisticsAttributesLabelMapFilter.txx
index 2ad41886e6..9af7b1729b 100644
--- a/Modules/Core/LabelMap/include/otbBandsStatisticsAttributesLabelMapFilter.txx
+++ b/Modules/Core/LabelMap/include/otbBandsStatisticsAttributesLabelMapFilter.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbBandsStatisticsAttributesLabelMapFilter_txx
-#define __otbBandsStatisticsAttributesLabelMapFilter_txx
+#ifndef otbBandsStatisticsAttributesLabelMapFilter_txx
+#define otbBandsStatisticsAttributesLabelMapFilter_txx
 
 #include "otbBandsStatisticsAttributesLabelMapFilter.h"
 #include "itkUnaryFunctorImageFilter.h"
diff --git a/Modules/Core/LabelMap/include/otbImageToLabelMapWithAttributesFilter.h b/Modules/Core/LabelMap/include/otbImageToLabelMapWithAttributesFilter.h
index 1b0032a2a7..3e7118ce62 100644
--- a/Modules/Core/LabelMap/include/otbImageToLabelMapWithAttributesFilter.h
+++ b/Modules/Core/LabelMap/include/otbImageToLabelMapWithAttributesFilter.h
@@ -15,8 +15,8 @@ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbImageToLabelMapWithAttributesFilter_h
-#define __otbImageToLabelMapWithAttributesFilter_h
+#ifndef otbImageToLabelMapWithAttributesFilter_h
+#define otbImageToLabelMapWithAttributesFilter_h
 
 #include "itkShapeLabelMapFilter.h"
 #include "otbAttributesMapLabelObjectWithClassLabel.h"
diff --git a/Modules/Core/LabelMap/include/otbImageToLabelMapWithAttributesFilter.txx b/Modules/Core/LabelMap/include/otbImageToLabelMapWithAttributesFilter.txx
index 063998a3bd..24cab3fd19 100644
--- a/Modules/Core/LabelMap/include/otbImageToLabelMapWithAttributesFilter.txx
+++ b/Modules/Core/LabelMap/include/otbImageToLabelMapWithAttributesFilter.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbImageToLabelMapWithAttributesFilter_txx
-#define __otbImageToLabelMapWithAttributesFilter_txx
+#ifndef otbImageToLabelMapWithAttributesFilter_txx
+#define otbImageToLabelMapWithAttributesFilter_txx
 
 #include "otbImageToLabelMapWithAttributesFilter.h"
 #include "itkProcessObject.h"
diff --git a/Modules/Core/LabelMap/include/otbKMeansAttributesLabelMapFilter.h b/Modules/Core/LabelMap/include/otbKMeansAttributesLabelMapFilter.h
index bc5e716760..6da83c0eb9 100644
--- a/Modules/Core/LabelMap/include/otbKMeansAttributesLabelMapFilter.h
+++ b/Modules/Core/LabelMap/include/otbKMeansAttributesLabelMapFilter.h
@@ -15,8 +15,8 @@ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbKMeansAttributesLabelMapFilter_h
-#define __otbKMeansAttributesLabelMapFilter_h
+#ifndef otbKMeansAttributesLabelMapFilter_h
+#define otbKMeansAttributesLabelMapFilter_h
 
 #include "itkLabelMapFilter.h"
 #include "otbLabelMapWithClassLabelToLabeledSampleListFilter.h"
diff --git a/Modules/Core/LabelMap/include/otbKMeansAttributesLabelMapFilter.txx b/Modules/Core/LabelMap/include/otbKMeansAttributesLabelMapFilter.txx
index 965edc618c..cc093f06f8 100644
--- a/Modules/Core/LabelMap/include/otbKMeansAttributesLabelMapFilter.txx
+++ b/Modules/Core/LabelMap/include/otbKMeansAttributesLabelMapFilter.txx
@@ -15,8 +15,8 @@ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbKMeansAttributesLabelMapFilter_txx
-#define __otbKMeansAttributesLabelMapFilter_txx
+#ifndef otbKMeansAttributesLabelMapFilter_txx
+#define otbKMeansAttributesLabelMapFilter_txx
 
 #include "otbKMeansAttributesLabelMapFilter.h"
 #include "itkNumericTraits.h"
diff --git a/Modules/Core/LabelMap/include/otbLabelImageToLabelMapWithAdjacencyFilter.h b/Modules/Core/LabelMap/include/otbLabelImageToLabelMapWithAdjacencyFilter.h
index 0cac885b05..27deeeaee2 100644
--- a/Modules/Core/LabelMap/include/otbLabelImageToLabelMapWithAdjacencyFilter.h
+++ b/Modules/Core/LabelMap/include/otbLabelImageToLabelMapWithAdjacencyFilter.h
@@ -18,8 +18,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbLabelImageToLabelMapWithAdjacencyFilter_h
-#define __otbLabelImageToLabelMapWithAdjacencyFilter_h
+#ifndef otbLabelImageToLabelMapWithAdjacencyFilter_h
+#define otbLabelImageToLabelMapWithAdjacencyFilter_h
 
 #include "itkImageToImageFilter.h"
 #include "otbLabelMapWithAdjacency.h"
diff --git a/Modules/Core/LabelMap/include/otbLabelImageToLabelMapWithAdjacencyFilter.txx b/Modules/Core/LabelMap/include/otbLabelImageToLabelMapWithAdjacencyFilter.txx
index d8995d186c..efca8c48f0 100644
--- a/Modules/Core/LabelMap/include/otbLabelImageToLabelMapWithAdjacencyFilter.txx
+++ b/Modules/Core/LabelMap/include/otbLabelImageToLabelMapWithAdjacencyFilter.txx
@@ -18,8 +18,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbLabelImageToLabelMapWithAdjacencyFilter_txx
-#define __otbLabelImageToLabelMapWithAdjacencyFilter_txx
+#ifndef otbLabelImageToLabelMapWithAdjacencyFilter_txx
+#define otbLabelImageToLabelMapWithAdjacencyFilter_txx
 
 #include "otbLabelImageToLabelMapWithAdjacencyFilter.h"
 #include "itkNumericTraits.h"
diff --git a/Modules/Core/LabelMap/include/otbLabelMapFeaturesFunctorImageFilter.h b/Modules/Core/LabelMap/include/otbLabelMapFeaturesFunctorImageFilter.h
index f17418747e..6366e3f2fb 100644
--- a/Modules/Core/LabelMap/include/otbLabelMapFeaturesFunctorImageFilter.h
+++ b/Modules/Core/LabelMap/include/otbLabelMapFeaturesFunctorImageFilter.h
@@ -18,8 +18,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbLabelMapFeaturesFunctorImageFilter_h
-#define __otbLabelMapFeaturesFunctorImageFilter_h
+#ifndef otbLabelMapFeaturesFunctorImageFilter_h
+#define otbLabelMapFeaturesFunctorImageFilter_h
 
 #include "itkInPlaceLabelMapFilter.h"
 
diff --git a/Modules/Core/LabelMap/include/otbLabelMapSource.h b/Modules/Core/LabelMap/include/otbLabelMapSource.h
index 3dbb4bc46c..1fc4ce631e 100644
--- a/Modules/Core/LabelMap/include/otbLabelMapSource.h
+++ b/Modules/Core/LabelMap/include/otbLabelMapSource.h
@@ -16,8 +16,8 @@
 
 =========================================================================*/
 
-#ifndef __otbLabelMapSource_h
-#define __otbLabelMapSource_h
+#ifndef otbLabelMapSource_h
+#define otbLabelMapSource_h
 
 
 #include "itkProcessObject.h"
@@ -80,4 +80,4 @@ private:
 #include "otbLabelMapSource.txx"
 #endif
 
-#endif // __otbLabelMapSource_h
+#endif // otbLabelMapSource_h
diff --git a/Modules/Core/LabelMap/include/otbLabelMapSource.txx b/Modules/Core/LabelMap/include/otbLabelMapSource.txx
index 5e9a4bf370..252421399a 100644
--- a/Modules/Core/LabelMap/include/otbLabelMapSource.txx
+++ b/Modules/Core/LabelMap/include/otbLabelMapSource.txx
@@ -16,8 +16,8 @@
 
 =========================================================================*/
 
-#ifndef __otbLabelMapSource_txx
-#define __otbLabelMapSource_txx
+#ifndef otbLabelMapSource_txx
+#define otbLabelMapSource_txx
 
 #include "otbLabelMapSource.h"
 
diff --git a/Modules/Core/LabelMap/include/otbLabelMapToAttributeImageFilter.h b/Modules/Core/LabelMap/include/otbLabelMapToAttributeImageFilter.h
index 5e791981d9..910e37edd1 100644
--- a/Modules/Core/LabelMap/include/otbLabelMapToAttributeImageFilter.h
+++ b/Modules/Core/LabelMap/include/otbLabelMapToAttributeImageFilter.h
@@ -16,8 +16,8 @@
 
 =========================================================================*/
 
-#ifndef __otbLabelMapToAttributeImageFilter_h
-#define __otbLabelMapToAttributeImageFilter_h
+#ifndef otbLabelMapToAttributeImageFilter_h
+#define otbLabelMapToAttributeImageFilter_h
 
 #include "itkLabelMapFilter.h"
 #include "otbAttributesMapLabelObject.h"
diff --git a/Modules/Core/LabelMap/include/otbLabelMapToAttributeImageFilter.txx b/Modules/Core/LabelMap/include/otbLabelMapToAttributeImageFilter.txx
index 88f606e143..7ed28cd3a4 100644
--- a/Modules/Core/LabelMap/include/otbLabelMapToAttributeImageFilter.txx
+++ b/Modules/Core/LabelMap/include/otbLabelMapToAttributeImageFilter.txx
@@ -16,8 +16,8 @@
 
 =========================================================================*/
 
-#ifndef __otbLabelMapToAttributeImageFilter_txx
-#define __otbLabelMapToAttributeImageFilter_txx
+#ifndef otbLabelMapToAttributeImageFilter_txx
+#define otbLabelMapToAttributeImageFilter_txx
 
 #include "otbLabelMapToAttributeImageFilter.h"
 #include "otbMacro.h"
diff --git a/Modules/Core/LabelMap/include/otbLabelMapToLabelImageFilter.h b/Modules/Core/LabelMap/include/otbLabelMapToLabelImageFilter.h
index 647e431cda..3614df3920 100644
--- a/Modules/Core/LabelMap/include/otbLabelMapToLabelImageFilter.h
+++ b/Modules/Core/LabelMap/include/otbLabelMapToLabelImageFilter.h
@@ -14,8 +14,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbLabelMapToLabelImageFilter_h
-#define __otbLabelMapToLabelImageFilter_h
+#ifndef otbLabelMapToLabelImageFilter_h
+#define otbLabelMapToLabelImageFilter_h
 
 #include "itkLabelMapToLabelImageFilter.h"
 
diff --git a/Modules/Core/LabelMap/include/otbLabelMapToLabelImageFilter.txx b/Modules/Core/LabelMap/include/otbLabelMapToLabelImageFilter.txx
index ffc0f7e701..1d38900990 100644
--- a/Modules/Core/LabelMap/include/otbLabelMapToLabelImageFilter.txx
+++ b/Modules/Core/LabelMap/include/otbLabelMapToLabelImageFilter.txx
@@ -14,8 +14,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbLabelMapToLabelImageFilter_txx
-#define __otbLabelMapToLabelImageFilter_txx
+#ifndef otbLabelMapToLabelImageFilter_txx
+#define otbLabelMapToLabelImageFilter_txx
 
 #include "otbLabelMapToLabelImageFilter.h"
 #include "itkNumericTraits.h"
diff --git a/Modules/Core/LabelMap/include/otbLabelMapToSampleListFilter.h b/Modules/Core/LabelMap/include/otbLabelMapToSampleListFilter.h
index 04231b7ea4..74e29aa939 100644
--- a/Modules/Core/LabelMap/include/otbLabelMapToSampleListFilter.h
+++ b/Modules/Core/LabelMap/include/otbLabelMapToSampleListFilter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbLabelMapToSampleListFilter_h
-#define __otbLabelMapToSampleListFilter_h
+#ifndef otbLabelMapToSampleListFilter_h
+#define otbLabelMapToSampleListFilter_h
 
 #include <algorithm>
 
diff --git a/Modules/Core/LabelMap/include/otbLabelMapToSampleListFilter.txx b/Modules/Core/LabelMap/include/otbLabelMapToSampleListFilter.txx
index 6a627f96c0..b85660a898 100644
--- a/Modules/Core/LabelMap/include/otbLabelMapToSampleListFilter.txx
+++ b/Modules/Core/LabelMap/include/otbLabelMapToSampleListFilter.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbLabelMapToSampleListFilter_txx
-#define __otbLabelMapToSampleListFilter_txx
+#ifndef otbLabelMapToSampleListFilter_txx
+#define otbLabelMapToSampleListFilter_txx
 
 #include "otbLabelMapToSampleListFilter.h"
 
diff --git a/Modules/Core/LabelMap/include/otbLabelMapWithAdjacency.h b/Modules/Core/LabelMap/include/otbLabelMapWithAdjacency.h
index 420d659679..f50f4bd98e 100644
--- a/Modules/Core/LabelMap/include/otbLabelMapWithAdjacency.h
+++ b/Modules/Core/LabelMap/include/otbLabelMapWithAdjacency.h
@@ -15,8 +15,8 @@ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbLabelMapWithAdjacency_h
-#define __otbLabelMapWithAdjacency_h
+#ifndef otbLabelMapWithAdjacency_h
+#define otbLabelMapWithAdjacency_h
 
 #include "itkLabelMap.h"
 #include "otbMergeLabelObjectFunctor.h"
diff --git a/Modules/Core/LabelMap/include/otbLabelMapWithClassLabelToClassLabelImageFilter.h b/Modules/Core/LabelMap/include/otbLabelMapWithClassLabelToClassLabelImageFilter.h
index faac75ab72..6de97a056f 100644
--- a/Modules/Core/LabelMap/include/otbLabelMapWithClassLabelToClassLabelImageFilter.h
+++ b/Modules/Core/LabelMap/include/otbLabelMapWithClassLabelToClassLabelImageFilter.h
@@ -15,8 +15,8 @@ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbLabelMapWithClassLabelToClassLabelImageFilter_h
-#define __otbLabelMapWithClassLabelToClassLabelImageFilter_h
+#ifndef otbLabelMapWithClassLabelToClassLabelImageFilter_h
+#define otbLabelMapWithClassLabelToClassLabelImageFilter_h
 
 #include "itkLabelMapFilter.h"
 
diff --git a/Modules/Core/LabelMap/include/otbLabelMapWithClassLabelToClassLabelImageFilter.txx b/Modules/Core/LabelMap/include/otbLabelMapWithClassLabelToClassLabelImageFilter.txx
index 7588b0877b..93c0528781 100644
--- a/Modules/Core/LabelMap/include/otbLabelMapWithClassLabelToClassLabelImageFilter.txx
+++ b/Modules/Core/LabelMap/include/otbLabelMapWithClassLabelToClassLabelImageFilter.txx
@@ -15,8 +15,8 @@ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbLabelMapWithClassLabelToClassLabelImageFilter_txx
-#define __otbLabelMapWithClassLabelToClassLabelImageFilter_txx
+#ifndef otbLabelMapWithClassLabelToClassLabelImageFilter_txx
+#define otbLabelMapWithClassLabelToClassLabelImageFilter_txx
 
 #include "otbLabelMapWithClassLabelToClassLabelImageFilter.h"
 #include "itkNumericTraits.h"
diff --git a/Modules/Core/LabelMap/include/otbLabelMapWithClassLabelToLabeledSampleListFilter.h b/Modules/Core/LabelMap/include/otbLabelMapWithClassLabelToLabeledSampleListFilter.h
index 4774c9a075..894b569cf5 100644
--- a/Modules/Core/LabelMap/include/otbLabelMapWithClassLabelToLabeledSampleListFilter.h
+++ b/Modules/Core/LabelMap/include/otbLabelMapWithClassLabelToLabeledSampleListFilter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbLabelMapWithClassLabelToLabeledSampleListFilter_h
-#define __otbLabelMapWithClassLabelToLabeledSampleListFilter_h
+#ifndef otbLabelMapWithClassLabelToLabeledSampleListFilter_h
+#define otbLabelMapWithClassLabelToLabeledSampleListFilter_h
 
 #include "otbLabelMapToSampleListFilter.h"
 
diff --git a/Modules/Core/LabelMap/include/otbLabelMapWithClassLabelToLabeledSampleListFilter.txx b/Modules/Core/LabelMap/include/otbLabelMapWithClassLabelToLabeledSampleListFilter.txx
index e0fdad6edd..66c7fb3e86 100644
--- a/Modules/Core/LabelMap/include/otbLabelMapWithClassLabelToLabeledSampleListFilter.txx
+++ b/Modules/Core/LabelMap/include/otbLabelMapWithClassLabelToLabeledSampleListFilter.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbLabelMapWithClassLabelToLabeledSampleListFilter_txx
-#define __otbLabelMapWithClassLabelToLabeledSampleListFilter_txx
+#ifndef otbLabelMapWithClassLabelToLabeledSampleListFilter_txx
+#define otbLabelMapWithClassLabelToLabeledSampleListFilter_txx
 
 #include "otbLabelMapWithClassLabelToLabeledSampleListFilter.h"
 #include "itkDataObject.h"
diff --git a/Modules/Core/LabelMap/include/otbLabelObjectFieldsFunctor.h b/Modules/Core/LabelMap/include/otbLabelObjectFieldsFunctor.h
index 4875537cfb..4140c94bc2 100644
--- a/Modules/Core/LabelMap/include/otbLabelObjectFieldsFunctor.h
+++ b/Modules/Core/LabelMap/include/otbLabelObjectFieldsFunctor.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbLabelObjectFieldsFunctor_h
-#define __otbLabelObjectFieldsFunctor_h
+#ifndef otbLabelObjectFieldsFunctor_h
+#define otbLabelObjectFieldsFunctor_h
 
 #include "itkLabelObject.h"
 #include <map>
diff --git a/Modules/Core/LabelMap/include/otbLabelObjectToPolygonFunctor.h b/Modules/Core/LabelMap/include/otbLabelObjectToPolygonFunctor.h
index f050fe1d65..bba63cd462 100644
--- a/Modules/Core/LabelMap/include/otbLabelObjectToPolygonFunctor.h
+++ b/Modules/Core/LabelMap/include/otbLabelObjectToPolygonFunctor.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbLabelObjectToPolygonFunctor_h
-#define __otbLabelObjectToPolygonFunctor_h
+#ifndef otbLabelObjectToPolygonFunctor_h
+#define otbLabelObjectToPolygonFunctor_h
 
 #include <vector>
 
diff --git a/Modules/Core/LabelMap/include/otbLabelObjectToPolygonFunctor.txx b/Modules/Core/LabelMap/include/otbLabelObjectToPolygonFunctor.txx
index cce9ffe675..bab301c62d 100644
--- a/Modules/Core/LabelMap/include/otbLabelObjectToPolygonFunctor.txx
+++ b/Modules/Core/LabelMap/include/otbLabelObjectToPolygonFunctor.txx
@@ -16,8 +16,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbLabelObjectToPolygonFunctor_txx
-#define __otbLabelObjectToPolygonFunctor_txx
+#ifndef otbLabelObjectToPolygonFunctor_txx
+#define otbLabelObjectToPolygonFunctor_txx
 
 
 #include "otbLabelObjectToPolygonFunctor.h"
diff --git a/Modules/Core/LabelMap/include/otbLabelObjectWithClassLabelFieldsFunctor.h b/Modules/Core/LabelMap/include/otbLabelObjectWithClassLabelFieldsFunctor.h
index 0317b60c01..1c89d8f3d9 100644
--- a/Modules/Core/LabelMap/include/otbLabelObjectWithClassLabelFieldsFunctor.h
+++ b/Modules/Core/LabelMap/include/otbLabelObjectWithClassLabelFieldsFunctor.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbLabelObjectWithClassLabelFieldsFunctor_h
-#define __otbLabelObjectWithClassLabelFieldsFunctor_h
+#ifndef otbLabelObjectWithClassLabelFieldsFunctor_h
+#define otbLabelObjectWithClassLabelFieldsFunctor_h
 
 #include "itkLabelObject.h"
 #include <map>
diff --git a/Modules/Core/LabelMap/include/otbMergeLabelObjectFunctor.h b/Modules/Core/LabelMap/include/otbMergeLabelObjectFunctor.h
index 5c279fdca7..d7f140bd54 100644
--- a/Modules/Core/LabelMap/include/otbMergeLabelObjectFunctor.h
+++ b/Modules/Core/LabelMap/include/otbMergeLabelObjectFunctor.h
@@ -15,8 +15,8 @@ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbMergeLabelObjectFunctor_h
-#define __otbMergeLabelObjectFunctor_h
+#ifndef otbMergeLabelObjectFunctor_h
+#define otbMergeLabelObjectFunctor_h
 
 #include <algorithm>
 
diff --git a/Modules/Core/LabelMap/include/otbMinMaxAttributesLabelMapFilter.h b/Modules/Core/LabelMap/include/otbMinMaxAttributesLabelMapFilter.h
index 12899f2835..53943dd2b3 100644
--- a/Modules/Core/LabelMap/include/otbMinMaxAttributesLabelMapFilter.h
+++ b/Modules/Core/LabelMap/include/otbMinMaxAttributesLabelMapFilter.h
@@ -15,8 +15,8 @@ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbMinMaxAttributesLabelMapFilter_h
-#define __otbMinMaxAttributesLabelMapFilter_h
+#ifndef otbMinMaxAttributesLabelMapFilter_h
+#define otbMinMaxAttributesLabelMapFilter_h
 
 #include "itkLabelMapFilter.h"
 #include "itkSimpleDataObjectDecorator.h"
diff --git a/Modules/Core/LabelMap/include/otbMinMaxAttributesLabelMapFilter.txx b/Modules/Core/LabelMap/include/otbMinMaxAttributesLabelMapFilter.txx
index 5285e63d8b..4f28217dee 100644
--- a/Modules/Core/LabelMap/include/otbMinMaxAttributesLabelMapFilter.txx
+++ b/Modules/Core/LabelMap/include/otbMinMaxAttributesLabelMapFilter.txx
@@ -15,8 +15,8 @@ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbMinMaxAttributesLabelMapFilter_txx
-#define __otbMinMaxAttributesLabelMapFilter_txx
+#ifndef otbMinMaxAttributesLabelMapFilter_txx
+#define otbMinMaxAttributesLabelMapFilter_txx
 
 #include "otbMinMaxAttributesLabelMapFilter.h"
 #include "itkNumericTraits.h"
diff --git a/Modules/Core/LabelMap/include/otbNormalizeAttributesLabelMapFilter.h b/Modules/Core/LabelMap/include/otbNormalizeAttributesLabelMapFilter.h
index d665a70510..ac8289eb64 100644
--- a/Modules/Core/LabelMap/include/otbNormalizeAttributesLabelMapFilter.h
+++ b/Modules/Core/LabelMap/include/otbNormalizeAttributesLabelMapFilter.h
@@ -18,8 +18,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbNormalizeAttributesLabelMapFilter_h
-#define __otbNormalizeAttributesLabelMapFilter_h
+#ifndef otbNormalizeAttributesLabelMapFilter_h
+#define otbNormalizeAttributesLabelMapFilter_h
 
 #include "otbLabelMapFeaturesFunctorImageFilter.h"
 #include <vector>
diff --git a/Modules/Core/LabelMap/include/otbNormalizeAttributesLabelMapFilter.txx b/Modules/Core/LabelMap/include/otbNormalizeAttributesLabelMapFilter.txx
index 4b3b86c264..d82e98355b 100644
--- a/Modules/Core/LabelMap/include/otbNormalizeAttributesLabelMapFilter.txx
+++ b/Modules/Core/LabelMap/include/otbNormalizeAttributesLabelMapFilter.txx
@@ -18,8 +18,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbNormalizeAttributesLabelMapFilter_txx
-#define __otbNormalizeAttributesLabelMapFilter_txx
+#ifndef otbNormalizeAttributesLabelMapFilter_txx
+#define otbNormalizeAttributesLabelMapFilter_txx
 
 #include "otbNormalizeAttributesLabelMapFilter.h"
 
diff --git a/Modules/Core/LabelMap/include/otbShapeAttributesLabelMapFilter.h b/Modules/Core/LabelMap/include/otbShapeAttributesLabelMapFilter.h
index f48bf3b5bd..7aa2b3bf1b 100644
--- a/Modules/Core/LabelMap/include/otbShapeAttributesLabelMapFilter.h
+++ b/Modules/Core/LabelMap/include/otbShapeAttributesLabelMapFilter.h
@@ -18,8 +18,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbShapeAttributesLabelMapFilter_h
-#define __otbShapeAttributesLabelMapFilter_h
+#ifndef otbShapeAttributesLabelMapFilter_h
+#define otbShapeAttributesLabelMapFilter_h
 
 #include "otbLabelMapFeaturesFunctorImageFilter.h"
 #include "otbImage.h"
diff --git a/Modules/Core/LabelMap/include/otbShapeAttributesLabelMapFilter.txx b/Modules/Core/LabelMap/include/otbShapeAttributesLabelMapFilter.txx
index ea28e703c6..bf5bff1184 100644
--- a/Modules/Core/LabelMap/include/otbShapeAttributesLabelMapFilter.txx
+++ b/Modules/Core/LabelMap/include/otbShapeAttributesLabelMapFilter.txx
@@ -18,8 +18,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbShapeAttributesLabelMapFilter_txx
-#define __otbShapeAttributesLabelMapFilter_txx
+#ifndef otbShapeAttributesLabelMapFilter_txx
+#define otbShapeAttributesLabelMapFilter_txx
 
 #include "otbShapeAttributesLabelMapFilter.h"
 #include "itkProgressReporter.h"
diff --git a/Modules/Core/LabelMap/include/otbStatisticsAttributesLabelMapFilter.h b/Modules/Core/LabelMap/include/otbStatisticsAttributesLabelMapFilter.h
index 00f0337cec..06314975f5 100644
--- a/Modules/Core/LabelMap/include/otbStatisticsAttributesLabelMapFilter.h
+++ b/Modules/Core/LabelMap/include/otbStatisticsAttributesLabelMapFilter.h
@@ -18,8 +18,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbStatisticsAttributesLabelMapFilter_h
-#define __otbStatisticsAttributesLabelMapFilter_h
+#ifndef otbStatisticsAttributesLabelMapFilter_h
+#define otbStatisticsAttributesLabelMapFilter_h
 
 #include "otbLabelMapFeaturesFunctorImageFilter.h"
 #include "itkMatrix.h"
diff --git a/Modules/Core/LabelMap/include/otbStatisticsAttributesLabelMapFilter.txx b/Modules/Core/LabelMap/include/otbStatisticsAttributesLabelMapFilter.txx
index bd77a6b5b8..0640feb2b0 100644
--- a/Modules/Core/LabelMap/include/otbStatisticsAttributesLabelMapFilter.txx
+++ b/Modules/Core/LabelMap/include/otbStatisticsAttributesLabelMapFilter.txx
@@ -18,8 +18,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbStatisticsAttributesLabelMapFilter_txx
-#define __otbStatisticsAttributesLabelMapFilter_txx
+#ifndef otbStatisticsAttributesLabelMapFilter_txx
+#define otbStatisticsAttributesLabelMapFilter_txx
 
 #include "otbStatisticsAttributesLabelMapFilter.h"
 
diff --git a/Modules/Core/Metadata/include/otbBandName.h b/Modules/Core/Metadata/include/otbBandName.h
index e00d69444f..040fea3299 100644
--- a/Modules/Core/Metadata/include/otbBandName.h
+++ b/Modules/Core/Metadata/include/otbBandName.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbBandName_h
-#define __otbBandName_h
+#ifndef otbBandName_h
+#define otbBandName_h
 
 namespace otb
 {
diff --git a/Modules/Core/Metadata/include/otbDefaultImageMetadataInterface.h b/Modules/Core/Metadata/include/otbDefaultImageMetadataInterface.h
index 45350ee841..b2fa104335 100644
--- a/Modules/Core/Metadata/include/otbDefaultImageMetadataInterface.h
+++ b/Modules/Core/Metadata/include/otbDefaultImageMetadataInterface.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbDefaultImageMetadataInterface_h
-#define __otbDefaultImageMetadataInterface_h
+#ifndef otbDefaultImageMetadataInterface_h
+#define otbDefaultImageMetadataInterface_h
 
 #include <algorithm>
 
diff --git a/Modules/Core/Metadata/include/otbDefaultImageMetadataInterfaceFactory.h b/Modules/Core/Metadata/include/otbDefaultImageMetadataInterfaceFactory.h
index 5364e509ca..7515336fcf 100644
--- a/Modules/Core/Metadata/include/otbDefaultImageMetadataInterfaceFactory.h
+++ b/Modules/Core/Metadata/include/otbDefaultImageMetadataInterfaceFactory.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbDefaultImageMetadataInterfaceFactory_h
-#define __otbDefaultImageMetadataInterfaceFactory_h
+#ifndef otbDefaultImageMetadataInterfaceFactory_h
+#define otbDefaultImageMetadataInterfaceFactory_h
 
 
 #include "itkObjectFactoryBase.h"
diff --git a/Modules/Core/Metadata/include/otbFormosatImageMetadataInterface.h b/Modules/Core/Metadata/include/otbFormosatImageMetadataInterface.h
index 6fd5ca792d..d2a005f13e 100644
--- a/Modules/Core/Metadata/include/otbFormosatImageMetadataInterface.h
+++ b/Modules/Core/Metadata/include/otbFormosatImageMetadataInterface.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbFormosatImageMetadataInterface_h
-#define __otbFormosatImageMetadataInterface_h
+#ifndef otbFormosatImageMetadataInterface_h
+#define otbFormosatImageMetadataInterface_h
 
 #include "otbOpticalImageMetadataInterface.h"
 
diff --git a/Modules/Core/Metadata/include/otbFormosatImageMetadataInterfaceFactory.h b/Modules/Core/Metadata/include/otbFormosatImageMetadataInterfaceFactory.h
index c99428a352..91a62c2ba1 100644
--- a/Modules/Core/Metadata/include/otbFormosatImageMetadataInterfaceFactory.h
+++ b/Modules/Core/Metadata/include/otbFormosatImageMetadataInterfaceFactory.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbFormosatImageMetadataInterfaceFactory_h
-#define __otbFormosatImageMetadataInterfaceFactory_h
+#ifndef otbFormosatImageMetadataInterfaceFactory_h
+#define otbFormosatImageMetadataInterfaceFactory_h
 
 
 #include "itkObjectFactoryBase.h"
diff --git a/Modules/Core/Metadata/include/otbIkonosImageMetadataInterface.h b/Modules/Core/Metadata/include/otbIkonosImageMetadataInterface.h
index 9859d04865..358161f66e 100644
--- a/Modules/Core/Metadata/include/otbIkonosImageMetadataInterface.h
+++ b/Modules/Core/Metadata/include/otbIkonosImageMetadataInterface.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbIkonosImageMetadataInterface_h
-#define __otbIkonosImageMetadataInterface_h
+#ifndef otbIkonosImageMetadataInterface_h
+#define otbIkonosImageMetadataInterface_h
 
 #include "otbOpticalImageMetadataInterface.h"
 
diff --git a/Modules/Core/Metadata/include/otbIkonosImageMetadataInterfaceFactory.h b/Modules/Core/Metadata/include/otbIkonosImageMetadataInterfaceFactory.h
index 247027420b..24c9212c18 100644
--- a/Modules/Core/Metadata/include/otbIkonosImageMetadataInterfaceFactory.h
+++ b/Modules/Core/Metadata/include/otbIkonosImageMetadataInterfaceFactory.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbIkonosImageMetadataInterfaceFactory_h
-#define __otbIkonosImageMetadataInterfaceFactory_h
+#ifndef otbIkonosImageMetadataInterfaceFactory_h
+#define otbIkonosImageMetadataInterfaceFactory_h
 
 
 #include "itkObjectFactoryBase.h"
diff --git a/Modules/Core/Metadata/include/otbImageMetadataInterfaceBase.h b/Modules/Core/Metadata/include/otbImageMetadataInterfaceBase.h
index 13b56b7b2f..f607d16666 100644
--- a/Modules/Core/Metadata/include/otbImageMetadataInterfaceBase.h
+++ b/Modules/Core/Metadata/include/otbImageMetadataInterfaceBase.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbImageMetadataInterfaceBase_h
-#define __otbImageMetadataInterfaceBase_h
+#ifndef otbImageMetadataInterfaceBase_h
+#define otbImageMetadataInterfaceBase_h
 
 #include <string>
 
diff --git a/Modules/Core/Metadata/include/otbImageMetadataInterfaceFactory.h b/Modules/Core/Metadata/include/otbImageMetadataInterfaceFactory.h
index e94e7dd3a5..11bea1aba6 100644
--- a/Modules/Core/Metadata/include/otbImageMetadataInterfaceFactory.h
+++ b/Modules/Core/Metadata/include/otbImageMetadataInterfaceFactory.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbImageMetadataInterfaceFactory_h
-#define __otbImageMetadataInterfaceFactory_h
+#ifndef otbImageMetadataInterfaceFactory_h
+#define otbImageMetadataInterfaceFactory_h
 
 #include "itkObject.h"
 #include "otbImageMetadataInterfaceBase.h"
diff --git a/Modules/Core/Metadata/include/otbNoDataHelper.h b/Modules/Core/Metadata/include/otbNoDataHelper.h
index 57d927c78f..4ab2546bb9 100644
--- a/Modules/Core/Metadata/include/otbNoDataHelper.h
+++ b/Modules/Core/Metadata/include/otbNoDataHelper.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbNoDataHelper_h
-#define __otbNoDataHelper_h
+#ifndef otbNoDataHelper_h
+#define otbNoDataHelper_h
 #include <vector>
 #include <cassert>
 #include "vnl/vnl_math.h"
diff --git a/Modules/Core/Metadata/include/otbOpticalDefaultImageMetadataInterface.h b/Modules/Core/Metadata/include/otbOpticalDefaultImageMetadataInterface.h
index 3647a8331f..d25d96fbf1 100644
--- a/Modules/Core/Metadata/include/otbOpticalDefaultImageMetadataInterface.h
+++ b/Modules/Core/Metadata/include/otbOpticalDefaultImageMetadataInterface.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbOpticalDefaultImageMetadataInterface_h
-#define __otbOpticalDefaultImageMetadataInterface_h
+#ifndef otbOpticalDefaultImageMetadataInterface_h
+#define otbOpticalDefaultImageMetadataInterface_h
 
 
 #include "otbMacro.h"
diff --git a/Modules/Core/Metadata/include/otbOpticalDefaultImageMetadataInterfaceFactory.h b/Modules/Core/Metadata/include/otbOpticalDefaultImageMetadataInterfaceFactory.h
index ec77c6e665..af4d0f4f58 100644
--- a/Modules/Core/Metadata/include/otbOpticalDefaultImageMetadataInterfaceFactory.h
+++ b/Modules/Core/Metadata/include/otbOpticalDefaultImageMetadataInterfaceFactory.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbOpticalDefaultImageMetadataInterfaceFactory_h
-#define __otbOpticalDefaultImageMetadataInterfaceFactory_h
+#ifndef otbOpticalDefaultImageMetadataInterfaceFactory_h
+#define otbOpticalDefaultImageMetadataInterfaceFactory_h
 
 
 #include "itkObjectFactoryBase.h"
diff --git a/Modules/Core/Metadata/include/otbOpticalImageMetadataInterface.h b/Modules/Core/Metadata/include/otbOpticalImageMetadataInterface.h
index 7330b3e04d..7c2ca8745a 100644
--- a/Modules/Core/Metadata/include/otbOpticalImageMetadataInterface.h
+++ b/Modules/Core/Metadata/include/otbOpticalImageMetadataInterface.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbOpticalImageMetadataInterface_h
-#define __otbOpticalImageMetadataInterface_h
+#ifndef otbOpticalImageMetadataInterface_h
+#define otbOpticalImageMetadataInterface_h
 
 #include <string>
 
diff --git a/Modules/Core/Metadata/include/otbOpticalImageMetadataInterfaceFactory.h b/Modules/Core/Metadata/include/otbOpticalImageMetadataInterfaceFactory.h
index 934352f0b6..30310fac1c 100644
--- a/Modules/Core/Metadata/include/otbOpticalImageMetadataInterfaceFactory.h
+++ b/Modules/Core/Metadata/include/otbOpticalImageMetadataInterfaceFactory.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbOpticalImageMetadataInterfaceFactory_h
-#define __otbOpticalImageMetadataInterfaceFactory_h
+#ifndef otbOpticalImageMetadataInterfaceFactory_h
+#define otbOpticalImageMetadataInterfaceFactory_h
 
 #include "itkObject.h"
 #include "otbOpticalImageMetadataInterface.h"
diff --git a/Modules/Core/Metadata/include/otbPleiadesImageMetadataInterface.h b/Modules/Core/Metadata/include/otbPleiadesImageMetadataInterface.h
index a5f4bcb91e..64d8bf2e67 100644
--- a/Modules/Core/Metadata/include/otbPleiadesImageMetadataInterface.h
+++ b/Modules/Core/Metadata/include/otbPleiadesImageMetadataInterface.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbPleiadesImageMetadataInterface_h
-#define __otbPleiadesImageMetadataInterface_h
+#ifndef otbPleiadesImageMetadataInterface_h
+#define otbPleiadesImageMetadataInterface_h
 
 #include "otbOpticalImageMetadataInterface.h"
 
diff --git a/Modules/Core/Metadata/include/otbPleiadesImageMetadataInterfaceFactory.h b/Modules/Core/Metadata/include/otbPleiadesImageMetadataInterfaceFactory.h
index 586a249653..6b31c3b6ba 100644
--- a/Modules/Core/Metadata/include/otbPleiadesImageMetadataInterfaceFactory.h
+++ b/Modules/Core/Metadata/include/otbPleiadesImageMetadataInterfaceFactory.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbPleiadesImageMetadataInterfaceFactory_h
-#define __otbPleiadesImageMetadataInterfaceFactory_h
+#ifndef otbPleiadesImageMetadataInterfaceFactory_h
+#define otbPleiadesImageMetadataInterfaceFactory_h
 
 
 #include "itkObjectFactoryBase.h"
diff --git a/Modules/Core/Metadata/include/otbQuickBirdImageMetadataInterface.h b/Modules/Core/Metadata/include/otbQuickBirdImageMetadataInterface.h
index d0176eadd7..81b79cd4cd 100644
--- a/Modules/Core/Metadata/include/otbQuickBirdImageMetadataInterface.h
+++ b/Modules/Core/Metadata/include/otbQuickBirdImageMetadataInterface.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbQuickBirdImageMetadataInterface_h
-#define __otbQuickBirdImageMetadataInterface_h
+#ifndef otbQuickBirdImageMetadataInterface_h
+#define otbQuickBirdImageMetadataInterface_h
 
 #include "otbOpticalImageMetadataInterface.h"
 
diff --git a/Modules/Core/Metadata/include/otbQuickBirdImageMetadataInterfaceFactory.h b/Modules/Core/Metadata/include/otbQuickBirdImageMetadataInterfaceFactory.h
index cb95c859af..426ff73bbd 100644
--- a/Modules/Core/Metadata/include/otbQuickBirdImageMetadataInterfaceFactory.h
+++ b/Modules/Core/Metadata/include/otbQuickBirdImageMetadataInterfaceFactory.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbQuickBirdImageMetadataInterfaceFactory_h
-#define __otbQuickBirdImageMetadataInterfaceFactory_h
+#ifndef otbQuickBirdImageMetadataInterfaceFactory_h
+#define otbQuickBirdImageMetadataInterfaceFactory_h
 
 
 #include "itkObjectFactoryBase.h"
diff --git a/Modules/Core/Metadata/include/otbRadarsat2ImageMetadataInterface.h b/Modules/Core/Metadata/include/otbRadarsat2ImageMetadataInterface.h
index b9f72fc633..12fd2eab18 100644
--- a/Modules/Core/Metadata/include/otbRadarsat2ImageMetadataInterface.h
+++ b/Modules/Core/Metadata/include/otbRadarsat2ImageMetadataInterface.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbRadarsat2ImageMetadataInterface_h
-#define __otbRadarsat2ImageMetadataInterface_h
+#ifndef otbRadarsat2ImageMetadataInterface_h
+#define otbRadarsat2ImageMetadataInterface_h
 
 #include "otbSarImageMetadataInterface.h"
 
diff --git a/Modules/Core/Metadata/include/otbRadarsat2ImageMetadataInterfaceFactory.h b/Modules/Core/Metadata/include/otbRadarsat2ImageMetadataInterfaceFactory.h
index 3a2eb1fca9..388452d3ee 100644
--- a/Modules/Core/Metadata/include/otbRadarsat2ImageMetadataInterfaceFactory.h
+++ b/Modules/Core/Metadata/include/otbRadarsat2ImageMetadataInterfaceFactory.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbRadarsat2ImageMetadataInterfaceFactory_h
-#define __otbRadarsat2ImageMetadataInterfaceFactory_h
+#ifndef otbRadarsat2ImageMetadataInterfaceFactory_h
+#define otbRadarsat2ImageMetadataInterfaceFactory_h
 
 #include "itkObjectFactoryBase.h"
 
diff --git a/Modules/Core/Metadata/include/otbSarDefaultImageMetadataInterface.h b/Modules/Core/Metadata/include/otbSarDefaultImageMetadataInterface.h
index f0dd509b9b..b109f34d5f 100644
--- a/Modules/Core/Metadata/include/otbSarDefaultImageMetadataInterface.h
+++ b/Modules/Core/Metadata/include/otbSarDefaultImageMetadataInterface.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbSarDefaultImageMetadataInterface_h
-#define __otbSarDefaultImageMetadataInterface_h
+#ifndef otbSarDefaultImageMetadataInterface_h
+#define otbSarDefaultImageMetadataInterface_h
 
 
 #include "otbMacro.h"
diff --git a/Modules/Core/Metadata/include/otbSarDefaultImageMetadataInterfaceFactory.h b/Modules/Core/Metadata/include/otbSarDefaultImageMetadataInterfaceFactory.h
index b43300bc7a..71543d00ff 100644
--- a/Modules/Core/Metadata/include/otbSarDefaultImageMetadataInterfaceFactory.h
+++ b/Modules/Core/Metadata/include/otbSarDefaultImageMetadataInterfaceFactory.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbSarDefaultImageMetadataInterfaceFactory_h
-#define __otbSarDefaultImageMetadataInterfaceFactory_h
+#ifndef otbSarDefaultImageMetadataInterfaceFactory_h
+#define otbSarDefaultImageMetadataInterfaceFactory_h
 
 
 #include "itkObjectFactoryBase.h"
diff --git a/Modules/Core/Metadata/include/otbSarImageMetadataInterface.h b/Modules/Core/Metadata/include/otbSarImageMetadataInterface.h
index 142f6efe35..1a9047b070 100644
--- a/Modules/Core/Metadata/include/otbSarImageMetadataInterface.h
+++ b/Modules/Core/Metadata/include/otbSarImageMetadataInterface.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbSarImageMetadataInterface_h
-#define __otbSarImageMetadataInterface_h
+#ifndef otbSarImageMetadataInterface_h
+#define otbSarImageMetadataInterface_h
 
 #include <string>
 #include <vector>
diff --git a/Modules/Core/Metadata/include/otbSarImageMetadataInterfaceFactory.h b/Modules/Core/Metadata/include/otbSarImageMetadataInterfaceFactory.h
index 6eed671f30..b12c0b970d 100644
--- a/Modules/Core/Metadata/include/otbSarImageMetadataInterfaceFactory.h
+++ b/Modules/Core/Metadata/include/otbSarImageMetadataInterfaceFactory.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbSarImageMetadataInterfaceFactory_h
-#define __otbSarImageMetadataInterfaceFactory_h
+#ifndef otbSarImageMetadataInterfaceFactory_h
+#define otbSarImageMetadataInterfaceFactory_h
 
 #include "itkObject.h"
 #include "otbSarImageMetadataInterface.h"
diff --git a/Modules/Core/Metadata/include/otbSentinel1ImageMetadataInterface.h b/Modules/Core/Metadata/include/otbSentinel1ImageMetadataInterface.h
index bac6a64685..5f54839b4e 100644
--- a/Modules/Core/Metadata/include/otbSentinel1ImageMetadataInterface.h
+++ b/Modules/Core/Metadata/include/otbSentinel1ImageMetadataInterface.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbSentinel1ImageMetadataInterface_h
-#define __otbSentinel1ImageMetadataInterface_h
+#ifndef otbSentinel1ImageMetadataInterface_h
+#define otbSentinel1ImageMetadataInterface_h
 
 #include "otbSarImageMetadataInterface.h"
 
diff --git a/Modules/Core/Metadata/include/otbSentinel1ImageMetadataInterfaceFactory.h b/Modules/Core/Metadata/include/otbSentinel1ImageMetadataInterfaceFactory.h
index 2798f55e49..18e0fb0d41 100644
--- a/Modules/Core/Metadata/include/otbSentinel1ImageMetadataInterfaceFactory.h
+++ b/Modules/Core/Metadata/include/otbSentinel1ImageMetadataInterfaceFactory.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbSentinel1ImageMetadataInterfaceFactory_h
-#define __otbSentinel1ImageMetadataInterfaceFactory_h
+#ifndef otbSentinel1ImageMetadataInterfaceFactory_h
+#define otbSentinel1ImageMetadataInterfaceFactory_h
 
 
 #include "itkObjectFactoryBase.h"
diff --git a/Modules/Core/Metadata/include/otbSpot6ImageMetadataInterface.h b/Modules/Core/Metadata/include/otbSpot6ImageMetadataInterface.h
index 931e271ed1..d1d3483e6e 100644
--- a/Modules/Core/Metadata/include/otbSpot6ImageMetadataInterface.h
+++ b/Modules/Core/Metadata/include/otbSpot6ImageMetadataInterface.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbSpot6ImageMetadataInterface_h
-#define __otbSpot6ImageMetadataInterface_h
+#ifndef otbSpot6ImageMetadataInterface_h
+#define otbSpot6ImageMetadataInterface_h
 
 #include "otbOpticalImageMetadataInterface.h"
 
diff --git a/Modules/Core/Metadata/include/otbSpot6ImageMetadataInterfaceFactory.h b/Modules/Core/Metadata/include/otbSpot6ImageMetadataInterfaceFactory.h
index e00fda0da0..7958c3cd1a 100644
--- a/Modules/Core/Metadata/include/otbSpot6ImageMetadataInterfaceFactory.h
+++ b/Modules/Core/Metadata/include/otbSpot6ImageMetadataInterfaceFactory.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbSpot6ImageMetadataInterfaceFactory_h
-#define __otbSpot6ImageMetadataInterfaceFactory_h
+#ifndef otbSpot6ImageMetadataInterfaceFactory_h
+#define otbSpot6ImageMetadataInterfaceFactory_h
 
 
 #include "itkObjectFactoryBase.h"
diff --git a/Modules/Core/Metadata/include/otbSpotImageMetadataInterface.h b/Modules/Core/Metadata/include/otbSpotImageMetadataInterface.h
index 2706658929..5e802dc24a 100644
--- a/Modules/Core/Metadata/include/otbSpotImageMetadataInterface.h
+++ b/Modules/Core/Metadata/include/otbSpotImageMetadataInterface.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbSpotImageMetadataInterface_h
-#define __otbSpotImageMetadataInterface_h
+#ifndef otbSpotImageMetadataInterface_h
+#define otbSpotImageMetadataInterface_h
 
 #include "otbOpticalImageMetadataInterface.h"
 
diff --git a/Modules/Core/Metadata/include/otbSpotImageMetadataInterfaceFactory.h b/Modules/Core/Metadata/include/otbSpotImageMetadataInterfaceFactory.h
index 1953721c7f..8ea90bc602 100644
--- a/Modules/Core/Metadata/include/otbSpotImageMetadataInterfaceFactory.h
+++ b/Modules/Core/Metadata/include/otbSpotImageMetadataInterfaceFactory.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbSpotImageMetadataInterfaceFactory_h
-#define __otbSpotImageMetadataInterfaceFactory_h
+#ifndef otbSpotImageMetadataInterfaceFactory_h
+#define otbSpotImageMetadataInterfaceFactory_h
 
 
 #include "itkObjectFactoryBase.h"
diff --git a/Modules/Core/Metadata/include/otbTerraSarImageMetadataInterface.h b/Modules/Core/Metadata/include/otbTerraSarImageMetadataInterface.h
index d2b5adcfce..6877a03962 100644
--- a/Modules/Core/Metadata/include/otbTerraSarImageMetadataInterface.h
+++ b/Modules/Core/Metadata/include/otbTerraSarImageMetadataInterface.h
@@ -16,8 +16,8 @@
 
 =========================================================================*/
 
-#ifndef __otbTerraSarImageMetadataInterface_h
-#define __otbTerraSarImageMetadataInterface_h
+#ifndef otbTerraSarImageMetadataInterface_h
+#define otbTerraSarImageMetadataInterface_h
 
 #include <string>
 
diff --git a/Modules/Core/Metadata/include/otbTerraSarImageMetadataInterfaceFactory.h b/Modules/Core/Metadata/include/otbTerraSarImageMetadataInterfaceFactory.h
index fedae74b36..4e33968586 100644
--- a/Modules/Core/Metadata/include/otbTerraSarImageMetadataInterfaceFactory.h
+++ b/Modules/Core/Metadata/include/otbTerraSarImageMetadataInterfaceFactory.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbTerraSarImageMetadataInterfaceFactory_h
-#define __otbTerraSarImageMetadataInterfaceFactory_h
+#ifndef otbTerraSarImageMetadataInterfaceFactory_h
+#define otbTerraSarImageMetadataInterfaceFactory_h
 
 
 #include "itkObjectFactoryBase.h"
diff --git a/Modules/Core/Metadata/include/otbWorldView2ImageMetadataInterface.h b/Modules/Core/Metadata/include/otbWorldView2ImageMetadataInterface.h
index d8aa945fbb..5383ae7612 100644
--- a/Modules/Core/Metadata/include/otbWorldView2ImageMetadataInterface.h
+++ b/Modules/Core/Metadata/include/otbWorldView2ImageMetadataInterface.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbWorldView2ImageMetadataInterface_h
-#define __otbWorldView2ImageMetadataInterface_h
+#ifndef otbWorldView2ImageMetadataInterface_h
+#define otbWorldView2ImageMetadataInterface_h
 
 #include "otbOpticalImageMetadataInterface.h"
 
diff --git a/Modules/Core/Metadata/include/otbWorldView2ImageMetadataInterfaceFactory.h b/Modules/Core/Metadata/include/otbWorldView2ImageMetadataInterfaceFactory.h
index 59f110620a..6d83e95ad7 100644
--- a/Modules/Core/Metadata/include/otbWorldView2ImageMetadataInterfaceFactory.h
+++ b/Modules/Core/Metadata/include/otbWorldView2ImageMetadataInterfaceFactory.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbWorldView2ImageMetadataInterfaceFactory_h
-#define __otbWorldView2ImageMetadataInterfaceFactory_h
+#ifndef otbWorldView2ImageMetadataInterfaceFactory_h
+#define otbWorldView2ImageMetadataInterfaceFactory_h
 
 
 #include "itkObjectFactoryBase.h"
diff --git a/Modules/Core/ObjectList/include/otbImageList.h b/Modules/Core/ObjectList/include/otbImageList.h
index bdd2b8444a..d99c42ed2c 100644
--- a/Modules/Core/ObjectList/include/otbImageList.h
+++ b/Modules/Core/ObjectList/include/otbImageList.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbImageList_h
-#define __otbImageList_h
+#ifndef otbImageList_h
+#define otbImageList_h
 
 #include "otbObjectList.h"
 
diff --git a/Modules/Core/ObjectList/include/otbImageList.txx b/Modules/Core/ObjectList/include/otbImageList.txx
index 8c0db0ae08..ec245289c7 100644
--- a/Modules/Core/ObjectList/include/otbImageList.txx
+++ b/Modules/Core/ObjectList/include/otbImageList.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbImageList_txx
-#define __otbImageList_txx
+#ifndef otbImageList_txx
+#define otbImageList_txx
 
 #include "otbMacro.h"
 
diff --git a/Modules/Core/ObjectList/include/otbImageListSource.h b/Modules/Core/ObjectList/include/otbImageListSource.h
index 0d983ad718..bdd164831c 100644
--- a/Modules/Core/ObjectList/include/otbImageListSource.h
+++ b/Modules/Core/ObjectList/include/otbImageListSource.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbImageListSource_h
-#define __otbImageListSource_h
+#ifndef otbImageListSource_h
+#define otbImageListSource_h
 
 #include "itkProcessObject.h"
 #include "otbImageList.h"
diff --git a/Modules/Core/ObjectList/include/otbImageListSource.txx b/Modules/Core/ObjectList/include/otbImageListSource.txx
index 507e1df87e..7976b7a253 100644
--- a/Modules/Core/ObjectList/include/otbImageListSource.txx
+++ b/Modules/Core/ObjectList/include/otbImageListSource.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbImageListSource_txx
-#define __otbImageListSource_txx
+#ifndef otbImageListSource_txx
+#define otbImageListSource_txx
 
 #include "otbImageListSource.h"
 
diff --git a/Modules/Core/ObjectList/include/otbImageListToImageFilter.h b/Modules/Core/ObjectList/include/otbImageListToImageFilter.h
index a345a7f288..738894599c 100644
--- a/Modules/Core/ObjectList/include/otbImageListToImageFilter.h
+++ b/Modules/Core/ObjectList/include/otbImageListToImageFilter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbImageListToImageFilter_h
-#define __otbImageListToImageFilter_h
+#ifndef otbImageListToImageFilter_h
+#define otbImageListToImageFilter_h
 
 #include "itkImageSource.h"
 #include "otbImageList.h"
diff --git a/Modules/Core/ObjectList/include/otbImageListToImageFilter.txx b/Modules/Core/ObjectList/include/otbImageListToImageFilter.txx
index 8e5c4a538f..bb873fa298 100644
--- a/Modules/Core/ObjectList/include/otbImageListToImageFilter.txx
+++ b/Modules/Core/ObjectList/include/otbImageListToImageFilter.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbImageListToImageFilter_txx
-#define __otbImageListToImageFilter_txx
+#ifndef otbImageListToImageFilter_txx
+#define otbImageListToImageFilter_txx
 
 #include "otbImageListToImageFilter.h"
 
diff --git a/Modules/Core/ObjectList/include/otbImageListToImageListApplyFilter.h b/Modules/Core/ObjectList/include/otbImageListToImageListApplyFilter.h
index 0fa624cff4..ca911d8464 100644
--- a/Modules/Core/ObjectList/include/otbImageListToImageListApplyFilter.h
+++ b/Modules/Core/ObjectList/include/otbImageListToImageListApplyFilter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbImageListToImageListApplyFilter_h
-#define __otbImageListToImageListApplyFilter_h
+#ifndef otbImageListToImageListApplyFilter_h
+#define otbImageListToImageListApplyFilter_h
 
 #include "otbImageListToImageListFilter.h"
 
diff --git a/Modules/Core/ObjectList/include/otbImageListToImageListApplyFilter.txx b/Modules/Core/ObjectList/include/otbImageListToImageListApplyFilter.txx
index 66556e2e58..c1b795e062 100644
--- a/Modules/Core/ObjectList/include/otbImageListToImageListApplyFilter.txx
+++ b/Modules/Core/ObjectList/include/otbImageListToImageListApplyFilter.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbImageListToImageListApplyFilter_txx
-#define __otbImageListToImageListApplyFilter_txx
+#ifndef otbImageListToImageListApplyFilter_txx
+#define otbImageListToImageListApplyFilter_txx
 
 #include "otbImageListToImageListApplyFilter.h"
 
diff --git a/Modules/Core/ObjectList/include/otbImageListToImageListFilter.h b/Modules/Core/ObjectList/include/otbImageListToImageListFilter.h
index dcbd3e6005..72a7ddd923 100644
--- a/Modules/Core/ObjectList/include/otbImageListToImageListFilter.h
+++ b/Modules/Core/ObjectList/include/otbImageListToImageListFilter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbImageListToImageListFilter_h
-#define __otbImageListToImageListFilter_h
+#ifndef otbImageListToImageListFilter_h
+#define otbImageListToImageListFilter_h
 
 #include "otbImageListSource.h"
 
diff --git a/Modules/Core/ObjectList/include/otbImageListToImageListFilter.txx b/Modules/Core/ObjectList/include/otbImageListToImageListFilter.txx
index c714b37865..8368704204 100644
--- a/Modules/Core/ObjectList/include/otbImageListToImageListFilter.txx
+++ b/Modules/Core/ObjectList/include/otbImageListToImageListFilter.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbImageListToImageListFilter_txx
-#define __otbImageListToImageListFilter_txx
+#ifndef otbImageListToImageListFilter_txx
+#define otbImageListToImageListFilter_txx
 
 #include "otbImageListToImageListFilter.h"
 
diff --git a/Modules/Core/ObjectList/include/otbImageListToSingleImageFilter.h b/Modules/Core/ObjectList/include/otbImageListToSingleImageFilter.h
index 9c56bc2b16..d1e33432b2 100644
--- a/Modules/Core/ObjectList/include/otbImageListToSingleImageFilter.h
+++ b/Modules/Core/ObjectList/include/otbImageListToSingleImageFilter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbImageListToSingleImageFilter_h
-#define __otbImageListToSingleImageFilter_h
+#ifndef otbImageListToSingleImageFilter_h
+#define otbImageListToSingleImageFilter_h
 
 #include "otbImageListToImageFilter.h"
 
diff --git a/Modules/Core/ObjectList/include/otbImageListToSingleImageFilter.txx b/Modules/Core/ObjectList/include/otbImageListToSingleImageFilter.txx
index fa0271f0d8..57a7c29267 100644
--- a/Modules/Core/ObjectList/include/otbImageListToSingleImageFilter.txx
+++ b/Modules/Core/ObjectList/include/otbImageListToSingleImageFilter.txx
@@ -16,8 +16,8 @@
 
 =========================================================================*/
 
-#ifndef __otbImageListToSingleImageFilter_txx
-#define __otbImageListToSingleImageFilter_txx
+#ifndef otbImageListToSingleImageFilter_txx
+#define otbImageListToSingleImageFilter_txx
 
 #include "itkImageRegionConstIteratorWithIndex.h"
 #include "itkImageRegionIteratorWithIndex.h"
diff --git a/Modules/Core/ObjectList/include/otbImageListToVectorImageFilter.h b/Modules/Core/ObjectList/include/otbImageListToVectorImageFilter.h
index c1a87ed00b..6a9bb591b5 100644
--- a/Modules/Core/ObjectList/include/otbImageListToVectorImageFilter.h
+++ b/Modules/Core/ObjectList/include/otbImageListToVectorImageFilter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbImageListToVectorImageFilter_h
-#define __otbImageListToVectorImageFilter_h
+#ifndef otbImageListToVectorImageFilter_h
+#define otbImageListToVectorImageFilter_h
 
 #include "otbImageListToImageFilter.h"
 
diff --git a/Modules/Core/ObjectList/include/otbImageListToVectorImageFilter.txx b/Modules/Core/ObjectList/include/otbImageListToVectorImageFilter.txx
index d8ae323ea8..e7f29ec279 100644
--- a/Modules/Core/ObjectList/include/otbImageListToVectorImageFilter.txx
+++ b/Modules/Core/ObjectList/include/otbImageListToVectorImageFilter.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbImageListToVectorImageFilter_txx
-#define __otbImageListToVectorImageFilter_txx
+#ifndef otbImageListToVectorImageFilter_txx
+#define otbImageListToVectorImageFilter_txx
 
 #include "otbImageListToVectorImageFilter.h"
 #include "itkImageRegionIterator.h"
diff --git a/Modules/Core/ObjectList/include/otbImageToImageListFilter.h b/Modules/Core/ObjectList/include/otbImageToImageListFilter.h
index 63d0f4a516..fbb7791208 100644
--- a/Modules/Core/ObjectList/include/otbImageToImageListFilter.h
+++ b/Modules/Core/ObjectList/include/otbImageToImageListFilter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbImageToImageListFilter_h
-#define __otbImageToImageListFilter_h
+#ifndef otbImageToImageListFilter_h
+#define otbImageToImageListFilter_h
 
 #include "otbImageListSource.h"
 
diff --git a/Modules/Core/ObjectList/include/otbImageToImageListFilter.txx b/Modules/Core/ObjectList/include/otbImageToImageListFilter.txx
index 2edba9c5f6..5cc0d6591d 100644
--- a/Modules/Core/ObjectList/include/otbImageToImageListFilter.txx
+++ b/Modules/Core/ObjectList/include/otbImageToImageListFilter.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbImageToImageListFilter_txx
-#define __otbImageToImageListFilter_txx
+#ifndef otbImageToImageListFilter_txx
+#define otbImageToImageListFilter_txx
 
 #include "otbImageToImageListFilter.h"
 
diff --git a/Modules/Core/ObjectList/include/otbObjectList.h b/Modules/Core/ObjectList/include/otbObjectList.h
index 0b32f26fa7..b4fd91dd7a 100644
--- a/Modules/Core/ObjectList/include/otbObjectList.h
+++ b/Modules/Core/ObjectList/include/otbObjectList.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbObjectList_h
-#define __otbObjectList_h
+#ifndef otbObjectList_h
+#define otbObjectList_h
 
 #include <vector>
 #include "itkDataObject.h"
diff --git a/Modules/Core/ObjectList/include/otbObjectList.txx b/Modules/Core/ObjectList/include/otbObjectList.txx
index e48d0f0a9d..2dc7fef3ae 100644
--- a/Modules/Core/ObjectList/include/otbObjectList.txx
+++ b/Modules/Core/ObjectList/include/otbObjectList.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbObjectList_txx
-#define __otbObjectList_txx
+#ifndef otbObjectList_txx
+#define otbObjectList_txx
 
 #include "otbObjectList.h"
 #include "itkMacro.h"
diff --git a/Modules/Core/ObjectList/include/otbObjectListSource.h b/Modules/Core/ObjectList/include/otbObjectListSource.h
index 8ec66de28e..1db920c491 100644
--- a/Modules/Core/ObjectList/include/otbObjectListSource.h
+++ b/Modules/Core/ObjectList/include/otbObjectListSource.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbObjectListSource_h
-#define __otbObjectListSource_h
+#ifndef otbObjectListSource_h
+#define otbObjectListSource_h
 
 #include "itkProcessObject.h"
 #include "otbObjectList.h"
diff --git a/Modules/Core/ObjectList/include/otbObjectListSource.txx b/Modules/Core/ObjectList/include/otbObjectListSource.txx
index 7c24330794..5085cbcc04 100644
--- a/Modules/Core/ObjectList/include/otbObjectListSource.txx
+++ b/Modules/Core/ObjectList/include/otbObjectListSource.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbObjectListSource_txx
-#define __otbObjectListSource_txx
+#ifndef otbObjectListSource_txx
+#define otbObjectListSource_txx
 
 #include "otbObjectListSource.h"
 #include "itkProgressReporter.h"
diff --git a/Modules/Core/ObjectList/include/otbObjectListToObjectListFilter.h b/Modules/Core/ObjectList/include/otbObjectListToObjectListFilter.h
index 6db5bd7827..8ab945b841 100644
--- a/Modules/Core/ObjectList/include/otbObjectListToObjectListFilter.h
+++ b/Modules/Core/ObjectList/include/otbObjectListToObjectListFilter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbObjectListToObjectListFilter_h
-#define __otbObjectListToObjectListFilter_h
+#ifndef otbObjectListToObjectListFilter_h
+#define otbObjectListToObjectListFilter_h
 
 #include "otbObjectListSource.h"
 
diff --git a/Modules/Core/ObjectList/include/otbObjectListToObjectListFilter.txx b/Modules/Core/ObjectList/include/otbObjectListToObjectListFilter.txx
index 887cf759cf..ee09c19a40 100644
--- a/Modules/Core/ObjectList/include/otbObjectListToObjectListFilter.txx
+++ b/Modules/Core/ObjectList/include/otbObjectListToObjectListFilter.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbObjectListToObjectListFilter_txx
-#define __otbObjectListToObjectListFilter_txx
+#ifndef otbObjectListToObjectListFilter_txx
+#define otbObjectListToObjectListFilter_txx
 
 #include "otbObjectListToObjectListFilter.h"
 #include "itkProgressReporter.h"
diff --git a/Modules/Core/ObjectList/include/otbUnaryFunctorObjectListBooleanFilter.h b/Modules/Core/ObjectList/include/otbUnaryFunctorObjectListBooleanFilter.h
index 00d4422cad..b54215377a 100644
--- a/Modules/Core/ObjectList/include/otbUnaryFunctorObjectListBooleanFilter.h
+++ b/Modules/Core/ObjectList/include/otbUnaryFunctorObjectListBooleanFilter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbUnaryFunctorObjectListBooleanFilter_h
-#define __otbUnaryFunctorObjectListBooleanFilter_h
+#ifndef otbUnaryFunctorObjectListBooleanFilter_h
+#define otbUnaryFunctorObjectListBooleanFilter_h
 
 #include "otbObjectListToObjectListFilter.h"
 
diff --git a/Modules/Core/ObjectList/include/otbUnaryFunctorObjectListBooleanFilter.txx b/Modules/Core/ObjectList/include/otbUnaryFunctorObjectListBooleanFilter.txx
index e468fa09ca..5898fe70d4 100644
--- a/Modules/Core/ObjectList/include/otbUnaryFunctorObjectListBooleanFilter.txx
+++ b/Modules/Core/ObjectList/include/otbUnaryFunctorObjectListBooleanFilter.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbUnaryFunctorObjectListBooleanFilter_txx
-#define __otbUnaryFunctorObjectListBooleanFilter_txx
+#ifndef otbUnaryFunctorObjectListBooleanFilter_txx
+#define otbUnaryFunctorObjectListBooleanFilter_txx
 
 #include "otbUnaryFunctorObjectListBooleanFilter.h"
 #include "itkProgressReporter.h"
diff --git a/Modules/Core/ObjectList/include/otbUnaryFunctorObjectListFilter.h b/Modules/Core/ObjectList/include/otbUnaryFunctorObjectListFilter.h
index 4e5f5c239e..ae1cf1e01c 100644
--- a/Modules/Core/ObjectList/include/otbUnaryFunctorObjectListFilter.h
+++ b/Modules/Core/ObjectList/include/otbUnaryFunctorObjectListFilter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbUnaryFunctorObjectListFilter_h
-#define __otbUnaryFunctorObjectListFilter_h
+#ifndef otbUnaryFunctorObjectListFilter_h
+#define otbUnaryFunctorObjectListFilter_h
 
 #include "otbObjectListToObjectListFilter.h"
 
diff --git a/Modules/Core/ObjectList/include/otbUnaryFunctorObjectListFilter.txx b/Modules/Core/ObjectList/include/otbUnaryFunctorObjectListFilter.txx
index cba8ecfaa7..ba03a138b6 100644
--- a/Modules/Core/ObjectList/include/otbUnaryFunctorObjectListFilter.txx
+++ b/Modules/Core/ObjectList/include/otbUnaryFunctorObjectListFilter.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbUnaryFunctorObjectListFilter_txx
-#define __otbUnaryFunctorObjectListFilter_txx
+#ifndef otbUnaryFunctorObjectListFilter_txx
+#define otbUnaryFunctorObjectListFilter_txx
 
 #include "otbUnaryFunctorObjectListFilter.h"
 #include "itkProgressReporter.h"
diff --git a/Modules/Core/ObjectList/include/otbVectorImageToImageListFilter.h b/Modules/Core/ObjectList/include/otbVectorImageToImageListFilter.h
index afbc61ceff..db1d3b20c9 100644
--- a/Modules/Core/ObjectList/include/otbVectorImageToImageListFilter.h
+++ b/Modules/Core/ObjectList/include/otbVectorImageToImageListFilter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbVectorImageToImageListFilter_h
-#define __otbVectorImageToImageListFilter_h
+#ifndef otbVectorImageToImageListFilter_h
+#define otbVectorImageToImageListFilter_h
 
 #include "otbImageToImageListFilter.h"
 
diff --git a/Modules/Core/ObjectList/include/otbVectorImageToImageListFilter.txx b/Modules/Core/ObjectList/include/otbVectorImageToImageListFilter.txx
index 46e1ddbb8e..777d256019 100644
--- a/Modules/Core/ObjectList/include/otbVectorImageToImageListFilter.txx
+++ b/Modules/Core/ObjectList/include/otbVectorImageToImageListFilter.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbVectorImageToImageListFilter_txx
-#define __otbVectorImageToImageListFilter_txx
+#ifndef otbVectorImageToImageListFilter_txx
+#define otbVectorImageToImageListFilter_txx
 
 #include "otbVectorImageToImageListFilter.h"
 #include "itkImageRegionIteratorWithIndex.h"
diff --git a/Modules/Core/PointSet/include/otbImageToPointSetFilter.h b/Modules/Core/PointSet/include/otbImageToPointSetFilter.h
index 2a080e8736..2aa69a0039 100644
--- a/Modules/Core/PointSet/include/otbImageToPointSetFilter.h
+++ b/Modules/Core/PointSet/include/otbImageToPointSetFilter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbImageToPointSetFilter_h
-#define __otbImageToPointSetFilter_h
+#ifndef otbImageToPointSetFilter_h
+#define otbImageToPointSetFilter_h
 
 #include "otbPointSetSource.h"
 #include "otbRAMDrivenAdaptativeStreamingManager.h"
diff --git a/Modules/Core/PointSet/include/otbImageToPointSetFilter.txx b/Modules/Core/PointSet/include/otbImageToPointSetFilter.txx
index f832535c1d..0978188a01 100644
--- a/Modules/Core/PointSet/include/otbImageToPointSetFilter.txx
+++ b/Modules/Core/PointSet/include/otbImageToPointSetFilter.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbImageToPointSetFilter_txx
-#define __otbImageToPointSetFilter_txx
+#ifndef otbImageToPointSetFilter_txx
+#define otbImageToPointSetFilter_txx
 
 #include "otbImageToPointSetFilter.h"
 
diff --git a/Modules/Core/PointSet/include/otbPointSetAndValuesFunction.h b/Modules/Core/PointSet/include/otbPointSetAndValuesFunction.h
index 72865167f4..c6348a18e2 100644
--- a/Modules/Core/PointSet/include/otbPointSetAndValuesFunction.h
+++ b/Modules/Core/PointSet/include/otbPointSetAndValuesFunction.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbPointSetAndValuesFunction_h
-#define __otbPointSetAndValuesFunction_h
+#ifndef otbPointSetAndValuesFunction_h
+#define otbPointSetAndValuesFunction_h
 
 #include "itkFunctionBase.h"
 #include "itkContinuousIndex.h"
diff --git a/Modules/Core/PointSet/include/otbPointSetExtractROI.h b/Modules/Core/PointSet/include/otbPointSetExtractROI.h
index 56dfeab436..f43667b271 100644
--- a/Modules/Core/PointSet/include/otbPointSetExtractROI.h
+++ b/Modules/Core/PointSet/include/otbPointSetExtractROI.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbPointSetExtractROI_h
-#define __otbPointSetExtractROI_h
+#ifndef otbPointSetExtractROI_h
+#define otbPointSetExtractROI_h
 
 #include "otbPointSetToPointSetFilter.h"
 #include "itkTransform.h"
diff --git a/Modules/Core/PointSet/include/otbPointSetExtractROI.txx b/Modules/Core/PointSet/include/otbPointSetExtractROI.txx
index cca471af42..03a525f3e8 100644
--- a/Modules/Core/PointSet/include/otbPointSetExtractROI.txx
+++ b/Modules/Core/PointSet/include/otbPointSetExtractROI.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbPointSetExtractROI_txx
-#define __otbPointSetExtractROI_txx
+#ifndef otbPointSetExtractROI_txx
+#define otbPointSetExtractROI_txx
 
 #include "otbPointSetExtractROI.h"
 #include "itkMacro.h"
diff --git a/Modules/Core/PointSet/include/otbPointSetFunction.h b/Modules/Core/PointSet/include/otbPointSetFunction.h
index 6832e9ae61..1c9cd58f68 100644
--- a/Modules/Core/PointSet/include/otbPointSetFunction.h
+++ b/Modules/Core/PointSet/include/otbPointSetFunction.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbPointSetFunction_h
-#define __otbPointSetFunction_h
+#ifndef otbPointSetFunction_h
+#define otbPointSetFunction_h
 
 #include "itkSpatialFunction.h"
 #include "itkProcessObject.h"
diff --git a/Modules/Core/PointSet/include/otbPointSetFunction.txx b/Modules/Core/PointSet/include/otbPointSetFunction.txx
index 81e8dcc52d..5fc40ad509 100644
--- a/Modules/Core/PointSet/include/otbPointSetFunction.txx
+++ b/Modules/Core/PointSet/include/otbPointSetFunction.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbPointSetFunction_txx
-#define __otbPointSetFunction_txx
+#ifndef otbPointSetFunction_txx
+#define otbPointSetFunction_txx
 
 #include "otbPointSetFunction.h"
 
diff --git a/Modules/Core/PointSet/include/otbPointSetSource.h b/Modules/Core/PointSet/include/otbPointSetSource.h
index 9129ba2737..08bf3d6fa1 100644
--- a/Modules/Core/PointSet/include/otbPointSetSource.h
+++ b/Modules/Core/PointSet/include/otbPointSetSource.h
@@ -16,8 +16,8 @@
 
 =========================================================================*/
 
-#ifndef __otbPointSetSource_h
-#define __otbPointSetSource_h
+#ifndef otbPointSetSource_h
+#define otbPointSetSource_h
 
 
 #include "itkProcessObject.h"
diff --git a/Modules/Core/PointSet/include/otbPointSetSource.txx b/Modules/Core/PointSet/include/otbPointSetSource.txx
index 9bb4cc19c1..4ccd106ff1 100644
--- a/Modules/Core/PointSet/include/otbPointSetSource.txx
+++ b/Modules/Core/PointSet/include/otbPointSetSource.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbPointSetSource_txx
-#define __otbPointSetSource_txx
+#ifndef otbPointSetSource_txx
+#define otbPointSetSource_txx
 
 #include "otbPointSetSource.h"
 
diff --git a/Modules/Core/PointSet/include/otbPointSetToPointSetFilter.h b/Modules/Core/PointSet/include/otbPointSetToPointSetFilter.h
index edeae03913..0726a32c85 100644
--- a/Modules/Core/PointSet/include/otbPointSetToPointSetFilter.h
+++ b/Modules/Core/PointSet/include/otbPointSetToPointSetFilter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbPointSetToPointSetFilter_h
-#define __otbPointSetToPointSetFilter_h
+#ifndef otbPointSetToPointSetFilter_h
+#define otbPointSetToPointSetFilter_h
 
 #include "otbPointSetSource.h"
 #include "otbStreamingTraits.h"
diff --git a/Modules/Core/PointSet/include/otbPointSetToPointSetFilter.txx b/Modules/Core/PointSet/include/otbPointSetToPointSetFilter.txx
index 2433cab447..1444215a5d 100644
--- a/Modules/Core/PointSet/include/otbPointSetToPointSetFilter.txx
+++ b/Modules/Core/PointSet/include/otbPointSetToPointSetFilter.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbPointSetToPointSetFilter_txx
-#define __otbPointSetToPointSetFilter_txx
+#ifndef otbPointSetToPointSetFilter_txx
+#define otbPointSetToPointSetFilter_txx
 
 #include "otbPointSetToPointSetFilter.h"
 
diff --git a/Modules/Core/PointSet/include/otbRandomPointSetSource.h b/Modules/Core/PointSet/include/otbRandomPointSetSource.h
index 9b392c695a..f967199dd3 100644
--- a/Modules/Core/PointSet/include/otbRandomPointSetSource.h
+++ b/Modules/Core/PointSet/include/otbRandomPointSetSource.h
@@ -16,8 +16,8 @@
 
 =========================================================================*/
 
-#ifndef __otbRandomPointSetSource_h
-#define __otbRandomPointSetSource_h
+#ifndef otbRandomPointSetSource_h
+#define otbRandomPointSetSource_h
 
 #include "otbPointSetSource.h"
 #include "itkMersenneTwisterRandomVariateGenerator.h"
diff --git a/Modules/Core/PointSet/include/otbRandomPointSetSource.txx b/Modules/Core/PointSet/include/otbRandomPointSetSource.txx
index 28b81afd20..2b6f944e4a 100644
--- a/Modules/Core/PointSet/include/otbRandomPointSetSource.txx
+++ b/Modules/Core/PointSet/include/otbRandomPointSetSource.txx
@@ -16,8 +16,8 @@
 
 =========================================================================*/
 
-#ifndef __otbRandomPointSetSource_txx
-#define __otbRandomPointSetSource_txx
+#ifndef otbRandomPointSetSource_txx
+#define otbRandomPointSetSource_txx
 
 #include "otbRandomPointSetSource.h"
 
diff --git a/Modules/Core/PointSet/include/otbSimplePointCountStrategy.h b/Modules/Core/PointSet/include/otbSimplePointCountStrategy.h
index d2f443f091..b1b83f2f6b 100644
--- a/Modules/Core/PointSet/include/otbSimplePointCountStrategy.h
+++ b/Modules/Core/PointSet/include/otbSimplePointCountStrategy.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbSimplePointCountStrategy_h
-#define __otbSimplePointCountStrategy_h
+#ifndef otbSimplePointCountStrategy_h
+#define otbSimplePointCountStrategy_h
 
 #include "otbMath.h"
 
diff --git a/Modules/Core/PointSet/include/otbThresholdImageToPointSetFilter.h b/Modules/Core/PointSet/include/otbThresholdImageToPointSetFilter.h
index 1140972ab8..258d92aef2 100644
--- a/Modules/Core/PointSet/include/otbThresholdImageToPointSetFilter.h
+++ b/Modules/Core/PointSet/include/otbThresholdImageToPointSetFilter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbThresholdImageToPointSetFilter_h
-#define __otbThresholdImageToPointSetFilter_h
+#ifndef otbThresholdImageToPointSetFilter_h
+#define otbThresholdImageToPointSetFilter_h
 
 #include "otbImageToPointSetFilter.h"
 #include "itkPointSet.h"
diff --git a/Modules/Core/PointSet/include/otbThresholdImageToPointSetFilter.txx b/Modules/Core/PointSet/include/otbThresholdImageToPointSetFilter.txx
index 4bb531d8ed..e12d4cb41a 100644
--- a/Modules/Core/PointSet/include/otbThresholdImageToPointSetFilter.txx
+++ b/Modules/Core/PointSet/include/otbThresholdImageToPointSetFilter.txx
@@ -16,8 +16,8 @@
 
 =========================================================================*/
 
-#ifndef __otbThresholdImageToPointSetFilter_txx
-#define __otbThresholdImageToPointSetFilter_txx
+#ifndef otbThresholdImageToPointSetFilter_txx
+#define otbThresholdImageToPointSetFilter_txx
 
 #include "otbThresholdImageToPointSetFilter.h"
 #include "itkImageRegionConstIterator.h"
diff --git a/Modules/Core/PointSet/include/otbTransformPointSetFilter.h b/Modules/Core/PointSet/include/otbTransformPointSetFilter.h
index e48e6aaee3..2512dd3370 100644
--- a/Modules/Core/PointSet/include/otbTransformPointSetFilter.h
+++ b/Modules/Core/PointSet/include/otbTransformPointSetFilter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbTransformPointSetFilter_h
-#define __otbTransformPointSetFilter_h
+#ifndef otbTransformPointSetFilter_h
+#define otbTransformPointSetFilter_h
 
 #include "otbPointSetToPointSetFilter.h"
 
diff --git a/Modules/Core/PointSet/include/otbTransformPointSetFilter.txx b/Modules/Core/PointSet/include/otbTransformPointSetFilter.txx
index 5658d1fe1a..4530bfabab 100644
--- a/Modules/Core/PointSet/include/otbTransformPointSetFilter.txx
+++ b/Modules/Core/PointSet/include/otbTransformPointSetFilter.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbTransformPointSetFilter_txx
-#define __otbTransformPointSetFilter_txx
+#ifndef otbTransformPointSetFilter_txx
+#define otbTransformPointSetFilter_txx
 
 #include "otbTransformPointSetFilter.h"
 #include "itkMacro.h"
diff --git a/Modules/Core/SpatialObjects/include/otbDrawLineSpatialObjectFilter.h b/Modules/Core/SpatialObjects/include/otbDrawLineSpatialObjectFilter.h
index 26d7c48cb0..1024dfc042 100644
--- a/Modules/Core/SpatialObjects/include/otbDrawLineSpatialObjectFilter.h
+++ b/Modules/Core/SpatialObjects/include/otbDrawLineSpatialObjectFilter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbDrawLineSpatialObjectFilter_h
-#define __otbDrawLineSpatialObjectFilter_h
+#ifndef otbDrawLineSpatialObjectFilter_h
+#define otbDrawLineSpatialObjectFilter_h
 
 #include "itkSpatialObjectToImageFilter.h"
 #include "otbDrawLineSpatialObjectListFilter.h"
diff --git a/Modules/Core/SpatialObjects/include/otbDrawLineSpatialObjectFilter.txx b/Modules/Core/SpatialObjects/include/otbDrawLineSpatialObjectFilter.txx
index 0f25a3268e..8a9fc656d3 100644
--- a/Modules/Core/SpatialObjects/include/otbDrawLineSpatialObjectFilter.txx
+++ b/Modules/Core/SpatialObjects/include/otbDrawLineSpatialObjectFilter.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbDrawLineSpatialObjectFilter_txx
-#define __otbDrawLineSpatialObjectFilter_txx
+#ifndef otbDrawLineSpatialObjectFilter_txx
+#define otbDrawLineSpatialObjectFilter_txx
 
 #include "otbDrawLineSpatialObjectFilter.h"
 
diff --git a/Modules/Core/SpatialObjects/include/otbDrawLineSpatialObjectListFilter.h b/Modules/Core/SpatialObjects/include/otbDrawLineSpatialObjectListFilter.h
index 69545ab03d..27e11f013b 100644
--- a/Modules/Core/SpatialObjects/include/otbDrawLineSpatialObjectListFilter.h
+++ b/Modules/Core/SpatialObjects/include/otbDrawLineSpatialObjectListFilter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbDrawLineSpatialObjectListFilter_h
-#define __otbDrawLineSpatialObjectListFilter_h
+#ifndef otbDrawLineSpatialObjectListFilter_h
+#define otbDrawLineSpatialObjectListFilter_h
 
 #include "itkImageToImageFilter.h"
 #include "otbLineSpatialObjectList.h"
diff --git a/Modules/Core/SpatialObjects/include/otbDrawLineSpatialObjectListFilter.txx b/Modules/Core/SpatialObjects/include/otbDrawLineSpatialObjectListFilter.txx
index df8feaac3d..b632705b16 100644
--- a/Modules/Core/SpatialObjects/include/otbDrawLineSpatialObjectListFilter.txx
+++ b/Modules/Core/SpatialObjects/include/otbDrawLineSpatialObjectListFilter.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbDrawLineSpatialObjectListFilter_txx
-#define __otbDrawLineSpatialObjectListFilter_txx
+#ifndef otbDrawLineSpatialObjectListFilter_txx
+#define otbDrawLineSpatialObjectListFilter_txx
 
 #include "otbDrawLineSpatialObjectListFilter.h"
 
diff --git a/Modules/Core/SpatialObjects/include/otbImageToLineSpatialObjectListFilter.h b/Modules/Core/SpatialObjects/include/otbImageToLineSpatialObjectListFilter.h
index 93f50114cf..ff3dcd4f41 100644
--- a/Modules/Core/SpatialObjects/include/otbImageToLineSpatialObjectListFilter.h
+++ b/Modules/Core/SpatialObjects/include/otbImageToLineSpatialObjectListFilter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbImageToLineSpatialObjectListFilter_h
-#define __otbImageToLineSpatialObjectListFilter_h
+#ifndef otbImageToLineSpatialObjectListFilter_h
+#define otbImageToLineSpatialObjectListFilter_h
 
 
 #include "itkProcessObject.h"
diff --git a/Modules/Core/SpatialObjects/include/otbImageToLineSpatialObjectListFilter.txx b/Modules/Core/SpatialObjects/include/otbImageToLineSpatialObjectListFilter.txx
index ab31f05868..3fdd1ef5cc 100644
--- a/Modules/Core/SpatialObjects/include/otbImageToLineSpatialObjectListFilter.txx
+++ b/Modules/Core/SpatialObjects/include/otbImageToLineSpatialObjectListFilter.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbImageToLineSpatialObjectListFilter_txx
-#define __otbImageToLineSpatialObjectListFilter_txx
+#ifndef otbImageToLineSpatialObjectListFilter_txx
+#define otbImageToLineSpatialObjectListFilter_txx
 
 #include "otbImageToLineSpatialObjectListFilter.h"
 
diff --git a/Modules/Core/SpatialObjects/include/otbLineSpatialObject.h b/Modules/Core/SpatialObjects/include/otbLineSpatialObject.h
index 6b9b35555d..72806900a0 100644
--- a/Modules/Core/SpatialObjects/include/otbLineSpatialObject.h
+++ b/Modules/Core/SpatialObjects/include/otbLineSpatialObject.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbLineSpatialObject_h
-#define __otbLineSpatialObject_h
+#ifndef otbLineSpatialObject_h
+#define otbLineSpatialObject_h
 
 #include "itkPointBasedSpatialObject.h"
 #include "itkLineSpatialObjectPoint.h"
diff --git a/Modules/Core/SpatialObjects/include/otbLineSpatialObject.txx b/Modules/Core/SpatialObjects/include/otbLineSpatialObject.txx
index 06a46be370..e8afd0803b 100644
--- a/Modules/Core/SpatialObjects/include/otbLineSpatialObject.txx
+++ b/Modules/Core/SpatialObjects/include/otbLineSpatialObject.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbLineSpatialObject_txx
-#define __otbLineSpatialObject_txx
+#ifndef otbLineSpatialObject_txx
+#define otbLineSpatialObject_txx
 
 
 #include "otbLineSpatialObject.h"
diff --git a/Modules/Core/SpatialObjects/include/otbLineSpatialObjectList.h b/Modules/Core/SpatialObjects/include/otbLineSpatialObjectList.h
index a52ea10939..8ab58d187a 100644
--- a/Modules/Core/SpatialObjects/include/otbLineSpatialObjectList.h
+++ b/Modules/Core/SpatialObjects/include/otbLineSpatialObjectList.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbLineSpatialObjectList_h
-#define __otbLineSpatialObjectList_h
+#ifndef otbLineSpatialObjectList_h
+#define otbLineSpatialObjectList_h
 
 
 #include "itkDataObject.h"
diff --git a/Modules/Core/SpatialObjects/include/otbLineSpatialObjectListToPointSetFilter.h b/Modules/Core/SpatialObjects/include/otbLineSpatialObjectListToPointSetFilter.h
index 03508ad550..73dfae6847 100644
--- a/Modules/Core/SpatialObjects/include/otbLineSpatialObjectListToPointSetFilter.h
+++ b/Modules/Core/SpatialObjects/include/otbLineSpatialObjectListToPointSetFilter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbLineSpatialObjectListToPointSetFilter_h
-#define __otbLineSpatialObjectListToPointSetFilter_h
+#ifndef otbLineSpatialObjectListToPointSetFilter_h
+#define otbLineSpatialObjectListToPointSetFilter_h
 
 
 #include "itkProcessObject.h"
diff --git a/Modules/Core/SpatialObjects/include/otbLineSpatialObjectListToPointSetFilter.txx b/Modules/Core/SpatialObjects/include/otbLineSpatialObjectListToPointSetFilter.txx
index 8bd5bf634c..38dd85c1fb 100644
--- a/Modules/Core/SpatialObjects/include/otbLineSpatialObjectListToPointSetFilter.txx
+++ b/Modules/Core/SpatialObjects/include/otbLineSpatialObjectListToPointSetFilter.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbLineSpatialObjectListToPointSetFilter_txx
-#define __otbLineSpatialObjectListToPointSetFilter_txx
+#ifndef otbLineSpatialObjectListToPointSetFilter_txx
+#define otbLineSpatialObjectListToPointSetFilter_txx
 
 #include "otbLineSpatialObjectListToPointSetFilter.h"
 
diff --git a/Modules/Core/SpatialObjects/include/otbSpatialObjectSource.h b/Modules/Core/SpatialObjects/include/otbSpatialObjectSource.h
index fd5d428aa3..cad8ae979d 100644
--- a/Modules/Core/SpatialObjects/include/otbSpatialObjectSource.h
+++ b/Modules/Core/SpatialObjects/include/otbSpatialObjectSource.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbSpatialObjectSource_h
-#define __otbSpatialObjectSource_h
+#ifndef otbSpatialObjectSource_h
+#define otbSpatialObjectSource_h
 
 #include "otbMacro.h"
 #include "itkProcessObject.h"
diff --git a/Modules/Core/SpatialObjects/include/otbSpatialObjectSource.txx b/Modules/Core/SpatialObjects/include/otbSpatialObjectSource.txx
index e35e738bd2..56af7dbf0d 100644
--- a/Modules/Core/SpatialObjects/include/otbSpatialObjectSource.txx
+++ b/Modules/Core/SpatialObjects/include/otbSpatialObjectSource.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbSpatialObjectSource_txx
-#define __otbSpatialObjectSource_txx
+#ifndef otbSpatialObjectSource_txx
+#define otbSpatialObjectSource_txx
 
 #include "otbSpatialObjectSource.h"
 
diff --git a/Modules/Core/SpatialObjects/include/otbSpatialObjectToImageDrawingFilter.h b/Modules/Core/SpatialObjects/include/otbSpatialObjectToImageDrawingFilter.h
index f4e60e43bb..28aad546ae 100644
--- a/Modules/Core/SpatialObjects/include/otbSpatialObjectToImageDrawingFilter.h
+++ b/Modules/Core/SpatialObjects/include/otbSpatialObjectToImageDrawingFilter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbSpatialObjectToImageDrawingFilter_h
-#define __otbSpatialObjectToImageDrawingFilter_h
+#ifndef otbSpatialObjectToImageDrawingFilter_h
+#define otbSpatialObjectToImageDrawingFilter_h
 
 #include "itkImageSource.h"
 #include "itkConceptChecking.h"
diff --git a/Modules/Core/SpatialObjects/include/otbSpatialObjectToImageDrawingFilter.txx b/Modules/Core/SpatialObjects/include/otbSpatialObjectToImageDrawingFilter.txx
index 7501ba32cb..ebf3d46462 100644
--- a/Modules/Core/SpatialObjects/include/otbSpatialObjectToImageDrawingFilter.txx
+++ b/Modules/Core/SpatialObjects/include/otbSpatialObjectToImageDrawingFilter.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbSpatialObjectToImageDrawingFilter_txx
-#define __otbSpatialObjectToImageDrawingFilter_txx
+#ifndef otbSpatialObjectToImageDrawingFilter_txx
+#define otbSpatialObjectToImageDrawingFilter_txx
 
 #include "otbSpatialObjectToImageDrawingFilter.h"
 #include "itkImageRegionIteratorWithIndex.h"
diff --git a/Modules/Core/Streaming/include/otbNumberOfDivisionsStrippedStreamingManager.h b/Modules/Core/Streaming/include/otbNumberOfDivisionsStrippedStreamingManager.h
index 5ea7705cc8..053c77d54e 100644
--- a/Modules/Core/Streaming/include/otbNumberOfDivisionsStrippedStreamingManager.h
+++ b/Modules/Core/Streaming/include/otbNumberOfDivisionsStrippedStreamingManager.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
    =========================================================================*/
-#ifndef __otbNumberOfDivisionsStrippedStreamingManager_h
-#define __otbNumberOfDivisionsStrippedStreamingManager_h
+#ifndef otbNumberOfDivisionsStrippedStreamingManager_h
+#define otbNumberOfDivisionsStrippedStreamingManager_h
 
 #include "otbStreamingManager.h"
 #include "itkImageRegionSplitterSlowDimension.h"
diff --git a/Modules/Core/Streaming/include/otbNumberOfDivisionsStrippedStreamingManager.txx b/Modules/Core/Streaming/include/otbNumberOfDivisionsStrippedStreamingManager.txx
index 6a1ef3748f..60f5a5ff67 100644
--- a/Modules/Core/Streaming/include/otbNumberOfDivisionsStrippedStreamingManager.txx
+++ b/Modules/Core/Streaming/include/otbNumberOfDivisionsStrippedStreamingManager.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
    =========================================================================*/
-#ifndef __otbNumberOfDivisionsStrippedStreamingManager_txx
-#define __otbNumberOfDivisionsStrippedStreamingManager_txx
+#ifndef otbNumberOfDivisionsStrippedStreamingManager_txx
+#define otbNumberOfDivisionsStrippedStreamingManager_txx
 
 #include "otbNumberOfDivisionsStrippedStreamingManager.h"
 #include "otbMacro.h"
diff --git a/Modules/Core/Streaming/include/otbNumberOfDivisionsTiledStreamingManager.h b/Modules/Core/Streaming/include/otbNumberOfDivisionsTiledStreamingManager.h
index 7ecd51b264..3f91fc0383 100644
--- a/Modules/Core/Streaming/include/otbNumberOfDivisionsTiledStreamingManager.h
+++ b/Modules/Core/Streaming/include/otbNumberOfDivisionsTiledStreamingManager.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
    =========================================================================*/
-#ifndef __otbNumberOfDivisionsTiledStreamingManager_h
-#define __otbNumberOfDivisionsTiledStreamingManager_h
+#ifndef otbNumberOfDivisionsTiledStreamingManager_h
+#define otbNumberOfDivisionsTiledStreamingManager_h
 
 #include "otbStreamingManager.h"
 
diff --git a/Modules/Core/Streaming/include/otbNumberOfDivisionsTiledStreamingManager.txx b/Modules/Core/Streaming/include/otbNumberOfDivisionsTiledStreamingManager.txx
index b948e55ba9..4a5e36c0ee 100644
--- a/Modules/Core/Streaming/include/otbNumberOfDivisionsTiledStreamingManager.txx
+++ b/Modules/Core/Streaming/include/otbNumberOfDivisionsTiledStreamingManager.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
    =========================================================================*/
-#ifndef __otbNumberOfDivisionsTiledStreamingManager_txx
-#define __otbNumberOfDivisionsTiledStreamingManager_txx
+#ifndef otbNumberOfDivisionsTiledStreamingManager_txx
+#define otbNumberOfDivisionsTiledStreamingManager_txx
 
 #include "otbNumberOfDivisionsTiledStreamingManager.h"
 #include "otbMacro.h"
diff --git a/Modules/Core/Streaming/include/otbNumberOfLinesStrippedStreamingManager.h b/Modules/Core/Streaming/include/otbNumberOfLinesStrippedStreamingManager.h
index 90ed9a66fa..7efc0456db 100644
--- a/Modules/Core/Streaming/include/otbNumberOfLinesStrippedStreamingManager.h
+++ b/Modules/Core/Streaming/include/otbNumberOfLinesStrippedStreamingManager.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
    =========================================================================*/
-#ifndef __otbNumberOfLinesStrippedStreamingManager_h
-#define __otbNumberOfLinesStrippedStreamingManager_h
+#ifndef otbNumberOfLinesStrippedStreamingManager_h
+#define otbNumberOfLinesStrippedStreamingManager_h
 
 #include "otbStreamingManager.h"
 #include "itkImageRegionSplitter.h"
diff --git a/Modules/Core/Streaming/include/otbNumberOfLinesStrippedStreamingManager.txx b/Modules/Core/Streaming/include/otbNumberOfLinesStrippedStreamingManager.txx
index 1d8c366db8..bf501b83b6 100644
--- a/Modules/Core/Streaming/include/otbNumberOfLinesStrippedStreamingManager.txx
+++ b/Modules/Core/Streaming/include/otbNumberOfLinesStrippedStreamingManager.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
    =========================================================================*/
-#ifndef __otbNumberOfLinesStrippedStreamingManager_txx
-#define __otbNumberOfLinesStrippedStreamingManager_txx
+#ifndef otbNumberOfLinesStrippedStreamingManager_txx
+#define otbNumberOfLinesStrippedStreamingManager_txx
 
 #include "otbNumberOfLinesStrippedStreamingManager.h"
 #include "otbMacro.h"
diff --git a/Modules/Core/Streaming/include/otbPersistentFilterStreamingDecorator.h b/Modules/Core/Streaming/include/otbPersistentFilterStreamingDecorator.h
index 97a546686a..904ecd3bcd 100644
--- a/Modules/Core/Streaming/include/otbPersistentFilterStreamingDecorator.h
+++ b/Modules/Core/Streaming/include/otbPersistentFilterStreamingDecorator.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbPersistentFilterStreamingDecorator_h
-#define __otbPersistentFilterStreamingDecorator_h
+#ifndef otbPersistentFilterStreamingDecorator_h
+#define otbPersistentFilterStreamingDecorator_h
 
 #include "otbStreamingImageVirtualWriter.h"
 #include "itkProcessObject.h"
diff --git a/Modules/Core/Streaming/include/otbPersistentFilterStreamingDecorator.txx b/Modules/Core/Streaming/include/otbPersistentFilterStreamingDecorator.txx
index d3a1704cb6..006ce75aef 100644
--- a/Modules/Core/Streaming/include/otbPersistentFilterStreamingDecorator.txx
+++ b/Modules/Core/Streaming/include/otbPersistentFilterStreamingDecorator.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbPersistentFilterStreamingDecorator_txx
-#define __otbPersistentFilterStreamingDecorator_txx
+#ifndef otbPersistentFilterStreamingDecorator_txx
+#define otbPersistentFilterStreamingDecorator_txx
 
 #include "otbPersistentFilterStreamingDecorator.h"
 
diff --git a/Modules/Core/Streaming/include/otbPersistentImageFilter.h b/Modules/Core/Streaming/include/otbPersistentImageFilter.h
index 368658410f..4784812f84 100644
--- a/Modules/Core/Streaming/include/otbPersistentImageFilter.h
+++ b/Modules/Core/Streaming/include/otbPersistentImageFilter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbPersistentImageFilter_h
-#define __otbPersistentImageFilter_h
+#ifndef otbPersistentImageFilter_h
+#define otbPersistentImageFilter_h
 
 #include "itkImageToImageFilter.h"
 
diff --git a/Modules/Core/Streaming/include/otbPipelineMemoryPrintCalculator.h b/Modules/Core/Streaming/include/otbPipelineMemoryPrintCalculator.h
index 25001c87b8..b623f29e9b 100644
--- a/Modules/Core/Streaming/include/otbPipelineMemoryPrintCalculator.h
+++ b/Modules/Core/Streaming/include/otbPipelineMemoryPrintCalculator.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbPipelineMemoryPrintCalculator_h
-#define __otbPipelineMemoryPrintCalculator_h
+#ifndef otbPipelineMemoryPrintCalculator_h
+#define otbPipelineMemoryPrintCalculator_h
 
 #include "itkProcessObject.h"
 #if ITK_VERSION_MAJOR < 4 || (ITK_VERSION_MAJOR == 4 && ITK_VERSION_MINOR <= 8)
diff --git a/Modules/Core/Streaming/include/otbRAMDrivenAdaptativeStreamingManager.h b/Modules/Core/Streaming/include/otbRAMDrivenAdaptativeStreamingManager.h
index 51f3e964db..40f5ed6c2f 100644
--- a/Modules/Core/Streaming/include/otbRAMDrivenAdaptativeStreamingManager.h
+++ b/Modules/Core/Streaming/include/otbRAMDrivenAdaptativeStreamingManager.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbRAMDrivenAdaptativeStreamingManager_h
-#define __otbRAMDrivenAdaptativeStreamingManager_h
+#ifndef otbRAMDrivenAdaptativeStreamingManager_h
+#define otbRAMDrivenAdaptativeStreamingManager_h
 
 #include "otbStreamingManager.h"
 
diff --git a/Modules/Core/Streaming/include/otbRAMDrivenAdaptativeStreamingManager.txx b/Modules/Core/Streaming/include/otbRAMDrivenAdaptativeStreamingManager.txx
index fc82561f25..d4179545af 100644
--- a/Modules/Core/Streaming/include/otbRAMDrivenAdaptativeStreamingManager.txx
+++ b/Modules/Core/Streaming/include/otbRAMDrivenAdaptativeStreamingManager.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbRAMDrivenAdaptativeStreamingManager_txx
-#define __otbRAMDrivenAdaptativeStreamingManager_txx
+#ifndef otbRAMDrivenAdaptativeStreamingManager_txx
+#define otbRAMDrivenAdaptativeStreamingManager_txx
 
 #include "otbRAMDrivenAdaptativeStreamingManager.h"
 #include "otbMacro.h"
diff --git a/Modules/Core/Streaming/include/otbRAMDrivenStrippedStreamingManager.h b/Modules/Core/Streaming/include/otbRAMDrivenStrippedStreamingManager.h
index d31ab93092..0b091239ba 100644
--- a/Modules/Core/Streaming/include/otbRAMDrivenStrippedStreamingManager.h
+++ b/Modules/Core/Streaming/include/otbRAMDrivenStrippedStreamingManager.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbRAMDrivenStrippedStreamingManager_h
-#define __otbRAMDrivenStrippedStreamingManager_h
+#ifndef otbRAMDrivenStrippedStreamingManager_h
+#define otbRAMDrivenStrippedStreamingManager_h
 
 #include "itkImageRegionSplitter.h"
 #include "otbStreamingManager.h"
diff --git a/Modules/Core/Streaming/include/otbRAMDrivenStrippedStreamingManager.txx b/Modules/Core/Streaming/include/otbRAMDrivenStrippedStreamingManager.txx
index 76928f49f5..05c0c46be3 100644
--- a/Modules/Core/Streaming/include/otbRAMDrivenStrippedStreamingManager.txx
+++ b/Modules/Core/Streaming/include/otbRAMDrivenStrippedStreamingManager.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbRAMDrivenStrippedStreamingManager_txx
-#define __otbRAMDrivenStrippedStreamingManager_txx
+#ifndef otbRAMDrivenStrippedStreamingManager_txx
+#define otbRAMDrivenStrippedStreamingManager_txx
 
 #include "otbRAMDrivenStrippedStreamingManager.h"
 #include "otbMacro.h"
diff --git a/Modules/Core/Streaming/include/otbRAMDrivenTiledStreamingManager.h b/Modules/Core/Streaming/include/otbRAMDrivenTiledStreamingManager.h
index b8222844b8..f60a01598a 100644
--- a/Modules/Core/Streaming/include/otbRAMDrivenTiledStreamingManager.h
+++ b/Modules/Core/Streaming/include/otbRAMDrivenTiledStreamingManager.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbRAMDrivenTiledStreamingManager_h
-#define __otbRAMDrivenTiledStreamingManager_h
+#ifndef otbRAMDrivenTiledStreamingManager_h
+#define otbRAMDrivenTiledStreamingManager_h
 
 #include "otbStreamingManager.h"
 
diff --git a/Modules/Core/Streaming/include/otbRAMDrivenTiledStreamingManager.txx b/Modules/Core/Streaming/include/otbRAMDrivenTiledStreamingManager.txx
index 80258b477b..626aa9a6f5 100644
--- a/Modules/Core/Streaming/include/otbRAMDrivenTiledStreamingManager.txx
+++ b/Modules/Core/Streaming/include/otbRAMDrivenTiledStreamingManager.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
    =========================================================================*/
-#ifndef __otbRAMDrivenTiledStreamingManager_txx
-#define __otbRAMDrivenTiledStreamingManager_txx
+#ifndef otbRAMDrivenTiledStreamingManager_txx
+#define otbRAMDrivenTiledStreamingManager_txx
 
 #include "otbRAMDrivenTiledStreamingManager.h"
 #include "otbMacro.h"
diff --git a/Modules/Core/Streaming/include/otbStreamingImageVirtualWriter.h b/Modules/Core/Streaming/include/otbStreamingImageVirtualWriter.h
index f31c7e78da..ef4121a624 100644
--- a/Modules/Core/Streaming/include/otbStreamingImageVirtualWriter.h
+++ b/Modules/Core/Streaming/include/otbStreamingImageVirtualWriter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbStreamingImageVirtualWriter_h
-#define __otbStreamingImageVirtualWriter_h
+#ifndef otbStreamingImageVirtualWriter_h
+#define otbStreamingImageVirtualWriter_h
 
 #include "itkMacro.h"
 #include "itkImageToImageFilter.h"
diff --git a/Modules/Core/Streaming/include/otbStreamingImageVirtualWriter.txx b/Modules/Core/Streaming/include/otbStreamingImageVirtualWriter.txx
index f4d5259f63..dc2d181924 100644
--- a/Modules/Core/Streaming/include/otbStreamingImageVirtualWriter.txx
+++ b/Modules/Core/Streaming/include/otbStreamingImageVirtualWriter.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbStreamingImageVirtualWriter_txx
-#define __otbStreamingImageVirtualWriter_txx
+#ifndef otbStreamingImageVirtualWriter_txx
+#define otbStreamingImageVirtualWriter_txx
 #include "otbStreamingImageVirtualWriter.h"
 
 #include "otbMacro.h"
diff --git a/Modules/Core/Streaming/include/otbStreamingManager.h b/Modules/Core/Streaming/include/otbStreamingManager.h
index 2c0bdac1c3..f940e79bad 100644
--- a/Modules/Core/Streaming/include/otbStreamingManager.h
+++ b/Modules/Core/Streaming/include/otbStreamingManager.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbStreamingManager_h
-#define __otbStreamingManager_h
+#ifndef otbStreamingManager_h
+#define otbStreamingManager_h
 
 #include "otbMacro.h"
 
diff --git a/Modules/Core/Streaming/include/otbStreamingManager.txx b/Modules/Core/Streaming/include/otbStreamingManager.txx
index ff34779eba..172d34436f 100644
--- a/Modules/Core/Streaming/include/otbStreamingManager.txx
+++ b/Modules/Core/Streaming/include/otbStreamingManager.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbStreamingManager_txx
-#define __otbStreamingManager_txx
+#ifndef otbStreamingManager_txx
+#define otbStreamingManager_txx
 
 #include "otbStreamingManager.h"
 #include "otbConfigurationManager.h"
diff --git a/Modules/Core/Streaming/include/otbTileDimensionTiledStreamingManager.h b/Modules/Core/Streaming/include/otbTileDimensionTiledStreamingManager.h
index 96a4a9d874..f9a1bd68ad 100644
--- a/Modules/Core/Streaming/include/otbTileDimensionTiledStreamingManager.h
+++ b/Modules/Core/Streaming/include/otbTileDimensionTiledStreamingManager.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
    =========================================================================*/
-#ifndef __otbTileDimensionTiledStreamingManager_h
-#define __otbTileDimensionTiledStreamingManager_h
+#ifndef otbTileDimensionTiledStreamingManager_h
+#define otbTileDimensionTiledStreamingManager_h
 
 #include "otbStreamingManager.h"
 
diff --git a/Modules/Core/Streaming/include/otbTileDimensionTiledStreamingManager.txx b/Modules/Core/Streaming/include/otbTileDimensionTiledStreamingManager.txx
index eda7ba2958..4555afb0ef 100644
--- a/Modules/Core/Streaming/include/otbTileDimensionTiledStreamingManager.txx
+++ b/Modules/Core/Streaming/include/otbTileDimensionTiledStreamingManager.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
    =========================================================================*/
-#ifndef __otbTileDimensionTiledStreamingManager_txx
-#define __otbTileDimensionTiledStreamingManager_txx
+#ifndef otbTileDimensionTiledStreamingManager_txx
+#define otbTileDimensionTiledStreamingManager_txx
 
 #include "otbTileDimensionTiledStreamingManager.h"
 #include "otbMacro.h"
diff --git a/Modules/Core/Transform/include/otbCompositeTransform.h b/Modules/Core/Transform/include/otbCompositeTransform.h
index 91df0412e5..eaf20365de 100644
--- a/Modules/Core/Transform/include/otbCompositeTransform.h
+++ b/Modules/Core/Transform/include/otbCompositeTransform.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbCompositeTransform_h
-#define __otbCompositeTransform_h
+#ifndef otbCompositeTransform_h
+#define otbCompositeTransform_h
 
 #include <iostream>
 #include <sstream>
diff --git a/Modules/Core/Transform/include/otbCompositeTransform.txx b/Modules/Core/Transform/include/otbCompositeTransform.txx
index b2dd67f592..70ac7cb5ac 100644
--- a/Modules/Core/Transform/include/otbCompositeTransform.txx
+++ b/Modules/Core/Transform/include/otbCompositeTransform.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbCompositeTransform_txx
-#define __otbCompositeTransform_txx
+#ifndef otbCompositeTransform_txx
+#define otbCompositeTransform_txx
 
 #include "otbCompositeTransform.h"
 
diff --git a/Modules/Core/Transform/include/otbForwardSensorModel.h b/Modules/Core/Transform/include/otbForwardSensorModel.h
index 8ded2f27e7..4e0eb56964 100644
--- a/Modules/Core/Transform/include/otbForwardSensorModel.h
+++ b/Modules/Core/Transform/include/otbForwardSensorModel.h
@@ -16,8 +16,8 @@
 
 =========================================================================*/
 
-#ifndef __otbForwardSensorModel_h
-#define __otbForwardSensorModel_h
+#ifndef otbForwardSensorModel_h
+#define otbForwardSensorModel_h
 
 #include "otbSensorModelBase.h"
 #include "itkMacro.h"
diff --git a/Modules/Core/Transform/include/otbForwardSensorModel.txx b/Modules/Core/Transform/include/otbForwardSensorModel.txx
index 5f0e63ba53..8dbe18af6a 100644
--- a/Modules/Core/Transform/include/otbForwardSensorModel.txx
+++ b/Modules/Core/Transform/include/otbForwardSensorModel.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbForwardSensorModel_txx
-#define __otbForwardSensorModel_txx
+#ifndef otbForwardSensorModel_txx
+#define otbForwardSensorModel_txx
 
 #include "otbForwardSensorModel.h"
 #include "otbMacro.h"
diff --git a/Modules/Core/Transform/include/otbGenericMapProjection.h b/Modules/Core/Transform/include/otbGenericMapProjection.h
index 6bfc1a632d..eb89c86bb4 100644
--- a/Modules/Core/Transform/include/otbGenericMapProjection.h
+++ b/Modules/Core/Transform/include/otbGenericMapProjection.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbGenericMapProjection_h
-#define __otbGenericMapProjection_h
+#ifndef otbGenericMapProjection_h
+#define otbGenericMapProjection_h
 
 #include <iostream>
 #include <sstream>
diff --git a/Modules/Core/Transform/include/otbGenericMapProjection.txx b/Modules/Core/Transform/include/otbGenericMapProjection.txx
index 6ff0283501..8c56ffefaf 100644
--- a/Modules/Core/Transform/include/otbGenericMapProjection.txx
+++ b/Modules/Core/Transform/include/otbGenericMapProjection.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbGenericMapProjection_txx
-#define __otbGenericMapProjection_txx
+#ifndef otbGenericMapProjection_txx
+#define otbGenericMapProjection_txx
 
 #include "otbGenericMapProjection.h"
 #include "otbMacro.h"
diff --git a/Modules/Core/Transform/include/otbGenericRSTransform.h b/Modules/Core/Transform/include/otbGenericRSTransform.h
index 04d4d7d5e7..5137aef08a 100644
--- a/Modules/Core/Transform/include/otbGenericRSTransform.h
+++ b/Modules/Core/Transform/include/otbGenericRSTransform.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbGenericRSTransform_h
-#define __otbGenericRSTransform_h
+#ifndef otbGenericRSTransform_h
+#define otbGenericRSTransform_h
 
 #include "otbCompositeTransform.h"
 
diff --git a/Modules/Core/Transform/include/otbGenericRSTransform.txx b/Modules/Core/Transform/include/otbGenericRSTransform.txx
index 58ca3171ff..56cff2ad98 100644
--- a/Modules/Core/Transform/include/otbGenericRSTransform.txx
+++ b/Modules/Core/Transform/include/otbGenericRSTransform.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbGenericRSTransform_txx
-#define __otbGenericRSTransform_txx
+#ifndef otbGenericRSTransform_txx
+#define otbGenericRSTransform_txx
 
 #include "otbGenericRSTransform.h"
 #include "otbMacro.h"
diff --git a/Modules/Core/Transform/include/otbGeoInformationConversion.h b/Modules/Core/Transform/include/otbGeoInformationConversion.h
index c004e32fe3..9b9456d06b 100644
--- a/Modules/Core/Transform/include/otbGeoInformationConversion.h
+++ b/Modules/Core/Transform/include/otbGeoInformationConversion.h
@@ -16,8 +16,8 @@
 
 =========================================================================*/
 
-#ifndef __otbGeoInformationConversion_h
-#define __otbGeoInformationConversion_h
+#ifndef otbGeoInformationConversion_h
+#define otbGeoInformationConversion_h
 
 #include <string>
 
diff --git a/Modules/Core/Transform/include/otbGeocentricTransform.h b/Modules/Core/Transform/include/otbGeocentricTransform.h
index 3035ab5aae..30703f96c4 100644
--- a/Modules/Core/Transform/include/otbGeocentricTransform.h
+++ b/Modules/Core/Transform/include/otbGeocentricTransform.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbGeocentricTransform_h
-#define __otbGeocentricTransform_h
+#ifndef otbGeocentricTransform_h
+#define otbGeocentricTransform_h
 
 #include "otbGenericMapProjection.h"
 #include "otbEllipsoidAdapter.h"
diff --git a/Modules/Core/Transform/include/otbGeocentricTransform.txx b/Modules/Core/Transform/include/otbGeocentricTransform.txx
index 72ed6f297b..ef67c46c70 100644
--- a/Modules/Core/Transform/include/otbGeocentricTransform.txx
+++ b/Modules/Core/Transform/include/otbGeocentricTransform.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbGeocentricTransform_txx
-#define __otbGeocentricTransform_txx
+#ifndef otbGeocentricTransform_txx
+#define otbGeocentricTransform_txx
 
 #include "otbGeocentricTransform.h"
 
diff --git a/Modules/Core/Transform/include/otbImageToGenericRSOutputParameters.h b/Modules/Core/Transform/include/otbImageToGenericRSOutputParameters.h
index 94535c389c..03ebe634a7 100644
--- a/Modules/Core/Transform/include/otbImageToGenericRSOutputParameters.h
+++ b/Modules/Core/Transform/include/otbImageToGenericRSOutputParameters.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbImageToGenericRSOutputParameters_h
-#define __otbImageToGenericRSOutputParameters_h
+#ifndef otbImageToGenericRSOutputParameters_h
+#define otbImageToGenericRSOutputParameters_h
 
 #include "itkObject.h"
 #include "otbGenericRSTransform.h"
diff --git a/Modules/Core/Transform/include/otbImageToGenericRSOutputParameters.txx b/Modules/Core/Transform/include/otbImageToGenericRSOutputParameters.txx
index 54a8997afa..b8952d36c2 100644
--- a/Modules/Core/Transform/include/otbImageToGenericRSOutputParameters.txx
+++ b/Modules/Core/Transform/include/otbImageToGenericRSOutputParameters.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbImageToGenericRSOutputParameters_txx
-#define __otbImageToGenericRSOutputParameters_txx
+#ifndef otbImageToGenericRSOutputParameters_txx
+#define otbImageToGenericRSOutputParameters_txx
 
 
 #include "otbImageToGenericRSOutputParameters.h"
diff --git a/Modules/Core/Transform/include/otbInverseLogPolarTransform.h b/Modules/Core/Transform/include/otbInverseLogPolarTransform.h
index 8277f4fe7b..ffe29c86b6 100644
--- a/Modules/Core/Transform/include/otbInverseLogPolarTransform.h
+++ b/Modules/Core/Transform/include/otbInverseLogPolarTransform.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbInverseLogPolarTransform_h
-#define __otbInverseLogPolarTransform_h
+#ifndef otbInverseLogPolarTransform_h
+#define otbInverseLogPolarTransform_h
 
 #include "otbTransform.h"
 
diff --git a/Modules/Core/Transform/include/otbInverseLogPolarTransform.txx b/Modules/Core/Transform/include/otbInverseLogPolarTransform.txx
index bdb4eb65af..ddbb8fd161 100644
--- a/Modules/Core/Transform/include/otbInverseLogPolarTransform.txx
+++ b/Modules/Core/Transform/include/otbInverseLogPolarTransform.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbInverseLogPolarTransform_txx
-#define __otbInverseLogPolarTransform_txx
+#ifndef otbInverseLogPolarTransform_txx
+#define otbInverseLogPolarTransform_txx
 
 #include "otbInverseLogPolarTransform.h"
 #include "otbMacro.h"
diff --git a/Modules/Core/Transform/include/otbInverseSensorModel.h b/Modules/Core/Transform/include/otbInverseSensorModel.h
index 5d7e1aa104..bc869e4260 100644
--- a/Modules/Core/Transform/include/otbInverseSensorModel.h
+++ b/Modules/Core/Transform/include/otbInverseSensorModel.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbInverseSensorModel_h
-#define __otbInverseSensorModel_h
+#ifndef otbInverseSensorModel_h
+#define otbInverseSensorModel_h
 
 #include "otbSensorModelBase.h"
 
diff --git a/Modules/Core/Transform/include/otbInverseSensorModel.txx b/Modules/Core/Transform/include/otbInverseSensorModel.txx
index 3433b33d7a..2516a4d54b 100644
--- a/Modules/Core/Transform/include/otbInverseSensorModel.txx
+++ b/Modules/Core/Transform/include/otbInverseSensorModel.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbInverseSensorModel_txx
-#define __otbInverseSensorModel_txx
+#ifndef otbInverseSensorModel_txx
+#define otbInverseSensorModel_txx
 
 #include "otbInverseSensorModel.h"
 #include "otbMacro.h"
diff --git a/Modules/Core/Transform/include/otbLogPolarTransform.h b/Modules/Core/Transform/include/otbLogPolarTransform.h
index 3bf2bf8083..9785b0af63 100644
--- a/Modules/Core/Transform/include/otbLogPolarTransform.h
+++ b/Modules/Core/Transform/include/otbLogPolarTransform.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbLogPolarTransform_h
-#define __otbLogPolarTransform_h
+#ifndef otbLogPolarTransform_h
+#define otbLogPolarTransform_h
 
 #include "otbTransform.h"
 
diff --git a/Modules/Core/Transform/include/otbLogPolarTransform.txx b/Modules/Core/Transform/include/otbLogPolarTransform.txx
index 0475c671e2..d6ad8a6548 100644
--- a/Modules/Core/Transform/include/otbLogPolarTransform.txx
+++ b/Modules/Core/Transform/include/otbLogPolarTransform.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbLogPolarTransform_txx
-#define __otbLogPolarTransform_txx
+#ifndef otbLogPolarTransform_txx
+#define otbLogPolarTransform_txx
 
 #include "otbLogPolarTransform.h"
 #include "otbMacro.h"
diff --git a/Modules/Core/Transform/include/otbSensorModelBase.h b/Modules/Core/Transform/include/otbSensorModelBase.h
index b261f4fdb8..84e0eb02a9 100644
--- a/Modules/Core/Transform/include/otbSensorModelBase.h
+++ b/Modules/Core/Transform/include/otbSensorModelBase.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbSensorModelBase_h
-#define __otbSensorModelBase_h
+#ifndef otbSensorModelBase_h
+#define otbSensorModelBase_h
 
 #include <iostream>
 
diff --git a/Modules/Core/Transform/include/otbSensorModelBase.txx b/Modules/Core/Transform/include/otbSensorModelBase.txx
index fe12a75e72..bf6ba624f8 100644
--- a/Modules/Core/Transform/include/otbSensorModelBase.txx
+++ b/Modules/Core/Transform/include/otbSensorModelBase.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbSensorModelBase_txx
-#define __otbSensorModelBase_txx
+#ifndef otbSensorModelBase_txx
+#define otbSensorModelBase_txx
 
 #include "otbSensorModelBase.h"
 
diff --git a/Modules/Core/Transform/include/otbStreamingWarpImageFilter.h b/Modules/Core/Transform/include/otbStreamingWarpImageFilter.h
index 84269e896e..813a4440bf 100644
--- a/Modules/Core/Transform/include/otbStreamingWarpImageFilter.h
+++ b/Modules/Core/Transform/include/otbStreamingWarpImageFilter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbStreamingWarpImageFilter_h
-#define __otbStreamingWarpImageFilter_h
+#ifndef otbStreamingWarpImageFilter_h
+#define otbStreamingWarpImageFilter_h
 
 #include "otbWarpImageFilter.h"
 #include "otbStreamingTraits.h"
diff --git a/Modules/Core/Transform/include/otbStreamingWarpImageFilter.txx b/Modules/Core/Transform/include/otbStreamingWarpImageFilter.txx
index 19ba9ff358..08cb65dae0 100644
--- a/Modules/Core/Transform/include/otbStreamingWarpImageFilter.txx
+++ b/Modules/Core/Transform/include/otbStreamingWarpImageFilter.txx
@@ -18,8 +18,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbStreamingWarpImageFilter_txx
-#define __otbStreamingWarpImageFilter_txx
+#ifndef otbStreamingWarpImageFilter_txx
+#define otbStreamingWarpImageFilter_txx
 
 #include "otbStreamingWarpImageFilter.h"
 #include "itkImageRegionIteratorWithIndex.h"
diff --git a/Modules/Core/Transform/include/otbTransform.h b/Modules/Core/Transform/include/otbTransform.h
index a90e3c673c..167a739b6e 100644
--- a/Modules/Core/Transform/include/otbTransform.h
+++ b/Modules/Core/Transform/include/otbTransform.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbTransform_h
-#define __otbTransform_h
+#ifndef otbTransform_h
+#define otbTransform_h
 
 #include "itkTransform.h"
 #include "vnl/vnl_vector_fixed.h"
diff --git a/Modules/Core/VectorDataBase/include/otbDataNode.h b/Modules/Core/VectorDataBase/include/otbDataNode.h
index 13b07f6fc1..1b21a3b624 100644
--- a/Modules/Core/VectorDataBase/include/otbDataNode.h
+++ b/Modules/Core/VectorDataBase/include/otbDataNode.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbDataNode_h
-#define __otbDataNode_h
+#ifndef otbDataNode_h
+#define otbDataNode_h
 
 #include "itkPoint.h"
 #include "otbPolygon.h"
diff --git a/Modules/Core/VectorDataBase/include/otbDataNode.txx b/Modules/Core/VectorDataBase/include/otbDataNode.txx
index 4d7402f291..d6b0136697 100644
--- a/Modules/Core/VectorDataBase/include/otbDataNode.txx
+++ b/Modules/Core/VectorDataBase/include/otbDataNode.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbDataNode_txx
-#define __otbDataNode_txx
+#ifndef otbDataNode_txx
+#define otbDataNode_txx
 
 #include "otbDataNode.h"
 #include "otbMetaDataKey.h"
diff --git a/Modules/Core/VectorDataBase/include/otbDataNodeFunctionBase.h b/Modules/Core/VectorDataBase/include/otbDataNodeFunctionBase.h
index 9253bc5eb2..c3ef784249 100644
--- a/Modules/Core/VectorDataBase/include/otbDataNodeFunctionBase.h
+++ b/Modules/Core/VectorDataBase/include/otbDataNodeFunctionBase.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbDataNodeFunctionBase_h
-#define __otbDataNodeFunctionBase_h
+#ifndef otbDataNodeFunctionBase_h
+#define otbDataNodeFunctionBase_h
 
 #include "itkFunctionBase.h"
 
diff --git a/Modules/Core/VectorDataBase/include/otbDataNodeImageFunction.h b/Modules/Core/VectorDataBase/include/otbDataNodeImageFunction.h
index 21e8ed423a..30a5f273da 100644
--- a/Modules/Core/VectorDataBase/include/otbDataNodeImageFunction.h
+++ b/Modules/Core/VectorDataBase/include/otbDataNodeImageFunction.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbDataNodeImageFunction_h
-#define __otbDataNodeImageFunction_h
+#ifndef otbDataNodeImageFunction_h
+#define otbDataNodeImageFunction_h
 
 #include "otbDataNodeFunctionBase.h"
 #include "otbDataNode.h"
diff --git a/Modules/Core/VectorDataBase/include/otbDataNodeImageFunction.txx b/Modules/Core/VectorDataBase/include/otbDataNodeImageFunction.txx
index d94a5def24..1531e7ee77 100644
--- a/Modules/Core/VectorDataBase/include/otbDataNodeImageFunction.txx
+++ b/Modules/Core/VectorDataBase/include/otbDataNodeImageFunction.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbDataNodeImageFunction_txx
-#define __otbDataNodeImageFunction_txx
+#ifndef otbDataNodeImageFunction_txx
+#define otbDataNodeImageFunction_txx
 
 #include "otbDataNodeImageFunction.h"
 
diff --git a/Modules/Core/VectorDataBase/include/otbDataNodeVectorDataFunction.h b/Modules/Core/VectorDataBase/include/otbDataNodeVectorDataFunction.h
index 8c2619b7cc..9084abed30 100644
--- a/Modules/Core/VectorDataBase/include/otbDataNodeVectorDataFunction.h
+++ b/Modules/Core/VectorDataBase/include/otbDataNodeVectorDataFunction.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbDataNodeVectorDataFunction_h
-#define __otbDataNodeVectorDataFunction_h
+#ifndef otbDataNodeVectorDataFunction_h
+#define otbDataNodeVectorDataFunction_h
 
 #include "otbDataNodeFunctionBase.h"
 #include "otbVectorDataProperties.h"
diff --git a/Modules/Core/VectorDataBase/include/otbDataNodeVectorDataFunction.txx b/Modules/Core/VectorDataBase/include/otbDataNodeVectorDataFunction.txx
index f57b2558c0..cba0ab4013 100644
--- a/Modules/Core/VectorDataBase/include/otbDataNodeVectorDataFunction.txx
+++ b/Modules/Core/VectorDataBase/include/otbDataNodeVectorDataFunction.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbDataNodeVectorDataFunction_txx
-#define __otbDataNodeVectorDataFunction_txx
+#ifndef otbDataNodeVectorDataFunction_txx
+#define otbDataNodeVectorDataFunction_txx
 
 #include "otbDataNodeVectorDataFunction.h"
 
diff --git a/Modules/Core/VectorDataBase/include/otbGISConnectionImplementation.h b/Modules/Core/VectorDataBase/include/otbGISConnectionImplementation.h
index 33c81ef6a8..6e29a2ff62 100644
--- a/Modules/Core/VectorDataBase/include/otbGISConnectionImplementation.h
+++ b/Modules/Core/VectorDataBase/include/otbGISConnectionImplementation.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbGISConnectionImplementation_h
-#define __otbGISConnectionImplementation_h
+#ifndef otbGISConnectionImplementation_h
+#define otbGISConnectionImplementation_h
 
 #include "itkDataObject.h"
 #include "itkObjectFactory.h"
diff --git a/Modules/Core/VectorDataBase/include/otbPolyLineParametricPathWithValue.h b/Modules/Core/VectorDataBase/include/otbPolyLineParametricPathWithValue.h
index ed10ebdd33..f067b5c6ee 100644
--- a/Modules/Core/VectorDataBase/include/otbPolyLineParametricPathWithValue.h
+++ b/Modules/Core/VectorDataBase/include/otbPolyLineParametricPathWithValue.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbPolyLineParametricPathWithValue_h
-#define __otbPolyLineParametricPathWithValue_h
+#ifndef otbPolyLineParametricPathWithValue_h
+#define otbPolyLineParametricPathWithValue_h
 
 #if defined(__GNUC__) || defined(__clang__)
 #pragma GCC diagnostic push
diff --git a/Modules/Core/VectorDataBase/include/otbPolyLineParametricPathWithValue.txx b/Modules/Core/VectorDataBase/include/otbPolyLineParametricPathWithValue.txx
index 3104714f10..739550e4f3 100644
--- a/Modules/Core/VectorDataBase/include/otbPolyLineParametricPathWithValue.txx
+++ b/Modules/Core/VectorDataBase/include/otbPolyLineParametricPathWithValue.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbPolyLineParametricPathWithValue_txx
-#define __otbPolyLineParametricPathWithValue_txx
+#ifndef otbPolyLineParametricPathWithValue_txx
+#define otbPolyLineParametricPathWithValue_txx
 
 #include "otbPolyLineParametricPathWithValue.h"
 
diff --git a/Modules/Core/VectorDataBase/include/otbPolygon.h b/Modules/Core/VectorDataBase/include/otbPolygon.h
index f5a627d70e..a16b1f9172 100644
--- a/Modules/Core/VectorDataBase/include/otbPolygon.h
+++ b/Modules/Core/VectorDataBase/include/otbPolygon.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbPolygon_h
-#define __otbPolygon_h
+#ifndef otbPolygon_h
+#define otbPolygon_h
 
 #include "otbPolyLineParametricPathWithValue.h"
 
diff --git a/Modules/Core/VectorDataBase/include/otbPolygon.txx b/Modules/Core/VectorDataBase/include/otbPolygon.txx
index fcc72e470e..526d876105 100644
--- a/Modules/Core/VectorDataBase/include/otbPolygon.txx
+++ b/Modules/Core/VectorDataBase/include/otbPolygon.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbPolygon_txx
-#define __otbPolygon_txx
+#ifndef otbPolygon_txx
+#define otbPolygon_txx
 
 #include "otbPolygon.h"
 
diff --git a/Modules/Core/VectorDataBase/include/otbVectorData.h b/Modules/Core/VectorDataBase/include/otbVectorData.h
index eeeb3c3236..fd9705d486 100644
--- a/Modules/Core/VectorDataBase/include/otbVectorData.h
+++ b/Modules/Core/VectorDataBase/include/otbVectorData.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbVectorData_h
-#define __otbVectorData_h
+#ifndef otbVectorData_h
+#define otbVectorData_h
 
 #include "itkTreeContainer.h"
 #include "itkDataObject.h"
diff --git a/Modules/Core/VectorDataBase/include/otbVectorData.txx b/Modules/Core/VectorDataBase/include/otbVectorData.txx
index eaf6306538..c1e5504e56 100644
--- a/Modules/Core/VectorDataBase/include/otbVectorData.txx
+++ b/Modules/Core/VectorDataBase/include/otbVectorData.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbVectorData_txx
-#define __otbVectorData_txx
+#ifndef otbVectorData_txx
+#define otbVectorData_txx
 
 #include "otbVectorData.h"
 #include "itkPreOrderTreeIterator.h"
diff --git a/Modules/Core/VectorDataBase/include/otbVectorDataIOBase.h b/Modules/Core/VectorDataBase/include/otbVectorDataIOBase.h
index 92403ab868..26314b498f 100644
--- a/Modules/Core/VectorDataBase/include/otbVectorDataIOBase.h
+++ b/Modules/Core/VectorDataBase/include/otbVectorDataIOBase.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbVectorDataIOBase_h
-#define __otbVectorDataIOBase_h
+#ifndef otbVectorDataIOBase_h
+#define otbVectorDataIOBase_h
 
 #include <string>
 
@@ -172,4 +172,4 @@ private:
 
 } // end namespace otb
 
-#endif // __otbVectorDataIOBase_h
+#endif // otbVectorDataIOBase_h
diff --git a/Modules/Core/VectorDataBase/include/otbVectorDataKeywordlist.h b/Modules/Core/VectorDataBase/include/otbVectorDataKeywordlist.h
index 10fd9a7147..7f86a6db70 100644
--- a/Modules/Core/VectorDataBase/include/otbVectorDataKeywordlist.h
+++ b/Modules/Core/VectorDataBase/include/otbVectorDataKeywordlist.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbVectorDataKeywordlist_h
-#define __otbVectorDataKeywordlist_h
+#ifndef otbVectorDataKeywordlist_h
+#define otbVectorDataKeywordlist_h
 
 #include "itkLightObject.h"
 #include "itkObjectFactory.h"
diff --git a/Modules/Core/VectorDataBase/include/otbVectorDataProperties.h b/Modules/Core/VectorDataBase/include/otbVectorDataProperties.h
index 9f8ece4ee0..41cd90dd4d 100644
--- a/Modules/Core/VectorDataBase/include/otbVectorDataProperties.h
+++ b/Modules/Core/VectorDataBase/include/otbVectorDataProperties.h
@@ -16,8 +16,8 @@
 
 =========================================================================*/
 
-#ifndef __otbVectorDataProperties_h
-#define __otbVectorDataProperties_h
+#ifndef otbVectorDataProperties_h
+#define otbVectorDataProperties_h
 
 #include "itkObjectFactory.h"
 
diff --git a/Modules/Core/VectorDataBase/include/otbVectorDataProperties.txx b/Modules/Core/VectorDataBase/include/otbVectorDataProperties.txx
index a624b0cd26..33de79d461 100644
--- a/Modules/Core/VectorDataBase/include/otbVectorDataProperties.txx
+++ b/Modules/Core/VectorDataBase/include/otbVectorDataProperties.txx
@@ -16,8 +16,8 @@
 
 =========================================================================*/
 
-#ifndef __otbVectorDataProperties_txx
-#define __otbVectorDataProperties_txx
+#ifndef otbVectorDataProperties_txx
+#define otbVectorDataProperties_txx
 
 #include "otbVectorDataProperties.h"
 #include <algorithm>
diff --git a/Modules/Core/VectorDataBase/include/otbVectorDataSource.h b/Modules/Core/VectorDataBase/include/otbVectorDataSource.h
index 6e54830a1a..029c859938 100644
--- a/Modules/Core/VectorDataBase/include/otbVectorDataSource.h
+++ b/Modules/Core/VectorDataBase/include/otbVectorDataSource.h
@@ -16,8 +16,8 @@
 
 =========================================================================*/
 
-#ifndef __otbVectorDataSource_h
-#define __otbVectorDataSource_h
+#ifndef otbVectorDataSource_h
+#define otbVectorDataSource_h
 
 
 #include "itkProcessObject.h"
@@ -99,4 +99,4 @@ private:
 #include "otbVectorDataSource.txx"
 #endif
 
-#endif // __otbVectorDataSource_h
+#endif // otbVectorDataSource_h
diff --git a/Modules/Core/VectorDataBase/include/otbVectorDataSource.txx b/Modules/Core/VectorDataBase/include/otbVectorDataSource.txx
index 614d53d2cc..4940d52ab4 100644
--- a/Modules/Core/VectorDataBase/include/otbVectorDataSource.txx
+++ b/Modules/Core/VectorDataBase/include/otbVectorDataSource.txx
@@ -16,8 +16,8 @@
 
 =========================================================================*/
 
-#ifndef __otbVectorDataSource_txx
-#define __otbVectorDataSource_txx
+#ifndef otbVectorDataSource_txx
+#define otbVectorDataSource_txx
 
 #include "otbVectorDataSource.h"
 
diff --git a/Modules/Detection/CloudDetection/include/otbCloudDetectionFilter.h b/Modules/Detection/CloudDetection/include/otbCloudDetectionFilter.h
index add466d24e..56e7cc302d 100644
--- a/Modules/Detection/CloudDetection/include/otbCloudDetectionFilter.h
+++ b/Modules/Detection/CloudDetection/include/otbCloudDetectionFilter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbCloudDetectionFilter_h
-#define __otbCloudDetectionFilter_h
+#ifndef otbCloudDetectionFilter_h
+#define otbCloudDetectionFilter_h
 
 #include "otbCloudDetectionFunctor.h"
 #include "itkUnaryFunctorImageFilter.h"
diff --git a/Modules/Detection/CloudDetection/include/otbCloudDetectionFilter.txx b/Modules/Detection/CloudDetection/include/otbCloudDetectionFilter.txx
index a5ca3bc469..99db7c1bc2 100644
--- a/Modules/Detection/CloudDetection/include/otbCloudDetectionFilter.txx
+++ b/Modules/Detection/CloudDetection/include/otbCloudDetectionFilter.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbCloudDetectionFilter_txx
-#define __otbCloudDetectionFilter_txx
+#ifndef otbCloudDetectionFilter_txx
+#define otbCloudDetectionFilter_txx
 
 #include "otbCloudDetectionFilter.h"
 
diff --git a/Modules/Detection/CloudDetection/include/otbCloudDetectionFunctor.h b/Modules/Detection/CloudDetection/include/otbCloudDetectionFunctor.h
index 1487c20dbf..1f875c0a68 100644
--- a/Modules/Detection/CloudDetection/include/otbCloudDetectionFunctor.h
+++ b/Modules/Detection/CloudDetection/include/otbCloudDetectionFunctor.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbCloudDetectionFunctor_h
-#define __otbCloudDetectionFunctor_h
+#ifndef otbCloudDetectionFunctor_h
+#define otbCloudDetectionFunctor_h
 
 #include "otbCloudEstimatorFunctor.h"
 
diff --git a/Modules/Detection/CloudDetection/include/otbCloudEstimatorFilter.h b/Modules/Detection/CloudDetection/include/otbCloudEstimatorFilter.h
index 15c9b4220a..9e59818a75 100644
--- a/Modules/Detection/CloudDetection/include/otbCloudEstimatorFilter.h
+++ b/Modules/Detection/CloudDetection/include/otbCloudEstimatorFilter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbCloudEstimatorFilter_h
-#define __otbCloudEstimatorFilter_h
+#ifndef otbCloudEstimatorFilter_h
+#define otbCloudEstimatorFilter_h
 
 #include "otbSpectralAngleFunctor.h"
 #include "itkUnaryFunctorImageFilter.h"
diff --git a/Modules/Detection/CloudDetection/include/otbCloudEstimatorFilter.txx b/Modules/Detection/CloudDetection/include/otbCloudEstimatorFilter.txx
index 1e58afd168..73290d94ca 100644
--- a/Modules/Detection/CloudDetection/include/otbCloudEstimatorFilter.txx
+++ b/Modules/Detection/CloudDetection/include/otbCloudEstimatorFilter.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbCloudEstimatorFilter_txx
-#define __otbCloudEstimatorFilter_txx
+#ifndef otbCloudEstimatorFilter_txx
+#define otbCloudEstimatorFilter_txx
 
 #include "otbCloudEstimatorFilter.h"
 
diff --git a/Modules/Detection/CloudDetection/include/otbCloudEstimatorFunctor.h b/Modules/Detection/CloudDetection/include/otbCloudEstimatorFunctor.h
index 9eaa4ab785..f63940f5ed 100644
--- a/Modules/Detection/CloudDetection/include/otbCloudEstimatorFunctor.h
+++ b/Modules/Detection/CloudDetection/include/otbCloudEstimatorFunctor.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbCloudEstimatorFunctor_h
-#define __otbCloudEstimatorFunctor_h
+#ifndef otbCloudEstimatorFunctor_h
+#define otbCloudEstimatorFunctor_h
 
 #include "otbSpectralAngleFunctor.h"
 
diff --git a/Modules/Detection/ObjectDetection/include/otbDescriptorsListSampleGenerator.h b/Modules/Detection/ObjectDetection/include/otbDescriptorsListSampleGenerator.h
index 0896d8cefb..9e4ca7572b 100644
--- a/Modules/Detection/ObjectDetection/include/otbDescriptorsListSampleGenerator.h
+++ b/Modules/Detection/ObjectDetection/include/otbDescriptorsListSampleGenerator.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbDescriptorsListSampleGenerator_h
-#define __otbDescriptorsListSampleGenerator_h
+#ifndef otbDescriptorsListSampleGenerator_h
+#define otbDescriptorsListSampleGenerator_h
 
 #include <vector>
 
diff --git a/Modules/Detection/ObjectDetection/include/otbDescriptorsListSampleGenerator.txx b/Modules/Detection/ObjectDetection/include/otbDescriptorsListSampleGenerator.txx
index b79108e24c..0f9b7b680b 100644
--- a/Modules/Detection/ObjectDetection/include/otbDescriptorsListSampleGenerator.txx
+++ b/Modules/Detection/ObjectDetection/include/otbDescriptorsListSampleGenerator.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbDescriptorsListSampleGenerator_txx
-#define __otbDescriptorsListSampleGenerator_txx
+#ifndef otbDescriptorsListSampleGenerator_txx
+#define otbDescriptorsListSampleGenerator_txx
 
 #include "otbDescriptorsListSampleGenerator.h"
 
diff --git a/Modules/Detection/ObjectDetection/include/otbFlusserMomentsIFFactory.h b/Modules/Detection/ObjectDetection/include/otbFlusserMomentsIFFactory.h
index 825eaef709..77f6ff8743 100644
--- a/Modules/Detection/ObjectDetection/include/otbFlusserMomentsIFFactory.h
+++ b/Modules/Detection/ObjectDetection/include/otbFlusserMomentsIFFactory.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbFlusserMomentsIFFactory_h
-#define __otbFlusserMomentsIFFactory_h
+#ifndef otbFlusserMomentsIFFactory_h
+#define otbFlusserMomentsIFFactory_h
 
 #include "itkLightObject.h"
 
diff --git a/Modules/Detection/ObjectDetection/include/otbFlusserMomentsIFFactory.txx b/Modules/Detection/ObjectDetection/include/otbFlusserMomentsIFFactory.txx
index b6ba843931..b1ea7207ec 100644
--- a/Modules/Detection/ObjectDetection/include/otbFlusserMomentsIFFactory.txx
+++ b/Modules/Detection/ObjectDetection/include/otbFlusserMomentsIFFactory.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbFlusserMomentsIFFactory_txx
-#define __otbFlusserMomentsIFFactory_txx
+#ifndef otbFlusserMomentsIFFactory_txx
+#define otbFlusserMomentsIFFactory_txx
 
 #include "otbFlusserMomentsIFFactory.h"
 
diff --git a/Modules/Detection/ObjectDetection/include/otbFourierMellinDescriptorsIFFactory.h b/Modules/Detection/ObjectDetection/include/otbFourierMellinDescriptorsIFFactory.h
index 1d6a0c5811..53f7b8d1d1 100644
--- a/Modules/Detection/ObjectDetection/include/otbFourierMellinDescriptorsIFFactory.h
+++ b/Modules/Detection/ObjectDetection/include/otbFourierMellinDescriptorsIFFactory.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbFourierMellinDescriptorsIFFactory_h
-#define __otbFourierMellinDescriptorsIFFactory_h
+#ifndef otbFourierMellinDescriptorsIFFactory_h
+#define otbFourierMellinDescriptorsIFFactory_h
 
 #include "itkLightObject.h"
 
diff --git a/Modules/Detection/ObjectDetection/include/otbFourierMellinDescriptorsIFFactory.txx b/Modules/Detection/ObjectDetection/include/otbFourierMellinDescriptorsIFFactory.txx
index a45e7603fe..bc0b270724 100644
--- a/Modules/Detection/ObjectDetection/include/otbFourierMellinDescriptorsIFFactory.txx
+++ b/Modules/Detection/ObjectDetection/include/otbFourierMellinDescriptorsIFFactory.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbFourierMellinDescriptorsIFFactory_txx
-#define __otbFourierMellinDescriptorsIFFactory_txx
+#ifndef otbFourierMellinDescriptorsIFFactory_txx
+#define otbFourierMellinDescriptorsIFFactory_txx
 
 #include "otbFourierMellinDescriptorsIFFactory.h"
 
diff --git a/Modules/Detection/ObjectDetection/include/otbHaralickTexturesIFFactory.h b/Modules/Detection/ObjectDetection/include/otbHaralickTexturesIFFactory.h
index 265c96efea..c1e5f01ae4 100644
--- a/Modules/Detection/ObjectDetection/include/otbHaralickTexturesIFFactory.h
+++ b/Modules/Detection/ObjectDetection/include/otbHaralickTexturesIFFactory.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbHaralickTexturesIFFactory_h
-#define __otbHaralickTexturesIFFactory_h
+#ifndef otbHaralickTexturesIFFactory_h
+#define otbHaralickTexturesIFFactory_h
 
 #include "itkLightObject.h"
 
diff --git a/Modules/Detection/ObjectDetection/include/otbHaralickTexturesIFFactory.txx b/Modules/Detection/ObjectDetection/include/otbHaralickTexturesIFFactory.txx
index 53dde8a84e..f16b85c7f5 100644
--- a/Modules/Detection/ObjectDetection/include/otbHaralickTexturesIFFactory.txx
+++ b/Modules/Detection/ObjectDetection/include/otbHaralickTexturesIFFactory.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbHaralickTexturesIFFactory_txx
-#define __otbHaralickTexturesIFFactory_txx
+#ifndef otbHaralickTexturesIFFactory_txx
+#define otbHaralickTexturesIFFactory_txx
 
 #include "otbHaralickTexturesIFFactory.h"
 
diff --git a/Modules/Detection/ObjectDetection/include/otbLabeledSampleLocalizationGenerator.h b/Modules/Detection/ObjectDetection/include/otbLabeledSampleLocalizationGenerator.h
index 8e365e06f8..b376be12ba 100644
--- a/Modules/Detection/ObjectDetection/include/otbLabeledSampleLocalizationGenerator.h
+++ b/Modules/Detection/ObjectDetection/include/otbLabeledSampleLocalizationGenerator.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbLabeledSampleLocalizationGenerator_h
-#define __otbLabeledSampleLocalizationGenerator_h
+#ifndef otbLabeledSampleLocalizationGenerator_h
+#define otbLabeledSampleLocalizationGenerator_h
 
 #include "otbVectorDataSource.h"
 #include "otbVectorData.h"
diff --git a/Modules/Detection/ObjectDetection/include/otbLabeledSampleLocalizationGenerator.txx b/Modules/Detection/ObjectDetection/include/otbLabeledSampleLocalizationGenerator.txx
index e97b24cc2a..9693e7dbf2 100644
--- a/Modules/Detection/ObjectDetection/include/otbLabeledSampleLocalizationGenerator.txx
+++ b/Modules/Detection/ObjectDetection/include/otbLabeledSampleLocalizationGenerator.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbLabeledSampleLocalizationGenerator_txx
-#define __otbLabeledSampleLocalizationGenerator_txx
+#ifndef otbLabeledSampleLocalizationGenerator_txx
+#define otbLabeledSampleLocalizationGenerator_txx
 
 #include "otbLabeledSampleLocalizationGenerator.h"
 
diff --git a/Modules/Detection/ObjectDetection/include/otbLocalHistogramIFFactory.h b/Modules/Detection/ObjectDetection/include/otbLocalHistogramIFFactory.h
index 7add54b4c0..e7aa76913a 100644
--- a/Modules/Detection/ObjectDetection/include/otbLocalHistogramIFFactory.h
+++ b/Modules/Detection/ObjectDetection/include/otbLocalHistogramIFFactory.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbLocalHistogramIFFactory_h
-#define __otbLocalHistogramIFFactory_h
+#ifndef otbLocalHistogramIFFactory_h
+#define otbLocalHistogramIFFactory_h
 
 #include "itkLightObject.h"
 
diff --git a/Modules/Detection/ObjectDetection/include/otbLocalHistogramIFFactory.txx b/Modules/Detection/ObjectDetection/include/otbLocalHistogramIFFactory.txx
index b590bd53cb..e748c6a62d 100644
--- a/Modules/Detection/ObjectDetection/include/otbLocalHistogramIFFactory.txx
+++ b/Modules/Detection/ObjectDetection/include/otbLocalHistogramIFFactory.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbLocalHistogramIFFactory_txx
-#define __otbLocalHistogramIFFactory_txx
+#ifndef otbLocalHistogramIFFactory_txx
+#define otbLocalHistogramIFFactory_txx
 
 #include "otbLocalHistogramIFFactory.h"
 
diff --git a/Modules/Detection/ObjectDetection/include/otbMultiChannelIFFactory.h b/Modules/Detection/ObjectDetection/include/otbMultiChannelIFFactory.h
index f475136328..964a87b30a 100644
--- a/Modules/Detection/ObjectDetection/include/otbMultiChannelIFFactory.h
+++ b/Modules/Detection/ObjectDetection/include/otbMultiChannelIFFactory.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbMultiChannelIFFactory_h
-#define __otbMultiChannelIFFactory_h
+#ifndef otbMultiChannelIFFactory_h
+#define otbMultiChannelIFFactory_h
 
 #include "otbVectorImageToImageListFilter.h"
 #include "otbVectorImage.h"
diff --git a/Modules/Detection/ObjectDetection/include/otbRadiometricMomentsIFFactory.h b/Modules/Detection/ObjectDetection/include/otbRadiometricMomentsIFFactory.h
index a83da56620..489d50d6cf 100644
--- a/Modules/Detection/ObjectDetection/include/otbRadiometricMomentsIFFactory.h
+++ b/Modules/Detection/ObjectDetection/include/otbRadiometricMomentsIFFactory.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbRadiometricMomentsIFFactory_h
-#define __otbRadiometricMomentsIFFactory_h
+#ifndef otbRadiometricMomentsIFFactory_h
+#define otbRadiometricMomentsIFFactory_h
 
 #include "itkLightObject.h"
 
diff --git a/Modules/Detection/ObjectDetection/include/otbRadiometricMomentsIFFactory.txx b/Modules/Detection/ObjectDetection/include/otbRadiometricMomentsIFFactory.txx
index 9cf59780fd..dd1327f3c1 100644
--- a/Modules/Detection/ObjectDetection/include/otbRadiometricMomentsIFFactory.txx
+++ b/Modules/Detection/ObjectDetection/include/otbRadiometricMomentsIFFactory.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbRadiometricMomentsIFFactory_txx
-#define __otbRadiometricMomentsIFFactory_txx
+#ifndef otbRadiometricMomentsIFFactory_txx
+#define otbRadiometricMomentsIFFactory_txx
 
 #include "otbRadiometricMomentsIFFactory.h"
 
diff --git a/Modules/Detection/ObjectDetection/include/otbStandardMetaImageFunctionBuilder.h b/Modules/Detection/ObjectDetection/include/otbStandardMetaImageFunctionBuilder.h
index 8813f16b4d..fb59aa2ba1 100644
--- a/Modules/Detection/ObjectDetection/include/otbStandardMetaImageFunctionBuilder.h
+++ b/Modules/Detection/ObjectDetection/include/otbStandardMetaImageFunctionBuilder.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbStandardMetaImageFunctionBuilder_h
-#define __otbStandardMetaImageFunctionBuilder_h
+#ifndef otbStandardMetaImageFunctionBuilder_h
+#define otbStandardMetaImageFunctionBuilder_h
 
 
 #include "itkVariableLengthVector.h"
diff --git a/Modules/Detection/ObjectDetection/include/otbStandardMetaImageFunctionBuilder.txx b/Modules/Detection/ObjectDetection/include/otbStandardMetaImageFunctionBuilder.txx
index bee36354eb..4126fd8644 100644
--- a/Modules/Detection/ObjectDetection/include/otbStandardMetaImageFunctionBuilder.txx
+++ b/Modules/Detection/ObjectDetection/include/otbStandardMetaImageFunctionBuilder.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbStandardMetaImageFunctionBuilder_txx
-#define __otbStandardMetaImageFunctionBuilder_txx
+#ifndef otbStandardMetaImageFunctionBuilder_txx
+#define otbStandardMetaImageFunctionBuilder_txx
 
 #include "otbStandardMetaImageFunctionBuilder.h"
 
diff --git a/Modules/Detection/RoadExtraction/include/otbBreakAngularPathListFilter.h b/Modules/Detection/RoadExtraction/include/otbBreakAngularPathListFilter.h
index bd1d8307a8..0782446ac8 100644
--- a/Modules/Detection/RoadExtraction/include/otbBreakAngularPathListFilter.h
+++ b/Modules/Detection/RoadExtraction/include/otbBreakAngularPathListFilter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbBreakAngularPathListFilter_h
-#define __otbBreakAngularPathListFilter_h
+#ifndef otbBreakAngularPathListFilter_h
+#define otbBreakAngularPathListFilter_h
 
 #include "otbPathListToPathListFilter.h"
 #include "otbMacro.h"
diff --git a/Modules/Detection/RoadExtraction/include/otbBreakAngularPathListFilter.txx b/Modules/Detection/RoadExtraction/include/otbBreakAngularPathListFilter.txx
index af9e2988eb..a122f6be6c 100644
--- a/Modules/Detection/RoadExtraction/include/otbBreakAngularPathListFilter.txx
+++ b/Modules/Detection/RoadExtraction/include/otbBreakAngularPathListFilter.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbBreakAngularPathListFilter_txx
-#define __otbBreakAngularPathListFilter_txx
+#ifndef otbBreakAngularPathListFilter_txx
+#define otbBreakAngularPathListFilter_txx
 
 #include "otbBreakAngularPathListFilter.h"
 #include "otbMath.h"
diff --git a/Modules/Detection/RoadExtraction/include/otbGenericRoadExtractionFilter.h b/Modules/Detection/RoadExtraction/include/otbGenericRoadExtractionFilter.h
index 81a689065c..6f5b324b13 100644
--- a/Modules/Detection/RoadExtraction/include/otbGenericRoadExtractionFilter.h
+++ b/Modules/Detection/RoadExtraction/include/otbGenericRoadExtractionFilter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbGenericRoadExtractionFilter_h
-#define __otbGenericRoadExtractionFilter_h
+#ifndef otbGenericRoadExtractionFilter_h
+#define otbGenericRoadExtractionFilter_h
 
 #include "itkUnaryFunctorImageFilter.h"
 #include "itkGradientRecursiveGaussianImageFilter.h"
diff --git a/Modules/Detection/RoadExtraction/include/otbGenericRoadExtractionFilter.txx b/Modules/Detection/RoadExtraction/include/otbGenericRoadExtractionFilter.txx
index 6ed3e03127..9927a9fb62 100644
--- a/Modules/Detection/RoadExtraction/include/otbGenericRoadExtractionFilter.txx
+++ b/Modules/Detection/RoadExtraction/include/otbGenericRoadExtractionFilter.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbGenericRoadExtractionFilter_txx
-#define __otbGenericRoadExtractionFilter_txx
+#ifndef otbGenericRoadExtractionFilter_txx
+#define otbGenericRoadExtractionFilter_txx
 
 #include "otbGenericRoadExtractionFilter.h"
 #include "otbMath.h"
diff --git a/Modules/Detection/RoadExtraction/include/otbImageToPathListAlignFilter.h b/Modules/Detection/RoadExtraction/include/otbImageToPathListAlignFilter.h
index e3ae867e7a..1bf6173998 100644
--- a/Modules/Detection/RoadExtraction/include/otbImageToPathListAlignFilter.h
+++ b/Modules/Detection/RoadExtraction/include/otbImageToPathListAlignFilter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbImageToPathListAlignFilter_h
-#define __otbImageToPathListAlignFilter_h
+#ifndef otbImageToPathListAlignFilter_h
+#define otbImageToPathListAlignFilter_h
 
 #include "itkImageSource.h"
 #include "itkConceptChecking.h"
diff --git a/Modules/Detection/RoadExtraction/include/otbImageToPathListAlignFilter.txx b/Modules/Detection/RoadExtraction/include/otbImageToPathListAlignFilter.txx
index 3db9a7dfac..e8f98e7f10 100644
--- a/Modules/Detection/RoadExtraction/include/otbImageToPathListAlignFilter.txx
+++ b/Modules/Detection/RoadExtraction/include/otbImageToPathListAlignFilter.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbImageToPathListAlignFilter_txx
-#define __otbImageToPathListAlignFilter_txx
+#ifndef otbImageToPathListAlignFilter_txx
+#define otbImageToPathListAlignFilter_txx
 
 #include "otbImageToPathListAlignFilter.h"
 #include "itkImageRegionIteratorWithIndex.h"
diff --git a/Modules/Detection/RoadExtraction/include/otbLikelihoodPathListFilter.h b/Modules/Detection/RoadExtraction/include/otbLikelihoodPathListFilter.h
index 0f35411c58..26a4f8d794 100644
--- a/Modules/Detection/RoadExtraction/include/otbLikelihoodPathListFilter.h
+++ b/Modules/Detection/RoadExtraction/include/otbLikelihoodPathListFilter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbLikelihoodPathListFilter_h
-#define __otbLikelihoodPathListFilter_h
+#ifndef otbLikelihoodPathListFilter_h
+#define otbLikelihoodPathListFilter_h
 
 #include "otbPathListToPathListFilter.h"
 #include "otbMacro.h"
diff --git a/Modules/Detection/RoadExtraction/include/otbLikelihoodPathListFilter.txx b/Modules/Detection/RoadExtraction/include/otbLikelihoodPathListFilter.txx
index fd2482e60b..33d2865bb1 100644
--- a/Modules/Detection/RoadExtraction/include/otbLikelihoodPathListFilter.txx
+++ b/Modules/Detection/RoadExtraction/include/otbLikelihoodPathListFilter.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbLikelihoodPathListFilter_txx
-#define __otbLikelihoodPathListFilter_txx
+#ifndef otbLikelihoodPathListFilter_txx
+#define otbLikelihoodPathListFilter_txx
 
 #include "otbLikelihoodPathListFilter.h"
 #include "otbPolyLineImageConstIterator.h"
diff --git a/Modules/Detection/RoadExtraction/include/otbLinkPathListFilter.h b/Modules/Detection/RoadExtraction/include/otbLinkPathListFilter.h
index 339598f177..a9e5a1cef0 100644
--- a/Modules/Detection/RoadExtraction/include/otbLinkPathListFilter.h
+++ b/Modules/Detection/RoadExtraction/include/otbLinkPathListFilter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbLinkPathListFilter_h
-#define __otbLinkPathListFilter_h
+#ifndef otbLinkPathListFilter_h
+#define otbLinkPathListFilter_h
 
 #include "otbPathListToPathListFilter.h"
 #include "otbMacro.h"
diff --git a/Modules/Detection/RoadExtraction/include/otbLinkPathListFilter.txx b/Modules/Detection/RoadExtraction/include/otbLinkPathListFilter.txx
index bfb025c31f..d102babf32 100644
--- a/Modules/Detection/RoadExtraction/include/otbLinkPathListFilter.txx
+++ b/Modules/Detection/RoadExtraction/include/otbLinkPathListFilter.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbLinkPathListFilter_txx
-#define __otbLinkPathListFilter_txx
+#ifndef otbLinkPathListFilter_txx
+#define otbLinkPathListFilter_txx
 
 #include "otbLinkPathListFilter.h"
 #include "otbMath.h"
diff --git a/Modules/Detection/RoadExtraction/include/otbModulusAndDirectionImageToImageFilter.h b/Modules/Detection/RoadExtraction/include/otbModulusAndDirectionImageToImageFilter.h
index 6317bab5fc..77f3667483 100644
--- a/Modules/Detection/RoadExtraction/include/otbModulusAndDirectionImageToImageFilter.h
+++ b/Modules/Detection/RoadExtraction/include/otbModulusAndDirectionImageToImageFilter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbModulusAndDirectionImageToImageFilter_h
-#define __otbModulusAndDirectionImageToImageFilter_h
+#ifndef otbModulusAndDirectionImageToImageFilter_h
+#define otbModulusAndDirectionImageToImageFilter_h
 
 #include "itkImageToImageFilter.h"
 
diff --git a/Modules/Detection/RoadExtraction/include/otbModulusAndDirectionImageToImageFilter.txx b/Modules/Detection/RoadExtraction/include/otbModulusAndDirectionImageToImageFilter.txx
index 63a95cbf22..7aaf57768a 100644
--- a/Modules/Detection/RoadExtraction/include/otbModulusAndDirectionImageToImageFilter.txx
+++ b/Modules/Detection/RoadExtraction/include/otbModulusAndDirectionImageToImageFilter.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbModulusAndDirectionImageToImageFilter_txx
-#define __otbModulusAndDirectionImageToImageFilter_txx
+#ifndef otbModulusAndDirectionImageToImageFilter_txx
+#define otbModulusAndDirectionImageToImageFilter_txx
 
 #include "otbModulusAndDirectionImageToImageFilter.h"
 #include "itkProcessObject.h"
diff --git a/Modules/Detection/RoadExtraction/include/otbNeighborhoodScalarProductFilter.h b/Modules/Detection/RoadExtraction/include/otbNeighborhoodScalarProductFilter.h
index 0e71a4e494..958f4ee35f 100644
--- a/Modules/Detection/RoadExtraction/include/otbNeighborhoodScalarProductFilter.h
+++ b/Modules/Detection/RoadExtraction/include/otbNeighborhoodScalarProductFilter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbNeighborhoodScalarProductFilter_h
-#define __otbNeighborhoodScalarProductFilter_h
+#ifndef otbNeighborhoodScalarProductFilter_h
+#define otbNeighborhoodScalarProductFilter_h
 
 #include "otbImageToModulusAndDirectionImageFilter.h"
 
diff --git a/Modules/Detection/RoadExtraction/include/otbNeighborhoodScalarProductFilter.txx b/Modules/Detection/RoadExtraction/include/otbNeighborhoodScalarProductFilter.txx
index e1d1c6afe9..ec95e1d498 100644
--- a/Modules/Detection/RoadExtraction/include/otbNeighborhoodScalarProductFilter.txx
+++ b/Modules/Detection/RoadExtraction/include/otbNeighborhoodScalarProductFilter.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbNeighborhoodScalarProductFilter_txx
-#define __otbNeighborhoodScalarProductFilter_txx
+#ifndef otbNeighborhoodScalarProductFilter_txx
+#define otbNeighborhoodScalarProductFilter_txx
 
 #include "otbNeighborhoodScalarProductFilter.h"
 #include "itkImageRegionIterator.h"
diff --git a/Modules/Detection/RoadExtraction/include/otbNonMaxRemovalByDirectionFilter.h b/Modules/Detection/RoadExtraction/include/otbNonMaxRemovalByDirectionFilter.h
index 23d1cacbc2..487a92af89 100644
--- a/Modules/Detection/RoadExtraction/include/otbNonMaxRemovalByDirectionFilter.h
+++ b/Modules/Detection/RoadExtraction/include/otbNonMaxRemovalByDirectionFilter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbNonMaxRemovalByDirectionFilter_h
-#define __otbNonMaxRemovalByDirectionFilter_h
+#ifndef otbNonMaxRemovalByDirectionFilter_h
+#define otbNonMaxRemovalByDirectionFilter_h
 
 #include "otbModulusAndDirectionImageToImageFilter.h"
 #include "otbBinaryFunctorNeighborhoodImageFilter.h"
diff --git a/Modules/Detection/RoadExtraction/include/otbParallelLinePathListFilter.h b/Modules/Detection/RoadExtraction/include/otbParallelLinePathListFilter.h
index 0408e43d10..815e43f6b6 100644
--- a/Modules/Detection/RoadExtraction/include/otbParallelLinePathListFilter.h
+++ b/Modules/Detection/RoadExtraction/include/otbParallelLinePathListFilter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbParallelLinePathListFilter_h
-#define __otbParallelLinePathListFilter_h
+#ifndef otbParallelLinePathListFilter_h
+#define otbParallelLinePathListFilter_h
 
 #include "otbPathListToPathListFilter.h"
 #include "otbMacro.h"
diff --git a/Modules/Detection/RoadExtraction/include/otbParallelLinePathListFilter.txx b/Modules/Detection/RoadExtraction/include/otbParallelLinePathListFilter.txx
index a59883455f..e117e47194 100644
--- a/Modules/Detection/RoadExtraction/include/otbParallelLinePathListFilter.txx
+++ b/Modules/Detection/RoadExtraction/include/otbParallelLinePathListFilter.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbParallelLinePathListFilter_txx
-#define __otbParallelLinePathListFilter_txx
+#ifndef otbParallelLinePathListFilter_txx
+#define otbParallelLinePathListFilter_txx
 
 #include "otbParallelLinePathListFilter.h"
 #include "otbMath.h"
diff --git a/Modules/Detection/RoadExtraction/include/otbRemoveIsolatedByDirectionFilter.h b/Modules/Detection/RoadExtraction/include/otbRemoveIsolatedByDirectionFilter.h
index 08fcd11091..29bb49d683 100644
--- a/Modules/Detection/RoadExtraction/include/otbRemoveIsolatedByDirectionFilter.h
+++ b/Modules/Detection/RoadExtraction/include/otbRemoveIsolatedByDirectionFilter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbRemoveIsolatedByDirectionFilter_h
-#define __otbRemoveIsolatedByDirectionFilter_h
+#ifndef otbRemoveIsolatedByDirectionFilter_h
+#define otbRemoveIsolatedByDirectionFilter_h
 
 #include "otbModulusAndDirectionImageToImageFilter.h"
 #include "otbBinaryFunctorNeighborhoodImageFilter.h"
diff --git a/Modules/Detection/RoadExtraction/include/otbRemoveTortuousPathListFilter.h b/Modules/Detection/RoadExtraction/include/otbRemoveTortuousPathListFilter.h
index 5cbc162739..9e3282d9f8 100644
--- a/Modules/Detection/RoadExtraction/include/otbRemoveTortuousPathListFilter.h
+++ b/Modules/Detection/RoadExtraction/include/otbRemoveTortuousPathListFilter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbRemoveTortuousPathListFilter_h
-#define __otbRemoveTortuousPathListFilter_h
+#ifndef otbRemoveTortuousPathListFilter_h
+#define otbRemoveTortuousPathListFilter_h
 
 #include "otbUnaryFunctorObjectListBooleanFilter.h"
 #include "otbPathMeanDistanceFunctor.h"
diff --git a/Modules/Detection/RoadExtraction/include/otbRemoveWrongDirectionFilter.h b/Modules/Detection/RoadExtraction/include/otbRemoveWrongDirectionFilter.h
index 71f2ebedc8..bada4bfc1f 100644
--- a/Modules/Detection/RoadExtraction/include/otbRemoveWrongDirectionFilter.h
+++ b/Modules/Detection/RoadExtraction/include/otbRemoveWrongDirectionFilter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbRemoveWrongDirectionFilter_h
-#define __otbRemoveWrongDirectionFilter_h
+#ifndef otbRemoveWrongDirectionFilter_h
+#define otbRemoveWrongDirectionFilter_h
 
 #include "otbModulusAndDirectionImageToImageFilter.h"
 #include "itkBinaryFunctorImageFilter.h"
diff --git a/Modules/Detection/RoadExtraction/include/otbRoadExtractionFilter.h b/Modules/Detection/RoadExtraction/include/otbRoadExtractionFilter.h
index 7ebc2c6d67..bc1f020c67 100644
--- a/Modules/Detection/RoadExtraction/include/otbRoadExtractionFilter.h
+++ b/Modules/Detection/RoadExtraction/include/otbRoadExtractionFilter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbRoadExtractionFilter_h
-#define __otbRoadExtractionFilter_h
+#ifndef otbRoadExtractionFilter_h
+#define otbRoadExtractionFilter_h
 
 
 #include "otbSpectralAngleDistanceImageFilter.h"
diff --git a/Modules/Detection/RoadExtraction/include/otbRoadExtractionFilter.txx b/Modules/Detection/RoadExtraction/include/otbRoadExtractionFilter.txx
index 3b5ddde2e8..caa0351b48 100644
--- a/Modules/Detection/RoadExtraction/include/otbRoadExtractionFilter.txx
+++ b/Modules/Detection/RoadExtraction/include/otbRoadExtractionFilter.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbRoadExtractionFilter_txx
-#define __otbRoadExtractionFilter_txx
+#ifndef otbRoadExtractionFilter_txx
+#define otbRoadExtractionFilter_txx
 
 #include "otbRoadExtractionFilter.h"
 #include "otbMath.h"
diff --git a/Modules/Detection/RoadExtraction/include/otbSimplifyPathListFilter.h b/Modules/Detection/RoadExtraction/include/otbSimplifyPathListFilter.h
index b4bc6c9881..847004511a 100644
--- a/Modules/Detection/RoadExtraction/include/otbSimplifyPathListFilter.h
+++ b/Modules/Detection/RoadExtraction/include/otbSimplifyPathListFilter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbSimplifyPathListFilter_h
-#define __otbSimplifyPathListFilter_h
+#ifndef otbSimplifyPathListFilter_h
+#define otbSimplifyPathListFilter_h
 
 #include "otbUnaryFunctorObjectListFilter.h"
 #include "otbSimplifyPathFunctor.h"
diff --git a/Modules/Detection/RoadExtraction/include/otbVectorDataToRoadDescriptionFilter.h b/Modules/Detection/RoadExtraction/include/otbVectorDataToRoadDescriptionFilter.h
index 0118ffa98f..628457b7a3 100644
--- a/Modules/Detection/RoadExtraction/include/otbVectorDataToRoadDescriptionFilter.h
+++ b/Modules/Detection/RoadExtraction/include/otbVectorDataToRoadDescriptionFilter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbVectorDataToRoadDescriptionFilter_h
-#define __otbVectorDataToRoadDescriptionFilter_h
+#ifndef otbVectorDataToRoadDescriptionFilter_h
+#define otbVectorDataToRoadDescriptionFilter_h
 
 #include "otbVectorDataToSpecificDescriptionFilterBase.h"
 #include "otbVectorData.h"
diff --git a/Modules/Detection/RoadExtraction/include/otbVectorDataToRoadDescriptionFilter.txx b/Modules/Detection/RoadExtraction/include/otbVectorDataToRoadDescriptionFilter.txx
index f5df76a11e..87ae91a221 100644
--- a/Modules/Detection/RoadExtraction/include/otbVectorDataToRoadDescriptionFilter.txx
+++ b/Modules/Detection/RoadExtraction/include/otbVectorDataToRoadDescriptionFilter.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbVectorDataToRoadDescriptionFilter_txx
-#define __otbVectorDataToRoadDescriptionFilter_txx
+#ifndef otbVectorDataToRoadDescriptionFilter_txx
+#define otbVectorDataToRoadDescriptionFilter_txx
 
 #include "otbVectorDataToRoadDescriptionFilter.h"
 
diff --git a/Modules/Detection/UrbanArea/include/otbUrbanAreaDetectionImageFilter.h b/Modules/Detection/UrbanArea/include/otbUrbanAreaDetectionImageFilter.h
index ae1cadbfd4..48e92d541b 100644
--- a/Modules/Detection/UrbanArea/include/otbUrbanAreaDetectionImageFilter.h
+++ b/Modules/Detection/UrbanArea/include/otbUrbanAreaDetectionImageFilter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbUrbanAreaDetectionImageFilter_h
-#define __otbUrbanAreaDetectionImageFilter_h
+#ifndef otbUrbanAreaDetectionImageFilter_h
+#define otbUrbanAreaDetectionImageFilter_h
 
 #include "otbImage.h"
 #include "otbWaterIndicesFunctor.h"
diff --git a/Modules/Detection/UrbanArea/include/otbUrbanAreaDetectionImageFilter.txx b/Modules/Detection/UrbanArea/include/otbUrbanAreaDetectionImageFilter.txx
index aad11939a7..a263dfcf74 100644
--- a/Modules/Detection/UrbanArea/include/otbUrbanAreaDetectionImageFilter.txx
+++ b/Modules/Detection/UrbanArea/include/otbUrbanAreaDetectionImageFilter.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbUrbanAreaDetectionImageFilter_txx
-#define __otbUrbanAreaDetectionImageFilter_txx
+#ifndef otbUrbanAreaDetectionImageFilter_txx
+#define otbUrbanAreaDetectionImageFilter_txx
 
 #include "otbUrbanAreaDetectionImageFilter.h"
 #include "itkProgressAccumulator.h"
diff --git a/Modules/Feature/Corner/include/otbHarrisImageFilter.h b/Modules/Feature/Corner/include/otbHarrisImageFilter.h
index 3c1bdb5d59..9d2f5ebdb5 100644
--- a/Modules/Feature/Corner/include/otbHarrisImageFilter.h
+++ b/Modules/Feature/Corner/include/otbHarrisImageFilter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbHarrisImageFilter_h
-#define __otbHarrisImageFilter_h
+#ifndef otbHarrisImageFilter_h
+#define otbHarrisImageFilter_h
 
 #include "itkImageToImageFilter.h"
 #include "itkHessianRecursiveGaussianImageFilter.h"
diff --git a/Modules/Feature/Corner/include/otbHarrisImageFilter.txx b/Modules/Feature/Corner/include/otbHarrisImageFilter.txx
index 4e6a0d68f2..a9044d9c1c 100644
--- a/Modules/Feature/Corner/include/otbHarrisImageFilter.txx
+++ b/Modules/Feature/Corner/include/otbHarrisImageFilter.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbHarrisImageFilter_txx
-#define __otbHarrisImageFilter_txx
+#ifndef otbHarrisImageFilter_txx
+#define otbHarrisImageFilter_txx
 
 #include "otbHarrisImageFilter.h"
 
diff --git a/Modules/Feature/Corner/include/otbHarrisImageToPointSetFilter.h b/Modules/Feature/Corner/include/otbHarrisImageToPointSetFilter.h
index 0f087edbce..9e52c0b3db 100644
--- a/Modules/Feature/Corner/include/otbHarrisImageToPointSetFilter.h
+++ b/Modules/Feature/Corner/include/otbHarrisImageToPointSetFilter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbHarrisImageToPointSetFilter_h
-#define __otbHarrisImageToPointSetFilter_h
+#ifndef otbHarrisImageToPointSetFilter_h
+#define otbHarrisImageToPointSetFilter_h
 
 #include "otbThresholdImageToPointSetFilter.h"
 #include "otbHarrisImageFilter.h"
diff --git a/Modules/Feature/Corner/include/otbHarrisImageToPointSetFilter.txx b/Modules/Feature/Corner/include/otbHarrisImageToPointSetFilter.txx
index 9dff206431..f8266e1634 100644
--- a/Modules/Feature/Corner/include/otbHarrisImageToPointSetFilter.txx
+++ b/Modules/Feature/Corner/include/otbHarrisImageToPointSetFilter.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbHarrisImageToPointSetFilter_txx
-#define __otbHarrisImageToPointSetFilter_txx
+#ifndef otbHarrisImageToPointSetFilter_txx
+#define otbHarrisImageToPointSetFilter_txx
 
 #include "otbHarrisImageToPointSetFilter.h"
 
diff --git a/Modules/Feature/Corner/include/otbLineSpatialObjectListToRightAnglePointSetFilter.h b/Modules/Feature/Corner/include/otbLineSpatialObjectListToRightAnglePointSetFilter.h
index 2df55b421b..17b142a0e1 100644
--- a/Modules/Feature/Corner/include/otbLineSpatialObjectListToRightAnglePointSetFilter.h
+++ b/Modules/Feature/Corner/include/otbLineSpatialObjectListToRightAnglePointSetFilter.h
@@ -17,8 +17,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbLineSpatialObjectListToRightAnglePointSetFilter_h
-#define __otbLineSpatialObjectListToRightAnglePointSetFilter_h
+#ifndef otbLineSpatialObjectListToRightAnglePointSetFilter_h
+#define otbLineSpatialObjectListToRightAnglePointSetFilter_h
 
 #include "itkPointSet.h"
 #include "otbLineSpatialObjectListToPointSetFilter.h"
diff --git a/Modules/Feature/Corner/include/otbLineSpatialObjectListToRightAnglePointSetFilter.txx b/Modules/Feature/Corner/include/otbLineSpatialObjectListToRightAnglePointSetFilter.txx
index a241052f34..fc396e5965 100644
--- a/Modules/Feature/Corner/include/otbLineSpatialObjectListToRightAnglePointSetFilter.txx
+++ b/Modules/Feature/Corner/include/otbLineSpatialObjectListToRightAnglePointSetFilter.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbLineSpatialObjectListToRightAnglePointSetFilter_txx
-#define __otbLineSpatialObjectListToRightAnglePointSetFilter_txx
+#ifndef otbLineSpatialObjectListToRightAnglePointSetFilter_txx
+#define otbLineSpatialObjectListToRightAnglePointSetFilter_txx
 
 #include "otbLineSpatialObjectListToRightAnglePointSetFilter.h"
 #include "itkLineIterator.h"
diff --git a/Modules/Feature/Corner/include/otbVectorDataToRightAngleVectorDataFilter.h b/Modules/Feature/Corner/include/otbVectorDataToRightAngleVectorDataFilter.h
index d3c6714d85..db552a5475 100644
--- a/Modules/Feature/Corner/include/otbVectorDataToRightAngleVectorDataFilter.h
+++ b/Modules/Feature/Corner/include/otbVectorDataToRightAngleVectorDataFilter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbVectorDataToRightAngleVectorDataFilter_h
-#define __otbVectorDataToRightAngleVectorDataFilter_h
+#ifndef otbVectorDataToRightAngleVectorDataFilter_h
+#define otbVectorDataToRightAngleVectorDataFilter_h
 
 
 #include "otbVectorDataToVectorDataFilter.h"
diff --git a/Modules/Feature/Corner/include/otbVectorDataToRightAngleVectorDataFilter.txx b/Modules/Feature/Corner/include/otbVectorDataToRightAngleVectorDataFilter.txx
index 661c4ff332..1b2f568458 100644
--- a/Modules/Feature/Corner/include/otbVectorDataToRightAngleVectorDataFilter.txx
+++ b/Modules/Feature/Corner/include/otbVectorDataToRightAngleVectorDataFilter.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbVectorDataToRightAngleVectorDataFilter_txx
-#define __otbVectorDataToRightAngleVectorDataFilter_txx
+#ifndef otbVectorDataToRightAngleVectorDataFilter_txx
+#define otbVectorDataToRightAngleVectorDataFilter_txx
 
 #include "otbVectorDataToRightAngleVectorDataFilter.h"
 #include "otbVectorData.h"
diff --git a/Modules/Feature/Density/include/otbKeyPointDensityImageFilter.h b/Modules/Feature/Density/include/otbKeyPointDensityImageFilter.h
index e3665b4e48..296d6063f2 100644
--- a/Modules/Feature/Density/include/otbKeyPointDensityImageFilter.h
+++ b/Modules/Feature/Density/include/otbKeyPointDensityImageFilter.h
@@ -17,8 +17,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbKeyPointDensityImageFilter_h
-#define __otbKeyPointDensityImageFilter_h
+#ifndef otbKeyPointDensityImageFilter_h
+#define otbKeyPointDensityImageFilter_h
 
 #include "itkImageToImageFilter.h"
 #include "otbPointSetToDensityImageFilter.h"
diff --git a/Modules/Feature/Density/include/otbKeyPointDensityImageFilter.txx b/Modules/Feature/Density/include/otbKeyPointDensityImageFilter.txx
index be946a3c75..bc03afbe8d 100644
--- a/Modules/Feature/Density/include/otbKeyPointDensityImageFilter.txx
+++ b/Modules/Feature/Density/include/otbKeyPointDensityImageFilter.txx
@@ -17,8 +17,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbKeyPointDensityImageFilter_txx
-#define __otbKeyPointDensityImageFilter_txx
+#ifndef otbKeyPointDensityImageFilter_txx
+#define otbKeyPointDensityImageFilter_txx
 
 #include "otbKeyPointDensityImageFilter.h"
 #include "itkImageRegionIterator.h"
diff --git a/Modules/Feature/Density/include/otbPointSetDensityEpanechnikovFunction.h b/Modules/Feature/Density/include/otbPointSetDensityEpanechnikovFunction.h
index a048b81dc0..7070b51ddd 100644
--- a/Modules/Feature/Density/include/otbPointSetDensityEpanechnikovFunction.h
+++ b/Modules/Feature/Density/include/otbPointSetDensityEpanechnikovFunction.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbPointSetDensityEpanechnikovFunction_h
-#define __otbPointSetDensityEpanechnikovFunction_h
+#ifndef otbPointSetDensityEpanechnikovFunction_h
+#define otbPointSetDensityEpanechnikovFunction_h
 
 #include "otbPointSetFunction.h"
 #include "itkPoint.h"
diff --git a/Modules/Feature/Density/include/otbPointSetDensityEpanechnikovFunction.txx b/Modules/Feature/Density/include/otbPointSetDensityEpanechnikovFunction.txx
index 63af5cffe5..ff6c98d575 100644
--- a/Modules/Feature/Density/include/otbPointSetDensityEpanechnikovFunction.txx
+++ b/Modules/Feature/Density/include/otbPointSetDensityEpanechnikovFunction.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbPointSetDensityEpanechnikovFunction_txx
-#define __otbPointSetDensityEpanechnikovFunction_txx
+#ifndef otbPointSetDensityEpanechnikovFunction_txx
+#define otbPointSetDensityEpanechnikovFunction_txx
 
 #include "otbPointSetDensityEpanechnikovFunction.h"
 #include "otbMath.h"
diff --git a/Modules/Feature/Density/include/otbPointSetDensityFunction.h b/Modules/Feature/Density/include/otbPointSetDensityFunction.h
index 0ed828941f..1cd07753d5 100644
--- a/Modules/Feature/Density/include/otbPointSetDensityFunction.h
+++ b/Modules/Feature/Density/include/otbPointSetDensityFunction.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbPointSetDensityFunction_h
-#define __otbPointSetDensityFunction_h
+#ifndef otbPointSetDensityFunction_h
+#define otbPointSetDensityFunction_h
 
 #include "otbPointSetFunction.h"
 
diff --git a/Modules/Feature/Density/include/otbPointSetDensityFunction.txx b/Modules/Feature/Density/include/otbPointSetDensityFunction.txx
index 8cf53d4786..d6aff829db 100644
--- a/Modules/Feature/Density/include/otbPointSetDensityFunction.txx
+++ b/Modules/Feature/Density/include/otbPointSetDensityFunction.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbPointSetDensityFunction_txx
-#define __otbPointSetDensityFunction_txx
+#ifndef otbPointSetDensityFunction_txx
+#define otbPointSetDensityFunction_txx
 
 #include "otbPointSetDensityFunction.h"
 #include "otbMath.h"
diff --git a/Modules/Feature/Density/include/otbPointSetDensityGaussianFunction.h b/Modules/Feature/Density/include/otbPointSetDensityGaussianFunction.h
index e6b84ffe1b..a9d1061f87 100644
--- a/Modules/Feature/Density/include/otbPointSetDensityGaussianFunction.h
+++ b/Modules/Feature/Density/include/otbPointSetDensityGaussianFunction.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbPointSetDensityGaussianFunction_h
-#define __otbPointSetDensityGaussianFunction_h
+#ifndef otbPointSetDensityGaussianFunction_h
+#define otbPointSetDensityGaussianFunction_h
 
 #include "otbPointSetFunction.h"
 #include "itkPoint.h"
diff --git a/Modules/Feature/Density/include/otbPointSetDensityGaussianFunction.txx b/Modules/Feature/Density/include/otbPointSetDensityGaussianFunction.txx
index c4de669a3c..423e465001 100644
--- a/Modules/Feature/Density/include/otbPointSetDensityGaussianFunction.txx
+++ b/Modules/Feature/Density/include/otbPointSetDensityGaussianFunction.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbPointSetDensityGaussianFunction_txx
-#define __otbPointSetDensityGaussianFunction_txx
+#ifndef otbPointSetDensityGaussianFunction_txx
+#define otbPointSetDensityGaussianFunction_txx
 
 #include "otbPointSetDensityGaussianFunction.h"
 #include "otbMath.h"
diff --git a/Modules/Feature/Density/include/otbPointSetToDensityImageFilter.h b/Modules/Feature/Density/include/otbPointSetToDensityImageFilter.h
index a24ef98346..d7ad151f9a 100644
--- a/Modules/Feature/Density/include/otbPointSetToDensityImageFilter.h
+++ b/Modules/Feature/Density/include/otbPointSetToDensityImageFilter.h
@@ -17,8 +17,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbPointSetToDensityImageFilter_h
-#define __otbPointSetToDensityImageFilter_h
+#ifndef otbPointSetToDensityImageFilter_h
+#define otbPointSetToDensityImageFilter_h
 
 #include "itkProcessObject.h"
 #include "itkPointSet.h"
diff --git a/Modules/Feature/Density/include/otbPointSetToDensityImageFilter.txx b/Modules/Feature/Density/include/otbPointSetToDensityImageFilter.txx
index 0f491f2422..6f62393352 100644
--- a/Modules/Feature/Density/include/otbPointSetToDensityImageFilter.txx
+++ b/Modules/Feature/Density/include/otbPointSetToDensityImageFilter.txx
@@ -17,8 +17,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbPointSetToDensityImageFilter_txx
-#define __otbPointSetToDensityImageFilter_txx
+#ifndef otbPointSetToDensityImageFilter_txx
+#define otbPointSetToDensityImageFilter_txx
 
 #include "otbPointSetToDensityImageFilter.h"
 #include "itkImageRegionIterator.h"
diff --git a/Modules/Feature/Descriptors/include/otbForwardFourierMellinTransformImageFilter.h b/Modules/Feature/Descriptors/include/otbForwardFourierMellinTransformImageFilter.h
index f099bc0ca4..7f267b7cdb 100644
--- a/Modules/Feature/Descriptors/include/otbForwardFourierMellinTransformImageFilter.h
+++ b/Modules/Feature/Descriptors/include/otbForwardFourierMellinTransformImageFilter.h
@@ -16,8 +16,8 @@
 
 =========================================================================*/
 
-#ifndef __otbForwardFourierMellinTransformImageFilter_h
-#define __otbForwardFourierMellinTransformImageFilter_h
+#ifndef otbForwardFourierMellinTransformImageFilter_h
+#define otbForwardFourierMellinTransformImageFilter_h
 
 #include "otbImage.h"
 #include "itkForwardFFTImageFilter.h"
diff --git a/Modules/Feature/Descriptors/include/otbForwardFourierMellinTransformImageFilter.txx b/Modules/Feature/Descriptors/include/otbForwardFourierMellinTransformImageFilter.txx
index c2f92e9295..9445ff2f27 100644
--- a/Modules/Feature/Descriptors/include/otbForwardFourierMellinTransformImageFilter.txx
+++ b/Modules/Feature/Descriptors/include/otbForwardFourierMellinTransformImageFilter.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbForwardFourierMellinTransformImageFilter_txx
-#define __otbForwardFourierMellinTransformImageFilter_txx
+#ifndef otbForwardFourierMellinTransformImageFilter_txx
+#define otbForwardFourierMellinTransformImageFilter_txx
 
 #include "otbForwardFourierMellinTransformImageFilter.h"
 #include "itkImageDuplicator.h"
diff --git a/Modules/Feature/Descriptors/include/otbFourierMellinDescriptorsImageFunction.h b/Modules/Feature/Descriptors/include/otbFourierMellinDescriptorsImageFunction.h
index e87dd53e1c..14b107c9c0 100644
--- a/Modules/Feature/Descriptors/include/otbFourierMellinDescriptorsImageFunction.h
+++ b/Modules/Feature/Descriptors/include/otbFourierMellinDescriptorsImageFunction.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbFourierMellinDescriptorsImageFunction_h
-#define __otbFourierMellinDescriptorsImageFunction_h
+#ifndef otbFourierMellinDescriptorsImageFunction_h
+#define otbFourierMellinDescriptorsImageFunction_h
 
 #include "itkImageFunction.h"
 
diff --git a/Modules/Feature/Descriptors/include/otbFourierMellinDescriptorsImageFunction.txx b/Modules/Feature/Descriptors/include/otbFourierMellinDescriptorsImageFunction.txx
index fe457666e1..9fc9bd0612 100644
--- a/Modules/Feature/Descriptors/include/otbFourierMellinDescriptorsImageFunction.txx
+++ b/Modules/Feature/Descriptors/include/otbFourierMellinDescriptorsImageFunction.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbFourierMellinDescriptorsImageFunction_txx
-#define __otbFourierMellinDescriptorsImageFunction_txx
+#ifndef otbFourierMellinDescriptorsImageFunction_txx
+#define otbFourierMellinDescriptorsImageFunction_txx
 
 #include "otbFourierMellinDescriptorsImageFunction.h"
 #include "itkConstNeighborhoodIterator.h"
diff --git a/Modules/Feature/Descriptors/include/otbHessianToScalarImageFilter.h b/Modules/Feature/Descriptors/include/otbHessianToScalarImageFilter.h
index c6b29d9e7d..b3645a8cce 100644
--- a/Modules/Feature/Descriptors/include/otbHessianToScalarImageFilter.h
+++ b/Modules/Feature/Descriptors/include/otbHessianToScalarImageFilter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbHessianToScalarImageFilter_h
-#define __otbHessianToScalarImageFilter_h
+#ifndef otbHessianToScalarImageFilter_h
+#define otbHessianToScalarImageFilter_h
 
 #include "itkUnaryFunctorImageFilter.h"
 
diff --git a/Modules/Feature/Descriptors/include/otbHistogramOfOrientedGradientCovariantImageFunction.h b/Modules/Feature/Descriptors/include/otbHistogramOfOrientedGradientCovariantImageFunction.h
index 945efd0de0..0fbcf8725b 100644
--- a/Modules/Feature/Descriptors/include/otbHistogramOfOrientedGradientCovariantImageFunction.h
+++ b/Modules/Feature/Descriptors/include/otbHistogramOfOrientedGradientCovariantImageFunction.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbHistogramOfOrientedGradientCovariantImageFunction_h
-#define __otbHistogramOfOrientedGradientCovariantImageFunction_h
+#ifndef otbHistogramOfOrientedGradientCovariantImageFunction_h
+#define otbHistogramOfOrientedGradientCovariantImageFunction_h
 
 #include "itkImageFunction.h"
 #include "itkFixedArray.h"
diff --git a/Modules/Feature/Descriptors/include/otbHistogramOfOrientedGradientCovariantImageFunction.txx b/Modules/Feature/Descriptors/include/otbHistogramOfOrientedGradientCovariantImageFunction.txx
index fbefccd429..7e344c53cf 100644
--- a/Modules/Feature/Descriptors/include/otbHistogramOfOrientedGradientCovariantImageFunction.txx
+++ b/Modules/Feature/Descriptors/include/otbHistogramOfOrientedGradientCovariantImageFunction.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbHistogramOfOrientedGradientCovariantImageFunction_txx
-#define __otbHistogramOfOrientedGradientCovariantImageFunction_txx
+#ifndef otbHistogramOfOrientedGradientCovariantImageFunction_txx
+#define otbHistogramOfOrientedGradientCovariantImageFunction_txx
 
 #include "otbHistogramOfOrientedGradientCovariantImageFunction.h"
 #include "itkConstNeighborhoodIterator.h"
diff --git a/Modules/Feature/Descriptors/include/otbImageToHessianDeterminantImageFilter.h b/Modules/Feature/Descriptors/include/otbImageToHessianDeterminantImageFilter.h
index 0729c4070c..4b844ac2ca 100644
--- a/Modules/Feature/Descriptors/include/otbImageToHessianDeterminantImageFilter.h
+++ b/Modules/Feature/Descriptors/include/otbImageToHessianDeterminantImageFilter.h
@@ -17,8 +17,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbImageToHessianDeterminantImageFilter_h
-#define __otbImageToHessianDeterminantImageFilter_h
+#ifndef otbImageToHessianDeterminantImageFilter_h
+#define otbImageToHessianDeterminantImageFilter_h
 
 #include "itkProcessObject.h"
 #include "itkImageToImageFilter.h"
diff --git a/Modules/Feature/Descriptors/include/otbImageToHessianDeterminantImageFilter.txx b/Modules/Feature/Descriptors/include/otbImageToHessianDeterminantImageFilter.txx
index 52740ff58c..3b1e4010f2 100644
--- a/Modules/Feature/Descriptors/include/otbImageToHessianDeterminantImageFilter.txx
+++ b/Modules/Feature/Descriptors/include/otbImageToHessianDeterminantImageFilter.txx
@@ -18,8 +18,8 @@
 
 =========================================================================*/
 
-#ifndef __otbImageToHessianDeterminantImageFilter_txx
-#define __otbImageToHessianDeterminantImageFilter_txx
+#ifndef otbImageToHessianDeterminantImageFilter_txx
+#define otbImageToHessianDeterminantImageFilter_txx
 
 #include "otbImageToHessianDeterminantImageFilter.h"
 
diff --git a/Modules/Feature/Descriptors/include/otbImageToSIFTKeyPointSetFilter.h b/Modules/Feature/Descriptors/include/otbImageToSIFTKeyPointSetFilter.h
index 02b84733a8..a93007c055 100644
--- a/Modules/Feature/Descriptors/include/otbImageToSIFTKeyPointSetFilter.h
+++ b/Modules/Feature/Descriptors/include/otbImageToSIFTKeyPointSetFilter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbImageToSIFTKeyPointSetFilter_h
-#define __otbImageToSIFTKeyPointSetFilter_h
+#ifndef otbImageToSIFTKeyPointSetFilter_h
+#define otbImageToSIFTKeyPointSetFilter_h
 
 #include <vector>
 
diff --git a/Modules/Feature/Descriptors/include/otbImageToSIFTKeyPointSetFilter.txx b/Modules/Feature/Descriptors/include/otbImageToSIFTKeyPointSetFilter.txx
index b59e23134a..91a67e0691 100644
--- a/Modules/Feature/Descriptors/include/otbImageToSIFTKeyPointSetFilter.txx
+++ b/Modules/Feature/Descriptors/include/otbImageToSIFTKeyPointSetFilter.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbImageToSIFTKeyPointSetFilter_txx
-#define __otbImageToSIFTKeyPointSetFilter_txx
+#ifndef otbImageToSIFTKeyPointSetFilter_txx
+#define otbImageToSIFTKeyPointSetFilter_txx
 
 #include "otbImageToSIFTKeyPointSetFilter.h"
 
diff --git a/Modules/Feature/Descriptors/include/otbImageToSURFKeyPointSetFilter.h b/Modules/Feature/Descriptors/include/otbImageToSURFKeyPointSetFilter.h
index 767ac99282..5805abc9ad 100644
--- a/Modules/Feature/Descriptors/include/otbImageToSURFKeyPointSetFilter.h
+++ b/Modules/Feature/Descriptors/include/otbImageToSURFKeyPointSetFilter.h
@@ -17,8 +17,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbImageToSURFKeyPointSetFilter_h
-#define __otbImageToSURFKeyPointSetFilter_h
+#ifndef otbImageToSURFKeyPointSetFilter_h
+#define otbImageToSURFKeyPointSetFilter_h
 
 #include "itkConstNeighborhoodIterator.h"
 #include "otbImageToHessianDeterminantImageFilter.h"
diff --git a/Modules/Feature/Descriptors/include/otbImageToSURFKeyPointSetFilter.txx b/Modules/Feature/Descriptors/include/otbImageToSURFKeyPointSetFilter.txx
index 87c264ec9a..f274b78da0 100644
--- a/Modules/Feature/Descriptors/include/otbImageToSURFKeyPointSetFilter.txx
+++ b/Modules/Feature/Descriptors/include/otbImageToSURFKeyPointSetFilter.txx
@@ -17,8 +17,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbImageToSURFKeyPointSetFilter_txx
-#define __otbImageToSURFKeyPointSetFilter_txx
+#ifndef otbImageToSURFKeyPointSetFilter_txx
+#define otbImageToSURFKeyPointSetFilter_txx
 
 #include "otbImageToSURFKeyPointSetFilter.h"
 #include "itkCenteredRigid2DTransform.h"
diff --git a/Modules/Feature/Descriptors/include/otbKeyPointSetsMatchingFilter.h b/Modules/Feature/Descriptors/include/otbKeyPointSetsMatchingFilter.h
index 55cc097c8d..9e656a483d 100644
--- a/Modules/Feature/Descriptors/include/otbKeyPointSetsMatchingFilter.h
+++ b/Modules/Feature/Descriptors/include/otbKeyPointSetsMatchingFilter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbKeyPointSetsMatchingFilter_h
-#define __otbKeyPointSetsMatchingFilter_h
+#ifndef otbKeyPointSetsMatchingFilter_h
+#define otbKeyPointSetsMatchingFilter_h
 
 #include "otbObjectListSource.h"
 #include "otbLandmark.h"
diff --git a/Modules/Feature/Descriptors/include/otbKeyPointSetsMatchingFilter.txx b/Modules/Feature/Descriptors/include/otbKeyPointSetsMatchingFilter.txx
index e4f0c3c132..ce00e79649 100644
--- a/Modules/Feature/Descriptors/include/otbKeyPointSetsMatchingFilter.txx
+++ b/Modules/Feature/Descriptors/include/otbKeyPointSetsMatchingFilter.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbKeyPointSetsMatchingFilter_txx
-#define __otbKeyPointSetsMatchingFilter_txx
+#ifndef otbKeyPointSetsMatchingFilter_txx
+#define otbKeyPointSetsMatchingFilter_txx
 
 #include "otbKeyPointSetsMatchingFilter.h"
 
diff --git a/Modules/Feature/Descriptors/include/otbLandmark.h b/Modules/Feature/Descriptors/include/otbLandmark.h
index b03f14cf66..f93d0c3839 100644
--- a/Modules/Feature/Descriptors/include/otbLandmark.h
+++ b/Modules/Feature/Descriptors/include/otbLandmark.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbLandmark_h
-#define __otbLandmark_h
+#ifndef otbLandmark_h
+#define otbLandmark_h
 
 #include "itkDataObject.h"
 #include "otbMacro.h"
diff --git a/Modules/Feature/Descriptors/include/otbSiftFastImageFilter.h b/Modules/Feature/Descriptors/include/otbSiftFastImageFilter.h
index 8ab518caf8..41062e2fc1 100644
--- a/Modules/Feature/Descriptors/include/otbSiftFastImageFilter.h
+++ b/Modules/Feature/Descriptors/include/otbSiftFastImageFilter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbSiftFastImageFilter_h
-#define __otbSiftFastImageFilter_h
+#ifndef otbSiftFastImageFilter_h
+#define otbSiftFastImageFilter_h
 
 #include "otbImageToPointSetFilter.h"
 #include "otbImage.h"
diff --git a/Modules/Feature/Descriptors/include/otbSiftFastImageFilter.txx b/Modules/Feature/Descriptors/include/otbSiftFastImageFilter.txx
index 8ec23f6143..e9bf2b5e4e 100644
--- a/Modules/Feature/Descriptors/include/otbSiftFastImageFilter.txx
+++ b/Modules/Feature/Descriptors/include/otbSiftFastImageFilter.txx
@@ -16,8 +16,8 @@
 
 =========================================================================*/
 
-#ifndef __otbSiftFastImageFilter_txx
-#define __otbSiftFastImageFilter_txx
+#ifndef otbSiftFastImageFilter_txx
+#define otbSiftFastImageFilter_txx
 
 #include "otbSiftFastImageFilter.h"
 
diff --git a/Modules/Feature/Edge/include/otbAssociativeSymmetricalSumImageFilter.h b/Modules/Feature/Edge/include/otbAssociativeSymmetricalSumImageFilter.h
index eb60a34461..f5d8714b00 100644
--- a/Modules/Feature/Edge/include/otbAssociativeSymmetricalSumImageFilter.h
+++ b/Modules/Feature/Edge/include/otbAssociativeSymmetricalSumImageFilter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbAssociativeSymmetricalSumImageFilter_h
-#define __otbAssociativeSymmetricalSumImageFilter_h
+#ifndef otbAssociativeSymmetricalSumImageFilter_h
+#define otbAssociativeSymmetricalSumImageFilter_h
 
 #include "itkBinaryFunctorImageFilter.h"
 
diff --git a/Modules/Feature/Edge/include/otbAssymmetricFusionOfLineDetectorImageFilter.h b/Modules/Feature/Edge/include/otbAssymmetricFusionOfLineDetectorImageFilter.h
index cab5398b5b..01b90d7862 100644
--- a/Modules/Feature/Edge/include/otbAssymmetricFusionOfLineDetectorImageFilter.h
+++ b/Modules/Feature/Edge/include/otbAssymmetricFusionOfLineDetectorImageFilter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbAssymmetricFusionOfLineDetectorImageFilter_h
-#define __otbAssymmetricFusionOfLineDetectorImageFilter_h
+#ifndef otbAssymmetricFusionOfLineDetectorImageFilter_h
+#define otbAssymmetricFusionOfLineDetectorImageFilter_h
 
 #include "itkImageToImageFilter.h"
 
diff --git a/Modules/Feature/Edge/include/otbAssymmetricFusionOfLineDetectorImageFilter.txx b/Modules/Feature/Edge/include/otbAssymmetricFusionOfLineDetectorImageFilter.txx
index 931a993d71..56e5a656b8 100644
--- a/Modules/Feature/Edge/include/otbAssymmetricFusionOfLineDetectorImageFilter.txx
+++ b/Modules/Feature/Edge/include/otbAssymmetricFusionOfLineDetectorImageFilter.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbAssymmetricFusionOfLineDetectorImageFilter_txx
-#define __otbAssymmetricFusionOfLineDetectorImageFilter_txx
+#ifndef otbAssymmetricFusionOfLineDetectorImageFilter_txx
+#define otbAssymmetricFusionOfLineDetectorImageFilter_txx
 
 #include "otbAssymmetricFusionOfLineDetectorImageFilter.h"
 
diff --git a/Modules/Feature/Edge/include/otbEdgeDensityImageFilter.h b/Modules/Feature/Edge/include/otbEdgeDensityImageFilter.h
index 17daef5c95..318f3546f0 100644
--- a/Modules/Feature/Edge/include/otbEdgeDensityImageFilter.h
+++ b/Modules/Feature/Edge/include/otbEdgeDensityImageFilter.h
@@ -17,8 +17,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbEdgeDensityImageFilter_h
-#define __otbEdgeDensityImageFilter_h
+#ifndef otbEdgeDensityImageFilter_h
+#define otbEdgeDensityImageFilter_h
 
 #include "otbBinaryImageToDensityImageFilter.h"
 #include "itkProcessObject.h"
diff --git a/Modules/Feature/Edge/include/otbEdgeDensityImageFilter.txx b/Modules/Feature/Edge/include/otbEdgeDensityImageFilter.txx
index 3726bd9a32..314e4959be 100644
--- a/Modules/Feature/Edge/include/otbEdgeDensityImageFilter.txx
+++ b/Modules/Feature/Edge/include/otbEdgeDensityImageFilter.txx
@@ -17,8 +17,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbEdgeDensityImageFilter_txx
-#define __otbEdgeDensityImageFilter_txx
+#ifndef otbEdgeDensityImageFilter_txx
+#define otbEdgeDensityImageFilter_txx
 
 #include "otbEdgeDensityImageFilter.h"
 
diff --git a/Modules/Feature/Edge/include/otbEdgeDetectorImageFilter.h b/Modules/Feature/Edge/include/otbEdgeDetectorImageFilter.h
index b869c4d990..7c0b090bc7 100644
--- a/Modules/Feature/Edge/include/otbEdgeDetectorImageFilter.h
+++ b/Modules/Feature/Edge/include/otbEdgeDetectorImageFilter.h
@@ -17,8 +17,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbEdgeDetectorImageFilter_h
-#define __otbEdgeDetectorImageFilter_h
+#ifndef otbEdgeDetectorImageFilter_h
+#define otbEdgeDetectorImageFilter_h
 
 #include "itkUnaryFunctorImageFilter.h"
 #include "itkImageToImageFilter.h"
diff --git a/Modules/Feature/Edge/include/otbEdgeDetectorImageFilter.txx b/Modules/Feature/Edge/include/otbEdgeDetectorImageFilter.txx
index 61d8135eda..2da68b0eb1 100644
--- a/Modules/Feature/Edge/include/otbEdgeDetectorImageFilter.txx
+++ b/Modules/Feature/Edge/include/otbEdgeDetectorImageFilter.txx
@@ -17,8 +17,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbEdgeDetectorImageFilter_txx
-#define __otbEdgeDetectorImageFilter_txx
+#ifndef otbEdgeDetectorImageFilter_txx
+#define otbEdgeDetectorImageFilter_txx
 
 #include "otbEdgeDetectorImageFilter.h"
 
diff --git a/Modules/Feature/Edge/include/otbExtractSegmentsImageFilter.h b/Modules/Feature/Edge/include/otbExtractSegmentsImageFilter.h
index 55884565d0..709f2f740e 100644
--- a/Modules/Feature/Edge/include/otbExtractSegmentsImageFilter.h
+++ b/Modules/Feature/Edge/include/otbExtractSegmentsImageFilter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbExtractSegmentsImageFilter_h
-#define __otbExtractSegmentsImageFilter_h
+#ifndef otbExtractSegmentsImageFilter_h
+#define otbExtractSegmentsImageFilter_h
 
 
 #include "otbPixelSuppressionByDirectionImageFilter.h"
diff --git a/Modules/Feature/Edge/include/otbExtractSegmentsImageFilter.txx b/Modules/Feature/Edge/include/otbExtractSegmentsImageFilter.txx
index 18d6146c7d..41e59cc3e5 100644
--- a/Modules/Feature/Edge/include/otbExtractSegmentsImageFilter.txx
+++ b/Modules/Feature/Edge/include/otbExtractSegmentsImageFilter.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbExtractSegmentsImageFilter_txx
-#define __otbExtractSegmentsImageFilter_txx
+#ifndef otbExtractSegmentsImageFilter_txx
+#define otbExtractSegmentsImageFilter_txx
 
 #include "otbExtractSegmentsImageFilter.h"
 
diff --git a/Modules/Feature/Edge/include/otbFillGapsFilter.h b/Modules/Feature/Edge/include/otbFillGapsFilter.h
index 0c96d2b21e..2041fecea0 100644
--- a/Modules/Feature/Edge/include/otbFillGapsFilter.h
+++ b/Modules/Feature/Edge/include/otbFillGapsFilter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbFillGapsFilter_h
-#define __otbFillGapsFilter_h
+#ifndef otbFillGapsFilter_h
+#define otbFillGapsFilter_h
 
 
 #include "itkProcessObject.h"
diff --git a/Modules/Feature/Edge/include/otbHorizontalSobelVectorImageFilter.h b/Modules/Feature/Edge/include/otbHorizontalSobelVectorImageFilter.h
index 3f5d32f21c..6788cf97ae 100644
--- a/Modules/Feature/Edge/include/otbHorizontalSobelVectorImageFilter.h
+++ b/Modules/Feature/Edge/include/otbHorizontalSobelVectorImageFilter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbHorizontalSobelVectorImageFilter_h
-#define __otbHorizontalSobelVectorImageFilter_h
+#ifndef otbHorizontalSobelVectorImageFilter_h
+#define otbHorizontalSobelVectorImageFilter_h
 
 #include "otbUnaryFunctorNeighborhoodVectorImageFilter.h"
 
@@ -98,4 +98,4 @@ private:
 } // end of namespace otb
 
 
-#endif // __otbHorizontalSobelVectorImageFilter_h
+#endif // otbHorizontalSobelVectorImageFilter_h
diff --git a/Modules/Feature/Edge/include/otbHoughTransform2DLinesImageFilter.h b/Modules/Feature/Edge/include/otbHoughTransform2DLinesImageFilter.h
index 3cb3f072ac..08814360e9 100644
--- a/Modules/Feature/Edge/include/otbHoughTransform2DLinesImageFilter.h
+++ b/Modules/Feature/Edge/include/otbHoughTransform2DLinesImageFilter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbHoughTransform2DLinesImageFilter_h
-#define __otbHoughTransform2DLinesImageFilter_h
+#ifndef otbHoughTransform2DLinesImageFilter_h
+#define otbHoughTransform2DLinesImageFilter_h
 
 
 #include "itkImageToImageFilter.h"
diff --git a/Modules/Feature/Edge/include/otbHoughTransform2DLinesImageFilter.txx b/Modules/Feature/Edge/include/otbHoughTransform2DLinesImageFilter.txx
index 8f1baac483..eefe6b3aa6 100644
--- a/Modules/Feature/Edge/include/otbHoughTransform2DLinesImageFilter.txx
+++ b/Modules/Feature/Edge/include/otbHoughTransform2DLinesImageFilter.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbHoughTransform2DLinesImageFilter_txx
-#define __otbHoughTransform2DLinesImageFilter_txx
+#ifndef otbHoughTransform2DLinesImageFilter_txx
+#define otbHoughTransform2DLinesImageFilter_txx
 
 #include "otbHoughTransform2DLinesImageFilter.h"
 #include "itkUnaryFunctorImageFilter.h"
diff --git a/Modules/Feature/Edge/include/otbLineCorrelationDetectorImageFilter.h b/Modules/Feature/Edge/include/otbLineCorrelationDetectorImageFilter.h
index 9a7768e9c1..569da730b0 100644
--- a/Modules/Feature/Edge/include/otbLineCorrelationDetectorImageFilter.h
+++ b/Modules/Feature/Edge/include/otbLineCorrelationDetectorImageFilter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbLineCorrelationDetectorImageFilter_h
-#define __otbLineCorrelationDetectorImageFilter_h
+#ifndef otbLineCorrelationDetectorImageFilter_h
+#define otbLineCorrelationDetectorImageFilter_h
 
 #include "otbLineDetectorImageFilterBase.h"
 
diff --git a/Modules/Feature/Edge/include/otbLineCorrelationDetectorImageFilter.txx b/Modules/Feature/Edge/include/otbLineCorrelationDetectorImageFilter.txx
index 8cab7d6e35..54968c4e6d 100644
--- a/Modules/Feature/Edge/include/otbLineCorrelationDetectorImageFilter.txx
+++ b/Modules/Feature/Edge/include/otbLineCorrelationDetectorImageFilter.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbLineCorrelationDetectorImageFilter_txx
-#define __otbLineCorrelationDetectorImageFilter_txx
+#ifndef otbLineCorrelationDetectorImageFilter_txx
+#define otbLineCorrelationDetectorImageFilter_txx
 
 #include "otbLineCorrelationDetectorImageFilter.h"
 
diff --git a/Modules/Feature/Edge/include/otbLineDetectorImageFilterBase.h b/Modules/Feature/Edge/include/otbLineDetectorImageFilterBase.h
index 3f8683a245..b97292eeea 100644
--- a/Modules/Feature/Edge/include/otbLineDetectorImageFilterBase.h
+++ b/Modules/Feature/Edge/include/otbLineDetectorImageFilterBase.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbLineDetectorImageFilterBase_h
-#define __otbLineDetectorImageFilterBase_h
+#ifndef otbLineDetectorImageFilterBase_h
+#define otbLineDetectorImageFilterBase_h
 
 #include "itkNearestNeighborInterpolateImageFunction.h"
 #include "itkLinearInterpolateImageFunction.h"
diff --git a/Modules/Feature/Edge/include/otbLineDetectorImageFilterBase.txx b/Modules/Feature/Edge/include/otbLineDetectorImageFilterBase.txx
index d53e7d5e22..e60a2c7246 100644
--- a/Modules/Feature/Edge/include/otbLineDetectorImageFilterBase.txx
+++ b/Modules/Feature/Edge/include/otbLineDetectorImageFilterBase.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbLineDetectorImageFilterBase_txx
-#define __otbLineDetectorImageFilterBase_txx
+#ifndef otbLineDetectorImageFilterBase_txx
+#define otbLineDetectorImageFilterBase_txx
 
 #include "otbLineDetectorImageFilterBase.h"
 
diff --git a/Modules/Feature/Edge/include/otbLineRatioDetectorImageFilter.h b/Modules/Feature/Edge/include/otbLineRatioDetectorImageFilter.h
index 1cd81fbea1..d66aa2f910 100644
--- a/Modules/Feature/Edge/include/otbLineRatioDetectorImageFilter.h
+++ b/Modules/Feature/Edge/include/otbLineRatioDetectorImageFilter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbLineRatioDetectorImageFilter_h
-#define __otbLineRatioDetectorImageFilter_h
+#ifndef otbLineRatioDetectorImageFilter_h
+#define otbLineRatioDetectorImageFilter_h
 
 #include "otbLineDetectorImageFilterBase.h"
 
diff --git a/Modules/Feature/Edge/include/otbLineRatioDetectorImageFilter.txx b/Modules/Feature/Edge/include/otbLineRatioDetectorImageFilter.txx
index 41715bdc3e..ade18d25ba 100644
--- a/Modules/Feature/Edge/include/otbLineRatioDetectorImageFilter.txx
+++ b/Modules/Feature/Edge/include/otbLineRatioDetectorImageFilter.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbLineRatioDetectorImageFilter_txx
-#define __otbLineRatioDetectorImageFilter_txx
+#ifndef otbLineRatioDetectorImageFilter_txx
+#define otbLineRatioDetectorImageFilter_txx
 
 #include "otbLineRatioDetectorImageFilter.h"
 #include "otbMacro.h"
diff --git a/Modules/Feature/Edge/include/otbLineSegmentDetector.h b/Modules/Feature/Edge/include/otbLineSegmentDetector.h
index 9b75da95b0..0edfde1bea 100644
--- a/Modules/Feature/Edge/include/otbLineSegmentDetector.h
+++ b/Modules/Feature/Edge/include/otbLineSegmentDetector.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbLineSegmentDetector_h
-#define __otbLineSegmentDetector_h
+#ifndef otbLineSegmentDetector_h
+#define otbLineSegmentDetector_h
 
 #include "otbImage.h"
 #include "otbVectorDataSource.h"
diff --git a/Modules/Feature/Edge/include/otbLineSegmentDetector.txx b/Modules/Feature/Edge/include/otbLineSegmentDetector.txx
index 3fa0bc5a90..f7c08df38c 100644
--- a/Modules/Feature/Edge/include/otbLineSegmentDetector.txx
+++ b/Modules/Feature/Edge/include/otbLineSegmentDetector.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbLineSegmentDetector_txx
-#define __otbLineSegmentDetector_txx
+#ifndef otbLineSegmentDetector_txx
+#define otbLineSegmentDetector_txx
 
 #include "otbLineSegmentDetector.h"
 #include "itkImageRegionIterator.h"
diff --git a/Modules/Feature/Edge/include/otbLocalHoughFilter.h b/Modules/Feature/Edge/include/otbLocalHoughFilter.h
index 23d574877d..79546f146b 100644
--- a/Modules/Feature/Edge/include/otbLocalHoughFilter.h
+++ b/Modules/Feature/Edge/include/otbLocalHoughFilter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbLocalHoughFilter_h
-#define __otbLocalHoughFilter_h
+#ifndef otbLocalHoughFilter_h
+#define otbLocalHoughFilter_h
 
 #include "itkUnaryFunctorImageFilter.h"
 #include "itkHoughTransform2DLinesImageFilter.h"
diff --git a/Modules/Feature/Edge/include/otbLocalHoughFilter.txx b/Modules/Feature/Edge/include/otbLocalHoughFilter.txx
index 830d82f139..6e2430c3e8 100644
--- a/Modules/Feature/Edge/include/otbLocalHoughFilter.txx
+++ b/Modules/Feature/Edge/include/otbLocalHoughFilter.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbLocalHoughFilter_txx
-#define __otbLocalHoughFilter_txx
+#ifndef otbLocalHoughFilter_txx
+#define otbLocalHoughFilter_txx
 
 #include "otbLocalHoughFilter.h"
 #include "otbImage.h"
diff --git a/Modules/Feature/Edge/include/otbPersistentVectorizationImageFilter.h b/Modules/Feature/Edge/include/otbPersistentVectorizationImageFilter.h
index 3a39c37f5a..78e311febb 100644
--- a/Modules/Feature/Edge/include/otbPersistentVectorizationImageFilter.h
+++ b/Modules/Feature/Edge/include/otbPersistentVectorizationImageFilter.h
@@ -18,8 +18,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbPersistentVectorizationImageFilter_h
-#define __otbPersistentVectorizationImageFilter_h
+#ifndef otbPersistentVectorizationImageFilter_h
+#define otbPersistentVectorizationImageFilter_h
 
 #include "otbPersistentImageFilter.h"
 
diff --git a/Modules/Feature/Edge/include/otbPersistentVectorizationImageFilter.txx b/Modules/Feature/Edge/include/otbPersistentVectorizationImageFilter.txx
index 07b00d0675..d9b10cada5 100644
--- a/Modules/Feature/Edge/include/otbPersistentVectorizationImageFilter.txx
+++ b/Modules/Feature/Edge/include/otbPersistentVectorizationImageFilter.txx
@@ -18,8 +18,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbPersistentVectorizationImageFilter_txx
-#define __otbPersistentVectorizationImageFilter_txx
+#ifndef otbPersistentVectorizationImageFilter_txx
+#define otbPersistentVectorizationImageFilter_txx
 
 #include "otbPersistentVectorizationImageFilter.h"
 
diff --git a/Modules/Feature/Edge/include/otbPixelSuppressionByDirectionImageFilter.h b/Modules/Feature/Edge/include/otbPixelSuppressionByDirectionImageFilter.h
index ba905db84c..e8c63bc4cb 100644
--- a/Modules/Feature/Edge/include/otbPixelSuppressionByDirectionImageFilter.h
+++ b/Modules/Feature/Edge/include/otbPixelSuppressionByDirectionImageFilter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbPixelSuppressionByDirectionImageFilter_h
-#define __otbPixelSuppressionByDirectionImageFilter_h
+#ifndef otbPixelSuppressionByDirectionImageFilter_h
+#define otbPixelSuppressionByDirectionImageFilter_h
 
 #include "itkImageToImageFilter.h"
 #include "itkImage.h"
diff --git a/Modules/Feature/Edge/include/otbPixelSuppressionByDirectionImageFilter.txx b/Modules/Feature/Edge/include/otbPixelSuppressionByDirectionImageFilter.txx
index b617bdb3b3..aa453b206f 100644
--- a/Modules/Feature/Edge/include/otbPixelSuppressionByDirectionImageFilter.txx
+++ b/Modules/Feature/Edge/include/otbPixelSuppressionByDirectionImageFilter.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbPixelSuppressionByDirectionImageFilter_txx
-#define __otbPixelSuppressionByDirectionImageFilter_txx
+#ifndef otbPixelSuppressionByDirectionImageFilter_txx
+#define otbPixelSuppressionByDirectionImageFilter_txx
 
 #include "otbPixelSuppressionByDirectionImageFilter.h"
 
diff --git a/Modules/Feature/Edge/include/otbSobelVectorImageFilter.h b/Modules/Feature/Edge/include/otbSobelVectorImageFilter.h
index ae8cdff5bb..aac4016ae6 100644
--- a/Modules/Feature/Edge/include/otbSobelVectorImageFilter.h
+++ b/Modules/Feature/Edge/include/otbSobelVectorImageFilter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbSobelVectorImageFilter_h
-#define __otbSobelVectorImageFilter_h
+#ifndef otbSobelVectorImageFilter_h
+#define otbSobelVectorImageFilter_h
 
 #include "otbUnaryFunctorNeighborhoodVectorImageFilter.h"
 
@@ -107,4 +107,4 @@ private:
 } // end of namespace otb
 
 
-#endif // __otbSobelVectorImageFilter_h
+#endif // otbSobelVectorImageFilter_h
diff --git a/Modules/Feature/Edge/include/otbStreamingLineSegmentDetector.h b/Modules/Feature/Edge/include/otbStreamingLineSegmentDetector.h
index 314caf2c54..0ea09e3b77 100644
--- a/Modules/Feature/Edge/include/otbStreamingLineSegmentDetector.h
+++ b/Modules/Feature/Edge/include/otbStreamingLineSegmentDetector.h
@@ -18,8 +18,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbStreamingLineSegmentDetector_h
-#define __otbStreamingLineSegmentDetector_h
+#ifndef otbStreamingLineSegmentDetector_h
+#define otbStreamingLineSegmentDetector_h
 
 #include <vector>
 
diff --git a/Modules/Feature/Edge/include/otbStreamingLineSegmentDetector.txx b/Modules/Feature/Edge/include/otbStreamingLineSegmentDetector.txx
index ff9a1a7d48..c9d4abf782 100644
--- a/Modules/Feature/Edge/include/otbStreamingLineSegmentDetector.txx
+++ b/Modules/Feature/Edge/include/otbStreamingLineSegmentDetector.txx
@@ -18,8 +18,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbStreamingLineSegmentDetector_txx
-#define __otbStreamingLineSegmentDetector_txx
+#ifndef otbStreamingLineSegmentDetector_txx
+#define otbStreamingLineSegmentDetector_txx
 
 #include "otbStreamingLineSegmentDetector.h"
 
diff --git a/Modules/Feature/Edge/include/otbTouziEdgeDetectorImageFilter.h b/Modules/Feature/Edge/include/otbTouziEdgeDetectorImageFilter.h
index b71c195b0e..1cabe791fb 100644
--- a/Modules/Feature/Edge/include/otbTouziEdgeDetectorImageFilter.h
+++ b/Modules/Feature/Edge/include/otbTouziEdgeDetectorImageFilter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbTouziEdgeDetectorImageFilter_h
-#define __otbTouziEdgeDetectorImageFilter_h
+#ifndef otbTouziEdgeDetectorImageFilter_h
+#define otbTouziEdgeDetectorImageFilter_h
 
 #include "otbImageToModulusAndDirectionImageFilter.h"
 #include "otbImage.h"
diff --git a/Modules/Feature/Edge/include/otbTouziEdgeDetectorImageFilter.txx b/Modules/Feature/Edge/include/otbTouziEdgeDetectorImageFilter.txx
index 5fb8cf880d..c93ffb50be 100644
--- a/Modules/Feature/Edge/include/otbTouziEdgeDetectorImageFilter.txx
+++ b/Modules/Feature/Edge/include/otbTouziEdgeDetectorImageFilter.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbTouziEdgeDetectorImageFilter_txx
-#define __otbTouziEdgeDetectorImageFilter_txx
+#ifndef otbTouziEdgeDetectorImageFilter_txx
+#define otbTouziEdgeDetectorImageFilter_txx
 
 #include "otbTouziEdgeDetectorImageFilter.h"
 
diff --git a/Modules/Feature/Edge/include/otbVerticalSobelVectorImageFilter.h b/Modules/Feature/Edge/include/otbVerticalSobelVectorImageFilter.h
index 4658981d5e..db5f3167b0 100644
--- a/Modules/Feature/Edge/include/otbVerticalSobelVectorImageFilter.h
+++ b/Modules/Feature/Edge/include/otbVerticalSobelVectorImageFilter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbVerticalSobelVectorImageFilter_h
-#define __otbVerticalSobelVectorImageFilter_h
+#ifndef otbVerticalSobelVectorImageFilter_h
+#define otbVerticalSobelVectorImageFilter_h
 
 #include "otbUnaryFunctorNeighborhoodVectorImageFilter.h"
 
@@ -98,4 +98,4 @@ private:
 } // end of namespace otb
 
 
-#endif // __otbVerticalSobelVectorImageFilter_h
+#endif // otbVerticalSobelVectorImageFilter_h
diff --git a/Modules/Feature/Moments/include/otbComplexMomentPathFunction.h b/Modules/Feature/Moments/include/otbComplexMomentPathFunction.h
index a2617918c8..671b12813f 100644
--- a/Modules/Feature/Moments/include/otbComplexMomentPathFunction.h
+++ b/Modules/Feature/Moments/include/otbComplexMomentPathFunction.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbComplexMomentPathFunction_h
-#define __otbComplexMomentPathFunction_h
+#ifndef otbComplexMomentPathFunction_h
+#define otbComplexMomentPathFunction_h
 
 #include "otbGeometricMomentPathFunction.h"
 #include "itkVectorContainer.h"
diff --git a/Modules/Feature/Moments/include/otbComplexMomentPathFunction.txx b/Modules/Feature/Moments/include/otbComplexMomentPathFunction.txx
index 52d381ab88..1bbf4fef5e 100644
--- a/Modules/Feature/Moments/include/otbComplexMomentPathFunction.txx
+++ b/Modules/Feature/Moments/include/otbComplexMomentPathFunction.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbComplexMomentPathFunction_txx
-#define __otbComplexMomentPathFunction_txx
+#ifndef otbComplexMomentPathFunction_txx
+#define otbComplexMomentPathFunction_txx
 
 #include "otbComplexMomentPathFunction.h"
 #include "itkImageRegionIterator.h"
diff --git a/Modules/Feature/Moments/include/otbComplexMomentsImageFunction.h b/Modules/Feature/Moments/include/otbComplexMomentsImageFunction.h
index e64cf226aa..d9b2e9da38 100644
--- a/Modules/Feature/Moments/include/otbComplexMomentsImageFunction.h
+++ b/Modules/Feature/Moments/include/otbComplexMomentsImageFunction.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbComplexMomentsImageFunction_h
-#define __otbComplexMomentsImageFunction_h
+#ifndef otbComplexMomentsImageFunction_h
+#define otbComplexMomentsImageFunction_h
 
 #include "itkImageFunction.h"
 
diff --git a/Modules/Feature/Moments/include/otbComplexMomentsImageFunction.txx b/Modules/Feature/Moments/include/otbComplexMomentsImageFunction.txx
index 019834ab9a..87a6c081c1 100644
--- a/Modules/Feature/Moments/include/otbComplexMomentsImageFunction.txx
+++ b/Modules/Feature/Moments/include/otbComplexMomentsImageFunction.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbComplexMomentsImageFunction_txx
-#define __otbComplexMomentsImageFunction_txx
+#ifndef otbComplexMomentsImageFunction_txx
+#define otbComplexMomentsImageFunction_txx
 
 #include "otbComplexMomentsImageFunction.h"
 #include "itkConstNeighborhoodIterator.h"
diff --git a/Modules/Feature/Moments/include/otbFlusserMomentsImageFunction.h b/Modules/Feature/Moments/include/otbFlusserMomentsImageFunction.h
index 7eca9a58e2..9049796fab 100644
--- a/Modules/Feature/Moments/include/otbFlusserMomentsImageFunction.h
+++ b/Modules/Feature/Moments/include/otbFlusserMomentsImageFunction.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbFlusserMomentsImageFunction_h
-#define __otbFlusserMomentsImageFunction_h
+#ifndef otbFlusserMomentsImageFunction_h
+#define otbFlusserMomentsImageFunction_h
 
 #include "itkImageFunction.h"
 #include "itkFixedArray.h"
diff --git a/Modules/Feature/Moments/include/otbFlusserMomentsImageFunction.txx b/Modules/Feature/Moments/include/otbFlusserMomentsImageFunction.txx
index e96c00ae2b..6ae90ae9da 100644
--- a/Modules/Feature/Moments/include/otbFlusserMomentsImageFunction.txx
+++ b/Modules/Feature/Moments/include/otbFlusserMomentsImageFunction.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbFlusserMomentsImageFunction_txx
-#define __otbFlusserMomentsImageFunction_txx
+#ifndef otbFlusserMomentsImageFunction_txx
+#define otbFlusserMomentsImageFunction_txx
 
 #include "otbFlusserMomentsImageFunction.h"
 #include "itkConstNeighborhoodIterator.h"
diff --git a/Modules/Feature/Moments/include/otbFlusserPathFunction.h b/Modules/Feature/Moments/include/otbFlusserPathFunction.h
index 0e62c0345a..c471f578c7 100644
--- a/Modules/Feature/Moments/include/otbFlusserPathFunction.h
+++ b/Modules/Feature/Moments/include/otbFlusserPathFunction.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbFlusserPathFunction_h
-#define __otbFlusserPathFunction_h
+#ifndef otbFlusserPathFunction_h
+#define otbFlusserPathFunction_h
 
 #include "otbRealMomentPathFunction.h"
 
diff --git a/Modules/Feature/Moments/include/otbFlusserPathFunction.txx b/Modules/Feature/Moments/include/otbFlusserPathFunction.txx
index 328aef48db..ae63ee887b 100644
--- a/Modules/Feature/Moments/include/otbFlusserPathFunction.txx
+++ b/Modules/Feature/Moments/include/otbFlusserPathFunction.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbFlusserPathFunction_txx
-#define __otbFlusserPathFunction_txx
+#ifndef otbFlusserPathFunction_txx
+#define otbFlusserPathFunction_txx
 
 #include "otbFlusserPathFunction.h"
 #include "otbComplexMomentPathFunction.h"
diff --git a/Modules/Feature/Moments/include/otbGeometricMomentPathFunction.h b/Modules/Feature/Moments/include/otbGeometricMomentPathFunction.h
index 780caa9b96..7701a062f7 100644
--- a/Modules/Feature/Moments/include/otbGeometricMomentPathFunction.h
+++ b/Modules/Feature/Moments/include/otbGeometricMomentPathFunction.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbGeometricMomentPathFunction_h
-#define __otbGeometricMomentPathFunction_h
+#ifndef otbGeometricMomentPathFunction_h
+#define otbGeometricMomentPathFunction_h
 
 #include "otbPathFunction.h"
 
diff --git a/Modules/Feature/Moments/include/otbHuMomentsImageFunction.h b/Modules/Feature/Moments/include/otbHuMomentsImageFunction.h
index 9fabcf122f..fcf4962da4 100644
--- a/Modules/Feature/Moments/include/otbHuMomentsImageFunction.h
+++ b/Modules/Feature/Moments/include/otbHuMomentsImageFunction.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbHuMomentsImageFunction_h
-#define __otbHuMomentsImageFunction_h
+#ifndef otbHuMomentsImageFunction_h
+#define otbHuMomentsImageFunction_h
 
 #include "itkImageFunction.h"
 #include "itkFixedArray.h"
diff --git a/Modules/Feature/Moments/include/otbHuMomentsImageFunction.txx b/Modules/Feature/Moments/include/otbHuMomentsImageFunction.txx
index c7668f1626..8be5f71932 100644
--- a/Modules/Feature/Moments/include/otbHuMomentsImageFunction.txx
+++ b/Modules/Feature/Moments/include/otbHuMomentsImageFunction.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbHuMomentsImageFunction_txx
-#define __otbHuMomentsImageFunction_txx
+#ifndef otbHuMomentsImageFunction_txx
+#define otbHuMomentsImageFunction_txx
 
 #include "otbHuMomentsImageFunction.h"
 #include "itkConstNeighborhoodIterator.h"
diff --git a/Modules/Feature/Moments/include/otbHuPathFunction.h b/Modules/Feature/Moments/include/otbHuPathFunction.h
index 4babb0ba74..9bdc25b0d5 100644
--- a/Modules/Feature/Moments/include/otbHuPathFunction.h
+++ b/Modules/Feature/Moments/include/otbHuPathFunction.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbHuPathFunction_h
-#define __otbHuPathFunction_h
+#ifndef otbHuPathFunction_h
+#define otbHuPathFunction_h
 
 #include "otbRealMomentPathFunction.h"
 
diff --git a/Modules/Feature/Moments/include/otbHuPathFunction.txx b/Modules/Feature/Moments/include/otbHuPathFunction.txx
index 1d9d5856d1..e3753f84f2 100644
--- a/Modules/Feature/Moments/include/otbHuPathFunction.txx
+++ b/Modules/Feature/Moments/include/otbHuPathFunction.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbHuPathFunction_txx
-#define __otbHuPathFunction_txx
+#ifndef otbHuPathFunction_txx
+#define otbHuPathFunction_txx
 
 #include "otbHuPathFunction.h"
 #include "otbComplexMomentPathFunction.h"
diff --git a/Modules/Feature/Moments/include/otbRadiometricMomentsFunctor.h b/Modules/Feature/Moments/include/otbRadiometricMomentsFunctor.h
index 3f29154a7d..666e95a9bb 100644
--- a/Modules/Feature/Moments/include/otbRadiometricMomentsFunctor.h
+++ b/Modules/Feature/Moments/include/otbRadiometricMomentsFunctor.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbRadiometricMomentsFunctor_h
-#define __otbRadiometricMomentsFunctor_h
+#ifndef otbRadiometricMomentsFunctor_h
+#define otbRadiometricMomentsFunctor_h
 
 #include "itkVariableLengthVector.h"
 #include "otbMath.h"
diff --git a/Modules/Feature/Moments/include/otbRadiometricMomentsImageFilter.h b/Modules/Feature/Moments/include/otbRadiometricMomentsImageFilter.h
index 2af2991273..8b718f7997 100644
--- a/Modules/Feature/Moments/include/otbRadiometricMomentsImageFilter.h
+++ b/Modules/Feature/Moments/include/otbRadiometricMomentsImageFilter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbRadiometricMomentsImageFilter_h
-#define __otbRadiometricMomentsImageFilter_h
+#ifndef otbRadiometricMomentsImageFilter_h
+#define otbRadiometricMomentsImageFilter_h
 
 #include "itkImageToImageFilter.h"
 #include "otbRadiometricMomentsFunctor.h"
diff --git a/Modules/Feature/Moments/include/otbRadiometricMomentsImageFilter.txx b/Modules/Feature/Moments/include/otbRadiometricMomentsImageFilter.txx
index 5748808936..6d8798b7e7 100644
--- a/Modules/Feature/Moments/include/otbRadiometricMomentsImageFilter.txx
+++ b/Modules/Feature/Moments/include/otbRadiometricMomentsImageFilter.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbRadiometricMomentsImageFilter_txx
-#define __otbRadiometricMomentsImageFilter_txx
+#ifndef otbRadiometricMomentsImageFilter_txx
+#define otbRadiometricMomentsImageFilter_txx
 
 #include "otbRadiometricMomentsImageFilter.h"
 #include "itkImageRegionIterator.h"
diff --git a/Modules/Feature/Moments/include/otbRadiometricMomentsImageFunction.h b/Modules/Feature/Moments/include/otbRadiometricMomentsImageFunction.h
index 96d8190449..58634e23f7 100644
--- a/Modules/Feature/Moments/include/otbRadiometricMomentsImageFunction.h
+++ b/Modules/Feature/Moments/include/otbRadiometricMomentsImageFunction.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbRadiometricMomentsImageFunction_h
-#define __otbRadiometricMomentsImageFunction_h
+#ifndef otbRadiometricMomentsImageFunction_h
+#define otbRadiometricMomentsImageFunction_h
 
 #include "itkImageFunction.h"
 #include "otbRadiometricMomentsFunctor.h"
diff --git a/Modules/Feature/Moments/include/otbRadiometricMomentsImageFunction.txx b/Modules/Feature/Moments/include/otbRadiometricMomentsImageFunction.txx
index 5d0b44bf9f..8983ddf6b9 100644
--- a/Modules/Feature/Moments/include/otbRadiometricMomentsImageFunction.txx
+++ b/Modules/Feature/Moments/include/otbRadiometricMomentsImageFunction.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbRadiometricMomentsImageFunction_txx
-#define __otbRadiometricMomentsImageFunction_txx
+#ifndef otbRadiometricMomentsImageFunction_txx
+#define otbRadiometricMomentsImageFunction_txx
 
 #include "otbRadiometricMomentsImageFunction.h"
 #include "itkMacro.h"
diff --git a/Modules/Feature/Moments/include/otbRealMomentPathFunction.h b/Modules/Feature/Moments/include/otbRealMomentPathFunction.h
index 394e380386..204bdf8bfb 100644
--- a/Modules/Feature/Moments/include/otbRealMomentPathFunction.h
+++ b/Modules/Feature/Moments/include/otbRealMomentPathFunction.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbRealMomentPathFunction_h
-#define __otbRealMomentPathFunction_h
+#ifndef otbRealMomentPathFunction_h
+#define otbRealMomentPathFunction_h
 
 #include "otbGeometricMomentPathFunction.h"
 #include "itkVectorContainer.h"
diff --git a/Modules/Feature/Moments/include/otbRealMomentsImageFunction.h b/Modules/Feature/Moments/include/otbRealMomentsImageFunction.h
index dff792afa6..64d54107e6 100644
--- a/Modules/Feature/Moments/include/otbRealMomentsImageFunction.h
+++ b/Modules/Feature/Moments/include/otbRealMomentsImageFunction.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbRealMomentsImageFunction_h
-#define __otbRealMomentsImageFunction_h
+#ifndef otbRealMomentsImageFunction_h
+#define otbRealMomentsImageFunction_h
 
 #include "itkImageFunction.h"
 
diff --git a/Modules/Feature/Moments/include/otbRealMomentsImageFunction.txx b/Modules/Feature/Moments/include/otbRealMomentsImageFunction.txx
index cc2966b052..ed29827f25 100644
--- a/Modules/Feature/Moments/include/otbRealMomentsImageFunction.txx
+++ b/Modules/Feature/Moments/include/otbRealMomentsImageFunction.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbRealMomentsImageFunction_txx
-#define __otbRealMomentsImageFunction_txx
+#ifndef otbRealMomentsImageFunction_txx
+#define otbRealMomentsImageFunction_txx
 
 #include "otbRealMomentsImageFunction.h"
 #include "itkConstNeighborhoodIterator.h"
diff --git a/Modules/Feature/SeamCarving/include/otbAddCarvingPathFilter.h b/Modules/Feature/SeamCarving/include/otbAddCarvingPathFilter.h
index 4a6e9ddc65..a961fc11b6 100644
--- a/Modules/Feature/SeamCarving/include/otbAddCarvingPathFilter.h
+++ b/Modules/Feature/SeamCarving/include/otbAddCarvingPathFilter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbAddCarvingPathFilter_h
-#define __otbAddCarvingPathFilter_h
+#ifndef otbAddCarvingPathFilter_h
+#define otbAddCarvingPathFilter_h
 
 #include "itkImageAndPathToImageFilter.h"
 #include "itkImageSliceIteratorWithIndex.h"
diff --git a/Modules/Feature/SeamCarving/include/otbAddCarvingPathFilter.txx b/Modules/Feature/SeamCarving/include/otbAddCarvingPathFilter.txx
index 8b1724c69f..5ea7356a10 100644
--- a/Modules/Feature/SeamCarving/include/otbAddCarvingPathFilter.txx
+++ b/Modules/Feature/SeamCarving/include/otbAddCarvingPathFilter.txx
@@ -16,8 +16,8 @@
 
 =========================================================================*/
 
-#ifndef __otbAddCarvingPathFilter_txx
-#define __otbAddCarvingPathFilter_txx
+#ifndef otbAddCarvingPathFilter_txx
+#define otbAddCarvingPathFilter_txx
 
 #include "otbAddCarvingPathFilter.h"
 #include "itkMacro.h"
diff --git a/Modules/Feature/SeamCarving/include/otbImageToCarvingPathFilter.h b/Modules/Feature/SeamCarving/include/otbImageToCarvingPathFilter.h
index 4808cce3f3..17a7219480 100644
--- a/Modules/Feature/SeamCarving/include/otbImageToCarvingPathFilter.h
+++ b/Modules/Feature/SeamCarving/include/otbImageToCarvingPathFilter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbImageToCarvingPathFilter_h
-#define __otbImageToCarvingPathFilter_h
+#ifndef otbImageToCarvingPathFilter_h
+#define otbImageToCarvingPathFilter_h
 
 #include "otbImageToPathFilter.h"
 #include "itkImageSliceConstIteratorWithIndex.h"
diff --git a/Modules/Feature/SeamCarving/include/otbImageToCarvingPathFilter.txx b/Modules/Feature/SeamCarving/include/otbImageToCarvingPathFilter.txx
index e7b4d748c6..64e15c4dd4 100644
--- a/Modules/Feature/SeamCarving/include/otbImageToCarvingPathFilter.txx
+++ b/Modules/Feature/SeamCarving/include/otbImageToCarvingPathFilter.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbImageToCarvingPathFilter_txx
-#define __otbImageToCarvingPathFilter_txx
+#ifndef otbImageToCarvingPathFilter_txx
+#define otbImageToCarvingPathFilter_txx
 
 #include "otbImageToCarvingPathFilter.h"
 #include "otbMacro.h"
diff --git a/Modules/Feature/SeamCarving/include/otbRemoveCarvingPathFilter.h b/Modules/Feature/SeamCarving/include/otbRemoveCarvingPathFilter.h
index ffa392786f..e5b870163f 100644
--- a/Modules/Feature/SeamCarving/include/otbRemoveCarvingPathFilter.h
+++ b/Modules/Feature/SeamCarving/include/otbRemoveCarvingPathFilter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbRemoveCarvingPathFilter_h
-#define __otbRemoveCarvingPathFilter_h
+#ifndef otbRemoveCarvingPathFilter_h
+#define otbRemoveCarvingPathFilter_h
 
 #include "itkImageAndPathToImageFilter.h"
 #include "itkImageSliceIteratorWithIndex.h"
diff --git a/Modules/Feature/SeamCarving/include/otbRemoveCarvingPathFilter.txx b/Modules/Feature/SeamCarving/include/otbRemoveCarvingPathFilter.txx
index 026319e2fc..d8b0f9df3d 100644
--- a/Modules/Feature/SeamCarving/include/otbRemoveCarvingPathFilter.txx
+++ b/Modules/Feature/SeamCarving/include/otbRemoveCarvingPathFilter.txx
@@ -16,8 +16,8 @@
 
 =========================================================================*/
 
-#ifndef __otbRemoveCarvingPathFilter_txx
-#define __otbRemoveCarvingPathFilter_txx
+#ifndef otbRemoveCarvingPathFilter_txx
+#define otbRemoveCarvingPathFilter_txx
 
 #include "otbRemoveCarvingPathFilter.h"
 #include "itkMacro.h"
diff --git a/Modules/Feature/Textures/include/otbGreyLevelCooccurrenceIndexedList.h b/Modules/Feature/Textures/include/otbGreyLevelCooccurrenceIndexedList.h
index ec4e0b1c88..7c030567d5 100644
--- a/Modules/Feature/Textures/include/otbGreyLevelCooccurrenceIndexedList.h
+++ b/Modules/Feature/Textures/include/otbGreyLevelCooccurrenceIndexedList.h
@@ -16,8 +16,8 @@ PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
 
-#ifndef __otbGreyLevelCooccurrenceIndexedList_h
-#define __otbGreyLevelCooccurrenceIndexedList_h
+#ifndef otbGreyLevelCooccurrenceIndexedList_h
+#define otbGreyLevelCooccurrenceIndexedList_h
 
 #include "itkNumericTraits.h"
 #include "itkObjectFactory.h"
diff --git a/Modules/Feature/Textures/include/otbGreyLevelCooccurrenceIndexedList.txx b/Modules/Feature/Textures/include/otbGreyLevelCooccurrenceIndexedList.txx
index 07b1e5c37d..8738d5f7f8 100644
--- a/Modules/Feature/Textures/include/otbGreyLevelCooccurrenceIndexedList.txx
+++ b/Modules/Feature/Textures/include/otbGreyLevelCooccurrenceIndexedList.txx
@@ -16,8 +16,8 @@ PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
 
-#ifndef __otbGreyLevelCooccurrenceIndexedList_txx
-#define __otbGreyLevelCooccurrenceIndexedList_txx
+#ifndef otbGreyLevelCooccurrenceIndexedList_txx
+#define otbGreyLevelCooccurrenceIndexedList_txx
 
 #include "otbGreyLevelCooccurrenceIndexedList.h"
 
diff --git a/Modules/Feature/Textures/include/otbHaralickTexturesImageFunction.h b/Modules/Feature/Textures/include/otbHaralickTexturesImageFunction.h
index cff67f6313..8ce63a7146 100644
--- a/Modules/Feature/Textures/include/otbHaralickTexturesImageFunction.h
+++ b/Modules/Feature/Textures/include/otbHaralickTexturesImageFunction.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbHaralickTexturesImageFunction_h
-#define __otbHaralickTexturesImageFunction_h
+#ifndef otbHaralickTexturesImageFunction_h
+#define otbHaralickTexturesImageFunction_h
 
 #include "otbGreyLevelCooccurrenceIndexedList.h"
 #include "itkImageToImageFilter.h"
diff --git a/Modules/Feature/Textures/include/otbHaralickTexturesImageFunction.txx b/Modules/Feature/Textures/include/otbHaralickTexturesImageFunction.txx
index 63a06d3afa..f88081c9b8 100644
--- a/Modules/Feature/Textures/include/otbHaralickTexturesImageFunction.txx
+++ b/Modules/Feature/Textures/include/otbHaralickTexturesImageFunction.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbHaralickTexturesImageFunction_txx
-#define __otbHaralickTexturesImageFunction_txx
+#ifndef otbHaralickTexturesImageFunction_txx
+#define otbHaralickTexturesImageFunction_txx
 
 #include "otbHaralickTexturesImageFunction.h"
 #include "itkImageRegionIteratorWithIndex.h"
diff --git a/Modules/Feature/Textures/include/otbSFSTexturesFunctor.h b/Modules/Feature/Textures/include/otbSFSTexturesFunctor.h
index 8ab7ab1b43..335d22e8f6 100644
--- a/Modules/Feature/Textures/include/otbSFSTexturesFunctor.h
+++ b/Modules/Feature/Textures/include/otbSFSTexturesFunctor.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbSFSTexturesFunctor_h
-#define __otbSFSTexturesFunctor_h
+#ifndef otbSFSTexturesFunctor_h
+#define otbSFSTexturesFunctor_h
 
 #include "otbMath.h"
 #include "itkNumericTraits.h"
diff --git a/Modules/Feature/Textures/include/otbSFSTexturesImageFilter.h b/Modules/Feature/Textures/include/otbSFSTexturesImageFilter.h
index b4fe36b41a..e90caecb1b 100644
--- a/Modules/Feature/Textures/include/otbSFSTexturesImageFilter.h
+++ b/Modules/Feature/Textures/include/otbSFSTexturesImageFilter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbSFSTexturesImageFilter_h
-#define __otbSFSTexturesImageFilter_h
+#ifndef otbSFSTexturesImageFilter_h
+#define otbSFSTexturesImageFilter_h
 
 #include "otbSFSTexturesFunctor.h"
 #include "itkImageToImageFilter.h"
diff --git a/Modules/Feature/Textures/include/otbSFSTexturesImageFilter.txx b/Modules/Feature/Textures/include/otbSFSTexturesImageFilter.txx
index fc2f974692..be677eb689 100644
--- a/Modules/Feature/Textures/include/otbSFSTexturesImageFilter.txx
+++ b/Modules/Feature/Textures/include/otbSFSTexturesImageFilter.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbSFSTexturesImageFilter_txx
-#define __otbSFSTexturesImageFilter_txx
+#ifndef otbSFSTexturesImageFilter_txx
+#define otbSFSTexturesImageFilter_txx
 
 #include "otbSFSTexturesImageFilter.h"
 
diff --git a/Modules/Feature/Textures/include/otbScalarImageToAdvancedTexturesFilter.h b/Modules/Feature/Textures/include/otbScalarImageToAdvancedTexturesFilter.h
index 62bee5fe53..cb04ff9ff4 100644
--- a/Modules/Feature/Textures/include/otbScalarImageToAdvancedTexturesFilter.h
+++ b/Modules/Feature/Textures/include/otbScalarImageToAdvancedTexturesFilter.h
@@ -15,8 +15,8 @@
  PURPOSE.  See the above copyright notices for more information.
 
  =========================================================================*/
-#ifndef __otbScalarImageToAdvancedTexturesFilter_h
-#define __otbScalarImageToAdvancedTexturesFilter_h
+#ifndef otbScalarImageToAdvancedTexturesFilter_h
+#define otbScalarImageToAdvancedTexturesFilter_h
 
 #include "otbGreyLevelCooccurrenceIndexedList.h"
 #include "itkImageToImageFilter.h"
diff --git a/Modules/Feature/Textures/include/otbScalarImageToAdvancedTexturesFilter.txx b/Modules/Feature/Textures/include/otbScalarImageToAdvancedTexturesFilter.txx
index a4ac9746af..cdf84808e9 100644
--- a/Modules/Feature/Textures/include/otbScalarImageToAdvancedTexturesFilter.txx
+++ b/Modules/Feature/Textures/include/otbScalarImageToAdvancedTexturesFilter.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbScalarImageToAdvancedTexturesFilter_txx
-#define __otbScalarImageToAdvancedTexturesFilter_txx
+#ifndef otbScalarImageToAdvancedTexturesFilter_txx
+#define otbScalarImageToAdvancedTexturesFilter_txx
 
 #include "otbScalarImageToAdvancedTexturesFilter.h"
 #include "itkImageRegionIteratorWithIndex.h"
diff --git a/Modules/Feature/Textures/include/otbScalarImageToHigherOrderTexturesFilter.h b/Modules/Feature/Textures/include/otbScalarImageToHigherOrderTexturesFilter.h
index 228d5b54f5..4879c7565a 100644
--- a/Modules/Feature/Textures/include/otbScalarImageToHigherOrderTexturesFilter.h
+++ b/Modules/Feature/Textures/include/otbScalarImageToHigherOrderTexturesFilter.h
@@ -15,8 +15,8 @@
  PURPOSE.  See the above copyright notices for more information.
 
  =========================================================================*/
-#ifndef __otbScalarImageToHigherOrderTexturesFilter_h
-#define __otbScalarImageToHigherOrderTexturesFilter_h
+#ifndef otbScalarImageToHigherOrderTexturesFilter_h
+#define otbScalarImageToHigherOrderTexturesFilter_h
 
 #include "itkImageToImageFilter.h"
 #include "itkScalarImageToRunLengthFeaturesFilter.h"
diff --git a/Modules/Feature/Textures/include/otbScalarImageToHigherOrderTexturesFilter.txx b/Modules/Feature/Textures/include/otbScalarImageToHigherOrderTexturesFilter.txx
index 2ef488a92f..7e3c6bd181 100644
--- a/Modules/Feature/Textures/include/otbScalarImageToHigherOrderTexturesFilter.txx
+++ b/Modules/Feature/Textures/include/otbScalarImageToHigherOrderTexturesFilter.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbScalarImageToHigherOrderTexturesFilter_txx
-#define __otbScalarImageToHigherOrderTexturesFilter_txx
+#ifndef otbScalarImageToHigherOrderTexturesFilter_txx
+#define otbScalarImageToHigherOrderTexturesFilter_txx
 
 #include "otbScalarImageToHigherOrderTexturesFilter.h"
 #include "itkImageRegionIteratorWithIndex.h"
diff --git a/Modules/Feature/Textures/include/otbScalarImageToPanTexTextureFilter.h b/Modules/Feature/Textures/include/otbScalarImageToPanTexTextureFilter.h
index 80caa2a0f7..5e0ca7bd7a 100644
--- a/Modules/Feature/Textures/include/otbScalarImageToPanTexTextureFilter.h
+++ b/Modules/Feature/Textures/include/otbScalarImageToPanTexTextureFilter.h
@@ -15,8 +15,8 @@
  PURPOSE.  See the above copyright notices for more information.
 
  =========================================================================*/
-#ifndef __otbScalarImageToPanTexTextureFilter_h
-#define __otbScalarImageToPanTexTextureFilter_h
+#ifndef otbScalarImageToPanTexTextureFilter_h
+#define otbScalarImageToPanTexTextureFilter_h
 
 #include "otbGreyLevelCooccurrenceIndexedList.h"
 #include "itkImageToImageFilter.h"
diff --git a/Modules/Feature/Textures/include/otbScalarImageToPanTexTextureFilter.txx b/Modules/Feature/Textures/include/otbScalarImageToPanTexTextureFilter.txx
index 4647a2cea3..c355964fe1 100644
--- a/Modules/Feature/Textures/include/otbScalarImageToPanTexTextureFilter.txx
+++ b/Modules/Feature/Textures/include/otbScalarImageToPanTexTextureFilter.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbScalarImageToPanTexTextureFilter_txx
-#define __otbScalarImageToPanTexTextureFilter_txx
+#ifndef otbScalarImageToPanTexTextureFilter_txx
+#define otbScalarImageToPanTexTextureFilter_txx
 
 #include "otbScalarImageToPanTexTextureFilter.h"
 #include "itkImageRegionIteratorWithIndex.h"
diff --git a/Modules/Feature/Textures/include/otbScalarImageToTexturesFilter.h b/Modules/Feature/Textures/include/otbScalarImageToTexturesFilter.h
index 4c489f0f96..3c02adec5f 100644
--- a/Modules/Feature/Textures/include/otbScalarImageToTexturesFilter.h
+++ b/Modules/Feature/Textures/include/otbScalarImageToTexturesFilter.h
@@ -16,8 +16,8 @@ PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
 
-#ifndef __otbScalarImageToTexturesFilter_h
-#define __otbScalarImageToTexturesFilter_h
+#ifndef otbScalarImageToTexturesFilter_h
+#define otbScalarImageToTexturesFilter_h
 
 #include "otbGreyLevelCooccurrenceIndexedList.h"
 #include "itkImageToImageFilter.h"
diff --git a/Modules/Feature/Textures/include/otbScalarImageToTexturesFilter.txx b/Modules/Feature/Textures/include/otbScalarImageToTexturesFilter.txx
index e8587d9234..0e70914b73 100644
--- a/Modules/Feature/Textures/include/otbScalarImageToTexturesFilter.txx
+++ b/Modules/Feature/Textures/include/otbScalarImageToTexturesFilter.txx
@@ -16,8 +16,8 @@ PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
 
-#ifndef __otbScalarImageToTexturesFilter_txx
-#define __otbScalarImageToTexturesFilter_txx
+#ifndef otbScalarImageToTexturesFilter_txx
+#define otbScalarImageToTexturesFilter_txx
 
 #include "otbScalarImageToTexturesFilter.h"
 #include "itkImageRegionIteratorWithIndex.h"
diff --git a/Modules/Feature/Textures/include/otbTextureImageFunction.h b/Modules/Feature/Textures/include/otbTextureImageFunction.h
index b0f43c0632..3f0548d42a 100644
--- a/Modules/Feature/Textures/include/otbTextureImageFunction.h
+++ b/Modules/Feature/Textures/include/otbTextureImageFunction.h
@@ -15,8 +15,8 @@
   PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbTextureImageFunction_h
-#define __otbTextureImageFunction_h
+#ifndef otbTextureImageFunction_h
+#define otbTextureImageFunction_h
 
 #include "itkImageFunction.h"
 #include "itkConstNeighborhoodIterator.h"
diff --git a/Modules/Feature/Textures/include/otbTextureImageFunction.txx b/Modules/Feature/Textures/include/otbTextureImageFunction.txx
index 0a90a831e4..b121ff9ba3 100644
--- a/Modules/Feature/Textures/include/otbTextureImageFunction.txx
+++ b/Modules/Feature/Textures/include/otbTextureImageFunction.txx
@@ -15,8 +15,8 @@
   PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbTextureImageFunction_txx
-#define __otbTextureImageFunction_txx
+#ifndef otbTextureImageFunction_txx
+#define otbTextureImageFunction_txx
 
 #include "otbTextureImageFunction.h"
 
diff --git a/Modules/Filtering/ChangeDetection/include/otbBinaryFunctorNeighborhoodJoinHistogramImageFilter.h b/Modules/Filtering/ChangeDetection/include/otbBinaryFunctorNeighborhoodJoinHistogramImageFilter.h
index d8d461e0f9..beb6850070 100644
--- a/Modules/Filtering/ChangeDetection/include/otbBinaryFunctorNeighborhoodJoinHistogramImageFilter.h
+++ b/Modules/Filtering/ChangeDetection/include/otbBinaryFunctorNeighborhoodJoinHistogramImageFilter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbBinaryFunctorNeighborhoodJoinHistogramImageFilter_h
-#define __otbBinaryFunctorNeighborhoodJoinHistogramImageFilter_h
+#ifndef otbBinaryFunctorNeighborhoodJoinHistogramImageFilter_h
+#define otbBinaryFunctorNeighborhoodJoinHistogramImageFilter_h
 
 #include "itkBinaryFunctorImageFilter.h"
 #include "itkImageRegionIteratorWithIndex.h"
diff --git a/Modules/Filtering/ChangeDetection/include/otbBinaryFunctorNeighborhoodJoinHistogramImageFilter.txx b/Modules/Filtering/ChangeDetection/include/otbBinaryFunctorNeighborhoodJoinHistogramImageFilter.txx
index edfa33fd82..e59b380649 100644
--- a/Modules/Filtering/ChangeDetection/include/otbBinaryFunctorNeighborhoodJoinHistogramImageFilter.txx
+++ b/Modules/Filtering/ChangeDetection/include/otbBinaryFunctorNeighborhoodJoinHistogramImageFilter.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbBinaryFunctorNeighborhoodJoinHistogramImageFilter_txx
-#define __otbBinaryFunctorNeighborhoodJoinHistogramImageFilter_txx
+#ifndef otbBinaryFunctorNeighborhoodJoinHistogramImageFilter_txx
+#define otbBinaryFunctorNeighborhoodJoinHistogramImageFilter_txx
 
 #include "otbBinaryFunctorNeighborhoodJoinHistogramImageFilter.h"
 #include "itkImageRegionIterator.h"
diff --git a/Modules/Filtering/ChangeDetection/include/otbCBAMI.h b/Modules/Filtering/ChangeDetection/include/otbCBAMI.h
index 01d528d0ac..0b2c46e651 100644
--- a/Modules/Filtering/ChangeDetection/include/otbCBAMI.h
+++ b/Modules/Filtering/ChangeDetection/include/otbCBAMI.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbCBAMI_h
-#define __otbCBAMI_h
+#ifndef otbCBAMI_h
+#define otbCBAMI_h
 
 #include <vector>
 #include "itkMath.h"
diff --git a/Modules/Filtering/ChangeDetection/include/otbCBAMIChangeDetector.h b/Modules/Filtering/ChangeDetection/include/otbCBAMIChangeDetector.h
index bc488255a3..99d7f06af8 100644
--- a/Modules/Filtering/ChangeDetection/include/otbCBAMIChangeDetector.h
+++ b/Modules/Filtering/ChangeDetection/include/otbCBAMIChangeDetector.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbCBAMIChangeDetector_h
-#define __otbCBAMIChangeDetector_h
+#ifndef otbCBAMIChangeDetector_h
+#define otbCBAMIChangeDetector_h
 
 #include "otbBinaryFunctorNeighborhoodImageFilter.h"
 #include "otbCBAMI.h"
diff --git a/Modules/Filtering/ChangeDetection/include/otbCorrelationChangeDetector.h b/Modules/Filtering/ChangeDetection/include/otbCorrelationChangeDetector.h
index 5e5c8a606a..c40da8de76 100644
--- a/Modules/Filtering/ChangeDetection/include/otbCorrelationChangeDetector.h
+++ b/Modules/Filtering/ChangeDetection/include/otbCorrelationChangeDetector.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbCorrelationChangeDetector_h
-#define __otbCorrelationChangeDetector_h
+#ifndef otbCorrelationChangeDetector_h
+#define otbCorrelationChangeDetector_h
 
 #include "otbBinaryFunctorNeighborhoodImageFilter.h"
 #include "otbCrossCorrelation.h"
diff --git a/Modules/Filtering/ChangeDetection/include/otbCrossCorrelation.h b/Modules/Filtering/ChangeDetection/include/otbCrossCorrelation.h
index 63112445a7..45b534c70f 100644
--- a/Modules/Filtering/ChangeDetection/include/otbCrossCorrelation.h
+++ b/Modules/Filtering/ChangeDetection/include/otbCrossCorrelation.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbCrossCorrelation_h
-#define __otbCrossCorrelation_h
+#ifndef otbCrossCorrelation_h
+#define otbCrossCorrelation_h
 
 #include "itkMath.h"
 
diff --git a/Modules/Filtering/ChangeDetection/include/otbJoinHistogramMI.h b/Modules/Filtering/ChangeDetection/include/otbJoinHistogramMI.h
index 559cebc6d5..26a0c29ffb 100644
--- a/Modules/Filtering/ChangeDetection/include/otbJoinHistogramMI.h
+++ b/Modules/Filtering/ChangeDetection/include/otbJoinHistogramMI.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbJoinHistogramMI_h
-#define __otbJoinHistogramMI_h
+#ifndef otbJoinHistogramMI_h
+#define otbJoinHistogramMI_h
 
 #include "itkHistogram.h"
 
diff --git a/Modules/Filtering/ChangeDetection/include/otbJoinHistogramMIImageFilter.h b/Modules/Filtering/ChangeDetection/include/otbJoinHistogramMIImageFilter.h
index a3efb85cfe..dafe9a8329 100644
--- a/Modules/Filtering/ChangeDetection/include/otbJoinHistogramMIImageFilter.h
+++ b/Modules/Filtering/ChangeDetection/include/otbJoinHistogramMIImageFilter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbJoinHistogramMIImageFilter_h
-#define __otbJoinHistogramMIImageFilter_h
+#ifndef otbJoinHistogramMIImageFilter_h
+#define otbJoinHistogramMIImageFilter_h
 
 #include "otbBinaryFunctorNeighborhoodJoinHistogramImageFilter.h"
 #include "otbJoinHistogramMI.h"
diff --git a/Modules/Filtering/ChangeDetection/include/otbKullbackLeiblerDistanceImageFilter.h b/Modules/Filtering/ChangeDetection/include/otbKullbackLeiblerDistanceImageFilter.h
index a075d9f583..c29c3457ad 100644
--- a/Modules/Filtering/ChangeDetection/include/otbKullbackLeiblerDistanceImageFilter.h
+++ b/Modules/Filtering/ChangeDetection/include/otbKullbackLeiblerDistanceImageFilter.h
@@ -17,8 +17,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbKullbackLeiblerDistanceImageFilter_h
-#define __otbKullbackLeiblerDistanceImageFilter_h
+#ifndef otbKullbackLeiblerDistanceImageFilter_h
+#define otbKullbackLeiblerDistanceImageFilter_h
 
 #include "itkVariableLengthVector.h"
 #include "otbBinaryFunctorNeighborhoodImageFilter.h"
diff --git a/Modules/Filtering/ChangeDetection/include/otbKullbackLeiblerDistanceImageFilter.txx b/Modules/Filtering/ChangeDetection/include/otbKullbackLeiblerDistanceImageFilter.txx
index b309f580dd..e36807327e 100644
--- a/Modules/Filtering/ChangeDetection/include/otbKullbackLeiblerDistanceImageFilter.txx
+++ b/Modules/Filtering/ChangeDetection/include/otbKullbackLeiblerDistanceImageFilter.txx
@@ -17,8 +17,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbKullbackLeiblerDistanceImageFilter_txx
-#define __otbKullbackLeiblerDistanceImageFilter_txx
+#ifndef otbKullbackLeiblerDistanceImageFilter_txx
+#define otbKullbackLeiblerDistanceImageFilter_txx
 
 #include <vector>
 
diff --git a/Modules/Filtering/ChangeDetection/include/otbKullbackLeiblerProfileImageFilter.h b/Modules/Filtering/ChangeDetection/include/otbKullbackLeiblerProfileImageFilter.h
index 4c7612c74e..96fe2260ae 100644
--- a/Modules/Filtering/ChangeDetection/include/otbKullbackLeiblerProfileImageFilter.h
+++ b/Modules/Filtering/ChangeDetection/include/otbKullbackLeiblerProfileImageFilter.h
@@ -18,8 +18,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbKullbackLeiblerProfileImageFilter_h
-#define __otbKullbackLeiblerProfileImageFilter_h
+#ifndef otbKullbackLeiblerProfileImageFilter_h
+#define otbKullbackLeiblerProfileImageFilter_h
 
 #include <vector>
 
diff --git a/Modules/Filtering/ChangeDetection/include/otbKullbackLeiblerProfileImageFilter.txx b/Modules/Filtering/ChangeDetection/include/otbKullbackLeiblerProfileImageFilter.txx
index 1620df7cd6..fa10d4f89f 100644
--- a/Modules/Filtering/ChangeDetection/include/otbKullbackLeiblerProfileImageFilter.txx
+++ b/Modules/Filtering/ChangeDetection/include/otbKullbackLeiblerProfileImageFilter.txx
@@ -18,8 +18,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbKullbackLeiblerProfileImageFilter_txx
-#define __otbKullbackLeiblerProfileImageFilter_txx
+#ifndef otbKullbackLeiblerProfileImageFilter_txx
+#define otbKullbackLeiblerProfileImageFilter_txx
 
 #include <vector>
 
diff --git a/Modules/Filtering/ChangeDetection/include/otbKullbackLeiblerSupervizedDistanceImageFilter.h b/Modules/Filtering/ChangeDetection/include/otbKullbackLeiblerSupervizedDistanceImageFilter.h
index 01b280719e..a6a52b68ec 100644
--- a/Modules/Filtering/ChangeDetection/include/otbKullbackLeiblerSupervizedDistanceImageFilter.h
+++ b/Modules/Filtering/ChangeDetection/include/otbKullbackLeiblerSupervizedDistanceImageFilter.h
@@ -18,8 +18,8 @@
 
 =========================================================================*/
 
-#ifndef __otbKullbackLeiblerSupervizedDistanceImageFilter_h
-#define __otbKullbackLeiblerSupervizedDistanceImageFilter_h
+#ifndef otbKullbackLeiblerSupervizedDistanceImageFilter_h
+#define otbKullbackLeiblerSupervizedDistanceImageFilter_h
 
 #include "otbKullbackLeiblerDistanceImageFilter.h"
 
diff --git a/Modules/Filtering/ChangeDetection/include/otbKullbackLeiblerSupervizedDistanceImageFilter.txx b/Modules/Filtering/ChangeDetection/include/otbKullbackLeiblerSupervizedDistanceImageFilter.txx
index 4b1cf715ae..b5f9234106 100644
--- a/Modules/Filtering/ChangeDetection/include/otbKullbackLeiblerSupervizedDistanceImageFilter.txx
+++ b/Modules/Filtering/ChangeDetection/include/otbKullbackLeiblerSupervizedDistanceImageFilter.txx
@@ -18,8 +18,8 @@
 
 =========================================================================*/
 
-#ifndef __otbKullbackLeiblerSupervizedDistanceImageFilter_txx
-#define __otbKullbackLeiblerSupervizedDistanceImageFilter_txx
+#ifndef otbKullbackLeiblerSupervizedDistanceImageFilter_txx
+#define otbKullbackLeiblerSupervizedDistanceImageFilter_txx
 
 #include "otbKullbackLeiblerSupervizedDistanceImageFilter.h"
 
diff --git a/Modules/Filtering/ChangeDetection/include/otbLHMI.h b/Modules/Filtering/ChangeDetection/include/otbLHMI.h
index e61ae24116..e2f296d2dd 100644
--- a/Modules/Filtering/ChangeDetection/include/otbLHMI.h
+++ b/Modules/Filtering/ChangeDetection/include/otbLHMI.h
@@ -16,8 +16,8 @@
 
 =========================================================================*/
 
-#ifndef __otbLHMI_h
-#define __otbLHMI_h
+#ifndef otbLHMI_h
+#define otbLHMI_h
 
 #include <vector>
 #include "itkHistogram.h"
diff --git a/Modules/Filtering/ChangeDetection/include/otbLHMIChangeDetector.h b/Modules/Filtering/ChangeDetection/include/otbLHMIChangeDetector.h
index 4ddbfe05fd..b2a3c1e4e7 100644
--- a/Modules/Filtering/ChangeDetection/include/otbLHMIChangeDetector.h
+++ b/Modules/Filtering/ChangeDetection/include/otbLHMIChangeDetector.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbLHMIChangeDetector_h
-#define __otbLHMIChangeDetector_h
+#ifndef otbLHMIChangeDetector_h
+#define otbLHMIChangeDetector_h
 
 #include "otbBinaryFunctorNeighborhoodImageFilter.h"
 #include "otbLHMI.h"
diff --git a/Modules/Filtering/ChangeDetection/include/otbMeanDifference.h b/Modules/Filtering/ChangeDetection/include/otbMeanDifference.h
index 0f29f742c2..830d2b0bee 100644
--- a/Modules/Filtering/ChangeDetection/include/otbMeanDifference.h
+++ b/Modules/Filtering/ChangeDetection/include/otbMeanDifference.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbMeanDifference_h
-#define __otbMeanDifference_h
+#ifndef otbMeanDifference_h
+#define otbMeanDifference_h
 
 namespace otb
 {
diff --git a/Modules/Filtering/ChangeDetection/include/otbMeanDifferenceImageFilter.h b/Modules/Filtering/ChangeDetection/include/otbMeanDifferenceImageFilter.h
index 2d69ac8450..1801b6df25 100644
--- a/Modules/Filtering/ChangeDetection/include/otbMeanDifferenceImageFilter.h
+++ b/Modules/Filtering/ChangeDetection/include/otbMeanDifferenceImageFilter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbMeanDifferenceImageFilter_h
-#define __otbMeanDifferenceImageFilter_h
+#ifndef otbMeanDifferenceImageFilter_h
+#define otbMeanDifferenceImageFilter_h
 
 #include "otbBinaryFunctorNeighborhoodImageFilter.h"
 #include "otbMeanDifference.h"
diff --git a/Modules/Filtering/ChangeDetection/include/otbMeanRatio.h b/Modules/Filtering/ChangeDetection/include/otbMeanRatio.h
index 431c9b7cf4..06f760de75 100644
--- a/Modules/Filtering/ChangeDetection/include/otbMeanRatio.h
+++ b/Modules/Filtering/ChangeDetection/include/otbMeanRatio.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbMeanRatio_h
-#define __otbMeanRatio_h
+#ifndef otbMeanRatio_h
+#define otbMeanRatio_h
 
 #include "otbBinaryFunctorNeighborhoodImageFilter.h"
 
diff --git a/Modules/Filtering/ChangeDetection/include/otbMeanRatioImageFilter.h b/Modules/Filtering/ChangeDetection/include/otbMeanRatioImageFilter.h
index a6ac437f9d..fa3890d963 100644
--- a/Modules/Filtering/ChangeDetection/include/otbMeanRatioImageFilter.h
+++ b/Modules/Filtering/ChangeDetection/include/otbMeanRatioImageFilter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbMeanRatioImageFilter_h
-#define __otbMeanRatioImageFilter_h
+#ifndef otbMeanRatioImageFilter_h
+#define otbMeanRatioImageFilter_h
 
 #include "otbMeanRatio.h"
 
diff --git a/Modules/Filtering/ChangeDetection/include/otbMultivariateAlterationDetectorImageFilter.h b/Modules/Filtering/ChangeDetection/include/otbMultivariateAlterationDetectorImageFilter.h
index 7e00aba91a..32c92bd126 100644
--- a/Modules/Filtering/ChangeDetection/include/otbMultivariateAlterationDetectorImageFilter.h
+++ b/Modules/Filtering/ChangeDetection/include/otbMultivariateAlterationDetectorImageFilter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbMultivariateAlterationDetectorImageFilter_h
-#define __otbMultivariateAlterationDetectorImageFilter_h
+#ifndef otbMultivariateAlterationDetectorImageFilter_h
+#define otbMultivariateAlterationDetectorImageFilter_h
 
 
 #include "otbStreamingStatisticsVectorImageFilter.h"
diff --git a/Modules/Filtering/ChangeDetection/include/otbMultivariateAlterationDetectorImageFilter.txx b/Modules/Filtering/ChangeDetection/include/otbMultivariateAlterationDetectorImageFilter.txx
index 666ae3e0fe..24190c3eb4 100644
--- a/Modules/Filtering/ChangeDetection/include/otbMultivariateAlterationDetectorImageFilter.txx
+++ b/Modules/Filtering/ChangeDetection/include/otbMultivariateAlterationDetectorImageFilter.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbMultivariateAlterationDetectorImageFilter_txx
-#define __otbMultivariateAlterationDetectorImageFilter_txx
+#ifndef otbMultivariateAlterationDetectorImageFilter_txx
+#define otbMultivariateAlterationDetectorImageFilter_txx
 
 #include "otbMultivariateAlterationDetectorImageFilter.h"
 #include "otbMath.h"
diff --git a/Modules/Filtering/ColorMap/include/otbReliefColormapFunctor.h b/Modules/Filtering/ColorMap/include/otbReliefColormapFunctor.h
index 4dd22cef45..b0a3b5ad00 100644
--- a/Modules/Filtering/ColorMap/include/otbReliefColormapFunctor.h
+++ b/Modules/Filtering/ColorMap/include/otbReliefColormapFunctor.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbReliefColormapFunctor_h
-#define __otbReliefColormapFunctor_h
+#ifndef otbReliefColormapFunctor_h
+#define otbReliefColormapFunctor_h
 
 #include "itkColormapFunction.h"
 
diff --git a/Modules/Filtering/ColorMap/include/otbReliefColormapFunctor.txx b/Modules/Filtering/ColorMap/include/otbReliefColormapFunctor.txx
index fc7958c969..4134e5d87d 100644
--- a/Modules/Filtering/ColorMap/include/otbReliefColormapFunctor.txx
+++ b/Modules/Filtering/ColorMap/include/otbReliefColormapFunctor.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbReliefColormapFunctor_txx
-#define __otbReliefColormapFunctor_txx
+#ifndef otbReliefColormapFunctor_txx
+#define otbReliefColormapFunctor_txx
 
 #include "otbReliefColormapFunctor.h"
 
diff --git a/Modules/Filtering/ColorMap/include/otbScalarToRainbowRGBPixelFunctor.h b/Modules/Filtering/ColorMap/include/otbScalarToRainbowRGBPixelFunctor.h
index 1b341f6994..1aae8c050b 100644
--- a/Modules/Filtering/ColorMap/include/otbScalarToRainbowRGBPixelFunctor.h
+++ b/Modules/Filtering/ColorMap/include/otbScalarToRainbowRGBPixelFunctor.h
@@ -16,8 +16,8 @@
 
 =========================================================================*/
 
-#ifndef __otbScalarToRainbowRGBPixelFunctor_h
-#define __otbScalarToRainbowRGBPixelFunctor_h
+#ifndef otbScalarToRainbowRGBPixelFunctor_h
+#define otbScalarToRainbowRGBPixelFunctor_h
 
 #include "itkColormapFunction.h"
 
diff --git a/Modules/Filtering/ColorMap/include/otbScalarToRainbowRGBPixelFunctor.txx b/Modules/Filtering/ColorMap/include/otbScalarToRainbowRGBPixelFunctor.txx
index 82e300375b..616ccb2021 100644
--- a/Modules/Filtering/ColorMap/include/otbScalarToRainbowRGBPixelFunctor.txx
+++ b/Modules/Filtering/ColorMap/include/otbScalarToRainbowRGBPixelFunctor.txx
@@ -16,8 +16,8 @@
 
 =========================================================================*/
 
-#ifndef __otbScalarToRainbowRGBPixelFunctor_txx
-#define __otbScalarToRainbowRGBPixelFunctor_txx
+#ifndef otbScalarToRainbowRGBPixelFunctor_txx
+#define otbScalarToRainbowRGBPixelFunctor_txx
 
 #include "otbScalarToRainbowRGBPixelFunctor.h"
 
diff --git a/Modules/Filtering/Convolution/include/otbConvolutionImageFilter.h b/Modules/Filtering/Convolution/include/otbConvolutionImageFilter.h
index f9eb1fbec0..2b097f6043 100644
--- a/Modules/Filtering/Convolution/include/otbConvolutionImageFilter.h
+++ b/Modules/Filtering/Convolution/include/otbConvolutionImageFilter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbConvolutionImageFilter_h
-#define __otbConvolutionImageFilter_h
+#ifndef otbConvolutionImageFilter_h
+#define otbConvolutionImageFilter_h
 
 #include "itkImageToImageFilter.h"
 #include "itkImage.h"
diff --git a/Modules/Filtering/Convolution/include/otbConvolutionImageFilter.txx b/Modules/Filtering/Convolution/include/otbConvolutionImageFilter.txx
index 076b28225e..ae9e501cd7 100644
--- a/Modules/Filtering/Convolution/include/otbConvolutionImageFilter.txx
+++ b/Modules/Filtering/Convolution/include/otbConvolutionImageFilter.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbConvolutionImageFilter_txx
-#define __otbConvolutionImageFilter_txx
+#ifndef otbConvolutionImageFilter_txx
+#define otbConvolutionImageFilter_txx
 #include "otbConvolutionImageFilter.h"
 
 #include "itkConstNeighborhoodIterator.h"
diff --git a/Modules/Filtering/Convolution/include/otbGaborFilterGenerator.h b/Modules/Filtering/Convolution/include/otbGaborFilterGenerator.h
index 977410ff00..9871761a6f 100644
--- a/Modules/Filtering/Convolution/include/otbGaborFilterGenerator.h
+++ b/Modules/Filtering/Convolution/include/otbGaborFilterGenerator.h
@@ -18,8 +18,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbGaborFilterGenerator_h
-#define __otbGaborFilterGenerator_h
+#ifndef otbGaborFilterGenerator_h
+#define otbGaborFilterGenerator_h
 
 #include "itkObject.h"
 #include "itkObjectFactory.h"
diff --git a/Modules/Filtering/Convolution/include/otbGaborFilterGenerator.txx b/Modules/Filtering/Convolution/include/otbGaborFilterGenerator.txx
index 31904ba548..fa4418f43f 100644
--- a/Modules/Filtering/Convolution/include/otbGaborFilterGenerator.txx
+++ b/Modules/Filtering/Convolution/include/otbGaborFilterGenerator.txx
@@ -18,8 +18,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbGaborFilterGenerator_txx
-#define __otbGaborFilterGenerator_txx
+#ifndef otbGaborFilterGenerator_txx
+#define otbGaborFilterGenerator_txx
 
 #include "otbMath.h"
 
diff --git a/Modules/Filtering/Convolution/include/otbOverlapSaveConvolutionImageFilter.h b/Modules/Filtering/Convolution/include/otbOverlapSaveConvolutionImageFilter.h
index b07d13ca78..af427086ba 100644
--- a/Modules/Filtering/Convolution/include/otbOverlapSaveConvolutionImageFilter.h
+++ b/Modules/Filtering/Convolution/include/otbOverlapSaveConvolutionImageFilter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbOverlapSaveConvolutionImageFilter_h
-#define __otbOverlapSaveConvolutionImageFilter_h
+#ifndef otbOverlapSaveConvolutionImageFilter_h
+#define otbOverlapSaveConvolutionImageFilter_h
 
 #include "itkImageToImageFilter.h"
 #include "itkImage.h"
diff --git a/Modules/Filtering/Convolution/include/otbOverlapSaveConvolutionImageFilter.txx b/Modules/Filtering/Convolution/include/otbOverlapSaveConvolutionImageFilter.txx
index b19a1919f1..8b3126aa4a 100644
--- a/Modules/Filtering/Convolution/include/otbOverlapSaveConvolutionImageFilter.txx
+++ b/Modules/Filtering/Convolution/include/otbOverlapSaveConvolutionImageFilter.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbOverlapSaveConvolutionImageFilter_txx
-#define __otbOverlapSaveConvolutionImageFilter_txx
+#ifndef otbOverlapSaveConvolutionImageFilter_txx
+#define otbOverlapSaveConvolutionImageFilter_txx
 
 #include "itkConfigure.h"
 
diff --git a/Modules/Filtering/DEM/include/otbDEMCaracteristicsExtractor.h b/Modules/Filtering/DEM/include/otbDEMCaracteristicsExtractor.h
index 77f901bef1..0e60ee63f2 100644
--- a/Modules/Filtering/DEM/include/otbDEMCaracteristicsExtractor.h
+++ b/Modules/Filtering/DEM/include/otbDEMCaracteristicsExtractor.h
@@ -18,8 +18,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbDEMCaracteristicsExtractor_h
-#define __otbDEMCaracteristicsExtractor_h
+#ifndef otbDEMCaracteristicsExtractor_h
+#define otbDEMCaracteristicsExtractor_h
 
 #include "otbImage.h"
 #include "otbVectorImage.h"
diff --git a/Modules/Filtering/DEM/include/otbDEMCaracteristicsExtractor.txx b/Modules/Filtering/DEM/include/otbDEMCaracteristicsExtractor.txx
index 717437a8c3..de13743ed3 100644
--- a/Modules/Filtering/DEM/include/otbDEMCaracteristicsExtractor.txx
+++ b/Modules/Filtering/DEM/include/otbDEMCaracteristicsExtractor.txx
@@ -18,8 +18,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbDEMCaracteristicsExtractor_txx
-#define __otbDEMCaracteristicsExtractor_txx
+#ifndef otbDEMCaracteristicsExtractor_txx
+#define otbDEMCaracteristicsExtractor_txx
 
 #include "otbDEMCaracteristicsExtractor.h"
 #include "itkImageRegionIterator.h"
diff --git a/Modules/Filtering/DEM/include/otbDEMToImageGenerator.h b/Modules/Filtering/DEM/include/otbDEMToImageGenerator.h
index 62c40ede82..e6d579018a 100644
--- a/Modules/Filtering/DEM/include/otbDEMToImageGenerator.h
+++ b/Modules/Filtering/DEM/include/otbDEMToImageGenerator.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbDEMToImageGenerator_h
-#define __otbDEMToImageGenerator_h
+#ifndef otbDEMToImageGenerator_h
+#define otbDEMToImageGenerator_h
 
 #include <iostream>
 #include <stdio.h>
diff --git a/Modules/Filtering/DEM/include/otbDEMToImageGenerator.txx b/Modules/Filtering/DEM/include/otbDEMToImageGenerator.txx
index e07bdf6cba..3d80be2dc1 100644
--- a/Modules/Filtering/DEM/include/otbDEMToImageGenerator.txx
+++ b/Modules/Filtering/DEM/include/otbDEMToImageGenerator.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbDEMToImageGenerator_txx
-#define __otbDEMToImageGenerator_txx
+#ifndef otbDEMToImageGenerator_txx
+#define otbDEMToImageGenerator_txx
 
 #include "otbDEMToImageGenerator.h"
 #include "otbMacro.h"
diff --git a/Modules/Filtering/DimensionalityReduction/include/otbAngularProjectionBinaryImageFilter.h b/Modules/Filtering/DimensionalityReduction/include/otbAngularProjectionBinaryImageFilter.h
index 3d5994f72f..c1df1d7ddb 100644
--- a/Modules/Filtering/DimensionalityReduction/include/otbAngularProjectionBinaryImageFilter.h
+++ b/Modules/Filtering/DimensionalityReduction/include/otbAngularProjectionBinaryImageFilter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbAngularProjectionBinaryImageFilter_h
-#define __otbAngularProjectionBinaryImageFilter_h
+#ifndef otbAngularProjectionBinaryImageFilter_h
+#define otbAngularProjectionBinaryImageFilter_h
 
 #include <vector>
 
diff --git a/Modules/Filtering/DimensionalityReduction/include/otbAngularProjectionBinaryImageFilter.txx b/Modules/Filtering/DimensionalityReduction/include/otbAngularProjectionBinaryImageFilter.txx
index c8b62a6f13..fc3110f25f 100644
--- a/Modules/Filtering/DimensionalityReduction/include/otbAngularProjectionBinaryImageFilter.txx
+++ b/Modules/Filtering/DimensionalityReduction/include/otbAngularProjectionBinaryImageFilter.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbAngularProjectionBinaryImageFilter_txx
-#define __otbAngularProjectionBinaryImageFilter_txx
+#ifndef otbAngularProjectionBinaryImageFilter_txx
+#define otbAngularProjectionBinaryImageFilter_txx
 #include "otbAngularProjectionBinaryImageFilter.h"
 
 #include <vnl/vnl_math.h>
diff --git a/Modules/Filtering/DimensionalityReduction/include/otbAngularProjectionImageFilter.h b/Modules/Filtering/DimensionalityReduction/include/otbAngularProjectionImageFilter.h
index b084b68224..30d2463a60 100644
--- a/Modules/Filtering/DimensionalityReduction/include/otbAngularProjectionImageFilter.h
+++ b/Modules/Filtering/DimensionalityReduction/include/otbAngularProjectionImageFilter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbAngularProjectionImageFilter_h
-#define __otbAngularProjectionImageFilter_h
+#ifndef otbAngularProjectionImageFilter_h
+#define otbAngularProjectionImageFilter_h
 
 #include "itkImageRegionConstIterator.h"
 #include "itkProgressReporter.h"
diff --git a/Modules/Filtering/DimensionalityReduction/include/otbAngularProjectionImageFilter.txx b/Modules/Filtering/DimensionalityReduction/include/otbAngularProjectionImageFilter.txx
index 8074e09a6b..33cf38a13a 100644
--- a/Modules/Filtering/DimensionalityReduction/include/otbAngularProjectionImageFilter.txx
+++ b/Modules/Filtering/DimensionalityReduction/include/otbAngularProjectionImageFilter.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbAngularProjectionImageFilter_txx
-#define __otbAngularProjectionImageFilter_txx
+#ifndef otbAngularProjectionImageFilter_txx
+#define otbAngularProjectionImageFilter_txx
 #include "otbAngularProjectionImageFilter.h"
 
 #include <vnl/vnl_math.h>
diff --git a/Modules/Filtering/DimensionalityReduction/include/otbAngularProjectionSetImageFilter.h b/Modules/Filtering/DimensionalityReduction/include/otbAngularProjectionSetImageFilter.h
index a8baed30d3..44caad873d 100644
--- a/Modules/Filtering/DimensionalityReduction/include/otbAngularProjectionSetImageFilter.h
+++ b/Modules/Filtering/DimensionalityReduction/include/otbAngularProjectionSetImageFilter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbAngularProjectionSetImageFilter_h
-#define __otbAngularProjectionSetImageFilter_h
+#ifndef otbAngularProjectionSetImageFilter_h
+#define otbAngularProjectionSetImageFilter_h
 
 #include "otbAngularProjectionImageFilter.h"
 #include "otbImageToImageListFilter.h"
diff --git a/Modules/Filtering/DimensionalityReduction/include/otbAngularProjectionSetImageFilter.txx b/Modules/Filtering/DimensionalityReduction/include/otbAngularProjectionSetImageFilter.txx
index feb9a4f029..fd98c1b942 100644
--- a/Modules/Filtering/DimensionalityReduction/include/otbAngularProjectionSetImageFilter.txx
+++ b/Modules/Filtering/DimensionalityReduction/include/otbAngularProjectionSetImageFilter.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbAngularProjectionSetImageFilter_txx
-#define __otbAngularProjectionSetImageFilter_txx
+#ifndef otbAngularProjectionSetImageFilter_txx
+#define otbAngularProjectionSetImageFilter_txx
 #include "otbAngularProjectionSetImageFilter.h"
 
 #include <vnl/vnl_math.h>
diff --git a/Modules/Filtering/DimensionalityReduction/include/otbEstimateInnerProductPCAImageFilter.h b/Modules/Filtering/DimensionalityReduction/include/otbEstimateInnerProductPCAImageFilter.h
index 18a7ed1f8c..cc0ce6a0c5 100644
--- a/Modules/Filtering/DimensionalityReduction/include/otbEstimateInnerProductPCAImageFilter.h
+++ b/Modules/Filtering/DimensionalityReduction/include/otbEstimateInnerProductPCAImageFilter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbEstimateInnerProductPCAImageFilter_h
-#define __otbEstimateInnerProductPCAImageFilter_h
+#ifndef otbEstimateInnerProductPCAImageFilter_h
+#define otbEstimateInnerProductPCAImageFilter_h
 
 #include "itkImageToImageFilter.h"
 #include "otbStreamingInnerProductVectorImageFilter.h"
diff --git a/Modules/Filtering/DimensionalityReduction/include/otbEstimateInnerProductPCAImageFilter.txx b/Modules/Filtering/DimensionalityReduction/include/otbEstimateInnerProductPCAImageFilter.txx
index f080e863ed..f66c181c81 100644
--- a/Modules/Filtering/DimensionalityReduction/include/otbEstimateInnerProductPCAImageFilter.txx
+++ b/Modules/Filtering/DimensionalityReduction/include/otbEstimateInnerProductPCAImageFilter.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbEstimateInnerProductPCAImageFilter_txx
-#define __otbEstimateInnerProductPCAImageFilter_txx
+#ifndef otbEstimateInnerProductPCAImageFilter_txx
+#define otbEstimateInnerProductPCAImageFilter_txx
 
 #include "otbEstimateInnerProductPCAImageFilter.h"
 
diff --git a/Modules/Filtering/DimensionalityReduction/include/otbFastICAImageFilter.h b/Modules/Filtering/DimensionalityReduction/include/otbFastICAImageFilter.h
index 9ed5f9c5a5..bd40d84ac8 100644
--- a/Modules/Filtering/DimensionalityReduction/include/otbFastICAImageFilter.h
+++ b/Modules/Filtering/DimensionalityReduction/include/otbFastICAImageFilter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbFastICAImageFilter_h
-#define __otbFastICAImageFilter_h
+#ifndef otbFastICAImageFilter_h
+#define otbFastICAImageFilter_h
 
 #include "itkImageToImageFilter.h"
 #include "otbPCAImageFilter.h"
diff --git a/Modules/Filtering/DimensionalityReduction/include/otbFastICAImageFilter.txx b/Modules/Filtering/DimensionalityReduction/include/otbFastICAImageFilter.txx
index 6aab3f19c5..28661f01db 100644
--- a/Modules/Filtering/DimensionalityReduction/include/otbFastICAImageFilter.txx
+++ b/Modules/Filtering/DimensionalityReduction/include/otbFastICAImageFilter.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbFastICAImageFilter_txx
-#define __otbFastICAImageFilter_txx
+#ifndef otbFastICAImageFilter_txx
+#define otbFastICAImageFilter_txx
 
 #include "otbFastICAImageFilter.h"
 
diff --git a/Modules/Filtering/DimensionalityReduction/include/otbFastICAInternalOptimizerVectorImageFilter.h b/Modules/Filtering/DimensionalityReduction/include/otbFastICAInternalOptimizerVectorImageFilter.h
index 0575bfc298..3403ba13fa 100644
--- a/Modules/Filtering/DimensionalityReduction/include/otbFastICAInternalOptimizerVectorImageFilter.h
+++ b/Modules/Filtering/DimensionalityReduction/include/otbFastICAInternalOptimizerVectorImageFilter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbFastICAInternalOptimizerVectorImageFilter_h
-#define __otbFastICAInternalOptimizerVectorImageFilter_h
+#ifndef otbFastICAInternalOptimizerVectorImageFilter_h
+#define otbFastICAInternalOptimizerVectorImageFilter_h
 
 #include "otbMacro.h"
 #include "otbMatrixImageFilter.h"
diff --git a/Modules/Filtering/DimensionalityReduction/include/otbFastICAInternalOptimizerVectorImageFilter.txx b/Modules/Filtering/DimensionalityReduction/include/otbFastICAInternalOptimizerVectorImageFilter.txx
index f3ada7eb7b..eb4876fc1c 100644
--- a/Modules/Filtering/DimensionalityReduction/include/otbFastICAInternalOptimizerVectorImageFilter.txx
+++ b/Modules/Filtering/DimensionalityReduction/include/otbFastICAInternalOptimizerVectorImageFilter.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbFastICAInternalOptimizerVectorImageFilter_txx
-#define __otbFastICAInternalOptimizerVectorImageFilter_txx
+#ifndef otbFastICAInternalOptimizerVectorImageFilter_txx
+#define otbFastICAInternalOptimizerVectorImageFilter_txx
 #include "otbFastICAInternalOptimizerVectorImageFilter.h"
 
 #include <itkMacro.h>
diff --git a/Modules/Filtering/DimensionalityReduction/include/otbInnerProductPCAImageFilter.h b/Modules/Filtering/DimensionalityReduction/include/otbInnerProductPCAImageFilter.h
index 6227397ac4..4e556f975e 100644
--- a/Modules/Filtering/DimensionalityReduction/include/otbInnerProductPCAImageFilter.h
+++ b/Modules/Filtering/DimensionalityReduction/include/otbInnerProductPCAImageFilter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbInnerProductPCAImageFilter_h
-#define __otbInnerProductPCAImageFilter_h
+#ifndef otbInnerProductPCAImageFilter_h
+#define otbInnerProductPCAImageFilter_h
 
 #include "otbImage.h"
 #include "otbMacro.h"
diff --git a/Modules/Filtering/DimensionalityReduction/include/otbInnerProductPCAImageFilter.txx b/Modules/Filtering/DimensionalityReduction/include/otbInnerProductPCAImageFilter.txx
index c6b03cec8d..834fc5a129 100644
--- a/Modules/Filtering/DimensionalityReduction/include/otbInnerProductPCAImageFilter.txx
+++ b/Modules/Filtering/DimensionalityReduction/include/otbInnerProductPCAImageFilter.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbInnerProductPCAImageFilter_txx
-#define __otbInnerProductPCAImageFilter_txx
+#ifndef otbInnerProductPCAImageFilter_txx
+#define otbInnerProductPCAImageFilter_txx
 
 #include "otbInnerProductPCAImageFilter.h"
 
diff --git a/Modules/Filtering/DimensionalityReduction/include/otbLocalActivityVectorImageFilter.h b/Modules/Filtering/DimensionalityReduction/include/otbLocalActivityVectorImageFilter.h
index 3f3a68a51e..388a81e4ca 100644
--- a/Modules/Filtering/DimensionalityReduction/include/otbLocalActivityVectorImageFilter.h
+++ b/Modules/Filtering/DimensionalityReduction/include/otbLocalActivityVectorImageFilter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbLocalActivityVectorImageFilter_h
-#define __otbLocalActivityVectorImageFilter_h
+#ifndef otbLocalActivityVectorImageFilter_h
+#define otbLocalActivityVectorImageFilter_h
 
 #include "otbUnaryFunctorNeighborhoodVectorImageFilter.h"
 
@@ -116,4 +116,4 @@ private:
 } // end of namespace otb
 
 
-#endif // __otbLocalActivityVectorImageFilter_h
+#endif // otbLocalActivityVectorImageFilter_h
diff --git a/Modules/Filtering/DimensionalityReduction/include/otbMNFImageFilter.h b/Modules/Filtering/DimensionalityReduction/include/otbMNFImageFilter.h
index 56d6deaae2..6f132355ca 100644
--- a/Modules/Filtering/DimensionalityReduction/include/otbMNFImageFilter.h
+++ b/Modules/Filtering/DimensionalityReduction/include/otbMNFImageFilter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbMNFImageFilter_h
-#define __otbMNFImageFilter_h
+#ifndef otbMNFImageFilter_h
+#define otbMNFImageFilter_h
 
 #include "otbPCAImageFilter.h"
 
diff --git a/Modules/Filtering/DimensionalityReduction/include/otbMNFImageFilter.txx b/Modules/Filtering/DimensionalityReduction/include/otbMNFImageFilter.txx
index 3308074e37..89854b10c0 100644
--- a/Modules/Filtering/DimensionalityReduction/include/otbMNFImageFilter.txx
+++ b/Modules/Filtering/DimensionalityReduction/include/otbMNFImageFilter.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbMNFImageFilter_txx
-#define __otbMNFImageFilter_txx
+#ifndef otbMNFImageFilter_txx
+#define otbMNFImageFilter_txx
 #include "otbMNFImageFilter.h"
 
 #include "itkMacro.h"
@@ -497,6 +497,6 @@ MNFImageFilter< TInputImage, TOutputImage, TNoiseImageFilter, TDirectionOfTransf
 
 } // end of namespace otb
 
-#endif // __otbMNFImageFilter_txx
+#endif // otbMNFImageFilter_txx
 
 
diff --git a/Modules/Filtering/DimensionalityReduction/include/otbMaximumAutocorrelationFactorImageFilter.h b/Modules/Filtering/DimensionalityReduction/include/otbMaximumAutocorrelationFactorImageFilter.h
index 7a4f8515a4..579675c711 100644
--- a/Modules/Filtering/DimensionalityReduction/include/otbMaximumAutocorrelationFactorImageFilter.h
+++ b/Modules/Filtering/DimensionalityReduction/include/otbMaximumAutocorrelationFactorImageFilter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbMaximumAutocorrelationFactorImageFilter_h
-#define __otbMaximumAutocorrelationFactorImageFilter_h
+#ifndef otbMaximumAutocorrelationFactorImageFilter_h
+#define otbMaximumAutocorrelationFactorImageFilter_h
 
 
 #include "otbStreamingStatisticsVectorImageFilter.h"
diff --git a/Modules/Filtering/DimensionalityReduction/include/otbMaximumAutocorrelationFactorImageFilter.txx b/Modules/Filtering/DimensionalityReduction/include/otbMaximumAutocorrelationFactorImageFilter.txx
index 1963ebb2e8..3b86aa0003 100644
--- a/Modules/Filtering/DimensionalityReduction/include/otbMaximumAutocorrelationFactorImageFilter.txx
+++ b/Modules/Filtering/DimensionalityReduction/include/otbMaximumAutocorrelationFactorImageFilter.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbMaximumAutocorrelationFactorImageFilter_txx
-#define __otbMaximumAutocorrelationFactorImageFilter_txx
+#ifndef otbMaximumAutocorrelationFactorImageFilter_txx
+#define otbMaximumAutocorrelationFactorImageFilter_txx
 
 #include "otbMaximumAutocorrelationFactorImageFilter.h"
 #include "otbMultiChannelExtractROI.h"
diff --git a/Modules/Filtering/DimensionalityReduction/include/otbNAPCAImageFilter.h b/Modules/Filtering/DimensionalityReduction/include/otbNAPCAImageFilter.h
index e6e2cf0c0c..5380f1368c 100644
--- a/Modules/Filtering/DimensionalityReduction/include/otbNAPCAImageFilter.h
+++ b/Modules/Filtering/DimensionalityReduction/include/otbNAPCAImageFilter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbNAPCAImageFilter_h
-#define __otbNAPCAImageFilter_h
+#ifndef otbNAPCAImageFilter_h
+#define otbNAPCAImageFilter_h
 
 #include "otbMNFImageFilter.h"
 
diff --git a/Modules/Filtering/DimensionalityReduction/include/otbNAPCAImageFilter.txx b/Modules/Filtering/DimensionalityReduction/include/otbNAPCAImageFilter.txx
index d7797ed112..e7539acabd 100644
--- a/Modules/Filtering/DimensionalityReduction/include/otbNAPCAImageFilter.txx
+++ b/Modules/Filtering/DimensionalityReduction/include/otbNAPCAImageFilter.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbNAPCAImageFilter_txx
-#define __otbNAPCAImageFilter_txx
+#ifndef otbNAPCAImageFilter_txx
+#define otbNAPCAImageFilter_txx
 #include "otbNAPCAImageFilter.h"
 
 #include "itkMacro.h"
diff --git a/Modules/Filtering/DimensionalityReduction/include/otbNormalizeInnerProductPCAImageFilter.h b/Modules/Filtering/DimensionalityReduction/include/otbNormalizeInnerProductPCAImageFilter.h
index 1b38d267ce..bcfa3e4bff 100644
--- a/Modules/Filtering/DimensionalityReduction/include/otbNormalizeInnerProductPCAImageFilter.h
+++ b/Modules/Filtering/DimensionalityReduction/include/otbNormalizeInnerProductPCAImageFilter.h
@@ -18,8 +18,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbNormalizeInnerProductPCAImageFilter_h
-#define __otbNormalizeInnerProductPCAImageFilter_h
+#ifndef otbNormalizeInnerProductPCAImageFilter_h
+#define otbNormalizeInnerProductPCAImageFilter_h
 
 #include "itkInPlaceImageFilter.h"
 #include "otbStreamingStatisticsVectorImageFilter.h"
diff --git a/Modules/Filtering/DimensionalityReduction/include/otbNormalizeInnerProductPCAImageFilter.txx b/Modules/Filtering/DimensionalityReduction/include/otbNormalizeInnerProductPCAImageFilter.txx
index 46eabc8d37..a141b76474 100644
--- a/Modules/Filtering/DimensionalityReduction/include/otbNormalizeInnerProductPCAImageFilter.txx
+++ b/Modules/Filtering/DimensionalityReduction/include/otbNormalizeInnerProductPCAImageFilter.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbNormalizeInnerProductPCAImageFilter_txx
-#define __otbNormalizeInnerProductPCAImageFilter_txx
+#ifndef otbNormalizeInnerProductPCAImageFilter_txx
+#define otbNormalizeInnerProductPCAImageFilter_txx
 
 #include "otbNormalizeInnerProductPCAImageFilter.h"
 #include "itkImageRegionIterator.h"
diff --git a/Modules/Filtering/DimensionalityReduction/include/otbPCAImageFilter.h b/Modules/Filtering/DimensionalityReduction/include/otbPCAImageFilter.h
index edfecfa6d4..4c992e02d2 100644
--- a/Modules/Filtering/DimensionalityReduction/include/otbPCAImageFilter.h
+++ b/Modules/Filtering/DimensionalityReduction/include/otbPCAImageFilter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbPCAImageFilter_h
-#define __otbPCAImageFilter_h
+#ifndef otbPCAImageFilter_h
+#define otbPCAImageFilter_h
 
 #include "otbMacro.h"
 #include "otbMatrixImageFilter.h"
@@ -216,4 +216,4 @@ private:
 #include "otbPCAImageFilter.txx"
 #endif
 
-#endif // __otbPCAImageFilter_h
+#endif // otbPCAImageFilter_h
diff --git a/Modules/Filtering/DimensionalityReduction/include/otbPCAImageFilter.txx b/Modules/Filtering/DimensionalityReduction/include/otbPCAImageFilter.txx
index 69d298cd12..8a37fd98d9 100644
--- a/Modules/Filtering/DimensionalityReduction/include/otbPCAImageFilter.txx
+++ b/Modules/Filtering/DimensionalityReduction/include/otbPCAImageFilter.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbPCAImageFilter_txx
-#define __otbPCAImageFilter_txx
+#ifndef otbPCAImageFilter_txx
+#define otbPCAImageFilter_txx
 #include "otbPCAImageFilter.h"
 
 #include "itkMacro.h"
@@ -478,6 +478,6 @@ PCAImageFilter< TInputImage, TOutputImage, TDirectionOfTransformation >
 
 } // end of namespace otb
 
-#endif // __otbPCAImageFilter_txx
+#endif // otbPCAImageFilter_txx
 
 
diff --git a/Modules/Filtering/DimensionalityReduction/include/otbSparseWvltToAngleMapperListFilter.h b/Modules/Filtering/DimensionalityReduction/include/otbSparseWvltToAngleMapperListFilter.h
index bad67e0981..ee7b9da200 100644
--- a/Modules/Filtering/DimensionalityReduction/include/otbSparseWvltToAngleMapperListFilter.h
+++ b/Modules/Filtering/DimensionalityReduction/include/otbSparseWvltToAngleMapperListFilter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbSparseWvltToAngleMapperListFilter_h
-#define __otbSparseWvltToAngleMapperListFilter_h
+#ifndef otbSparseWvltToAngleMapperListFilter_h
+#define otbSparseWvltToAngleMapperListFilter_h
 
 #include "otbMath.h"
 #include "otbImageList.h"
diff --git a/Modules/Filtering/DimensionalityReduction/include/otbSparseWvltToAngleMapperListFilter.txx b/Modules/Filtering/DimensionalityReduction/include/otbSparseWvltToAngleMapperListFilter.txx
index 21e21a0f77..c99bedf39a 100644
--- a/Modules/Filtering/DimensionalityReduction/include/otbSparseWvltToAngleMapperListFilter.txx
+++ b/Modules/Filtering/DimensionalityReduction/include/otbSparseWvltToAngleMapperListFilter.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbSparseWvltToAngleMapperListFilter_txx
-#define __otbSparseWvltToAngleMapperListFilter_txx
+#ifndef otbSparseWvltToAngleMapperListFilter_txx
+#define otbSparseWvltToAngleMapperListFilter_txx
 #include "otbSparseWvltToAngleMapperListFilter.h"
 
 #include <vnl/vnl_math.h>
diff --git a/Modules/Filtering/ImageManipulation/include/otbAffineFunctor.h b/Modules/Filtering/ImageManipulation/include/otbAffineFunctor.h
index 22a4c138dd..d26cb4c3a0 100644
--- a/Modules/Filtering/ImageManipulation/include/otbAffineFunctor.h
+++ b/Modules/Filtering/ImageManipulation/include/otbAffineFunctor.h
@@ -16,8 +16,8 @@
 
 =========================================================================*/
 
-#ifndef __otbAffineFunctor_h
-#define __otbAffineFunctor_h
+#ifndef otbAffineFunctor_h
+#define otbAffineFunctor_h
 
 namespace otb
 {
diff --git a/Modules/Filtering/ImageManipulation/include/otbAlphaBlendingFunctor.h b/Modules/Filtering/ImageManipulation/include/otbAlphaBlendingFunctor.h
index 5201c34cca..5a3e56d0e0 100644
--- a/Modules/Filtering/ImageManipulation/include/otbAlphaBlendingFunctor.h
+++ b/Modules/Filtering/ImageManipulation/include/otbAlphaBlendingFunctor.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbAlphaBlendingFunctor_h
-#define __otbAlphaBlendingFunctor_h
+#ifndef otbAlphaBlendingFunctor_h
+#define otbAlphaBlendingFunctor_h
 
 #include "itkRGBAPixel.h"
 namespace otb
diff --git a/Modules/Filtering/ImageManipulation/include/otbAmplitudeFunctor.h b/Modules/Filtering/ImageManipulation/include/otbAmplitudeFunctor.h
index 8b46602096..baa08411d8 100644
--- a/Modules/Filtering/ImageManipulation/include/otbAmplitudeFunctor.h
+++ b/Modules/Filtering/ImageManipulation/include/otbAmplitudeFunctor.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbAmplitudeFunctor_h
-#define __otbAmplitudeFunctor_h
+#ifndef otbAmplitudeFunctor_h
+#define otbAmplitudeFunctor_h
 
 #include "otbChannelSelectorFunctor.h"
 
diff --git a/Modules/Filtering/ImageManipulation/include/otbBinaryFunctorNeighborhoodImageFilter.h b/Modules/Filtering/ImageManipulation/include/otbBinaryFunctorNeighborhoodImageFilter.h
index 73e17ea6e2..b28324838f 100644
--- a/Modules/Filtering/ImageManipulation/include/otbBinaryFunctorNeighborhoodImageFilter.h
+++ b/Modules/Filtering/ImageManipulation/include/otbBinaryFunctorNeighborhoodImageFilter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbBinaryFunctorNeighborhoodImageFilter_h
-#define __otbBinaryFunctorNeighborhoodImageFilter_h
+#ifndef otbBinaryFunctorNeighborhoodImageFilter_h
+#define otbBinaryFunctorNeighborhoodImageFilter_h
 
 #include "itkImageToImageFilter.h"
 #include "itkImageRegionIteratorWithIndex.h"
diff --git a/Modules/Filtering/ImageManipulation/include/otbBinaryFunctorNeighborhoodImageFilter.txx b/Modules/Filtering/ImageManipulation/include/otbBinaryFunctorNeighborhoodImageFilter.txx
index 97fde0633e..d5e13ccf18 100644
--- a/Modules/Filtering/ImageManipulation/include/otbBinaryFunctorNeighborhoodImageFilter.txx
+++ b/Modules/Filtering/ImageManipulation/include/otbBinaryFunctorNeighborhoodImageFilter.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbBinaryFunctorNeighborhoodImageFilter_txx
-#define __otbBinaryFunctorNeighborhoodImageFilter_txx
+#ifndef otbBinaryFunctorNeighborhoodImageFilter_txx
+#define otbBinaryFunctorNeighborhoodImageFilter_txx
 
 #include "otbBinaryFunctorNeighborhoodImageFilter.h"
 #include "itkImageRegionIterator.h"
diff --git a/Modules/Filtering/ImageManipulation/include/otbBinaryFunctorNeighborhoodVectorImageFilter.h b/Modules/Filtering/ImageManipulation/include/otbBinaryFunctorNeighborhoodVectorImageFilter.h
index e2f3ed3850..ccd6497f24 100644
--- a/Modules/Filtering/ImageManipulation/include/otbBinaryFunctorNeighborhoodVectorImageFilter.h
+++ b/Modules/Filtering/ImageManipulation/include/otbBinaryFunctorNeighborhoodVectorImageFilter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbBinaryFunctorNeighborhoodVectorImageFilter_h
-#define __otbBinaryFunctorNeighborhoodVectorImageFilter_h
+#ifndef otbBinaryFunctorNeighborhoodVectorImageFilter_h
+#define otbBinaryFunctorNeighborhoodVectorImageFilter_h
 
 #include "itkInPlaceImageFilter.h"
 #include "itkImageRegionIteratorWithIndex.h"
diff --git a/Modules/Filtering/ImageManipulation/include/otbBinaryFunctorNeighborhoodVectorImageFilter.txx b/Modules/Filtering/ImageManipulation/include/otbBinaryFunctorNeighborhoodVectorImageFilter.txx
index afcbfcce16..f0519c0a2a 100644
--- a/Modules/Filtering/ImageManipulation/include/otbBinaryFunctorNeighborhoodVectorImageFilter.txx
+++ b/Modules/Filtering/ImageManipulation/include/otbBinaryFunctorNeighborhoodVectorImageFilter.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbBinaryFunctorNeighborhoodVectorImageFilter_txx
-#define __otbBinaryFunctorNeighborhoodVectorImageFilter_txx
+#ifndef otbBinaryFunctorNeighborhoodVectorImageFilter_txx
+#define otbBinaryFunctorNeighborhoodVectorImageFilter_txx
 
 #include "otbBinaryFunctorNeighborhoodVectorImageFilter.h"
 #include "itkImageRegionIterator.h"
diff --git a/Modules/Filtering/ImageManipulation/include/otbBinaryImageDensityFunction.h b/Modules/Filtering/ImageManipulation/include/otbBinaryImageDensityFunction.h
index 3f5d41fb4f..510bde9e32 100644
--- a/Modules/Filtering/ImageManipulation/include/otbBinaryImageDensityFunction.h
+++ b/Modules/Filtering/ImageManipulation/include/otbBinaryImageDensityFunction.h
@@ -17,8 +17,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbBinaryImageDensityFunction_h
-#define __otbBinaryImageDensityFunction_h
+#ifndef otbBinaryImageDensityFunction_h
+#define otbBinaryImageDensityFunction_h
 
 #include "itkImageFunction.h"
 #include "itkNumericTraits.h"
diff --git a/Modules/Filtering/ImageManipulation/include/otbBinaryImageDensityFunction.txx b/Modules/Filtering/ImageManipulation/include/otbBinaryImageDensityFunction.txx
index 332adbdd10..28131a2659 100644
--- a/Modules/Filtering/ImageManipulation/include/otbBinaryImageDensityFunction.txx
+++ b/Modules/Filtering/ImageManipulation/include/otbBinaryImageDensityFunction.txx
@@ -19,8 +19,8 @@
 
 =========================================================================*/
 
-#ifndef __otbBinaryImageDensityFunction_txx
-#define __otbBinaryImageDensityFunction_txx
+#ifndef otbBinaryImageDensityFunction_txx
+#define otbBinaryImageDensityFunction_txx
 
 #include "otbBinaryImageDensityFunction.h"
 
diff --git a/Modules/Filtering/ImageManipulation/include/otbBinaryImageMinimalBoundingRegionCalculator.h b/Modules/Filtering/ImageManipulation/include/otbBinaryImageMinimalBoundingRegionCalculator.h
index 3c0dc39fb1..c5e5ee56ae 100644
--- a/Modules/Filtering/ImageManipulation/include/otbBinaryImageMinimalBoundingRegionCalculator.h
+++ b/Modules/Filtering/ImageManipulation/include/otbBinaryImageMinimalBoundingRegionCalculator.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbBinaryImageMinimalBoundingRegionCalculator_h
-#define __otbBinaryImageMinimalBoundingRegionCalculator_h
+#ifndef otbBinaryImageMinimalBoundingRegionCalculator_h
+#define otbBinaryImageMinimalBoundingRegionCalculator_h
 
 #include "itkImageToImageFilter.h"
 #include "itkObjectFactory.h"
diff --git a/Modules/Filtering/ImageManipulation/include/otbBinaryImageMinimalBoundingRegionCalculator.txx b/Modules/Filtering/ImageManipulation/include/otbBinaryImageMinimalBoundingRegionCalculator.txx
index c97db4063a..a518ebde8b 100644
--- a/Modules/Filtering/ImageManipulation/include/otbBinaryImageMinimalBoundingRegionCalculator.txx
+++ b/Modules/Filtering/ImageManipulation/include/otbBinaryImageMinimalBoundingRegionCalculator.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbBinaryImageMinimalBoundingRegionCalculator_txx
-#define __otbBinaryImageMinimalBoundingRegionCalculator_txx
+#ifndef otbBinaryImageMinimalBoundingRegionCalculator_txx
+#define otbBinaryImageMinimalBoundingRegionCalculator_txx
 
 #include "otbBinaryImageMinimalBoundingRegionCalculator.h"
 #include "itkImageSliceConstIteratorWithIndex.h"
diff --git a/Modules/Filtering/ImageManipulation/include/otbBinaryImageToDensityImageFilter.h b/Modules/Filtering/ImageManipulation/include/otbBinaryImageToDensityImageFilter.h
index 69a448b2f0..da268eec54 100644
--- a/Modules/Filtering/ImageManipulation/include/otbBinaryImageToDensityImageFilter.h
+++ b/Modules/Filtering/ImageManipulation/include/otbBinaryImageToDensityImageFilter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbBinaryImageToDensityImageFilter_h
-#define __otbBinaryImageToDensityImageFilter_h
+#ifndef otbBinaryImageToDensityImageFilter_h
+#define otbBinaryImageToDensityImageFilter_h
 
 #include "itkImageToImageFilter.h"
 #include "itkDataObject.h"
diff --git a/Modules/Filtering/ImageManipulation/include/otbBinaryImageToDensityImageFilter.txx b/Modules/Filtering/ImageManipulation/include/otbBinaryImageToDensityImageFilter.txx
index 48ef72e5c6..d0bef89f06 100644
--- a/Modules/Filtering/ImageManipulation/include/otbBinaryImageToDensityImageFilter.txx
+++ b/Modules/Filtering/ImageManipulation/include/otbBinaryImageToDensityImageFilter.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbBinaryImageToDensityImageFilter_txx
-#define __otbBinaryImageToDensityImageFilter_txx
+#ifndef otbBinaryImageToDensityImageFilter_txx
+#define otbBinaryImageToDensityImageFilter_txx
 
 #include "otbBinaryImageToDensityImageFilter.h"
 #include "itkImageRegionIterator.h"
diff --git a/Modules/Filtering/ImageManipulation/include/otbBinarySpectralAngleFunctor.h b/Modules/Filtering/ImageManipulation/include/otbBinarySpectralAngleFunctor.h
index b56db8e7c9..be4bfefdc6 100644
--- a/Modules/Filtering/ImageManipulation/include/otbBinarySpectralAngleFunctor.h
+++ b/Modules/Filtering/ImageManipulation/include/otbBinarySpectralAngleFunctor.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbBinarySpectralAngleFunctor_h
-#define __otbBinarySpectralAngleFunctor_h
+#ifndef otbBinarySpectralAngleFunctor_h
+#define otbBinarySpectralAngleFunctor_h
 
 #include <algorithm>
 #include "otbMath.h"
diff --git a/Modules/Filtering/ImageManipulation/include/otbBoxAndWhiskerImageFilter.h b/Modules/Filtering/ImageManipulation/include/otbBoxAndWhiskerImageFilter.h
index 263b4ad8fa..78e32f8c00 100644
--- a/Modules/Filtering/ImageManipulation/include/otbBoxAndWhiskerImageFilter.h
+++ b/Modules/Filtering/ImageManipulation/include/otbBoxAndWhiskerImageFilter.h
@@ -18,8 +18,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbBoxAndWhiskerImageFilter_h
-#define __otbBoxAndWhiskerImageFilter_h
+#ifndef otbBoxAndWhiskerImageFilter_h
+#define otbBoxAndWhiskerImageFilter_h
 
 #include "itkMacro.h"
 #include "itkUnaryFunctorImageFilter.h"
diff --git a/Modules/Filtering/ImageManipulation/include/otbBoxAndWhiskerImageFilter.txx b/Modules/Filtering/ImageManipulation/include/otbBoxAndWhiskerImageFilter.txx
index f15af8aef1..6c7b62d8b5 100644
--- a/Modules/Filtering/ImageManipulation/include/otbBoxAndWhiskerImageFilter.txx
+++ b/Modules/Filtering/ImageManipulation/include/otbBoxAndWhiskerImageFilter.txx
@@ -18,8 +18,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbBoxAndWhiskerImageFilter_txx
-#define __otbBoxAndWhiskerImageFilter_txx
+#ifndef otbBoxAndWhiskerImageFilter_txx
+#define otbBoxAndWhiskerImageFilter_txx
 
 #include <vector>
 #include <algorithm>
diff --git a/Modules/Filtering/ImageManipulation/include/otbChangeInformationImageFilter.h b/Modules/Filtering/ImageManipulation/include/otbChangeInformationImageFilter.h
index 06d0ee4741..29b2abf7a9 100644
--- a/Modules/Filtering/ImageManipulation/include/otbChangeInformationImageFilter.h
+++ b/Modules/Filtering/ImageManipulation/include/otbChangeInformationImageFilter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbChangeInformationImageFilter_h
-#define __otbChangeInformationImageFilter_h
+#ifndef otbChangeInformationImageFilter_h
+#define otbChangeInformationImageFilter_h
 
 #include "itkChangeInformationImageFilter.h"
 #include "otbMetaDataKey.h"
diff --git a/Modules/Filtering/ImageManipulation/include/otbChangeInformationImageFilter.txx b/Modules/Filtering/ImageManipulation/include/otbChangeInformationImageFilter.txx
index 319684064c..d56a694eda 100644
--- a/Modules/Filtering/ImageManipulation/include/otbChangeInformationImageFilter.txx
+++ b/Modules/Filtering/ImageManipulation/include/otbChangeInformationImageFilter.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbChangeInformationImageFilter_txx
-#define __otbChangeInformationImageFilter_txx
+#ifndef otbChangeInformationImageFilter_txx
+#define otbChangeInformationImageFilter_txx
 
 #include "otbChangeInformationImageFilter.h"
 #include "itkMetaDataObject.h"
diff --git a/Modules/Filtering/ImageManipulation/include/otbChangeLabelImageFilter.h b/Modules/Filtering/ImageManipulation/include/otbChangeLabelImageFilter.h
index b26d8a4fea..5cdf24dec3 100644
--- a/Modules/Filtering/ImageManipulation/include/otbChangeLabelImageFilter.h
+++ b/Modules/Filtering/ImageManipulation/include/otbChangeLabelImageFilter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbChangeLabelImageFilter_h
-#define __otbChangeLabelImageFilter_h
+#ifndef otbChangeLabelImageFilter_h
+#define otbChangeLabelImageFilter_h
 
 #include "itkUnaryFunctorImageFilter.h"
 #include "itkConceptChecking.h"
diff --git a/Modules/Filtering/ImageManipulation/include/otbChangeLabelImageFilter.txx b/Modules/Filtering/ImageManipulation/include/otbChangeLabelImageFilter.txx
index 4d37003091..dc5438737b 100644
--- a/Modules/Filtering/ImageManipulation/include/otbChangeLabelImageFilter.txx
+++ b/Modules/Filtering/ImageManipulation/include/otbChangeLabelImageFilter.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbChangeLabelImageFilter_txx
-#define __otbChangeLabelImageFilter_txx
+#ifndef otbChangeLabelImageFilter_txx
+#define otbChangeLabelImageFilter_txx
 
 #include "otbChangeLabelImageFilter.h"
 
diff --git a/Modules/Filtering/ImageManipulation/include/otbChangeNoDataValueFilter.h b/Modules/Filtering/ImageManipulation/include/otbChangeNoDataValueFilter.h
index 7ebee3bf6a..6767be3145 100644
--- a/Modules/Filtering/ImageManipulation/include/otbChangeNoDataValueFilter.h
+++ b/Modules/Filtering/ImageManipulation/include/otbChangeNoDataValueFilter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbChangeNoDataValueFilter_h
-#define __otbChangeNoDataValueFilter_h
+#ifndef otbChangeNoDataValueFilter_h
+#define otbChangeNoDataValueFilter_h
 
 #include "itkUnaryFunctorImageFilter.h"
 #include "itkMetaDataObject.h"
diff --git a/Modules/Filtering/ImageManipulation/include/otbClampImageFilter.h b/Modules/Filtering/ImageManipulation/include/otbClampImageFilter.h
index 0b5cf4663e..fd2c6a54ab 100644
--- a/Modules/Filtering/ImageManipulation/include/otbClampImageFilter.h
+++ b/Modules/Filtering/ImageManipulation/include/otbClampImageFilter.h
@@ -14,8 +14,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbClampImageFilter_h
-#define __otbClampImageFilter_h
+#ifndef otbClampImageFilter_h
+#define otbClampImageFilter_h
 
 #include "itkImageToImageFilter.h"
 
diff --git a/Modules/Filtering/ImageManipulation/include/otbClampImageFilter.txx b/Modules/Filtering/ImageManipulation/include/otbClampImageFilter.txx
index 89abe23b22..cb1f7fcab8 100644
--- a/Modules/Filtering/ImageManipulation/include/otbClampImageFilter.txx
+++ b/Modules/Filtering/ImageManipulation/include/otbClampImageFilter.txx
@@ -15,8 +15,8 @@
 
 =========================================================================*/
 
-#ifndef __otbClampImageFilter_txx
-#define __otbClampImageFilter_txx
+#ifndef otbClampImageFilter_txx
+#define otbClampImageFilter_txx
 
 #include "otbClampImageFilter.h"
 #include "itkImageRegionIterator.h"
diff --git a/Modules/Filtering/ImageManipulation/include/otbClampVectorImageFilter.h b/Modules/Filtering/ImageManipulation/include/otbClampVectorImageFilter.h
index 4f0f4ebf5b..8a2adf3c19 100644
--- a/Modules/Filtering/ImageManipulation/include/otbClampVectorImageFilter.h
+++ b/Modules/Filtering/ImageManipulation/include/otbClampVectorImageFilter.h
@@ -14,8 +14,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbClampVectorImageFilter_h
-#define __otbClampVectorImageFilter_h
+#ifndef otbClampVectorImageFilter_h
+#define otbClampVectorImageFilter_h
 
 #include "itkImageToImageFilter.h"
 
diff --git a/Modules/Filtering/ImageManipulation/include/otbClampVectorImageFilter.txx b/Modules/Filtering/ImageManipulation/include/otbClampVectorImageFilter.txx
index e6893ab213..d6259e7235 100644
--- a/Modules/Filtering/ImageManipulation/include/otbClampVectorImageFilter.txx
+++ b/Modules/Filtering/ImageManipulation/include/otbClampVectorImageFilter.txx
@@ -15,8 +15,8 @@
 
 =========================================================================*/
 
-#ifndef __otbClampVectorImageFilter_txx
-#define __otbClampVectorImageFilter_txx
+#ifndef otbClampVectorImageFilter_txx
+#define otbClampVectorImageFilter_txx
 
 #include "otbClampVectorImageFilter.h"
 #include "itkImageRegionIterator.h"
diff --git a/Modules/Filtering/ImageManipulation/include/otbConcatenateScalarValueImageFilter.h b/Modules/Filtering/ImageManipulation/include/otbConcatenateScalarValueImageFilter.h
index 20b4c16b1f..0839c75516 100644
--- a/Modules/Filtering/ImageManipulation/include/otbConcatenateScalarValueImageFilter.h
+++ b/Modules/Filtering/ImageManipulation/include/otbConcatenateScalarValueImageFilter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbConcatenateScalarValueImageFilter_h
-#define __otbConcatenateScalarValueImageFilter_h
+#ifndef otbConcatenateScalarValueImageFilter_h
+#define otbConcatenateScalarValueImageFilter_h
 
 #include "itkMacro.h"
 #include "itkUnaryFunctorImageFilter.h"
diff --git a/Modules/Filtering/ImageManipulation/include/otbConcatenateScalarValueImageFilter.txx b/Modules/Filtering/ImageManipulation/include/otbConcatenateScalarValueImageFilter.txx
index e2c8ff1ccc..40099dc544 100644
--- a/Modules/Filtering/ImageManipulation/include/otbConcatenateScalarValueImageFilter.txx
+++ b/Modules/Filtering/ImageManipulation/include/otbConcatenateScalarValueImageFilter.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbConcatenateScalarValueImageFilter_txx
-#define __otbConcatenateScalarValueImageFilter_txx
+#ifndef otbConcatenateScalarValueImageFilter_txx
+#define otbConcatenateScalarValueImageFilter_txx
 
 #include "otbConcatenateScalarValueImageFilter.h"
 
diff --git a/Modules/Filtering/ImageManipulation/include/otbConcatenateVectorImageFilter.h b/Modules/Filtering/ImageManipulation/include/otbConcatenateVectorImageFilter.h
index b78bb65531..12f290d981 100644
--- a/Modules/Filtering/ImageManipulation/include/otbConcatenateVectorImageFilter.h
+++ b/Modules/Filtering/ImageManipulation/include/otbConcatenateVectorImageFilter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbConcatenateVectorImageFilter_h
-#define __otbConcatenateVectorImageFilter_h
+#ifndef otbConcatenateVectorImageFilter_h
+#define otbConcatenateVectorImageFilter_h
 
 #include "itkImageToImageFilter.h"
 #include "otbVectorImage.h"
diff --git a/Modules/Filtering/ImageManipulation/include/otbConcatenateVectorImageFilter.txx b/Modules/Filtering/ImageManipulation/include/otbConcatenateVectorImageFilter.txx
index d956787de2..24ecb274f8 100644
--- a/Modules/Filtering/ImageManipulation/include/otbConcatenateVectorImageFilter.txx
+++ b/Modules/Filtering/ImageManipulation/include/otbConcatenateVectorImageFilter.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbConcatenateVectorImageFilter_txx
-#define __otbConcatenateVectorImageFilter_txx
+#ifndef otbConcatenateVectorImageFilter_txx
+#define otbConcatenateVectorImageFilter_txx
 
 #include "otbConcatenateVectorImageFilter.h"
 #include "itkImageRegionIterator.h"
diff --git a/Modules/Filtering/ImageManipulation/include/otbEuclideanDistanceMetricWithMissingValue.h b/Modules/Filtering/ImageManipulation/include/otbEuclideanDistanceMetricWithMissingValue.h
index a2ce996de8..3f6a73275c 100644
--- a/Modules/Filtering/ImageManipulation/include/otbEuclideanDistanceMetricWithMissingValue.h
+++ b/Modules/Filtering/ImageManipulation/include/otbEuclideanDistanceMetricWithMissingValue.h
@@ -18,8 +18,8 @@
 
 =========================================================================*/
 
-#ifndef __otbEuclideanDistanceMetricWithMissingValue_h
-#define __otbEuclideanDistanceMetricWithMissingValue_h
+#ifndef otbEuclideanDistanceMetricWithMissingValue_h
+#define otbEuclideanDistanceMetricWithMissingValue_h
 
 #include "otbEuclideanDistanceMetricWithMissingValuePow2.h"
 
diff --git a/Modules/Filtering/ImageManipulation/include/otbEuclideanDistanceMetricWithMissingValuePow2.h b/Modules/Filtering/ImageManipulation/include/otbEuclideanDistanceMetricWithMissingValuePow2.h
index 0acd5e5f32..08c9283657 100644
--- a/Modules/Filtering/ImageManipulation/include/otbEuclideanDistanceMetricWithMissingValuePow2.h
+++ b/Modules/Filtering/ImageManipulation/include/otbEuclideanDistanceMetricWithMissingValuePow2.h
@@ -18,8 +18,8 @@
 
 =========================================================================*/
 
-#ifndef __otbEuclideanDistanceMetricWithMissingValuePow2_h
-#define __otbEuclideanDistanceMetricWithMissingValuePow2_h
+#ifndef otbEuclideanDistanceMetricWithMissingValuePow2_h
+#define otbEuclideanDistanceMetricWithMissingValuePow2_h
 
 #include "itkEuclideanDistanceMetric.h"
 
diff --git a/Modules/Filtering/ImageManipulation/include/otbEuclideanDistanceMetricWithMissingValuePow2.txx b/Modules/Filtering/ImageManipulation/include/otbEuclideanDistanceMetricWithMissingValuePow2.txx
index 37c2115f0f..79a1347b1a 100644
--- a/Modules/Filtering/ImageManipulation/include/otbEuclideanDistanceMetricWithMissingValuePow2.txx
+++ b/Modules/Filtering/ImageManipulation/include/otbEuclideanDistanceMetricWithMissingValuePow2.txx
@@ -18,8 +18,8 @@
 
 =========================================================================*/
 
-#ifndef __otbEuclideanDistanceMetricWithMissingValuePow2_txx
-#define __otbEuclideanDistanceMetricWithMissingValuePow2_txx
+#ifndef otbEuclideanDistanceMetricWithMissingValuePow2_txx
+#define otbEuclideanDistanceMetricWithMissingValuePow2_txx
 
 #include "itkMeasurementVectorTraits.h"
 
diff --git a/Modules/Filtering/ImageManipulation/include/otbFlexibleDistanceWithMissingValue.h b/Modules/Filtering/ImageManipulation/include/otbFlexibleDistanceWithMissingValue.h
index 437189b305..ac156f9e05 100644
--- a/Modules/Filtering/ImageManipulation/include/otbFlexibleDistanceWithMissingValue.h
+++ b/Modules/Filtering/ImageManipulation/include/otbFlexibleDistanceWithMissingValue.h
@@ -18,8 +18,8 @@
 
 =========================================================================*/
 
-#ifndef __otbFlexibleDistanceWithMissingValue_h
-#define __otbFlexibleDistanceWithMissingValue_h
+#ifndef otbFlexibleDistanceWithMissingValue_h
+#define otbFlexibleDistanceWithMissingValue_h
 
 #include "otbEuclideanDistanceMetricWithMissingValuePow2.h"
 
diff --git a/Modules/Filtering/ImageManipulation/include/otbFlexibleDistanceWithMissingValue.txx b/Modules/Filtering/ImageManipulation/include/otbFlexibleDistanceWithMissingValue.txx
index 9bdb74433f..af2d811259 100644
--- a/Modules/Filtering/ImageManipulation/include/otbFlexibleDistanceWithMissingValue.txx
+++ b/Modules/Filtering/ImageManipulation/include/otbFlexibleDistanceWithMissingValue.txx
@@ -18,8 +18,8 @@
 
 =========================================================================*/
 
-#ifndef __otbFlexibleDistanceWithMissingValue_txx
-#define __otbFlexibleDistanceWithMissingValue_txx
+#ifndef otbFlexibleDistanceWithMissingValue_txx
+#define otbFlexibleDistanceWithMissingValue_txx
 
 #include "itkNumericTraits.h"
 
diff --git a/Modules/Filtering/ImageManipulation/include/otbFunctionWithNeighborhoodToImageFilter.h b/Modules/Filtering/ImageManipulation/include/otbFunctionWithNeighborhoodToImageFilter.h
index 258362d560..f387bc8e39 100644
--- a/Modules/Filtering/ImageManipulation/include/otbFunctionWithNeighborhoodToImageFilter.h
+++ b/Modules/Filtering/ImageManipulation/include/otbFunctionWithNeighborhoodToImageFilter.h
@@ -18,8 +18,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbFunctionWithNeighborhoodToImageFilter_h
-#define __otbFunctionWithNeighborhoodToImageFilter_h
+#ifndef otbFunctionWithNeighborhoodToImageFilter_h
+#define otbFunctionWithNeighborhoodToImageFilter_h
 
 #include "otbFunctionToImageFilter.h"
 
diff --git a/Modules/Filtering/ImageManipulation/include/otbFunctionWithNeighborhoodToImageFilter.txx b/Modules/Filtering/ImageManipulation/include/otbFunctionWithNeighborhoodToImageFilter.txx
index 1343d615ca..416d644d7c 100644
--- a/Modules/Filtering/ImageManipulation/include/otbFunctionWithNeighborhoodToImageFilter.txx
+++ b/Modules/Filtering/ImageManipulation/include/otbFunctionWithNeighborhoodToImageFilter.txx
@@ -18,8 +18,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbFunctionWithNeighborhoodToImageFilter_txx
-#define __otbFunctionWithNeighborhoodToImageFilter_txx
+#ifndef otbFunctionWithNeighborhoodToImageFilter_txx
+#define otbFunctionWithNeighborhoodToImageFilter_txx
 
 #include "otbFunctionWithNeighborhoodToImageFilter.h"
 #include "otbMacro.h"
diff --git a/Modules/Filtering/ImageManipulation/include/otbGridResampleImageFilter.h b/Modules/Filtering/ImageManipulation/include/otbGridResampleImageFilter.h
index c33fb06f74..d6e9e9eb28 100644
--- a/Modules/Filtering/ImageManipulation/include/otbGridResampleImageFilter.h
+++ b/Modules/Filtering/ImageManipulation/include/otbGridResampleImageFilter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbGridResampleImageFilter_h
-#define __otbGridResampleImageFilter_h
+#ifndef otbGridResampleImageFilter_h
+#define otbGridResampleImageFilter_h
 
 
 #include "itkImageToImageFilter.h"
diff --git a/Modules/Filtering/ImageManipulation/include/otbGridResampleImageFilter.txx b/Modules/Filtering/ImageManipulation/include/otbGridResampleImageFilter.txx
index 2f0ec7cf57..51847f1928 100644
--- a/Modules/Filtering/ImageManipulation/include/otbGridResampleImageFilter.txx
+++ b/Modules/Filtering/ImageManipulation/include/otbGridResampleImageFilter.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbGridResampleImageFilter_txx
-#define __otbGridResampleImageFilter_txx
+#ifndef otbGridResampleImageFilter_txx
+#define otbGridResampleImageFilter_txx
 
 #include "otbGridResampleImageFilter.h"
 
diff --git a/Modules/Filtering/ImageManipulation/include/otbHillShadingFilter.h b/Modules/Filtering/ImageManipulation/include/otbHillShadingFilter.h
index ce9c5ed716..cfaeaa271e 100644
--- a/Modules/Filtering/ImageManipulation/include/otbHillShadingFilter.h
+++ b/Modules/Filtering/ImageManipulation/include/otbHillShadingFilter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbHillShadingFilter_h
-#define __otbHillShadingFilter_h
+#ifndef otbHillShadingFilter_h
+#define otbHillShadingFilter_h
 
 #include "otbUnaryFunctorNeighborhoodImageFilter.h"
 #include "otbHillShadingFunctor.h"
diff --git a/Modules/Filtering/ImageManipulation/include/otbHillShadingFunctor.h b/Modules/Filtering/ImageManipulation/include/otbHillShadingFunctor.h
index 4a62f6fd29..415b2c39db 100644
--- a/Modules/Filtering/ImageManipulation/include/otbHillShadingFunctor.h
+++ b/Modules/Filtering/ImageManipulation/include/otbHillShadingFunctor.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbHillShadingFunctor_h
-#define __otbHillShadingFunctor_h
+#ifndef otbHillShadingFunctor_h
+#define otbHillShadingFunctor_h
 
 #include "itkNumericTraits.h"
 #include "otbMath.h"
diff --git a/Modules/Filtering/ImageManipulation/include/otbImageToNoDataMaskFilter.h b/Modules/Filtering/ImageManipulation/include/otbImageToNoDataMaskFilter.h
index b05bd243a0..c15518d009 100644
--- a/Modules/Filtering/ImageManipulation/include/otbImageToNoDataMaskFilter.h
+++ b/Modules/Filtering/ImageManipulation/include/otbImageToNoDataMaskFilter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbImageToNoDataMaskFilter_h
-#define __otbImageToNoDataMaskFilter_h
+#ifndef otbImageToNoDataMaskFilter_h
+#define otbImageToNoDataMaskFilter_h
 
 #include "itkUnaryFunctorImageFilter.h"
 #include "itkMetaDataObject.h"
diff --git a/Modules/Filtering/ImageManipulation/include/otbImageToVectorImageCastFilter.h b/Modules/Filtering/ImageManipulation/include/otbImageToVectorImageCastFilter.h
index 6f210df1e3..566a1d1aa2 100644
--- a/Modules/Filtering/ImageManipulation/include/otbImageToVectorImageCastFilter.h
+++ b/Modules/Filtering/ImageManipulation/include/otbImageToVectorImageCastFilter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbImageToVectorImageCastFilter_h
-#define __otbImageToVectorImageCastFilter_h
+#ifndef otbImageToVectorImageCastFilter_h
+#define otbImageToVectorImageCastFilter_h
 
 #include "itkUnaryFunctorImageFilter.h"
 #include "itkVariableLengthVector.h"
diff --git a/Modules/Filtering/ImageManipulation/include/otbLocalGradientVectorImageFilter.h b/Modules/Filtering/ImageManipulation/include/otbLocalGradientVectorImageFilter.h
index f9d4e7972c..7a201934d0 100644
--- a/Modules/Filtering/ImageManipulation/include/otbLocalGradientVectorImageFilter.h
+++ b/Modules/Filtering/ImageManipulation/include/otbLocalGradientVectorImageFilter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbLocalGradientVectorImageFilter_h
-#define __otbLocalGradientVectorImageFilter_h
+#ifndef otbLocalGradientVectorImageFilter_h
+#define otbLocalGradientVectorImageFilter_h
 
 #include "otbUnaryFunctorNeighborhoodVectorImageFilter.h"
 
@@ -103,4 +103,4 @@ private:
 } // end of namespace otb
 
 
-#endif // __otbLocalGradientVectorImageFilter_h
+#endif // otbLocalGradientVectorImageFilter_h
diff --git a/Modules/Filtering/ImageManipulation/include/otbLog10ThresholdedImageFilter.h b/Modules/Filtering/ImageManipulation/include/otbLog10ThresholdedImageFilter.h
index 1c0b10bef7..e21f5dd926 100644
--- a/Modules/Filtering/ImageManipulation/include/otbLog10ThresholdedImageFilter.h
+++ b/Modules/Filtering/ImageManipulation/include/otbLog10ThresholdedImageFilter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbLog10ThresholdedImageFilter_h
-#define __otbLog10ThresholdedImageFilter_h
+#ifndef otbLog10ThresholdedImageFilter_h
+#define otbLog10ThresholdedImageFilter_h
 
 #include "itkUnaryFunctorImageFilter.h"
 #include "vnl/vnl_math.h"
diff --git a/Modules/Filtering/ImageManipulation/include/otbMatrixImageFilter.h b/Modules/Filtering/ImageManipulation/include/otbMatrixImageFilter.h
index 54eb0d3503..d3e1a7a256 100644
--- a/Modules/Filtering/ImageManipulation/include/otbMatrixImageFilter.h
+++ b/Modules/Filtering/ImageManipulation/include/otbMatrixImageFilter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbMatrixImageFilter_h
-#define __otbMatrixImageFilter_h
+#ifndef otbMatrixImageFilter_h
+#define otbMatrixImageFilter_h
 
 #include "itkImageToImageFilter.h"
 #include "otbMath.h"
diff --git a/Modules/Filtering/ImageManipulation/include/otbMatrixImageFilter.txx b/Modules/Filtering/ImageManipulation/include/otbMatrixImageFilter.txx
index c2146680b2..c8d6053b95 100644
--- a/Modules/Filtering/ImageManipulation/include/otbMatrixImageFilter.txx
+++ b/Modules/Filtering/ImageManipulation/include/otbMatrixImageFilter.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbMatrixImageFilter_txx
-#define __otbMatrixImageFilter_txx
+#ifndef otbMatrixImageFilter_txx
+#define otbMatrixImageFilter_txx
 
 #include "otbMatrixImageFilter.h"
 #include "itkImageRegionIterator.h"
diff --git a/Modules/Filtering/ImageManipulation/include/otbMeanFunctor.h b/Modules/Filtering/ImageManipulation/include/otbMeanFunctor.h
index 9f513fbf19..df5baf5c67 100644
--- a/Modules/Filtering/ImageManipulation/include/otbMeanFunctor.h
+++ b/Modules/Filtering/ImageManipulation/include/otbMeanFunctor.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbMeanFunctor_h
-#define __otbMeanFunctor_h
+#ifndef otbMeanFunctor_h
+#define otbMeanFunctor_h
 
 namespace otb
 {
diff --git a/Modules/Filtering/ImageManipulation/include/otbMultiplyByScalarImageFilter.h b/Modules/Filtering/ImageManipulation/include/otbMultiplyByScalarImageFilter.h
index d58904fcc2..5e0a679a6e 100644
--- a/Modules/Filtering/ImageManipulation/include/otbMultiplyByScalarImageFilter.h
+++ b/Modules/Filtering/ImageManipulation/include/otbMultiplyByScalarImageFilter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbMultiplyByScalarImageFilter_h
-#define __otbMultiplyByScalarImageFilter_h
+#ifndef otbMultiplyByScalarImageFilter_h
+#define otbMultiplyByScalarImageFilter_h
 
 #include "itkUnaryFunctorImageFilter.h"
 
diff --git a/Modules/Filtering/ImageManipulation/include/otbNRIBandImagesToOneNComplexBandsImage.h b/Modules/Filtering/ImageManipulation/include/otbNRIBandImagesToOneNComplexBandsImage.h
index e2e65d4dfd..858719d0d7 100644
--- a/Modules/Filtering/ImageManipulation/include/otbNRIBandImagesToOneNComplexBandsImage.h
+++ b/Modules/Filtering/ImageManipulation/include/otbNRIBandImagesToOneNComplexBandsImage.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbNRIBandImagesToOneNComplexBandsImage_h
-#define __otbNRIBandImagesToOneNComplexBandsImage_h
+#ifndef otbNRIBandImagesToOneNComplexBandsImage_h
+#define otbNRIBandImagesToOneNComplexBandsImage_h
 
 #include "itkImageToImageFilter.h"
 #include "itkImage.h"
diff --git a/Modules/Filtering/ImageManipulation/include/otbNRIBandImagesToOneNComplexBandsImage.txx b/Modules/Filtering/ImageManipulation/include/otbNRIBandImagesToOneNComplexBandsImage.txx
index 46abbf79ef..260801206a 100644
--- a/Modules/Filtering/ImageManipulation/include/otbNRIBandImagesToOneNComplexBandsImage.txx
+++ b/Modules/Filtering/ImageManipulation/include/otbNRIBandImagesToOneNComplexBandsImage.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbNRIBandImagesToOneNComplexBandsImage_txx
-#define __otbNRIBandImagesToOneNComplexBandsImage_txx
+#ifndef otbNRIBandImagesToOneNComplexBandsImage_txx
+#define otbNRIBandImagesToOneNComplexBandsImage_txx
 
 #include "otbNRIBandImagesToOneNComplexBandsImage.h"
 
diff --git a/Modules/Filtering/ImageManipulation/include/otbOneRIBandImageToOneComplexBandImage.h b/Modules/Filtering/ImageManipulation/include/otbOneRIBandImageToOneComplexBandImage.h
index 4a69fab7f0..2479807232 100644
--- a/Modules/Filtering/ImageManipulation/include/otbOneRIBandImageToOneComplexBandImage.h
+++ b/Modules/Filtering/ImageManipulation/include/otbOneRIBandImageToOneComplexBandImage.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbOneRIBandImageToOneComplexBandImage_h
-#define __otbOneRIBandImageToOneComplexBandImage_h
+#ifndef otbOneRIBandImageToOneComplexBandImage_h
+#define otbOneRIBandImageToOneComplexBandImage_h
 
 #include "itkImageToImageFilter.h"
 #include "itkImage.h"
diff --git a/Modules/Filtering/ImageManipulation/include/otbOneRIBandImageToOneComplexBandImage.txx b/Modules/Filtering/ImageManipulation/include/otbOneRIBandImageToOneComplexBandImage.txx
index 8a7003a8ee..a9bb0c0352 100644
--- a/Modules/Filtering/ImageManipulation/include/otbOneRIBandImageToOneComplexBandImage.txx
+++ b/Modules/Filtering/ImageManipulation/include/otbOneRIBandImageToOneComplexBandImage.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbOneRIBandImageToOneComplexBandImage_txx
-#define __otbOneRIBandImageToOneComplexBandImage_txx
+#ifndef otbOneRIBandImageToOneComplexBandImage_txx
+#define otbOneRIBandImageToOneComplexBandImage_txx
 
 #include "otbOneRIBandImageToOneComplexBandImage.h"
 
diff --git a/Modules/Filtering/ImageManipulation/include/otbPerBandVectorImageFilter.h b/Modules/Filtering/ImageManipulation/include/otbPerBandVectorImageFilter.h
index b249b07a1e..45b0b251bc 100644
--- a/Modules/Filtering/ImageManipulation/include/otbPerBandVectorImageFilter.h
+++ b/Modules/Filtering/ImageManipulation/include/otbPerBandVectorImageFilter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbPerBandVectorImageFilter_h
-#define __otbPerBandVectorImageFilter_h
+#ifndef otbPerBandVectorImageFilter_h
+#define otbPerBandVectorImageFilter_h
 
 #include "otbVectorImageToImageListFilter.h"
 #include "otbImageListToImageListApplyFilter.h"
diff --git a/Modules/Filtering/ImageManipulation/include/otbPerBandVectorImageFilter.txx b/Modules/Filtering/ImageManipulation/include/otbPerBandVectorImageFilter.txx
index 2687b4a806..b29893160f 100644
--- a/Modules/Filtering/ImageManipulation/include/otbPerBandVectorImageFilter.txx
+++ b/Modules/Filtering/ImageManipulation/include/otbPerBandVectorImageFilter.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbPerBandVectorImageFilter_txx
-#define __otbPerBandVectorImageFilter_txx
+#ifndef otbPerBandVectorImageFilter_txx
+#define otbPerBandVectorImageFilter_txx
 
 #include "otbPerBandVectorImageFilter.h"
 
diff --git a/Modules/Filtering/ImageManipulation/include/otbPhaseFunctor.h b/Modules/Filtering/ImageManipulation/include/otbPhaseFunctor.h
index 97acdb2d83..c7e12a456e 100644
--- a/Modules/Filtering/ImageManipulation/include/otbPhaseFunctor.h
+++ b/Modules/Filtering/ImageManipulation/include/otbPhaseFunctor.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbPhaseFunctor_h
-#define __otbPhaseFunctor_h
+#ifndef otbPhaseFunctor_h
+#define otbPhaseFunctor_h
 
 #include "otbChannelSelectorFunctor.h"
 
diff --git a/Modules/Filtering/ImageManipulation/include/otbPrintableImageFilter.h b/Modules/Filtering/ImageManipulation/include/otbPrintableImageFilter.h
index ad6a937865..8e7c25c644 100644
--- a/Modules/Filtering/ImageManipulation/include/otbPrintableImageFilter.h
+++ b/Modules/Filtering/ImageManipulation/include/otbPrintableImageFilter.h
@@ -19,8 +19,8 @@
 
 =========================================================================*/
 
-#ifndef __otbPrintableImageFilter_h
-#define __otbPrintableImageFilter_h
+#ifndef otbPrintableImageFilter_h
+#define otbPrintableImageFilter_h
 
 #include "otbImage.h"
 #include "itkImageToImageFilter.h"
diff --git a/Modules/Filtering/ImageManipulation/include/otbPrintableImageFilter.txx b/Modules/Filtering/ImageManipulation/include/otbPrintableImageFilter.txx
index 146c65fd02..407fa2350b 100644
--- a/Modules/Filtering/ImageManipulation/include/otbPrintableImageFilter.txx
+++ b/Modules/Filtering/ImageManipulation/include/otbPrintableImageFilter.txx
@@ -18,8 +18,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbPrintableImageFilter_txx
-#define __otbPrintableImageFilter_txx
+#ifndef otbPrintableImageFilter_txx
+#define otbPrintableImageFilter_txx
 
 #include "otbPrintableImageFilter.h"
 
diff --git a/Modules/Filtering/ImageManipulation/include/otbRealAndImaginaryImageToComplexImageFilter.h b/Modules/Filtering/ImageManipulation/include/otbRealAndImaginaryImageToComplexImageFilter.h
index 570fd2b8c8..4a9a5d889e 100644
--- a/Modules/Filtering/ImageManipulation/include/otbRealAndImaginaryImageToComplexImageFilter.h
+++ b/Modules/Filtering/ImageManipulation/include/otbRealAndImaginaryImageToComplexImageFilter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbRealAndImaginaryImageToComplexImageFilter_h
-#define __otbRealAndImaginaryImageToComplexImageFilter_h
+#ifndef otbRealAndImaginaryImageToComplexImageFilter_h
+#define otbRealAndImaginaryImageToComplexImageFilter_h
 
 #include "itkBinaryFunctorImageFilter.h"
 #include "vnl/vnl_math.h"
diff --git a/Modules/Filtering/ImageManipulation/include/otbRealImageToComplexImageFilter.h b/Modules/Filtering/ImageManipulation/include/otbRealImageToComplexImageFilter.h
index 0316365ac7..d17b5a9b11 100644
--- a/Modules/Filtering/ImageManipulation/include/otbRealImageToComplexImageFilter.h
+++ b/Modules/Filtering/ImageManipulation/include/otbRealImageToComplexImageFilter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbRealImageToComplexImageFilter_h
-#define __otbRealImageToComplexImageFilter_h
+#ifndef otbRealImageToComplexImageFilter_h
+#define otbRealImageToComplexImageFilter_h
 
 #include "itkUnaryFunctorImageFilter.h"
 #include "vnl/vnl_math.h"
diff --git a/Modules/Filtering/ImageManipulation/include/otbShiftScaleImageAdaptor.h b/Modules/Filtering/ImageManipulation/include/otbShiftScaleImageAdaptor.h
index 8beb79458e..faaf39a806 100644
--- a/Modules/Filtering/ImageManipulation/include/otbShiftScaleImageAdaptor.h
+++ b/Modules/Filtering/ImageManipulation/include/otbShiftScaleImageAdaptor.h
@@ -16,8 +16,8 @@
 
 =========================================================================*/
 
-#ifndef __otbShiftScaleImageAdaptor_h
-#define __otbShiftScaleImageAdaptor_h
+#ifndef otbShiftScaleImageAdaptor_h
+#define otbShiftScaleImageAdaptor_h
 
 #include "vnl/vnl_math.h"
 #include "itkImageAdaptor.h"
diff --git a/Modules/Filtering/ImageManipulation/include/otbShiftScaleVectorImageFilter.h b/Modules/Filtering/ImageManipulation/include/otbShiftScaleVectorImageFilter.h
index dd4c382682..7834dde1e2 100644
--- a/Modules/Filtering/ImageManipulation/include/otbShiftScaleVectorImageFilter.h
+++ b/Modules/Filtering/ImageManipulation/include/otbShiftScaleVectorImageFilter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbShiftScaleImageFilter_h
-#define __otbShiftScaleImageFilter_h
+#ifndef otbShiftScaleImageFilter_h
+#define otbShiftScaleImageFilter_h
 
 #include "itkUnaryFunctorImageFilter.h"
 #include "itkVariableLengthVector.h"
diff --git a/Modules/Filtering/ImageManipulation/include/otbShiftScaleVectorImageFilter.txx b/Modules/Filtering/ImageManipulation/include/otbShiftScaleVectorImageFilter.txx
index 4b2edaa7ca..3882ff2d82 100644
--- a/Modules/Filtering/ImageManipulation/include/otbShiftScaleVectorImageFilter.txx
+++ b/Modules/Filtering/ImageManipulation/include/otbShiftScaleVectorImageFilter.txx
@@ -18,8 +18,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbShiftScaleVectorImageFilter_txx
-#define __otbShiftScaleVectorImageFilter_txx
+#ifndef otbShiftScaleVectorImageFilter_txx
+#define otbShiftScaleVectorImageFilter_txx
 
 #include "otbShiftScaleVectorImageFilter.h"
 
diff --git a/Modules/Filtering/ImageManipulation/include/otbSpectralAngleDistanceImageFilter.h b/Modules/Filtering/ImageManipulation/include/otbSpectralAngleDistanceImageFilter.h
index 615ccd0349..db1f3b79eb 100644
--- a/Modules/Filtering/ImageManipulation/include/otbSpectralAngleDistanceImageFilter.h
+++ b/Modules/Filtering/ImageManipulation/include/otbSpectralAngleDistanceImageFilter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbSpectralAngleDistanceImageFilter_h
-#define __otbSpectralAngleDistanceImageFilter_h
+#ifndef otbSpectralAngleDistanceImageFilter_h
+#define otbSpectralAngleDistanceImageFilter_h
 
 #include "itkImageToImageFilter.h"
 
diff --git a/Modules/Filtering/ImageManipulation/include/otbSpectralAngleDistanceImageFilter.txx b/Modules/Filtering/ImageManipulation/include/otbSpectralAngleDistanceImageFilter.txx
index edcc5e07bd..ac01ae1944 100644
--- a/Modules/Filtering/ImageManipulation/include/otbSpectralAngleDistanceImageFilter.txx
+++ b/Modules/Filtering/ImageManipulation/include/otbSpectralAngleDistanceImageFilter.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbSpectralAngleDistanceImageFilter_txx
-#define __otbSpectralAngleDistanceImageFilter_txx
+#ifndef otbSpectralAngleDistanceImageFilter_txx
+#define otbSpectralAngleDistanceImageFilter_txx
 
 #include "otbSpectralAngleDistanceImageFilter.h"
 #include "itkImageRegionIterator.h"
diff --git a/Modules/Filtering/ImageManipulation/include/otbSpectralAngleFunctor.h b/Modules/Filtering/ImageManipulation/include/otbSpectralAngleFunctor.h
index 4ce398a881..74fb60b664 100644
--- a/Modules/Filtering/ImageManipulation/include/otbSpectralAngleFunctor.h
+++ b/Modules/Filtering/ImageManipulation/include/otbSpectralAngleFunctor.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbSpectralAngleFunctor_h
-#define __otbSpectralAngleFunctor_h
+#ifndef otbSpectralAngleFunctor_h
+#define otbSpectralAngleFunctor_h
 
 #include "otbMath.h"
 #include <algorithm>
diff --git a/Modules/Filtering/ImageManipulation/include/otbSqrtSpectralAngleFunctor.h b/Modules/Filtering/ImageManipulation/include/otbSqrtSpectralAngleFunctor.h
index 89d8089595..6c0874f968 100644
--- a/Modules/Filtering/ImageManipulation/include/otbSqrtSpectralAngleFunctor.h
+++ b/Modules/Filtering/ImageManipulation/include/otbSqrtSpectralAngleFunctor.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbSqrtSpectralAngleFunctor_h
-#define __otbSqrtSpectralAngleFunctor_h
+#ifndef otbSqrtSpectralAngleFunctor_h
+#define otbSqrtSpectralAngleFunctor_h
 
 #include "otbSpectralAngleFunctor.h"
 
diff --git a/Modules/Filtering/ImageManipulation/include/otbStreamingInnerProductVectorImageFilter.h b/Modules/Filtering/ImageManipulation/include/otbStreamingInnerProductVectorImageFilter.h
index 0208075de2..036807e5f8 100644
--- a/Modules/Filtering/ImageManipulation/include/otbStreamingInnerProductVectorImageFilter.h
+++ b/Modules/Filtering/ImageManipulation/include/otbStreamingInnerProductVectorImageFilter.h
@@ -18,8 +18,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbStreamingInnerProductVectorImageFilter_h
-#define __otbStreamingInnerProductVectorImageFilter_h
+#ifndef otbStreamingInnerProductVectorImageFilter_h
+#define otbStreamingInnerProductVectorImageFilter_h
 
 #include "otbPersistentImageFilter.h"
 #include "otbPersistentFilterStreamingDecorator.h"
diff --git a/Modules/Filtering/ImageManipulation/include/otbStreamingInnerProductVectorImageFilter.txx b/Modules/Filtering/ImageManipulation/include/otbStreamingInnerProductVectorImageFilter.txx
index bb33a873e1..54c3e93b66 100644
--- a/Modules/Filtering/ImageManipulation/include/otbStreamingInnerProductVectorImageFilter.txx
+++ b/Modules/Filtering/ImageManipulation/include/otbStreamingInnerProductVectorImageFilter.txx
@@ -18,8 +18,8 @@ for details.
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbStreamingInnerProductVectorImageFilter_txx
-#define __otbStreamingInnerProductVectorImageFilter_txx
+#ifndef otbStreamingInnerProductVectorImageFilter_txx
+#define otbStreamingInnerProductVectorImageFilter_txx
 #include "otbStreamingInnerProductVectorImageFilter.h"
 
 #include "itkImageRegionIterator.h"
diff --git a/Modules/Filtering/ImageManipulation/include/otbStreamingMatrixTransposeMatrixImageFilter.h b/Modules/Filtering/ImageManipulation/include/otbStreamingMatrixTransposeMatrixImageFilter.h
index e27d535bed..eab69d6aa1 100644
--- a/Modules/Filtering/ImageManipulation/include/otbStreamingMatrixTransposeMatrixImageFilter.h
+++ b/Modules/Filtering/ImageManipulation/include/otbStreamingMatrixTransposeMatrixImageFilter.h
@@ -18,8 +18,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbStreamingMatrixTransposeMatrixImageFilter_h
-#define __otbStreamingMatrixTransposeMatrixImageFilter_h
+#ifndef otbStreamingMatrixTransposeMatrixImageFilter_h
+#define otbStreamingMatrixTransposeMatrixImageFilter_h
 
 #include "otbPersistentImageFilter.h"
 #include "itkSimpleDataObjectDecorator.h"
diff --git a/Modules/Filtering/ImageManipulation/include/otbStreamingMatrixTransposeMatrixImageFilter.txx b/Modules/Filtering/ImageManipulation/include/otbStreamingMatrixTransposeMatrixImageFilter.txx
index 535d2a565f..14cb93bc00 100644
--- a/Modules/Filtering/ImageManipulation/include/otbStreamingMatrixTransposeMatrixImageFilter.txx
+++ b/Modules/Filtering/ImageManipulation/include/otbStreamingMatrixTransposeMatrixImageFilter.txx
@@ -18,8 +18,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbStreamingMatrixTransposeMatrixImageFilter_txx
-#define __otbStreamingMatrixTransposeMatrixImageFilter_txx
+#ifndef otbStreamingMatrixTransposeMatrixImageFilter_txx
+#define otbStreamingMatrixTransposeMatrixImageFilter_txx
 
 #include "otbStreamingMatrixTransposeMatrixImageFilter.h"
 
diff --git a/Modules/Filtering/ImageManipulation/include/otbStreamingResampleImageFilter.h b/Modules/Filtering/ImageManipulation/include/otbStreamingResampleImageFilter.h
index c888aacb1e..9a2f24df2f 100644
--- a/Modules/Filtering/ImageManipulation/include/otbStreamingResampleImageFilter.h
+++ b/Modules/Filtering/ImageManipulation/include/otbStreamingResampleImageFilter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbStreamingResampleImageFilter_h
-#define __otbStreamingResampleImageFilter_h
+#ifndef otbStreamingResampleImageFilter_h
+#define otbStreamingResampleImageFilter_h
 
 #include "itkImageToImageFilter.h"
 #include "otbStreamingWarpImageFilter.h"
diff --git a/Modules/Filtering/ImageManipulation/include/otbStreamingResampleImageFilter.txx b/Modules/Filtering/ImageManipulation/include/otbStreamingResampleImageFilter.txx
index 8543b9e888..a0b6399609 100644
--- a/Modules/Filtering/ImageManipulation/include/otbStreamingResampleImageFilter.txx
+++ b/Modules/Filtering/ImageManipulation/include/otbStreamingResampleImageFilter.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbStreamingResampleImageFilter_txx
-#define __otbStreamingResampleImageFilter_txx
+#ifndef otbStreamingResampleImageFilter_txx
+#define otbStreamingResampleImageFilter_txx
 
 #include "itkProgressAccumulator.h"
 
diff --git a/Modules/Filtering/ImageManipulation/include/otbStreamingShrinkImageFilter.h b/Modules/Filtering/ImageManipulation/include/otbStreamingShrinkImageFilter.h
index 5a12557a42..9524f87717 100644
--- a/Modules/Filtering/ImageManipulation/include/otbStreamingShrinkImageFilter.h
+++ b/Modules/Filtering/ImageManipulation/include/otbStreamingShrinkImageFilter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbStreamingShrinkImageFilter_h
-#define __otbStreamingShrinkImageFilter_h
+#ifndef otbStreamingShrinkImageFilter_h
+#define otbStreamingShrinkImageFilter_h
 
 
 #include "otbPersistentImageFilter.h"
diff --git a/Modules/Filtering/ImageManipulation/include/otbStreamingShrinkImageFilter.txx b/Modules/Filtering/ImageManipulation/include/otbStreamingShrinkImageFilter.txx
index 95761c9fe1..bbe7e02071 100644
--- a/Modules/Filtering/ImageManipulation/include/otbStreamingShrinkImageFilter.txx
+++ b/Modules/Filtering/ImageManipulation/include/otbStreamingShrinkImageFilter.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbStreamingShrinkImageFilter_txx
-#define __otbStreamingShrinkImageFilter_txx
+#ifndef otbStreamingShrinkImageFilter_txx
+#define otbStreamingShrinkImageFilter_txx
 
 #include "otbStreamingShrinkImageFilter.h"
 #include "itkImageRegionIteratorWithIndex.h"
diff --git a/Modules/Filtering/ImageManipulation/include/otbThresholdVectorImageFilter.h b/Modules/Filtering/ImageManipulation/include/otbThresholdVectorImageFilter.h
index b12b59a622..32453a0c1f 100644
--- a/Modules/Filtering/ImageManipulation/include/otbThresholdVectorImageFilter.h
+++ b/Modules/Filtering/ImageManipulation/include/otbThresholdVectorImageFilter.h
@@ -17,8 +17,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbThresholdVectorImageFilter_h
-#define __otbThresholdVectorImageFilter_h
+#ifndef otbThresholdVectorImageFilter_h
+#define otbThresholdVectorImageFilter_h
 
 #include "itkImageToImageFilter.h"
 
diff --git a/Modules/Filtering/ImageManipulation/include/otbThresholdVectorImageFilter.txx b/Modules/Filtering/ImageManipulation/include/otbThresholdVectorImageFilter.txx
index 51cb678bd7..c2b9bc843d 100644
--- a/Modules/Filtering/ImageManipulation/include/otbThresholdVectorImageFilter.txx
+++ b/Modules/Filtering/ImageManipulation/include/otbThresholdVectorImageFilter.txx
@@ -18,8 +18,8 @@
 
 =========================================================================*/
 
-#ifndef __otbThresholdVectorImageFilter_txx
-#define __otbThresholdVectorImageFilter_txx
+#ifndef otbThresholdVectorImageFilter_txx
+#define otbThresholdVectorImageFilter_txx
 
 #include "otbThresholdVectorImageFilter.h"
 #include "itkImageRegionIterator.h"
diff --git a/Modules/Filtering/ImageManipulation/include/otbTileImageFilter.h b/Modules/Filtering/ImageManipulation/include/otbTileImageFilter.h
index fc4e81350c..3e8da58747 100644
--- a/Modules/Filtering/ImageManipulation/include/otbTileImageFilter.h
+++ b/Modules/Filtering/ImageManipulation/include/otbTileImageFilter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbTileImageFilter_h
-#define __otbTileImageFilter_h
+#ifndef otbTileImageFilter_h
+#define otbTileImageFilter_h
 
 #include "itkImageToImageFilter.h"
 
diff --git a/Modules/Filtering/ImageManipulation/include/otbTileImageFilter.txx b/Modules/Filtering/ImageManipulation/include/otbTileImageFilter.txx
index 55dd3e5bec..3b59245ffa 100644
--- a/Modules/Filtering/ImageManipulation/include/otbTileImageFilter.txx
+++ b/Modules/Filtering/ImageManipulation/include/otbTileImageFilter.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbTileImageFilter_txx
-#define __otbTileImageFilter_txx
+#ifndef otbTileImageFilter_txx
+#define otbTileImageFilter_txx
 
 #include "otbTileImageFilter.h"
 #include "itkImageRegionIterator.h"
diff --git a/Modules/Filtering/ImageManipulation/include/otbTwoNRIBandsImageToNComplexBandsImage.h b/Modules/Filtering/ImageManipulation/include/otbTwoNRIBandsImageToNComplexBandsImage.h
index 4f404198e7..ae4ccb2fec 100644
--- a/Modules/Filtering/ImageManipulation/include/otbTwoNRIBandsImageToNComplexBandsImage.h
+++ b/Modules/Filtering/ImageManipulation/include/otbTwoNRIBandsImageToNComplexBandsImage.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbTwoNRIBandsImageToNComplexBandsImage_h
-#define __otbTwoNRIBandsImageToNComplexBandsImage_h
+#ifndef otbTwoNRIBandsImageToNComplexBandsImage_h
+#define otbTwoNRIBandsImageToNComplexBandsImage_h
 
 #include "itkImageToImageFilter.h"
 #include "itkImage.h"
diff --git a/Modules/Filtering/ImageManipulation/include/otbTwoNRIBandsImageToNComplexBandsImage.txx b/Modules/Filtering/ImageManipulation/include/otbTwoNRIBandsImageToNComplexBandsImage.txx
index c61f07a900..8219546898 100644
--- a/Modules/Filtering/ImageManipulation/include/otbTwoNRIBandsImageToNComplexBandsImage.txx
+++ b/Modules/Filtering/ImageManipulation/include/otbTwoNRIBandsImageToNComplexBandsImage.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbTwoNRIBandsImageToNComplexBandsImage_txx
-#define __otbTwoNRIBandsImageToNComplexBandsImage_txx
+#ifndef otbTwoNRIBandsImageToNComplexBandsImage_txx
+#define otbTwoNRIBandsImageToNComplexBandsImage_txx
 
 #include "otbTwoNRIBandsImageToNComplexBandsImage.h"
 
diff --git a/Modules/Filtering/ImageManipulation/include/otbUnaryFunctorNeighborhoodImageFilter.h b/Modules/Filtering/ImageManipulation/include/otbUnaryFunctorNeighborhoodImageFilter.h
index bbe82b4a28..336b9cdebc 100644
--- a/Modules/Filtering/ImageManipulation/include/otbUnaryFunctorNeighborhoodImageFilter.h
+++ b/Modules/Filtering/ImageManipulation/include/otbUnaryFunctorNeighborhoodImageFilter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbUnaryFunctorNeighborhoodImageFilter_h
-#define __otbUnaryFunctorNeighborhoodImageFilter_h
+#ifndef otbUnaryFunctorNeighborhoodImageFilter_h
+#define otbUnaryFunctorNeighborhoodImageFilter_h
 
 #include "itkImageToImageFilter.h"
 #include "itkImageRegionIteratorWithIndex.h"
diff --git a/Modules/Filtering/ImageManipulation/include/otbUnaryFunctorNeighborhoodImageFilter.txx b/Modules/Filtering/ImageManipulation/include/otbUnaryFunctorNeighborhoodImageFilter.txx
index 3ee51a2ec6..77e6947a80 100644
--- a/Modules/Filtering/ImageManipulation/include/otbUnaryFunctorNeighborhoodImageFilter.txx
+++ b/Modules/Filtering/ImageManipulation/include/otbUnaryFunctorNeighborhoodImageFilter.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbUnaryFunctorNeighborhoodImageFilter_txx
-#define __otbUnaryFunctorNeighborhoodImageFilter_txx
+#ifndef otbUnaryFunctorNeighborhoodImageFilter_txx
+#define otbUnaryFunctorNeighborhoodImageFilter_txx
 
 #include "otbUnaryFunctorNeighborhoodImageFilter.h"
 #include "itkImageRegionIterator.h"
diff --git a/Modules/Filtering/ImageManipulation/include/otbUnaryFunctorNeighborhoodWithOffsetImageFilter.h b/Modules/Filtering/ImageManipulation/include/otbUnaryFunctorNeighborhoodWithOffsetImageFilter.h
index a552191930..02c694335d 100644
--- a/Modules/Filtering/ImageManipulation/include/otbUnaryFunctorNeighborhoodWithOffsetImageFilter.h
+++ b/Modules/Filtering/ImageManipulation/include/otbUnaryFunctorNeighborhoodWithOffsetImageFilter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbUnaryFunctorNeighborhoodWithOffsetImageFilter_h
-#define __otbUnaryFunctorNeighborhoodWithOffsetImageFilter_h
+#ifndef otbUnaryFunctorNeighborhoodWithOffsetImageFilter_h
+#define otbUnaryFunctorNeighborhoodWithOffsetImageFilter_h
 
 #include "itkImageToImageFilter.h"
 #include "itkImageRegionIteratorWithIndex.h"
diff --git a/Modules/Filtering/ImageManipulation/include/otbUnaryFunctorNeighborhoodWithOffsetImageFilter.txx b/Modules/Filtering/ImageManipulation/include/otbUnaryFunctorNeighborhoodWithOffsetImageFilter.txx
index a0c040c668..7c318b3263 100644
--- a/Modules/Filtering/ImageManipulation/include/otbUnaryFunctorNeighborhoodWithOffsetImageFilter.txx
+++ b/Modules/Filtering/ImageManipulation/include/otbUnaryFunctorNeighborhoodWithOffsetImageFilter.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbUnaryFunctorNeighborhoodWithOffsetImageFilter_txx
-#define __otbUnaryFunctorNeighborhoodWithOffsetImageFilter_txx
+#ifndef otbUnaryFunctorNeighborhoodWithOffsetImageFilter_txx
+#define otbUnaryFunctorNeighborhoodWithOffsetImageFilter_txx
 
 #include "otbUnaryFunctorNeighborhoodWithOffsetImageFilter.h"
 #include "itkImageRegionIterator.h"
diff --git a/Modules/Filtering/ImageManipulation/include/otbUnaryFunctorWithIndexImageFilter.h b/Modules/Filtering/ImageManipulation/include/otbUnaryFunctorWithIndexImageFilter.h
index 87f4467051..d387433d9d 100644
--- a/Modules/Filtering/ImageManipulation/include/otbUnaryFunctorWithIndexImageFilter.h
+++ b/Modules/Filtering/ImageManipulation/include/otbUnaryFunctorWithIndexImageFilter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbUnaryFunctorWithIndexImageFilter_h
-#define __otbUnaryFunctorWithIndexImageFilter_h
+#ifndef otbUnaryFunctorWithIndexImageFilter_h
+#define otbUnaryFunctorWithIndexImageFilter_h
 
 #include "itkImageToImageFilter.h"
 #include "itkImageRegionConstIteratorWithIndex.h"
diff --git a/Modules/Filtering/ImageManipulation/include/otbUnaryFunctorWithIndexImageFilter.txx b/Modules/Filtering/ImageManipulation/include/otbUnaryFunctorWithIndexImageFilter.txx
index dc78ead929..1d5b9795a9 100644
--- a/Modules/Filtering/ImageManipulation/include/otbUnaryFunctorWithIndexImageFilter.txx
+++ b/Modules/Filtering/ImageManipulation/include/otbUnaryFunctorWithIndexImageFilter.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbUnaryFunctorWithIndexImageFilter_txx
-#define __otbUnaryFunctorWithIndexImageFilter_txx
+#ifndef otbUnaryFunctorWithIndexImageFilter_txx
+#define otbUnaryFunctorWithIndexImageFilter_txx
 
 #include "otbUnaryFunctorWithIndexImageFilter.h"
 #include "itkImageRegionIterator.h"
diff --git a/Modules/Filtering/ImageManipulation/include/otbUnaryImageFunctorWithVectorImageFilter.h b/Modules/Filtering/ImageManipulation/include/otbUnaryImageFunctorWithVectorImageFilter.h
index ee86574bd1..1854a8536f 100644
--- a/Modules/Filtering/ImageManipulation/include/otbUnaryImageFunctorWithVectorImageFilter.h
+++ b/Modules/Filtering/ImageManipulation/include/otbUnaryImageFunctorWithVectorImageFilter.h
@@ -18,8 +18,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbUnaryImageFunctorWithVectorImageFilter_h
-#define __otbUnaryImageFunctorWithVectorImageFilter_h
+#ifndef otbUnaryImageFunctorWithVectorImageFilter_h
+#define otbUnaryImageFunctorWithVectorImageFilter_h
 
 #include "otbVectorImage.h"
 #include "itkVariableLengthVector.h"
diff --git a/Modules/Filtering/ImageManipulation/include/otbUnaryImageFunctorWithVectorImageFilter.txx b/Modules/Filtering/ImageManipulation/include/otbUnaryImageFunctorWithVectorImageFilter.txx
index 9718f7d276..6c77bd78f2 100644
--- a/Modules/Filtering/ImageManipulation/include/otbUnaryImageFunctorWithVectorImageFilter.txx
+++ b/Modules/Filtering/ImageManipulation/include/otbUnaryImageFunctorWithVectorImageFilter.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbUnaryImageFunctorWithVectorImageFilter_txx
-#define __otbUnaryImageFunctorWithVectorImageFilter_txx
+#ifndef otbUnaryImageFunctorWithVectorImageFilter_txx
+#define otbUnaryImageFunctorWithVectorImageFilter_txx
 
 #include "otbUnaryImageFunctorWithVectorImageFilter.h"
 #include "itkImageRegionIterator.h"
diff --git a/Modules/Filtering/ImageManipulation/include/otbVectorImageTo3DScalarImageFilter.h b/Modules/Filtering/ImageManipulation/include/otbVectorImageTo3DScalarImageFilter.h
index 41f98d0602..4683217271 100644
--- a/Modules/Filtering/ImageManipulation/include/otbVectorImageTo3DScalarImageFilter.h
+++ b/Modules/Filtering/ImageManipulation/include/otbVectorImageTo3DScalarImageFilter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbVectorImageTo3DScalarImageFilter_h
-#define __otbVectorImageTo3DScalarImageFilter_h
+#ifndef otbVectorImageTo3DScalarImageFilter_h
+#define otbVectorImageTo3DScalarImageFilter_h
 
 #include "itkImageToImageFilter.h"
 
diff --git a/Modules/Filtering/ImageManipulation/include/otbVectorImageTo3DScalarImageFilter.txx b/Modules/Filtering/ImageManipulation/include/otbVectorImageTo3DScalarImageFilter.txx
index 2f05d6dfc0..423e1425c5 100644
--- a/Modules/Filtering/ImageManipulation/include/otbVectorImageTo3DScalarImageFilter.txx
+++ b/Modules/Filtering/ImageManipulation/include/otbVectorImageTo3DScalarImageFilter.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbVectorImageTo3DScalarImageFilter_txx
-#define __otbVectorImageTo3DScalarImageFilter_txx
+#ifndef otbVectorImageTo3DScalarImageFilter_txx
+#define otbVectorImageTo3DScalarImageFilter_txx
 
 #include "otbVectorImageTo3DScalarImageFilter.h"
 #include "itkImageRegionConstIterator.h"
diff --git a/Modules/Filtering/ImageManipulation/include/otbVectorImageToAmplitudeImageFilter.h b/Modules/Filtering/ImageManipulation/include/otbVectorImageToAmplitudeImageFilter.h
index f91d685ce7..8142135240 100644
--- a/Modules/Filtering/ImageManipulation/include/otbVectorImageToAmplitudeImageFilter.h
+++ b/Modules/Filtering/ImageManipulation/include/otbVectorImageToAmplitudeImageFilter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbVectorImageToAmplitudeImageFilter_h
-#define __otbVectorImageToAmplitudeImageFilter_h
+#ifndef otbVectorImageToAmplitudeImageFilter_h
+#define otbVectorImageToAmplitudeImageFilter_h
 
 #include "itkUnaryFunctorImageFilter.h"
 #include "otbMath.h"
diff --git a/Modules/Filtering/ImageManipulation/include/otbVectorRescaleIntensityImageFilter.h b/Modules/Filtering/ImageManipulation/include/otbVectorRescaleIntensityImageFilter.h
index 4c1491f94c..150b4166c9 100644
--- a/Modules/Filtering/ImageManipulation/include/otbVectorRescaleIntensityImageFilter.h
+++ b/Modules/Filtering/ImageManipulation/include/otbVectorRescaleIntensityImageFilter.h
@@ -18,8 +18,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbVectorRescaleIntensityImageFilter_h
-#define __otbVectorRescaleIntensityImageFilter_h
+#ifndef otbVectorRescaleIntensityImageFilter_h
+#define otbVectorRescaleIntensityImageFilter_h
 
 #include "itkUnaryFunctorImageFilter.h"
 #include "itkVariableLengthVector.h"
diff --git a/Modules/Filtering/ImageManipulation/include/otbVectorRescaleIntensityImageFilter.txx b/Modules/Filtering/ImageManipulation/include/otbVectorRescaleIntensityImageFilter.txx
index 41409e7a95..425dbdc2ff 100644
--- a/Modules/Filtering/ImageManipulation/include/otbVectorRescaleIntensityImageFilter.txx
+++ b/Modules/Filtering/ImageManipulation/include/otbVectorRescaleIntensityImageFilter.txx
@@ -18,8 +18,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbVectorRescaleIntensityImageFilter_txx
-#define __otbVectorRescaleIntensityImageFilter_txx
+#ifndef otbVectorRescaleIntensityImageFilter_txx
+#define otbVectorRescaleIntensityImageFilter_txx
 
 #include "otbVectorRescaleIntensityImageFilter.h"
 #include "itkSampleToHistogramFilter.h"
diff --git a/Modules/Filtering/ImageNoise/include/otbFrostImageFilter.h b/Modules/Filtering/ImageNoise/include/otbFrostImageFilter.h
index 0d573ed96d..62956d3121 100644
--- a/Modules/Filtering/ImageNoise/include/otbFrostImageFilter.h
+++ b/Modules/Filtering/ImageNoise/include/otbFrostImageFilter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbFrostImageFilter_h
-#define __otbFrostImageFilter_h
+#ifndef otbFrostImageFilter_h
+#define otbFrostImageFilter_h
 
 #include "itkImageToImageFilter.h"
 #include "itkImage.h"
diff --git a/Modules/Filtering/ImageNoise/include/otbFrostImageFilter.txx b/Modules/Filtering/ImageNoise/include/otbFrostImageFilter.txx
index bca00f9c7d..c4e7e9ab3b 100644
--- a/Modules/Filtering/ImageNoise/include/otbFrostImageFilter.txx
+++ b/Modules/Filtering/ImageNoise/include/otbFrostImageFilter.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbFrostImageFilter_txx
-#define __otbFrostImageFilter_txx
+#ifndef otbFrostImageFilter_txx
+#define otbFrostImageFilter_txx
 
 #include "otbFrostImageFilter.h"
 
diff --git a/Modules/Filtering/ImageNoise/include/otbGammaMAPImageFilter.h b/Modules/Filtering/ImageNoise/include/otbGammaMAPImageFilter.h
index 85c342bdea..7098606955 100644
--- a/Modules/Filtering/ImageNoise/include/otbGammaMAPImageFilter.h
+++ b/Modules/Filtering/ImageNoise/include/otbGammaMAPImageFilter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbGammaMAPImageFilter_h
-#define __otbGammaMAPImageFilter_h
+#ifndef otbGammaMAPImageFilter_h
+#define otbGammaMAPImageFilter_h
 
 #include "itkImageToImageFilter.h"
 #include "itkImage.h"
diff --git a/Modules/Filtering/ImageNoise/include/otbGammaMAPImageFilter.txx b/Modules/Filtering/ImageNoise/include/otbGammaMAPImageFilter.txx
index 10883ddc81..08c5181df2 100644
--- a/Modules/Filtering/ImageNoise/include/otbGammaMAPImageFilter.txx
+++ b/Modules/Filtering/ImageNoise/include/otbGammaMAPImageFilter.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbGammaMAPImageFilter_txx
-#define __otbGammaMAPImageFilter_txx
+#ifndef otbGammaMAPImageFilter_txx
+#define otbGammaMAPImageFilter_txx
 
 #include "otbGammaMAPImageFilter.h"
 
diff --git a/Modules/Filtering/ImageNoise/include/otbKuanImageFilter.h b/Modules/Filtering/ImageNoise/include/otbKuanImageFilter.h
index 3710eb2259..ca82a8beb1 100644
--- a/Modules/Filtering/ImageNoise/include/otbKuanImageFilter.h
+++ b/Modules/Filtering/ImageNoise/include/otbKuanImageFilter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbKuanImageFilter_h
-#define __otbKuanImageFilter_h
+#ifndef otbKuanImageFilter_h
+#define otbKuanImageFilter_h
 
 #include "itkImageToImageFilter.h"
 #include "itkImage.h"
diff --git a/Modules/Filtering/ImageNoise/include/otbKuanImageFilter.txx b/Modules/Filtering/ImageNoise/include/otbKuanImageFilter.txx
index 351aed9dcd..2960cd303f 100644
--- a/Modules/Filtering/ImageNoise/include/otbKuanImageFilter.txx
+++ b/Modules/Filtering/ImageNoise/include/otbKuanImageFilter.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbKuanImageFilter_txx
-#define __otbKuanImageFilter_txx
+#ifndef otbKuanImageFilter_txx
+#define otbKuanImageFilter_txx
 
 #include "otbKuanImageFilter.h"
 
diff --git a/Modules/Filtering/ImageNoise/include/otbLeeImageFilter.h b/Modules/Filtering/ImageNoise/include/otbLeeImageFilter.h
index 735c26664b..6c07139d95 100644
--- a/Modules/Filtering/ImageNoise/include/otbLeeImageFilter.h
+++ b/Modules/Filtering/ImageNoise/include/otbLeeImageFilter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbLeeImageFilter_h
-#define __otbLeeImageFilter_h
+#ifndef otbLeeImageFilter_h
+#define otbLeeImageFilter_h
 
 #include "itkImageToImageFilter.h"
 #include "itkImage.h"
diff --git a/Modules/Filtering/ImageNoise/include/otbLeeImageFilter.txx b/Modules/Filtering/ImageNoise/include/otbLeeImageFilter.txx
index 4c68f1916a..0ea7e3aa09 100644
--- a/Modules/Filtering/ImageNoise/include/otbLeeImageFilter.txx
+++ b/Modules/Filtering/ImageNoise/include/otbLeeImageFilter.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbLeeImageFilter_txx
-#define __otbLeeImageFilter_txx
+#ifndef otbLeeImageFilter_txx
+#define otbLeeImageFilter_txx
 
 #include "otbLeeImageFilter.h"
 
diff --git a/Modules/Filtering/MathParser/include/otbBandMathImageFilter.h b/Modules/Filtering/MathParser/include/otbBandMathImageFilter.h
index d83ce8c735..a7f68ee4d9 100644
--- a/Modules/Filtering/MathParser/include/otbBandMathImageFilter.h
+++ b/Modules/Filtering/MathParser/include/otbBandMathImageFilter.h
@@ -19,8 +19,8 @@
 
 =========================================================================*/
 
-#ifndef __otbBandMathImageFilter_h
-#define __otbBandMathImageFilter_h
+#ifndef otbBandMathImageFilter_h
+#define otbBandMathImageFilter_h
 
 #include "itkInPlaceImageFilter.h"
 #include "itkImageRegionIteratorWithIndex.h"
diff --git a/Modules/Filtering/MathParser/include/otbBandMathImageFilter.txx b/Modules/Filtering/MathParser/include/otbBandMathImageFilter.txx
index 8bc0e54ee7..ae7af5ab4f 100644
--- a/Modules/Filtering/MathParser/include/otbBandMathImageFilter.txx
+++ b/Modules/Filtering/MathParser/include/otbBandMathImageFilter.txx
@@ -18,8 +18,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbBandMathImageFilter_txx
-#define __otbBandMathImageFilter_txx
+#ifndef otbBandMathImageFilter_txx
+#define otbBandMathImageFilter_txx
 #include "otbBandMathImageFilter.h"
 
 #include "itkImageRegionIterator.h"
diff --git a/Modules/Filtering/MathParser/include/otbMaskMuParserFilter.h b/Modules/Filtering/MathParser/include/otbMaskMuParserFilter.h
index c0c95a84b5..c1984a532a 100644
--- a/Modules/Filtering/MathParser/include/otbMaskMuParserFilter.h
+++ b/Modules/Filtering/MathParser/include/otbMaskMuParserFilter.h
@@ -19,8 +19,8 @@
 
 =========================================================================*/
 
-#ifndef __otbMaskMuParserFilter_h
-#define __otbMaskMuParserFilter_h
+#ifndef otbMaskMuParserFilter_h
+#define otbMaskMuParserFilter_h
 
 
 #include "itkProgressReporter.h"
diff --git a/Modules/Filtering/MathParser/include/otbMaskMuParserFilter.txx b/Modules/Filtering/MathParser/include/otbMaskMuParserFilter.txx
index 391adfec7d..01bce06c3d 100644
--- a/Modules/Filtering/MathParser/include/otbMaskMuParserFilter.txx
+++ b/Modules/Filtering/MathParser/include/otbMaskMuParserFilter.txx
@@ -15,8 +15,8 @@
  PURPOSE.  See the above copyright notices for more information.
 
  =========================================================================*/
-#ifndef __otbMaskMuParserFilter_txx
-#define __otbMaskMuParserFilter_txx
+#ifndef otbMaskMuParserFilter_txx
+#define otbMaskMuParserFilter_txx
 
 #include "otbMaskMuParserFilter.h"
 #include <iostream>
diff --git a/Modules/Filtering/MathParser/include/otbMaskMuParserFunctor.h b/Modules/Filtering/MathParser/include/otbMaskMuParserFunctor.h
index 1e0dfd653d..78bd01e63c 100644
--- a/Modules/Filtering/MathParser/include/otbMaskMuParserFunctor.h
+++ b/Modules/Filtering/MathParser/include/otbMaskMuParserFunctor.h
@@ -19,8 +19,8 @@
 
  =========================================================================*/
 
-#ifndef __otbMaskMuParserFunctor_h
-#define __otbMaskMuParserFunctor_h
+#ifndef otbMaskMuParserFunctor_h
+#define otbMaskMuParserFunctor_h
 
 #include "otbParser.h"
 #include "otbMacro.h"
diff --git a/Modules/Filtering/MathParser/include/otbMaskMuParserFunctor.txx b/Modules/Filtering/MathParser/include/otbMaskMuParserFunctor.txx
index dc6a43b3cf..98ee372836 100644
--- a/Modules/Filtering/MathParser/include/otbMaskMuParserFunctor.txx
+++ b/Modules/Filtering/MathParser/include/otbMaskMuParserFunctor.txx
@@ -15,8 +15,8 @@
  PURPOSE.  See the above copyright notices for more information.
 
  =========================================================================*/
-#ifndef __otbMaskMuParserFunctor_txx
-#define __otbMaskMuParserFunctor_txx
+#ifndef otbMaskMuParserFunctor_txx
+#define otbMaskMuParserFunctor_txx
 
 #include "otbMaskMuParserFunctor.h"
 
diff --git a/Modules/Filtering/MathParser/include/otbOBIAMuParserFunctor.h b/Modules/Filtering/MathParser/include/otbOBIAMuParserFunctor.h
index 0979d2dab9..710ed11f43 100644
--- a/Modules/Filtering/MathParser/include/otbOBIAMuParserFunctor.h
+++ b/Modules/Filtering/MathParser/include/otbOBIAMuParserFunctor.h
@@ -19,8 +19,8 @@
 
  =========================================================================*/
 
-#ifndef __otbOBIAMuParserFunctor_h
-#define __otbOBIAMuParserFunctor_h
+#ifndef otbOBIAMuParserFunctor_h
+#define otbOBIAMuParserFunctor_h
 
 #include "otbParser.h"
 #include "otbMacro.h"
diff --git a/Modules/Filtering/MathParser/include/otbParser.h b/Modules/Filtering/MathParser/include/otbParser.h
index 0fdfa42056..5ecd32321c 100644
--- a/Modules/Filtering/MathParser/include/otbParser.h
+++ b/Modules/Filtering/MathParser/include/otbParser.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbParser_h
-#define __otbParser_h
+#ifndef otbParser_h
+#define otbParser_h
 
 #include "itkLightObject.h"
 #include "itkObjectFactory.h"
diff --git a/Modules/Filtering/MathParser/include/otbParserConditionDataNodeFeatureFunction.h b/Modules/Filtering/MathParser/include/otbParserConditionDataNodeFeatureFunction.h
index 0609523f83..0e47e59e3a 100644
--- a/Modules/Filtering/MathParser/include/otbParserConditionDataNodeFeatureFunction.h
+++ b/Modules/Filtering/MathParser/include/otbParserConditionDataNodeFeatureFunction.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbParserConditionDataNodeFeatureFunction_h
-#define __otbParserConditionDataNodeFeatureFunction_h
+#ifndef otbParserConditionDataNodeFeatureFunction_h
+#define otbParserConditionDataNodeFeatureFunction_h
 
 #include "otbDataNodeImageFunction.h"
 #include "otbPolyLineImageConstIterator.h"
diff --git a/Modules/Filtering/MathParser/include/otbParserConditionDataNodeFeatureFunction.txx b/Modules/Filtering/MathParser/include/otbParserConditionDataNodeFeatureFunction.txx
index a9d0faed56..2413d93dd2 100644
--- a/Modules/Filtering/MathParser/include/otbParserConditionDataNodeFeatureFunction.txx
+++ b/Modules/Filtering/MathParser/include/otbParserConditionDataNodeFeatureFunction.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbParserConditionDataNodeFeatureFunction_txx
-#define __otbParserConditionDataNodeFeatureFunction_txx
+#ifndef otbParserConditionDataNodeFeatureFunction_txx
+#define otbParserConditionDataNodeFeatureFunction_txx
 
 #include "otbParserConditionDataNodeFeatureFunction.h"
 
diff --git a/Modules/Filtering/MathParserX/include/otbBandMathXImageFilter.h b/Modules/Filtering/MathParserX/include/otbBandMathXImageFilter.h
index 0b25ef56ba..4e2d873476 100644
--- a/Modules/Filtering/MathParserX/include/otbBandMathXImageFilter.h
+++ b/Modules/Filtering/MathParserX/include/otbBandMathXImageFilter.h
@@ -19,8 +19,8 @@
 
 =========================================================================*/
 
-#ifndef __otbBandMathXImageFilter_h
-#define __otbBandMathXImageFilter_h
+#ifndef otbBandMathXImageFilter_h
+#define otbBandMathXImageFilter_h
 
 #include "itkConstNeighborhoodIterator.h"
 #include "itkImageToImageFilter.h"
diff --git a/Modules/Filtering/MathParserX/include/otbBandMathXImageFilter.txx b/Modules/Filtering/MathParserX/include/otbBandMathXImageFilter.txx
index 61ba03478b..eecaf976cf 100644
--- a/Modules/Filtering/MathParserX/include/otbBandMathXImageFilter.txx
+++ b/Modules/Filtering/MathParserX/include/otbBandMathXImageFilter.txx
@@ -18,8 +18,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbBandMathXImageFilter_txx
-#define __otbBandMathXImageFilter_txx
+#ifndef otbBandMathXImageFilter_txx
+#define otbBandMathXImageFilter_txx
 #include "otbBandMathXImageFilter.h"
 
 #include "itkImageRegionIterator.h"
diff --git a/Modules/Filtering/MathParserX/include/otbParserX.h b/Modules/Filtering/MathParserX/include/otbParserX.h
index f2235e5020..a62d109e83 100644
--- a/Modules/Filtering/MathParserX/include/otbParserX.h
+++ b/Modules/Filtering/MathParserX/include/otbParserX.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbParserX_h
-#define __otbParserX_h
+#ifndef otbParserX_h
+#define otbParserX_h
 
 #include "itkLightObject.h"
 #include "itkObjectFactory.h"
diff --git a/Modules/Filtering/MathParserX/include/otbParserXPlugins.h b/Modules/Filtering/MathParserX/include/otbParserXPlugins.h
index 2026a95f16..443768e68c 100644
--- a/Modules/Filtering/MathParserX/include/otbParserXPlugins.h
+++ b/Modules/Filtering/MathParserX/include/otbParserXPlugins.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbParserXPlugins_h
-#define __otbParserXPlugins_h
+#ifndef otbParserXPlugins_h
+#define otbParserXPlugins_h
 
 #include "itkMacro.h"
 #include "otbMath.h"
diff --git a/Modules/Filtering/MorphologicalPyramid/include/otbMorphologicalPyramidAnalysisFilter.h b/Modules/Filtering/MorphologicalPyramid/include/otbMorphologicalPyramidAnalysisFilter.h
index e82874d20a..4fe7728133 100644
--- a/Modules/Filtering/MorphologicalPyramid/include/otbMorphologicalPyramidAnalysisFilter.h
+++ b/Modules/Filtering/MorphologicalPyramid/include/otbMorphologicalPyramidAnalysisFilter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbMorphologicalPyramidAnalysisFilter_h
-#define __otbMorphologicalPyramidAnalysisFilter_h
+#ifndef otbMorphologicalPyramidAnalysisFilter_h
+#define otbMorphologicalPyramidAnalysisFilter_h
 
 #include "otbImageToImageListFilter.h"
 
diff --git a/Modules/Filtering/MorphologicalPyramid/include/otbMorphologicalPyramidAnalysisFilter.txx b/Modules/Filtering/MorphologicalPyramid/include/otbMorphologicalPyramidAnalysisFilter.txx
index 3ad47321d4..f010b4c6be 100644
--- a/Modules/Filtering/MorphologicalPyramid/include/otbMorphologicalPyramidAnalysisFilter.txx
+++ b/Modules/Filtering/MorphologicalPyramid/include/otbMorphologicalPyramidAnalysisFilter.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbMorphologicalPyramidAnalysisFilter_txx
-#define __otbMorphologicalPyramidAnalysisFilter_txx
+#ifndef otbMorphologicalPyramidAnalysisFilter_txx
+#define otbMorphologicalPyramidAnalysisFilter_txx
 
 #include "otbMorphologicalPyramidAnalysisFilter.h"
 
diff --git a/Modules/Filtering/MorphologicalPyramid/include/otbMorphologicalPyramidMRToMSConverter.h b/Modules/Filtering/MorphologicalPyramid/include/otbMorphologicalPyramidMRToMSConverter.h
index 9c91a2476b..40721088e6 100644
--- a/Modules/Filtering/MorphologicalPyramid/include/otbMorphologicalPyramidMRToMSConverter.h
+++ b/Modules/Filtering/MorphologicalPyramid/include/otbMorphologicalPyramidMRToMSConverter.h
@@ -15,8 +15,8 @@
  PURPOSE.  See the above copyright notices for more information.
 
  =========================================================================*/
-#ifndef __otbMorphologicalPyramidMRToMSConverter_h
-#define __otbMorphologicalPyramidMRToMSConverter_h
+#ifndef otbMorphologicalPyramidMRToMSConverter_h
+#define otbMorphologicalPyramidMRToMSConverter_h
 
 #include "otbImageListToImageListFilter.h"
 
diff --git a/Modules/Filtering/MorphologicalPyramid/include/otbMorphologicalPyramidMRToMSConverter.txx b/Modules/Filtering/MorphologicalPyramid/include/otbMorphologicalPyramidMRToMSConverter.txx
index 3c26e6f695..a4288dea77 100644
--- a/Modules/Filtering/MorphologicalPyramid/include/otbMorphologicalPyramidMRToMSConverter.txx
+++ b/Modules/Filtering/MorphologicalPyramid/include/otbMorphologicalPyramidMRToMSConverter.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbMorphologicalPyramidMRToMSConverter_txx
-#define __otbMorphologicalPyramidMRToMSConverter_txx
+#ifndef otbMorphologicalPyramidMRToMSConverter_txx
+#define otbMorphologicalPyramidMRToMSConverter_txx
 
 #include "otbMorphologicalPyramidMRToMSConverter.h"
 #include "otbMorphologicalPyramidResampler.h"
diff --git a/Modules/Filtering/MorphologicalPyramid/include/otbMorphologicalPyramidResampler.h b/Modules/Filtering/MorphologicalPyramid/include/otbMorphologicalPyramidResampler.h
index a10a729771..4f9377338e 100644
--- a/Modules/Filtering/MorphologicalPyramid/include/otbMorphologicalPyramidResampler.h
+++ b/Modules/Filtering/MorphologicalPyramid/include/otbMorphologicalPyramidResampler.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbMorphologicalPyramidResampler_h
-#define __otbMorphologicalPyramidResampler_h
+#ifndef otbMorphologicalPyramidResampler_h
+#define otbMorphologicalPyramidResampler_h
 
 #include "itkImageToImageFilter.h"
 
diff --git a/Modules/Filtering/MorphologicalPyramid/include/otbMorphologicalPyramidResampler.txx b/Modules/Filtering/MorphologicalPyramid/include/otbMorphologicalPyramidResampler.txx
index aecbfdbf20..07526fadcc 100644
--- a/Modules/Filtering/MorphologicalPyramid/include/otbMorphologicalPyramidResampler.txx
+++ b/Modules/Filtering/MorphologicalPyramid/include/otbMorphologicalPyramidResampler.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbMorphologicalPyramidResampler_txx
-#define __otbMorphologicalPyramidResampler_txx
+#ifndef otbMorphologicalPyramidResampler_txx
+#define otbMorphologicalPyramidResampler_txx
 #include "otbMorphologicalPyramidResampler.h"
 #include "itkResampleImageFilter.h"
 #include "itkScalableAffineTransform.h"
diff --git a/Modules/Filtering/MorphologicalPyramid/include/otbMorphologicalPyramidSegmentationFilter.h b/Modules/Filtering/MorphologicalPyramid/include/otbMorphologicalPyramidSegmentationFilter.h
index 2158062e17..a47b4334d4 100644
--- a/Modules/Filtering/MorphologicalPyramid/include/otbMorphologicalPyramidSegmentationFilter.h
+++ b/Modules/Filtering/MorphologicalPyramid/include/otbMorphologicalPyramidSegmentationFilter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbMorphologicalPyramidSegmentationFilter_h
-#define __otbMorphologicalPyramidSegmentationFilter_h
+#ifndef otbMorphologicalPyramidSegmentationFilter_h
+#define otbMorphologicalPyramidSegmentationFilter_h
 
 #include "otbImageListToImageListFilter.h"
 namespace otb
diff --git a/Modules/Filtering/MorphologicalPyramid/include/otbMorphologicalPyramidSegmentationFilter.txx b/Modules/Filtering/MorphologicalPyramid/include/otbMorphologicalPyramidSegmentationFilter.txx
index 03521bb256..2783835831 100644
--- a/Modules/Filtering/MorphologicalPyramid/include/otbMorphologicalPyramidSegmentationFilter.txx
+++ b/Modules/Filtering/MorphologicalPyramid/include/otbMorphologicalPyramidSegmentationFilter.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbMorphologicalPyramidSegmentationFilter_txx
-#define __otbMorphologicalPyramidSegmentationFilter_txx
+#ifndef otbMorphologicalPyramidSegmentationFilter_txx
+#define otbMorphologicalPyramidSegmentationFilter_txx
 
 #include "otbMorphologicalPyramidSegmentationFilter.h"
 
diff --git a/Modules/Filtering/MorphologicalPyramid/include/otbMorphologicalPyramidSegmenter.h b/Modules/Filtering/MorphologicalPyramid/include/otbMorphologicalPyramidSegmenter.h
index 044d516170..79652b191a 100644
--- a/Modules/Filtering/MorphologicalPyramid/include/otbMorphologicalPyramidSegmenter.h
+++ b/Modules/Filtering/MorphologicalPyramid/include/otbMorphologicalPyramidSegmenter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbMorphologicalPyramidSegmenter_h
-#define __otbMorphologicalPyramidSegmenter_h
+#ifndef otbMorphologicalPyramidSegmenter_h
+#define otbMorphologicalPyramidSegmenter_h
 
 #include "itkImageToImageFilter.h"
 
diff --git a/Modules/Filtering/MorphologicalPyramid/include/otbMorphologicalPyramidSegmenter.txx b/Modules/Filtering/MorphologicalPyramid/include/otbMorphologicalPyramidSegmenter.txx
index e67e86c695..aa24b811be 100644
--- a/Modules/Filtering/MorphologicalPyramid/include/otbMorphologicalPyramidSegmenter.txx
+++ b/Modules/Filtering/MorphologicalPyramid/include/otbMorphologicalPyramidSegmenter.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbMorphologicalPyramidSegmenter_txx
-#define __otbMorphologicalPyramidSegmenter_txx
+#ifndef otbMorphologicalPyramidSegmenter_txx
+#define otbMorphologicalPyramidSegmenter_txx
 
 #include "otbMorphologicalPyramidSegmenter.h"
 
diff --git a/Modules/Filtering/MorphologicalPyramid/include/otbMorphologicalPyramidSynthesisFilter.h b/Modules/Filtering/MorphologicalPyramid/include/otbMorphologicalPyramidSynthesisFilter.h
index 187c7ef397..45b5acea53 100644
--- a/Modules/Filtering/MorphologicalPyramid/include/otbMorphologicalPyramidSynthesisFilter.h
+++ b/Modules/Filtering/MorphologicalPyramid/include/otbMorphologicalPyramidSynthesisFilter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbMorphologicalPyramidSynthesisFilter_h
-#define __otbMorphologicalPyramidSynthesisFilter_h
+#ifndef otbMorphologicalPyramidSynthesisFilter_h
+#define otbMorphologicalPyramidSynthesisFilter_h
 
 #include "otbImageToImageListFilter.h"
 
diff --git a/Modules/Filtering/MorphologicalPyramid/include/otbMorphologicalPyramidSynthesisFilter.txx b/Modules/Filtering/MorphologicalPyramid/include/otbMorphologicalPyramidSynthesisFilter.txx
index de2aaa7bb1..f37b510a46 100644
--- a/Modules/Filtering/MorphologicalPyramid/include/otbMorphologicalPyramidSynthesisFilter.txx
+++ b/Modules/Filtering/MorphologicalPyramid/include/otbMorphologicalPyramidSynthesisFilter.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbMorphologicalPyramidSynthesisFilter_txx
-#define __otbMorphologicalPyramidSynthesisFilter_txx
+#ifndef otbMorphologicalPyramidSynthesisFilter_txx
+#define otbMorphologicalPyramidSynthesisFilter_txx
 
 #include "otbMorphologicalPyramidSynthesisFilter.h"
 
diff --git a/Modules/Filtering/Path/include/otbClosePathFunctor.h b/Modules/Filtering/Path/include/otbClosePathFunctor.h
index dec07b272e..9d7d44bb5c 100644
--- a/Modules/Filtering/Path/include/otbClosePathFunctor.h
+++ b/Modules/Filtering/Path/include/otbClosePathFunctor.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbClosePathFunctor_h
-#define __otbClosePathFunctor_h
+#ifndef otbClosePathFunctor_h
+#define otbClosePathFunctor_h
 
 #include "otbMath.h"
 
diff --git a/Modules/Filtering/Path/include/otbCompacityPathFunction.h b/Modules/Filtering/Path/include/otbCompacityPathFunction.h
index ea3a86fa8f..cb8e5e8150 100644
--- a/Modules/Filtering/Path/include/otbCompacityPathFunction.h
+++ b/Modules/Filtering/Path/include/otbCompacityPathFunction.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbCompacityPathFunction_h
-#define __otbCompacityPathFunction_h
+#ifndef otbCompacityPathFunction_h
+#define otbCompacityPathFunction_h
 
 #include "otbPathFunction.h"
 #include "itkVectorContainer.h"
diff --git a/Modules/Filtering/Path/include/otbCompacityPathFunction.txx b/Modules/Filtering/Path/include/otbCompacityPathFunction.txx
index bffc74afc2..46523581c4 100644
--- a/Modules/Filtering/Path/include/otbCompacityPathFunction.txx
+++ b/Modules/Filtering/Path/include/otbCompacityPathFunction.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbCompacityPathFunction_txx
-#define __otbCompacityPathFunction_txx
+#ifndef otbCompacityPathFunction_txx
+#define otbCompacityPathFunction_txx
 
 #include "otbPathFunction.h"
 #include "itkNumericTraits.h"
diff --git a/Modules/Filtering/Path/include/otbDrawPathFilter.h b/Modules/Filtering/Path/include/otbDrawPathFilter.h
index afe2940495..19bb249f69 100644
--- a/Modules/Filtering/Path/include/otbDrawPathFilter.h
+++ b/Modules/Filtering/Path/include/otbDrawPathFilter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbDrawPathFilter_h
-#define __otbDrawPathFilter_h
+#ifndef otbDrawPathFilter_h
+#define otbDrawPathFilter_h
 
 #include "itkImageAndPathToImageFilter.h"
 
diff --git a/Modules/Filtering/Path/include/otbDrawPathFilter.txx b/Modules/Filtering/Path/include/otbDrawPathFilter.txx
index fac98e7a12..ae29709542 100644
--- a/Modules/Filtering/Path/include/otbDrawPathFilter.txx
+++ b/Modules/Filtering/Path/include/otbDrawPathFilter.txx
@@ -16,8 +16,8 @@
 
 =========================================================================*/
 
-#ifndef __otbDrawPathFilter_txx
-#define __otbDrawPathFilter_txx
+#ifndef otbDrawPathFilter_txx
+#define otbDrawPathFilter_txx
 
 #include "otbDrawPathFilter.h"
 #include "otbDrawPathListFilter.h"
diff --git a/Modules/Filtering/Path/include/otbDrawPathListFilter.h b/Modules/Filtering/Path/include/otbDrawPathListFilter.h
index 81ee894534..963ad8d85d 100644
--- a/Modules/Filtering/Path/include/otbDrawPathListFilter.h
+++ b/Modules/Filtering/Path/include/otbDrawPathListFilter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbDrawPathListFilter_h
-#define __otbDrawPathListFilter_h
+#ifndef otbDrawPathListFilter_h
+#define otbDrawPathListFilter_h
 
 #include "itkImageToImageFilter.h"
 #include "otbObjectList.h"
diff --git a/Modules/Filtering/Path/include/otbDrawPathListFilter.txx b/Modules/Filtering/Path/include/otbDrawPathListFilter.txx
index ade94420a3..0b60c2a688 100644
--- a/Modules/Filtering/Path/include/otbDrawPathListFilter.txx
+++ b/Modules/Filtering/Path/include/otbDrawPathListFilter.txx
@@ -16,8 +16,8 @@
 
 =========================================================================*/
 
-#ifndef __otbDrawPathListFilter_txx
-#define __otbDrawPathListFilter_txx
+#ifndef otbDrawPathListFilter_txx
+#define otbDrawPathListFilter_txx
 
 #include "otbDrawPathListFilter.h"
 
diff --git a/Modules/Filtering/Path/include/otbImageFittingPolygonListFilter.h b/Modules/Filtering/Path/include/otbImageFittingPolygonListFilter.h
index 4e8af8afce..57a3fbb7c6 100644
--- a/Modules/Filtering/Path/include/otbImageFittingPolygonListFilter.h
+++ b/Modules/Filtering/Path/include/otbImageFittingPolygonListFilter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbImageFittingPolygonListFilter_h
-#define __otbImageFittingPolygonListFilter_h
+#ifndef otbImageFittingPolygonListFilter_h
+#define otbImageFittingPolygonListFilter_h
 
 #include "otbPathListToPathListFilter.h"
 #include "otbMacro.h"
diff --git a/Modules/Filtering/Path/include/otbImageFittingPolygonListFilter.txx b/Modules/Filtering/Path/include/otbImageFittingPolygonListFilter.txx
index 5cb12c555a..baf4292944 100644
--- a/Modules/Filtering/Path/include/otbImageFittingPolygonListFilter.txx
+++ b/Modules/Filtering/Path/include/otbImageFittingPolygonListFilter.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbImageFittingPolygonListFilter_txx
-#define __otbImageFittingPolygonListFilter_txx
+#ifndef otbImageFittingPolygonListFilter_txx
+#define otbImageFittingPolygonListFilter_txx
 
 #include "otbImageFittingPolygonListFilter.h"
 #include "otbPolyLineImageConstIterator.h"
diff --git a/Modules/Filtering/Path/include/otbImageToEdgePathFilter.h b/Modules/Filtering/Path/include/otbImageToEdgePathFilter.h
index cd514094ec..87d6301923 100644
--- a/Modules/Filtering/Path/include/otbImageToEdgePathFilter.h
+++ b/Modules/Filtering/Path/include/otbImageToEdgePathFilter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbImageToEdgePathFilter_h
-#define __otbImageToEdgePathFilter_h
+#ifndef otbImageToEdgePathFilter_h
+#define otbImageToEdgePathFilter_h
 
 #include "otbImageToPathFilter.h"
 
diff --git a/Modules/Filtering/Path/include/otbImageToEdgePathFilter.txx b/Modules/Filtering/Path/include/otbImageToEdgePathFilter.txx
index fb34a16679..9306826888 100644
--- a/Modules/Filtering/Path/include/otbImageToEdgePathFilter.txx
+++ b/Modules/Filtering/Path/include/otbImageToEdgePathFilter.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbImageToEdgePathFilter_txx
-#define __otbImageToEdgePathFilter_txx
+#ifndef otbImageToEdgePathFilter_txx
+#define otbImageToEdgePathFilter_txx
 
 #include "otbImageToEdgePathFilter.h"
 #include "otbMacro.h"
diff --git a/Modules/Filtering/Path/include/otbImageToPathFilter.h b/Modules/Filtering/Path/include/otbImageToPathFilter.h
index 66a68f0571..ffc0ffd6a2 100644
--- a/Modules/Filtering/Path/include/otbImageToPathFilter.h
+++ b/Modules/Filtering/Path/include/otbImageToPathFilter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbImageToPathFilter_h
-#define __otbImageToPathFilter_h
+#ifndef otbImageToPathFilter_h
+#define otbImageToPathFilter_h
 
 #include "itkPathSource.h"
 
diff --git a/Modules/Filtering/Path/include/otbImageToPathFilter.txx b/Modules/Filtering/Path/include/otbImageToPathFilter.txx
index 45c6af20e5..c6628d1020 100644
--- a/Modules/Filtering/Path/include/otbImageToPathFilter.txx
+++ b/Modules/Filtering/Path/include/otbImageToPathFilter.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbImageToPathFilter_txx
-#define __otbImageToPathFilter_txx
+#ifndef otbImageToPathFilter_txx
+#define otbImageToPathFilter_txx
 
 #include "otbImageToPathFilter.h"
 
diff --git a/Modules/Filtering/Path/include/otbImageToPathListFilter.h b/Modules/Filtering/Path/include/otbImageToPathListFilter.h
index 11bd6bb1b3..0f609053dc 100644
--- a/Modules/Filtering/Path/include/otbImageToPathListFilter.h
+++ b/Modules/Filtering/Path/include/otbImageToPathListFilter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbImageToPathListFilter_h
-#define __otbImageToPathListFilter_h
+#ifndef otbImageToPathListFilter_h
+#define otbImageToPathListFilter_h
 
 #include "otbPathListSource.h"
 namespace otb
diff --git a/Modules/Filtering/Path/include/otbImageToPathListFilter.txx b/Modules/Filtering/Path/include/otbImageToPathListFilter.txx
index 1f6296792c..df505f0a59 100644
--- a/Modules/Filtering/Path/include/otbImageToPathListFilter.txx
+++ b/Modules/Filtering/Path/include/otbImageToPathListFilter.txx
@@ -16,8 +16,8 @@
 
 =========================================================================*/
 
-#ifndef __otbImageToPathListFilter_txx
-#define __otbImageToPathListFilter_txx
+#ifndef otbImageToPathListFilter_txx
+#define otbImageToPathListFilter_txx
 
 #include "otbImageToPathListFilter.h"
 #include "itkProcessObject.h"
diff --git a/Modules/Filtering/Path/include/otbOrientationPathFunction.h b/Modules/Filtering/Path/include/otbOrientationPathFunction.h
index eae5641c6b..ca207f685a 100644
--- a/Modules/Filtering/Path/include/otbOrientationPathFunction.h
+++ b/Modules/Filtering/Path/include/otbOrientationPathFunction.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbOrientationPathFunction_h
-#define __otbOrientationPathFunction_h
+#ifndef otbOrientationPathFunction_h
+#define otbOrientationPathFunction_h
 
 #include "otbPathFunction.h"
 #include "itkVectorContainer.h"
diff --git a/Modules/Filtering/Path/include/otbOrientationPathFunction.txx b/Modules/Filtering/Path/include/otbOrientationPathFunction.txx
index ab09be6b0c..a5d8eaf162 100644
--- a/Modules/Filtering/Path/include/otbOrientationPathFunction.txx
+++ b/Modules/Filtering/Path/include/otbOrientationPathFunction.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbOrientationPathFunction_txx
-#define __otbOrientationPathFunction_txx
+#ifndef otbOrientationPathFunction_txx
+#define otbOrientationPathFunction_txx
 
 #include "otbPathFunction.h"
 #include "itkNumericTraits.h"
diff --git a/Modules/Filtering/Path/include/otbPathFunction.h b/Modules/Filtering/Path/include/otbPathFunction.h
index 9715674577..25ca7f89e6 100644
--- a/Modules/Filtering/Path/include/otbPathFunction.h
+++ b/Modules/Filtering/Path/include/otbPathFunction.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbPathFunction_h
-#define __otbPathFunction_h
+#ifndef otbPathFunction_h
+#define otbPathFunction_h
 
 #include "itkFunctionBase.h"
 
diff --git a/Modules/Filtering/Path/include/otbPathFunction.txx b/Modules/Filtering/Path/include/otbPathFunction.txx
index b3d9086a80..43ee43a072 100644
--- a/Modules/Filtering/Path/include/otbPathFunction.txx
+++ b/Modules/Filtering/Path/include/otbPathFunction.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbPathFunction_txx
-#define __otbPathFunction_txx
+#ifndef otbPathFunction_txx
+#define otbPathFunction_txx
 
 #include "otbPathFunction.h"
 
diff --git a/Modules/Filtering/Path/include/otbPathLengthFunctor.h b/Modules/Filtering/Path/include/otbPathLengthFunctor.h
index f8dd25a0f7..2fcbfb1893 100644
--- a/Modules/Filtering/Path/include/otbPathLengthFunctor.h
+++ b/Modules/Filtering/Path/include/otbPathLengthFunctor.h
@@ -16,8 +16,8 @@
 
 =========================================================================*/
 
-#ifndef __otbPathLengthFunctor_h
-#define __otbPathLengthFunctor_h
+#ifndef otbPathLengthFunctor_h
+#define otbPathLengthFunctor_h
 
 #include "otbMath.h"
 
diff --git a/Modules/Filtering/Path/include/otbPathListSource.h b/Modules/Filtering/Path/include/otbPathListSource.h
index bc3ac50fb4..b25f914fd7 100644
--- a/Modules/Filtering/Path/include/otbPathListSource.h
+++ b/Modules/Filtering/Path/include/otbPathListSource.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbPathListSource_h
-#define __otbPathListSource_h
+#ifndef otbPathListSource_h
+#define otbPathListSource_h
 
 // #include "itkProcessObject.h"
 // #include "itkDataObject.h"
diff --git a/Modules/Filtering/Path/include/otbPathListToHistogramGenerator.h b/Modules/Filtering/Path/include/otbPathListToHistogramGenerator.h
index 490183f2b2..2f46aad8b6 100644
--- a/Modules/Filtering/Path/include/otbPathListToHistogramGenerator.h
+++ b/Modules/Filtering/Path/include/otbPathListToHistogramGenerator.h
@@ -16,8 +16,8 @@
 
 =========================================================================*/
 
-#ifndef __otbPathListToHistogramGenerator_h
-#define __otbPathListToHistogramGenerator_h
+#ifndef otbPathListToHistogramGenerator_h
+#define otbPathListToHistogramGenerator_h
 
 #include "itkSampleToHistogramFilter.h"
 #include "itkHistogram.h"
diff --git a/Modules/Filtering/Path/include/otbPathListToHistogramGenerator.txx b/Modules/Filtering/Path/include/otbPathListToHistogramGenerator.txx
index 6c2cf4daaf..35f6302317 100644
--- a/Modules/Filtering/Path/include/otbPathListToHistogramGenerator.txx
+++ b/Modules/Filtering/Path/include/otbPathListToHistogramGenerator.txx
@@ -16,8 +16,8 @@
 
 =========================================================================*/
 
-#ifndef __otbPathListToHistogramGenerator_txx
-#define __otbPathListToHistogramGenerator_txx
+#ifndef otbPathListToHistogramGenerator_txx
+#define otbPathListToHistogramGenerator_txx
 
 #include "otbPathListToHistogramGenerator.h"
 
diff --git a/Modules/Filtering/Path/include/otbPathListToPathListFilter.h b/Modules/Filtering/Path/include/otbPathListToPathListFilter.h
index 8d746b57cc..b822cd9f81 100644
--- a/Modules/Filtering/Path/include/otbPathListToPathListFilter.h
+++ b/Modules/Filtering/Path/include/otbPathListToPathListFilter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbPathListToPathListFilter_h
-#define __otbPathListToPathListFilter_h
+#ifndef otbPathListToPathListFilter_h
+#define otbPathListToPathListFilter_h
 
 #include "otbObjectListToObjectListFilter.h"
 #include "otbObjectList.h"
diff --git a/Modules/Filtering/Path/include/otbPathMeanDistanceFunctor.h b/Modules/Filtering/Path/include/otbPathMeanDistanceFunctor.h
index 7d632d99d4..eff6f2a533 100644
--- a/Modules/Filtering/Path/include/otbPathMeanDistanceFunctor.h
+++ b/Modules/Filtering/Path/include/otbPathMeanDistanceFunctor.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbPathMeanDistanceFunctor_h
-#define __otbPathMeanDistanceFunctor_h
+#ifndef otbPathMeanDistanceFunctor_h
+#define otbPathMeanDistanceFunctor_h
 
 #include "otbMacro.h"
 #include "otbMath.h"
diff --git a/Modules/Filtering/Path/include/otbPolyLineImageConstIterator.h b/Modules/Filtering/Path/include/otbPolyLineImageConstIterator.h
index 4d44ee407b..01868c0eb1 100644
--- a/Modules/Filtering/Path/include/otbPolyLineImageConstIterator.h
+++ b/Modules/Filtering/Path/include/otbPolyLineImageConstIterator.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbPolyLineImageConstIterator_h
-#define __otbPolyLineImageConstIterator_h
+#ifndef otbPolyLineImageConstIterator_h
+#define otbPolyLineImageConstIterator_h
 
 #include "itkIndex.h"
 #include "itkImage.h"
diff --git a/Modules/Filtering/Path/include/otbPolyLineImageConstIterator.txx b/Modules/Filtering/Path/include/otbPolyLineImageConstIterator.txx
index 2016bf5dc4..a0e748d78c 100644
--- a/Modules/Filtering/Path/include/otbPolyLineImageConstIterator.txx
+++ b/Modules/Filtering/Path/include/otbPolyLineImageConstIterator.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbPolyLineImageConstIterator_txx
-#define __otbPolyLineImageConstIterator_txx
+#ifndef otbPolyLineImageConstIterator_txx
+#define otbPolyLineImageConstIterator_txx
 
 #include "otbPolyLineImageConstIterator.h"
 #include "otbMacro.h"
diff --git a/Modules/Filtering/Path/include/otbPolyLineImageIterator.h b/Modules/Filtering/Path/include/otbPolyLineImageIterator.h
index 5c33640bb5..4611700a92 100644
--- a/Modules/Filtering/Path/include/otbPolyLineImageIterator.h
+++ b/Modules/Filtering/Path/include/otbPolyLineImageIterator.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbPolyLineImageIterator_h
-#define __otbPolyLineImageIterator_h
+#ifndef otbPolyLineImageIterator_h
+#define otbPolyLineImageIterator_h
 
 #include "otbPolyLineImageConstIterator.h"
 
diff --git a/Modules/Filtering/Path/include/otbRegionImageToRectangularPathListFilter.h b/Modules/Filtering/Path/include/otbRegionImageToRectangularPathListFilter.h
index ae2c918d80..c7d98969df 100644
--- a/Modules/Filtering/Path/include/otbRegionImageToRectangularPathListFilter.h
+++ b/Modules/Filtering/Path/include/otbRegionImageToRectangularPathListFilter.h
@@ -17,8 +17,8 @@
 =========================================================================*/
 
 // Adapted from otbImageToPathListAlignFilter.h
-#ifndef __otbRegionImageToRectangularPathListFilter_h
-#define __otbRegionImageToRectangularPathListFilter_h
+#ifndef otbRegionImageToRectangularPathListFilter_h
+#define otbRegionImageToRectangularPathListFilter_h
 
 #include "itkImageSource.h"
 #include "itkConceptChecking.h"
diff --git a/Modules/Filtering/Path/include/otbRegionImageToRectangularPathListFilter.txx b/Modules/Filtering/Path/include/otbRegionImageToRectangularPathListFilter.txx
index 251efe9828..d96e1b2b19 100644
--- a/Modules/Filtering/Path/include/otbRegionImageToRectangularPathListFilter.txx
+++ b/Modules/Filtering/Path/include/otbRegionImageToRectangularPathListFilter.txx
@@ -18,8 +18,8 @@
 
 // Adapted from otbImageToPathListAlignFilter.txx
 
-#ifndef __otbRegionImageToRectangularPathListFilter_txx
-#define __otbRegionImageToRectangularPathListFilter_txx
+#ifndef otbRegionImageToRectangularPathListFilter_txx
+#define otbRegionImageToRectangularPathListFilter_txx
 
 #include <iostream>
 #include <exception>
diff --git a/Modules/Filtering/Path/include/otbVectorizationPathListFilter.h b/Modules/Filtering/Path/include/otbVectorizationPathListFilter.h
index 43795b7fef..60a36144e9 100644
--- a/Modules/Filtering/Path/include/otbVectorizationPathListFilter.h
+++ b/Modules/Filtering/Path/include/otbVectorizationPathListFilter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbVectorizationPathListFilter_h
-#define __otbVectorizationPathListFilter_h
+#ifndef otbVectorizationPathListFilter_h
+#define otbVectorizationPathListFilter_h
 
 #include "otbPathListSource.h"
 #include "itkImageRegionIterator.h"
diff --git a/Modules/Filtering/Path/include/otbVectorizationPathListFilter.txx b/Modules/Filtering/Path/include/otbVectorizationPathListFilter.txx
index 90599e0d19..038ceb4bb2 100644
--- a/Modules/Filtering/Path/include/otbVectorizationPathListFilter.txx
+++ b/Modules/Filtering/Path/include/otbVectorizationPathListFilter.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbVectorizationPathListFilter_txx
-#define __otbVectorizationPathListFilter_txx
+#ifndef otbVectorizationPathListFilter_txx
+#define otbVectorizationPathListFilter_txx
 
 #include "otbVectorizationPathListFilter.h"
 #include "otbMacro.h"
diff --git a/Modules/Filtering/Polarimetry/include/otbMultiChannelsPolarimetricSynthesisFilter.h b/Modules/Filtering/Polarimetry/include/otbMultiChannelsPolarimetricSynthesisFilter.h
index 092d5004a1..841b97563e 100644
--- a/Modules/Filtering/Polarimetry/include/otbMultiChannelsPolarimetricSynthesisFilter.h
+++ b/Modules/Filtering/Polarimetry/include/otbMultiChannelsPolarimetricSynthesisFilter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbMultiChannelsPolarimetricSynthesisFilter_h
-#define __otbMultiChannelsPolarimetricSynthesisFilter_h
+#ifndef otbMultiChannelsPolarimetricSynthesisFilter_h
+#define otbMultiChannelsPolarimetricSynthesisFilter_h
 
 #include "itkInPlaceImageFilter.h"
 #include "otbPolarimetricSynthesisFunctor.h"
diff --git a/Modules/Filtering/Polarimetry/include/otbMultiChannelsPolarimetricSynthesisFilter.txx b/Modules/Filtering/Polarimetry/include/otbMultiChannelsPolarimetricSynthesisFilter.txx
index e5539846c7..4640fd4d0b 100644
--- a/Modules/Filtering/Polarimetry/include/otbMultiChannelsPolarimetricSynthesisFilter.txx
+++ b/Modules/Filtering/Polarimetry/include/otbMultiChannelsPolarimetricSynthesisFilter.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbMultiChannelsPolarimetricSynthesisFilter_txx
-#define __otbMultiChannelsPolarimetricSynthesisFilter_txx
+#ifndef otbMultiChannelsPolarimetricSynthesisFilter_txx
+#define otbMultiChannelsPolarimetricSynthesisFilter_txx
 
 #include <complex>
 
diff --git a/Modules/Filtering/Polarimetry/include/otbPolarimetricData.h b/Modules/Filtering/Polarimetry/include/otbPolarimetricData.h
index eb3a4a4c26..15cd3bf513 100644
--- a/Modules/Filtering/Polarimetry/include/otbPolarimetricData.h
+++ b/Modules/Filtering/Polarimetry/include/otbPolarimetricData.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbPolarimetricData_h
-#define __otbPolarimetricData_h
+#ifndef otbPolarimetricData_h
+#define otbPolarimetricData_h
 
 #include "itkDataObject.h"
 #include "itkObjectFactory.h"
diff --git a/Modules/Filtering/Polarimetry/include/otbPolarimetricSynthesisFunctor.h b/Modules/Filtering/Polarimetry/include/otbPolarimetricSynthesisFunctor.h
index 0877fbb161..2b22bff697 100644
--- a/Modules/Filtering/Polarimetry/include/otbPolarimetricSynthesisFunctor.h
+++ b/Modules/Filtering/Polarimetry/include/otbPolarimetricSynthesisFunctor.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbPolarimetricSynthesisFunctor_h
-#define __otbPolarimetricSynthesisFunctor_h
+#ifndef otbPolarimetricSynthesisFunctor_h
+#define otbPolarimetricSynthesisFunctor_h
 
 #include "otbMath.h"
 #include "vcl_complex.h"
diff --git a/Modules/Filtering/Polarimetry/include/otbSinclairImageFilter.h b/Modules/Filtering/Polarimetry/include/otbSinclairImageFilter.h
index 9ec92d5c05..8f2f6a38c5 100644
--- a/Modules/Filtering/Polarimetry/include/otbSinclairImageFilter.h
+++ b/Modules/Filtering/Polarimetry/include/otbSinclairImageFilter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbSinclairImageFilter_h
-#define __otbSinclairImageFilter_h
+#ifndef otbSinclairImageFilter_h
+#define otbSinclairImageFilter_h
 
 #include "otbQuaternaryFunctorImageFilter.h"
 #include "otbSinclairToCovarianceMatrixFunctor.h"
diff --git a/Modules/Filtering/Polarimetry/include/otbSinclairImageFilter.txx b/Modules/Filtering/Polarimetry/include/otbSinclairImageFilter.txx
index d929a06c69..eb81e538e2 100644
--- a/Modules/Filtering/Polarimetry/include/otbSinclairImageFilter.txx
+++ b/Modules/Filtering/Polarimetry/include/otbSinclairImageFilter.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbSinclairImageFilter_txx
-#define __otbSinclairImageFilter_txx
+#ifndef otbSinclairImageFilter_txx
+#define otbSinclairImageFilter_txx
 
 #include "otbSinclairImageFilter.h"
 #include "otbMath.h"
diff --git a/Modules/Filtering/Polarimetry/include/otbSinclairReciprocalImageFilter.h b/Modules/Filtering/Polarimetry/include/otbSinclairReciprocalImageFilter.h
index ddd6a80dc9..b089f94a7d 100644
--- a/Modules/Filtering/Polarimetry/include/otbSinclairReciprocalImageFilter.h
+++ b/Modules/Filtering/Polarimetry/include/otbSinclairReciprocalImageFilter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbSinclairReciprocalImageFilter_h
-#define __otbSinclairReciprocalImageFilter_h
+#ifndef otbSinclairReciprocalImageFilter_h
+#define otbSinclairReciprocalImageFilter_h
 
 #include "itkTernaryFunctorImageFilter.h"
 #include "otbSinclairToReciprocalCovarianceMatrixFunctor.h"
diff --git a/Modules/Filtering/Polarimetry/include/otbSinclairReciprocalImageFilter.txx b/Modules/Filtering/Polarimetry/include/otbSinclairReciprocalImageFilter.txx
index 82ca755cbf..159b374501 100644
--- a/Modules/Filtering/Polarimetry/include/otbSinclairReciprocalImageFilter.txx
+++ b/Modules/Filtering/Polarimetry/include/otbSinclairReciprocalImageFilter.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbSinclairReciprocalImageFilter_txx
-#define __otbSinclairReciprocalImageFilter_txx
+#ifndef otbSinclairReciprocalImageFilter_txx
+#define otbSinclairReciprocalImageFilter_txx
 
 #include "otbSinclairReciprocalImageFilter.h"
 #include "otbMath.h"
diff --git a/Modules/Filtering/Polarimetry/include/otbSinclairToCircularCovarianceMatrixFunctor.h b/Modules/Filtering/Polarimetry/include/otbSinclairToCircularCovarianceMatrixFunctor.h
index 08e10da87a..174dcd8263 100644
--- a/Modules/Filtering/Polarimetry/include/otbSinclairToCircularCovarianceMatrixFunctor.h
+++ b/Modules/Filtering/Polarimetry/include/otbSinclairToCircularCovarianceMatrixFunctor.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbSinclairToCircularCovarianceMatrixFunctor_h
-#define __otbSinclairToCircularCovarianceMatrixFunctor_h
+#ifndef otbSinclairToCircularCovarianceMatrixFunctor_h
+#define otbSinclairToCircularCovarianceMatrixFunctor_h
 
 #include "vcl_complex.h"
 #include "otbSinclairToCovarianceMatrixFunctor.h"
diff --git a/Modules/Filtering/Polarimetry/include/otbSinclairToCoherencyMatrixFunctor.h b/Modules/Filtering/Polarimetry/include/otbSinclairToCoherencyMatrixFunctor.h
index 43b3320ce7..779eef23e6 100644
--- a/Modules/Filtering/Polarimetry/include/otbSinclairToCoherencyMatrixFunctor.h
+++ b/Modules/Filtering/Polarimetry/include/otbSinclairToCoherencyMatrixFunctor.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbSinclairToCoherencyMatrixFunctor_h
-#define __otbSinclairToCoherencyMatrixFunctor_h
+#ifndef otbSinclairToCoherencyMatrixFunctor_h
+#define otbSinclairToCoherencyMatrixFunctor_h
 
 #include "vcl_complex.h"
 
diff --git a/Modules/Filtering/Polarimetry/include/otbSinclairToCovarianceMatrixFunctor.h b/Modules/Filtering/Polarimetry/include/otbSinclairToCovarianceMatrixFunctor.h
index 390487cf7c..2a0d1dac86 100644
--- a/Modules/Filtering/Polarimetry/include/otbSinclairToCovarianceMatrixFunctor.h
+++ b/Modules/Filtering/Polarimetry/include/otbSinclairToCovarianceMatrixFunctor.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbSinclairToCovarianceMatrixFunctor_h
-#define __otbSinclairToCovarianceMatrixFunctor_h
+#ifndef otbSinclairToCovarianceMatrixFunctor_h
+#define otbSinclairToCovarianceMatrixFunctor_h
 
 #include "vcl_complex.h"
 
diff --git a/Modules/Filtering/Polarimetry/include/otbSinclairToMuellerMatrixFunctor.h b/Modules/Filtering/Polarimetry/include/otbSinclairToMuellerMatrixFunctor.h
index 4bd338ccef..33ab0b9d1e 100644
--- a/Modules/Filtering/Polarimetry/include/otbSinclairToMuellerMatrixFunctor.h
+++ b/Modules/Filtering/Polarimetry/include/otbSinclairToMuellerMatrixFunctor.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbSinclairToMuellerMatrixFunctor_h
-#define __otbSinclairToMuellerMatrixFunctor_h
+#ifndef otbSinclairToMuellerMatrixFunctor_h
+#define otbSinclairToMuellerMatrixFunctor_h
 
 #include "vcl_complex.h"
 
diff --git a/Modules/Filtering/Polarimetry/include/otbSinclairToReciprocalCircularCovarianceMatrixFunctor.h b/Modules/Filtering/Polarimetry/include/otbSinclairToReciprocalCircularCovarianceMatrixFunctor.h
index 7dbb8322dc..5fc5a2c009 100644
--- a/Modules/Filtering/Polarimetry/include/otbSinclairToReciprocalCircularCovarianceMatrixFunctor.h
+++ b/Modules/Filtering/Polarimetry/include/otbSinclairToReciprocalCircularCovarianceMatrixFunctor.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbSinclairToReciprocalCircularCovarianceMatrixFunctor_h
-#define __otbSinclairToReciprocalCircularCovarianceMatrixFunctor_h
+#ifndef otbSinclairToReciprocalCircularCovarianceMatrixFunctor_h
+#define otbSinclairToReciprocalCircularCovarianceMatrixFunctor_h
 
 #include "vcl_complex.h"
 #include "otbSinclairToReciprocalCovarianceMatrixFunctor.h"
diff --git a/Modules/Filtering/Polarimetry/include/otbSinclairToReciprocalCoherencyMatrixFunctor.h b/Modules/Filtering/Polarimetry/include/otbSinclairToReciprocalCoherencyMatrixFunctor.h
index 7fb9ddc327..06db3349cd 100644
--- a/Modules/Filtering/Polarimetry/include/otbSinclairToReciprocalCoherencyMatrixFunctor.h
+++ b/Modules/Filtering/Polarimetry/include/otbSinclairToReciprocalCoherencyMatrixFunctor.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbSinclairToReciprocalCoherencyMatrixFunctor_h
-#define __otbSinclairToReciprocalCoherencyMatrixFunctor_h
+#ifndef otbSinclairToReciprocalCoherencyMatrixFunctor_h
+#define otbSinclairToReciprocalCoherencyMatrixFunctor_h
 
 #include "itkMacro.h"
 #include "vcl_complex.h"
diff --git a/Modules/Filtering/Polarimetry/include/otbSinclairToReciprocalCovarianceMatrixFunctor.h b/Modules/Filtering/Polarimetry/include/otbSinclairToReciprocalCovarianceMatrixFunctor.h
index 632033676a..4aed252c5c 100644
--- a/Modules/Filtering/Polarimetry/include/otbSinclairToReciprocalCovarianceMatrixFunctor.h
+++ b/Modules/Filtering/Polarimetry/include/otbSinclairToReciprocalCovarianceMatrixFunctor.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbSinclairToReciprocalCovarianceMatrixFunctor_h
-#define __otbSinclairToReciprocalCovarianceMatrixFunctor_h
+#ifndef otbSinclairToReciprocalCovarianceMatrixFunctor_h
+#define otbSinclairToReciprocalCovarianceMatrixFunctor_h
 
 #include "vcl_complex.h"
 #include "otbMath.h"
diff --git a/Modules/Filtering/Projection/include/otbEckert4MapProjection.h b/Modules/Filtering/Projection/include/otbEckert4MapProjection.h
index ac08f45515..e2288456e8 100644
--- a/Modules/Filtering/Projection/include/otbEckert4MapProjection.h
+++ b/Modules/Filtering/Projection/include/otbEckert4MapProjection.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbEckert4MapProjection_h
-#define __otbEckert4MapProjection_h
+#ifndef otbEckert4MapProjection_h
+#define otbEckert4MapProjection_h
 
 #include "otbGenericMapProjection.h"
 
diff --git a/Modules/Filtering/Projection/include/otbEckert4MapProjection.txx b/Modules/Filtering/Projection/include/otbEckert4MapProjection.txx
index a3567527c1..71bb883ae7 100644
--- a/Modules/Filtering/Projection/include/otbEckert4MapProjection.txx
+++ b/Modules/Filtering/Projection/include/otbEckert4MapProjection.txx
@@ -16,8 +16,8 @@
 
 =========================================================================*/
 
-#ifndef __otbEckert4MapProjection_txx
-#define __otbEckert4MapProjection_txx
+#ifndef otbEckert4MapProjection_txx
+#define otbEckert4MapProjection_txx
 
 #include "otbEckert4MapProjection.h"
 #include "otbUtils.h"
diff --git a/Modules/Filtering/Projection/include/otbGCPsToRPCSensorModelImageFilter.h b/Modules/Filtering/Projection/include/otbGCPsToRPCSensorModelImageFilter.h
index 101582ae6d..f3a1f8fb3a 100644
--- a/Modules/Filtering/Projection/include/otbGCPsToRPCSensorModelImageFilter.h
+++ b/Modules/Filtering/Projection/include/otbGCPsToRPCSensorModelImageFilter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbGCPsToRPCSensorModelImageFilter_h
-#define __otbGCPsToRPCSensorModelImageFilter_h
+#ifndef otbGCPsToRPCSensorModelImageFilter_h
+#define otbGCPsToRPCSensorModelImageFilter_h
 
 #include "itkUnaryFunctorImageFilter.h"
 #include "itkCastImageFilter.h"
diff --git a/Modules/Filtering/Projection/include/otbGCPsToRPCSensorModelImageFilter.txx b/Modules/Filtering/Projection/include/otbGCPsToRPCSensorModelImageFilter.txx
index 66d876c9f1..f9b78b9113 100644
--- a/Modules/Filtering/Projection/include/otbGCPsToRPCSensorModelImageFilter.txx
+++ b/Modules/Filtering/Projection/include/otbGCPsToRPCSensorModelImageFilter.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbGCPsToRPCSensorModelImageFilter_txx
-#define __otbGCPsToRPCSensorModelImageFilter_txx
+#ifndef otbGCPsToRPCSensorModelImageFilter_txx
+#define otbGCPsToRPCSensorModelImageFilter_txx
 
 #include "otbGCPsToRPCSensorModelImageFilter.h"
 
diff --git a/Modules/Filtering/Projection/include/otbGenericRSResampleImageFilter.h b/Modules/Filtering/Projection/include/otbGenericRSResampleImageFilter.h
index bb2b680cd5..97ff952021 100644
--- a/Modules/Filtering/Projection/include/otbGenericRSResampleImageFilter.h
+++ b/Modules/Filtering/Projection/include/otbGenericRSResampleImageFilter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbGenericRSResampleImageFilter_h
-#define __otbGenericRSResampleImageFilter_h
+#ifndef otbGenericRSResampleImageFilter_h
+#define otbGenericRSResampleImageFilter_h
 
 #include "otbStreamingResampleImageFilter.h"
 #include "otbPhysicalToRPCSensorModelImageFilter.h"
diff --git a/Modules/Filtering/Projection/include/otbGenericRSResampleImageFilter.txx b/Modules/Filtering/Projection/include/otbGenericRSResampleImageFilter.txx
index c56e8cfdd9..990119d130 100644
--- a/Modules/Filtering/Projection/include/otbGenericRSResampleImageFilter.txx
+++ b/Modules/Filtering/Projection/include/otbGenericRSResampleImageFilter.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbGenericRSResampleImageFilter_txx
-#define __otbGenericRSResampleImageFilter_txx
+#ifndef otbGenericRSResampleImageFilter_txx
+#define otbGenericRSResampleImageFilter_txx
 
 #include "otbGenericRSResampleImageFilter.h"
 
diff --git a/Modules/Filtering/Projection/include/otbGeographicalDistance.h b/Modules/Filtering/Projection/include/otbGeographicalDistance.h
index aed35be49e..c05ee3243a 100644
--- a/Modules/Filtering/Projection/include/otbGeographicalDistance.h
+++ b/Modules/Filtering/Projection/include/otbGeographicalDistance.h
@@ -17,8 +17,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbGeographicalDistance_h
-#define __otbGeographicalDistance_h
+#ifndef otbGeographicalDistance_h
+#define otbGeographicalDistance_h
 
 #include "itkNumericTraits.h"
 #include "itkDistanceMetric.h"
diff --git a/Modules/Filtering/Projection/include/otbGeographicalDistance.txx b/Modules/Filtering/Projection/include/otbGeographicalDistance.txx
index 1a84de0490..fb75398d5c 100644
--- a/Modules/Filtering/Projection/include/otbGeographicalDistance.txx
+++ b/Modules/Filtering/Projection/include/otbGeographicalDistance.txx
@@ -17,8 +17,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbGeographicalDistance_txx
-#define __otbGeographicalDistance_txx
+#ifndef otbGeographicalDistance_txx
+#define otbGeographicalDistance_txx
 
 #include "otbGeographicalDistance.h"
 #include "otbMath.h"
diff --git a/Modules/Filtering/Projection/include/otbGeometriesProjectionFilter.h b/Modules/Filtering/Projection/include/otbGeometriesProjectionFilter.h
index 4b0e3ca509..542916f2b7 100644
--- a/Modules/Filtering/Projection/include/otbGeometriesProjectionFilter.h
+++ b/Modules/Filtering/Projection/include/otbGeometriesProjectionFilter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbGeometriesProjectionFilter_h
-#define __otbGeometriesProjectionFilter_h
+#ifndef otbGeometriesProjectionFilter_h
+#define otbGeometriesProjectionFilter_h
 
 #include "otbGeometriesToGeometriesFilter.h"
 #include "otbOGRGeometryWrapper.h"
@@ -292,4 +292,4 @@ private:
 #include "otbGeometriesProjectionFilter.txx"
 #endif
 
-#endif // __otbGeometriesProjectionFilter_h
+#endif // otbGeometriesProjectionFilter_h
diff --git a/Modules/Filtering/Projection/include/otbGroundSpacingImageFunction.h b/Modules/Filtering/Projection/include/otbGroundSpacingImageFunction.h
index bc85e4bb91..70e3945ae7 100644
--- a/Modules/Filtering/Projection/include/otbGroundSpacingImageFunction.h
+++ b/Modules/Filtering/Projection/include/otbGroundSpacingImageFunction.h
@@ -18,8 +18,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbGroundSpacingImageFunction_h
-#define __otbGroundSpacingImageFunction_h
+#ifndef otbGroundSpacingImageFunction_h
+#define otbGroundSpacingImageFunction_h
 
 #include "itkImageFunction.h"
 #include "itkNumericTraits.h"
diff --git a/Modules/Filtering/Projection/include/otbGroundSpacingImageFunction.txx b/Modules/Filtering/Projection/include/otbGroundSpacingImageFunction.txx
index c9ed6c63e6..b966d64347 100644
--- a/Modules/Filtering/Projection/include/otbGroundSpacingImageFunction.txx
+++ b/Modules/Filtering/Projection/include/otbGroundSpacingImageFunction.txx
@@ -19,8 +19,8 @@
 
 =========================================================================*/
 
-#ifndef __otbGroundSpacingImageFunction_txx
-#define __otbGroundSpacingImageFunction_txx
+#ifndef otbGroundSpacingImageFunction_txx
+#define otbGroundSpacingImageFunction_txx
 
 #include "otbMath.h"
 #include "itkConstNeighborhoodIterator.h"
diff --git a/Modules/Filtering/Projection/include/otbImageToEnvelopeVectorDataFilter.h b/Modules/Filtering/Projection/include/otbImageToEnvelopeVectorDataFilter.h
index 128f70098a..fde7efc0b6 100644
--- a/Modules/Filtering/Projection/include/otbImageToEnvelopeVectorDataFilter.h
+++ b/Modules/Filtering/Projection/include/otbImageToEnvelopeVectorDataFilter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbImageToEnvelopeVectorDataFilter_h
-#define __otbImageToEnvelopeVectorDataFilter_h
+#ifndef otbImageToEnvelopeVectorDataFilter_h
+#define otbImageToEnvelopeVectorDataFilter_h
 
 #include "otbVectorDataSource.h"
 #include "otbGenericRSTransform.h"
diff --git a/Modules/Filtering/Projection/include/otbImageToEnvelopeVectorDataFilter.txx b/Modules/Filtering/Projection/include/otbImageToEnvelopeVectorDataFilter.txx
index cdd2263ccc..c0804d4155 100644
--- a/Modules/Filtering/Projection/include/otbImageToEnvelopeVectorDataFilter.txx
+++ b/Modules/Filtering/Projection/include/otbImageToEnvelopeVectorDataFilter.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbImageToEnvelopeVectorDataFilter_txx
-#define __otbImageToEnvelopeVectorDataFilter_txx
+#ifndef otbImageToEnvelopeVectorDataFilter_txx
+#define otbImageToEnvelopeVectorDataFilter_txx
 
 #include "otbImageToEnvelopeVectorDataFilter.h"
 #include "otbDataNode.h"
diff --git a/Modules/Filtering/Projection/include/otbImportGeoInformationImageFilter.h b/Modules/Filtering/Projection/include/otbImportGeoInformationImageFilter.h
index 064dda4c2e..26fa8c755e 100644
--- a/Modules/Filtering/Projection/include/otbImportGeoInformationImageFilter.h
+++ b/Modules/Filtering/Projection/include/otbImportGeoInformationImageFilter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbImportGeoInformationImageFilter_h
-#define __otbImportGeoInformationImageFilter_h
+#ifndef otbImportGeoInformationImageFilter_h
+#define otbImportGeoInformationImageFilter_h
 
 #include "itkUnaryFunctorImageFilter.h"
 #include "itkCastImageFilter.h"
diff --git a/Modules/Filtering/Projection/include/otbImportGeoInformationImageFilter.txx b/Modules/Filtering/Projection/include/otbImportGeoInformationImageFilter.txx
index 2e10dc4c11..8a64e95e21 100644
--- a/Modules/Filtering/Projection/include/otbImportGeoInformationImageFilter.txx
+++ b/Modules/Filtering/Projection/include/otbImportGeoInformationImageFilter.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbImportGeoInformationImageFilter_txx
-#define __otbImportGeoInformationImageFilter_txx
+#ifndef otbImportGeoInformationImageFilter_txx
+#define otbImportGeoInformationImageFilter_txx
 
 #include "otbImportGeoInformationImageFilter.h"
 #include "itkMetaDataObject.h"
diff --git a/Modules/Filtering/Projection/include/otbLambert2EtenduProjection.h b/Modules/Filtering/Projection/include/otbLambert2EtenduProjection.h
index e5cdf2ba87..e19f4d8a62 100644
--- a/Modules/Filtering/Projection/include/otbLambert2EtenduProjection.h
+++ b/Modules/Filtering/Projection/include/otbLambert2EtenduProjection.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbLambert2EtenduProjection_h
-#define __otbLambert2EtenduProjection_h
+#ifndef otbLambert2EtenduProjection_h
+#define otbLambert2EtenduProjection_h
 
 #include "otbLambertConformalConicMapProjection.h"
 
diff --git a/Modules/Filtering/Projection/include/otbLambert3CartoSudProjection.h b/Modules/Filtering/Projection/include/otbLambert3CartoSudProjection.h
index 5fc17804dc..1a81254c89 100644
--- a/Modules/Filtering/Projection/include/otbLambert3CartoSudProjection.h
+++ b/Modules/Filtering/Projection/include/otbLambert3CartoSudProjection.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbLambert3CartoSudProjection_h
-#define __otbLambert3CartoSudProjection_h
+#ifndef otbLambert3CartoSudProjection_h
+#define otbLambert3CartoSudProjection_h
 
 #include "otbLambertConformalConicMapProjection.h"
 
diff --git a/Modules/Filtering/Projection/include/otbLambert93Projection.h b/Modules/Filtering/Projection/include/otbLambert93Projection.h
index 2d89ac1804..828fe4da0b 100644
--- a/Modules/Filtering/Projection/include/otbLambert93Projection.h
+++ b/Modules/Filtering/Projection/include/otbLambert93Projection.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbLambert93Projection_h
-#define __otbLambert93Projection_h
+#ifndef otbLambert93Projection_h
+#define otbLambert93Projection_h
 
 #include "otbLambertConformalConicMapProjection.h"
 
diff --git a/Modules/Filtering/Projection/include/otbLambertConformalConicMapProjection.h b/Modules/Filtering/Projection/include/otbLambertConformalConicMapProjection.h
index df8220fefc..96b1be98c6 100644
--- a/Modules/Filtering/Projection/include/otbLambertConformalConicMapProjection.h
+++ b/Modules/Filtering/Projection/include/otbLambertConformalConicMapProjection.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbLambertConformalConicMapProjection_h
-#define __otbLambertConformalConicMapProjection_h
+#ifndef otbLambertConformalConicMapProjection_h
+#define otbLambertConformalConicMapProjection_h
 
 #include "otbGenericMapProjection.h"
 
diff --git a/Modules/Filtering/Projection/include/otbLambertConformalConicMapProjection.txx b/Modules/Filtering/Projection/include/otbLambertConformalConicMapProjection.txx
index 590732ef9b..c88a49e64b 100644
--- a/Modules/Filtering/Projection/include/otbLambertConformalConicMapProjection.txx
+++ b/Modules/Filtering/Projection/include/otbLambertConformalConicMapProjection.txx
@@ -16,8 +16,8 @@
 
 =========================================================================*/
 
-#ifndef __otbLambertConformalConicMapProjection_txx
-#define __otbLambertConformalConicMapProjection_txx
+#ifndef otbLambertConformalConicMapProjection_txx
+#define otbLambertConformalConicMapProjection_txx
 
 #include "otbLambertConformalConicMapProjection.h"
 #include "otbUtils.h"
diff --git a/Modules/Filtering/Projection/include/otbLeastSquareAffineTransformEstimator.h b/Modules/Filtering/Projection/include/otbLeastSquareAffineTransformEstimator.h
index 8518232df0..d593ca9d24 100644
--- a/Modules/Filtering/Projection/include/otbLeastSquareAffineTransformEstimator.h
+++ b/Modules/Filtering/Projection/include/otbLeastSquareAffineTransformEstimator.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbLeastSquareAffineTransformEstimator_h
-#define __otbLeastSquareAffineTransformEstimator_h
+#ifndef otbLeastSquareAffineTransformEstimator_h
+#define otbLeastSquareAffineTransformEstimator_h
 
 #include "itkObject.h"
 #include "itkObjectFactory.h"
diff --git a/Modules/Filtering/Projection/include/otbLeastSquareAffineTransformEstimator.txx b/Modules/Filtering/Projection/include/otbLeastSquareAffineTransformEstimator.txx
index 4dad5e6fa4..d04f54f5ac 100644
--- a/Modules/Filtering/Projection/include/otbLeastSquareAffineTransformEstimator.txx
+++ b/Modules/Filtering/Projection/include/otbLeastSquareAffineTransformEstimator.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbLeastSquareAffineTransformEstimator_txx
-#define __otbLeastSquareAffineTransformEstimator_txx
+#ifndef otbLeastSquareAffineTransformEstimator_txx
+#define otbLeastSquareAffineTransformEstimator_txx
 
 #include <vnl/algo/vnl_lsqr.h>
 #include <vnl/vnl_sparse_matrix_linear_system.h>
diff --git a/Modules/Filtering/Projection/include/otbMapProjectionDeprecated.h b/Modules/Filtering/Projection/include/otbMapProjectionDeprecated.h
index 537a60a00b..20c2c9c5e6 100644
--- a/Modules/Filtering/Projection/include/otbMapProjectionDeprecated.h
+++ b/Modules/Filtering/Projection/include/otbMapProjectionDeprecated.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbMapProjectionDeprecated_h
-#define __otbMapProjectionDeprecated_h
+#ifndef otbMapProjectionDeprecated_h
+#define otbMapProjectionDeprecated_h
 
 #include "otbGenericMapProjection.h"
 
diff --git a/Modules/Filtering/Projection/include/otbMapProjectionDeprecated.txx b/Modules/Filtering/Projection/include/otbMapProjectionDeprecated.txx
index 66ba50c01e..7334ba1f8b 100644
--- a/Modules/Filtering/Projection/include/otbMapProjectionDeprecated.txx
+++ b/Modules/Filtering/Projection/include/otbMapProjectionDeprecated.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbMapProjectionDeprecated_txx
-#define __otbMapProjectionDeprecated_txx
+#ifndef otbMapProjectionDeprecated_txx
+#define otbMapProjectionDeprecated_txx
 
 namespace otb
 {
diff --git a/Modules/Filtering/Projection/include/otbMapProjections.h b/Modules/Filtering/Projection/include/otbMapProjections.h
index 644a0d0c3d..19d28f2343 100644
--- a/Modules/Filtering/Projection/include/otbMapProjections.h
+++ b/Modules/Filtering/Projection/include/otbMapProjections.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbMapProjections_h
-#define __otbMapProjections_h
+#ifndef otbMapProjections_h
+#define otbMapProjections_h
 
 #include "otbMapProjectionDeprecated.h"
 
diff --git a/Modules/Filtering/Projection/include/otbMollweidMapProjection.h b/Modules/Filtering/Projection/include/otbMollweidMapProjection.h
index 86560ea777..40be10376d 100644
--- a/Modules/Filtering/Projection/include/otbMollweidMapProjection.h
+++ b/Modules/Filtering/Projection/include/otbMollweidMapProjection.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbMollweidMapProjection_h
-#define __otbMollweidMapProjection_h
+#ifndef otbMollweidMapProjection_h
+#define otbMollweidMapProjection_h
 
 #include "otbGenericMapProjection.h"
 
diff --git a/Modules/Filtering/Projection/include/otbMollweidMapProjection.txx b/Modules/Filtering/Projection/include/otbMollweidMapProjection.txx
index 013db5c0c4..435ce3f08f 100644
--- a/Modules/Filtering/Projection/include/otbMollweidMapProjection.txx
+++ b/Modules/Filtering/Projection/include/otbMollweidMapProjection.txx
@@ -16,8 +16,8 @@
 
 =========================================================================*/
 
-#ifndef __otbMollweidMapProjection_txx
-#define __otbMollweidMapProjection_txx
+#ifndef otbMollweidMapProjection_txx
+#define otbMollweidMapProjection_txx
 
 #include "otbMollweidMapProjection.h"
 #include "otbUtils.h"
diff --git a/Modules/Filtering/Projection/include/otbOrthoRectificationFilter.h b/Modules/Filtering/Projection/include/otbOrthoRectificationFilter.h
index ee0f67ac40..55e830bbe9 100644
--- a/Modules/Filtering/Projection/include/otbOrthoRectificationFilter.h
+++ b/Modules/Filtering/Projection/include/otbOrthoRectificationFilter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbOrthoRectificationFilter_h
-#define __otbOrthoRectificationFilter_h
+#ifndef otbOrthoRectificationFilter_h
+#define otbOrthoRectificationFilter_h
 
 #include <iostream>
 #include <sstream>
diff --git a/Modules/Filtering/Projection/include/otbOrthoRectificationFilter.txx b/Modules/Filtering/Projection/include/otbOrthoRectificationFilter.txx
index 51bdfecb49..a3b781c1f3 100644
--- a/Modules/Filtering/Projection/include/otbOrthoRectificationFilter.txx
+++ b/Modules/Filtering/Projection/include/otbOrthoRectificationFilter.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbOrthoRectificationFilter_txx
-#define __otbOrthoRectificationFilter_txx
+#ifndef otbOrthoRectificationFilter_txx
+#define otbOrthoRectificationFilter_txx
 
 #include "otbOrthoRectificationFilter.h"
 #include "itkMetaDataObject.h"
diff --git a/Modules/Filtering/Projection/include/otbPhysicalToRPCSensorModelImageFilter.h b/Modules/Filtering/Projection/include/otbPhysicalToRPCSensorModelImageFilter.h
index a80fb8b7f5..98d76ee016 100644
--- a/Modules/Filtering/Projection/include/otbPhysicalToRPCSensorModelImageFilter.h
+++ b/Modules/Filtering/Projection/include/otbPhysicalToRPCSensorModelImageFilter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbPhysicalToRPCSensorModelImageFilter_h
-#define __otbPhysicalToRPCSensorModelImageFilter_h
+#ifndef otbPhysicalToRPCSensorModelImageFilter_h
+#define otbPhysicalToRPCSensorModelImageFilter_h
 
 #include "otbGCPsToRPCSensorModelImageFilter.h"
 #include "otbGenericRSTransform.h"
diff --git a/Modules/Filtering/Projection/include/otbPhysicalToRPCSensorModelImageFilter.txx b/Modules/Filtering/Projection/include/otbPhysicalToRPCSensorModelImageFilter.txx
index 59047b41a1..d9c619c78c 100644
--- a/Modules/Filtering/Projection/include/otbPhysicalToRPCSensorModelImageFilter.txx
+++ b/Modules/Filtering/Projection/include/otbPhysicalToRPCSensorModelImageFilter.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbPhysicalToRPCSensorModelImageFilter_txx
-#define __otbPhysicalToRPCSensorModelImageFilter_txx
+#ifndef otbPhysicalToRPCSensorModelImageFilter_txx
+#define otbPhysicalToRPCSensorModelImageFilter_txx
 
 #include "otbPhysicalToRPCSensorModelImageFilter.h"
 #include "otbDEMHandler.h"
diff --git a/Modules/Filtering/Projection/include/otbPleiadesPToXSAffineTransformCalculator.h b/Modules/Filtering/Projection/include/otbPleiadesPToXSAffineTransformCalculator.h
index 0ff93665a2..bfd76656ea 100644
--- a/Modules/Filtering/Projection/include/otbPleiadesPToXSAffineTransformCalculator.h
+++ b/Modules/Filtering/Projection/include/otbPleiadesPToXSAffineTransformCalculator.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbPleiadesPToXSAffineTransformCalculator__h
-#define __otbPleiadesPToXSAffineTransformCalculator__h
+#ifndef otbPleiadesPToXSAffineTransformCalculator__h
+#define otbPleiadesPToXSAffineTransformCalculator__h
 
 #include "itkLightObject.h"
 #include "itkScalableAffineTransform.h"
diff --git a/Modules/Filtering/Projection/include/otbProjectiveProjectionImageFilter.h b/Modules/Filtering/Projection/include/otbProjectiveProjectionImageFilter.h
index eed49540b7..597d79cd08 100644
--- a/Modules/Filtering/Projection/include/otbProjectiveProjectionImageFilter.h
+++ b/Modules/Filtering/Projection/include/otbProjectiveProjectionImageFilter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbProjectiveProjectionImageFilter_h
-#define __otbProjectiveProjectionImageFilter_h
+#ifndef otbProjectiveProjectionImageFilter_h
+#define otbProjectiveProjectionImageFilter_h
 
 #include "itkMacro.h"
 #include "otbUnaryFunctorImageFilter.h"
diff --git a/Modules/Filtering/Projection/include/otbProjectiveProjectionImageFilter.txx b/Modules/Filtering/Projection/include/otbProjectiveProjectionImageFilter.txx
index edebb7140d..213cffc9a8 100644
--- a/Modules/Filtering/Projection/include/otbProjectiveProjectionImageFilter.txx
+++ b/Modules/Filtering/Projection/include/otbProjectiveProjectionImageFilter.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbProjectiveProjectionImageFilter_txx
-#define __otbProjectiveProjectionImageFilter_txx
+#ifndef otbProjectiveProjectionImageFilter_txx
+#define otbProjectiveProjectionImageFilter_txx
 
 #include "otbProjectiveProjectionImageFilter.h"
 
diff --git a/Modules/Filtering/Projection/include/otbROIdataConversion.h b/Modules/Filtering/Projection/include/otbROIdataConversion.h
index 8def533846..ed3b5c7b73 100644
--- a/Modules/Filtering/Projection/include/otbROIdataConversion.h
+++ b/Modules/Filtering/Projection/include/otbROIdataConversion.h
@@ -16,8 +16,8 @@
 
 =========================================================================*/
 
-#ifndef __otbROIdataConversion_h
-#define __otbROIdataConversion_h
+#ifndef otbROIdataConversion_h
+#define otbROIdataConversion_h
 
 #include <vector>
 #include "otbImage.h"
diff --git a/Modules/Filtering/Projection/include/otbROIdataConversion.txx b/Modules/Filtering/Projection/include/otbROIdataConversion.txx
index b8513a07a8..d5737a5a68 100644
--- a/Modules/Filtering/Projection/include/otbROIdataConversion.txx
+++ b/Modules/Filtering/Projection/include/otbROIdataConversion.txx
@@ -16,8 +16,8 @@
 
 =========================================================================*/
 
-#ifndef __otbROIdataConversion_txx
-#define __otbROIdataConversion_txx
+#ifndef otbROIdataConversion_txx
+#define otbROIdataConversion_txx
 
 #include "itkVector.h"
 
diff --git a/Modules/Filtering/Projection/include/otbRationalTransform.h b/Modules/Filtering/Projection/include/otbRationalTransform.h
index 5b177826c6..bdd889160c 100644
--- a/Modules/Filtering/Projection/include/otbRationalTransform.h
+++ b/Modules/Filtering/Projection/include/otbRationalTransform.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbRationalTransform_h
-#define __otbRationalTransform_h
+#ifndef otbRationalTransform_h
+#define otbRationalTransform_h
 
 #include "otbTransform.h"
 #include "itkMacro.h"
diff --git a/Modules/Filtering/Projection/include/otbSVY21MapProjection.h b/Modules/Filtering/Projection/include/otbSVY21MapProjection.h
index 47cbb7edab..4555a109d9 100644
--- a/Modules/Filtering/Projection/include/otbSVY21MapProjection.h
+++ b/Modules/Filtering/Projection/include/otbSVY21MapProjection.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbSVY21MapProjection_h
-#define __otbSVY21MapProjection_h
+#ifndef otbSVY21MapProjection_h
+#define otbSVY21MapProjection_h
 
 #include "otbTransMercatorMapProjection.h"
 
diff --git a/Modules/Filtering/Projection/include/otbSinusoidalMapProjection.h b/Modules/Filtering/Projection/include/otbSinusoidalMapProjection.h
index 88656f3523..c299742ee0 100644
--- a/Modules/Filtering/Projection/include/otbSinusoidalMapProjection.h
+++ b/Modules/Filtering/Projection/include/otbSinusoidalMapProjection.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbSinusoidalMapProjection_h
-#define __otbSinusoidalMapProjection_h
+#ifndef otbSinusoidalMapProjection_h
+#define otbSinusoidalMapProjection_h
 
 #include "otbGenericMapProjection.h"
 
diff --git a/Modules/Filtering/Projection/include/otbSinusoidalMapProjection.txx b/Modules/Filtering/Projection/include/otbSinusoidalMapProjection.txx
index 04c194124a..e0d34783e9 100644
--- a/Modules/Filtering/Projection/include/otbSinusoidalMapProjection.txx
+++ b/Modules/Filtering/Projection/include/otbSinusoidalMapProjection.txx
@@ -16,8 +16,8 @@
 
 =========================================================================*/
 
-#ifndef __otbSinusoidalMapProjection_txx
-#define __otbSinusoidalMapProjection_txx
+#ifndef otbSinusoidalMapProjection_txx
+#define otbSinusoidalMapProjection_txx
 
 #include "otbSinusoidalMapProjection.h"
 #include "otbUtils.h"
diff --git a/Modules/Filtering/Projection/include/otbTileMapTransform.h b/Modules/Filtering/Projection/include/otbTileMapTransform.h
index 6a8a8317eb..31487c07b3 100644
--- a/Modules/Filtering/Projection/include/otbTileMapTransform.h
+++ b/Modules/Filtering/Projection/include/otbTileMapTransform.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbTileMapTransform_h
-#define __otbTileMapTransform_h
+#ifndef otbTileMapTransform_h
+#define otbTileMapTransform_h
 
 
 // Only for the enum definition
diff --git a/Modules/Filtering/Projection/include/otbTileMapTransform.txx b/Modules/Filtering/Projection/include/otbTileMapTransform.txx
index 863b866ed9..fe9ec1ef52 100644
--- a/Modules/Filtering/Projection/include/otbTileMapTransform.txx
+++ b/Modules/Filtering/Projection/include/otbTileMapTransform.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbTileMapTransform_txx
-#define __otbTileMapTransform_txx
+#ifndef otbTileMapTransform_txx
+#define otbTileMapTransform_txx
 
 #include "otbTileMapTransform.h"
 #include "otbMacro.h"
diff --git a/Modules/Filtering/Projection/include/otbTransMercatorMapProjection.h b/Modules/Filtering/Projection/include/otbTransMercatorMapProjection.h
index 8283c73326..7001173fc9 100644
--- a/Modules/Filtering/Projection/include/otbTransMercatorMapProjection.h
+++ b/Modules/Filtering/Projection/include/otbTransMercatorMapProjection.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbTransMercatorMapProjection_h
-#define __otbTransMercatorMapProjection_h
+#ifndef otbTransMercatorMapProjection_h
+#define otbTransMercatorMapProjection_h
 
 #include "otbGenericMapProjection.h"
 
diff --git a/Modules/Filtering/Projection/include/otbTransMercatorMapProjection.txx b/Modules/Filtering/Projection/include/otbTransMercatorMapProjection.txx
index 3ae3397234..5bfa8a7254 100644
--- a/Modules/Filtering/Projection/include/otbTransMercatorMapProjection.txx
+++ b/Modules/Filtering/Projection/include/otbTransMercatorMapProjection.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbTransMercatorMapProjection_txx
-#define __otbTransMercatorMapProjection_txx
+#ifndef otbTransMercatorMapProjection_txx
+#define otbTransMercatorMapProjection_txx
 
 #include "otbTransMercatorMapProjection.h"
 #include "otbUtils.h"
diff --git a/Modules/Filtering/Projection/include/otbUtmMapProjection.h b/Modules/Filtering/Projection/include/otbUtmMapProjection.h
index 2ab6f79997..bee651dbb6 100644
--- a/Modules/Filtering/Projection/include/otbUtmMapProjection.h
+++ b/Modules/Filtering/Projection/include/otbUtmMapProjection.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbUtmMapProjection_h
-#define __otbUtmMapProjection_h
+#ifndef otbUtmMapProjection_h
+#define otbUtmMapProjection_h
 
 #include "otbGenericMapProjection.h"
 
diff --git a/Modules/Filtering/Projection/include/otbUtmMapProjection.txx b/Modules/Filtering/Projection/include/otbUtmMapProjection.txx
index b947df22eb..715c93e272 100644
--- a/Modules/Filtering/Projection/include/otbUtmMapProjection.txx
+++ b/Modules/Filtering/Projection/include/otbUtmMapProjection.txx
@@ -16,8 +16,8 @@
 
 =========================================================================*/
 
-#ifndef __otbUtmMapProjection_txx
-#define __otbUtmMapProjection_txx
+#ifndef otbUtmMapProjection_txx
+#define otbUtmMapProjection_txx
 
 #include "otbUtmMapProjection.h"
 
diff --git a/Modules/Filtering/Projection/include/otbVectorDataIntoImageProjectionFilter.h b/Modules/Filtering/Projection/include/otbVectorDataIntoImageProjectionFilter.h
index e14bacc23a..686b112b64 100644
--- a/Modules/Filtering/Projection/include/otbVectorDataIntoImageProjectionFilter.h
+++ b/Modules/Filtering/Projection/include/otbVectorDataIntoImageProjectionFilter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbVectorDataIntoImageProjectionFilter_h
-#define __otbVectorDataIntoImageProjectionFilter_h
+#ifndef otbVectorDataIntoImageProjectionFilter_h
+#define otbVectorDataIntoImageProjectionFilter_h
 
 
 #include "otbImage.h"
diff --git a/Modules/Filtering/Projection/include/otbVectorDataIntoImageProjectionFilter.txx b/Modules/Filtering/Projection/include/otbVectorDataIntoImageProjectionFilter.txx
index 8a912bbeef..d92d3dd787 100644
--- a/Modules/Filtering/Projection/include/otbVectorDataIntoImageProjectionFilter.txx
+++ b/Modules/Filtering/Projection/include/otbVectorDataIntoImageProjectionFilter.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbVectorDataIntoImageProjectionFilter_txx
-#define __otbVectorDataIntoImageProjectionFilter_txx
+#ifndef otbVectorDataIntoImageProjectionFilter_txx
+#define otbVectorDataIntoImageProjectionFilter_txx
 
 #include "otbVectorDataIntoImageProjectionFilter.h"
 #include "otb_boost_string_header.h"
diff --git a/Modules/Filtering/Projection/include/otbVectorDataProjectionFilter.h b/Modules/Filtering/Projection/include/otbVectorDataProjectionFilter.h
index 66e435a0c7..17b2349146 100644
--- a/Modules/Filtering/Projection/include/otbVectorDataProjectionFilter.h
+++ b/Modules/Filtering/Projection/include/otbVectorDataProjectionFilter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbVectorDataProjectionFilter_h
-#define __otbVectorDataProjectionFilter_h
+#ifndef otbVectorDataProjectionFilter_h
+#define otbVectorDataProjectionFilter_h
 
 #include "otbVectorDataToVectorDataFilter.h"
 #include "otbGenericRSTransform.h"
diff --git a/Modules/Filtering/Projection/include/otbVectorDataProjectionFilter.txx b/Modules/Filtering/Projection/include/otbVectorDataProjectionFilter.txx
index 9fc262fe14..6bd1b232af 100644
--- a/Modules/Filtering/Projection/include/otbVectorDataProjectionFilter.txx
+++ b/Modules/Filtering/Projection/include/otbVectorDataProjectionFilter.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbVectorDataProjectionFilter_txx
-#define __otbVectorDataProjectionFilter_txx
+#ifndef otbVectorDataProjectionFilter_txx
+#define otbVectorDataProjectionFilter_txx
 
 #include "otbVectorDataProjectionFilter.h"
 #include "itkProgressReporter.h"
diff --git a/Modules/Filtering/Projection/include/otbVectorDataTransformFilter.h b/Modules/Filtering/Projection/include/otbVectorDataTransformFilter.h
index 370f2918e4..67562ea247 100644
--- a/Modules/Filtering/Projection/include/otbVectorDataTransformFilter.h
+++ b/Modules/Filtering/Projection/include/otbVectorDataTransformFilter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbVectorDataTransformFilter_h
-#define __otbVectorDataTransformFilter_h
+#ifndef otbVectorDataTransformFilter_h
+#define otbVectorDataTransformFilter_h
 
 #include "otbVectorDataToVectorDataFilter.h"
 #include "itkTransform.h"
diff --git a/Modules/Filtering/Projection/include/otbVectorDataTransformFilter.txx b/Modules/Filtering/Projection/include/otbVectorDataTransformFilter.txx
index 027d629345..ae07c0f89f 100644
--- a/Modules/Filtering/Projection/include/otbVectorDataTransformFilter.txx
+++ b/Modules/Filtering/Projection/include/otbVectorDataTransformFilter.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbVectorDataTransformFilter_txx
-#define __otbVectorDataTransformFilter_txx
+#ifndef otbVectorDataTransformFilter_txx
+#define otbVectorDataTransformFilter_txx
 
 #include "otbVectorDataTransformFilter.h"
 #include "itkProgressReporter.h"
diff --git a/Modules/Filtering/Smoothing/include/otbMeanShiftSmoothingImageFilter.txx b/Modules/Filtering/Smoothing/include/otbMeanShiftSmoothingImageFilter.txx
index 77a563765e..a881287db8 100644
--- a/Modules/Filtering/Smoothing/include/otbMeanShiftSmoothingImageFilter.txx
+++ b/Modules/Filtering/Smoothing/include/otbMeanShiftSmoothingImageFilter.txx
@@ -16,8 +16,8 @@
 
 =========================================================================*/
 
-#ifndef __otbMeanShiftSmoothingImageFilter_txx
-#define __otbMeanShiftSmoothingImageFilter_txx
+#ifndef otbMeanShiftSmoothingImageFilter_txx
+#define otbMeanShiftSmoothingImageFilter_txx
 
 #include "otbMeanShiftSmoothingImageFilter.h"
 #include "itkImageRegionIterator.h"
diff --git a/Modules/Filtering/Statistics/include/otbConcatenateSampleListFilter.h b/Modules/Filtering/Statistics/include/otbConcatenateSampleListFilter.h
index fca7ea6432..4b0822594e 100644
--- a/Modules/Filtering/Statistics/include/otbConcatenateSampleListFilter.h
+++ b/Modules/Filtering/Statistics/include/otbConcatenateSampleListFilter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbConcatenateSampleListFilter_h
-#define __otbConcatenateSampleListFilter_h
+#ifndef otbConcatenateSampleListFilter_h
+#define otbConcatenateSampleListFilter_h
 
 #include "otbListSampleToListSampleFilter.h"
 
diff --git a/Modules/Filtering/Statistics/include/otbConcatenateSampleListFilter.txx b/Modules/Filtering/Statistics/include/otbConcatenateSampleListFilter.txx
index d32a8f2000..3c5ccf4aa9 100644
--- a/Modules/Filtering/Statistics/include/otbConcatenateSampleListFilter.txx
+++ b/Modules/Filtering/Statistics/include/otbConcatenateSampleListFilter.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbConcatenateSampleListFilter_txx
-#define __otbConcatenateSampleListFilter_txx
+#ifndef otbConcatenateSampleListFilter_txx
+#define otbConcatenateSampleListFilter_txx
 
 #include "otbConcatenateSampleListFilter.h"
 #include "itkProgressReporter.h"
diff --git a/Modules/Filtering/Statistics/include/otbContinuousMinimumMaximumImageCalculator.h b/Modules/Filtering/Statistics/include/otbContinuousMinimumMaximumImageCalculator.h
index 51e9c164a8..de39962689 100644
--- a/Modules/Filtering/Statistics/include/otbContinuousMinimumMaximumImageCalculator.h
+++ b/Modules/Filtering/Statistics/include/otbContinuousMinimumMaximumImageCalculator.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbContinuousMinimumMaximumImageCalculator_h
-#define __otbContinuousMinimumMaximumImageCalculator_h
+#ifndef otbContinuousMinimumMaximumImageCalculator_h
+#define otbContinuousMinimumMaximumImageCalculator_h
 
 #include "itkObject.h"
 #include "itkObjectFactory.h"
diff --git a/Modules/Filtering/Statistics/include/otbContinuousMinimumMaximumImageCalculator.txx b/Modules/Filtering/Statistics/include/otbContinuousMinimumMaximumImageCalculator.txx
index c6079d432e..05c50cce4c 100644
--- a/Modules/Filtering/Statistics/include/otbContinuousMinimumMaximumImageCalculator.txx
+++ b/Modules/Filtering/Statistics/include/otbContinuousMinimumMaximumImageCalculator.txx
@@ -16,8 +16,8 @@
 
 =========================================================================*/
 
-#ifndef __otbContinuousMinimumMaximumImageCalculator_txx
-#define __otbContinuousMinimumMaximumImageCalculator_txx
+#ifndef otbContinuousMinimumMaximumImageCalculator_txx
+#define otbContinuousMinimumMaximumImageCalculator_txx
 
 #include "otbContinuousMinimumMaximumImageCalculator.h"
 #include "itkImageRegionConstIteratorWithIndex.h"
diff --git a/Modules/Filtering/Statistics/include/otbGaussianAdditiveNoiseSampleListFilter.h b/Modules/Filtering/Statistics/include/otbGaussianAdditiveNoiseSampleListFilter.h
index de1862c79a..91d7b1fb25 100644
--- a/Modules/Filtering/Statistics/include/otbGaussianAdditiveNoiseSampleListFilter.h
+++ b/Modules/Filtering/Statistics/include/otbGaussianAdditiveNoiseSampleListFilter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbGaussianAdditiveNoiseSampleListFilter_h
-#define __otbGaussianAdditiveNoiseSampleListFilter_h
+#ifndef otbGaussianAdditiveNoiseSampleListFilter_h
+#define otbGaussianAdditiveNoiseSampleListFilter_h
 
 #include "otbListSampleToListSampleFilter.h"
 
diff --git a/Modules/Filtering/Statistics/include/otbGaussianAdditiveNoiseSampleListFilter.txx b/Modules/Filtering/Statistics/include/otbGaussianAdditiveNoiseSampleListFilter.txx
index cf482b7711..c538763c76 100644
--- a/Modules/Filtering/Statistics/include/otbGaussianAdditiveNoiseSampleListFilter.txx
+++ b/Modules/Filtering/Statistics/include/otbGaussianAdditiveNoiseSampleListFilter.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbGaussianAdditiveNoiseSampleListFilter_txx
-#define __otbGaussianAdditiveNoiseSampleListFilter_txx
+#ifndef otbGaussianAdditiveNoiseSampleListFilter_txx
+#define otbGaussianAdditiveNoiseSampleListFilter_txx
 
 #include "otbGaussianAdditiveNoiseSampleListFilter.h"
 #include "itkMersenneTwisterRandomVariateGenerator.h"
diff --git a/Modules/Filtering/Statistics/include/otbHistogramStatisticsFunction.h b/Modules/Filtering/Statistics/include/otbHistogramStatisticsFunction.h
index 200a78811c..20f6a2537b 100644
--- a/Modules/Filtering/Statistics/include/otbHistogramStatisticsFunction.h
+++ b/Modules/Filtering/Statistics/include/otbHistogramStatisticsFunction.h
@@ -16,8 +16,8 @@
 
 =========================================================================*/
 
-#ifndef __otbHistogramStatisticsFunction_h
-#define __otbHistogramStatisticsFunction_h
+#ifndef otbHistogramStatisticsFunction_h
+#define otbHistogramStatisticsFunction_h
 
 #include "itkNumericTraits.h"
 #include "itkHistogramAlgorithmBase.h"
diff --git a/Modules/Filtering/Statistics/include/otbHistogramStatisticsFunction.txx b/Modules/Filtering/Statistics/include/otbHistogramStatisticsFunction.txx
index ee609e3bf8..c3d3bee9a6 100644
--- a/Modules/Filtering/Statistics/include/otbHistogramStatisticsFunction.txx
+++ b/Modules/Filtering/Statistics/include/otbHistogramStatisticsFunction.txx
@@ -16,8 +16,8 @@
 
 =========================================================================*/
 
-#ifndef __otbHistogramStatisticsFunction_txx
-#define __otbHistogramStatisticsFunction_txx
+#ifndef otbHistogramStatisticsFunction_txx
+#define otbHistogramStatisticsFunction_txx
 
 #include "otbHistogramStatisticsFunction.h"
 
diff --git a/Modules/Filtering/Statistics/include/otbListSampleGenerator.h b/Modules/Filtering/Statistics/include/otbListSampleGenerator.h
index c384337786..2fb3f17fb6 100644
--- a/Modules/Filtering/Statistics/include/otbListSampleGenerator.h
+++ b/Modules/Filtering/Statistics/include/otbListSampleGenerator.h
@@ -16,8 +16,8 @@
 
 =========================================================================*/
 
-#ifndef __otbListSampleGenerator_h
-#define __otbListSampleGenerator_h
+#ifndef otbListSampleGenerator_h
+#define otbListSampleGenerator_h
 
 #include "itkProcessObject.h"
 #include "itkListSample.h"
diff --git a/Modules/Filtering/Statistics/include/otbListSampleGenerator.txx b/Modules/Filtering/Statistics/include/otbListSampleGenerator.txx
index 85fcebc15e..8b21b56eae 100644
--- a/Modules/Filtering/Statistics/include/otbListSampleGenerator.txx
+++ b/Modules/Filtering/Statistics/include/otbListSampleGenerator.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbListSampleGenerator_txx
-#define __otbListSampleGenerator_txx
+#ifndef otbListSampleGenerator_txx
+#define otbListSampleGenerator_txx
 
 #include "otbListSampleGenerator.h"
 
diff --git a/Modules/Filtering/Statistics/include/otbListSampleSource.h b/Modules/Filtering/Statistics/include/otbListSampleSource.h
index ecad23a4f2..8224d1a12d 100644
--- a/Modules/Filtering/Statistics/include/otbListSampleSource.h
+++ b/Modules/Filtering/Statistics/include/otbListSampleSource.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbListSampleSource_h
-#define __otbListSampleSource_h
+#ifndef otbListSampleSource_h
+#define otbListSampleSource_h
 
 #include "itkProcessObject.h"
 #include "itkDataObjectDecorator.h"
diff --git a/Modules/Filtering/Statistics/include/otbListSampleSource.txx b/Modules/Filtering/Statistics/include/otbListSampleSource.txx
index 512a21d83b..9e161248e2 100644
--- a/Modules/Filtering/Statistics/include/otbListSampleSource.txx
+++ b/Modules/Filtering/Statistics/include/otbListSampleSource.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbListSampleSource_txx
-#define __otbListSampleSource_txx
+#ifndef otbListSampleSource_txx
+#define otbListSampleSource_txx
 
 #include "otbListSampleSource.h"
 
diff --git a/Modules/Filtering/Statistics/include/otbListSampleToBalancedListSampleFilter.h b/Modules/Filtering/Statistics/include/otbListSampleToBalancedListSampleFilter.h
index 296b930747..525d9f80db 100644
--- a/Modules/Filtering/Statistics/include/otbListSampleToBalancedListSampleFilter.h
+++ b/Modules/Filtering/Statistics/include/otbListSampleToBalancedListSampleFilter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbListSampleToBalancedListSampleFilter_h
-#define __otbListSampleToBalancedListSampleFilter_h
+#ifndef otbListSampleToBalancedListSampleFilter_h
+#define otbListSampleToBalancedListSampleFilter_h
 
 #include "otbGaussianAdditiveNoiseSampleListFilter.h"
 #include "itkDataObjectDecorator.h"
diff --git a/Modules/Filtering/Statistics/include/otbListSampleToBalancedListSampleFilter.txx b/Modules/Filtering/Statistics/include/otbListSampleToBalancedListSampleFilter.txx
index 2ddde509e7..6a98e8deec 100644
--- a/Modules/Filtering/Statistics/include/otbListSampleToBalancedListSampleFilter.txx
+++ b/Modules/Filtering/Statistics/include/otbListSampleToBalancedListSampleFilter.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbListSampleToBalancedListSampleFilter_txx
-#define __otbListSampleToBalancedListSampleFilter_txx
+#ifndef otbListSampleToBalancedListSampleFilter_txx
+#define otbListSampleToBalancedListSampleFilter_txx
 
 #include "otbListSampleToBalancedListSampleFilter.h"
 #include "itkProgressReporter.h"
diff --git a/Modules/Filtering/Statistics/include/otbListSampleToHistogramListGenerator.h b/Modules/Filtering/Statistics/include/otbListSampleToHistogramListGenerator.h
index 6f6361372b..e4afc9216b 100644
--- a/Modules/Filtering/Statistics/include/otbListSampleToHistogramListGenerator.h
+++ b/Modules/Filtering/Statistics/include/otbListSampleToHistogramListGenerator.h
@@ -18,8 +18,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbListSampleToHistogramListGenerator_h
-#define __otbListSampleToHistogramListGenerator_h
+#ifndef otbListSampleToHistogramListGenerator_h
+#define otbListSampleToHistogramListGenerator_h
 
 #include "itkNumericTraits.h"
 #include "itkProcessObject.h"
diff --git a/Modules/Filtering/Statistics/include/otbListSampleToHistogramListGenerator.txx b/Modules/Filtering/Statistics/include/otbListSampleToHistogramListGenerator.txx
index 28fb6e6ddd..ad4370cb19 100644
--- a/Modules/Filtering/Statistics/include/otbListSampleToHistogramListGenerator.txx
+++ b/Modules/Filtering/Statistics/include/otbListSampleToHistogramListGenerator.txx
@@ -18,8 +18,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbListSampleToHistogramListGenerator_txx
-#define __otbListSampleToHistogramListGenerator_txx
+#ifndef otbListSampleToHistogramListGenerator_txx
+#define otbListSampleToHistogramListGenerator_txx
 
 #include "itkArray.h"
 #include "otbMacro.h"
diff --git a/Modules/Filtering/Statistics/include/otbListSampleToListSampleFilter.h b/Modules/Filtering/Statistics/include/otbListSampleToListSampleFilter.h
index e34414f55b..fc2122bc3f 100644
--- a/Modules/Filtering/Statistics/include/otbListSampleToListSampleFilter.h
+++ b/Modules/Filtering/Statistics/include/otbListSampleToListSampleFilter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbListSampleToListSampleFilter_h
-#define __otbListSampleToListSampleFilter_h
+#ifndef otbListSampleToListSampleFilter_h
+#define otbListSampleToListSampleFilter_h
 
 #include "otbListSampleSource.h"
 
diff --git a/Modules/Filtering/Statistics/include/otbListSampleToListSampleFilter.txx b/Modules/Filtering/Statistics/include/otbListSampleToListSampleFilter.txx
index 82b4c27817..3d7ef2ac1c 100644
--- a/Modules/Filtering/Statistics/include/otbListSampleToListSampleFilter.txx
+++ b/Modules/Filtering/Statistics/include/otbListSampleToListSampleFilter.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbListSampleToListSample_txx
-#define __otbListSampleToListSample_txx
+#ifndef otbListSampleToListSample_txx
+#define otbListSampleToListSample_txx
 
 #include "otbListSampleToListSampleFilter.h"
 #include "itkProgressReporter.h"
diff --git a/Modules/Filtering/Statistics/include/otbListSampleToVariableDimensionHistogramGenerator.h b/Modules/Filtering/Statistics/include/otbListSampleToVariableDimensionHistogramGenerator.h
index 1c0ce1b5f8..0c562152a2 100644
--- a/Modules/Filtering/Statistics/include/otbListSampleToVariableDimensionHistogramGenerator.h
+++ b/Modules/Filtering/Statistics/include/otbListSampleToVariableDimensionHistogramGenerator.h
@@ -18,8 +18,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbListSampleToVariableDimensionHistogramGenerator_h
-#define __otbListSampleToVariableDimensionHistogramGenerator_h
+#ifndef otbListSampleToVariableDimensionHistogramGenerator_h
+#define otbListSampleToVariableDimensionHistogramGenerator_h
 
 #include "itkProcessObject.h"
 #include "itkHistogram.h"
diff --git a/Modules/Filtering/Statistics/include/otbListSampleToVariableDimensionHistogramGenerator.txx b/Modules/Filtering/Statistics/include/otbListSampleToVariableDimensionHistogramGenerator.txx
index 7830624e9b..dd1123c660 100644
--- a/Modules/Filtering/Statistics/include/otbListSampleToVariableDimensionHistogramGenerator.txx
+++ b/Modules/Filtering/Statistics/include/otbListSampleToVariableDimensionHistogramGenerator.txx
@@ -18,8 +18,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbListSampleToVariableDimensionHistogramGenerator_txx
-#define __otbListSampleToVariableDimensionHistogramGenerator_txx
+#ifndef otbListSampleToVariableDimensionHistogramGenerator_txx
+#define otbListSampleToVariableDimensionHistogramGenerator_txx
 
 #include "otbMacro.h"
 #include "itkStatisticsAlgorithm.h"
diff --git a/Modules/Filtering/Statistics/include/otbLocalHistogramImageFunction.h b/Modules/Filtering/Statistics/include/otbLocalHistogramImageFunction.h
index c2d6fe2e1c..2ccbe0d966 100644
--- a/Modules/Filtering/Statistics/include/otbLocalHistogramImageFunction.h
+++ b/Modules/Filtering/Statistics/include/otbLocalHistogramImageFunction.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbLocalHistogramImageFunction_h
-#define __otbLocalHistogramImageFunction_h
+#ifndef otbLocalHistogramImageFunction_h
+#define otbLocalHistogramImageFunction_h
 
 #include "itkImageFunction.h"
 #include "itkHistogram.h"
diff --git a/Modules/Filtering/Statistics/include/otbLocalHistogramImageFunction.txx b/Modules/Filtering/Statistics/include/otbLocalHistogramImageFunction.txx
index 4d729c653b..6fe3f1ab0c 100644
--- a/Modules/Filtering/Statistics/include/otbLocalHistogramImageFunction.txx
+++ b/Modules/Filtering/Statistics/include/otbLocalHistogramImageFunction.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbLocalHistogramImageFunction_txx
-#define __otbLocalHistogramImageFunction_txx
+#ifndef otbLocalHistogramImageFunction_txx
+#define otbLocalHistogramImageFunction_txx
 
 #include "otbLocalHistogramImageFunction.h"
 #include "itkConstNeighborhoodIterator.h"
diff --git a/Modules/Filtering/Statistics/include/otbNormalizeVectorImageFilter.h b/Modules/Filtering/Statistics/include/otbNormalizeVectorImageFilter.h
index 94949fd199..f58676f6f6 100644
--- a/Modules/Filtering/Statistics/include/otbNormalizeVectorImageFilter.h
+++ b/Modules/Filtering/Statistics/include/otbNormalizeVectorImageFilter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbNormalizeVectorImageFilter_h
-#define __otbNormalizeVectorImageFilter_h
+#ifndef otbNormalizeVectorImageFilter_h
+#define otbNormalizeVectorImageFilter_h
 
 #include <vnl/vnl_math.h>
 
@@ -218,5 +218,5 @@ private:
 #include "otbNormalizeVectorImageFilter.txx"
 #endif
 
-#endif // __otbNormalizeVectorImageFilter_h
+#endif // otbNormalizeVectorImageFilter_h
 
diff --git a/Modules/Filtering/Statistics/include/otbNormalizeVectorImageFilter.txx b/Modules/Filtering/Statistics/include/otbNormalizeVectorImageFilter.txx
index 9d578bf1a9..6f6b8b8397 100644
--- a/Modules/Filtering/Statistics/include/otbNormalizeVectorImageFilter.txx
+++ b/Modules/Filtering/Statistics/include/otbNormalizeVectorImageFilter.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbNormalizeVectorImageFilter_txx
-#define __otbNormalizeVectorImageFilter_txx
+#ifndef otbNormalizeVectorImageFilter_txx
+#define otbNormalizeVectorImageFilter_txx
 #include "otbNormalizeVectorImageFilter.h"
 
 namespace otb
@@ -83,4 +83,4 @@ NormalizeVectorImageFilter< TInputImage, TOutputImage >
 
 } // end of namespace otb
 
-#endif // __otbNormalizeVectorImageFilter_txx
+#endif // otbNormalizeVectorImageFilter_txx
diff --git a/Modules/Filtering/Statistics/include/otbShiftScaleSampleListFilter.h b/Modules/Filtering/Statistics/include/otbShiftScaleSampleListFilter.h
index 45f78fa533..e373780855 100644
--- a/Modules/Filtering/Statistics/include/otbShiftScaleSampleListFilter.h
+++ b/Modules/Filtering/Statistics/include/otbShiftScaleSampleListFilter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbShiftScaleSampleListFilter_h
-#define __otbShiftScaleSampleListFilter_h
+#ifndef otbShiftScaleSampleListFilter_h
+#define otbShiftScaleSampleListFilter_h
 
 #include "otbListSampleToListSampleFilter.h"
 
diff --git a/Modules/Filtering/Statistics/include/otbShiftScaleSampleListFilter.txx b/Modules/Filtering/Statistics/include/otbShiftScaleSampleListFilter.txx
index e2d6139f96..10af8a845c 100644
--- a/Modules/Filtering/Statistics/include/otbShiftScaleSampleListFilter.txx
+++ b/Modules/Filtering/Statistics/include/otbShiftScaleSampleListFilter.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbShiftScaleSampleListFilter_txx
-#define __otbShiftScaleSampleListFilter_txx
+#ifndef otbShiftScaleSampleListFilter_txx
+#define otbShiftScaleSampleListFilter_txx
 
 #include "otbShiftScaleSampleListFilter.h"
 #include "itkProgressReporter.h"
diff --git a/Modules/Filtering/Statistics/include/otbStreamingCompareImageFilter.h b/Modules/Filtering/Statistics/include/otbStreamingCompareImageFilter.h
index 9b1faa3df2..12eba3b2ec 100644
--- a/Modules/Filtering/Statistics/include/otbStreamingCompareImageFilter.h
+++ b/Modules/Filtering/Statistics/include/otbStreamingCompareImageFilter.h
@@ -18,8 +18,8 @@ for details.
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbStreamingCompareImageFilter_h
-#define __otbStreamingCompareImageFilter_h
+#ifndef otbStreamingCompareImageFilter_h
+#define otbStreamingCompareImageFilter_h
 
 #include "otbPersistentImageFilter.h"
 #include "itkNumericTraits.h"
diff --git a/Modules/Filtering/Statistics/include/otbStreamingCompareImageFilter.txx b/Modules/Filtering/Statistics/include/otbStreamingCompareImageFilter.txx
index 968c0bcd91..9d91807f16 100644
--- a/Modules/Filtering/Statistics/include/otbStreamingCompareImageFilter.txx
+++ b/Modules/Filtering/Statistics/include/otbStreamingCompareImageFilter.txx
@@ -15,8 +15,8 @@
   PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbStreamingCompareImageFilter_txx
-#define __otbStreamingCompareImageFilter_txx
+#ifndef otbStreamingCompareImageFilter_txx
+#define otbStreamingCompareImageFilter_txx
 #include "otbStreamingCompareImageFilter.h"
 
 #include "itkImageRegionIterator.h"
diff --git a/Modules/Filtering/Statistics/include/otbStreamingHistogramVectorImageFilter.h b/Modules/Filtering/Statistics/include/otbStreamingHistogramVectorImageFilter.h
index ad5768780c..04e60cb1ac 100644
--- a/Modules/Filtering/Statistics/include/otbStreamingHistogramVectorImageFilter.h
+++ b/Modules/Filtering/Statistics/include/otbStreamingHistogramVectorImageFilter.h
@@ -18,8 +18,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbStreamingHistogramVectorImageFilter_h
-#define __otbStreamingHistogramVectorImageFilter_h
+#ifndef otbStreamingHistogramVectorImageFilter_h
+#define otbStreamingHistogramVectorImageFilter_h
 
 #include "otbPersistentImageFilter.h"
 #include "otbPersistentFilterStreamingDecorator.h"
diff --git a/Modules/Filtering/Statistics/include/otbStreamingHistogramVectorImageFilter.txx b/Modules/Filtering/Statistics/include/otbStreamingHistogramVectorImageFilter.txx
index d84366ed20..bc980f6e6c 100644
--- a/Modules/Filtering/Statistics/include/otbStreamingHistogramVectorImageFilter.txx
+++ b/Modules/Filtering/Statistics/include/otbStreamingHistogramVectorImageFilter.txx
@@ -18,8 +18,8 @@ for details.
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbStreamingHistogramVectorImageFilter_txx
-#define __otbStreamingHistogramVectorImageFilter_txx
+#ifndef otbStreamingHistogramVectorImageFilter_txx
+#define otbStreamingHistogramVectorImageFilter_txx
 #include "otbStreamingHistogramVectorImageFilter.h"
 
 #include "itkImageRegionIterator.h"
diff --git a/Modules/Filtering/Statistics/include/otbStreamingMinMaxImageFilter.h b/Modules/Filtering/Statistics/include/otbStreamingMinMaxImageFilter.h
index f956537a80..334be523da 100644
--- a/Modules/Filtering/Statistics/include/otbStreamingMinMaxImageFilter.h
+++ b/Modules/Filtering/Statistics/include/otbStreamingMinMaxImageFilter.h
@@ -18,8 +18,8 @@ for details.
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbStreamingMinMaxImageFilter_h
-#define __otbStreamingMinMaxImageFilter_h
+#ifndef otbStreamingMinMaxImageFilter_h
+#define otbStreamingMinMaxImageFilter_h
 
 #include <vector>
 #include "otbPersistentImageFilter.h"
diff --git a/Modules/Filtering/Statistics/include/otbStreamingMinMaxImageFilter.txx b/Modules/Filtering/Statistics/include/otbStreamingMinMaxImageFilter.txx
index 6ab54e02d5..9b871c1197 100644
--- a/Modules/Filtering/Statistics/include/otbStreamingMinMaxImageFilter.txx
+++ b/Modules/Filtering/Statistics/include/otbStreamingMinMaxImageFilter.txx
@@ -18,8 +18,8 @@ for details.
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbStreamingMinMaxImageFilter_txx
-#define __otbStreamingMinMaxImageFilter_txx
+#ifndef otbStreamingMinMaxImageFilter_txx
+#define otbStreamingMinMaxImageFilter_txx
 #include "otbStreamingMinMaxImageFilter.h"
 
 #include <algorithm>
diff --git a/Modules/Filtering/Statistics/include/otbStreamingMinMaxVectorImageFilter.h b/Modules/Filtering/Statistics/include/otbStreamingMinMaxVectorImageFilter.h
index 7926e9abf7..ac8ce99b5e 100644
--- a/Modules/Filtering/Statistics/include/otbStreamingMinMaxVectorImageFilter.h
+++ b/Modules/Filtering/Statistics/include/otbStreamingMinMaxVectorImageFilter.h
@@ -18,8 +18,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbStreamingMinMaxVectorImageFilter_h
-#define __otbStreamingMinMaxVectorImageFilter_h
+#ifndef otbStreamingMinMaxVectorImageFilter_h
+#define otbStreamingMinMaxVectorImageFilter_h
 
 #include "otbPersistentImageFilter.h"
 #include "otbPersistentFilterStreamingDecorator.h"
diff --git a/Modules/Filtering/Statistics/include/otbStreamingMinMaxVectorImageFilter.txx b/Modules/Filtering/Statistics/include/otbStreamingMinMaxVectorImageFilter.txx
index fb9e4e1fe0..097ac7b048 100644
--- a/Modules/Filtering/Statistics/include/otbStreamingMinMaxVectorImageFilter.txx
+++ b/Modules/Filtering/Statistics/include/otbStreamingMinMaxVectorImageFilter.txx
@@ -18,8 +18,8 @@ for details.
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbStreamingMinMaxVectorImageFilter_txx
-#define __otbStreamingMinMaxVectorImageFilter_txx
+#ifndef otbStreamingMinMaxVectorImageFilter_txx
+#define otbStreamingMinMaxVectorImageFilter_txx
 #include "otbStreamingMinMaxVectorImageFilter.h"
 
 #include "itkImageRegionIterator.h"
diff --git a/Modules/Filtering/Statistics/include/otbStreamingStatisticsImageFilter.h b/Modules/Filtering/Statistics/include/otbStreamingStatisticsImageFilter.h
index 16846e8299..a9443a6fd6 100644
--- a/Modules/Filtering/Statistics/include/otbStreamingStatisticsImageFilter.h
+++ b/Modules/Filtering/Statistics/include/otbStreamingStatisticsImageFilter.h
@@ -18,8 +18,8 @@ for details.
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbStreamingStatisticsImageFilter_h
-#define __otbStreamingStatisticsImageFilter_h
+#ifndef otbStreamingStatisticsImageFilter_h
+#define otbStreamingStatisticsImageFilter_h
 
 #include "otbPersistentImageFilter.h"
 #include "itkNumericTraits.h"
diff --git a/Modules/Filtering/Statistics/include/otbStreamingStatisticsImageFilter.txx b/Modules/Filtering/Statistics/include/otbStreamingStatisticsImageFilter.txx
index 328f517d8a..1001ed7a27 100644
--- a/Modules/Filtering/Statistics/include/otbStreamingStatisticsImageFilter.txx
+++ b/Modules/Filtering/Statistics/include/otbStreamingStatisticsImageFilter.txx
@@ -18,8 +18,8 @@ for details.
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbStreamingStatisticsImageFilter_txx
-#define __otbStreamingStatisticsImageFilter_txx
+#ifndef otbStreamingStatisticsImageFilter_txx
+#define otbStreamingStatisticsImageFilter_txx
 #include "otbStreamingStatisticsImageFilter.h"
 
 #include "itkImageRegionIterator.h"
diff --git a/Modules/Filtering/Statistics/include/otbStreamingStatisticsMapFromLabelImageFilter.h b/Modules/Filtering/Statistics/include/otbStreamingStatisticsMapFromLabelImageFilter.h
index a435676355..5ad13c2791 100644
--- a/Modules/Filtering/Statistics/include/otbStreamingStatisticsMapFromLabelImageFilter.h
+++ b/Modules/Filtering/Statistics/include/otbStreamingStatisticsMapFromLabelImageFilter.h
@@ -18,8 +18,8 @@ for details.
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbStreamingStatisticsMapFromLabelImageFilter_h
-#define __otbStreamingStatisticsMapFromLabelImageFilter_h
+#ifndef otbStreamingStatisticsMapFromLabelImageFilter_h
+#define otbStreamingStatisticsMapFromLabelImageFilter_h
 
 #include "otbPersistentImageFilter.h"
 #include "itkNumericTraits.h"
diff --git a/Modules/Filtering/Statistics/include/otbStreamingStatisticsMapFromLabelImageFilter.txx b/Modules/Filtering/Statistics/include/otbStreamingStatisticsMapFromLabelImageFilter.txx
index d9d9db8493..561a837f2d 100644
--- a/Modules/Filtering/Statistics/include/otbStreamingStatisticsMapFromLabelImageFilter.txx
+++ b/Modules/Filtering/Statistics/include/otbStreamingStatisticsMapFromLabelImageFilter.txx
@@ -18,8 +18,8 @@ for details.
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbStreamingStatisticsMapFromLabelImageFilter_txx
-#define __otbStreamingStatisticsMapFromLabelImageFilter_txx
+#ifndef otbStreamingStatisticsMapFromLabelImageFilter_txx
+#define otbStreamingStatisticsMapFromLabelImageFilter_txx
 #include "otbStreamingStatisticsMapFromLabelImageFilter.h"
 
 #include "itkInputDataObjectIterator.h"
diff --git a/Modules/Filtering/Statistics/include/otbStreamingStatisticsVectorImageFilter.h b/Modules/Filtering/Statistics/include/otbStreamingStatisticsVectorImageFilter.h
index 7399407d14..d3da80dceb 100644
--- a/Modules/Filtering/Statistics/include/otbStreamingStatisticsVectorImageFilter.h
+++ b/Modules/Filtering/Statistics/include/otbStreamingStatisticsVectorImageFilter.h
@@ -18,8 +18,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbStreamingStatisticsVectorImageFilter_h
-#define __otbStreamingStatisticsVectorImageFilter_h
+#ifndef otbStreamingStatisticsVectorImageFilter_h
+#define otbStreamingStatisticsVectorImageFilter_h
 
 #include "otbPersistentImageFilter.h"
 #include "otbPersistentFilterStreamingDecorator.h"
diff --git a/Modules/Filtering/Statistics/include/otbStreamingStatisticsVectorImageFilter.txx b/Modules/Filtering/Statistics/include/otbStreamingStatisticsVectorImageFilter.txx
index 3801d3b440..39ac5fd797 100644
--- a/Modules/Filtering/Statistics/include/otbStreamingStatisticsVectorImageFilter.txx
+++ b/Modules/Filtering/Statistics/include/otbStreamingStatisticsVectorImageFilter.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbStreamingStatisticsVectorImageFilter_txx
-#define __otbStreamingStatisticsVectorImageFilter_txx
+#ifndef otbStreamingStatisticsVectorImageFilter_txx
+#define otbStreamingStatisticsVectorImageFilter_txx
 #include "otbStreamingStatisticsVectorImageFilter.h"
 
 #include "itkImageRegionIterator.h"
diff --git a/Modules/Filtering/Statistics/include/otbVarianceImageFilter.h b/Modules/Filtering/Statistics/include/otbVarianceImageFilter.h
index e6cefb7d07..586e94bba8 100644
--- a/Modules/Filtering/Statistics/include/otbVarianceImageFilter.h
+++ b/Modules/Filtering/Statistics/include/otbVarianceImageFilter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbVarianceImageFilter_h
-#define __otbVarianceImageFilter_h
+#ifndef otbVarianceImageFilter_h
+#define otbVarianceImageFilter_h
 
 #include "itkImageToImageFilter.h"
 #include "itkImage.h"
diff --git a/Modules/Filtering/Statistics/include/otbVarianceImageFilter.txx b/Modules/Filtering/Statistics/include/otbVarianceImageFilter.txx
index b104d6e4ea..f13c14e6a1 100644
--- a/Modules/Filtering/Statistics/include/otbVarianceImageFilter.txx
+++ b/Modules/Filtering/Statistics/include/otbVarianceImageFilter.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbVarianceImageFilter_txx
-#define __otbVarianceImageFilter_txx
+#ifndef otbVarianceImageFilter_txx
+#define otbVarianceImageFilter_txx
 
 #include "otbVarianceImageFilter.h"
 
diff --git a/Modules/Filtering/Statistics/include/otbVectorImageToIntensityImageFilter.h b/Modules/Filtering/Statistics/include/otbVectorImageToIntensityImageFilter.h
index d8d1723097..98fdb20f81 100644
--- a/Modules/Filtering/Statistics/include/otbVectorImageToIntensityImageFilter.h
+++ b/Modules/Filtering/Statistics/include/otbVectorImageToIntensityImageFilter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbVectorImageToIntensityImageFilter_h
-#define __otbVectorImageToIntensityImageFilter_h
+#ifndef otbVectorImageToIntensityImageFilter_h
+#define otbVectorImageToIntensityImageFilter_h
 
 #include "itkImageToImageFilter.h"
 
diff --git a/Modules/Filtering/Statistics/include/otbVectorImageToIntensityImageFilter.txx b/Modules/Filtering/Statistics/include/otbVectorImageToIntensityImageFilter.txx
index a4df410c71..8f1a324839 100644
--- a/Modules/Filtering/Statistics/include/otbVectorImageToIntensityImageFilter.txx
+++ b/Modules/Filtering/Statistics/include/otbVectorImageToIntensityImageFilter.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbVectorImageToIntensityImageFilter_txx
-#define __otbVectorImageToIntensityImageFilter_txx
+#ifndef otbVectorImageToIntensityImageFilter_txx
+#define otbVectorImageToIntensityImageFilter_txx
 
 #include "otbVectorImageToIntensityImageFilter.h"
 #include "itkImageRegionIterator.h"
diff --git a/Modules/Filtering/Statistics/include/otbVectorImageToMatrixImageFilter.h b/Modules/Filtering/Statistics/include/otbVectorImageToMatrixImageFilter.h
index a464ef413d..f5853b0d55 100644
--- a/Modules/Filtering/Statistics/include/otbVectorImageToMatrixImageFilter.h
+++ b/Modules/Filtering/Statistics/include/otbVectorImageToMatrixImageFilter.h
@@ -18,8 +18,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbVectorImageToMatrixFilter_h
-#define __otbVectorImageToMatrixFilter_h
+#ifndef otbVectorImageToMatrixFilter_h
+#define otbVectorImageToMatrixFilter_h
 
 #include "otbPersistentImageFilter.h"
 #include "otbPersistentFilterStreamingDecorator.h"
diff --git a/Modules/Filtering/Statistics/include/otbVectorImageToMatrixImageFilter.txx b/Modules/Filtering/Statistics/include/otbVectorImageToMatrixImageFilter.txx
index 3db7e891c5..846d9cd937 100644
--- a/Modules/Filtering/Statistics/include/otbVectorImageToMatrixImageFilter.txx
+++ b/Modules/Filtering/Statistics/include/otbVectorImageToMatrixImageFilter.txx
@@ -18,8 +18,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbVectorImageToMatrixFilter_txx
-#define __otbVectorImageToMatrixFilter_txx
+#ifndef otbVectorImageToMatrixFilter_txx
+#define otbVectorImageToMatrixFilter_txx
 #include "otbVectorImageToMatrixImageFilter.h"
 
 #include "itkImageRegionIterator.h"
diff --git a/Modules/Filtering/TimeSeries/include/otbEnvelopeSavitzkyGolayInterpolationFunctor.h b/Modules/Filtering/TimeSeries/include/otbEnvelopeSavitzkyGolayInterpolationFunctor.h
index b0510786c8..6654dc0eca 100644
--- a/Modules/Filtering/TimeSeries/include/otbEnvelopeSavitzkyGolayInterpolationFunctor.h
+++ b/Modules/Filtering/TimeSeries/include/otbEnvelopeSavitzkyGolayInterpolationFunctor.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbEnvelopeSavitzkyGolayInterpolationFunctor_h
-#define __otbEnvelopeSavitzkyGolayInterpolationFunctor_h
+#ifndef otbEnvelopeSavitzkyGolayInterpolationFunctor_h
+#define otbEnvelopeSavitzkyGolayInterpolationFunctor_h
 
 #include "otbSavitzkyGolayInterpolationFunctor.h"
 
diff --git a/Modules/Filtering/TimeSeries/include/otbSavitzkyGolayInterpolationFunctor.h b/Modules/Filtering/TimeSeries/include/otbSavitzkyGolayInterpolationFunctor.h
index 393bd3445b..c4fcea461b 100644
--- a/Modules/Filtering/TimeSeries/include/otbSavitzkyGolayInterpolationFunctor.h
+++ b/Modules/Filtering/TimeSeries/include/otbSavitzkyGolayInterpolationFunctor.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbSavitzkyGolayInterpolationFunctor_h
-#define __otbSavitzkyGolayInterpolationFunctor_h
+#ifndef otbSavitzkyGolayInterpolationFunctor_h
+#define otbSavitzkyGolayInterpolationFunctor_h
 
 #include "otbTimeSeries.h"
 #include "otbTimeSeriesLeastSquareFittingFunctor.h"
diff --git a/Modules/Filtering/TimeSeries/include/otbTimeSeries.h b/Modules/Filtering/TimeSeries/include/otbTimeSeries.h
index 0d8c98129d..3958e59528 100644
--- a/Modules/Filtering/TimeSeries/include/otbTimeSeries.h
+++ b/Modules/Filtering/TimeSeries/include/otbTimeSeries.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbTimeSeries_h
-#define __otbTimeSeries_h
+#ifndef otbTimeSeries_h
+#define otbTimeSeries_h
 
 #include "itkFixedArray.h"
 #include <vcl_cmath.h>
diff --git a/Modules/Filtering/TimeSeries/include/otbTimeSeriesLeastSquareFittingFunctor.h b/Modules/Filtering/TimeSeries/include/otbTimeSeriesLeastSquareFittingFunctor.h
index c527913c4a..64d61f5857 100644
--- a/Modules/Filtering/TimeSeries/include/otbTimeSeriesLeastSquareFittingFunctor.h
+++ b/Modules/Filtering/TimeSeries/include/otbTimeSeriesLeastSquareFittingFunctor.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbTimeSeriesLSFF_h
-#define __otbTimeSeriesLSFF_h
+#ifndef otbTimeSeriesLSFF_h
+#define otbTimeSeriesLSFF_h
 
 #include "vnl/algo/vnl_matrix_inverse.h"
 #include "vnl/vnl_transpose.h"
diff --git a/Modules/Filtering/VectorDataManipulation/include/otbConcatenateVectorDataFilter.h b/Modules/Filtering/VectorDataManipulation/include/otbConcatenateVectorDataFilter.h
index 923c398a57..878e84e4d4 100644
--- a/Modules/Filtering/VectorDataManipulation/include/otbConcatenateVectorDataFilter.h
+++ b/Modules/Filtering/VectorDataManipulation/include/otbConcatenateVectorDataFilter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbConcatenateVectorDataFilter_h
-#define __otbConcatenateVectorDataFilter_h
+#ifndef otbConcatenateVectorDataFilter_h
+#define otbConcatenateVectorDataFilter_h
 
 #include "otbVectorDataToVectorDataFilter.h"
 #include "otbVectorData.h"
diff --git a/Modules/Filtering/VectorDataManipulation/include/otbConcatenateVectorDataFilter.txx b/Modules/Filtering/VectorDataManipulation/include/otbConcatenateVectorDataFilter.txx
index 0145df2ff7..ddc3fd4f4e 100644
--- a/Modules/Filtering/VectorDataManipulation/include/otbConcatenateVectorDataFilter.txx
+++ b/Modules/Filtering/VectorDataManipulation/include/otbConcatenateVectorDataFilter.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbConcatenateVectorDataFilter_txx
-#define __otbConcatenateVectorDataFilter_txx
+#ifndef otbConcatenateVectorDataFilter_txx
+#define otbConcatenateVectorDataFilter_txx
 
 #include "otbConcatenateVectorDataFilter.h"
 
diff --git a/Modules/Filtering/VectorDataManipulation/include/otbCorrectPolygonFunctor.h b/Modules/Filtering/VectorDataManipulation/include/otbCorrectPolygonFunctor.h
index 027ef05668..4a001376ba 100644
--- a/Modules/Filtering/VectorDataManipulation/include/otbCorrectPolygonFunctor.h
+++ b/Modules/Filtering/VectorDataManipulation/include/otbCorrectPolygonFunctor.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbCorrectPolygonFunctor_h
-#define __otbCorrectPolygonFunctor_h
+#ifndef otbCorrectPolygonFunctor_h
+#define otbCorrectPolygonFunctor_h
 
 #include "otbSimplifyPathFunctor.h"
 #include "otbClosePathFunctor.h"
diff --git a/Modules/Filtering/VectorDataManipulation/include/otbDBOverlapDataNodeFeatureFunction.h b/Modules/Filtering/VectorDataManipulation/include/otbDBOverlapDataNodeFeatureFunction.h
index b0812958ee..ab374199f7 100644
--- a/Modules/Filtering/VectorDataManipulation/include/otbDBOverlapDataNodeFeatureFunction.h
+++ b/Modules/Filtering/VectorDataManipulation/include/otbDBOverlapDataNodeFeatureFunction.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbDBOverlapDataNodeFeatureFunction_h
-#define __otbDBOverlapDataNodeFeatureFunction_h
+#ifndef otbDBOverlapDataNodeFeatureFunction_h
+#define otbDBOverlapDataNodeFeatureFunction_h
 
 #include "otbDataNodeVectorDataFunction.h"
 
diff --git a/Modules/Filtering/VectorDataManipulation/include/otbDBOverlapDataNodeFeatureFunction.txx b/Modules/Filtering/VectorDataManipulation/include/otbDBOverlapDataNodeFeatureFunction.txx
index cedd4fe944..79f9bfff8f 100644
--- a/Modules/Filtering/VectorDataManipulation/include/otbDBOverlapDataNodeFeatureFunction.txx
+++ b/Modules/Filtering/VectorDataManipulation/include/otbDBOverlapDataNodeFeatureFunction.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbDBOverlapDataNodeFeatureFunction_txx
-#define __otbDBOverlapDataNodeFeatureFunction_txx
+#ifndef otbDBOverlapDataNodeFeatureFunction_txx
+#define otbDBOverlapDataNodeFeatureFunction_txx
 
 #include "otbDBOverlapDataNodeFeatureFunction.h"
 
diff --git a/Modules/Filtering/VectorDataManipulation/include/otbPolygonCompacityFunctor.h b/Modules/Filtering/VectorDataManipulation/include/otbPolygonCompacityFunctor.h
index e4d8c022c8..3d04dcf923 100644
--- a/Modules/Filtering/VectorDataManipulation/include/otbPolygonCompacityFunctor.h
+++ b/Modules/Filtering/VectorDataManipulation/include/otbPolygonCompacityFunctor.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbPolygonCompacityFunctor_h
-#define __otbPolygonCompacityFunctor_h
+#ifndef otbPolygonCompacityFunctor_h
+#define otbPolygonCompacityFunctor_h
 
 #include "otbMath.h"
 
diff --git a/Modules/Filtering/VectorDataManipulation/include/otbRadiometryHomogenousWithNeighborhoodDataNodeFeatureFunction.h b/Modules/Filtering/VectorDataManipulation/include/otbRadiometryHomogenousWithNeighborhoodDataNodeFeatureFunction.h
index 8d7a130e35..1f205ccd5e 100644
--- a/Modules/Filtering/VectorDataManipulation/include/otbRadiometryHomogenousWithNeighborhoodDataNodeFeatureFunction.h
+++ b/Modules/Filtering/VectorDataManipulation/include/otbRadiometryHomogenousWithNeighborhoodDataNodeFeatureFunction.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbRadiometryHomogenousWithNeighborhoodDataNodeFeatureFunction_h
-#define __otbRadiometryHomogenousWithNeighborhoodDataNodeFeatureFunction_h
+#ifndef otbRadiometryHomogenousWithNeighborhoodDataNodeFeatureFunction_h
+#define otbRadiometryHomogenousWithNeighborhoodDataNodeFeatureFunction_h
 
 #include "otbDataNodeImageFunction.h"
 
diff --git a/Modules/Filtering/VectorDataManipulation/include/otbRadiometryHomogenousWithNeighborhoodDataNodeFeatureFunction.txx b/Modules/Filtering/VectorDataManipulation/include/otbRadiometryHomogenousWithNeighborhoodDataNodeFeatureFunction.txx
index 617912c67c..6fa0c37822 100644
--- a/Modules/Filtering/VectorDataManipulation/include/otbRadiometryHomogenousWithNeighborhoodDataNodeFeatureFunction.txx
+++ b/Modules/Filtering/VectorDataManipulation/include/otbRadiometryHomogenousWithNeighborhoodDataNodeFeatureFunction.txx
@@ -15,8 +15,8 @@
  PURPOSE.  See the above copyright notices for more information.
 
  =========================================================================*/
-#ifndef __otbRadiometryHomogenousWithNeighborhoodDataNodeFeatureFunction_txx
-#define __otbRadiometryHomogenousWithNeighborhoodDataNodeFeatureFunction_txx
+#ifndef otbRadiometryHomogenousWithNeighborhoodDataNodeFeatureFunction_txx
+#define otbRadiometryHomogenousWithNeighborhoodDataNodeFeatureFunction_txx
 
 #include "otbRadiometryHomogenousWithNeighborhoodDataNodeFeatureFunction.h"
 
diff --git a/Modules/Filtering/VectorDataManipulation/include/otbSimplifyPathFunctor.h b/Modules/Filtering/VectorDataManipulation/include/otbSimplifyPathFunctor.h
index ad99254b88..c60ede291e 100644
--- a/Modules/Filtering/VectorDataManipulation/include/otbSimplifyPathFunctor.h
+++ b/Modules/Filtering/VectorDataManipulation/include/otbSimplifyPathFunctor.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbSimplifyPathFunctor_h
-#define __otbSimplifyPathFunctor_h
+#ifndef otbSimplifyPathFunctor_h
+#define otbSimplifyPathFunctor_h
 
 #include "otbMath.h"
 
diff --git a/Modules/Filtering/VectorDataManipulation/include/otbSpectralAngleDataNodeFeatureFunction.h b/Modules/Filtering/VectorDataManipulation/include/otbSpectralAngleDataNodeFeatureFunction.h
index 12767ec499..30a379d20d 100644
--- a/Modules/Filtering/VectorDataManipulation/include/otbSpectralAngleDataNodeFeatureFunction.h
+++ b/Modules/Filtering/VectorDataManipulation/include/otbSpectralAngleDataNodeFeatureFunction.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbSpectralAngleDataNodeFeatureFunction_h
-#define __otbSpectralAngleDataNodeFeatureFunction_h
+#ifndef otbSpectralAngleDataNodeFeatureFunction_h
+#define otbSpectralAngleDataNodeFeatureFunction_h
 
 #include "otbDataNodeImageFunction.h"
 
diff --git a/Modules/Filtering/VectorDataManipulation/include/otbSpectralAngleDataNodeFeatureFunction.txx b/Modules/Filtering/VectorDataManipulation/include/otbSpectralAngleDataNodeFeatureFunction.txx
index 1982f3c57a..889fe99ab2 100644
--- a/Modules/Filtering/VectorDataManipulation/include/otbSpectralAngleDataNodeFeatureFunction.txx
+++ b/Modules/Filtering/VectorDataManipulation/include/otbSpectralAngleDataNodeFeatureFunction.txx
@@ -15,8 +15,8 @@
  PURPOSE.  See the above copyright notices for more information.
 
  =========================================================================*/
-#ifndef __otbSpectralAngleDataNodeFeatureFunction_txx
-#define __otbSpectralAngleDataNodeFeatureFunction_txx
+#ifndef otbSpectralAngleDataNodeFeatureFunction_txx
+#define otbSpectralAngleDataNodeFeatureFunction_txx
 
 #include "otbSpectralAngleDataNodeFeatureFunction.h"
 
diff --git a/Modules/Filtering/VectorDataManipulation/include/otbVectorDataAdapter.h b/Modules/Filtering/VectorDataManipulation/include/otbVectorDataAdapter.h
index ad37791050..12c45a59bb 100644
--- a/Modules/Filtering/VectorDataManipulation/include/otbVectorDataAdapter.h
+++ b/Modules/Filtering/VectorDataManipulation/include/otbVectorDataAdapter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbVectorDataAdapter_h
-#define __otbVectorDataAdapter_h
+#ifndef otbVectorDataAdapter_h
+#define otbVectorDataAdapter_h
 
 #include "otbVectorDataToVectorDataFilter.h"
 
diff --git a/Modules/Filtering/VectorDataManipulation/include/otbVectorDataAdapter.txx b/Modules/Filtering/VectorDataManipulation/include/otbVectorDataAdapter.txx
index a7ad11ccfb..9d181f7c4c 100644
--- a/Modules/Filtering/VectorDataManipulation/include/otbVectorDataAdapter.txx
+++ b/Modules/Filtering/VectorDataManipulation/include/otbVectorDataAdapter.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbVectorDataAdapterFilter_txx
-#define __otbVectorDataAdapterFilter_txx
+#ifndef otbVectorDataAdapterFilter_txx
+#define otbVectorDataAdapterFilter_txx
 
 #include "otbVectorDataAdapter.h"
 
diff --git a/Modules/Filtering/VectorDataManipulation/include/otbVectorDataExtractROI.h b/Modules/Filtering/VectorDataManipulation/include/otbVectorDataExtractROI.h
index 69e9555e6d..2312ab8ee7 100644
--- a/Modules/Filtering/VectorDataManipulation/include/otbVectorDataExtractROI.h
+++ b/Modules/Filtering/VectorDataManipulation/include/otbVectorDataExtractROI.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbVectorDataExtractROI_h
-#define __otbVectorDataExtractROI_h
+#ifndef otbVectorDataExtractROI_h
+#define otbVectorDataExtractROI_h
 
 #include "otbVectorDataToVectorDataFilter.h"
 #include "otbRemoteSensingRegion.h"
diff --git a/Modules/Filtering/VectorDataManipulation/include/otbVectorDataExtractROI.txx b/Modules/Filtering/VectorDataManipulation/include/otbVectorDataExtractROI.txx
index 51dab922d1..c37a0c28e5 100644
--- a/Modules/Filtering/VectorDataManipulation/include/otbVectorDataExtractROI.txx
+++ b/Modules/Filtering/VectorDataManipulation/include/otbVectorDataExtractROI.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbVectorDataExtractROI_txx
-#define __otbVectorDataExtractROI_txx
+#ifndef otbVectorDataExtractROI_txx
+#define otbVectorDataExtractROI_txx
 
 #include "otbVectorDataExtractROI.h"
 
diff --git a/Modules/Filtering/VectorDataManipulation/include/otbVectorDataToRandomLineGenerator.h b/Modules/Filtering/VectorDataManipulation/include/otbVectorDataToRandomLineGenerator.h
index 731c91f3c7..16ffdd754d 100644
--- a/Modules/Filtering/VectorDataManipulation/include/otbVectorDataToRandomLineGenerator.h
+++ b/Modules/Filtering/VectorDataManipulation/include/otbVectorDataToRandomLineGenerator.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbVectorDataToRandomLineGenerator_h
-#define __otbVectorDataToRandomLineGenerator_h
+#ifndef otbVectorDataToRandomLineGenerator_h
+#define otbVectorDataToRandomLineGenerator_h
 
 #include "otbVectorDataSource.h"
 #include "otbVectorData.h"
diff --git a/Modules/Filtering/VectorDataManipulation/include/otbVectorDataToRandomLineGenerator.txx b/Modules/Filtering/VectorDataManipulation/include/otbVectorDataToRandomLineGenerator.txx
index b54797f7f4..e737654784 100644
--- a/Modules/Filtering/VectorDataManipulation/include/otbVectorDataToRandomLineGenerator.txx
+++ b/Modules/Filtering/VectorDataManipulation/include/otbVectorDataToRandomLineGenerator.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbVectorDataToRandomLineGenerator_txx
-#define __otbVectorDataToRandomLineGenerator_txx
+#ifndef otbVectorDataToRandomLineGenerator_txx
+#define otbVectorDataToRandomLineGenerator_txx
 
 #include "otbVectorDataToRandomLineGenerator.h"
 
diff --git a/Modules/Filtering/VectorDataManipulation/include/otbVectorDataToSpecificDescriptionFilterBase.h b/Modules/Filtering/VectorDataManipulation/include/otbVectorDataToSpecificDescriptionFilterBase.h
index 7b4a9f432b..9e31ae6b3e 100644
--- a/Modules/Filtering/VectorDataManipulation/include/otbVectorDataToSpecificDescriptionFilterBase.h
+++ b/Modules/Filtering/VectorDataManipulation/include/otbVectorDataToSpecificDescriptionFilterBase.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbVectorDataToSpecificDescriptionFilterBase_h
-#define __otbVectorDataToSpecificDescriptionFilterBase_h
+#ifndef otbVectorDataToSpecificDescriptionFilterBase_h
+#define otbVectorDataToSpecificDescriptionFilterBase_h
 
 #include "otbVectorDataToVectorDataFilter.h"
 
diff --git a/Modules/Filtering/VectorDataManipulation/include/otbVectorDataToSpecificDescriptionFilterBase.txx b/Modules/Filtering/VectorDataManipulation/include/otbVectorDataToSpecificDescriptionFilterBase.txx
index 7a856120bd..1806d07333 100644
--- a/Modules/Filtering/VectorDataManipulation/include/otbVectorDataToSpecificDescriptionFilterBase.txx
+++ b/Modules/Filtering/VectorDataManipulation/include/otbVectorDataToSpecificDescriptionFilterBase.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbVectorDataToSpecificDescriptionFilterBase_txx
-#define __otbVectorDataToSpecificDescriptionFilterBase_txx
+#ifndef otbVectorDataToSpecificDescriptionFilterBase_txx
+#define otbVectorDataToSpecificDescriptionFilterBase_txx
 
 #include "otbVectorDataToSpecificDescriptionFilterBase.h"
 
diff --git a/Modules/Filtering/VectorDataManipulation/include/otbVectorDataToVectorDataFilter.h b/Modules/Filtering/VectorDataManipulation/include/otbVectorDataToVectorDataFilter.h
index 61efafd421..5c410dd15e 100644
--- a/Modules/Filtering/VectorDataManipulation/include/otbVectorDataToVectorDataFilter.h
+++ b/Modules/Filtering/VectorDataManipulation/include/otbVectorDataToVectorDataFilter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbVectorDataToVectorDataFilter_h
-#define __otbVectorDataToVectorDataFilter_h
+#ifndef otbVectorDataToVectorDataFilter_h
+#define otbVectorDataToVectorDataFilter_h
 
 #include "otbVectorDataSource.h"
 
diff --git a/Modules/Filtering/VectorDataManipulation/include/otbVectorDataToVectorDataFilter.txx b/Modules/Filtering/VectorDataManipulation/include/otbVectorDataToVectorDataFilter.txx
index 71e607cd5f..6ff5429638 100644
--- a/Modules/Filtering/VectorDataManipulation/include/otbVectorDataToVectorDataFilter.txx
+++ b/Modules/Filtering/VectorDataManipulation/include/otbVectorDataToVectorDataFilter.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbVectorDataToVectorDataFilter_txx
-#define __otbVectorDataToVectorDataFilter_txx
+#ifndef otbVectorDataToVectorDataFilter_txx
+#define otbVectorDataToVectorDataFilter_txx
 
 #include "otbVectorDataToVectorDataFilter.h"
 #include "itkProgressReporter.h"
diff --git a/Modules/Filtering/VectorDataRendering/include/otbMapnikAdapter.h b/Modules/Filtering/VectorDataRendering/include/otbMapnikAdapter.h
index 9ac69affe7..41d31c08cb 100644
--- a/Modules/Filtering/VectorDataRendering/include/otbMapnikAdapter.h
+++ b/Modules/Filtering/VectorDataRendering/include/otbMapnikAdapter.h
@@ -16,8 +16,8 @@
 
 =========================================================================*/
 
-#ifndef __otbMapnikAdapter_h
-#define __otbMapnikAdapter_h
+#ifndef otbMapnikAdapter_h
+#define otbMapnikAdapter_h
 
 #if defined(__GNUC__) || defined(__clang__)
 #pragma GCC diagnostic push
diff --git a/Modules/Filtering/VectorDataRendering/include/otbVectorDataStyle.h b/Modules/Filtering/VectorDataRendering/include/otbVectorDataStyle.h
index c4c63e3471..8162789217 100644
--- a/Modules/Filtering/VectorDataRendering/include/otbVectorDataStyle.h
+++ b/Modules/Filtering/VectorDataRendering/include/otbVectorDataStyle.h
@@ -16,8 +16,8 @@
 
 =========================================================================*/
 
-#ifndef __otbVectorDataStyle_h
-#define __otbVectorDataStyle_h
+#ifndef otbVectorDataStyle_h
+#define otbVectorDataStyle_h
 
 #include "itkLightObject.h"
 #include "itkObjectFactory.h"
diff --git a/Modules/Filtering/VectorDataRendering/include/otbVectorDataToImageFilter.h b/Modules/Filtering/VectorDataRendering/include/otbVectorDataToImageFilter.h
index 86777f9605..41a17260a2 100644
--- a/Modules/Filtering/VectorDataRendering/include/otbVectorDataToImageFilter.h
+++ b/Modules/Filtering/VectorDataRendering/include/otbVectorDataToImageFilter.h
@@ -16,8 +16,8 @@
 
 =========================================================================*/
 
-#ifndef __otbVectorDataToImageFilter_h
-#define __otbVectorDataToImageFilter_h
+#ifndef otbVectorDataToImageFilter_h
+#define otbVectorDataToImageFilter_h
 
 #include "itkImageSource.h"
 #include "otbRGBAPixelConverter.h"
diff --git a/Modules/Filtering/VectorDataRendering/include/otbVectorDataToImageFilter.txx b/Modules/Filtering/VectorDataRendering/include/otbVectorDataToImageFilter.txx
index d5d00eb26f..38ce8b56ce 100644
--- a/Modules/Filtering/VectorDataRendering/include/otbVectorDataToImageFilter.txx
+++ b/Modules/Filtering/VectorDataRendering/include/otbVectorDataToImageFilter.txx
@@ -16,8 +16,8 @@
 
 =========================================================================*/
 
-#ifndef __otbVectorDataToImageFilter_txx
-#define __otbVectorDataToImageFilter_txx
+#ifndef otbVectorDataToImageFilter_txx
+#define otbVectorDataToImageFilter_txx
 
 #include <sstream>
 #include "otbVectorDataToImageFilter.h"
diff --git a/Modules/Filtering/VectorDataRendering/include/otbVectorDataToMapFilter.h b/Modules/Filtering/VectorDataRendering/include/otbVectorDataToMapFilter.h
index a965bab322..aba35b0844 100644
--- a/Modules/Filtering/VectorDataRendering/include/otbVectorDataToMapFilter.h
+++ b/Modules/Filtering/VectorDataRendering/include/otbVectorDataToMapFilter.h
@@ -16,8 +16,8 @@
 
 =========================================================================*/
 
-#ifndef __otbVectorDataToMapFilter_h
-#define __otbVectorDataToMapFilter_h
+#ifndef otbVectorDataToMapFilter_h
+#define otbVectorDataToMapFilter_h
 
 #include "itkImageSource.h"
 #include "otbRGBAPixelConverter.h"
diff --git a/Modules/Filtering/VectorDataRendering/include/otbVectorDataToMapFilter.txx b/Modules/Filtering/VectorDataRendering/include/otbVectorDataToMapFilter.txx
index 928e540090..06435e7bf7 100644
--- a/Modules/Filtering/VectorDataRendering/include/otbVectorDataToMapFilter.txx
+++ b/Modules/Filtering/VectorDataRendering/include/otbVectorDataToMapFilter.txx
@@ -16,8 +16,8 @@
 
 =========================================================================*/
 
-#ifndef __otbVectorDataToMapFilter_txx
-#define __otbVectorDataToMapFilter_txx
+#ifndef otbVectorDataToMapFilter_txx
+#define otbVectorDataToMapFilter_txx
 
 #include <sstream>
 #include "otbVectorDataToMapFilter.h"
diff --git a/Modules/Filtering/Wavelet/include/otbSubsampleImageFilter.h b/Modules/Filtering/Wavelet/include/otbSubsampleImageFilter.h
index c74a540efc..095afc9305 100644
--- a/Modules/Filtering/Wavelet/include/otbSubsampleImageFilter.h
+++ b/Modules/Filtering/Wavelet/include/otbSubsampleImageFilter.h
@@ -18,8 +18,8 @@
 
 =========================================================================*/
 
-#ifndef __otbSubsampleImageFilter_h
-#define __otbSubsampleImageFilter_h
+#ifndef otbSubsampleImageFilter_h
+#define otbSubsampleImageFilter_h
 
 #include "itkImageToImageFilter.h"
 #include "itkImage.h"
diff --git a/Modules/Filtering/Wavelet/include/otbSubsampleImageFilter.txx b/Modules/Filtering/Wavelet/include/otbSubsampleImageFilter.txx
index 0375f3956a..1848cc66b5 100644
--- a/Modules/Filtering/Wavelet/include/otbSubsampleImageFilter.txx
+++ b/Modules/Filtering/Wavelet/include/otbSubsampleImageFilter.txx
@@ -18,8 +18,8 @@
 
 =========================================================================*/
 
-#ifndef __otbSubsampleImageFilter_txx
-#define __otbSubsampleImageFilter_txx
+#ifndef otbSubsampleImageFilter_txx
+#define otbSubsampleImageFilter_txx
 #include "otbSubsampleImageFilter.h"
 
 #include "otbMacro.h"
diff --git a/Modules/Filtering/Wavelet/include/otbWaveletFilterBank.h b/Modules/Filtering/Wavelet/include/otbWaveletFilterBank.h
index 51c9ea0a50..3a579fd075 100644
--- a/Modules/Filtering/Wavelet/include/otbWaveletFilterBank.h
+++ b/Modules/Filtering/Wavelet/include/otbWaveletFilterBank.h
@@ -18,8 +18,8 @@
 
 =========================================================================*/
 
-#ifndef __otbWaveletFilterBank_h
-#define __otbWaveletFilterBank_h
+#ifndef otbWaveletFilterBank_h
+#define otbWaveletFilterBank_h
 
 #include "itkProgressReporter.h"
 #include "itkImageToImageFilter.h"
diff --git a/Modules/Filtering/Wavelet/include/otbWaveletFilterBank.txx b/Modules/Filtering/Wavelet/include/otbWaveletFilterBank.txx
index 21ba8cdf9f..c0cb161dbc 100644
--- a/Modules/Filtering/Wavelet/include/otbWaveletFilterBank.txx
+++ b/Modules/Filtering/Wavelet/include/otbWaveletFilterBank.txx
@@ -18,8 +18,8 @@
 
 =========================================================================*/
 
-#ifndef __otbWaveletFilterBank_txx
-#define __otbWaveletFilterBank_txx
+#ifndef otbWaveletFilterBank_txx
+#define otbWaveletFilterBank_txx
 #include "otbWaveletFilterBank.h"
 
 #include "otbSubsampleImageFilter.h"
diff --git a/Modules/Filtering/Wavelet/include/otbWaveletGenerator.h b/Modules/Filtering/Wavelet/include/otbWaveletGenerator.h
index 8d49d71bab..0ff5365ba5 100644
--- a/Modules/Filtering/Wavelet/include/otbWaveletGenerator.h
+++ b/Modules/Filtering/Wavelet/include/otbWaveletGenerator.h
@@ -18,8 +18,8 @@
 
 =========================================================================*/
 
-#ifndef __otbWaveletGenerator_h
-#define __otbWaveletGenerator_h
+#ifndef otbWaveletGenerator_h
+#define otbWaveletGenerator_h
 
 #include <vector>
 #include "itkLightObject.h"
diff --git a/Modules/Filtering/Wavelet/include/otbWaveletHighPassOperator.h b/Modules/Filtering/Wavelet/include/otbWaveletHighPassOperator.h
index 09cd6c7982..37d2092df5 100644
--- a/Modules/Filtering/Wavelet/include/otbWaveletHighPassOperator.h
+++ b/Modules/Filtering/Wavelet/include/otbWaveletHighPassOperator.h
@@ -17,8 +17,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbWaveletHighPassOperator_h
-#define __otbWaveletHighPassOperator_h
+#ifndef otbWaveletHighPassOperator_h
+#define otbWaveletHighPassOperator_h
 
 #include "otbWaveletOperatorBase.h"
 
diff --git a/Modules/Filtering/Wavelet/include/otbWaveletLowPassOperator.h b/Modules/Filtering/Wavelet/include/otbWaveletLowPassOperator.h
index e6ca6cd775..eaae45dc59 100644
--- a/Modules/Filtering/Wavelet/include/otbWaveletLowPassOperator.h
+++ b/Modules/Filtering/Wavelet/include/otbWaveletLowPassOperator.h
@@ -17,8 +17,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbWaveletLowPassOperator_h
-#define __otbWaveletLowPassOperator_h
+#ifndef otbWaveletLowPassOperator_h
+#define otbWaveletLowPassOperator_h
 
 #include "otbWaveletOperatorBase.h"
 
diff --git a/Modules/Filtering/Wavelet/include/otbWaveletOperator.h b/Modules/Filtering/Wavelet/include/otbWaveletOperator.h
index a6d9394d3e..031b8d63cc 100644
--- a/Modules/Filtering/Wavelet/include/otbWaveletOperator.h
+++ b/Modules/Filtering/Wavelet/include/otbWaveletOperator.h
@@ -17,8 +17,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbWaveletOperator_h
-#define __otbWaveletOperator_h
+#ifndef otbWaveletOperator_h
+#define otbWaveletOperator_h
 
 #include "itkMacro.h"
 #include "itkNeighborhoodOperator.h"
diff --git a/Modules/Filtering/Wavelet/include/otbWaveletOperatorBase.h b/Modules/Filtering/Wavelet/include/otbWaveletOperatorBase.h
index 19d437500a..f827ca79e4 100644
--- a/Modules/Filtering/Wavelet/include/otbWaveletOperatorBase.h
+++ b/Modules/Filtering/Wavelet/include/otbWaveletOperatorBase.h
@@ -17,8 +17,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbWaveletOperatorBase_h
-#define __otbWaveletOperatorBase_h
+#ifndef otbWaveletOperatorBase_h
+#define otbWaveletOperatorBase_h
 
 #include "itkMacro.h"
 #include "itkNeighborhoodOperator.h"
diff --git a/Modules/Filtering/Wavelet/include/otbWaveletOperatorBase.txx b/Modules/Filtering/Wavelet/include/otbWaveletOperatorBase.txx
index 8b76a313d3..abba734852 100644
--- a/Modules/Filtering/Wavelet/include/otbWaveletOperatorBase.txx
+++ b/Modules/Filtering/Wavelet/include/otbWaveletOperatorBase.txx
@@ -18,8 +18,8 @@
 
 =========================================================================*/
 
-#ifndef __otbWaveletOperatorBase_txx
-#define __otbWaveletOperatorBase_txx
+#ifndef otbWaveletOperatorBase_txx
+#define otbWaveletOperatorBase_txx
 
 #include "otbWaveletOperatorBase.h"
 
diff --git a/Modules/Filtering/Wavelet/include/otbWaveletPacketDecompositionCosts.h b/Modules/Filtering/Wavelet/include/otbWaveletPacketDecompositionCosts.h
index ed3db83bd4..3c5e95b299 100644
--- a/Modules/Filtering/Wavelet/include/otbWaveletPacketDecompositionCosts.h
+++ b/Modules/Filtering/Wavelet/include/otbWaveletPacketDecompositionCosts.h
@@ -18,8 +18,8 @@
 
 =========================================================================*/
 
-#ifndef __otbWaveletPacketDecompositionCosts_h
-#define __otbWaveletPacketDecompositionCosts_h
+#ifndef otbWaveletPacketDecompositionCosts_h
+#define otbWaveletPacketDecompositionCosts_h
 
 #include "itkObject.h"
 #include "itkMacro.h"
diff --git a/Modules/Filtering/Wavelet/include/otbWaveletPacketTransform.h b/Modules/Filtering/Wavelet/include/otbWaveletPacketTransform.h
index 0ed7fdbb47..75380406a1 100644
--- a/Modules/Filtering/Wavelet/include/otbWaveletPacketTransform.h
+++ b/Modules/Filtering/Wavelet/include/otbWaveletPacketTransform.h
@@ -18,8 +18,8 @@
 
 =========================================================================*/
 
-#ifndef __otbWaveletPacketTransform_h
-#define __otbWaveletPacketTransform_h
+#ifndef otbWaveletPacketTransform_h
+#define otbWaveletPacketTransform_h
 
 #include "itkProgressAccumulator.h"
 
diff --git a/Modules/Filtering/Wavelet/include/otbWaveletPacketTransform.txx b/Modules/Filtering/Wavelet/include/otbWaveletPacketTransform.txx
index 2d0e628e72..be8c8bee03 100644
--- a/Modules/Filtering/Wavelet/include/otbWaveletPacketTransform.txx
+++ b/Modules/Filtering/Wavelet/include/otbWaveletPacketTransform.txx
@@ -18,8 +18,8 @@
 
 =========================================================================*/
 
-#ifndef __otbWaveletPacketTransform_txx
-#define __otbWaveletPacketTransform_txx
+#ifndef otbWaveletPacketTransform_txx
+#define otbWaveletPacketTransform_txx
 #include "otbWaveletPacketTransform.h"
 #include "otbMacro.h"
 
diff --git a/Modules/Filtering/Wavelet/include/otbWaveletTransform.h b/Modules/Filtering/Wavelet/include/otbWaveletTransform.h
index 853d73c31c..8678966bfb 100644
--- a/Modules/Filtering/Wavelet/include/otbWaveletTransform.h
+++ b/Modules/Filtering/Wavelet/include/otbWaveletTransform.h
@@ -18,8 +18,8 @@
 
 =========================================================================*/
 
-#ifndef __otbWaveletTransform_h
-#define __otbWaveletTransform_h
+#ifndef otbWaveletTransform_h
+#define otbWaveletTransform_h
 
 #include "otbImageToImageListFilter.h"
 #include "otbImageListToImageFilter.h"
diff --git a/Modules/Filtering/Wavelet/include/otbWaveletTransform.txx b/Modules/Filtering/Wavelet/include/otbWaveletTransform.txx
index 93eac94b95..625660e694 100644
--- a/Modules/Filtering/Wavelet/include/otbWaveletTransform.txx
+++ b/Modules/Filtering/Wavelet/include/otbWaveletTransform.txx
@@ -18,8 +18,8 @@
 
 =========================================================================*/
 
-#ifndef __otbWaveletTransform_txx
-#define __otbWaveletTransform_txx
+#ifndef otbWaveletTransform_txx
+#define otbWaveletTransform_txx
 #include "otbWaveletTransform.h"
 
 #include "itkImageRegionIterator.h"
diff --git a/Modules/Fusion/Fuzzy/include/otbFuzzyDescriptorsModelManager.h b/Modules/Fusion/Fuzzy/include/otbFuzzyDescriptorsModelManager.h
index 987aaceb8b..76a69500b7 100644
--- a/Modules/Fusion/Fuzzy/include/otbFuzzyDescriptorsModelManager.h
+++ b/Modules/Fusion/Fuzzy/include/otbFuzzyDescriptorsModelManager.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbFuzzyDescriptorsModelManager_h
-#define __otbFuzzyDescriptorsModelManager_h
+#ifndef otbFuzzyDescriptorsModelManager_h
+#define otbFuzzyDescriptorsModelManager_h
 
 #include <vector>
 #include <utility>
diff --git a/Modules/Fusion/Fuzzy/include/otbFuzzyVariable.h b/Modules/Fusion/Fuzzy/include/otbFuzzyVariable.h
index d1147d0f0b..4b62d08bf1 100644
--- a/Modules/Fusion/Fuzzy/include/otbFuzzyVariable.h
+++ b/Modules/Fusion/Fuzzy/include/otbFuzzyVariable.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbFuzzyVariable_h
-#define __otbFuzzyVariable_h
+#ifndef otbFuzzyVariable_h
+#define otbFuzzyVariable_h
 
 #include "itkDataObject.h"
 #include "itkFixedArray.h"
diff --git a/Modules/Fusion/Fuzzy/include/otbFuzzyVariable.txx b/Modules/Fusion/Fuzzy/include/otbFuzzyVariable.txx
index bd64b464f5..4ebb79000e 100644
--- a/Modules/Fusion/Fuzzy/include/otbFuzzyVariable.txx
+++ b/Modules/Fusion/Fuzzy/include/otbFuzzyVariable.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbFuzzyVariable_txx
-#define __otbFuzzyVariable_txx
+#ifndef otbFuzzyVariable_txx
+#define otbFuzzyVariable_txx
 
 
 #include "otbFuzzyVariable.h"
diff --git a/Modules/Fusion/MajorityVoting/include/otbNeighborhoodMajorityVotingImageFilter.h b/Modules/Fusion/MajorityVoting/include/otbNeighborhoodMajorityVotingImageFilter.h
index 9074cf956c..f7ce6b84e5 100644
--- a/Modules/Fusion/MajorityVoting/include/otbNeighborhoodMajorityVotingImageFilter.h
+++ b/Modules/Fusion/MajorityVoting/include/otbNeighborhoodMajorityVotingImageFilter.h
@@ -15,8 +15,8 @@
  PURPOSE.  See the above copyright notices for more information.
 
  =========================================================================*/
-#ifndef __otbNeighborhoodMajorityVotingImageFilter_h
-#define __otbNeighborhoodMajorityVotingImageFilter_h
+#ifndef otbNeighborhoodMajorityVotingImageFilter_h
+#define otbNeighborhoodMajorityVotingImageFilter_h
 
 // First make sure that the configuration is available.
 // This line can be removed once the optimized versions
diff --git a/Modules/Fusion/MajorityVoting/include/otbNeighborhoodMajorityVotingImageFilter.txx b/Modules/Fusion/MajorityVoting/include/otbNeighborhoodMajorityVotingImageFilter.txx
index 93c05d6b20..5fab37c3fe 100644
--- a/Modules/Fusion/MajorityVoting/include/otbNeighborhoodMajorityVotingImageFilter.txx
+++ b/Modules/Fusion/MajorityVoting/include/otbNeighborhoodMajorityVotingImageFilter.txx
@@ -15,8 +15,8 @@
  PURPOSE.  See the above copyright notices for more information.
 
  =========================================================================*/
-#ifndef __otbNeighborhoodMajorityVotingImageFilter_txx
-#define __otbNeighborhoodMajorityVotingImageFilter_txx
+#ifndef otbNeighborhoodMajorityVotingImageFilter_txx
+#define otbNeighborhoodMajorityVotingImageFilter_txx
 
 // First make sure that the configuration is available.
 // This line can be removed once the optimized versions
diff --git a/Modules/Fusion/PanSharpening/include/otbBayesianFusionFilter.h b/Modules/Fusion/PanSharpening/include/otbBayesianFusionFilter.h
index aaee25a297..312f82745f 100644
--- a/Modules/Fusion/PanSharpening/include/otbBayesianFusionFilter.h
+++ b/Modules/Fusion/PanSharpening/include/otbBayesianFusionFilter.h
@@ -20,8 +20,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbBayesianFusionFilter_h
-#define __otbBayesianFusionFilter_h
+#ifndef otbBayesianFusionFilter_h
+#define otbBayesianFusionFilter_h
 
 #include "itkImageToImageFilter.h"
 #include "otbVectorImage.h"
diff --git a/Modules/Fusion/PanSharpening/include/otbBayesianFusionFilter.txx b/Modules/Fusion/PanSharpening/include/otbBayesianFusionFilter.txx
index 0a2cc11e86..d1ff015d7e 100644
--- a/Modules/Fusion/PanSharpening/include/otbBayesianFusionFilter.txx
+++ b/Modules/Fusion/PanSharpening/include/otbBayesianFusionFilter.txx
@@ -18,8 +18,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbBayesianFusionFilter_txx
-#define __otbBayesianFusionFilter_txx
+#ifndef otbBayesianFusionFilter_txx
+#define otbBayesianFusionFilter_txx
 
 #include "otbBayesianFusionFilter.h"
 
diff --git a/Modules/Fusion/PanSharpening/include/otbFusionImageBase.h b/Modules/Fusion/PanSharpening/include/otbFusionImageBase.h
index b983ba896b..aef6003fa6 100644
--- a/Modules/Fusion/PanSharpening/include/otbFusionImageBase.h
+++ b/Modules/Fusion/PanSharpening/include/otbFusionImageBase.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbFusionImageBase_h
-#define __otbFusionImageBase_h
+#ifndef otbFusionImageBase_h
+#define otbFusionImageBase_h
 
 #include "itkTernaryFunctorImageFilter.h"
 #include "itkNumericTraits.h"
diff --git a/Modules/Fusion/PanSharpening/include/otbLmvmPanSharpeningFusionImageFilter.h b/Modules/Fusion/PanSharpening/include/otbLmvmPanSharpeningFusionImageFilter.h
index 6304757d47..f30c8c8525 100644
--- a/Modules/Fusion/PanSharpening/include/otbLmvmPanSharpeningFusionImageFilter.h
+++ b/Modules/Fusion/PanSharpening/include/otbLmvmPanSharpeningFusionImageFilter.h
@@ -18,8 +18,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbLmvmPanSharpeningFusionImageFilter_h
-#define __otbLmvmPanSharpeningFusionImageFilter_h
+#ifndef otbLmvmPanSharpeningFusionImageFilter_h
+#define otbLmvmPanSharpeningFusionImageFilter_h
 
 #include "otbConvolutionImageFilter.h"
 #include "itkUnaryFunctorImageFilter.h"
diff --git a/Modules/Fusion/PanSharpening/include/otbLmvmPanSharpeningFusionImageFilter.txx b/Modules/Fusion/PanSharpening/include/otbLmvmPanSharpeningFusionImageFilter.txx
index da08259963..2dee5c593f 100644
--- a/Modules/Fusion/PanSharpening/include/otbLmvmPanSharpeningFusionImageFilter.txx
+++ b/Modules/Fusion/PanSharpening/include/otbLmvmPanSharpeningFusionImageFilter.txx
@@ -18,8 +18,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbLmvmPanSharpeningFusionImageFilter_txx
-#define __otbLmvmPanSharpeningFusionImageFilter_txx
+#ifndef otbLmvmPanSharpeningFusionImageFilter_txx
+#define otbLmvmPanSharpeningFusionImageFilter_txx
 
 #include "otbLmvmPanSharpeningFusionImageFilter.h"
 
diff --git a/Modules/Fusion/PanSharpening/include/otbSimpleRcsPanSharpeningFusionImageFilter.h b/Modules/Fusion/PanSharpening/include/otbSimpleRcsPanSharpeningFusionImageFilter.h
index dcd58296ad..25e1470de6 100644
--- a/Modules/Fusion/PanSharpening/include/otbSimpleRcsPanSharpeningFusionImageFilter.h
+++ b/Modules/Fusion/PanSharpening/include/otbSimpleRcsPanSharpeningFusionImageFilter.h
@@ -18,8 +18,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbSimpleRcsPanSharpeningFusionImageFilter_h
-#define __otbSimpleRcsPanSharpeningFusionImageFilter_h
+#ifndef otbSimpleRcsPanSharpeningFusionImageFilter_h
+#define otbSimpleRcsPanSharpeningFusionImageFilter_h
 
 #include "otbConvolutionImageFilter.h"
 #include "otbImage.h"
diff --git a/Modules/Fusion/PanSharpening/include/otbSimpleRcsPanSharpeningFusionImageFilter.txx b/Modules/Fusion/PanSharpening/include/otbSimpleRcsPanSharpeningFusionImageFilter.txx
index 4f99e10e8e..be46021863 100644
--- a/Modules/Fusion/PanSharpening/include/otbSimpleRcsPanSharpeningFusionImageFilter.txx
+++ b/Modules/Fusion/PanSharpening/include/otbSimpleRcsPanSharpeningFusionImageFilter.txx
@@ -18,8 +18,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbSimpleRcsPanSharpeningFusionImageFilter_txx
-#define __otbSimpleRcsPanSharpeningFusionImageFilter_txx
+#ifndef otbSimpleRcsPanSharpeningFusionImageFilter_txx
+#define otbSimpleRcsPanSharpeningFusionImageFilter_txx
 
 #include "otbSimpleRcsPanSharpeningFusionImageFilter.h"
 
diff --git a/Modules/Hyperspectral/AnomalyDetection/include/otbLocalRxDetectorFilter.h b/Modules/Hyperspectral/AnomalyDetection/include/otbLocalRxDetectorFilter.h
index 8f4ba2cad7..a1b00a1f06 100644
--- a/Modules/Hyperspectral/AnomalyDetection/include/otbLocalRxDetectorFilter.h
+++ b/Modules/Hyperspectral/AnomalyDetection/include/otbLocalRxDetectorFilter.h
@@ -15,8 +15,8 @@
 
 =========================================================================*/
 
-#ifndef __otbLocalRxDetectorFilter_h
-#define __otbLocalRxDetectorFilter_h
+#ifndef otbLocalRxDetectorFilter_h
+#define otbLocalRxDetectorFilter_h
 
 #include "itkImageToImageFilter.h"
 
diff --git a/Modules/Hyperspectral/AnomalyDetection/include/otbLocalRxDetectorFilter.txx b/Modules/Hyperspectral/AnomalyDetection/include/otbLocalRxDetectorFilter.txx
index 09004b54dd..288e2a4662 100644
--- a/Modules/Hyperspectral/AnomalyDetection/include/otbLocalRxDetectorFilter.txx
+++ b/Modules/Hyperspectral/AnomalyDetection/include/otbLocalRxDetectorFilter.txx
@@ -15,8 +15,8 @@
 
 =========================================================================*/
 
-#ifndef __otbLocalRxDetectorFilter_txx
-#define __otbLocalRxDetectorFilter_txx
+#ifndef otbLocalRxDetectorFilter_txx
+#define otbLocalRxDetectorFilter_txx
 
 #include "otbLocalRxDetectorFilter.h"
 
diff --git a/Modules/Hyperspectral/AnomalyDetection/include/otbLocalRxDetectorNonThreadFilter.h b/Modules/Hyperspectral/AnomalyDetection/include/otbLocalRxDetectorNonThreadFilter.h
index e52011f183..39c665a309 100644
--- a/Modules/Hyperspectral/AnomalyDetection/include/otbLocalRxDetectorNonThreadFilter.h
+++ b/Modules/Hyperspectral/AnomalyDetection/include/otbLocalRxDetectorNonThreadFilter.h
@@ -15,8 +15,8 @@
 
 =========================================================================*/
 
-#ifndef __otbLocalRxDetectorNonThreadFilter_h
-#define __otbLocalRxDetectorNonThreadFilter_h
+#ifndef otbLocalRxDetectorNonThreadFilter_h
+#define otbLocalRxDetectorNonThreadFilter_h
 
 #include "itkImageToImageFilter.h"
 
diff --git a/Modules/Hyperspectral/AnomalyDetection/include/otbLocalRxDetectorNonThreadFilter.txx b/Modules/Hyperspectral/AnomalyDetection/include/otbLocalRxDetectorNonThreadFilter.txx
index 10fd32d4ce..d786477323 100644
--- a/Modules/Hyperspectral/AnomalyDetection/include/otbLocalRxDetectorNonThreadFilter.txx
+++ b/Modules/Hyperspectral/AnomalyDetection/include/otbLocalRxDetectorNonThreadFilter.txx
@@ -15,8 +15,8 @@
 
 =========================================================================*/
 
-#ifndef __otbLocalRxDetectorNonThreadFilter_txx
-#define __otbLocalRxDetectorNonThreadFilter_txx
+#ifndef otbLocalRxDetectorNonThreadFilter_txx
+#define otbLocalRxDetectorNonThreadFilter_txx
 
 #include "otbLocalRxDetectorNonThreadFilter.h"
 
diff --git a/Modules/Hyperspectral/EndmembersExtraction/include/otbEigenvalueLikelihoodMaximisation.h b/Modules/Hyperspectral/EndmembersExtraction/include/otbEigenvalueLikelihoodMaximisation.h
index 0390b099e5..ad30119c02 100644
--- a/Modules/Hyperspectral/EndmembersExtraction/include/otbEigenvalueLikelihoodMaximisation.h
+++ b/Modules/Hyperspectral/EndmembersExtraction/include/otbEigenvalueLikelihoodMaximisation.h
@@ -18,8 +18,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbEigenvalueLikelihoodMaximisation_h
-#define __otbEigenvalueLikelihoodMaximisation_h
+#ifndef otbEigenvalueLikelihoodMaximisation_h
+#define otbEigenvalueLikelihoodMaximisation_h
 
 #include "itkObjectFactory.h"
 #include "itkLightObject.h"
diff --git a/Modules/Hyperspectral/EndmembersExtraction/include/otbEigenvalueLikelihoodMaximisation.txx b/Modules/Hyperspectral/EndmembersExtraction/include/otbEigenvalueLikelihoodMaximisation.txx
index cf49434cb8..4b28047c4e 100644
--- a/Modules/Hyperspectral/EndmembersExtraction/include/otbEigenvalueLikelihoodMaximisation.txx
+++ b/Modules/Hyperspectral/EndmembersExtraction/include/otbEigenvalueLikelihoodMaximisation.txx
@@ -18,8 +18,8 @@ for details.
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbEigenvalueLikelihoodMaximisation_txx
-#define __otbEigenvalueLikelihoodMaximisation_txx
+#ifndef otbEigenvalueLikelihoodMaximisation_txx
+#define otbEigenvalueLikelihoodMaximisation_txx
 
 #include "otbEigenvalueLikelihoodMaximisation.h"
 
diff --git a/Modules/Hyperspectral/EndmembersExtraction/include/otbVcaImageFilter.h b/Modules/Hyperspectral/EndmembersExtraction/include/otbVcaImageFilter.h
index c07b06cf2f..080d023d89 100644
--- a/Modules/Hyperspectral/EndmembersExtraction/include/otbVcaImageFilter.h
+++ b/Modules/Hyperspectral/EndmembersExtraction/include/otbVcaImageFilter.h
@@ -18,8 +18,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbVCAImageFilter_h
-#define __otbVCAImageFilter_h
+#ifndef otbVCAImageFilter_h
+#define otbVCAImageFilter_h
 
 #include "otbImage.h"
 #include "itkUnaryFunctorImageFilter.h"
@@ -136,4 +136,4 @@ private:
 
 #include "otbVcaImageFilter.txx"
 
-#endif /* __otbVCAImageFilter_h */
+#endif /* otbVCAImageFilter_h */
diff --git a/Modules/Hyperspectral/EndmembersExtraction/include/otbVcaImageFilter.txx b/Modules/Hyperspectral/EndmembersExtraction/include/otbVcaImageFilter.txx
index 0987179c6b..401594d326 100644
--- a/Modules/Hyperspectral/EndmembersExtraction/include/otbVcaImageFilter.txx
+++ b/Modules/Hyperspectral/EndmembersExtraction/include/otbVcaImageFilter.txx
@@ -18,8 +18,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbVCAImageFilter_txx
-#define __otbVCAImageFilter_txx
+#ifndef otbVCAImageFilter_txx
+#define otbVCAImageFilter_txx
 
 #include "otbVcaImageFilter.h"
 #include "otbStandardWriterWatcher.h"
diff --git a/Modules/Hyperspectral/EndmembersExtraction/include/otbVirtualDimensionality.h b/Modules/Hyperspectral/EndmembersExtraction/include/otbVirtualDimensionality.h
index f5c130dc5d..fbc72a6027 100644
--- a/Modules/Hyperspectral/EndmembersExtraction/include/otbVirtualDimensionality.h
+++ b/Modules/Hyperspectral/EndmembersExtraction/include/otbVirtualDimensionality.h
@@ -18,8 +18,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbVirtualDimensionality_h
-#define __otbVirtualDimensionality_h
+#ifndef otbVirtualDimensionality_h
+#define otbVirtualDimensionality_h
 
 #include "itkObjectFactory.h"
 #include "itkLightObject.h"
diff --git a/Modules/Hyperspectral/EndmembersExtraction/include/otbVirtualDimensionality.txx b/Modules/Hyperspectral/EndmembersExtraction/include/otbVirtualDimensionality.txx
index c9892f0f7b..ee01654412 100644
--- a/Modules/Hyperspectral/EndmembersExtraction/include/otbVirtualDimensionality.txx
+++ b/Modules/Hyperspectral/EndmembersExtraction/include/otbVirtualDimensionality.txx
@@ -18,8 +18,8 @@ for details.
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbVirtualDimensionality_txx
-#define __otbVirtualDimensionality_txx
+#ifndef otbVirtualDimensionality_txx
+#define otbVirtualDimensionality_txx
 
 #include "otbVirtualDimensionality.h"
 
diff --git a/Modules/Hyperspectral/Unmixing/include/otbISRAUnmixingImageFilter.h b/Modules/Hyperspectral/Unmixing/include/otbISRAUnmixingImageFilter.h
index 6e6a5d3b98..b44458cc9f 100644
--- a/Modules/Hyperspectral/Unmixing/include/otbISRAUnmixingImageFilter.h
+++ b/Modules/Hyperspectral/Unmixing/include/otbISRAUnmixingImageFilter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbISRAUnmixingImageFilter_h
-#define __otbISRAUnmixingImageFilter_h
+#ifndef otbISRAUnmixingImageFilter_h
+#define otbISRAUnmixingImageFilter_h
 
 #include "itkNumericTraits.h"
 #include "otbUnaryFunctorImageFilter.h"
diff --git a/Modules/Hyperspectral/Unmixing/include/otbISRAUnmixingImageFilter.txx b/Modules/Hyperspectral/Unmixing/include/otbISRAUnmixingImageFilter.txx
index a8e71af5cc..73be208c1c 100644
--- a/Modules/Hyperspectral/Unmixing/include/otbISRAUnmixingImageFilter.txx
+++ b/Modules/Hyperspectral/Unmixing/include/otbISRAUnmixingImageFilter.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbISRAUnmixingImageFilter_txx
-#define __otbISRAUnmixingImageFilter_txx
+#ifndef otbISRAUnmixingImageFilter_txx
+#define otbISRAUnmixingImageFilter_txx
 
 #include "otbISRAUnmixingImageFilter.h"
 #include <algorithm>
diff --git a/Modules/Hyperspectral/Unmixing/include/otbMDMDNMFImageFilter.h b/Modules/Hyperspectral/Unmixing/include/otbMDMDNMFImageFilter.h
index b60a49658a..bfd974692b 100644
--- a/Modules/Hyperspectral/Unmixing/include/otbMDMDNMFImageFilter.h
+++ b/Modules/Hyperspectral/Unmixing/include/otbMDMDNMFImageFilter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbMDMDNMFImageFilter_h
-#define __otbMDMDNMFImageFilter_h
+#ifndef otbMDMDNMFImageFilter_h
+#define otbMDMDNMFImageFilter_h
 
 #include "itkImageToImageFilter.h"
 #include "otbVectorImageToMatrixImageFilter.h"
diff --git a/Modules/Hyperspectral/Unmixing/include/otbMDMDNMFImageFilter.txx b/Modules/Hyperspectral/Unmixing/include/otbMDMDNMFImageFilter.txx
index 2a2a030b36..0bd9cd8b53 100644
--- a/Modules/Hyperspectral/Unmixing/include/otbMDMDNMFImageFilter.txx
+++ b/Modules/Hyperspectral/Unmixing/include/otbMDMDNMFImageFilter.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbMDMDNMFImageFilter_txx
-#define __otbMDMDNMFImageFilter_txx
+#ifndef otbMDMDNMFImageFilter_txx
+#define otbMDMDNMFImageFilter_txx
 
 #include "otbMDMDNMFImageFilter.h"
 
diff --git a/Modules/Hyperspectral/Unmixing/include/otbNCLSUnmixingImageFilter.h b/Modules/Hyperspectral/Unmixing/include/otbNCLSUnmixingImageFilter.h
index 40c4cb5b2d..563b0ab942 100644
--- a/Modules/Hyperspectral/Unmixing/include/otbNCLSUnmixingImageFilter.h
+++ b/Modules/Hyperspectral/Unmixing/include/otbNCLSUnmixingImageFilter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbNCLSUnmixingImageFilter_h
-#define __otbNCLSUnmixingImageFilter_h
+#ifndef otbNCLSUnmixingImageFilter_h
+#define otbNCLSUnmixingImageFilter_h
 
 #include "itkMacro.h"
 #include "itkNumericTraits.h"
diff --git a/Modules/Hyperspectral/Unmixing/include/otbNCLSUnmixingImageFilter.txx b/Modules/Hyperspectral/Unmixing/include/otbNCLSUnmixingImageFilter.txx
index 7c7a201914..6f696b183f 100644
--- a/Modules/Hyperspectral/Unmixing/include/otbNCLSUnmixingImageFilter.txx
+++ b/Modules/Hyperspectral/Unmixing/include/otbNCLSUnmixingImageFilter.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbNCLSUnmixingImageFilter_txx
-#define __otbNCLSUnmixingImageFilter_txx
+#ifndef otbNCLSUnmixingImageFilter_txx
+#define otbNCLSUnmixingImageFilter_txx
 
 #include "otbNCLSUnmixingImageFilter.h"
 #include <algorithm>
diff --git a/Modules/Hyperspectral/Unmixing/include/otbSparseUnmixingImageFilter.h b/Modules/Hyperspectral/Unmixing/include/otbSparseUnmixingImageFilter.h
index d43b6413b1..64f22bd47a 100644
--- a/Modules/Hyperspectral/Unmixing/include/otbSparseUnmixingImageFilter.h
+++ b/Modules/Hyperspectral/Unmixing/include/otbSparseUnmixingImageFilter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbSparseUnmixingImageFilter_h
-#define __otbSparseUnmixingImageFilter_h
+#ifndef otbSparseUnmixingImageFilter_h
+#define otbSparseUnmixingImageFilter_h
 
 #include "itkListSample.h"
 #include "itkHistogram.h"
diff --git a/Modules/Hyperspectral/Unmixing/include/otbSparseUnmixingImageFilter.txx b/Modules/Hyperspectral/Unmixing/include/otbSparseUnmixingImageFilter.txx
index ceadc2e6b1..830cd37e31 100644
--- a/Modules/Hyperspectral/Unmixing/include/otbSparseUnmixingImageFilter.txx
+++ b/Modules/Hyperspectral/Unmixing/include/otbSparseUnmixingImageFilter.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbSparseUnmixingImageFilter_txx
-#define __otbSparseUnmixingImageFilter_txx
+#ifndef otbSparseUnmixingImageFilter_txx
+#define otbSparseUnmixingImageFilter_txx
 
 #include "otbSparseUnmixingImageFilter.h"
 
diff --git a/Modules/Hyperspectral/Unmixing/include/otbUnConstrainedLeastSquareImageFilter.h b/Modules/Hyperspectral/Unmixing/include/otbUnConstrainedLeastSquareImageFilter.h
index ffa75b2a7b..58099595c8 100644
--- a/Modules/Hyperspectral/Unmixing/include/otbUnConstrainedLeastSquareImageFilter.h
+++ b/Modules/Hyperspectral/Unmixing/include/otbUnConstrainedLeastSquareImageFilter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbUnConstrainedLeastSquareImageFilter_h
-#define __otbUnConstrainedLeastSquareImageFilter_h
+#ifndef otbUnConstrainedLeastSquareImageFilter_h
+#define otbUnConstrainedLeastSquareImageFilter_h
 
 #include "itkMacro.h"
 #include "otbUnaryFunctorImageFilter.h"
diff --git a/Modules/Hyperspectral/Unmixing/include/otbUnConstrainedLeastSquareImageFilter.txx b/Modules/Hyperspectral/Unmixing/include/otbUnConstrainedLeastSquareImageFilter.txx
index 268af36187..663b02fbdc 100644
--- a/Modules/Hyperspectral/Unmixing/include/otbUnConstrainedLeastSquareImageFilter.txx
+++ b/Modules/Hyperspectral/Unmixing/include/otbUnConstrainedLeastSquareImageFilter.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbUnConstrainedLeastSquareImageFilter_txx
-#define __otbUnConstrainedLeastSquareImageFilter_txx
+#ifndef otbUnConstrainedLeastSquareImageFilter_txx
+#define otbUnConstrainedLeastSquareImageFilter_txx
 
 #include "otbUnConstrainedLeastSquareImageFilter.h"
 
diff --git a/Modules/IO/Carto/include/otbCoordinateToName.h b/Modules/IO/Carto/include/otbCoordinateToName.h
index 3ddf428083..952e27cc23 100644
--- a/Modules/IO/Carto/include/otbCoordinateToName.h
+++ b/Modules/IO/Carto/include/otbCoordinateToName.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbCoordinateToName_h
-#define __otbCoordinateToName_h
+#ifndef otbCoordinateToName_h
+#define otbCoordinateToName_h
 
 #include "itkPoint.h"
 #include "itkMultiThreader.h"
diff --git a/Modules/IO/Carto/include/otbImageToOSMVectorDataGenerator.h b/Modules/IO/Carto/include/otbImageToOSMVectorDataGenerator.h
index 00100ba887..77665ad81f 100644
--- a/Modules/IO/Carto/include/otbImageToOSMVectorDataGenerator.h
+++ b/Modules/IO/Carto/include/otbImageToOSMVectorDataGenerator.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbImageToOSMVectorDataGenerator_h
-#define __otbImageToOSMVectorDataGenerator_h
+#ifndef otbImageToOSMVectorDataGenerator_h
+#define otbImageToOSMVectorDataGenerator_h
 
 #include "otbOSMDataToVectorDataGenerator.h"
 
diff --git a/Modules/IO/Carto/include/otbImageToOSMVectorDataGenerator.txx b/Modules/IO/Carto/include/otbImageToOSMVectorDataGenerator.txx
index 87f2ec062a..e8da8dedef 100644
--- a/Modules/IO/Carto/include/otbImageToOSMVectorDataGenerator.txx
+++ b/Modules/IO/Carto/include/otbImageToOSMVectorDataGenerator.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbImageToOSMVectorDataGenerator_txx
-#define __otbImageToOSMVectorDataGenerator_txx
+#ifndef otbImageToOSMVectorDataGenerator_txx
+#define otbImageToOSMVectorDataGenerator_txx
 
 #include "otbImageToOSMVectorDataGenerator.h"
 #include "otbGeoInformationConversion.h"
diff --git a/Modules/IO/Carto/include/otbMapFileProductWriter.h b/Modules/IO/Carto/include/otbMapFileProductWriter.h
index f5625e04ef..c180daf23d 100644
--- a/Modules/IO/Carto/include/otbMapFileProductWriter.h
+++ b/Modules/IO/Carto/include/otbMapFileProductWriter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbMapFileProductWriter_h
-#define __otbMapFileProductWriter_h
+#ifndef otbMapFileProductWriter_h
+#define otbMapFileProductWriter_h
 
 #include <fstream>
 
diff --git a/Modules/IO/Carto/include/otbMapFileProductWriter.txx b/Modules/IO/Carto/include/otbMapFileProductWriter.txx
index d6e84cda4d..da8f09e847 100644
--- a/Modules/IO/Carto/include/otbMapFileProductWriter.txx
+++ b/Modules/IO/Carto/include/otbMapFileProductWriter.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbMapFileProductWriter_txx
-#define __otbMapFileProductWriter_txx
+#ifndef otbMapFileProductWriter_txx
+#define otbMapFileProductWriter_txx
 
 #include "otbMapFileProductWriter.h"
 #include "itksys/SystemTools.hxx"
diff --git a/Modules/IO/Carto/include/otbOSMDataToVectorDataGenerator.h b/Modules/IO/Carto/include/otbOSMDataToVectorDataGenerator.h
index 8b207173c3..a58f0a331e 100644
--- a/Modules/IO/Carto/include/otbOSMDataToVectorDataGenerator.h
+++ b/Modules/IO/Carto/include/otbOSMDataToVectorDataGenerator.h
@@ -16,8 +16,8 @@
 
 =========================================================================*/
 
-#ifndef __otbOSMDataToVectorDataGenerator_h
-#define __otbOSMDataToVectorDataGenerator_h
+#ifndef otbOSMDataToVectorDataGenerator_h
+#define otbOSMDataToVectorDataGenerator_h
 
 // store the nodes (points) coordinates
 #include <map>
diff --git a/Modules/IO/Carto/include/otbPlaceNameToLonLat.h b/Modules/IO/Carto/include/otbPlaceNameToLonLat.h
index aa141ded0c..1587e817ee 100644
--- a/Modules/IO/Carto/include/otbPlaceNameToLonLat.h
+++ b/Modules/IO/Carto/include/otbPlaceNameToLonLat.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbPlaceNameToLonLat_h
-#define __otbPlaceNameToLonLat_h
+#ifndef otbPlaceNameToLonLat_h
+#define otbPlaceNameToLonLat_h
 
 #include "otbCurlHelperInterface.h"
 
diff --git a/Modules/IO/Carto/include/otbWorldFile.h b/Modules/IO/Carto/include/otbWorldFile.h
index d70e473e8e..77624276b5 100644
--- a/Modules/IO/Carto/include/otbWorldFile.h
+++ b/Modules/IO/Carto/include/otbWorldFile.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbWorldFile_h
-#define __otbWorldFile_h
+#ifndef otbWorldFile_h
+#define otbWorldFile_h
 
 #include <iomanip>
 #include <fstream>
diff --git a/Modules/IO/ExtendedFilename/include/otbExtendedFilenameHelper.h b/Modules/IO/ExtendedFilename/include/otbExtendedFilenameHelper.h
index 873c41301e..910d1068fb 100644
--- a/Modules/IO/ExtendedFilename/include/otbExtendedFilenameHelper.h
+++ b/Modules/IO/ExtendedFilename/include/otbExtendedFilenameHelper.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbExtendedFilenameHelper_h
-#define __otbExtendedFilenameHelper_h
+#ifndef otbExtendedFilenameHelper_h
+#define otbExtendedFilenameHelper_h
 
 #include "itkObject.h"
 #include "itkObjectFactory.h"
@@ -68,4 +68,4 @@ private:
 };
 } // end namespace otb
 
-#endif // __otbExtendedFilenameHelper_h
+#endif // otbExtendedFilenameHelper_h
diff --git a/Modules/IO/ExtendedFilename/include/otbExtendedFilenameToReaderOptions.h b/Modules/IO/ExtendedFilename/include/otbExtendedFilenameToReaderOptions.h
index afd89f11f6..7dc33dbecd 100644
--- a/Modules/IO/ExtendedFilename/include/otbExtendedFilenameToReaderOptions.h
+++ b/Modules/IO/ExtendedFilename/include/otbExtendedFilenameToReaderOptions.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbExtendedFilenameToReaderOptions_h
-#define __otbExtendedFilenameToReaderOptions_h
+#ifndef otbExtendedFilenameToReaderOptions_h
+#define otbExtendedFilenameToReaderOptions_h
 
 #include "otbExtendedFilenameHelper.h"
 
@@ -99,4 +99,4 @@ private:
 };
 } // end namespace otb
 
-#endif // __otbExtendedFilenameToReaderOptions_h
+#endif // otbExtendedFilenameToReaderOptions_h
diff --git a/Modules/IO/ExtendedFilename/include/otbExtendedFilenameToWriterOptions.h b/Modules/IO/ExtendedFilename/include/otbExtendedFilenameToWriterOptions.h
index 12dca4a8a6..994a9e3791 100644
--- a/Modules/IO/ExtendedFilename/include/otbExtendedFilenameToWriterOptions.h
+++ b/Modules/IO/ExtendedFilename/include/otbExtendedFilenameToWriterOptions.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbExtendedFilenameToWriterOptions_h
-#define __otbExtendedFilenameToWriterOptions_h
+#ifndef otbExtendedFilenameToWriterOptions_h
+#define otbExtendedFilenameToWriterOptions_h
 
 #include "otbExtendedFilenameHelper.h"
 #include "otbGDALImageIO.h"
@@ -108,4 +108,4 @@ private:
 };
 } // end namespace otb
 
-#endif // __otbExtendedFilenameToWriterOptions_h
+#endif // otbExtendedFilenameToWriterOptions_h
diff --git a/Modules/IO/IOBSQ/include/otbBSQImageIO.h b/Modules/IO/IOBSQ/include/otbBSQImageIO.h
index 09b8844680..548aa31de6 100644
--- a/Modules/IO/IOBSQ/include/otbBSQImageIO.h
+++ b/Modules/IO/IOBSQ/include/otbBSQImageIO.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbBSQImageIO_h
-#define __otbBSQImageIO_h
+#ifndef otbBSQImageIO_h
+#define otbBSQImageIO_h
 
 #include <fstream>
 #include <string>
@@ -183,4 +183,4 @@ private:
 
 } // end namespace otb
 
-#endif // __otbBSQImageIO_h
+#endif // otbBSQImageIO_h
diff --git a/Modules/IO/IOBSQ/include/otbBSQImageIOFactory.h b/Modules/IO/IOBSQ/include/otbBSQImageIOFactory.h
index d19c3f5530..4233c7a8bd 100644
--- a/Modules/IO/IOBSQ/include/otbBSQImageIOFactory.h
+++ b/Modules/IO/IOBSQ/include/otbBSQImageIOFactory.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbBSQImageIOFactory_h
-#define __otbBSQImageIOFactory_h
+#ifndef otbBSQImageIOFactory_h
+#define otbBSQImageIOFactory_h
 
 #include "itkObjectFactoryBase.h"
 
diff --git a/Modules/IO/IOGDAL/include/otbGDALImageIO.h b/Modules/IO/IOGDAL/include/otbGDALImageIO.h
index 5f3cc815e1..83ed3bf5a2 100644
--- a/Modules/IO/IOGDAL/include/otbGDALImageIO.h
+++ b/Modules/IO/IOGDAL/include/otbGDALImageIO.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbGDALImageIO_h
-#define __otbGDALImageIO_h
+#ifndef otbGDALImageIO_h
+#define otbGDALImageIO_h
 
 
 /* C++ Libraries */
@@ -278,4 +278,4 @@ private:
 
 } // end namespace otb
 
-#endif // __otbGDALImageIO_h
+#endif // otbGDALImageIO_h
diff --git a/Modules/IO/IOGDAL/include/otbGDALImageIOFactory.h b/Modules/IO/IOGDAL/include/otbGDALImageIOFactory.h
index f78784694c..c32302b131 100644
--- a/Modules/IO/IOGDAL/include/otbGDALImageIOFactory.h
+++ b/Modules/IO/IOGDAL/include/otbGDALImageIOFactory.h
@@ -16,8 +16,8 @@
 
 =========================================================================*/
 
-#ifndef __otbGDALImageIOFactory_h
-#define __otbGDALImageIOFactory_h
+#ifndef otbGDALImageIOFactory_h
+#define otbGDALImageIOFactory_h
 
 #include "itkObjectFactoryBase.h"
 
diff --git a/Modules/IO/IOGDAL/include/otbOGRIOHelper.h b/Modules/IO/IOGDAL/include/otbOGRIOHelper.h
index a09ae724a5..f15b8186c8 100644
--- a/Modules/IO/IOGDAL/include/otbOGRIOHelper.h
+++ b/Modules/IO/IOGDAL/include/otbOGRIOHelper.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbOGRIOHelper_h
-#define __otbOGRIOHelper_h
+#ifndef otbOGRIOHelper_h
+#define otbOGRIOHelper_h
 
 #include <vector>
 
diff --git a/Modules/IO/IOGDAL/include/otbOGRVectorDataIO.h b/Modules/IO/IOGDAL/include/otbOGRVectorDataIO.h
index 0c3b0b5c67..39067cf082 100644
--- a/Modules/IO/IOGDAL/include/otbOGRVectorDataIO.h
+++ b/Modules/IO/IOGDAL/include/otbOGRVectorDataIO.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbOGRVectorDataIO_h
-#define __otbOGRVectorDataIO_h
+#ifndef otbOGRVectorDataIO_h
+#define otbOGRVectorDataIO_h
 
 #include <string>
 #include <cassert>
@@ -124,4 +124,4 @@ private:
 
 } // end namespace otb
 
-#endif // __otbOGRVectorDataIO_h
+#endif // otbOGRVectorDataIO_h
diff --git a/Modules/IO/IOGDAL/include/otbOGRVectorDataIOFactory.h b/Modules/IO/IOGDAL/include/otbOGRVectorDataIOFactory.h
index 69dd784f3f..3a414b6371 100644
--- a/Modules/IO/IOGDAL/include/otbOGRVectorDataIOFactory.h
+++ b/Modules/IO/IOGDAL/include/otbOGRVectorDataIOFactory.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbOGRVectorDataIOFactory_h
-#define __otbOGRVectorDataIOFactory_h
+#ifndef otbOGRVectorDataIOFactory_h
+#define otbOGRVectorDataIOFactory_h
 
 #include "itkObjectFactoryBase.h"
 
diff --git a/Modules/IO/IOJPEG2000/include/otbJPEG2000ImageIO.h b/Modules/IO/IOJPEG2000/include/otbJPEG2000ImageIO.h
index 8a0009c403..d5b19bcad9 100644
--- a/Modules/IO/IOJPEG2000/include/otbJPEG2000ImageIO.h
+++ b/Modules/IO/IOJPEG2000/include/otbJPEG2000ImageIO.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbJPEG2000ImageIO_h
-#define __otbJPEG2000ImageIO_h
+#ifndef otbJPEG2000ImageIO_h
+#define otbJPEG2000ImageIO_h
 
 #include "otbImageIOBase.h"
 #include "itkMultiThreader.h"
@@ -172,4 +172,4 @@ private:
 
 } // end namespace otb
 
-#endif // __otbJPEG2000ImageIO_h
+#endif // otbJPEG2000ImageIO_h
diff --git a/Modules/IO/IOJPEG2000/include/otbJPEG2000ImageIOFactory.h b/Modules/IO/IOJPEG2000/include/otbJPEG2000ImageIOFactory.h
index 27c327315c..5a284580c0 100644
--- a/Modules/IO/IOJPEG2000/include/otbJPEG2000ImageIOFactory.h
+++ b/Modules/IO/IOJPEG2000/include/otbJPEG2000ImageIOFactory.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbJPEG2000ImageIOFactory_h
-#define __otbJPEG2000ImageIOFactory_h
+#ifndef otbJPEG2000ImageIOFactory_h
+#define otbJPEG2000ImageIOFactory_h
 
 #include "itkObjectFactoryBase.h"
 
diff --git a/Modules/IO/IOKML/include/otbKMLVectorDataIO.h b/Modules/IO/IOKML/include/otbKMLVectorDataIO.h
index 741f27d08b..ddbed80312 100644
--- a/Modules/IO/IOKML/include/otbKMLVectorDataIO.h
+++ b/Modules/IO/IOKML/include/otbKMLVectorDataIO.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbKMLVectorDataIO_h
-#define __otbKMLVectorDataIO_h
+#ifndef otbKMLVectorDataIO_h
+#define otbKMLVectorDataIO_h
 
 #include <string>
 
@@ -143,4 +143,4 @@ private:
 
 } // end namespace otb
 
-#endif // __otbKMLVectorDataIO_h
+#endif // otbKMLVectorDataIO_h
diff --git a/Modules/IO/IOKML/include/otbKMLVectorDataIOFactory.h b/Modules/IO/IOKML/include/otbKMLVectorDataIOFactory.h
index f5f7c496d1..4155d5b883 100644
--- a/Modules/IO/IOKML/include/otbKMLVectorDataIOFactory.h
+++ b/Modules/IO/IOKML/include/otbKMLVectorDataIOFactory.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbKMLVectorDataIOFactory_h
-#define __otbKMLVectorDataIOFactory_h
+#ifndef otbKMLVectorDataIOFactory_h
+#define otbKMLVectorDataIOFactory_h
 
 #include "itkObjectFactoryBase.h"
 
diff --git a/Modules/IO/IOLUM/include/otbLUMImageIO.h b/Modules/IO/IOLUM/include/otbLUMImageIO.h
index 6df6f273a3..c737370124 100644
--- a/Modules/IO/IOLUM/include/otbLUMImageIO.h
+++ b/Modules/IO/IOLUM/include/otbLUMImageIO.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbLUMImageIO_h
-#define __otbLUMImageIO_h
+#ifndef otbLUMImageIO_h
+#define otbLUMImageIO_h
 
 #include "otbImageIOBase.h"
 #include <fstream>
@@ -192,4 +192,4 @@ private:
 
 } // end namespace otb
 
-#endif // __otbLUMImageIO_h
+#endif // otbLUMImageIO_h
diff --git a/Modules/IO/IOLUM/include/otbLUMImageIOFactory.h b/Modules/IO/IOLUM/include/otbLUMImageIOFactory.h
index 33d6880c0f..d82cdf0009 100644
--- a/Modules/IO/IOLUM/include/otbLUMImageIOFactory.h
+++ b/Modules/IO/IOLUM/include/otbLUMImageIOFactory.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbLUMImageIOFactory_h
-#define __otbLUMImageIOFactory_h
+#ifndef otbLUMImageIOFactory_h
+#define otbLUMImageIOFactory_h
 
 #include "itkObjectFactoryBase.h"
 
diff --git a/Modules/IO/IOMSTAR/include/otbMSTARImageIO.h b/Modules/IO/IOMSTAR/include/otbMSTARImageIO.h
index f421cad501..5089e33701 100644
--- a/Modules/IO/IOMSTAR/include/otbMSTARImageIO.h
+++ b/Modules/IO/IOMSTAR/include/otbMSTARImageIO.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbMSTARImageIO_h
-#define __otbMSTARImageIO_h
+#ifndef otbMSTARImageIO_h
+#define otbMSTARImageIO_h
 
 #include "otbImageIOBase.h"
 
@@ -155,4 +155,4 @@ private:
 
 } // end namespace otb
 
-#endif // __otbMSTARImageIO_h
+#endif // otbMSTARImageIO_h
diff --git a/Modules/IO/IOMSTAR/include/otbMSTARImageIOFactory.h b/Modules/IO/IOMSTAR/include/otbMSTARImageIOFactory.h
index b5d5bb2ba8..d77c1a0bda 100644
--- a/Modules/IO/IOMSTAR/include/otbMSTARImageIOFactory.h
+++ b/Modules/IO/IOMSTAR/include/otbMSTARImageIOFactory.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbMSTARImageIOFactory_h
-#define __otbMSTARImageIOFactory_h
+#ifndef otbMSTARImageIOFactory_h
+#define otbMSTARImageIOFactory_h
 
 #include "itkObjectFactoryBase.h"
 
diff --git a/Modules/IO/IOMW/include/otbMWImageIO.h b/Modules/IO/IOMW/include/otbMWImageIO.h
index 41fd845b9c..8d1aafb5d4 100644
--- a/Modules/IO/IOMW/include/otbMWImageIO.h
+++ b/Modules/IO/IOMW/include/otbMWImageIO.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbMWImageIO_h
-#define __otbMWImageIO_h
+#ifndef otbMWImageIO_h
+#define otbMWImageIO_h
 
 #include "otbImageIOBase.h"
 #include <fstream>
@@ -184,4 +184,4 @@ private:
 
 } // end namespace otb
 
-#endif // __otbMWImageIO_h
+#endif // otbMWImageIO_h
diff --git a/Modules/IO/IOMW/include/otbMWImageIOFactory.h b/Modules/IO/IOMW/include/otbMWImageIOFactory.h
index e869cb9492..261cb79636 100644
--- a/Modules/IO/IOMW/include/otbMWImageIOFactory.h
+++ b/Modules/IO/IOMW/include/otbMWImageIOFactory.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbMWImageIOFactory_h
-#define __otbMWImageIOFactory_h
+#ifndef otbMWImageIOFactory_h
+#define otbMWImageIOFactory_h
 
 #include "itkObjectFactoryBase.h"
 
diff --git a/Modules/IO/IOONERA/include/otbONERAImageIO.h b/Modules/IO/IOONERA/include/otbONERAImageIO.h
index 2c216323a5..394b27ff63 100644
--- a/Modules/IO/IOONERA/include/otbONERAImageIO.h
+++ b/Modules/IO/IOONERA/include/otbONERAImageIO.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbONERAImageIO_h
-#define __otbONERAImageIO_h
+#ifndef otbONERAImageIO_h
+#define otbONERAImageIO_h
 
 #include "itkByteSwapper.h"
 #include "otbImageIOBase.h"
@@ -188,4 +188,4 @@ private:
 
 } // end namespace otb
 
-#endif // __otbONERAImageIO_h
+#endif // otbONERAImageIO_h
diff --git a/Modules/IO/IOONERA/include/otbONERAImageIOFactory.h b/Modules/IO/IOONERA/include/otbONERAImageIOFactory.h
index 3e1dde8d5d..b1ffd7501e 100644
--- a/Modules/IO/IOONERA/include/otbONERAImageIOFactory.h
+++ b/Modules/IO/IOONERA/include/otbONERAImageIOFactory.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbONERAImageIOFactory_h
-#define __otbONERAImageIOFactory_h
+#ifndef otbONERAImageIOFactory_h
+#define otbONERAImageIOFactory_h
 
 #include "itkObjectFactoryBase.h"
 
diff --git a/Modules/IO/IORAD/include/otbRADImageIO.h b/Modules/IO/IORAD/include/otbRADImageIO.h
index 50d8e1d031..3f3e3cd41d 100644
--- a/Modules/IO/IORAD/include/otbRADImageIO.h
+++ b/Modules/IO/IORAD/include/otbRADImageIO.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbRADImageIO_h
-#define __otbRADImageIO_h
+#ifndef otbRADImageIO_h
+#define otbRADImageIO_h
 
 #include "otbImageIOBase.h"
 #include <fstream>
@@ -185,4 +185,4 @@ private:
 
 } // end namespace otb
 
-#endif // __otbRADImageIO_h
+#endif // otbRADImageIO_h
diff --git a/Modules/IO/IORAD/include/otbRADImageIOFactory.h b/Modules/IO/IORAD/include/otbRADImageIOFactory.h
index 79c27b508e..0fa2c7ab3e 100644
--- a/Modules/IO/IORAD/include/otbRADImageIOFactory.h
+++ b/Modules/IO/IORAD/include/otbRADImageIOFactory.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbRADImageIOFactory_h
-#define __otbRADImageIOFactory_h
+#ifndef otbRADImageIOFactory_h
+#define otbRADImageIOFactory_h
 
 #include "itkObjectFactoryBase.h"
 
diff --git a/Modules/IO/IOTileMap/include/otbTileMapImageIO.h b/Modules/IO/IOTileMap/include/otbTileMapImageIO.h
index 7fcf93252d..63cace866a 100644
--- a/Modules/IO/IOTileMap/include/otbTileMapImageIO.h
+++ b/Modules/IO/IOTileMap/include/otbTileMapImageIO.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbTileMapImageIO_h
-#define __otbTileMapImageIO_h
+#ifndef otbTileMapImageIO_h
+#define otbTileMapImageIO_h
 
 
 /* C++ Libraries */
@@ -225,4 +225,4 @@ private:
 
 } // end namespace otb
 
-#endif // __otbTileMapImageIO_h
+#endif // otbTileMapImageIO_h
diff --git a/Modules/IO/IOTileMap/include/otbTileMapImageIOFactory.h b/Modules/IO/IOTileMap/include/otbTileMapImageIOFactory.h
index 4cf6d48003..eb934255b0 100644
--- a/Modules/IO/IOTileMap/include/otbTileMapImageIOFactory.h
+++ b/Modules/IO/IOTileMap/include/otbTileMapImageIOFactory.h
@@ -16,8 +16,8 @@
 
 =========================================================================*/
 
-#ifndef __otbTileMapImageIOFactory_h
-#define __otbTileMapImageIOFactory_h
+#ifndef otbTileMapImageIOFactory_h
+#define otbTileMapImageIOFactory_h
 
 #include "itkObjectFactoryBase.h"
 
diff --git a/Modules/IO/IOTileMap/include/otbTileMapImageIOHelper.h b/Modules/IO/IOTileMap/include/otbTileMapImageIOHelper.h
index a12d39e2eb..e4f645cb37 100644
--- a/Modules/IO/IOTileMap/include/otbTileMapImageIOHelper.h
+++ b/Modules/IO/IOTileMap/include/otbTileMapImageIOHelper.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbTileMapImageIOHelper_h
-#define __otbTileMapImageIOHelper_h
+#ifndef otbTileMapImageIOHelper_h
+#define otbTileMapImageIOHelper_h
 
 
 #include "itkObject.h"
diff --git a/Modules/IO/IOXML/include/otbStatisticsXMLFileReader.h b/Modules/IO/IOXML/include/otbStatisticsXMLFileReader.h
index 0755563e11..371b8b40e8 100644
--- a/Modules/IO/IOXML/include/otbStatisticsXMLFileReader.h
+++ b/Modules/IO/IOXML/include/otbStatisticsXMLFileReader.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbStatisticsXMLFileReader_h
-#define __otbStatisticsXMLFileReader_h
+#ifndef otbStatisticsXMLFileReader_h
+#define otbStatisticsXMLFileReader_h
 
 #include "itkProcessObject.h"
 
diff --git a/Modules/IO/IOXML/include/otbStatisticsXMLFileReader.txx b/Modules/IO/IOXML/include/otbStatisticsXMLFileReader.txx
index 11d8ef26a6..2bf86d544e 100644
--- a/Modules/IO/IOXML/include/otbStatisticsXMLFileReader.txx
+++ b/Modules/IO/IOXML/include/otbStatisticsXMLFileReader.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbStatisticsXMLFileReader_txx
-#define __otbStatisticsXMLFileReader_txx
+#ifndef otbStatisticsXMLFileReader_txx
+#define otbStatisticsXMLFileReader_txx
 
 #include "otbStatisticsXMLFileReader.h"
 #include "itkMacro.h"
diff --git a/Modules/IO/IOXML/include/otbStatisticsXMLFileWriter.h b/Modules/IO/IOXML/include/otbStatisticsXMLFileWriter.h
index c1c43bd7db..419c76dacd 100644
--- a/Modules/IO/IOXML/include/otbStatisticsXMLFileWriter.h
+++ b/Modules/IO/IOXML/include/otbStatisticsXMLFileWriter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbStatisticsXMLFileWriter_h
-#define __otbStatisticsXMLFileWriter_h
+#ifndef otbStatisticsXMLFileWriter_h
+#define otbStatisticsXMLFileWriter_h
 
 #include "itkProcessObject.h"
 #include <utility>
diff --git a/Modules/IO/IOXML/include/otbStatisticsXMLFileWriter.txx b/Modules/IO/IOXML/include/otbStatisticsXMLFileWriter.txx
index 7426352538..b3f7e16a11 100644
--- a/Modules/IO/IOXML/include/otbStatisticsXMLFileWriter.txx
+++ b/Modules/IO/IOXML/include/otbStatisticsXMLFileWriter.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbStatisticsXMLFileWriter_txx
-#define __otbStatisticsXMLFileWriter_txx
+#ifndef otbStatisticsXMLFileWriter_txx
+#define otbStatisticsXMLFileWriter_txx
 
 #include "otbStatisticsXMLFileWriter.h"
 #include "itkMacro.h"
diff --git a/Modules/IO/ImageIO/include/otbImageFileReader.h b/Modules/IO/ImageIO/include/otbImageFileReader.h
index a5b6d7df32..a7d4ab9150 100644
--- a/Modules/IO/ImageIO/include/otbImageFileReader.h
+++ b/Modules/IO/ImageIO/include/otbImageFileReader.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbImageFileReader_h
-#define __otbImageFileReader_h
+#ifndef otbImageFileReader_h
+#define otbImageFileReader_h
 
 #if defined(__GNUC__) || defined(__clang__)
 #pragma GCC diagnostic push
@@ -207,4 +207,4 @@ private:
 #include "otbImageFileReader.txx"
 #endif
 
-#endif // __otbImageFileReader_h
+#endif // otbImageFileReader_h
diff --git a/Modules/IO/ImageIO/include/otbImageFileReader.txx b/Modules/IO/ImageIO/include/otbImageFileReader.txx
index 9b8a6a09b0..50877a32b2 100644
--- a/Modules/IO/ImageIO/include/otbImageFileReader.txx
+++ b/Modules/IO/ImageIO/include/otbImageFileReader.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbImageFileReader_txx
-#define __otbImageFileReader_txx
+#ifndef otbImageFileReader_txx
+#define otbImageFileReader_txx
 
 #include "otbImageFileReader.h"
 #include "otbConfigure.h"
diff --git a/Modules/IO/ImageIO/include/otbImageFileWriter.h b/Modules/IO/ImageIO/include/otbImageFileWriter.h
index d1b3176bae..07aedabf89 100644
--- a/Modules/IO/ImageIO/include/otbImageFileWriter.h
+++ b/Modules/IO/ImageIO/include/otbImageFileWriter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbImageFileWriter_h
-#define __otbImageFileWriter_h
+#ifndef otbImageFileWriter_h
+#define otbImageFileWriter_h
 
 #include "otbImageIOBase.h"
 #include "itkProcessObject.h"
diff --git a/Modules/IO/ImageIO/include/otbImageFileWriter.txx b/Modules/IO/ImageIO/include/otbImageFileWriter.txx
index 8979a01e02..49de27982d 100644
--- a/Modules/IO/ImageIO/include/otbImageFileWriter.txx
+++ b/Modules/IO/ImageIO/include/otbImageFileWriter.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbImageFileWriter_txx
-#define __otbImageFileWriter_txx
+#ifndef otbImageFileWriter_txx
+#define otbImageFileWriter_txx
 
 #include "otbImageFileWriter.h"
 #include "itkImageFileWriter.h"
diff --git a/Modules/IO/ImageIO/include/otbImageIOFactory.h b/Modules/IO/ImageIO/include/otbImageIOFactory.h
index 5cffc62b9d..282da7119b 100644
--- a/Modules/IO/ImageIO/include/otbImageIOFactory.h
+++ b/Modules/IO/ImageIO/include/otbImageIOFactory.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbImageIOFactory_h
-#define __otbImageIOFactory_h
+#ifndef otbImageIOFactory_h
+#define otbImageIOFactory_h
 
 #include "itkObject.h"
 #include "otbImageIOBase.h"
diff --git a/Modules/IO/ImageIO/include/otbImageSeriesFileReader.h b/Modules/IO/ImageIO/include/otbImageSeriesFileReader.h
index c5e9c61b26..b9ce01a814 100644
--- a/Modules/IO/ImageIO/include/otbImageSeriesFileReader.h
+++ b/Modules/IO/ImageIO/include/otbImageSeriesFileReader.h
@@ -18,8 +18,8 @@
 
 =========================================================================*/
 
-#ifndef __otbImageSeriesFileReader_h
-#define __otbImageSeriesFileReader_h
+#ifndef otbImageSeriesFileReader_h
+#define otbImageSeriesFileReader_h
 
 #include "otbImageSeriesFileReaderBase.h"
 
diff --git a/Modules/IO/ImageIO/include/otbImageSeriesFileReader.txx b/Modules/IO/ImageIO/include/otbImageSeriesFileReader.txx
index 0bafea5e66..4ecc611d54 100644
--- a/Modules/IO/ImageIO/include/otbImageSeriesFileReader.txx
+++ b/Modules/IO/ImageIO/include/otbImageSeriesFileReader.txx
@@ -18,8 +18,8 @@
 
 =========================================================================*/
 
-#ifndef __otbImageSeriesFileReader_txx
-#define __otbImageSeriesFileReader_txx
+#ifndef otbImageSeriesFileReader_txx
+#define otbImageSeriesFileReader_txx
 #include "otbImageSeriesFileReader.h"
 
 namespace otb {
diff --git a/Modules/IO/ImageIO/include/otbImageSeriesFileReaderBase.h b/Modules/IO/ImageIO/include/otbImageSeriesFileReaderBase.h
index b3f8b66ad6..50c579fab1 100644
--- a/Modules/IO/ImageIO/include/otbImageSeriesFileReaderBase.h
+++ b/Modules/IO/ImageIO/include/otbImageSeriesFileReaderBase.h
@@ -18,8 +18,8 @@
 
 =========================================================================*/
 
-#ifndef __otbImageSeriesFileReaderBase_h
-#define __otbImageSeriesFileReaderBase_h
+#ifndef otbImageSeriesFileReaderBase_h
+#define otbImageSeriesFileReaderBase_h
 
 #include <iostream>
 #include <fstream>
diff --git a/Modules/IO/ImageIO/include/otbImageSeriesFileReaderBase.txx b/Modules/IO/ImageIO/include/otbImageSeriesFileReaderBase.txx
index 60ddc4d1c5..4ca00ae867 100644
--- a/Modules/IO/ImageIO/include/otbImageSeriesFileReaderBase.txx
+++ b/Modules/IO/ImageIO/include/otbImageSeriesFileReaderBase.txx
@@ -18,8 +18,8 @@
 
 =========================================================================*/
 
-#ifndef __otbImageSeriesFileReaderBase_txx
-#define __otbImageSeriesFileReaderBase_txx
+#ifndef otbImageSeriesFileReaderBase_txx
+#define otbImageSeriesFileReaderBase_txx
 #include "otbImageSeriesFileReaderBase.h"
 
 namespace otb {
diff --git a/Modules/IO/ImageIO/include/otbScalarBufferToImageFileWriter.h b/Modules/IO/ImageIO/include/otbScalarBufferToImageFileWriter.h
index d925284352..e5080bfc15 100644
--- a/Modules/IO/ImageIO/include/otbScalarBufferToImageFileWriter.h
+++ b/Modules/IO/ImageIO/include/otbScalarBufferToImageFileWriter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbScalarBufferToImageFileWriter_h
-#define __otbScalarBufferToImageFileWriter_h
+#ifndef otbScalarBufferToImageFileWriter_h
+#define otbScalarBufferToImageFileWriter_h
 
 
 #include "otbVectorImage.h"
diff --git a/Modules/IO/KMZWriter/include/otbKmzProductWriter.h b/Modules/IO/KMZWriter/include/otbKmzProductWriter.h
index 707f8c565f..26f26ad466 100644
--- a/Modules/IO/KMZWriter/include/otbKmzProductWriter.h
+++ b/Modules/IO/KMZWriter/include/otbKmzProductWriter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbKmzProductWriter_h
-#define __otbKmzProductWriter_h
+#ifndef otbKmzProductWriter_h
+#define otbKmzProductWriter_h
 
 #include <fstream>
 
diff --git a/Modules/IO/KMZWriter/include/otbKmzProductWriter.txx b/Modules/IO/KMZWriter/include/otbKmzProductWriter.txx
index 0e5622ee5c..8cbca3b1dc 100644
--- a/Modules/IO/KMZWriter/include/otbKmzProductWriter.txx
+++ b/Modules/IO/KMZWriter/include/otbKmzProductWriter.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbKmzProductWriter_txx
-#define __otbKmzProductWriter_txx
+#ifndef otbKmzProductWriter_txx
+#define otbKmzProductWriter_txx
 
 #include <string>
 
diff --git a/Modules/IO/TestKernel/include/otbDifferenceImageFilter.h b/Modules/IO/TestKernel/include/otbDifferenceImageFilter.h
index 9d7a425159..55a04a4e51 100644
--- a/Modules/IO/TestKernel/include/otbDifferenceImageFilter.h
+++ b/Modules/IO/TestKernel/include/otbDifferenceImageFilter.h
@@ -1,5 +1,5 @@
-#ifndef __otbDifferenceImageFilter_h
-#define __otbDifferenceImageFilter_h
+#ifndef otbDifferenceImageFilter_h
+#define otbDifferenceImageFilter_h
 
 #include "itkImageToImageFilter.h"
 #include "itkNumericTraits.h"
diff --git a/Modules/IO/TestKernel/include/otbDifferenceImageFilter.txx b/Modules/IO/TestKernel/include/otbDifferenceImageFilter.txx
index 141b9167a4..8da4ed9322 100644
--- a/Modules/IO/TestKernel/include/otbDifferenceImageFilter.txx
+++ b/Modules/IO/TestKernel/include/otbDifferenceImageFilter.txx
@@ -1,5 +1,5 @@
-#ifndef __otbDifferenceImageFilter_txx
-#define __otbDifferenceImageFilter_txx
+#ifndef otbDifferenceImageFilter_txx
+#define otbDifferenceImageFilter_txx
 
 #include "otbDifferenceImageFilter.h"
 
diff --git a/Modules/IO/TestKernel/include/otbTestHelper.h b/Modules/IO/TestKernel/include/otbTestHelper.h
index ed90de6d36..a6a615db84 100644
--- a/Modules/IO/TestKernel/include/otbTestHelper.h
+++ b/Modules/IO/TestKernel/include/otbTestHelper.h
@@ -18,8 +18,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbTestHelper_h
-#define __otbTestHelper_h
+#ifndef otbTestHelper_h
+#define otbTestHelper_h
 
 #include <map>
 #include <string>
diff --git a/Modules/IO/TestKernel/include/otbTestMain.h b/Modules/IO/TestKernel/include/otbTestMain.h
index 2ec5b71cfb..78999573a5 100644
--- a/Modules/IO/TestKernel/include/otbTestMain.h
+++ b/Modules/IO/TestKernel/include/otbTestMain.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbTestMain_h
-#define __otbTestMain_h
+#ifndef otbTestMain_h
+#define otbTestMain_h
 
 #include "otbConfigure.h"
 
diff --git a/Modules/IO/VectorDataIO/include/otbVectorDataFileReader.h b/Modules/IO/VectorDataIO/include/otbVectorDataFileReader.h
index c243e476e2..930ad72b16 100644
--- a/Modules/IO/VectorDataIO/include/otbVectorDataFileReader.h
+++ b/Modules/IO/VectorDataIO/include/otbVectorDataFileReader.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbVectorDataFileReader_h
-#define __otbVectorDataFileReader_h
+#ifndef otbVectorDataFileReader_h
+#define otbVectorDataFileReader_h
 
 #include "otbVectorDataSource.h"
 #include "otbVectorDataIOBase.h"
@@ -151,4 +151,4 @@ private:
 #include "otbVectorDataFileReader.txx"
 #endif
 
-#endif // __otbVectorDataFileReader_h
+#endif // otbVectorDataFileReader_h
diff --git a/Modules/IO/VectorDataIO/include/otbVectorDataFileReader.txx b/Modules/IO/VectorDataIO/include/otbVectorDataFileReader.txx
index a7e97946f0..318a055c33 100644
--- a/Modules/IO/VectorDataIO/include/otbVectorDataFileReader.txx
+++ b/Modules/IO/VectorDataIO/include/otbVectorDataFileReader.txx
@@ -16,8 +16,8 @@
 
 =========================================================================*/
 
-#ifndef __otbVectorDataFileReader_txx
-#define __otbVectorDataFileReader_txx
+#ifndef otbVectorDataFileReader_txx
+#define otbVectorDataFileReader_txx
 
 #include <fstream>
 
diff --git a/Modules/IO/VectorDataIO/include/otbVectorDataFileWriter.h b/Modules/IO/VectorDataIO/include/otbVectorDataFileWriter.h
index bac0cd9350..76b08b5f85 100644
--- a/Modules/IO/VectorDataIO/include/otbVectorDataFileWriter.h
+++ b/Modules/IO/VectorDataIO/include/otbVectorDataFileWriter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbVectorDataFileWriter_h
-#define __otbVectorDataFileWriter_h
+#ifndef otbVectorDataFileWriter_h
+#define otbVectorDataFileWriter_h
 
 #include "itkProcessObject.h"
 #include "itkMacro.h"
@@ -124,4 +124,4 @@ private:
 #include "otbVectorDataFileWriter.txx"
 #endif
 
-#endif // __otbVectorDataFileWriter_h
+#endif // otbVectorDataFileWriter_h
diff --git a/Modules/IO/VectorDataIO/include/otbVectorDataFileWriter.txx b/Modules/IO/VectorDataIO/include/otbVectorDataFileWriter.txx
index 0606ad4313..486de4260e 100644
--- a/Modules/IO/VectorDataIO/include/otbVectorDataFileWriter.txx
+++ b/Modules/IO/VectorDataIO/include/otbVectorDataFileWriter.txx
@@ -16,8 +16,8 @@
 
 =========================================================================*/
 
-#ifndef __otbVectorDataFileWriter_txx
-#define __otbVectorDataFileWriter_txx
+#ifndef otbVectorDataFileWriter_txx
+#define otbVectorDataFileWriter_txx
 
 #include "otbMacro.h"
 #include "otbVectorDataFileWriter.h"
diff --git a/Modules/IO/VectorDataIO/include/otbVectorDataIOFactory.h b/Modules/IO/VectorDataIO/include/otbVectorDataIOFactory.h
index 6f4d54cd91..073681f2b1 100644
--- a/Modules/IO/VectorDataIO/include/otbVectorDataIOFactory.h
+++ b/Modules/IO/VectorDataIO/include/otbVectorDataIOFactory.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbVectorDataIOFactory_h
-#define __otbVectorDataIOFactory_h
+#ifndef otbVectorDataIOFactory_h
+#define otbVectorDataIOFactory_h
 
 #include "itkObject.h"
 #include "otbVectorDataIOBase.h"
diff --git a/Modules/Learning/DempsterShafer/include/otbConfusionMatrixToMassOfBelief.h b/Modules/Learning/DempsterShafer/include/otbConfusionMatrixToMassOfBelief.h
index 37b117b3e5..de0a90af4f 100644
--- a/Modules/Learning/DempsterShafer/include/otbConfusionMatrixToMassOfBelief.h
+++ b/Modules/Learning/DempsterShafer/include/otbConfusionMatrixToMassOfBelief.h
@@ -15,8 +15,8 @@
  PURPOSE.  See the above copyright notices for more information.
 
  =========================================================================*/
-#ifndef __otbConfusionMatrixToMassOfBelief_h
-#define __otbConfusionMatrixToMassOfBelief_h
+#ifndef otbConfusionMatrixToMassOfBelief_h
+#define otbConfusionMatrixToMassOfBelief_h
 
 // First make sure that the configuration is available.
 // This line can be removed once the optimized versions
diff --git a/Modules/Learning/DempsterShafer/include/otbConfusionMatrixToMassOfBelief.txx b/Modules/Learning/DempsterShafer/include/otbConfusionMatrixToMassOfBelief.txx
index 18bb0d6e39..f1d7fcd762 100644
--- a/Modules/Learning/DempsterShafer/include/otbConfusionMatrixToMassOfBelief.txx
+++ b/Modules/Learning/DempsterShafer/include/otbConfusionMatrixToMassOfBelief.txx
@@ -15,8 +15,8 @@
  PURPOSE.  See the above copyright notices for more information.
 
  =========================================================================*/
-#ifndef __otbConfusionMatrixToMassOfBelief_txx
-#define __otbConfusionMatrixToMassOfBelief_txx
+#ifndef otbConfusionMatrixToMassOfBelief_txx
+#define otbConfusionMatrixToMassOfBelief_txx
 
 #include "otbConfusionMatrixToMassOfBelief.h"
 
diff --git a/Modules/Learning/DempsterShafer/include/otbDSFusionOfClassifiersImageFilter.h b/Modules/Learning/DempsterShafer/include/otbDSFusionOfClassifiersImageFilter.h
index 6b5c871faf..48a3eccefe 100644
--- a/Modules/Learning/DempsterShafer/include/otbDSFusionOfClassifiersImageFilter.h
+++ b/Modules/Learning/DempsterShafer/include/otbDSFusionOfClassifiersImageFilter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbDSFusionOfClassifiersImageFilter_h
-#define __otbDSFusionOfClassifiersImageFilter_h
+#ifndef otbDSFusionOfClassifiersImageFilter_h
+#define otbDSFusionOfClassifiersImageFilter_h
 
 #include "itkImageToImageFilter.h"
 #include "otbVectorImage.h"
diff --git a/Modules/Learning/DempsterShafer/include/otbDSFusionOfClassifiersImageFilter.txx b/Modules/Learning/DempsterShafer/include/otbDSFusionOfClassifiersImageFilter.txx
index bb71f7790c..af6a06d643 100644
--- a/Modules/Learning/DempsterShafer/include/otbDSFusionOfClassifiersImageFilter.txx
+++ b/Modules/Learning/DempsterShafer/include/otbDSFusionOfClassifiersImageFilter.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbDSFusionOfClassifiersImageFilter_txx
-#define __otbDSFusionOfClassifiersImageFilter_txx
+#ifndef otbDSFusionOfClassifiersImageFilter_txx
+#define otbDSFusionOfClassifiersImageFilter_txx
 
 #include "otbDSFusionOfClassifiersImageFilter.h"
 #include "itkImageRegionIterator.h"
diff --git a/Modules/Learning/DempsterShafer/include/otbJointMassOfBeliefFilter.h b/Modules/Learning/DempsterShafer/include/otbJointMassOfBeliefFilter.h
index 74499f4d46..0f3643f8cb 100644
--- a/Modules/Learning/DempsterShafer/include/otbJointMassOfBeliefFilter.h
+++ b/Modules/Learning/DempsterShafer/include/otbJointMassOfBeliefFilter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbJointMassOfBeliefFilter_h
-#define __otbJointMassOfBeliefFilter_h
+#ifndef otbJointMassOfBeliefFilter_h
+#define otbJointMassOfBeliefFilter_h
 
 #include "itkProcessObject.h"
 
diff --git a/Modules/Learning/DempsterShafer/include/otbJointMassOfBeliefFilter.txx b/Modules/Learning/DempsterShafer/include/otbJointMassOfBeliefFilter.txx
index 5690fefcd5..6446d23850 100644
--- a/Modules/Learning/DempsterShafer/include/otbJointMassOfBeliefFilter.txx
+++ b/Modules/Learning/DempsterShafer/include/otbJointMassOfBeliefFilter.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbJointMassOfBeliefFilter_txx
-#define __otbJointMassOfBeliefFilter_txx
+#ifndef otbJointMassOfBeliefFilter_txx
+#define otbJointMassOfBeliefFilter_txx
 
 #include "otbJointMassOfBeliefFilter.h"
 
diff --git a/Modules/Learning/DempsterShafer/include/otbMassOfBelief.h b/Modules/Learning/DempsterShafer/include/otbMassOfBelief.h
index 8e8dc53954..6979f33e5f 100644
--- a/Modules/Learning/DempsterShafer/include/otbMassOfBelief.h
+++ b/Modules/Learning/DempsterShafer/include/otbMassOfBelief.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbMassOfBelief_h
-#define __otbMassOfBelief_h
+#ifndef otbMassOfBelief_h
+#define otbMassOfBelief_h
 
 #include "itkDataObject.h"
 #include "itkObjectFactory.h"
diff --git a/Modules/Learning/DempsterShafer/include/otbMassOfBelief.txx b/Modules/Learning/DempsterShafer/include/otbMassOfBelief.txx
index 6a453de2ae..6717226e37 100644
--- a/Modules/Learning/DempsterShafer/include/otbMassOfBelief.txx
+++ b/Modules/Learning/DempsterShafer/include/otbMassOfBelief.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbMassOfBelief_txx
-#define __otbMassOfBelief_txx
+#ifndef otbMassOfBelief_txx
+#define otbMassOfBelief_txx
 
 #include "otbMassOfBelief.h"
 
diff --git a/Modules/Learning/DempsterShafer/include/otbStandardDSCostFunction.h b/Modules/Learning/DempsterShafer/include/otbStandardDSCostFunction.h
index ced8f739b4..e56b75033d 100644
--- a/Modules/Learning/DempsterShafer/include/otbStandardDSCostFunction.h
+++ b/Modules/Learning/DempsterShafer/include/otbStandardDSCostFunction.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbStandardDSCostFunction_h
-#define __otbStandardDSCostFunction_h
+#ifndef otbStandardDSCostFunction_h
+#define otbStandardDSCostFunction_h
 
 #include "itkSingleValuedCostFunction.h"
 
diff --git a/Modules/Learning/DempsterShafer/include/otbStandardDSCostFunction.txx b/Modules/Learning/DempsterShafer/include/otbStandardDSCostFunction.txx
index f47c10db7d..6eb70e5a6b 100644
--- a/Modules/Learning/DempsterShafer/include/otbStandardDSCostFunction.txx
+++ b/Modules/Learning/DempsterShafer/include/otbStandardDSCostFunction.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbStandardDSCostFunction_txx
-#define __otbStandardDSCostFunction_txx
+#ifndef otbStandardDSCostFunction_txx
+#define otbStandardDSCostFunction_txx
 
 #include "otbStandardDSCostFunction.h"
 
diff --git a/Modules/Learning/DempsterShafer/include/otbVectorDataToDSValidatedVectorDataFilter.h b/Modules/Learning/DempsterShafer/include/otbVectorDataToDSValidatedVectorDataFilter.h
index ca8dcd2aff..715f33416b 100644
--- a/Modules/Learning/DempsterShafer/include/otbVectorDataToDSValidatedVectorDataFilter.h
+++ b/Modules/Learning/DempsterShafer/include/otbVectorDataToDSValidatedVectorDataFilter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbVectorDataToDSValidatedVectorDataFilter_h
-#define __otbVectorDataToDSValidatedVectorDataFilter_h
+#ifndef otbVectorDataToDSValidatedVectorDataFilter_h
+#define otbVectorDataToDSValidatedVectorDataFilter_h
 
 #include "otbMassOfBelief.h"
 
diff --git a/Modules/Learning/DempsterShafer/include/otbVectorDataToDSValidatedVectorDataFilter.txx b/Modules/Learning/DempsterShafer/include/otbVectorDataToDSValidatedVectorDataFilter.txx
index 2054231407..746433b8e3 100644
--- a/Modules/Learning/DempsterShafer/include/otbVectorDataToDSValidatedVectorDataFilter.txx
+++ b/Modules/Learning/DempsterShafer/include/otbVectorDataToDSValidatedVectorDataFilter.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbVectorDataToDSValidatedVectorDataFilter_txx
-#define __otbVectorDataToDSValidatedVectorDataFilter_txx
+#ifndef otbVectorDataToDSValidatedVectorDataFilter_txx
+#define otbVectorDataToDSValidatedVectorDataFilter_txx
 
 #include "otbVectorDataToDSValidatedVectorDataFilter.h"
 #include <iostream>
diff --git a/Modules/Learning/LearningBase/include/otbDecisionTree.h b/Modules/Learning/LearningBase/include/otbDecisionTree.h
index b529e190e8..d8f6378f5c 100644
--- a/Modules/Learning/LearningBase/include/otbDecisionTree.h
+++ b/Modules/Learning/LearningBase/include/otbDecisionTree.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbDecisionTree_h
-#define __otbDecisionTree_h
+#ifndef otbDecisionTree_h
+#define otbDecisionTree_h
 
 #include <map>
 #include "itkObjectFactory.h"
diff --git a/Modules/Learning/LearningBase/include/otbDecisionTree.txx b/Modules/Learning/LearningBase/include/otbDecisionTree.txx
index 6265ad29b3..2b4d8d61a9 100644
--- a/Modules/Learning/LearningBase/include/otbDecisionTree.txx
+++ b/Modules/Learning/LearningBase/include/otbDecisionTree.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbDecisionTree_txx
-#define __otbDecisionTree_txx
+#ifndef otbDecisionTree_txx
+#define otbDecisionTree_txx
 
 #include "otbDecisionTree.h"
 #include "otbMacro.h"
diff --git a/Modules/Learning/LearningBase/include/otbGaussianModelComponent.h b/Modules/Learning/LearningBase/include/otbGaussianModelComponent.h
index 9aba12d281..31915c70c8 100644
--- a/Modules/Learning/LearningBase/include/otbGaussianModelComponent.h
+++ b/Modules/Learning/LearningBase/include/otbGaussianModelComponent.h
@@ -17,8 +17,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbGaussianModelComponent_h
-#define __otbGaussianModelComponent_h
+#ifndef otbGaussianModelComponent_h
+#define otbGaussianModelComponent_h
 
 #include "itkCovarianceSampleFilter.h"
 #include "itkGaussianMembershipFunction.h"
diff --git a/Modules/Learning/LearningBase/include/otbGaussianModelComponent.txx b/Modules/Learning/LearningBase/include/otbGaussianModelComponent.txx
index d420d84070..f823ea30a3 100644
--- a/Modules/Learning/LearningBase/include/otbGaussianModelComponent.txx
+++ b/Modules/Learning/LearningBase/include/otbGaussianModelComponent.txx
@@ -17,8 +17,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbGaussianModelComponent_txx
-#define __otbGaussianModelComponent_txx
+#ifndef otbGaussianModelComponent_txx
+#define otbGaussianModelComponent_txx
 
 #include <iostream>
 
diff --git a/Modules/Learning/LearningBase/include/otbKMeansImageClassificationFilter.h b/Modules/Learning/LearningBase/include/otbKMeansImageClassificationFilter.h
index ec3f880feb..4ddf04a079 100644
--- a/Modules/Learning/LearningBase/include/otbKMeansImageClassificationFilter.h
+++ b/Modules/Learning/LearningBase/include/otbKMeansImageClassificationFilter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbKMeansImageClassificationFilter_h
-#define __otbKMeansImageClassificationFilter_h
+#ifndef otbKMeansImageClassificationFilter_h
+#define otbKMeansImageClassificationFilter_h
 
 #include "itkInPlaceImageFilter.h"
 #include "itkListSample.h"
diff --git a/Modules/Learning/LearningBase/include/otbKMeansImageClassificationFilter.txx b/Modules/Learning/LearningBase/include/otbKMeansImageClassificationFilter.txx
index 258134e685..861aefe4ff 100644
--- a/Modules/Learning/LearningBase/include/otbKMeansImageClassificationFilter.txx
+++ b/Modules/Learning/LearningBase/include/otbKMeansImageClassificationFilter.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbKMeansImageClassificationFilter_txx
-#define __otbKMeansImageClassificationFilter_txx
+#ifndef otbKMeansImageClassificationFilter_txx
+#define otbKMeansImageClassificationFilter_txx
 
 #include "otbKMeansImageClassificationFilter.h"
 #include "itkImageRegionIterator.h"
diff --git a/Modules/Learning/LearningBase/include/otbSEMClassifier.h b/Modules/Learning/LearningBase/include/otbSEMClassifier.h
index f011851695..43c5daa27c 100644
--- a/Modules/Learning/LearningBase/include/otbSEMClassifier.h
+++ b/Modules/Learning/LearningBase/include/otbSEMClassifier.h
@@ -17,8 +17,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbSEMClassifier_h
-#define __otbSEMClassifier_h
+#ifndef otbSEMClassifier_h
+#define otbSEMClassifier_h
 
 #include "itkListSample.h"
 #include "itkSampleClassifierFilter.h"
diff --git a/Modules/Learning/LearningBase/include/otbSEMClassifier.txx b/Modules/Learning/LearningBase/include/otbSEMClassifier.txx
index 9222684ae6..bf5674f7be 100644
--- a/Modules/Learning/LearningBase/include/otbSEMClassifier.txx
+++ b/Modules/Learning/LearningBase/include/otbSEMClassifier.txx
@@ -17,8 +17,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbSEMClassifier_txx
-#define __otbSEMClassifier_txx
+#ifndef otbSEMClassifier_txx
+#define otbSEMClassifier_txx
 
 #include <cstdlib>
 
diff --git a/Modules/Learning/Markov/include/otbMRFEnergy.h b/Modules/Learning/Markov/include/otbMRFEnergy.h
index 78ba2da191..f2af4cf962 100644
--- a/Modules/Learning/Markov/include/otbMRFEnergy.h
+++ b/Modules/Learning/Markov/include/otbMRFEnergy.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbMRFEnergy_h
-#define __otbMRFEnergy_h
+#ifndef otbMRFEnergy_h
+#define otbMRFEnergy_h
 
 #include "itkConstNeighborhoodIterator.h"
 #include "itkObject.h"
diff --git a/Modules/Learning/Markov/include/otbMRFEnergyEdgeFidelity.h b/Modules/Learning/Markov/include/otbMRFEnergyEdgeFidelity.h
index 55c93dede6..fa3df033cc 100644
--- a/Modules/Learning/Markov/include/otbMRFEnergyEdgeFidelity.h
+++ b/Modules/Learning/Markov/include/otbMRFEnergyEdgeFidelity.h
@@ -16,8 +16,8 @@
 
 =========================================================================*/
 
-#ifndef __otbMRFEnergyEdgeFidelity_h
-#define __otbMRFEnergyEdgeFidelity_h
+#ifndef otbMRFEnergyEdgeFidelity_h
+#define otbMRFEnergyEdgeFidelity_h
 
 #include "otbMRFEnergy.h"
 
diff --git a/Modules/Learning/Markov/include/otbMRFEnergyFisherClassification.h b/Modules/Learning/Markov/include/otbMRFEnergyFisherClassification.h
index 773d78cb3d..f0aaae39da 100644
--- a/Modules/Learning/Markov/include/otbMRFEnergyFisherClassification.h
+++ b/Modules/Learning/Markov/include/otbMRFEnergyFisherClassification.h
@@ -17,8 +17,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbMRFEnergyFisherClassification_h
-#define __otbMRFEnergyFisherClassification_h
+#ifndef otbMRFEnergyFisherClassification_h
+#define otbMRFEnergyFisherClassification_h
 
 #include "otbMRFEnergy.h"
 #include "otbMath.h"
diff --git a/Modules/Learning/Markov/include/otbMRFEnergyGaussian.h b/Modules/Learning/Markov/include/otbMRFEnergyGaussian.h
index cff86e60e7..b4b86e0264 100644
--- a/Modules/Learning/Markov/include/otbMRFEnergyGaussian.h
+++ b/Modules/Learning/Markov/include/otbMRFEnergyGaussian.h
@@ -16,8 +16,8 @@
 
 =========================================================================*/
 
-#ifndef __otbMRFEnergyGaussian_h
-#define __otbMRFEnergyGaussian_h
+#ifndef otbMRFEnergyGaussian_h
+#define otbMRFEnergyGaussian_h
 
 #include "otbMRFEnergy.h"
 
diff --git a/Modules/Learning/Markov/include/otbMRFEnergyGaussianClassification.h b/Modules/Learning/Markov/include/otbMRFEnergyGaussianClassification.h
index efffa8af77..ccea47d6a0 100644
--- a/Modules/Learning/Markov/include/otbMRFEnergyGaussianClassification.h
+++ b/Modules/Learning/Markov/include/otbMRFEnergyGaussianClassification.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbMRFEnergyGaussianClassification_h
-#define __otbMRFEnergyGaussianClassification_h
+#ifndef otbMRFEnergyGaussianClassification_h
+#define otbMRFEnergyGaussianClassification_h
 
 #include "otbMRFEnergy.h"
 #include "otbMath.h"
diff --git a/Modules/Learning/Markov/include/otbMRFEnergyPotts.h b/Modules/Learning/Markov/include/otbMRFEnergyPotts.h
index d2aaae3e67..565c42f7f4 100644
--- a/Modules/Learning/Markov/include/otbMRFEnergyPotts.h
+++ b/Modules/Learning/Markov/include/otbMRFEnergyPotts.h
@@ -16,8 +16,8 @@
 
 =========================================================================*/
 
-#ifndef __otbMRFEnergyPotts_h
-#define __otbMRFEnergyPotts_h
+#ifndef otbMRFEnergyPotts_h
+#define otbMRFEnergyPotts_h
 
 #include "otbMRFEnergy.h"
 
diff --git a/Modules/Learning/Markov/include/otbMRFOptimizer.h b/Modules/Learning/Markov/include/otbMRFOptimizer.h
index e1b1c70f49..ee1dbb943a 100644
--- a/Modules/Learning/Markov/include/otbMRFOptimizer.h
+++ b/Modules/Learning/Markov/include/otbMRFOptimizer.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbMRFOptimizer_h
-#define __otbMRFOptimizer_h
+#ifndef otbMRFOptimizer_h
+#define otbMRFOptimizer_h
 
 #include "itkObject.h"
 #include "itkObjectFactory.h"
diff --git a/Modules/Learning/Markov/include/otbMRFOptimizerICM.h b/Modules/Learning/Markov/include/otbMRFOptimizerICM.h
index 244debbdaf..28974c31d6 100644
--- a/Modules/Learning/Markov/include/otbMRFOptimizerICM.h
+++ b/Modules/Learning/Markov/include/otbMRFOptimizerICM.h
@@ -16,8 +16,8 @@
 
 =========================================================================*/
 
-#ifndef __otbMRFOptimizerICM_h
-#define __otbMRFOptimizerICM_h
+#ifndef otbMRFOptimizerICM_h
+#define otbMRFOptimizerICM_h
 
 #include "otbMRFOptimizer.h"
 
diff --git a/Modules/Learning/Markov/include/otbMRFOptimizerMetropolis.h b/Modules/Learning/Markov/include/otbMRFOptimizerMetropolis.h
index a8ee6a143a..52f2c01adf 100644
--- a/Modules/Learning/Markov/include/otbMRFOptimizerMetropolis.h
+++ b/Modules/Learning/Markov/include/otbMRFOptimizerMetropolis.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbMRFOptimizerMetropolis_h
-#define __otbMRFOptimizerMetropolis_h
+#ifndef otbMRFOptimizerMetropolis_h
+#define otbMRFOptimizerMetropolis_h
 
 #include "otbMRFOptimizer.h"
 #include "otbMath.h"
diff --git a/Modules/Learning/Markov/include/otbMRFSampler.h b/Modules/Learning/Markov/include/otbMRFSampler.h
index 37379b600e..3cca0414ac 100644
--- a/Modules/Learning/Markov/include/otbMRFSampler.h
+++ b/Modules/Learning/Markov/include/otbMRFSampler.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbMRFSampler_h
-#define __otbMRFSampler_h
+#ifndef otbMRFSampler_h
+#define otbMRFSampler_h
 
 #include "otbMRFEnergy.h"
 #include "itkNeighborhoodIterator.h"
diff --git a/Modules/Learning/Markov/include/otbMRFSamplerMAP.h b/Modules/Learning/Markov/include/otbMRFSamplerMAP.h
index 5a4632bd6c..26c5614ac1 100644
--- a/Modules/Learning/Markov/include/otbMRFSamplerMAP.h
+++ b/Modules/Learning/Markov/include/otbMRFSamplerMAP.h
@@ -16,8 +16,8 @@
 
 =========================================================================*/
 
-#ifndef __otbMRFSamplerMAP_h
-#define __otbMRFSamplerMAP_h
+#ifndef otbMRFSamplerMAP_h
+#define otbMRFSamplerMAP_h
 
 #include "otbMRFSampler.h"
 
diff --git a/Modules/Learning/Markov/include/otbMRFSamplerRandom.h b/Modules/Learning/Markov/include/otbMRFSamplerRandom.h
index bcbd810640..bdf2714d61 100644
--- a/Modules/Learning/Markov/include/otbMRFSamplerRandom.h
+++ b/Modules/Learning/Markov/include/otbMRFSamplerRandom.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbMRFSamplerRandom_h
-#define __otbMRFSamplerRandom_h
+#ifndef otbMRFSamplerRandom_h
+#define otbMRFSamplerRandom_h
 
 #include "otbMRFSampler.h"
 #include "itkMersenneTwisterRandomVariateGenerator.h"
diff --git a/Modules/Learning/Markov/include/otbMRFSamplerRandomMAP.h b/Modules/Learning/Markov/include/otbMRFSamplerRandomMAP.h
index 9ea737ab80..0b28f16634 100644
--- a/Modules/Learning/Markov/include/otbMRFSamplerRandomMAP.h
+++ b/Modules/Learning/Markov/include/otbMRFSamplerRandomMAP.h
@@ -16,8 +16,8 @@
 
 =========================================================================*/
 
-#ifndef __otbMRFSamplerRandomMAP_h
-#define __otbMRFSamplerRandomMAP_h
+#ifndef otbMRFSamplerRandomMAP_h
+#define otbMRFSamplerRandomMAP_h
 
 #include "itkMersenneTwisterRandomVariateGenerator.h"
 #include "otbMRFSampler.h"
diff --git a/Modules/Learning/Markov/include/otbMarkovRandomFieldFilter.h b/Modules/Learning/Markov/include/otbMarkovRandomFieldFilter.h
index a686eee2fd..1b7d2050e1 100644
--- a/Modules/Learning/Markov/include/otbMarkovRandomFieldFilter.h
+++ b/Modules/Learning/Markov/include/otbMarkovRandomFieldFilter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbMarkovRandomFieldFilter_h
-#define __otbMarkovRandomFieldFilter_h
+#ifndef otbMarkovRandomFieldFilter_h
+#define otbMarkovRandomFieldFilter_h
 
 #include "otbMacro.h"
 
diff --git a/Modules/Learning/Markov/include/otbMarkovRandomFieldFilter.txx b/Modules/Learning/Markov/include/otbMarkovRandomFieldFilter.txx
index e7660a677f..91d9354f0c 100644
--- a/Modules/Learning/Markov/include/otbMarkovRandomFieldFilter.txx
+++ b/Modules/Learning/Markov/include/otbMarkovRandomFieldFilter.txx
@@ -16,8 +16,8 @@
 
 =========================================================================*/
 
-#ifndef __otbMarkovRandomFieldFilter_txx
-#define __otbMarkovRandomFieldFilter_txx
+#ifndef otbMarkovRandomFieldFilter_txx
+#define otbMarkovRandomFieldFilter_txx
 #include "otbMarkovRandomFieldFilter.h"
 
 namespace otb
diff --git a/Modules/Learning/SOM/include/otbCzihoSOMLearningBehaviorFunctor.h b/Modules/Learning/SOM/include/otbCzihoSOMLearningBehaviorFunctor.h
index 19fdf31beb..2b8161a2e5 100644
--- a/Modules/Learning/SOM/include/otbCzihoSOMLearningBehaviorFunctor.h
+++ b/Modules/Learning/SOM/include/otbCzihoSOMLearningBehaviorFunctor.h
@@ -18,8 +18,8 @@
 
 =========================================================================*/
 
-#ifndef __otbCzihoSOMLearningBehaviorFunctor_h
-#define __otbCzihoSOMLearningBehaviorFunctor_h
+#ifndef otbCzihoSOMLearningBehaviorFunctor_h
+#define otbCzihoSOMLearningBehaviorFunctor_h
 
 #include "itkSize.h"
 #include "otbMath.h"
diff --git a/Modules/Learning/SOM/include/otbCzihoSOMNeighborhoodBehaviorFunctor.h b/Modules/Learning/SOM/include/otbCzihoSOMNeighborhoodBehaviorFunctor.h
index a364d57dc9..d8190d78b8 100644
--- a/Modules/Learning/SOM/include/otbCzihoSOMNeighborhoodBehaviorFunctor.h
+++ b/Modules/Learning/SOM/include/otbCzihoSOMNeighborhoodBehaviorFunctor.h
@@ -18,8 +18,8 @@
 
 =========================================================================*/
 
-#ifndef __otbCzihoSOMNeighborhoodBehaviorFunctor_h
-#define __otbCzihoSOMNeighborhoodBehaviorFunctor_h
+#ifndef otbCzihoSOMNeighborhoodBehaviorFunctor_h
+#define otbCzihoSOMNeighborhoodBehaviorFunctor_h
 
 #include "itkSize.h"
 #include "itkMath.h"
diff --git a/Modules/Learning/SOM/include/otbPeriodicSOM.h b/Modules/Learning/SOM/include/otbPeriodicSOM.h
index 28b4c20de2..c2c9a27649 100644
--- a/Modules/Learning/SOM/include/otbPeriodicSOM.h
+++ b/Modules/Learning/SOM/include/otbPeriodicSOM.h
@@ -18,8 +18,8 @@
 
 =========================================================================*/
 
-#ifndef __otbPeriodicSOM_h
-#define __otbPeriodicSOM_h
+#ifndef otbPeriodicSOM_h
+#define otbPeriodicSOM_h
 
 #include "otbSOM.h"
 
diff --git a/Modules/Learning/SOM/include/otbPeriodicSOM.txx b/Modules/Learning/SOM/include/otbPeriodicSOM.txx
index 4876824b15..1121298e21 100644
--- a/Modules/Learning/SOM/include/otbPeriodicSOM.txx
+++ b/Modules/Learning/SOM/include/otbPeriodicSOM.txx
@@ -18,8 +18,8 @@
 
 =========================================================================*/
 
-#ifndef __otbPeriodicSOM_txx
-#define __otbPeriodicSOM_txx
+#ifndef otbPeriodicSOM_txx
+#define otbPeriodicSOM_txx
 
 #include "itkNumericTraits.h"
 #include "itkNeighborhoodIterator.h"
diff --git a/Modules/Learning/SOM/include/otbSOM.h b/Modules/Learning/SOM/include/otbSOM.h
index 0ff5dbfbbc..ea7cf7cd09 100644
--- a/Modules/Learning/SOM/include/otbSOM.h
+++ b/Modules/Learning/SOM/include/otbSOM.h
@@ -17,8 +17,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbSOM_h
-#define __otbSOM_h
+#ifndef otbSOM_h
+#define otbSOM_h
 
 #include "itkImageToImageFilter.h"
 #include "itkEuclideanDistanceMetric.h"
diff --git a/Modules/Learning/SOM/include/otbSOM.txx b/Modules/Learning/SOM/include/otbSOM.txx
index cdc5066cfd..2f811d68e7 100644
--- a/Modules/Learning/SOM/include/otbSOM.txx
+++ b/Modules/Learning/SOM/include/otbSOM.txx
@@ -18,8 +18,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbSOM_txx
-#define __otbSOM_txx
+#ifndef otbSOM_txx
+#define otbSOM_txx
 
 #include "otbSOM.h"
 #include "itkImageRegionIteratorWithIndex.h"
diff --git a/Modules/Learning/SOM/include/otbSOMActivationBuilder.h b/Modules/Learning/SOM/include/otbSOMActivationBuilder.h
index b2ee93f9eb..fd88a2c145 100644
--- a/Modules/Learning/SOM/include/otbSOMActivationBuilder.h
+++ b/Modules/Learning/SOM/include/otbSOMActivationBuilder.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbSOMActivationBuilder_h
-#define __otbSOMActivationBuilder_h
+#ifndef otbSOMActivationBuilder_h
+#define otbSOMActivationBuilder_h
 
 #include "itkImageToImageFilter.h"
 
diff --git a/Modules/Learning/SOM/include/otbSOMActivationBuilder.txx b/Modules/Learning/SOM/include/otbSOMActivationBuilder.txx
index e8048291e0..fc96ba32c2 100644
--- a/Modules/Learning/SOM/include/otbSOMActivationBuilder.txx
+++ b/Modules/Learning/SOM/include/otbSOMActivationBuilder.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbSOMActivationBuilder_txx
-#define __otbSOMActivationBuilder_txx
+#ifndef otbSOMActivationBuilder_txx
+#define otbSOMActivationBuilder_txx
 
 #include "itkImageRegionIterator.h"
 
diff --git a/Modules/Learning/SOM/include/otbSOMClassifier.h b/Modules/Learning/SOM/include/otbSOMClassifier.h
index caeed5eeb0..ed1bd2f6cb 100644
--- a/Modules/Learning/SOM/include/otbSOMClassifier.h
+++ b/Modules/Learning/SOM/include/otbSOMClassifier.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbSOMClassifier_h
-#define __otbSOMClassifier_h
+#ifndef otbSOMClassifier_h
+#define otbSOMClassifier_h
 
 #include "itkProcessObject.h"
 #include "itkMembershipSample.h"
diff --git a/Modules/Learning/SOM/include/otbSOMClassifier.txx b/Modules/Learning/SOM/include/otbSOMClassifier.txx
index a6d13ee0ae..2c9e8189e5 100644
--- a/Modules/Learning/SOM/include/otbSOMClassifier.txx
+++ b/Modules/Learning/SOM/include/otbSOMClassifier.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbSOMClassifier_txx
-#define __otbSOMClassifier_txx
+#ifndef otbSOMClassifier_txx
+#define otbSOMClassifier_txx
 
 #include "otbSOMClassifier.h"
 #include "otbMacro.h"
diff --git a/Modules/Learning/SOM/include/otbSOMImageClassificationFilter.h b/Modules/Learning/SOM/include/otbSOMImageClassificationFilter.h
index d5a761fb12..54d5187c1a 100644
--- a/Modules/Learning/SOM/include/otbSOMImageClassificationFilter.h
+++ b/Modules/Learning/SOM/include/otbSOMImageClassificationFilter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbSOMImageClassificationFilter_h
-#define __otbSOMImageClassificationFilter_h
+#ifndef otbSOMImageClassificationFilter_h
+#define otbSOMImageClassificationFilter_h
 
 #include "otbSOMClassifier.h"
 #include "itkInPlaceImageFilter.h"
diff --git a/Modules/Learning/SOM/include/otbSOMImageClassificationFilter.txx b/Modules/Learning/SOM/include/otbSOMImageClassificationFilter.txx
index 7b2331eed9..d2f1a05fb7 100644
--- a/Modules/Learning/SOM/include/otbSOMImageClassificationFilter.txx
+++ b/Modules/Learning/SOM/include/otbSOMImageClassificationFilter.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbSOMImageClassificationFilter_txx
-#define __otbSOMImageClassificationFilter_txx
+#ifndef otbSOMImageClassificationFilter_txx
+#define otbSOMImageClassificationFilter_txx
 
 #include "otbSOMImageClassificationFilter.h"
 #include "itkImageRegionIterator.h"
diff --git a/Modules/Learning/SOM/include/otbSOMLearningBehaviorFunctor.h b/Modules/Learning/SOM/include/otbSOMLearningBehaviorFunctor.h
index 4e38167100..0ebe5efab8 100644
--- a/Modules/Learning/SOM/include/otbSOMLearningBehaviorFunctor.h
+++ b/Modules/Learning/SOM/include/otbSOMLearningBehaviorFunctor.h
@@ -18,8 +18,8 @@
 
 =========================================================================*/
 
-#ifndef __otbSOMLearningBehaviorFunctor_h
-#define __otbSOMLearningBehaviorFunctor_h
+#ifndef otbSOMLearningBehaviorFunctor_h
+#define otbSOMLearningBehaviorFunctor_h
 
 namespace otb
 {
diff --git a/Modules/Learning/SOM/include/otbSOMMap.h b/Modules/Learning/SOM/include/otbSOMMap.h
index ce181a414e..b6c3e37316 100644
--- a/Modules/Learning/SOM/include/otbSOMMap.h
+++ b/Modules/Learning/SOM/include/otbSOMMap.h
@@ -18,8 +18,8 @@ See IMTCopyright.txt for details.
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbSOMMap_h
-#define __otbSOMMap_h
+#ifndef otbSOMMap_h
+#define otbSOMMap_h
 
 #include "itkVariableLengthVector.h"
 #include "itkEuclideanDistanceMetric.h"
diff --git a/Modules/Learning/SOM/include/otbSOMMap.txx b/Modules/Learning/SOM/include/otbSOMMap.txx
index e36e4d6a66..787330da0c 100644
--- a/Modules/Learning/SOM/include/otbSOMMap.txx
+++ b/Modules/Learning/SOM/include/otbSOMMap.txx
@@ -18,8 +18,8 @@ See IMTCopyright.txt for details.
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbSOMMap_txx
-#define __otbSOMMap_txx
+#ifndef otbSOMMap_txx
+#define otbSOMMap_txx
 
 #include "itkImageRegionIteratorWithIndex.h"
 
diff --git a/Modules/Learning/SOM/include/otbSOMWithMissingValue.h b/Modules/Learning/SOM/include/otbSOMWithMissingValue.h
index 89f0e2a7db..948e18d6a2 100644
--- a/Modules/Learning/SOM/include/otbSOMWithMissingValue.h
+++ b/Modules/Learning/SOM/include/otbSOMWithMissingValue.h
@@ -17,8 +17,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbSOMWithMissingValue_h
-#define __otbSOMWithMissingValue_h
+#ifndef otbSOMWithMissingValue_h
+#define otbSOMWithMissingValue_h
 
 #include "otbPeriodicSOM.h"
 
diff --git a/Modules/Learning/SOM/include/otbSOMWithMissingValue.txx b/Modules/Learning/SOM/include/otbSOMWithMissingValue.txx
index 841dbda280..5e99c19024 100644
--- a/Modules/Learning/SOM/include/otbSOMWithMissingValue.txx
+++ b/Modules/Learning/SOM/include/otbSOMWithMissingValue.txx
@@ -17,8 +17,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbSOMWithMissingValue_txx
-#define __otbSOMWithMissingValue_txx
+#ifndef otbSOMWithMissingValue_txx
+#define otbSOMWithMissingValue_txx
 
 #include "otbSOMWithMissingValue.h"
 
diff --git a/Modules/Learning/SOM/include/otbSOMbasedImageFilter.h b/Modules/Learning/SOM/include/otbSOMbasedImageFilter.h
index f8aea7ec7e..a2a23c625a 100644
--- a/Modules/Learning/SOM/include/otbSOMbasedImageFilter.h
+++ b/Modules/Learning/SOM/include/otbSOMbasedImageFilter.h
@@ -18,8 +18,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbSOMbasedImageFilter_h
-#define __otbSOMbasedImageFilter_h
+#ifndef otbSOMbasedImageFilter_h
+#define otbSOMbasedImageFilter_h
 
 #include "itkMacro.h"
 #include "itkUnaryFunctorImageFilter.h"
diff --git a/Modules/Learning/SOM/include/otbSOMbasedImageFilter.txx b/Modules/Learning/SOM/include/otbSOMbasedImageFilter.txx
index 6e6e4f1a62..8b80759ba4 100644
--- a/Modules/Learning/SOM/include/otbSOMbasedImageFilter.txx
+++ b/Modules/Learning/SOM/include/otbSOMbasedImageFilter.txx
@@ -18,8 +18,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbSOMbasedImageFilter_txx
-#define __otbSOMbasedImageFilter_txx
+#ifndef otbSOMbasedImageFilter_txx
+#define otbSOMbasedImageFilter_txx
 
 #include "otbSOMbasedImageFilter.txx"
 
diff --git a/Modules/Learning/SVMLearning/include/otbExhaustiveExponentialOptimizer.h b/Modules/Learning/SVMLearning/include/otbExhaustiveExponentialOptimizer.h
index 95a9371d5c..5a375420c0 100644
--- a/Modules/Learning/SVMLearning/include/otbExhaustiveExponentialOptimizer.h
+++ b/Modules/Learning/SVMLearning/include/otbExhaustiveExponentialOptimizer.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbExhaustiveExponentialOptimizer_h
-#define __otbExhaustiveExponentialOptimizer_h
+#ifndef otbExhaustiveExponentialOptimizer_h
+#define otbExhaustiveExponentialOptimizer_h
 
 #include "itkSingleValuedNonLinearOptimizer.h"
 
diff --git a/Modules/Learning/SVMLearning/include/otbLabelMapSVMClassifier.h b/Modules/Learning/SVMLearning/include/otbLabelMapSVMClassifier.h
index c44f4276cd..deecd34764 100644
--- a/Modules/Learning/SVMLearning/include/otbLabelMapSVMClassifier.h
+++ b/Modules/Learning/SVMLearning/include/otbLabelMapSVMClassifier.h
@@ -15,8 +15,8 @@ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbLabelMapSVMClassifier_h
-#define __otbLabelMapSVMClassifier_h
+#ifndef otbLabelMapSVMClassifier_h
+#define otbLabelMapSVMClassifier_h
 
 #include "itkInPlaceLabelMapFilter.h"
 #include "otbSVMModel.h"
diff --git a/Modules/Learning/SVMLearning/include/otbLabelMapSVMClassifier.txx b/Modules/Learning/SVMLearning/include/otbLabelMapSVMClassifier.txx
index ff13977208..040f46f34d 100644
--- a/Modules/Learning/SVMLearning/include/otbLabelMapSVMClassifier.txx
+++ b/Modules/Learning/SVMLearning/include/otbLabelMapSVMClassifier.txx
@@ -15,8 +15,8 @@ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbLabelMapSVMClassifier_txx
-#define __otbLabelMapSVMClassifier_txx
+#ifndef otbLabelMapSVMClassifier_txx
+#define otbLabelMapSVMClassifier_txx
 
 #include "otbLabelMapSVMClassifier.h"
 
diff --git a/Modules/Learning/SVMLearning/include/otbObjectDetectionClassifier.h b/Modules/Learning/SVMLearning/include/otbObjectDetectionClassifier.h
index 9dcaa0f722..38fcf35cba 100644
--- a/Modules/Learning/SVMLearning/include/otbObjectDetectionClassifier.h
+++ b/Modules/Learning/SVMLearning/include/otbObjectDetectionClassifier.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbObjectDetectionClassifier_h
-#define __otbObjectDetectionClassifier_h
+#ifndef otbObjectDetectionClassifier_h
+#define otbObjectDetectionClassifier_h
 
 #include <vector>
 
diff --git a/Modules/Learning/SVMLearning/include/otbObjectDetectionClassifier.txx b/Modules/Learning/SVMLearning/include/otbObjectDetectionClassifier.txx
index 1cad8598e1..8b41cb9f77 100644
--- a/Modules/Learning/SVMLearning/include/otbObjectDetectionClassifier.txx
+++ b/Modules/Learning/SVMLearning/include/otbObjectDetectionClassifier.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbObjectDetectionClassifier_txx
-#define __otbObjectDetectionClassifier_txx
+#ifndef otbObjectDetectionClassifier_txx
+#define otbObjectDetectionClassifier_txx
 
 #include "otbObjectDetectionClassifier.h"
 
diff --git a/Modules/Learning/SVMLearning/include/otbSVMClassifier.h b/Modules/Learning/SVMLearning/include/otbSVMClassifier.h
index 9655b0f756..58e3ca9483 100644
--- a/Modules/Learning/SVMLearning/include/otbSVMClassifier.h
+++ b/Modules/Learning/SVMLearning/include/otbSVMClassifier.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbSVMClassifier_h
-#define __otbSVMClassifier_h
+#ifndef otbSVMClassifier_h
+#define otbSVMClassifier_h
 
 #include "vcl_deprecated_header.h"
 
diff --git a/Modules/Learning/SVMLearning/include/otbSVMClassifier.txx b/Modules/Learning/SVMLearning/include/otbSVMClassifier.txx
index 6609f063ba..f8f65ee674 100644
--- a/Modules/Learning/SVMLearning/include/otbSVMClassifier.txx
+++ b/Modules/Learning/SVMLearning/include/otbSVMClassifier.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbSVMClassifier_txx
-#define __otbSVMClassifier_txx
+#ifndef otbSVMClassifier_txx
+#define otbSVMClassifier_txx
 
 #include "otbSVMClassifier.h"
 #include "otbMacro.h"
diff --git a/Modules/Learning/SVMLearning/include/otbSVMCrossValidationCostFunction.h b/Modules/Learning/SVMLearning/include/otbSVMCrossValidationCostFunction.h
index 3ebbfd8255..72d33538ac 100644
--- a/Modules/Learning/SVMLearning/include/otbSVMCrossValidationCostFunction.h
+++ b/Modules/Learning/SVMLearning/include/otbSVMCrossValidationCostFunction.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbSVMCrossValidationCostFunction_h
-#define __otbSVMCrossValidationCostFunction_h
+#ifndef otbSVMCrossValidationCostFunction_h
+#define otbSVMCrossValidationCostFunction_h
 
 #include "otbSVMModel.h"
 #include "itkSingleValuedCostFunction.h"
diff --git a/Modules/Learning/SVMLearning/include/otbSVMCrossValidationCostFunction.txx b/Modules/Learning/SVMLearning/include/otbSVMCrossValidationCostFunction.txx
index e09dd8248e..54cc670d01 100644
--- a/Modules/Learning/SVMLearning/include/otbSVMCrossValidationCostFunction.txx
+++ b/Modules/Learning/SVMLearning/include/otbSVMCrossValidationCostFunction.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbSVMCrossValidationCostFunction_txx
-#define __otbSVMCrossValidationCostFunction_txx
+#ifndef otbSVMCrossValidationCostFunction_txx
+#define otbSVMCrossValidationCostFunction_txx
 
 #include "otbSVMCrossValidationCostFunction.h"
 
diff --git a/Modules/Learning/SVMLearning/include/otbSVMImageClassificationFilter.h b/Modules/Learning/SVMLearning/include/otbSVMImageClassificationFilter.h
index dfaa1c110e..5513fe4a7c 100644
--- a/Modules/Learning/SVMLearning/include/otbSVMImageClassificationFilter.h
+++ b/Modules/Learning/SVMLearning/include/otbSVMImageClassificationFilter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbSVMImageClassificationFilter_h
-#define __otbSVMImageClassificationFilter_h
+#ifndef otbSVMImageClassificationFilter_h
+#define otbSVMImageClassificationFilter_h
 
 #include "vcl_deprecated_header.h"
 
diff --git a/Modules/Learning/SVMLearning/include/otbSVMImageClassificationFilter.txx b/Modules/Learning/SVMLearning/include/otbSVMImageClassificationFilter.txx
index 03b9d141f3..e81146ad62 100644
--- a/Modules/Learning/SVMLearning/include/otbSVMImageClassificationFilter.txx
+++ b/Modules/Learning/SVMLearning/include/otbSVMImageClassificationFilter.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbSVMImageClassificationFilter_txx
-#define __otbSVMImageClassificationFilter_txx
+#ifndef otbSVMImageClassificationFilter_txx
+#define otbSVMImageClassificationFilter_txx
 
 #include "otbSVMImageClassificationFilter.h"
 #include "itkImageRegionIterator.h"
diff --git a/Modules/Learning/SVMLearning/include/otbSVMImageClassificationWithRuleFilter.h b/Modules/Learning/SVMLearning/include/otbSVMImageClassificationWithRuleFilter.h
index 3a333fea80..04429d0d0c 100644
--- a/Modules/Learning/SVMLearning/include/otbSVMImageClassificationWithRuleFilter.h
+++ b/Modules/Learning/SVMLearning/include/otbSVMImageClassificationWithRuleFilter.h
@@ -18,8 +18,8 @@
 
 =========================================================================*/
 
-#ifndef __otbSVMImageClassificationWithRuleFilter_h
-#define __otbSVMImageClassificationWithRuleFilter_h
+#ifndef otbSVMImageClassificationWithRuleFilter_h
+#define otbSVMImageClassificationWithRuleFilter_h
 
 #include "otbSVMImageClassificationFilter.h"
 #include "otbVectorImage.h"
diff --git a/Modules/Learning/SVMLearning/include/otbSVMImageClassificationWithRuleFilter.txx b/Modules/Learning/SVMLearning/include/otbSVMImageClassificationWithRuleFilter.txx
index cc7ad7f23f..72cc653cb5 100644
--- a/Modules/Learning/SVMLearning/include/otbSVMImageClassificationWithRuleFilter.txx
+++ b/Modules/Learning/SVMLearning/include/otbSVMImageClassificationWithRuleFilter.txx
@@ -18,8 +18,8 @@
 
 =========================================================================*/
 
-#ifndef __otbSVMImageClassificationWithRuleFilter_txx
-#define __otbSVMImageClassificationWithRuleFilter_txx
+#ifndef otbSVMImageClassificationWithRuleFilter_txx
+#define otbSVMImageClassificationWithRuleFilter_txx
 #include "otbSVMImageClassificationWithRuleFilter.h"
 
 #include "itkNumericTraits.h"
diff --git a/Modules/Learning/SVMLearning/include/otbSVMImageModelEstimator.h b/Modules/Learning/SVMLearning/include/otbSVMImageModelEstimator.h
index dbcf5bb0a2..22818a796c 100644
--- a/Modules/Learning/SVMLearning/include/otbSVMImageModelEstimator.h
+++ b/Modules/Learning/SVMLearning/include/otbSVMImageModelEstimator.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbSVMImageModelEstimator_h
-#define __otbSVMImageModelEstimator_h
+#ifndef otbSVMImageModelEstimator_h
+#define otbSVMImageModelEstimator_h
 
 #include "vcl_deprecated_header.h"
 
diff --git a/Modules/Learning/SVMLearning/include/otbSVMImageModelEstimator.txx b/Modules/Learning/SVMLearning/include/otbSVMImageModelEstimator.txx
index edb0f12c30..c92d5034ae 100644
--- a/Modules/Learning/SVMLearning/include/otbSVMImageModelEstimator.txx
+++ b/Modules/Learning/SVMLearning/include/otbSVMImageModelEstimator.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbSVMImageModelEstimator_txx
-#define __otbSVMImageModelEstimator_txx
+#ifndef otbSVMImageModelEstimator_txx
+#define otbSVMImageModelEstimator_txx
 
 #include "otbSVMImageModelEstimator.h"
 #include "otbMacro.h"
diff --git a/Modules/Learning/SVMLearning/include/otbSVMMarginSampler.h b/Modules/Learning/SVMLearning/include/otbSVMMarginSampler.h
index e3e9ec32f0..ad9e72e92e 100644
--- a/Modules/Learning/SVMLearning/include/otbSVMMarginSampler.h
+++ b/Modules/Learning/SVMLearning/include/otbSVMMarginSampler.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbSVMMarginSampler_h
-#define __otbSVMMarginSampler_h
+#ifndef otbSVMMarginSampler_h
+#define otbSVMMarginSampler_h
 
 #include "itkSampleClassifierFilter.h"
 #include "itkVectorImage.h"
diff --git a/Modules/Learning/SVMLearning/include/otbSVMMarginSampler.txx b/Modules/Learning/SVMLearning/include/otbSVMMarginSampler.txx
index 48f617a149..513b09ce50 100644
--- a/Modules/Learning/SVMLearning/include/otbSVMMarginSampler.txx
+++ b/Modules/Learning/SVMLearning/include/otbSVMMarginSampler.txx
@@ -15,8 +15,8 @@ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbSVMMarginSampler_txx
-#define __otbSVMMarginSampler_txx
+#ifndef otbSVMMarginSampler_txx
+#define otbSVMMarginSampler_txx
 
 #include "otbSVMMarginSampler.h"
 #include "otbMacro.h"
diff --git a/Modules/Learning/SVMLearning/include/otbSVMModel.h b/Modules/Learning/SVMLearning/include/otbSVMModel.h
index b6298bc3bc..482f306659 100644
--- a/Modules/Learning/SVMLearning/include/otbSVMModel.h
+++ b/Modules/Learning/SVMLearning/include/otbSVMModel.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbSVMModel_h
-#define __otbSVMModel_h
+#ifndef otbSVMModel_h
+#define otbSVMModel_h
 
 #include "itkObjectFactory.h"
 #include "itkDataObject.h"
diff --git a/Modules/Learning/SVMLearning/include/otbSVMModel.txx b/Modules/Learning/SVMLearning/include/otbSVMModel.txx
index d7a59f3b8e..324d67f94a 100644
--- a/Modules/Learning/SVMLearning/include/otbSVMModel.txx
+++ b/Modules/Learning/SVMLearning/include/otbSVMModel.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbSVMModel_txx
-#define __otbSVMModel_txx
+#ifndef otbSVMModel_txx
+#define otbSVMModel_txx
 #include "otbSVMModel.h"
 #include "otbMacro.h"
 
diff --git a/Modules/Learning/SVMLearning/include/otbSVMModelEstimator.h b/Modules/Learning/SVMLearning/include/otbSVMModelEstimator.h
index 381a1d119b..6d899bc3ef 100644
--- a/Modules/Learning/SVMLearning/include/otbSVMModelEstimator.h
+++ b/Modules/Learning/SVMLearning/include/otbSVMModelEstimator.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbSVMModelEstimator_h
-#define __otbSVMModelEstimator_h
+#ifndef otbSVMModelEstimator_h
+#define otbSVMModelEstimator_h
 
 #include "otbSVMModel.h"
 #include "itkProcessObject.h"
diff --git a/Modules/Learning/SVMLearning/include/otbSVMModelEstimator.txx b/Modules/Learning/SVMLearning/include/otbSVMModelEstimator.txx
index 97a9793261..df7ec69f58 100644
--- a/Modules/Learning/SVMLearning/include/otbSVMModelEstimator.txx
+++ b/Modules/Learning/SVMLearning/include/otbSVMModelEstimator.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbSVMModelEstimator_txx
-#define __otbSVMModelEstimator_txx
+#ifndef otbSVMModelEstimator_txx
+#define otbSVMModelEstimator_txx
 
 #include "otbSVMModelEstimator.h"
 #include "otbSVMCrossValidationCostFunction.h"
diff --git a/Modules/Learning/SVMLearning/include/otbSVMPointSetModelEstimator.h b/Modules/Learning/SVMLearning/include/otbSVMPointSetModelEstimator.h
index 47f22fb617..868556e48d 100644
--- a/Modules/Learning/SVMLearning/include/otbSVMPointSetModelEstimator.h
+++ b/Modules/Learning/SVMLearning/include/otbSVMPointSetModelEstimator.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbSVMPointSetModelEstimator_h
-#define __otbSVMPointSetModelEstimator_h
+#ifndef otbSVMPointSetModelEstimator_h
+#define otbSVMPointSetModelEstimator_h
 
 #include "vcl_deprecated_header.h"
 
diff --git a/Modules/Learning/SVMLearning/include/otbSVMPointSetModelEstimator.txx b/Modules/Learning/SVMLearning/include/otbSVMPointSetModelEstimator.txx
index 0c6cabbc8c..4734e9ed85 100644
--- a/Modules/Learning/SVMLearning/include/otbSVMPointSetModelEstimator.txx
+++ b/Modules/Learning/SVMLearning/include/otbSVMPointSetModelEstimator.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbSVMPointSetModelEstimator_txx
-#define __otbSVMPointSetModelEstimator_txx
+#ifndef otbSVMPointSetModelEstimator_txx
+#define otbSVMPointSetModelEstimator_txx
 
 #include "otbSVMPointSetModelEstimator.h"
 #include "itkCommand.h"
diff --git a/Modules/Learning/SVMLearning/include/otbSVMSampleListModelEstimator.h b/Modules/Learning/SVMLearning/include/otbSVMSampleListModelEstimator.h
index 97a073bb53..a2484976ac 100644
--- a/Modules/Learning/SVMLearning/include/otbSVMSampleListModelEstimator.h
+++ b/Modules/Learning/SVMLearning/include/otbSVMSampleListModelEstimator.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbSVMSampleListModelEstimator_h
-#define __otbSVMSampleListModelEstimator_h
+#ifndef otbSVMSampleListModelEstimator_h
+#define otbSVMSampleListModelEstimator_h
 
 #include "vcl_deprecated_header.h"
 
diff --git a/Modules/Learning/SVMLearning/include/otbSVMSampleListModelEstimator.txx b/Modules/Learning/SVMLearning/include/otbSVMSampleListModelEstimator.txx
index b62a91cb17..d85122ec1c 100644
--- a/Modules/Learning/SVMLearning/include/otbSVMSampleListModelEstimator.txx
+++ b/Modules/Learning/SVMLearning/include/otbSVMSampleListModelEstimator.txx
@@ -16,8 +16,8 @@
 
 =========================================================================*/
 
-#ifndef __otbSVMSampleListModelEstimator_txx
-#define __otbSVMSampleListModelEstimator_txx
+#ifndef otbSVMSampleListModelEstimator_txx
+#define otbSVMSampleListModelEstimator_txx
 
 #include "otbSVMSampleListModelEstimator.h"
 #include "itkCommand.h"
diff --git a/Modules/Learning/Sampling/include/otbOGRDataToClassStatisticsFilter.h b/Modules/Learning/Sampling/include/otbOGRDataToClassStatisticsFilter.h
index 920d413daf..6f4d9ee22b 100644
--- a/Modules/Learning/Sampling/include/otbOGRDataToClassStatisticsFilter.h
+++ b/Modules/Learning/Sampling/include/otbOGRDataToClassStatisticsFilter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbOGRDataToClassStatisticsFilter_h
-#define __otbOGRDataToClassStatisticsFilter_h
+#ifndef otbOGRDataToClassStatisticsFilter_h
+#define otbOGRDataToClassStatisticsFilter_h
 
 #include "otbPersistentImageFilter.h"
 #include "otbPersistentFilterStreamingDecorator.h"
diff --git a/Modules/Learning/Sampling/include/otbOGRDataToClassStatisticsFilter.txx b/Modules/Learning/Sampling/include/otbOGRDataToClassStatisticsFilter.txx
index 880e1d19f1..0fee32a39d 100644
--- a/Modules/Learning/Sampling/include/otbOGRDataToClassStatisticsFilter.txx
+++ b/Modules/Learning/Sampling/include/otbOGRDataToClassStatisticsFilter.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbOGRDataToClassStatisticsFilter_txx
-#define __otbOGRDataToClassStatisticsFilter_txx
+#ifndef otbOGRDataToClassStatisticsFilter_txx
+#define otbOGRDataToClassStatisticsFilter_txx
 
 #include "otbMaskedIteratorDecorator.h"
 #include "itkImageRegionConstIteratorWithOnlyIndex.h"
diff --git a/Modules/Learning/Sampling/include/otbPolygonClassStatisticsAccumulator.h b/Modules/Learning/Sampling/include/otbPolygonClassStatisticsAccumulator.h
index c3750029e2..8c703c6c23 100644
--- a/Modules/Learning/Sampling/include/otbPolygonClassStatisticsAccumulator.h
+++ b/Modules/Learning/Sampling/include/otbPolygonClassStatisticsAccumulator.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbPolygonClassStatisticsAccumulator_h
-#define __otbPolygonClassStatisticsAccumulator_h
+#ifndef otbPolygonClassStatisticsAccumulator_h
+#define otbPolygonClassStatisticsAccumulator_h
 
 #include "otbOGRDataSourceWrapper.h"
 
diff --git a/Modules/Learning/Sampling/include/otbPolygonClassStatisticsAccumulator.txx b/Modules/Learning/Sampling/include/otbPolygonClassStatisticsAccumulator.txx
index d0812e3a07..def2370b43 100644
--- a/Modules/Learning/Sampling/include/otbPolygonClassStatisticsAccumulator.txx
+++ b/Modules/Learning/Sampling/include/otbPolygonClassStatisticsAccumulator.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbPolygonClassStatisticsAccumulator_txx
-#define __otbPolygonClassStatisticsAccumulator_txx
+#ifndef otbPolygonClassStatisticsAccumulator_txx
+#define otbPolygonClassStatisticsAccumulator_txx
 
 #include "otbPolygonClassStatisticsAccumulator.h"
 #include "otbMacro.h"
diff --git a/Modules/Learning/Supervised/include/otbBoostMachineLearningModel.h b/Modules/Learning/Supervised/include/otbBoostMachineLearningModel.h
index abf5a9f0c9..ba95eeaa14 100644
--- a/Modules/Learning/Supervised/include/otbBoostMachineLearningModel.h
+++ b/Modules/Learning/Supervised/include/otbBoostMachineLearningModel.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbBoostMachineLearningModel_h
-#define __otbBoostMachineLearningModel_h
+#ifndef otbBoostMachineLearningModel_h
+#define otbBoostMachineLearningModel_h
 
 #include "otbRequiresOpenCVCheck.h"
 
diff --git a/Modules/Learning/Supervised/include/otbBoostMachineLearningModel.txx b/Modules/Learning/Supervised/include/otbBoostMachineLearningModel.txx
index 15a9d5c293..dfd656a223 100644
--- a/Modules/Learning/Supervised/include/otbBoostMachineLearningModel.txx
+++ b/Modules/Learning/Supervised/include/otbBoostMachineLearningModel.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbBoostMachineLearningModel_txx
-#define __otbBoostMachineLearningModel_txx
+#ifndef otbBoostMachineLearningModel_txx
+#define otbBoostMachineLearningModel_txx
 
 #include "otbBoostMachineLearningModel.h"
 #include "otbOpenCVUtils.h"
diff --git a/Modules/Learning/Supervised/include/otbBoostMachineLearningModelFactory.h b/Modules/Learning/Supervised/include/otbBoostMachineLearningModelFactory.h
index 990ee6a03b..27f3251405 100644
--- a/Modules/Learning/Supervised/include/otbBoostMachineLearningModelFactory.h
+++ b/Modules/Learning/Supervised/include/otbBoostMachineLearningModelFactory.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbBoostMachineLearningModelFactory_h
-#define __otbBoostMachineLearningModelFactory_h
+#ifndef otbBoostMachineLearningModelFactory_h
+#define otbBoostMachineLearningModelFactory_h
 
 #include "otbRequiresOpenCVCheck.h"
 
diff --git a/Modules/Learning/Supervised/include/otbConfusionMatrixCalculator.h b/Modules/Learning/Supervised/include/otbConfusionMatrixCalculator.h
index 2615283e02..8f1390c144 100644
--- a/Modules/Learning/Supervised/include/otbConfusionMatrixCalculator.h
+++ b/Modules/Learning/Supervised/include/otbConfusionMatrixCalculator.h
@@ -16,8 +16,8 @@
 
 =========================================================================*/
 
-#ifndef __otbConfusionMatrixCalculator_h
-#define __otbConfusionMatrixCalculator_h
+#ifndef otbConfusionMatrixCalculator_h
+#define otbConfusionMatrixCalculator_h
 
 #include "otbMacro.h"
 #include "otbConfusionMatrixMeasurements.h"
diff --git a/Modules/Learning/Supervised/include/otbConfusionMatrixCalculator.txx b/Modules/Learning/Supervised/include/otbConfusionMatrixCalculator.txx
index 305220a919..4f0ab5f78a 100644
--- a/Modules/Learning/Supervised/include/otbConfusionMatrixCalculator.txx
+++ b/Modules/Learning/Supervised/include/otbConfusionMatrixCalculator.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbConfusionMatrixCalculator_txx
-#define __otbConfusionMatrixCalculator_txx
+#ifndef otbConfusionMatrixCalculator_txx
+#define otbConfusionMatrixCalculator_txx
 
 
 namespace otb
diff --git a/Modules/Learning/Supervised/include/otbConfusionMatrixMeasurements.h b/Modules/Learning/Supervised/include/otbConfusionMatrixMeasurements.h
index 5834da0f87..e2dd235ee9 100644
--- a/Modules/Learning/Supervised/include/otbConfusionMatrixMeasurements.h
+++ b/Modules/Learning/Supervised/include/otbConfusionMatrixMeasurements.h
@@ -16,8 +16,8 @@
 
 =========================================================================*/
 
-#ifndef __otbConfusionMatrixMeasurements_h
-#define __otbConfusionMatrixMeasurements_h
+#ifndef otbConfusionMatrixMeasurements_h
+#define otbConfusionMatrixMeasurements_h
 
 #include "itkObject.h"
 #include "itkObjectFactory.h"
diff --git a/Modules/Learning/Supervised/include/otbConfusionMatrixMeasurements.txx b/Modules/Learning/Supervised/include/otbConfusionMatrixMeasurements.txx
index da4dcb4940..6bd4c2cb58 100644
--- a/Modules/Learning/Supervised/include/otbConfusionMatrixMeasurements.txx
+++ b/Modules/Learning/Supervised/include/otbConfusionMatrixMeasurements.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbConfusionMatrixMeasurements_txx
-#define __otbConfusionMatrixMeasurements_txx
+#ifndef otbConfusionMatrixMeasurements_txx
+#define otbConfusionMatrixMeasurements_txx
 
 
 namespace otb
diff --git a/Modules/Learning/Supervised/include/otbCvRTreesWrapper.h b/Modules/Learning/Supervised/include/otbCvRTreesWrapper.h
index dcfc2d7546..3494a4e670 100644
--- a/Modules/Learning/Supervised/include/otbCvRTreesWrapper.h
+++ b/Modules/Learning/Supervised/include/otbCvRTreesWrapper.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbCvRTreesWrapper_h
-#define __otbCvRTreesWrapper_h
+#ifndef otbCvRTreesWrapper_h
+#define otbCvRTreesWrapper_h
 
 #include "otbOpenCVUtils.h"
 #include <vector>
diff --git a/Modules/Learning/Supervised/include/otbDecisionTreeMachineLearningModel.h b/Modules/Learning/Supervised/include/otbDecisionTreeMachineLearningModel.h
index ff626f27cb..571bbd597a 100644
--- a/Modules/Learning/Supervised/include/otbDecisionTreeMachineLearningModel.h
+++ b/Modules/Learning/Supervised/include/otbDecisionTreeMachineLearningModel.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbDecisionTreeMachineLearningModel_h
-#define __otbDecisionTreeMachineLearningModel_h
+#ifndef otbDecisionTreeMachineLearningModel_h
+#define otbDecisionTreeMachineLearningModel_h
 
 #include "otbRequiresOpenCVCheck.h"
 
diff --git a/Modules/Learning/Supervised/include/otbDecisionTreeMachineLearningModel.txx b/Modules/Learning/Supervised/include/otbDecisionTreeMachineLearningModel.txx
index 283fb039c3..ddaf2e871f 100644
--- a/Modules/Learning/Supervised/include/otbDecisionTreeMachineLearningModel.txx
+++ b/Modules/Learning/Supervised/include/otbDecisionTreeMachineLearningModel.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbDecisionTreeMachineLearningModel_txx
-#define __otbDecisionTreeMachineLearningModel_txx
+#ifndef otbDecisionTreeMachineLearningModel_txx
+#define otbDecisionTreeMachineLearningModel_txx
 
 #include "otbDecisionTreeMachineLearningModel.h"
 #include "otbOpenCVUtils.h"
diff --git a/Modules/Learning/Supervised/include/otbDecisionTreeMachineLearningModelFactory.h b/Modules/Learning/Supervised/include/otbDecisionTreeMachineLearningModelFactory.h
index 73a03c0be6..c38907a872 100644
--- a/Modules/Learning/Supervised/include/otbDecisionTreeMachineLearningModelFactory.h
+++ b/Modules/Learning/Supervised/include/otbDecisionTreeMachineLearningModelFactory.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbDecisionTreeMachineLearningModelFactory_h
-#define __otbDecisionTreeMachineLearningModelFactory_h
+#ifndef otbDecisionTreeMachineLearningModelFactory_h
+#define otbDecisionTreeMachineLearningModelFactory_h
 
 #include "otbRequiresOpenCVCheck.h"
 
diff --git a/Modules/Learning/Supervised/include/otbGradientBoostedTreeMachineLearningModel.h b/Modules/Learning/Supervised/include/otbGradientBoostedTreeMachineLearningModel.h
index 029fb7d380..4221da6df8 100644
--- a/Modules/Learning/Supervised/include/otbGradientBoostedTreeMachineLearningModel.h
+++ b/Modules/Learning/Supervised/include/otbGradientBoostedTreeMachineLearningModel.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbGradientBoostedTreeMachineLearningModel_h
-#define __otbGradientBoostedTreeMachineLearningModel_h
+#ifndef otbGradientBoostedTreeMachineLearningModel_h
+#define otbGradientBoostedTreeMachineLearningModel_h
 
 #include "otbRequiresOpenCVCheck.h"
 
diff --git a/Modules/Learning/Supervised/include/otbGradientBoostedTreeMachineLearningModel.txx b/Modules/Learning/Supervised/include/otbGradientBoostedTreeMachineLearningModel.txx
index d08abec029..49451c7be6 100644
--- a/Modules/Learning/Supervised/include/otbGradientBoostedTreeMachineLearningModel.txx
+++ b/Modules/Learning/Supervised/include/otbGradientBoostedTreeMachineLearningModel.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbGradientBoostedTreeMachineLearningModel_txx
-#define __otbGradientBoostedTreeMachineLearningModel_txx
+#ifndef otbGradientBoostedTreeMachineLearningModel_txx
+#define otbGradientBoostedTreeMachineLearningModel_txx
 
 #include "otbGradientBoostedTreeMachineLearningModel.h"
 #include "otbOpenCVUtils.h"
diff --git a/Modules/Learning/Supervised/include/otbGradientBoostedTreeMachineLearningModelFactory.h b/Modules/Learning/Supervised/include/otbGradientBoostedTreeMachineLearningModelFactory.h
index b66f790d58..1e7f11a7f6 100644
--- a/Modules/Learning/Supervised/include/otbGradientBoostedTreeMachineLearningModelFactory.h
+++ b/Modules/Learning/Supervised/include/otbGradientBoostedTreeMachineLearningModelFactory.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbGradientBoostedTreeMachineLearningModelFactory_h
-#define __otbGradientBoostedTreeMachineLearningModelFactory_h
+#ifndef otbGradientBoostedTreeMachineLearningModelFactory_h
+#define otbGradientBoostedTreeMachineLearningModelFactory_h
 
 #include "otbRequiresOpenCVCheck.h"
 
diff --git a/Modules/Learning/Supervised/include/otbImageClassificationFilter.h b/Modules/Learning/Supervised/include/otbImageClassificationFilter.h
index 156c772f15..e8ee652f0f 100644
--- a/Modules/Learning/Supervised/include/otbImageClassificationFilter.h
+++ b/Modules/Learning/Supervised/include/otbImageClassificationFilter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbImageClassificationFilter_h
-#define __otbImageClassificationFilter_h
+#ifndef otbImageClassificationFilter_h
+#define otbImageClassificationFilter_h
 
 #include "itkImageToImageFilter.h"
 #include "otbMachineLearningModel.h"
diff --git a/Modules/Learning/Supervised/include/otbImageClassificationFilter.txx b/Modules/Learning/Supervised/include/otbImageClassificationFilter.txx
index b0a5d5e3e8..95c00b5a1b 100644
--- a/Modules/Learning/Supervised/include/otbImageClassificationFilter.txx
+++ b/Modules/Learning/Supervised/include/otbImageClassificationFilter.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbImageClassificationFilter_txx
-#define __otbImageClassificationFilter_txx
+#ifndef otbImageClassificationFilter_txx
+#define otbImageClassificationFilter_txx
 
 #include "otbImageClassificationFilter.h"
 #include "itkImageRegionIterator.h"
diff --git a/Modules/Learning/Supervised/include/otbKNearestNeighborsMachineLearningModel.h b/Modules/Learning/Supervised/include/otbKNearestNeighborsMachineLearningModel.h
index c9fc45a2b1..bc5e586972 100644
--- a/Modules/Learning/Supervised/include/otbKNearestNeighborsMachineLearningModel.h
+++ b/Modules/Learning/Supervised/include/otbKNearestNeighborsMachineLearningModel.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbKNearestNeighborsMachineLearningModel_h
-#define __otbKNearestNeighborsMachineLearningModel_h
+#ifndef otbKNearestNeighborsMachineLearningModel_h
+#define otbKNearestNeighborsMachineLearningModel_h
 
 #include "otbRequiresOpenCVCheck.h"
 
diff --git a/Modules/Learning/Supervised/include/otbKNearestNeighborsMachineLearningModel.txx b/Modules/Learning/Supervised/include/otbKNearestNeighborsMachineLearningModel.txx
index fd33b7c906..83b55bb7a2 100644
--- a/Modules/Learning/Supervised/include/otbKNearestNeighborsMachineLearningModel.txx
+++ b/Modules/Learning/Supervised/include/otbKNearestNeighborsMachineLearningModel.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbKNearestNeighborsMachineLearningModel_txx
-#define __otbKNearestNeighborsMachineLearningModel_txx
+#ifndef otbKNearestNeighborsMachineLearningModel_txx
+#define otbKNearestNeighborsMachineLearningModel_txx
 
 #include <boost/lexical_cast.hpp>
 #include "otbKNearestNeighborsMachineLearningModel.h"
diff --git a/Modules/Learning/Supervised/include/otbKNearestNeighborsMachineLearningModelFactory.h b/Modules/Learning/Supervised/include/otbKNearestNeighborsMachineLearningModelFactory.h
index ab2dbe7fdd..c8a96eadea 100644
--- a/Modules/Learning/Supervised/include/otbKNearestNeighborsMachineLearningModelFactory.h
+++ b/Modules/Learning/Supervised/include/otbKNearestNeighborsMachineLearningModelFactory.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbKNearestNeighborsMachineLearningModelFactory_h
-#define __otbKNearestNeighborsMachineLearningModelFactory_h
+#ifndef otbKNearestNeighborsMachineLearningModelFactory_h
+#define otbKNearestNeighborsMachineLearningModelFactory_h
 
 #include "otbRequiresOpenCVCheck.h"
 
diff --git a/Modules/Learning/Supervised/include/otbLibSVMMachineLearningModel.h b/Modules/Learning/Supervised/include/otbLibSVMMachineLearningModel.h
index 0dc98e066f..b398f7d640 100644
--- a/Modules/Learning/Supervised/include/otbLibSVMMachineLearningModel.h
+++ b/Modules/Learning/Supervised/include/otbLibSVMMachineLearningModel.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbLibSVMMachineLearningModel_h
-#define __otbLibSVMMachineLearningModel_h
+#ifndef otbLibSVMMachineLearningModel_h
+#define otbLibSVMMachineLearningModel_h
 
 #include "itkLightObject.h"
 #include "itkFixedArray.h"
diff --git a/Modules/Learning/Supervised/include/otbLibSVMMachineLearningModel.txx b/Modules/Learning/Supervised/include/otbLibSVMMachineLearningModel.txx
index e95e97543d..443f355717 100644
--- a/Modules/Learning/Supervised/include/otbLibSVMMachineLearningModel.txx
+++ b/Modules/Learning/Supervised/include/otbLibSVMMachineLearningModel.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbLibSVMMachineLearningModel_txx
-#define __otbLibSVMMachineLearningModel_txx
+#ifndef otbLibSVMMachineLearningModel_txx
+#define otbLibSVMMachineLearningModel_txx
 
 #include <fstream>
 #include "otbLibSVMMachineLearningModel.h"
diff --git a/Modules/Learning/Supervised/include/otbLibSVMMachineLearningModelFactory.h b/Modules/Learning/Supervised/include/otbLibSVMMachineLearningModelFactory.h
index c9f4acc054..5b72bf775b 100644
--- a/Modules/Learning/Supervised/include/otbLibSVMMachineLearningModelFactory.h
+++ b/Modules/Learning/Supervised/include/otbLibSVMMachineLearningModelFactory.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbLibSVMMachineLearningModelFactory_h
-#define __otbLibSVMMachineLearningModelFactory_h
+#ifndef otbLibSVMMachineLearningModelFactory_h
+#define otbLibSVMMachineLearningModelFactory_h
 
 #include "itkObjectFactoryBase.h"
 #include "itkImageIOBase.h"
diff --git a/Modules/Learning/Supervised/include/otbMachineLearningModel.h b/Modules/Learning/Supervised/include/otbMachineLearningModel.h
index 3f66f30518..dea22a6177 100644
--- a/Modules/Learning/Supervised/include/otbMachineLearningModel.h
+++ b/Modules/Learning/Supervised/include/otbMachineLearningModel.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbMachineLearningModel_h
-#define __otbMachineLearningModel_h
+#ifndef otbMachineLearningModel_h
+#define otbMachineLearningModel_h
 
 #include "itkObject.h"
 #include "itkVariableLengthVector.h"
diff --git a/Modules/Learning/Supervised/include/otbMachineLearningModel.txx b/Modules/Learning/Supervised/include/otbMachineLearningModel.txx
index 8cc82055fe..c3954072cc 100644
--- a/Modules/Learning/Supervised/include/otbMachineLearningModel.txx
+++ b/Modules/Learning/Supervised/include/otbMachineLearningModel.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbMachineLearningModel_txx
-#define __otbMachineLearningModel_txx
+#ifndef otbMachineLearningModel_txx
+#define otbMachineLearningModel_txx
 
 #include "otbMachineLearningModel.h"
 
diff --git a/Modules/Learning/Supervised/include/otbMachineLearningModelFactory.h b/Modules/Learning/Supervised/include/otbMachineLearningModelFactory.h
index 492a45ac61..cba071dbe1 100644
--- a/Modules/Learning/Supervised/include/otbMachineLearningModelFactory.h
+++ b/Modules/Learning/Supervised/include/otbMachineLearningModelFactory.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbMachineLearningModelFactory_h
-#define __otbMachineLearningModelFactory_h
+#ifndef otbMachineLearningModelFactory_h
+#define otbMachineLearningModelFactory_h
 
 #include "otbMachineLearningModel.h"
 #include "otbMachineLearningModelFactoryBase.h"
diff --git a/Modules/Learning/Supervised/include/otbMachineLearningModelFactoryBase.h b/Modules/Learning/Supervised/include/otbMachineLearningModelFactoryBase.h
index 7705675fe4..0c02236527 100644
--- a/Modules/Learning/Supervised/include/otbMachineLearningModelFactoryBase.h
+++ b/Modules/Learning/Supervised/include/otbMachineLearningModelFactoryBase.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbMachineLearningModelFactoryBase_h
-#define __otbMachineLearningModelFactoryBase_h
+#ifndef otbMachineLearningModelFactoryBase_h
+#define otbMachineLearningModelFactoryBase_h
 
 #include "itkMutexLock.h"
 
diff --git a/Modules/Learning/Supervised/include/otbNeuralNetworkMachineLearningModel.h b/Modules/Learning/Supervised/include/otbNeuralNetworkMachineLearningModel.h
index 3a8eef763a..dd132b956d 100644
--- a/Modules/Learning/Supervised/include/otbNeuralNetworkMachineLearningModel.h
+++ b/Modules/Learning/Supervised/include/otbNeuralNetworkMachineLearningModel.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbNeuralNetworkMachineLearningModel_h
-#define __otbNeuralNetworkMachineLearningModel_h
+#ifndef otbNeuralNetworkMachineLearningModel_h
+#define otbNeuralNetworkMachineLearningModel_h
 
 #include "otbRequiresOpenCVCheck.h"
 
diff --git a/Modules/Learning/Supervised/include/otbNeuralNetworkMachineLearningModel.txx b/Modules/Learning/Supervised/include/otbNeuralNetworkMachineLearningModel.txx
index f55eb5375c..7be83ac990 100644
--- a/Modules/Learning/Supervised/include/otbNeuralNetworkMachineLearningModel.txx
+++ b/Modules/Learning/Supervised/include/otbNeuralNetworkMachineLearningModel.txx
@@ -15,8 +15,8 @@
  PURPOSE.  See the above copyright notices for more information.
 
  =========================================================================*/
-#ifndef __otbNeuralNetworkMachineLearningModel_txx
-#define __otbNeuralNetworkMachineLearningModel_txx
+#ifndef otbNeuralNetworkMachineLearningModel_txx
+#define otbNeuralNetworkMachineLearningModel_txx
 
 #include <fstream>
 #include "otbNeuralNetworkMachineLearningModel.h"
diff --git a/Modules/Learning/Supervised/include/otbNeuralNetworkMachineLearningModelFactory.h b/Modules/Learning/Supervised/include/otbNeuralNetworkMachineLearningModelFactory.h
index fcf5adaee0..fbdae76395 100644
--- a/Modules/Learning/Supervised/include/otbNeuralNetworkMachineLearningModelFactory.h
+++ b/Modules/Learning/Supervised/include/otbNeuralNetworkMachineLearningModelFactory.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbNeuralNetworkMachineLearningModelFactory_h
-#define __otbNeuralNetworkMachineLearningModelFactory_h
+#ifndef otbNeuralNetworkMachineLearningModelFactory_h
+#define otbNeuralNetworkMachineLearningModelFactory_h
 
 #include "otbRequiresOpenCVCheck.h"
 
diff --git a/Modules/Learning/Supervised/include/otbNormalBayesMachineLearningModel.h b/Modules/Learning/Supervised/include/otbNormalBayesMachineLearningModel.h
index f68ef83af3..f9362e970d 100644
--- a/Modules/Learning/Supervised/include/otbNormalBayesMachineLearningModel.h
+++ b/Modules/Learning/Supervised/include/otbNormalBayesMachineLearningModel.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbNormalBayesMachineLearningModel_h
-#define __otbNormalBayesMachineLearningModel_h
+#ifndef otbNormalBayesMachineLearningModel_h
+#define otbNormalBayesMachineLearningModel_h
 
 #include "otbRequiresOpenCVCheck.h"
 
diff --git a/Modules/Learning/Supervised/include/otbNormalBayesMachineLearningModel.txx b/Modules/Learning/Supervised/include/otbNormalBayesMachineLearningModel.txx
index 7538f02c88..cb10272f71 100644
--- a/Modules/Learning/Supervised/include/otbNormalBayesMachineLearningModel.txx
+++ b/Modules/Learning/Supervised/include/otbNormalBayesMachineLearningModel.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbNormalBayesMachineLearningModel_txx
-#define __otbNormalBayesMachineLearningModel_txx
+#ifndef otbNormalBayesMachineLearningModel_txx
+#define otbNormalBayesMachineLearningModel_txx
 
 #include <fstream>
 #include "itkMacro.h"
diff --git a/Modules/Learning/Supervised/include/otbNormalBayesMachineLearningModelFactory.h b/Modules/Learning/Supervised/include/otbNormalBayesMachineLearningModelFactory.h
index 726c3c2c94..6067f67f35 100644
--- a/Modules/Learning/Supervised/include/otbNormalBayesMachineLearningModelFactory.h
+++ b/Modules/Learning/Supervised/include/otbNormalBayesMachineLearningModelFactory.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbNormalBayesMachineLearningModelFactory_h
-#define __otbNormalBayesMachineLearningModelFactory_h
+#ifndef otbNormalBayesMachineLearningModelFactory_h
+#define otbNormalBayesMachineLearningModelFactory_h
 
 #include "otbRequiresOpenCVCheck.h"
 
diff --git a/Modules/Learning/Supervised/include/otbOpenCVUtils.h b/Modules/Learning/Supervised/include/otbOpenCVUtils.h
index 607c6cc559..2a7720a42b 100644
--- a/Modules/Learning/Supervised/include/otbOpenCVUtils.h
+++ b/Modules/Learning/Supervised/include/otbOpenCVUtils.h
@@ -15,8 +15,8 @@
   PURPOSE.  See the above copyright notices for more information.
 
   =========================================================================*/
-#ifndef __otbOpenCVUtils_h
-#define __otbOpenCVUtils_h
+#ifndef otbOpenCVUtils_h
+#define otbOpenCVUtils_h
 
 #include <opencv2/core/core_c.h>
 
diff --git a/Modules/Learning/Supervised/include/otbRandomForestsMachineLearningModel.h b/Modules/Learning/Supervised/include/otbRandomForestsMachineLearningModel.h
index eb8a8d069e..bc2a51ab8e 100644
--- a/Modules/Learning/Supervised/include/otbRandomForestsMachineLearningModel.h
+++ b/Modules/Learning/Supervised/include/otbRandomForestsMachineLearningModel.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbRandomForestsMachineLearningModel_h
-#define __otbRandomForestsMachineLearningModel_h
+#ifndef otbRandomForestsMachineLearningModel_h
+#define otbRandomForestsMachineLearningModel_h
 
 #include "otbRequiresOpenCVCheck.h"
 
diff --git a/Modules/Learning/Supervised/include/otbRandomForestsMachineLearningModel.txx b/Modules/Learning/Supervised/include/otbRandomForestsMachineLearningModel.txx
index aa0f054aa7..be24152a23 100644
--- a/Modules/Learning/Supervised/include/otbRandomForestsMachineLearningModel.txx
+++ b/Modules/Learning/Supervised/include/otbRandomForestsMachineLearningModel.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbRandomForestsMachineLearningModel_txx
-#define __otbRandomForestsMachineLearningModel_txx
+#ifndef otbRandomForestsMachineLearningModel_txx
+#define otbRandomForestsMachineLearningModel_txx
 
 #include <fstream>
 #include "itkMacro.h"
diff --git a/Modules/Learning/Supervised/include/otbRandomForestsMachineLearningModelFactory.h b/Modules/Learning/Supervised/include/otbRandomForestsMachineLearningModelFactory.h
index a9e7e5e611..02c97efe01 100644
--- a/Modules/Learning/Supervised/include/otbRandomForestsMachineLearningModelFactory.h
+++ b/Modules/Learning/Supervised/include/otbRandomForestsMachineLearningModelFactory.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbRandomForestsMachineLearningModelFactory_h
-#define __otbRandomForestsMachineLearningModelFactory_h
+#ifndef otbRandomForestsMachineLearningModelFactory_h
+#define otbRandomForestsMachineLearningModelFactory_h
 
 #include "otbRequiresOpenCVCheck.h"
 
diff --git a/Modules/Learning/Supervised/include/otbRequiresOpenCVCheck.h b/Modules/Learning/Supervised/include/otbRequiresOpenCVCheck.h
index 3330d8b9cf..83f73b1164 100644
--- a/Modules/Learning/Supervised/include/otbRequiresOpenCVCheck.h
+++ b/Modules/Learning/Supervised/include/otbRequiresOpenCVCheck.h
@@ -15,8 +15,8 @@
   PURPOSE.  See the above copyright notices for more information.
 
   =========================================================================*/
-#ifndef __otbRequiresOpenCVCheck_h
-#define __otbRequiresOpenCVCheck_h
+#ifndef otbRequiresOpenCVCheck_h
+#define otbRequiresOpenCVCheck_h
 
 #include "otbConfigure.h"
 #ifndef OTB_USE_OPENCV
diff --git a/Modules/Learning/Supervised/include/otbSVMMachineLearningModel.h b/Modules/Learning/Supervised/include/otbSVMMachineLearningModel.h
index 681d03f44a..06131fe76b 100644
--- a/Modules/Learning/Supervised/include/otbSVMMachineLearningModel.h
+++ b/Modules/Learning/Supervised/include/otbSVMMachineLearningModel.h
@@ -16,8 +16,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbSVMMachineLearningModel_h
-#define __otbSVMMachineLearningModel_h
+#ifndef otbSVMMachineLearningModel_h
+#define otbSVMMachineLearningModel_h
 
 #include "otbRequiresOpenCVCheck.h"
 #include "itkLightObject.h"
diff --git a/Modules/Learning/Supervised/include/otbSVMMachineLearningModel.txx b/Modules/Learning/Supervised/include/otbSVMMachineLearningModel.txx
index 9d0b7d6859..df4aace3d2 100644
--- a/Modules/Learning/Supervised/include/otbSVMMachineLearningModel.txx
+++ b/Modules/Learning/Supervised/include/otbSVMMachineLearningModel.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbSVMMachineLearningModel_txx
-#define __otbSVMMachineLearningModel_txx
+#ifndef otbSVMMachineLearningModel_txx
+#define otbSVMMachineLearningModel_txx
 
 #include <fstream>
 #include "itkMacro.h"
diff --git a/Modules/Learning/Supervised/include/otbSVMMachineLearningModelFactory.h b/Modules/Learning/Supervised/include/otbSVMMachineLearningModelFactory.h
index 3ef3fd6dad..caf2289ebb 100644
--- a/Modules/Learning/Supervised/include/otbSVMMachineLearningModelFactory.h
+++ b/Modules/Learning/Supervised/include/otbSVMMachineLearningModelFactory.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbSVMMachineLearningModelFactory_h
-#define __otbSVMMachineLearningModelFactory_h
+#ifndef otbSVMMachineLearningModelFactory_h
+#define otbSVMMachineLearningModelFactory_h
 
 #include "otbRequiresOpenCVCheck.h"
 
diff --git a/Modules/OBIA/RCC8/include/otbImageListToRCC8GraphFilter.h b/Modules/OBIA/RCC8/include/otbImageListToRCC8GraphFilter.h
index 0f04f442f0..62e2448951 100644
--- a/Modules/OBIA/RCC8/include/otbImageListToRCC8GraphFilter.h
+++ b/Modules/OBIA/RCC8/include/otbImageListToRCC8GraphFilter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbImageListToRCC8GraphFilter_h
-#define __otbImageListToRCC8GraphFilter_h
+#ifndef otbImageListToRCC8GraphFilter_h
+#define otbImageListToRCC8GraphFilter_h
 
 #include "otbRCC8GraphSource.h"
 #include "otbImageList.h"
diff --git a/Modules/OBIA/RCC8/include/otbImageListToRCC8GraphFilter.txx b/Modules/OBIA/RCC8/include/otbImageListToRCC8GraphFilter.txx
index a70a25df56..2a93c2adb6 100644
--- a/Modules/OBIA/RCC8/include/otbImageListToRCC8GraphFilter.txx
+++ b/Modules/OBIA/RCC8/include/otbImageListToRCC8GraphFilter.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbImageListToRCC8GraphFilter_txx
-#define __otbImageListToRCC8GraphFilter_txx
+#ifndef otbImageListToRCC8GraphFilter_txx
+#define otbImageListToRCC8GraphFilter_txx
 
 #include "otbImageListToRCC8GraphFilter.h"
 
diff --git a/Modules/OBIA/RCC8/include/otbImageMultiSegmentationToRCC8GraphFilter.h b/Modules/OBIA/RCC8/include/otbImageMultiSegmentationToRCC8GraphFilter.h
index 39cae56536..344ee2d2aa 100644
--- a/Modules/OBIA/RCC8/include/otbImageMultiSegmentationToRCC8GraphFilter.h
+++ b/Modules/OBIA/RCC8/include/otbImageMultiSegmentationToRCC8GraphFilter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbImageMultiSegmentationToRCC8GraphFilter_h
-#define __otbImageMultiSegmentationToRCC8GraphFilter_h
+#ifndef otbImageMultiSegmentationToRCC8GraphFilter_h
+#define otbImageMultiSegmentationToRCC8GraphFilter_h
 
 #include "otbImageListToRCC8GraphFilter.h"
 
diff --git a/Modules/OBIA/RCC8/include/otbImageMultiSegmentationToRCC8GraphFilter.txx b/Modules/OBIA/RCC8/include/otbImageMultiSegmentationToRCC8GraphFilter.txx
index 605a8ace1a..80cfc75fa9 100644
--- a/Modules/OBIA/RCC8/include/otbImageMultiSegmentationToRCC8GraphFilter.txx
+++ b/Modules/OBIA/RCC8/include/otbImageMultiSegmentationToRCC8GraphFilter.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbImageMultiSegmentationToRCC8GraphFilter_txx
-#define __otbImageMultiSegmentationToRCC8GraphFilter_txx
+#ifndef otbImageMultiSegmentationToRCC8GraphFilter_txx
+#define otbImageMultiSegmentationToRCC8GraphFilter_txx
 
 #include "otbImageMultiSegmentationToRCC8GraphFilter.h"
 #include "itkMinimumMaximumImageCalculator.h"
diff --git a/Modules/OBIA/RCC8/include/otbImageToImageRCC8Calculator.h b/Modules/OBIA/RCC8/include/otbImageToImageRCC8Calculator.h
index eb7074d168..6f6c71af38 100644
--- a/Modules/OBIA/RCC8/include/otbImageToImageRCC8Calculator.h
+++ b/Modules/OBIA/RCC8/include/otbImageToImageRCC8Calculator.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbImageToImageRCC8Calculator_h
-#define __otbImageToImageRCC8Calculator_h
+#ifndef otbImageToImageRCC8Calculator_h
+#define otbImageToImageRCC8Calculator_h
 
 #include "itkImageToImageFilter.h"
 #include "itkObjectFactory.h"
diff --git a/Modules/OBIA/RCC8/include/otbImageToImageRCC8Calculator.txx b/Modules/OBIA/RCC8/include/otbImageToImageRCC8Calculator.txx
index 91de9df3aa..c0dc617868 100644
--- a/Modules/OBIA/RCC8/include/otbImageToImageRCC8Calculator.txx
+++ b/Modules/OBIA/RCC8/include/otbImageToImageRCC8Calculator.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbImageToImageRCC8Calculator_txx
-#define __otbImageToImageRCC8Calculator_txx
+#ifndef otbImageToImageRCC8Calculator_txx
+#define otbImageToImageRCC8Calculator_txx
 
 #include "otbImageToImageRCC8Calculator.h"
 #include "itkUnaryFunctorImageFilter.h"
diff --git a/Modules/OBIA/RCC8/include/otbPolygonListToRCC8GraphFilter.h b/Modules/OBIA/RCC8/include/otbPolygonListToRCC8GraphFilter.h
index bf13e04000..86f23b833b 100644
--- a/Modules/OBIA/RCC8/include/otbPolygonListToRCC8GraphFilter.h
+++ b/Modules/OBIA/RCC8/include/otbPolygonListToRCC8GraphFilter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbPolygonListToRCC8GraphFilter_h
-#define __otbPolygonListToRCC8GraphFilter_h
+#ifndef otbPolygonListToRCC8GraphFilter_h
+#define otbPolygonListToRCC8GraphFilter_h
 
 #include "otbRCC8GraphSource.h"
 #include "otbPolygonToPolygonRCC8Calculator.h"
diff --git a/Modules/OBIA/RCC8/include/otbPolygonListToRCC8GraphFilter.txx b/Modules/OBIA/RCC8/include/otbPolygonListToRCC8GraphFilter.txx
index 4bcb28a02a..a2819f97b8 100644
--- a/Modules/OBIA/RCC8/include/otbPolygonListToRCC8GraphFilter.txx
+++ b/Modules/OBIA/RCC8/include/otbPolygonListToRCC8GraphFilter.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbPolygonListToRCC8GraphFilter_txx
-#define __otbPolygonListToRCC8GraphFilter_txx
+#ifndef otbPolygonListToRCC8GraphFilter_txx
+#define otbPolygonListToRCC8GraphFilter_txx
 
 #include "otbPolygonListToRCC8GraphFilter.h"
 #include "itkProgressReporter.h"
diff --git a/Modules/OBIA/RCC8/include/otbPolygonToPolygonRCC8Calculator.h b/Modules/OBIA/RCC8/include/otbPolygonToPolygonRCC8Calculator.h
index 4c20f280ee..2bb7acbece 100644
--- a/Modules/OBIA/RCC8/include/otbPolygonToPolygonRCC8Calculator.h
+++ b/Modules/OBIA/RCC8/include/otbPolygonToPolygonRCC8Calculator.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbPolygonToPolygonRCC8Calculator_h
-#define __otbPolygonToPolygonRCC8Calculator_h
+#ifndef otbPolygonToPolygonRCC8Calculator_h
+#define otbPolygonToPolygonRCC8Calculator_h
 
 #include "itkObject.h"
 #include "otbRCC8Value.h"
diff --git a/Modules/OBIA/RCC8/include/otbPolygonToPolygonRCC8Calculator.txx b/Modules/OBIA/RCC8/include/otbPolygonToPolygonRCC8Calculator.txx
index 83bddfdafc..84095d57dc 100644
--- a/Modules/OBIA/RCC8/include/otbPolygonToPolygonRCC8Calculator.txx
+++ b/Modules/OBIA/RCC8/include/otbPolygonToPolygonRCC8Calculator.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbPolygonToPolygonRCC8Calculator_txx
-#define __otbPolygonToPolygonRCC8Calculator_txx
+#ifndef otbPolygonToPolygonRCC8Calculator_txx
+#define otbPolygonToPolygonRCC8Calculator_txx
 
 #include "otbPolygonToPolygonRCC8Calculator.h"
 #include "otbMacro.h"
diff --git a/Modules/OBIA/RCC8/include/otbRCC8Edge.h b/Modules/OBIA/RCC8/include/otbRCC8Edge.h
index 4ffce97e22..dd31ad03cd 100644
--- a/Modules/OBIA/RCC8/include/otbRCC8Edge.h
+++ b/Modules/OBIA/RCC8/include/otbRCC8Edge.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbRCC8Edge_h
-#define __otbRCC8Edge_h
+#ifndef otbRCC8Edge_h
+#define otbRCC8Edge_h
 
 #include "itkDataObject.h"
 #include "itkObjectFactory.h"
diff --git a/Modules/OBIA/RCC8/include/otbRCC8EdgeIterator.h b/Modules/OBIA/RCC8/include/otbRCC8EdgeIterator.h
index b7d99e51d9..e54f0c4364 100644
--- a/Modules/OBIA/RCC8/include/otbRCC8EdgeIterator.h
+++ b/Modules/OBIA/RCC8/include/otbRCC8EdgeIterator.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbRCC8EdgeIterator_h
-#define __otbRCC8EdgeIterator_h
+#ifndef otbRCC8EdgeIterator_h
+#define otbRCC8EdgeIterator_h
 
 #include "otbRCC8Graph.h"
 
diff --git a/Modules/OBIA/RCC8/include/otbRCC8EdgeIterator.txx b/Modules/OBIA/RCC8/include/otbRCC8EdgeIterator.txx
index 1072e14a3f..cc2c0c72b5 100644
--- a/Modules/OBIA/RCC8/include/otbRCC8EdgeIterator.txx
+++ b/Modules/OBIA/RCC8/include/otbRCC8EdgeIterator.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbRCC8EdgeIterator_txx
-#define __otbRCC8EdgeIterator_txx
+#ifndef otbRCC8EdgeIterator_txx
+#define otbRCC8EdgeIterator_txx
 
 #include "otbRCC8EdgeIterator.h"
 
diff --git a/Modules/OBIA/RCC8/include/otbRCC8Graph.h b/Modules/OBIA/RCC8/include/otbRCC8Graph.h
index cd85ae8ffa..ae50520ed2 100644
--- a/Modules/OBIA/RCC8/include/otbRCC8Graph.h
+++ b/Modules/OBIA/RCC8/include/otbRCC8Graph.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbRCC8Graph_h
-#define __otbRCC8Graph_h
+#ifndef otbRCC8Graph_h
+#define otbRCC8Graph_h
 
 #include "otbRCC8Edge.h"
 
diff --git a/Modules/OBIA/RCC8/include/otbRCC8Graph.txx b/Modules/OBIA/RCC8/include/otbRCC8Graph.txx
index 9d7a508392..208118c101 100644
--- a/Modules/OBIA/RCC8/include/otbRCC8Graph.txx
+++ b/Modules/OBIA/RCC8/include/otbRCC8Graph.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbRCC8Graph_txx
-#define __otbRCC8Graph_txx
+#ifndef otbRCC8Graph_txx
+#define otbRCC8Graph_txx
 
 namespace otb
 {
diff --git a/Modules/OBIA/RCC8/include/otbRCC8GraphFileReader.h b/Modules/OBIA/RCC8/include/otbRCC8GraphFileReader.h
index 96b3bce681..9c6b88b6b5 100644
--- a/Modules/OBIA/RCC8/include/otbRCC8GraphFileReader.h
+++ b/Modules/OBIA/RCC8/include/otbRCC8GraphFileReader.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbRCC8GraphFileReader_h
-#define __otbRCC8GraphFileReader_h
+#ifndef otbRCC8GraphFileReader_h
+#define otbRCC8GraphFileReader_h
 
 #include "otbRCC8GraphSource.h"
 #include "itkMacro.h"
diff --git a/Modules/OBIA/RCC8/include/otbRCC8GraphFileReader.txx b/Modules/OBIA/RCC8/include/otbRCC8GraphFileReader.txx
index 8ab351494a..778660c47c 100644
--- a/Modules/OBIA/RCC8/include/otbRCC8GraphFileReader.txx
+++ b/Modules/OBIA/RCC8/include/otbRCC8GraphFileReader.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbRCC8GraphFileReader_txx
-#define __otbRCC8GraphFileReader_txx
+#ifndef otbRCC8GraphFileReader_txx
+#define otbRCC8GraphFileReader_txx
 
 #include "otbRCC8GraphFileReader.h"
 #include "otbRCC8VertexIterator.h"
diff --git a/Modules/OBIA/RCC8/include/otbRCC8GraphFileWriter.h b/Modules/OBIA/RCC8/include/otbRCC8GraphFileWriter.h
index 2fda2d6027..73c67a9334 100644
--- a/Modules/OBIA/RCC8/include/otbRCC8GraphFileWriter.h
+++ b/Modules/OBIA/RCC8/include/otbRCC8GraphFileWriter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbRCC8GraphFileWriter_h
-#define __otbRCC8GraphFileWriter_h
+#ifndef otbRCC8GraphFileWriter_h
+#define otbRCC8GraphFileWriter_h
 
 #include "itkProcessObject.h"
 #include "itkMacro.h"
diff --git a/Modules/OBIA/RCC8/include/otbRCC8GraphFileWriter.txx b/Modules/OBIA/RCC8/include/otbRCC8GraphFileWriter.txx
index a9954ebcec..af908a965b 100644
--- a/Modules/OBIA/RCC8/include/otbRCC8GraphFileWriter.txx
+++ b/Modules/OBIA/RCC8/include/otbRCC8GraphFileWriter.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbRCC8GraphFileWriter_txx
-#define __otbRCC8GraphFileWriter_txx
+#ifndef otbRCC8GraphFileWriter_txx
+#define otbRCC8GraphFileWriter_txx
 
 #include "otbRCC8GraphFileWriter.h"
 #include "otbRCC8VertexIterator.h"
diff --git a/Modules/OBIA/RCC8/include/otbRCC8GraphSource.h b/Modules/OBIA/RCC8/include/otbRCC8GraphSource.h
index dca5674c0f..4c47c705bb 100644
--- a/Modules/OBIA/RCC8/include/otbRCC8GraphSource.h
+++ b/Modules/OBIA/RCC8/include/otbRCC8GraphSource.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbRCC8GraphSource_h
-#define __otbRCC8GraphSource_h
+#ifndef otbRCC8GraphSource_h
+#define otbRCC8GraphSource_h
 
 #include "itkProcessObject.h"
 
diff --git a/Modules/OBIA/RCC8/include/otbRCC8GraphSource.txx b/Modules/OBIA/RCC8/include/otbRCC8GraphSource.txx
index 6700418fc6..a3ea3d0519 100644
--- a/Modules/OBIA/RCC8/include/otbRCC8GraphSource.txx
+++ b/Modules/OBIA/RCC8/include/otbRCC8GraphSource.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbRCC8GraphSource_txx
-#define __otbRCC8GraphSource_txx
+#ifndef otbRCC8GraphSource_txx
+#define otbRCC8GraphSource_txx
 
 #include "otbRCC8GraphSource.h"
 
diff --git a/Modules/OBIA/RCC8/include/otbRCC8InEdgeIterator.h b/Modules/OBIA/RCC8/include/otbRCC8InEdgeIterator.h
index 0cda308201..a14e1653a9 100644
--- a/Modules/OBIA/RCC8/include/otbRCC8InEdgeIterator.h
+++ b/Modules/OBIA/RCC8/include/otbRCC8InEdgeIterator.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbRCC8InEdgeIterator_h
-#define __otbRCC8InEdgeIterator_h
+#ifndef otbRCC8InEdgeIterator_h
+#define otbRCC8InEdgeIterator_h
 
 #include "otbRCC8Graph.h"
 
diff --git a/Modules/OBIA/RCC8/include/otbRCC8InEdgeIterator.txx b/Modules/OBIA/RCC8/include/otbRCC8InEdgeIterator.txx
index 1dcb6c6293..680f33ac93 100644
--- a/Modules/OBIA/RCC8/include/otbRCC8InEdgeIterator.txx
+++ b/Modules/OBIA/RCC8/include/otbRCC8InEdgeIterator.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbRCC8InEdgeIterator_txx
-#define __otbRCC8InEdgeIterator_txx
+#ifndef otbRCC8InEdgeIterator_txx
+#define otbRCC8InEdgeIterator_txx
 
 #include "otbRCC8InEdgeIterator.h"
 
diff --git a/Modules/OBIA/RCC8/include/otbRCC8OutEdgeIterator.h b/Modules/OBIA/RCC8/include/otbRCC8OutEdgeIterator.h
index 5d2bebd0fd..4b787a8d80 100644
--- a/Modules/OBIA/RCC8/include/otbRCC8OutEdgeIterator.h
+++ b/Modules/OBIA/RCC8/include/otbRCC8OutEdgeIterator.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbRCC8OutEdgeIterator_h
-#define __otbRCC8OutEdgeIterator_h
+#ifndef otbRCC8OutEdgeIterator_h
+#define otbRCC8OutEdgeIterator_h
 
 #include "otbRCC8Graph.h"
 
diff --git a/Modules/OBIA/RCC8/include/otbRCC8OutEdgeIterator.txx b/Modules/OBIA/RCC8/include/otbRCC8OutEdgeIterator.txx
index 423ec0cb37..68d6231d10 100644
--- a/Modules/OBIA/RCC8/include/otbRCC8OutEdgeIterator.txx
+++ b/Modules/OBIA/RCC8/include/otbRCC8OutEdgeIterator.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbRCC8OutEdgeIterator_txx
-#define __otbRCC8OutEdgeIterator_txx
+#ifndef otbRCC8OutEdgeIterator_txx
+#define otbRCC8OutEdgeIterator_txx
 
 #include "otbRCC8OutEdgeIterator.h"
 
diff --git a/Modules/OBIA/RCC8/include/otbRCC8Value.h b/Modules/OBIA/RCC8/include/otbRCC8Value.h
index b240b3a58f..b185281689 100644
--- a/Modules/OBIA/RCC8/include/otbRCC8Value.h
+++ b/Modules/OBIA/RCC8/include/otbRCC8Value.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbRCC8Value_h
-#define __otbRCC8Value_h
+#ifndef otbRCC8Value_h
+#define otbRCC8Value_h
 
 namespace otb
 {
diff --git a/Modules/OBIA/RCC8/include/otbRCC8VertexBase.h b/Modules/OBIA/RCC8/include/otbRCC8VertexBase.h
index 4d7492b785..14cb39813f 100644
--- a/Modules/OBIA/RCC8/include/otbRCC8VertexBase.h
+++ b/Modules/OBIA/RCC8/include/otbRCC8VertexBase.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbRCC8VertexBase_h
-#define __otbRCC8VertexBase_h
+#ifndef otbRCC8VertexBase_h
+#define otbRCC8VertexBase_h
 
 #include "itkDataObject.h"
 #include "itkObjectFactory.h"
diff --git a/Modules/OBIA/RCC8/include/otbRCC8VertexBase.txx b/Modules/OBIA/RCC8/include/otbRCC8VertexBase.txx
index 18b277453d..c4d51f298c 100644
--- a/Modules/OBIA/RCC8/include/otbRCC8VertexBase.txx
+++ b/Modules/OBIA/RCC8/include/otbRCC8VertexBase.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbRCC8VertexBase_txx
-#define __otbRCC8VertexBase_txx
+#ifndef otbRCC8VertexBase_txx
+#define otbRCC8VertexBase_txx
 
 #include "otbRCC8VertexBase.h"
 
diff --git a/Modules/OBIA/RCC8/include/otbRCC8VertexIterator.h b/Modules/OBIA/RCC8/include/otbRCC8VertexIterator.h
index dbf99dd2ab..b60cb13f1a 100644
--- a/Modules/OBIA/RCC8/include/otbRCC8VertexIterator.h
+++ b/Modules/OBIA/RCC8/include/otbRCC8VertexIterator.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbRCC8VertexIterator_h
-#define __otbRCC8VertexIterator_h
+#ifndef otbRCC8VertexIterator_h
+#define otbRCC8VertexIterator_h
 
 #include "otbRCC8Graph.h"
 
diff --git a/Modules/OBIA/RCC8/include/otbRCC8VertexIterator.txx b/Modules/OBIA/RCC8/include/otbRCC8VertexIterator.txx
index 9be1cdd7e0..8c4a4ce2b6 100644
--- a/Modules/OBIA/RCC8/include/otbRCC8VertexIterator.txx
+++ b/Modules/OBIA/RCC8/include/otbRCC8VertexIterator.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbRCC8VertexIterator_txx
-#define __otbRCC8VertexIterator_txx
+#ifndef otbRCC8VertexIterator_txx
+#define otbRCC8VertexIterator_txx
 
 #include "otbRCC8VertexIterator.h"
 
diff --git a/Modules/OBIA/RCC8/include/otbRCC8VertexWithCompacity.h b/Modules/OBIA/RCC8/include/otbRCC8VertexWithCompacity.h
index a74a1db6a9..5a3404aa43 100644
--- a/Modules/OBIA/RCC8/include/otbRCC8VertexWithCompacity.h
+++ b/Modules/OBIA/RCC8/include/otbRCC8VertexWithCompacity.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbRCC8VertexWithCompacity_h
-#define __otbRCC8VertexWithCompacity_h
+#ifndef otbRCC8VertexWithCompacity_h
+#define otbRCC8VertexWithCompacity_h
 
 #include "otbRCC8VertexBase.h"
 
diff --git a/Modules/OBIA/RCC8/include/otbRCC8VertexWithCompacity.txx b/Modules/OBIA/RCC8/include/otbRCC8VertexWithCompacity.txx
index 0862f90b9e..086507f257 100644
--- a/Modules/OBIA/RCC8/include/otbRCC8VertexWithCompacity.txx
+++ b/Modules/OBIA/RCC8/include/otbRCC8VertexWithCompacity.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbRCC8VertexWithCompacity_txx
-#define __otbRCC8VertexWithCompacity_txx
+#ifndef otbRCC8VertexWithCompacity_txx
+#define otbRCC8VertexWithCompacity_txx
 
 #include "otbRCC8VertexWithCompacity.h"
 
diff --git a/Modules/OBIA/RCC8/include/otbRCC8VertexWithRegionCenter.h b/Modules/OBIA/RCC8/include/otbRCC8VertexWithRegionCenter.h
index 4235a1b490..01d3e8e9ef 100644
--- a/Modules/OBIA/RCC8/include/otbRCC8VertexWithRegionCenter.h
+++ b/Modules/OBIA/RCC8/include/otbRCC8VertexWithRegionCenter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbRCC8VertexWithRegionCenter_h
-#define __otbRCC8VertexWithRegionCenter_h
+#ifndef otbRCC8VertexWithRegionCenter_h
+#define otbRCC8VertexWithRegionCenter_h
 
 #include "otbRCC8VertexBase.h"
 
diff --git a/Modules/OBIA/RCC8/include/otbRCC8VertexWithRegionCenter.txx b/Modules/OBIA/RCC8/include/otbRCC8VertexWithRegionCenter.txx
index 4a43311a98..e47ba33ae0 100644
--- a/Modules/OBIA/RCC8/include/otbRCC8VertexWithRegionCenter.txx
+++ b/Modules/OBIA/RCC8/include/otbRCC8VertexWithRegionCenter.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbRCC8VertexWithRegionCenter_txx
-#define __otbRCC8VertexWithRegionCenter_txx
+#ifndef otbRCC8VertexWithRegionCenter_txx
+#define otbRCC8VertexWithRegionCenter_txx
 
 #include "otbRCC8VertexWithRegionCenter.h"
 
diff --git a/Modules/Radiometry/Indices/include/otbBuiltUpIndicesFunctor.h b/Modules/Radiometry/Indices/include/otbBuiltUpIndicesFunctor.h
index 5c4baa71ae..08e7f4053a 100644
--- a/Modules/Radiometry/Indices/include/otbBuiltUpIndicesFunctor.h
+++ b/Modules/Radiometry/Indices/include/otbBuiltUpIndicesFunctor.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbBuiltUpIndicesFunctor_h
-#define __otbBuiltUpIndicesFunctor_h
+#ifndef otbBuiltUpIndicesFunctor_h
+#define otbBuiltUpIndicesFunctor_h
 
 #include "otbVegetationIndicesFunctor.h"
 
diff --git a/Modules/Radiometry/Indices/include/otbGAndRIndexImageFilter.h b/Modules/Radiometry/Indices/include/otbGAndRIndexImageFilter.h
index 1404c2005a..da4bbf4aab 100644
--- a/Modules/Radiometry/Indices/include/otbGAndRIndexImageFilter.h
+++ b/Modules/Radiometry/Indices/include/otbGAndRIndexImageFilter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbGAndRIndexImageFilter_h
-#define __otbGAndRIndexImageFilter_h
+#ifndef otbGAndRIndexImageFilter_h
+#define otbGAndRIndexImageFilter_h
 
 #include "itkBinaryFunctorImageFilter.h"
 #include "otbSoilIndicesFunctor.h"
diff --git a/Modules/Radiometry/Indices/include/otbGAndRIndexImageFilter.txx b/Modules/Radiometry/Indices/include/otbGAndRIndexImageFilter.txx
index 37ec73ef01..98ecab1182 100644
--- a/Modules/Radiometry/Indices/include/otbGAndRIndexImageFilter.txx
+++ b/Modules/Radiometry/Indices/include/otbGAndRIndexImageFilter.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbGAndRIndexImageFilter_txx
-#define __otbGAndRIndexImageFilter_txx
+#ifndef otbGAndRIndexImageFilter_txx
+#define otbGAndRIndexImageFilter_txx
 
 #include "otbGAndRIndexImageFilter.h"
 #include "itkImageRegionIterator.h"
diff --git a/Modules/Radiometry/Indices/include/otbLandsatTMIndices.h b/Modules/Radiometry/Indices/include/otbLandsatTMIndices.h
index 5c8927cbf7..cf2f469d4e 100644
--- a/Modules/Radiometry/Indices/include/otbLandsatTMIndices.h
+++ b/Modules/Radiometry/Indices/include/otbLandsatTMIndices.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbLandsatTMIndices_h
-#define __otbLandsatTMIndices_h
+#ifndef otbLandsatTMIndices_h
+#define otbLandsatTMIndices_h
 
 #include "otbMath.h"
 #include "itkVariableLengthVector.h"
diff --git a/Modules/Radiometry/Indices/include/otbMultiChannelGAndRIndexImageFilter.h b/Modules/Radiometry/Indices/include/otbMultiChannelGAndRIndexImageFilter.h
index 14e5b832d8..7f1b1b7ed2 100644
--- a/Modules/Radiometry/Indices/include/otbMultiChannelGAndRIndexImageFilter.h
+++ b/Modules/Radiometry/Indices/include/otbMultiChannelGAndRIndexImageFilter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbMultiChannelGAndRIndexImageFilter_h
-#define __otbMultiChannelGAndRIndexImageFilter_h
+#ifndef otbMultiChannelGAndRIndexImageFilter_h
+#define otbMultiChannelGAndRIndexImageFilter_h
 
 #include "itkUnaryFunctorImageFilter.h"
 #include "otbSoilIndicesFunctor.h"
diff --git a/Modules/Radiometry/Indices/include/otbMultiChannelRAndBAndNIRIndexImageFilter.h b/Modules/Radiometry/Indices/include/otbMultiChannelRAndBAndNIRIndexImageFilter.h
index 00b6902cab..bd87c4bb62 100644
--- a/Modules/Radiometry/Indices/include/otbMultiChannelRAndBAndNIRIndexImageFilter.h
+++ b/Modules/Radiometry/Indices/include/otbMultiChannelRAndBAndNIRIndexImageFilter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbMultiChannelRAndBAndNIRIndexImageFilter_h
-#define __otbMultiChannelRAndBAndNIRIndexImageFilter_h
+#ifndef otbMultiChannelRAndBAndNIRIndexImageFilter_h
+#define otbMultiChannelRAndBAndNIRIndexImageFilter_h
 
 #include "itkUnaryFunctorImageFilter.h"
 #include "otbVegetationIndicesFunctor.h"
diff --git a/Modules/Radiometry/Indices/include/otbMultiChannelRAndGAndNIRIndexImageFilter.h b/Modules/Radiometry/Indices/include/otbMultiChannelRAndGAndNIRIndexImageFilter.h
index bca9d5a455..a65559daf9 100644
--- a/Modules/Radiometry/Indices/include/otbMultiChannelRAndGAndNIRIndexImageFilter.h
+++ b/Modules/Radiometry/Indices/include/otbMultiChannelRAndGAndNIRIndexImageFilter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbMultiChannelRAndGAndNIRIndexImageFilter_h
-#define __otbMultiChannelRAndGAndNIRIndexImageFilter_h
+#ifndef otbMultiChannelRAndGAndNIRIndexImageFilter_h
+#define otbMultiChannelRAndGAndNIRIndexImageFilter_h
 
 #include "itkUnaryFunctorImageFilter.h"
 #include "otbVegetationIndicesFunctor.h"
diff --git a/Modules/Radiometry/Indices/include/otbMultiChannelRAndNIRIndexImageFilter.h b/Modules/Radiometry/Indices/include/otbMultiChannelRAndNIRIndexImageFilter.h
index 4371c98995..8bbbe37695 100644
--- a/Modules/Radiometry/Indices/include/otbMultiChannelRAndNIRIndexImageFilter.h
+++ b/Modules/Radiometry/Indices/include/otbMultiChannelRAndNIRIndexImageFilter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbMultiChannelRAndNIRIndexImageFilter_h
-#define __otbMultiChannelRAndNIRIndexImageFilter_h
+#ifndef otbMultiChannelRAndNIRIndexImageFilter_h
+#define otbMultiChannelRAndNIRIndexImageFilter_h
 
 #include "itkUnaryFunctorImageFilter.h"
 #include "otbVegetationIndicesFunctor.h"
diff --git a/Modules/Radiometry/Indices/include/otbMultiChannelRadiometricImageFilter.h b/Modules/Radiometry/Indices/include/otbMultiChannelRadiometricImageFilter.h
index e92eecb111..c0e96690de 100644
--- a/Modules/Radiometry/Indices/include/otbMultiChannelRadiometricImageFilter.h
+++ b/Modules/Radiometry/Indices/include/otbMultiChannelRadiometricImageFilter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbMultiChannelRadiometricImageFilter_h
-#define __otbMultiChannelRadiometricImageFilter_h
+#ifndef otbMultiChannelRadiometricImageFilter_h
+#define otbMultiChannelRadiometricImageFilter_h
 
 #include "itkUnaryFunctorImageFilter.h"
 
diff --git a/Modules/Radiometry/Indices/include/otbNDVIDataNodeFeatureFunction.h b/Modules/Radiometry/Indices/include/otbNDVIDataNodeFeatureFunction.h
index 1e63969473..afc06ace75 100644
--- a/Modules/Radiometry/Indices/include/otbNDVIDataNodeFeatureFunction.h
+++ b/Modules/Radiometry/Indices/include/otbNDVIDataNodeFeatureFunction.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbNDVIDataNodeFeatureFunction_h
-#define __otbNDVIDataNodeFeatureFunction_h
+#ifndef otbNDVIDataNodeFeatureFunction_h
+#define otbNDVIDataNodeFeatureFunction_h
 
 #include "otbDataNodeImageFunction.h"
 
diff --git a/Modules/Radiometry/Indices/include/otbNDVIDataNodeFeatureFunction.txx b/Modules/Radiometry/Indices/include/otbNDVIDataNodeFeatureFunction.txx
index cdb5c6965b..c650c8562b 100644
--- a/Modules/Radiometry/Indices/include/otbNDVIDataNodeFeatureFunction.txx
+++ b/Modules/Radiometry/Indices/include/otbNDVIDataNodeFeatureFunction.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbNDVIDataNodeFeatureFunction_txx
-#define __otbNDVIDataNodeFeatureFunction_txx
+#ifndef otbNDVIDataNodeFeatureFunction_txx
+#define otbNDVIDataNodeFeatureFunction_txx
 
 #include "otbNDVIDataNodeFeatureFunction.h"
 
diff --git a/Modules/Radiometry/Indices/include/otbRAndBAndNIRIndexImageFilter.h b/Modules/Radiometry/Indices/include/otbRAndBAndNIRIndexImageFilter.h
index ab919197f4..f265d2d158 100644
--- a/Modules/Radiometry/Indices/include/otbRAndBAndNIRIndexImageFilter.h
+++ b/Modules/Radiometry/Indices/include/otbRAndBAndNIRIndexImageFilter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbRAndBAndNIRIndexImageFilter_h
-#define __otbRAndBAndNIRIndexImageFilter_h
+#ifndef otbRAndBAndNIRIndexImageFilter_h
+#define otbRAndBAndNIRIndexImageFilter_h
 
 #include "itkTernaryFunctorImageFilter.h"
 #include "otbVegetationIndicesFunctor.h"
diff --git a/Modules/Radiometry/Indices/include/otbRAndBAndNIRIndexImageFilter.txx b/Modules/Radiometry/Indices/include/otbRAndBAndNIRIndexImageFilter.txx
index 6030fd1a3f..94ecdaa4be 100644
--- a/Modules/Radiometry/Indices/include/otbRAndBAndNIRIndexImageFilter.txx
+++ b/Modules/Radiometry/Indices/include/otbRAndBAndNIRIndexImageFilter.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbRAndBAndNIRIndexImageFilter_txx
-#define __otbRAndBAndNIRIndexImageFilter_txx
+#ifndef otbRAndBAndNIRIndexImageFilter_txx
+#define otbRAndBAndNIRIndexImageFilter_txx
 
 #include "otbRAndBAndNIRIndexImageFilter.h"
 
diff --git a/Modules/Radiometry/Indices/include/otbRAndGAndNIRIndexImageFilter.h b/Modules/Radiometry/Indices/include/otbRAndGAndNIRIndexImageFilter.h
index cd36fcd9cb..ba30f3730d 100644
--- a/Modules/Radiometry/Indices/include/otbRAndGAndNIRIndexImageFilter.h
+++ b/Modules/Radiometry/Indices/include/otbRAndGAndNIRIndexImageFilter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbRAndGAndNIRIndexImageFilter_h
-#define __otbRAndGAndNIRIndexImageFilter_h
+#ifndef otbRAndGAndNIRIndexImageFilter_h
+#define otbRAndGAndNIRIndexImageFilter_h
 
 #include "itkTernaryFunctorImageFilter.h"
 #include "otbVegetationIndicesFunctor.h"
diff --git a/Modules/Radiometry/Indices/include/otbRAndGAndNIRIndexImageFilter.txx b/Modules/Radiometry/Indices/include/otbRAndGAndNIRIndexImageFilter.txx
index e138c4caeb..93038fe440 100644
--- a/Modules/Radiometry/Indices/include/otbRAndGAndNIRIndexImageFilter.txx
+++ b/Modules/Radiometry/Indices/include/otbRAndGAndNIRIndexImageFilter.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbRAndGAndNIRIndexImageFilter_txx
-#define __otbRAndGAndNIRIndexImageFilter_txx
+#ifndef otbRAndGAndNIRIndexImageFilter_txx
+#define otbRAndGAndNIRIndexImageFilter_txx
 
 #include "otbRAndGAndNIRIndexImageFilter.h"
 
diff --git a/Modules/Radiometry/Indices/include/otbRAndNIRIndexImageFilter.h b/Modules/Radiometry/Indices/include/otbRAndNIRIndexImageFilter.h
index f987aaae11..46c157fed8 100644
--- a/Modules/Radiometry/Indices/include/otbRAndNIRIndexImageFilter.h
+++ b/Modules/Radiometry/Indices/include/otbRAndNIRIndexImageFilter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbRAndNIRIndexImageFilter_h
-#define __otbRAndNIRIndexImageFilter_h
+#ifndef otbRAndNIRIndexImageFilter_h
+#define otbRAndNIRIndexImageFilter_h
 
 #include "itkBinaryFunctorImageFilter.h"
 #include "otbVegetationIndicesFunctor.h"
diff --git a/Modules/Radiometry/Indices/include/otbRAndNIRIndexImageFilter.txx b/Modules/Radiometry/Indices/include/otbRAndNIRIndexImageFilter.txx
index b1e42689ac..9d9abfb4e4 100644
--- a/Modules/Radiometry/Indices/include/otbRAndNIRIndexImageFilter.txx
+++ b/Modules/Radiometry/Indices/include/otbRAndNIRIndexImageFilter.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbRAndNIRIndexImageFilter_txx
-#define __otbRAndNIRIndexImageFilter_txx
+#ifndef otbRAndNIRIndexImageFilter_txx
+#define otbRAndNIRIndexImageFilter_txx
 
 #include "otbRAndNIRIndexImageFilter.h"
 #include "itkImageRegionIterator.h"
diff --git a/Modules/Radiometry/Indices/include/otbSoilIndicesFunctor.h b/Modules/Radiometry/Indices/include/otbSoilIndicesFunctor.h
index cba94498ee..f3b9dbc787 100644
--- a/Modules/Radiometry/Indices/include/otbSoilIndicesFunctor.h
+++ b/Modules/Radiometry/Indices/include/otbSoilIndicesFunctor.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbSoilIndicesFunctor_h
-#define __otbSoilIndicesFunctor_h
+#ifndef otbSoilIndicesFunctor_h
+#define otbSoilIndicesFunctor_h
 
 #include "otbMath.h"
 #include "itkVariableLengthVector.h"
diff --git a/Modules/Radiometry/Indices/include/otbVegetationIndicesFunctor.h b/Modules/Radiometry/Indices/include/otbVegetationIndicesFunctor.h
index 993792fddf..8c128d0340 100644
--- a/Modules/Radiometry/Indices/include/otbVegetationIndicesFunctor.h
+++ b/Modules/Radiometry/Indices/include/otbVegetationIndicesFunctor.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbVegetationIndicesFunctor_h
-#define __otbVegetationIndicesFunctor_h
+#ifndef otbVegetationIndicesFunctor_h
+#define otbVegetationIndicesFunctor_h
 
 #include "otbMath.h"
 #include "itkVariableLengthVector.h"
diff --git a/Modules/Radiometry/Indices/include/otbWaterIndicesFunctor.h b/Modules/Radiometry/Indices/include/otbWaterIndicesFunctor.h
index 14c981162f..ffefc68883 100644
--- a/Modules/Radiometry/Indices/include/otbWaterIndicesFunctor.h
+++ b/Modules/Radiometry/Indices/include/otbWaterIndicesFunctor.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbWaterIndicesFunctor_h
-#define __otbWaterIndicesFunctor_h
+#ifndef otbWaterIndicesFunctor_h
+#define otbWaterIndicesFunctor_h
 
 #include "otbMath.h"
 #include "itkVariableLengthVector.h"
diff --git a/Modules/Radiometry/Indices/include/otbWaterSqrtSpectralAngleImageFilter.h b/Modules/Radiometry/Indices/include/otbWaterSqrtSpectralAngleImageFilter.h
index 74b0565019..a07fee24fe 100644
--- a/Modules/Radiometry/Indices/include/otbWaterSqrtSpectralAngleImageFilter.h
+++ b/Modules/Radiometry/Indices/include/otbWaterSqrtSpectralAngleImageFilter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbWaterSqrtSpectralAngleImageFilter_h
-#define __otbWaterSqrtSpectralAngleImageFilter_h
+#ifndef otbWaterSqrtSpectralAngleImageFilter_h
+#define otbWaterSqrtSpectralAngleImageFilter_h
 
 #include "otbWaterIndicesFunctor.h"
 #include "itkUnaryFunctorImageFilter.h"
diff --git a/Modules/Radiometry/LandSatClassifier/include/otbLandsatTMSpectralRuleBasedClassifier.h b/Modules/Radiometry/LandSatClassifier/include/otbLandsatTMSpectralRuleBasedClassifier.h
index 7a36b23b2f..1c9674a5e5 100644
--- a/Modules/Radiometry/LandSatClassifier/include/otbLandsatTMSpectralRuleBasedClassifier.h
+++ b/Modules/Radiometry/LandSatClassifier/include/otbLandsatTMSpectralRuleBasedClassifier.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbLandsatTMSRBC_h
-#define __otbLandsatTMSRBC_h
+#ifndef otbLandsatTMSRBC_h
+#define otbLandsatTMSRBC_h
 
 #include "otbLandsatTMIndices.h"
 
diff --git a/Modules/Radiometry/OpticalCalibration/include/otbAeronetData.h b/Modules/Radiometry/OpticalCalibration/include/otbAeronetData.h
index 853b1e86d4..6136f8c084 100644
--- a/Modules/Radiometry/OpticalCalibration/include/otbAeronetData.h
+++ b/Modules/Radiometry/OpticalCalibration/include/otbAeronetData.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbAeronetData_h
-#define __otbAeronetData_h
+#ifndef otbAeronetData_h
+#define otbAeronetData_h
 
 #include "itkDataObject.h"
 #include "itkObjectFactory.h"
diff --git a/Modules/Radiometry/OpticalCalibration/include/otbAeronetFileReader.h b/Modules/Radiometry/OpticalCalibration/include/otbAeronetFileReader.h
index b52dd75830..75e75ffecf 100644
--- a/Modules/Radiometry/OpticalCalibration/include/otbAeronetFileReader.h
+++ b/Modules/Radiometry/OpticalCalibration/include/otbAeronetFileReader.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbAeronetFileReader_h
-#define __otbAeronetFileReader_h
+#ifndef otbAeronetFileReader_h
+#define otbAeronetFileReader_h
 
 #include <string>
 #include <vector>
diff --git a/Modules/Radiometry/OpticalCalibration/include/otbAtmosphericCorrectionParameters.h b/Modules/Radiometry/OpticalCalibration/include/otbAtmosphericCorrectionParameters.h
index 1fe4f4e194..4b3d591cf8 100644
--- a/Modules/Radiometry/OpticalCalibration/include/otbAtmosphericCorrectionParameters.h
+++ b/Modules/Radiometry/OpticalCalibration/include/otbAtmosphericCorrectionParameters.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbAtmosphericCorrectionParameters_h
-#define __otbAtmosphericCorrectionParameters_h
+#ifndef otbAtmosphericCorrectionParameters_h
+#define otbAtmosphericCorrectionParameters_h
 
 #include "itkObject.h"
 #include "itkVariableSizeMatrix.h"
diff --git a/Modules/Radiometry/OpticalCalibration/include/otbAtmosphericRadiativeTerms.h b/Modules/Radiometry/OpticalCalibration/include/otbAtmosphericRadiativeTerms.h
index bc97817b0c..c719ca9af6 100644
--- a/Modules/Radiometry/OpticalCalibration/include/otbAtmosphericRadiativeTerms.h
+++ b/Modules/Radiometry/OpticalCalibration/include/otbAtmosphericRadiativeTerms.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbAtmosphericRadiativeTerms_h
-#define __otbAtmosphericRadiativeTerms_h
+#ifndef otbAtmosphericRadiativeTerms_h
+#define otbAtmosphericRadiativeTerms_h
 
 #include "itkDataObject.h"
 #include "itkObjectFactory.h"
diff --git a/Modules/Radiometry/OpticalCalibration/include/otbImageMetadataCorrectionParameters.h b/Modules/Radiometry/OpticalCalibration/include/otbImageMetadataCorrectionParameters.h
index e967db513b..8d1596628b 100644
--- a/Modules/Radiometry/OpticalCalibration/include/otbImageMetadataCorrectionParameters.h
+++ b/Modules/Radiometry/OpticalCalibration/include/otbImageMetadataCorrectionParameters.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbImageMetadataCorrectionParameters_h
-#define __otbImageMetadataCorrectionParameters_h
+#ifndef otbImageMetadataCorrectionParameters_h
+#define otbImageMetadataCorrectionParameters_h
 
 #include "itkObject.h"
 #include "itkVariableSizeMatrix.h"
diff --git a/Modules/Radiometry/OpticalCalibration/include/otbImageToLuminanceImageFilter.h b/Modules/Radiometry/OpticalCalibration/include/otbImageToLuminanceImageFilter.h
index f43cfa2b81..0334935c2f 100644
--- a/Modules/Radiometry/OpticalCalibration/include/otbImageToLuminanceImageFilter.h
+++ b/Modules/Radiometry/OpticalCalibration/include/otbImageToLuminanceImageFilter.h
@@ -19,8 +19,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbImageToLuminanceImageFilter_h
-#define __otbImageToLuminanceImageFilter_h
+#ifndef otbImageToLuminanceImageFilter_h
+#define otbImageToLuminanceImageFilter_h
 
 #include "otbUnaryImageFunctorWithVectorImageFilter.h"
 #include "itkNumericTraits.h"
diff --git a/Modules/Radiometry/OpticalCalibration/include/otbImageToReflectanceImageFilter.h b/Modules/Radiometry/OpticalCalibration/include/otbImageToReflectanceImageFilter.h
index d03ed1977c..2040c40204 100644
--- a/Modules/Radiometry/OpticalCalibration/include/otbImageToReflectanceImageFilter.h
+++ b/Modules/Radiometry/OpticalCalibration/include/otbImageToReflectanceImageFilter.h
@@ -19,8 +19,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbImageToReflectanceImageFilter_h
-#define __otbImageToReflectanceImageFilter_h
+#ifndef otbImageToReflectanceImageFilter_h
+#define otbImageToReflectanceImageFilter_h
 
 #include "otbImageToLuminanceImageFilter.h"
 #include "otbLuminanceToReflectanceImageFilter.h"
diff --git a/Modules/Radiometry/OpticalCalibration/include/otbLuminanceToImageImageFilter.h b/Modules/Radiometry/OpticalCalibration/include/otbLuminanceToImageImageFilter.h
index c5e3df0232..8f53ee7b31 100644
--- a/Modules/Radiometry/OpticalCalibration/include/otbLuminanceToImageImageFilter.h
+++ b/Modules/Radiometry/OpticalCalibration/include/otbLuminanceToImageImageFilter.h
@@ -19,8 +19,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbLuminanceToImageImageFilter_h
-#define __otbLuminanceToImageImageFilter_h
+#ifndef otbLuminanceToImageImageFilter_h
+#define otbLuminanceToImageImageFilter_h
 
 #include "otb_6S.h"
 #include "otbUnaryImageFunctorWithVectorImageFilter.h"
diff --git a/Modules/Radiometry/OpticalCalibration/include/otbLuminanceToReflectanceImageFilter.h b/Modules/Radiometry/OpticalCalibration/include/otbLuminanceToReflectanceImageFilter.h
index 1d54a0f021..8c28238133 100644
--- a/Modules/Radiometry/OpticalCalibration/include/otbLuminanceToReflectanceImageFilter.h
+++ b/Modules/Radiometry/OpticalCalibration/include/otbLuminanceToReflectanceImageFilter.h
@@ -19,8 +19,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbLuminanceToReflectanceImageFilter_h
-#define __otbLuminanceToReflectanceImageFilter_h
+#ifndef otbLuminanceToReflectanceImageFilter_h
+#define otbLuminanceToReflectanceImageFilter_h
 
 #include "otbVarSol.h"
 #include "otbUnaryImageFunctorWithVectorImageFilter.h"
diff --git a/Modules/Radiometry/OpticalCalibration/include/otbRadiometryCorrectionParametersToAtmosphericRadiativeTerms.h b/Modules/Radiometry/OpticalCalibration/include/otbRadiometryCorrectionParametersToAtmosphericRadiativeTerms.h
index 7c47357ee1..dc584568cb 100644
--- a/Modules/Radiometry/OpticalCalibration/include/otbRadiometryCorrectionParametersToAtmosphericRadiativeTerms.h
+++ b/Modules/Radiometry/OpticalCalibration/include/otbRadiometryCorrectionParametersToAtmosphericRadiativeTerms.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbRadiometryCorrectionParametersToAtmosphericRadiativeTerms_h
-#define __otbRadiometryCorrectionParametersToAtmosphericRadiativeTerms_h
+#ifndef otbRadiometryCorrectionParametersToAtmosphericRadiativeTerms_h
+#define otbRadiometryCorrectionParametersToAtmosphericRadiativeTerms_h
 
 #include "otbAtmosphericRadiativeTerms.h"
 #include "otbImageMetadataCorrectionParameters.h"
diff --git a/Modules/Radiometry/OpticalCalibration/include/otbReflectanceToImageImageFilter.h b/Modules/Radiometry/OpticalCalibration/include/otbReflectanceToImageImageFilter.h
index df5e312274..107f07edcf 100644
--- a/Modules/Radiometry/OpticalCalibration/include/otbReflectanceToImageImageFilter.h
+++ b/Modules/Radiometry/OpticalCalibration/include/otbReflectanceToImageImageFilter.h
@@ -19,8 +19,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbReflectanceToImageImageFilter_h
-#define __otbReflectanceToImageImageFilter_h
+#ifndef otbReflectanceToImageImageFilter_h
+#define otbReflectanceToImageImageFilter_h
 
 #include "otbLuminanceToImageImageFilter.h"
 #include "otbReflectanceToLuminanceImageFilter.h"
diff --git a/Modules/Radiometry/OpticalCalibration/include/otbReflectanceToLuminanceImageFilter.h b/Modules/Radiometry/OpticalCalibration/include/otbReflectanceToLuminanceImageFilter.h
index 2f137bf243..ceeac8e0ba 100644
--- a/Modules/Radiometry/OpticalCalibration/include/otbReflectanceToLuminanceImageFilter.h
+++ b/Modules/Radiometry/OpticalCalibration/include/otbReflectanceToLuminanceImageFilter.h
@@ -19,8 +19,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbReflectanceToLuminanceImageFilter_h
-#define __otbReflectanceToLuminanceImageFilter_h
+#ifndef otbReflectanceToLuminanceImageFilter_h
+#define otbReflectanceToLuminanceImageFilter_h
 
 #include "otbVarSol.h"
 #include "otbUnaryImageFunctorWithVectorImageFilter.h"
diff --git a/Modules/Radiometry/OpticalCalibration/include/otbReflectanceToSurfaceReflectanceImageFilter.h b/Modules/Radiometry/OpticalCalibration/include/otbReflectanceToSurfaceReflectanceImageFilter.h
index 3c3b823477..c495e8440a 100644
--- a/Modules/Radiometry/OpticalCalibration/include/otbReflectanceToSurfaceReflectanceImageFilter.h
+++ b/Modules/Radiometry/OpticalCalibration/include/otbReflectanceToSurfaceReflectanceImageFilter.h
@@ -19,8 +19,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbReflectanceToSurfaceReflectanceImageFilter_h
-#define __otbReflectanceToSurfaceReflectanceImageFilter_h
+#ifndef otbReflectanceToSurfaceReflectanceImageFilter_h
+#define otbReflectanceToSurfaceReflectanceImageFilter_h
 
 #include "otbUnaryImageFunctorWithVectorImageFilter.h"
 
diff --git a/Modules/Radiometry/OpticalCalibration/include/otbReflectanceToSurfaceReflectanceImageFilter.txx b/Modules/Radiometry/OpticalCalibration/include/otbReflectanceToSurfaceReflectanceImageFilter.txx
index 38c6159ae9..f17f85d3f7 100644
--- a/Modules/Radiometry/OpticalCalibration/include/otbReflectanceToSurfaceReflectanceImageFilter.txx
+++ b/Modules/Radiometry/OpticalCalibration/include/otbReflectanceToSurfaceReflectanceImageFilter.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbReflectanceToSurfaceReflectanceImageFilter_txx
-#define __otbReflectanceToSurfaceReflectanceImageFilter_txx
+#ifndef otbReflectanceToSurfaceReflectanceImageFilter_txx
+#define otbReflectanceToSurfaceReflectanceImageFilter_txx
 
 #include "otbReflectanceToSurfaceReflectanceImageFilter.h"
 #include "otbOpticalImageMetadataInterfaceFactory.h"
diff --git a/Modules/Radiometry/OpticalCalibration/include/otbSIXSTraits.h b/Modules/Radiometry/OpticalCalibration/include/otbSIXSTraits.h
index feb0c1b8e8..6fc9b4505d 100644
--- a/Modules/Radiometry/OpticalCalibration/include/otbSIXSTraits.h
+++ b/Modules/Radiometry/OpticalCalibration/include/otbSIXSTraits.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbSIXSTraits_h
-#define __otbSIXSTraits_h
+#ifndef otbSIXSTraits_h
+#define otbSIXSTraits_h
 
 #include "otbAtmosphericCorrectionParameters.h"
 
diff --git a/Modules/Radiometry/OpticalCalibration/include/otbSpectralSensitivityReader.h b/Modules/Radiometry/OpticalCalibration/include/otbSpectralSensitivityReader.h
index 2ff0576851..213fa0cc75 100644
--- a/Modules/Radiometry/OpticalCalibration/include/otbSpectralSensitivityReader.h
+++ b/Modules/Radiometry/OpticalCalibration/include/otbSpectralSensitivityReader.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbSpectralSensitivityReader_h
-#define __otbSpectralSensitivityReader_h
+#ifndef otbSpectralSensitivityReader_h
+#define otbSpectralSensitivityReader_h
 
 #include "itkProcessObject.h"
 #include "itkImageBase.h"
diff --git a/Modules/Radiometry/OpticalCalibration/include/otbSurfaceAdjacencyEffectCorrectionSchemeFilter.h b/Modules/Radiometry/OpticalCalibration/include/otbSurfaceAdjacencyEffectCorrectionSchemeFilter.h
index 9abbff89b5..c896492a9f 100644
--- a/Modules/Radiometry/OpticalCalibration/include/otbSurfaceAdjacencyEffectCorrectionSchemeFilter.h
+++ b/Modules/Radiometry/OpticalCalibration/include/otbSurfaceAdjacencyEffectCorrectionSchemeFilter.h
@@ -19,8 +19,8 @@
     PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbSurfaceAdjacencyEffectCorrectionSchemeFilter_h
-#define __otbSurfaceAdjacencyEffectCorrectionSchemeFilter_h
+#ifndef otbSurfaceAdjacencyEffectCorrectionSchemeFilter_h
+#define otbSurfaceAdjacencyEffectCorrectionSchemeFilter_h
 
 #include "itkNumericTraits.h"
 #include <vector>
diff --git a/Modules/Radiometry/OpticalCalibration/include/otbSurfaceAdjacencyEffectCorrectionSchemeFilter.txx b/Modules/Radiometry/OpticalCalibration/include/otbSurfaceAdjacencyEffectCorrectionSchemeFilter.txx
index bc19df839a..fc1be89537 100644
--- a/Modules/Radiometry/OpticalCalibration/include/otbSurfaceAdjacencyEffectCorrectionSchemeFilter.txx
+++ b/Modules/Radiometry/OpticalCalibration/include/otbSurfaceAdjacencyEffectCorrectionSchemeFilter.txx
@@ -20,8 +20,8 @@
 
 =========================================================================*/
 
-#ifndef __otbSurfaceAdjacencyEffectCorrectionSchemeFilter_txx
-#define __otbSurfaceAdjacencyEffectCorrectionSchemeFilter_txx
+#ifndef otbSurfaceAdjacencyEffectCorrectionSchemeFilter_txx
+#define otbSurfaceAdjacencyEffectCorrectionSchemeFilter_txx
 
 #include "otbSurfaceAdjacencyEffectCorrectionSchemeFilter.h"
 
diff --git a/Modules/Radiometry/OpticalCalibration/include/otbVarSol.h b/Modules/Radiometry/OpticalCalibration/include/otbVarSol.h
index 9d615c8d94..360c4bb918 100644
--- a/Modules/Radiometry/OpticalCalibration/include/otbVarSol.h
+++ b/Modules/Radiometry/OpticalCalibration/include/otbVarSol.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbVarSol_h
-#define __otbVarSol_h
+#ifndef otbVarSol_h
+#define otbVarSol_h
 
 #include "itkMacro.h"
 #include "otbMath.h"
diff --git a/Modules/Radiometry/OpticalCalibration/include/otbWavelengthSpectralBands.h b/Modules/Radiometry/OpticalCalibration/include/otbWavelengthSpectralBands.h
index 83840afece..72c8b8bfb0 100644
--- a/Modules/Radiometry/OpticalCalibration/include/otbWavelengthSpectralBands.h
+++ b/Modules/Radiometry/OpticalCalibration/include/otbWavelengthSpectralBands.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbWavelengthSpectralBands_h
-#define __otbWavelengthSpectralBands_h
+#ifndef otbWavelengthSpectralBands_h
+#define otbWavelengthSpectralBands_h
 
 #include "otbObjectList.h"
 #include "otbFilterFunctionValues.h"
diff --git a/Modules/Radiometry/SARCalibration/include/otbSarBrightnessFunction.h b/Modules/Radiometry/SARCalibration/include/otbSarBrightnessFunction.h
index f205eac3e6..a703971b78 100644
--- a/Modules/Radiometry/SARCalibration/include/otbSarBrightnessFunction.h
+++ b/Modules/Radiometry/SARCalibration/include/otbSarBrightnessFunction.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbSarBrightnessFunction_h
-#define __otbSarBrightnessFunction_h
+#ifndef otbSarBrightnessFunction_h
+#define otbSarBrightnessFunction_h
 
 #include "otbSarBrightnessFunctor.h"
 #include "otbSarParametricMapFunction.h"
diff --git a/Modules/Radiometry/SARCalibration/include/otbSarBrightnessFunction.txx b/Modules/Radiometry/SARCalibration/include/otbSarBrightnessFunction.txx
index d18e9f3837..531bc380c2 100644
--- a/Modules/Radiometry/SARCalibration/include/otbSarBrightnessFunction.txx
+++ b/Modules/Radiometry/SARCalibration/include/otbSarBrightnessFunction.txx
@@ -16,8 +16,8 @@
 
 =========================================================================*/
 
-#ifndef __otbSarBrightnessFunction_txx
-#define __otbSarBrightnessFunction_txx
+#ifndef otbSarBrightnessFunction_txx
+#define otbSarBrightnessFunction_txx
 
 #include "otbSarBrightnessFunction.h"
 #include "itkNumericTraits.h"
diff --git a/Modules/Radiometry/SARCalibration/include/otbSarBrightnessFunctor.h b/Modules/Radiometry/SARCalibration/include/otbSarBrightnessFunctor.h
index 22aecbbad5..88cda952fb 100644
--- a/Modules/Radiometry/SARCalibration/include/otbSarBrightnessFunctor.h
+++ b/Modules/Radiometry/SARCalibration/include/otbSarBrightnessFunctor.h
@@ -16,8 +16,8 @@
 
 =========================================================================*/
 
-#ifndef __otbSarBrightnessFunctor_h
-#define __otbSarBrightnessFunctor_h
+#ifndef otbSarBrightnessFunctor_h
+#define otbSarBrightnessFunctor_h
 
 #include "otbMath.h"
 #include "itkNumericTraits.h"
diff --git a/Modules/Radiometry/SARCalibration/include/otbSarBrightnessToImageFilter.h b/Modules/Radiometry/SARCalibration/include/otbSarBrightnessToImageFilter.h
index 9542eba839..25c85da60f 100644
--- a/Modules/Radiometry/SARCalibration/include/otbSarBrightnessToImageFilter.h
+++ b/Modules/Radiometry/SARCalibration/include/otbSarBrightnessToImageFilter.h
@@ -18,8 +18,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbSarBrightnessToImageFilter_h
-#define __otbSarBrightnessToImageFilter_h
+#ifndef otbSarBrightnessToImageFilter_h
+#define otbSarBrightnessToImageFilter_h
 
 #include "otbSarBrightnessFunction.h"
 #include "otbFunctionToImageFilter.h"
diff --git a/Modules/Radiometry/SARCalibration/include/otbSarBrightnessToImageFilter.txx b/Modules/Radiometry/SARCalibration/include/otbSarBrightnessToImageFilter.txx
index 5030eb932d..2184f44f63 100644
--- a/Modules/Radiometry/SARCalibration/include/otbSarBrightnessToImageFilter.txx
+++ b/Modules/Radiometry/SARCalibration/include/otbSarBrightnessToImageFilter.txx
@@ -18,8 +18,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbSarBrightnessToImageFilter_txx
-#define __otbSarBrightnessToImageFilter_txx
+#ifndef otbSarBrightnessToImageFilter_txx
+#define otbSarBrightnessToImageFilter_txx
 
 #include "otbSarBrightnessToImageFilter.h"
 
diff --git a/Modules/Radiometry/SARCalibration/include/otbSarParametricMapFunction.h b/Modules/Radiometry/SARCalibration/include/otbSarParametricMapFunction.h
index d6d117d3e7..526bcc57c1 100644
--- a/Modules/Radiometry/SARCalibration/include/otbSarParametricMapFunction.h
+++ b/Modules/Radiometry/SARCalibration/include/otbSarParametricMapFunction.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbSarParametricMapFunction_h
-#define __otbSarParametricMapFunction_h
+#ifndef otbSarParametricMapFunction_h
+#define otbSarParametricMapFunction_h
 
 #include "itkImageFunction.h"
 #include "itkPointSet.h"
diff --git a/Modules/Radiometry/SARCalibration/include/otbSarParametricMapFunction.txx b/Modules/Radiometry/SARCalibration/include/otbSarParametricMapFunction.txx
index ed1c8c745c..fa849761cc 100644
--- a/Modules/Radiometry/SARCalibration/include/otbSarParametricMapFunction.txx
+++ b/Modules/Radiometry/SARCalibration/include/otbSarParametricMapFunction.txx
@@ -16,8 +16,8 @@
 
 =========================================================================*/
 
-#ifndef __otbSarParametricMapFunction_txx
-#define __otbSarParametricMapFunction_txx
+#ifndef otbSarParametricMapFunction_txx
+#define otbSarParametricMapFunction_txx
 
 #include "otbSarParametricMapFunction.h"
 #include "itkNumericTraits.h"
diff --git a/Modules/Radiometry/SARCalibration/include/otbSarRadiometricCalibrationFunction.h b/Modules/Radiometry/SARCalibration/include/otbSarRadiometricCalibrationFunction.h
index 3dbeac8f70..704d90b043 100644
--- a/Modules/Radiometry/SARCalibration/include/otbSarRadiometricCalibrationFunction.h
+++ b/Modules/Radiometry/SARCalibration/include/otbSarRadiometricCalibrationFunction.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbSarRadiometricCalibrationFunction_h
-#define __otbSarRadiometricCalibrationFunction_h
+#ifndef otbSarRadiometricCalibrationFunction_h
+#define otbSarRadiometricCalibrationFunction_h
 
 #include "otbSarParametricMapFunction.h"
 #include "otbSarCalibrationLookupData.h"
diff --git a/Modules/Radiometry/SARCalibration/include/otbSarRadiometricCalibrationFunction.txx b/Modules/Radiometry/SARCalibration/include/otbSarRadiometricCalibrationFunction.txx
index 4e22a24c59..2dc5a2625c 100644
--- a/Modules/Radiometry/SARCalibration/include/otbSarRadiometricCalibrationFunction.txx
+++ b/Modules/Radiometry/SARCalibration/include/otbSarRadiometricCalibrationFunction.txx
@@ -16,8 +16,8 @@
 
 =========================================================================*/
 
-#ifndef __otbSarRadiometricCalibrationFunction_txx
-#define __otbSarRadiometricCalibrationFunction_txx
+#ifndef otbSarRadiometricCalibrationFunction_txx
+#define otbSarRadiometricCalibrationFunction_txx
 
 #include "otbSarRadiometricCalibrationFunction.h"
 #include "itkNumericTraits.h"
diff --git a/Modules/Radiometry/SARCalibration/include/otbSarRadiometricCalibrationToImageFilter.h b/Modules/Radiometry/SARCalibration/include/otbSarRadiometricCalibrationToImageFilter.h
index 8940d382a7..34486aa01e 100644
--- a/Modules/Radiometry/SARCalibration/include/otbSarRadiometricCalibrationToImageFilter.h
+++ b/Modules/Radiometry/SARCalibration/include/otbSarRadiometricCalibrationToImageFilter.h
@@ -18,8 +18,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbSarRadiometricCalibrationToImageFilter_h
-#define __otbSarRadiometricCalibrationToImageFilter_h
+#ifndef otbSarRadiometricCalibrationToImageFilter_h
+#define otbSarRadiometricCalibrationToImageFilter_h
 
 #include "otbSarRadiometricCalibrationFunction.h"
 #include "otbFunctionToImageFilter.h"
diff --git a/Modules/Radiometry/SARCalibration/include/otbSarRadiometricCalibrationToImageFilter.txx b/Modules/Radiometry/SARCalibration/include/otbSarRadiometricCalibrationToImageFilter.txx
index ad0f5b47e0..50b4ad850d 100644
--- a/Modules/Radiometry/SARCalibration/include/otbSarRadiometricCalibrationToImageFilter.txx
+++ b/Modules/Radiometry/SARCalibration/include/otbSarRadiometricCalibrationToImageFilter.txx
@@ -18,8 +18,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbSarRadiometricCalibrationToImageFilter_txx
-#define __otbSarRadiometricCalibrationToImageFilter_txx
+#ifndef otbSarRadiometricCalibrationToImageFilter_txx
+#define otbSarRadiometricCalibrationToImageFilter_txx
 
 #include "otbSarRadiometricCalibrationToImageFilter.h"
 #include "otbSarImageMetadataInterfaceFactory.h"
diff --git a/Modules/Radiometry/SARCalibration/include/otbTerraSarBrightnessFunctor.h b/Modules/Radiometry/SARCalibration/include/otbTerraSarBrightnessFunctor.h
index 9ff7c1a608..d8fde3aa99 100644
--- a/Modules/Radiometry/SARCalibration/include/otbTerraSarBrightnessFunctor.h
+++ b/Modules/Radiometry/SARCalibration/include/otbTerraSarBrightnessFunctor.h
@@ -19,8 +19,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbTerraSarBrightnessFunctor_h
-#define __otbTerraSarBrightnessFunctor_h
+#ifndef otbTerraSarBrightnessFunctor_h
+#define otbTerraSarBrightnessFunctor_h
 
 #include "otbMath.h"
 
diff --git a/Modules/Radiometry/SARCalibration/include/otbTerraSarBrightnessFunctor.txx b/Modules/Radiometry/SARCalibration/include/otbTerraSarBrightnessFunctor.txx
index 96a05e8c6c..6ad103ba74 100644
--- a/Modules/Radiometry/SARCalibration/include/otbTerraSarBrightnessFunctor.txx
+++ b/Modules/Radiometry/SARCalibration/include/otbTerraSarBrightnessFunctor.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbTerraSarBrightnessFunctor_txx
-#define __otbTerraSarBrightnessFunctor_txx
+#ifndef otbTerraSarBrightnessFunctor_txx
+#define otbTerraSarBrightnessFunctor_txx
 
 #include "otbTerraSarBrightnessFunctor.h"
 
diff --git a/Modules/Radiometry/SARCalibration/include/otbTerraSarBrightnessImageFilter.h b/Modules/Radiometry/SARCalibration/include/otbTerraSarBrightnessImageFilter.h
index cd7869f729..9e82701f04 100644
--- a/Modules/Radiometry/SARCalibration/include/otbTerraSarBrightnessImageFilter.h
+++ b/Modules/Radiometry/SARCalibration/include/otbTerraSarBrightnessImageFilter.h
@@ -19,8 +19,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbTerraSarBrightnessImageFilter_h
-#define __otbTerraSarBrightnessImageFilter_h
+#ifndef otbTerraSarBrightnessImageFilter_h
+#define otbTerraSarBrightnessImageFilter_h
 
 #include "itkUnaryFunctorImageFilter.h"
 #include "itkMetaDataDictionary.h"
diff --git a/Modules/Radiometry/SARCalibration/include/otbTerraSarBrightnessImageFilter.txx b/Modules/Radiometry/SARCalibration/include/otbTerraSarBrightnessImageFilter.txx
index 23db6e9ba7..b183e8a2d0 100644
--- a/Modules/Radiometry/SARCalibration/include/otbTerraSarBrightnessImageFilter.txx
+++ b/Modules/Radiometry/SARCalibration/include/otbTerraSarBrightnessImageFilter.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbTerraSarBrightnessImageFilter_txx
-#define __otbTerraSarBrightnessImageFilter_txx
+#ifndef otbTerraSarBrightnessImageFilter_txx
+#define otbTerraSarBrightnessImageFilter_txx
 
 #include "otbTerraSarBrightnessImageFilter.h"
 #include "otbTerraSarImageMetadataInterface.h"
diff --git a/Modules/Radiometry/Simulation/include/otbAtmosphericEffects.h b/Modules/Radiometry/Simulation/include/otbAtmosphericEffects.h
index 06399b4dbb..09575398d2 100644
--- a/Modules/Radiometry/Simulation/include/otbAtmosphericEffects.h
+++ b/Modules/Radiometry/Simulation/include/otbAtmosphericEffects.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbAtmosphericEffects_h
-#define __otbAtmosphericEffects_h
+#ifndef otbAtmosphericEffects_h
+#define otbAtmosphericEffects_h
 
 #include "otbRadiometryCorrectionParametersToAtmosphericRadiativeTerms.h"
 
diff --git a/Modules/Radiometry/Simulation/include/otbAtmosphericEffects.txx b/Modules/Radiometry/Simulation/include/otbAtmosphericEffects.txx
index e31a692ca5..6bd373b791 100644
--- a/Modules/Radiometry/Simulation/include/otbAtmosphericEffects.txx
+++ b/Modules/Radiometry/Simulation/include/otbAtmosphericEffects.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbAtmosphericEffects_txx
-#define __otbAtmosphericEffects_txx
+#ifndef otbAtmosphericEffects_txx
+#define otbAtmosphericEffects_txx
 
 #include "otbAtmosphericEffects.h"
 #include "otbSurfaceReflectanceToReflectanceFilter.h"
diff --git a/Modules/Radiometry/Simulation/include/otbDataSpecP5B.h b/Modules/Radiometry/Simulation/include/otbDataSpecP5B.h
index ae829af9ef..e5116ac13f 100644
--- a/Modules/Radiometry/Simulation/include/otbDataSpecP5B.h
+++ b/Modules/Radiometry/Simulation/include/otbDataSpecP5B.h
@@ -16,8 +16,8 @@
 
 =========================================================================*/
 
-#ifndef __otbDataSpecP5B_h
-#define __otbDataSpecP5B_h
+#ifndef otbDataSpecP5B_h
+#define otbDataSpecP5B_h
 
 namespace otb
 {
@@ -62,4 +62,4 @@ extern const DataSpec DataSpecP5B[2101];
 
 }
 
-#endif /* __otbDataSpecP5B_h */
+#endif /* otbDataSpecP5B_h */
diff --git a/Modules/Radiometry/Simulation/include/otbImageSimulationMethod.h b/Modules/Radiometry/Simulation/include/otbImageSimulationMethod.h
index e501285654..77143adb68 100644
--- a/Modules/Radiometry/Simulation/include/otbImageSimulationMethod.h
+++ b/Modules/Radiometry/Simulation/include/otbImageSimulationMethod.h
@@ -16,8 +16,8 @@
 
 =========================================================================*/
 
-#ifndef __otbImageSimulationMethod_h
-#define __otbImageSimulationMethod_h
+#ifndef otbImageSimulationMethod_h
+#define otbImageSimulationMethod_h
 
 
 #include "itkImageSource.h"
diff --git a/Modules/Radiometry/Simulation/include/otbImageSimulationMethod.txx b/Modules/Radiometry/Simulation/include/otbImageSimulationMethod.txx
index 880f18e9d4..5af27083d0 100644
--- a/Modules/Radiometry/Simulation/include/otbImageSimulationMethod.txx
+++ b/Modules/Radiometry/Simulation/include/otbImageSimulationMethod.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbImageSimulationMethod_txx
-#define __otbImageSimulationMethod_txx
+#ifndef otbImageSimulationMethod_txx
+#define otbImageSimulationMethod_txx
 
 #include "otbImageSimulationMethod.h"
 
diff --git a/Modules/Radiometry/Simulation/include/otbLabelMapToSimulatedImageFilter.h b/Modules/Radiometry/Simulation/include/otbLabelMapToSimulatedImageFilter.h
index 9c2e663cb9..f3589aefe9 100644
--- a/Modules/Radiometry/Simulation/include/otbLabelMapToSimulatedImageFilter.h
+++ b/Modules/Radiometry/Simulation/include/otbLabelMapToSimulatedImageFilter.h
@@ -16,8 +16,8 @@
 
 =========================================================================*/
 
-#ifndef __otbLabelMapToSimulatedImageFilter_h
-#define __otbLabelMapToSimulatedImageFilter_h
+#ifndef otbLabelMapToSimulatedImageFilter_h
+#define otbLabelMapToSimulatedImageFilter_h
 
 
 #include "itkLabelMapFilter.h"
diff --git a/Modules/Radiometry/Simulation/include/otbLabelMapToSimulatedImageFilter.txx b/Modules/Radiometry/Simulation/include/otbLabelMapToSimulatedImageFilter.txx
index b892bfe307..24403404d0 100644
--- a/Modules/Radiometry/Simulation/include/otbLabelMapToSimulatedImageFilter.txx
+++ b/Modules/Radiometry/Simulation/include/otbLabelMapToSimulatedImageFilter.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbLabelMapToSimulatedImageFilter_txx
-#define __otbLabelMapToSimulatedImageFilter_txx
+#ifndef otbLabelMapToSimulatedImageFilter_txx
+#define otbLabelMapToSimulatedImageFilter_txx
 
 #include "otbLabelMapToSimulatedImageFilter.h"
 
diff --git a/Modules/Radiometry/Simulation/include/otbLabelToProSailParameters.h b/Modules/Radiometry/Simulation/include/otbLabelToProSailParameters.h
index 9899671e75..6fe0a5c811 100644
--- a/Modules/Radiometry/Simulation/include/otbLabelToProSailParameters.h
+++ b/Modules/Radiometry/Simulation/include/otbLabelToProSailParameters.h
@@ -16,8 +16,8 @@
 
 =========================================================================*/
 
-#ifndef __otbLabelToProSailParameters_h
-#define __otbLabelToProSailParameters_h
+#ifndef otbLabelToProSailParameters_h
+#define otbLabelToProSailParameters_h
 
 #include "otbLabelToSimulationParametersBase.h"
 
diff --git a/Modules/Radiometry/Simulation/include/otbLabelToProSailParameters.txx b/Modules/Radiometry/Simulation/include/otbLabelToProSailParameters.txx
index 3def2c714b..d198b61596 100644
--- a/Modules/Radiometry/Simulation/include/otbLabelToProSailParameters.txx
+++ b/Modules/Radiometry/Simulation/include/otbLabelToProSailParameters.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbLabelToProSailParameters_txx
-#define __otbLabelToProSailParameters_txx
+#ifndef otbLabelToProSailParameters_txx
+#define otbLabelToProSailParameters_txx
 
 #include "itkNumericTraits.h"
 
diff --git a/Modules/Radiometry/Simulation/include/otbLabelToSimulationParametersBase.h b/Modules/Radiometry/Simulation/include/otbLabelToSimulationParametersBase.h
index 45e00b2ba3..667913a648 100644
--- a/Modules/Radiometry/Simulation/include/otbLabelToSimulationParametersBase.h
+++ b/Modules/Radiometry/Simulation/include/otbLabelToSimulationParametersBase.h
@@ -16,8 +16,8 @@
 
 =========================================================================*/
 
-#ifndef __otbLabelToSimulationParametersBase_h
-#define __otbLabelToSimulationParametersBase_h
+#ifndef otbLabelToSimulationParametersBase_h
+#define otbLabelToSimulationParametersBase_h
 
 
 #include "itkProcessObject.h"
diff --git a/Modules/Radiometry/Simulation/include/otbLeafParameters.h b/Modules/Radiometry/Simulation/include/otbLeafParameters.h
index b4aefb7c85..51fb59d85a 100644
--- a/Modules/Radiometry/Simulation/include/otbLeafParameters.h
+++ b/Modules/Radiometry/Simulation/include/otbLeafParameters.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbLeafParameters_h
-#define __otbLeafParameters_h
+#ifndef otbLeafParameters_h
+#define otbLeafParameters_h
 
 
 #include "itkDataObject.h"
diff --git a/Modules/Radiometry/Simulation/include/otbProSailParameters.h b/Modules/Radiometry/Simulation/include/otbProSailParameters.h
index 52d1475b06..f4a306b2d2 100644
--- a/Modules/Radiometry/Simulation/include/otbProSailParameters.h
+++ b/Modules/Radiometry/Simulation/include/otbProSailParameters.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbProSailParameters_h
-#define __otbProSailParameters_h
+#ifndef otbProSailParameters_h
+#define otbProSailParameters_h
 
 
 #include "itkDataObject.h"
diff --git a/Modules/Radiometry/Simulation/include/otbProspectModel.h b/Modules/Radiometry/Simulation/include/otbProspectModel.h
index eb8833c5c5..68165778a7 100644
--- a/Modules/Radiometry/Simulation/include/otbProspectModel.h
+++ b/Modules/Radiometry/Simulation/include/otbProspectModel.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbProspectModel_h
-#define __otbProspectModel_h
+#ifndef otbProspectModel_h
+#define otbProspectModel_h
 
 
 #include "otbLeafParameters.h"
diff --git a/Modules/Radiometry/Simulation/include/otbReduceSpectralResponse.h b/Modules/Radiometry/Simulation/include/otbReduceSpectralResponse.h
index f56ec78b0c..b0370b7465 100644
--- a/Modules/Radiometry/Simulation/include/otbReduceSpectralResponse.h
+++ b/Modules/Radiometry/Simulation/include/otbReduceSpectralResponse.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbReduceSpectralResponse_h
-#define __otbReduceSpectralResponse_h
+#ifndef otbReduceSpectralResponse_h
+#define otbReduceSpectralResponse_h
 
 
 #include "itkDataObject.h"
diff --git a/Modules/Radiometry/Simulation/include/otbReduceSpectralResponse.txx b/Modules/Radiometry/Simulation/include/otbReduceSpectralResponse.txx
index 2ab4baa479..7484c17a81 100644
--- a/Modules/Radiometry/Simulation/include/otbReduceSpectralResponse.txx
+++ b/Modules/Radiometry/Simulation/include/otbReduceSpectralResponse.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbReduceSpectralResponse_txx
-#define __otbReduceSpectralResponse_txx
+#ifndef otbReduceSpectralResponse_txx
+#define otbReduceSpectralResponse_txx
 
 #include <algorithm>
 #include "itkNumericTraits.h"
diff --git a/Modules/Radiometry/Simulation/include/otbReduceSpectralResponseClassifierRAndNIR.h b/Modules/Radiometry/Simulation/include/otbReduceSpectralResponseClassifierRAndNIR.h
index be8d7a5586..70f1032688 100644
--- a/Modules/Radiometry/Simulation/include/otbReduceSpectralResponseClassifierRAndNIR.h
+++ b/Modules/Radiometry/Simulation/include/otbReduceSpectralResponseClassifierRAndNIR.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbReduceSpectralResponseClassifierRAndNIR_h
-#define __otbReduceSpectralResponseClassifierRAndNIR_h
+#ifndef otbReduceSpectralResponseClassifierRAndNIR_h
+#define otbReduceSpectralResponseClassifierRAndNIR_h
 
 
 #include "otbReduceSpectralResponse.h"
diff --git a/Modules/Radiometry/Simulation/include/otbReduceSpectralResponseClassifierRAndNIR.txx b/Modules/Radiometry/Simulation/include/otbReduceSpectralResponseClassifierRAndNIR.txx
index 2791d1fa55..7f488cdc72 100644
--- a/Modules/Radiometry/Simulation/include/otbReduceSpectralResponseClassifierRAndNIR.txx
+++ b/Modules/Radiometry/Simulation/include/otbReduceSpectralResponseClassifierRAndNIR.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbReduceSpectralResponseClassifierRAndNIR_txx
-#define __otbReduceSpectralResponseClassifierRAndNIR_txx
+#ifndef otbReduceSpectralResponseClassifierRAndNIR_txx
+#define otbReduceSpectralResponseClassifierRAndNIR_txx
 
 #include "otbReduceSpectralResponseClassifierRAndNIR.h"
 
diff --git a/Modules/Radiometry/Simulation/include/otbSailModel.h b/Modules/Radiometry/Simulation/include/otbSailModel.h
index 442370f17f..5aec526b6d 100644
--- a/Modules/Radiometry/Simulation/include/otbSailModel.h
+++ b/Modules/Radiometry/Simulation/include/otbSailModel.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbSailModel_h
-#define __otbSailModel_h
+#ifndef otbSailModel_h
+#define otbSailModel_h
 
 
 #include "otbSpectralResponse.h"
diff --git a/Modules/Radiometry/Simulation/include/otbSatelliteRSR.h b/Modules/Radiometry/Simulation/include/otbSatelliteRSR.h
index ee852cee15..e98f2b4a18 100644
--- a/Modules/Radiometry/Simulation/include/otbSatelliteRSR.h
+++ b/Modules/Radiometry/Simulation/include/otbSatelliteRSR.h
@@ -15,8 +15,8 @@
  PURPOSE.  See the above copyright notices for more information.
 
  =========================================================================*/
-#ifndef __otbSatelliteRSR_h
-#define __otbSatelliteRSR_h
+#ifndef otbSatelliteRSR_h
+#define otbSatelliteRSR_h
 
 #include <vector>
 #include <utility>
diff --git a/Modules/Radiometry/Simulation/include/otbSatelliteRSR.txx b/Modules/Radiometry/Simulation/include/otbSatelliteRSR.txx
index 12d3b8c04c..b12efd80f4 100644
--- a/Modules/Radiometry/Simulation/include/otbSatelliteRSR.txx
+++ b/Modules/Radiometry/Simulation/include/otbSatelliteRSR.txx
@@ -15,8 +15,8 @@
  PURPOSE.  See the above copyright notices for more information.
 
  =========================================================================*/
-#ifndef __otbSatelliteRSR_txx
-#define __otbSatelliteRSR_txx
+#ifndef otbSatelliteRSR_txx
+#define otbSatelliteRSR_txx
 
 #include "otbSatelliteRSR.h"
 
diff --git a/Modules/Radiometry/Simulation/include/otbSimulationStep1Base.h b/Modules/Radiometry/Simulation/include/otbSimulationStep1Base.h
index 22fbde2480..6285ff432c 100644
--- a/Modules/Radiometry/Simulation/include/otbSimulationStep1Base.h
+++ b/Modules/Radiometry/Simulation/include/otbSimulationStep1Base.h
@@ -16,8 +16,8 @@
 
 =========================================================================*/
 
-#ifndef __otbSimulationStep1Base_h
-#define __otbSimulationStep1Base_h
+#ifndef otbSimulationStep1Base_h
+#define otbSimulationStep1Base_h
 
 
 #include "itkProcessObject.h"
diff --git a/Modules/Radiometry/Simulation/include/otbSimulationStep2Base.h b/Modules/Radiometry/Simulation/include/otbSimulationStep2Base.h
index 274c35cd21..b53beded13 100644
--- a/Modules/Radiometry/Simulation/include/otbSimulationStep2Base.h
+++ b/Modules/Radiometry/Simulation/include/otbSimulationStep2Base.h
@@ -16,8 +16,8 @@
 
 =========================================================================*/
 
-#ifndef __otbSimulationStep2Base_h
-#define __otbSimulationStep2Base_h
+#ifndef otbSimulationStep2Base_h
+#define otbSimulationStep2Base_h
 
 #include "itkProcessObject.h"
 #include "otbSpectralResponse.h"
diff --git a/Modules/Radiometry/Simulation/include/otbSpatialisationFilter.h b/Modules/Radiometry/Simulation/include/otbSpatialisationFilter.h
index 984a8f2903..c480ccd7a3 100644
--- a/Modules/Radiometry/Simulation/include/otbSpatialisationFilter.h
+++ b/Modules/Radiometry/Simulation/include/otbSpatialisationFilter.h
@@ -16,8 +16,8 @@
 
 =========================================================================*/
 
-#ifndef __otbSpatialisationFilter_h
-#define __otbSpatialisationFilter_h
+#ifndef otbSpatialisationFilter_h
+#define otbSpatialisationFilter_h
 
 #include "itkLabelObject.h"
 #include "otbLabelMapSource.h"
diff --git a/Modules/Radiometry/Simulation/include/otbSpatialisationFilter.txx b/Modules/Radiometry/Simulation/include/otbSpatialisationFilter.txx
index b6832c57a8..602dc7a1e8 100644
--- a/Modules/Radiometry/Simulation/include/otbSpatialisationFilter.txx
+++ b/Modules/Radiometry/Simulation/include/otbSpatialisationFilter.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbSpatialisationFilter_txx
-#define __otbSpatialisationFilter_txx
+#ifndef otbSpatialisationFilter_txx
+#define otbSpatialisationFilter_txx
 
 #include "itkNumericTraits.h"
 
diff --git a/Modules/Radiometry/Simulation/include/otbSpectralResponse.h b/Modules/Radiometry/Simulation/include/otbSpectralResponse.h
index 042793f974..a2440838bc 100644
--- a/Modules/Radiometry/Simulation/include/otbSpectralResponse.h
+++ b/Modules/Radiometry/Simulation/include/otbSpectralResponse.h
@@ -15,8 +15,8 @@
  PURPOSE.  See the above copyright notices for more information.
 
  =========================================================================*/
-#ifndef __otbSpectralResponse_h
-#define __otbSpectralResponse_h
+#ifndef otbSpectralResponse_h
+#define otbSpectralResponse_h
 
 #include "itkDataObject.h"
 #include <itkObjectFactory.h>
diff --git a/Modules/Radiometry/Simulation/include/otbSpectralResponse.txx b/Modules/Radiometry/Simulation/include/otbSpectralResponse.txx
index 95fd78e0f6..efad5980eb 100644
--- a/Modules/Radiometry/Simulation/include/otbSpectralResponse.txx
+++ b/Modules/Radiometry/Simulation/include/otbSpectralResponse.txx
@@ -15,8 +15,8 @@
  PURPOSE.  See the above copyright notices for more information.
 
  =========================================================================*/
-#ifndef __otbSpectralResponse_txx
-#define __otbSpectralResponse_txx
+#ifndef otbSpectralResponse_txx
+#define otbSpectralResponse_txx
 
 #include "itkNumericTraits.h"
 
diff --git a/Modules/Radiometry/Simulation/include/otbSurfaceReflectanceToReflectanceFilter.h b/Modules/Radiometry/Simulation/include/otbSurfaceReflectanceToReflectanceFilter.h
index 2820a8a5b0..cd469c5cdf 100644
--- a/Modules/Radiometry/Simulation/include/otbSurfaceReflectanceToReflectanceFilter.h
+++ b/Modules/Radiometry/Simulation/include/otbSurfaceReflectanceToReflectanceFilter.h
@@ -19,8 +19,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbSurfaceReflectanceToReflectanceFilter_h
-#define __otbSurfaceReflectanceToReflectanceFilter_h
+#ifndef otbSurfaceReflectanceToReflectanceFilter_h
+#define otbSurfaceReflectanceToReflectanceFilter_h
 
 
 #include "otbUnaryImageFunctorWithVectorImageFilter.h"
diff --git a/Modules/Radiometry/Simulation/include/otbSurfaceReflectanceToReflectanceFilter.txx b/Modules/Radiometry/Simulation/include/otbSurfaceReflectanceToReflectanceFilter.txx
index de5447e914..8ead55df91 100644
--- a/Modules/Radiometry/Simulation/include/otbSurfaceReflectanceToReflectanceFilter.txx
+++ b/Modules/Radiometry/Simulation/include/otbSurfaceReflectanceToReflectanceFilter.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbSurfaceReflectanceToReflectanceFilter_txx
-#define __otbSurfaceReflectanceToReflectanceFilter_txx
+#ifndef otbSurfaceReflectanceToReflectanceFilter_txx
+#define otbSurfaceReflectanceToReflectanceFilter_txx
 
 #include "otbSurfaceReflectanceToReflectanceFilter.h"
 #include "otbOpticalImageMetadataInterfaceFactory.h"
diff --git a/Modules/Registration/DisparityMap/include/otbDisparityMapEstimationMethod.h b/Modules/Registration/DisparityMap/include/otbDisparityMapEstimationMethod.h
index f1fd222d22..3bbe520a40 100644
--- a/Modules/Registration/DisparityMap/include/otbDisparityMapEstimationMethod.h
+++ b/Modules/Registration/DisparityMap/include/otbDisparityMapEstimationMethod.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbDisparityMapEstimationMethod_h
-#define __otbDisparityMapEstimationMethod_h
+#ifndef otbDisparityMapEstimationMethod_h
+#define otbDisparityMapEstimationMethod_h
 
 #include "itkImageToImageMetric.h"
 #include "itkSingleValuedNonLinearOptimizer.h"
diff --git a/Modules/Registration/DisparityMap/include/otbDisparityMapEstimationMethod.txx b/Modules/Registration/DisparityMap/include/otbDisparityMapEstimationMethod.txx
index cf94785d23..91e84ea592 100644
--- a/Modules/Registration/DisparityMap/include/otbDisparityMapEstimationMethod.txx
+++ b/Modules/Registration/DisparityMap/include/otbDisparityMapEstimationMethod.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbDisparityMapEstimationMethod_txx
-#define __otbDisparityMapEstimationMethod_txx
+#ifndef otbDisparityMapEstimationMethod_txx
+#define otbDisparityMapEstimationMethod_txx
 
 #include "otbDisparityMapEstimationMethod.h"
 #include "itkImageRegistrationMethod.h"
diff --git a/Modules/Registration/DisparityMap/include/otbDisparityMapMedianFilter.h b/Modules/Registration/DisparityMap/include/otbDisparityMapMedianFilter.h
index 2d786adec7..4d45a7a5ff 100644
--- a/Modules/Registration/DisparityMap/include/otbDisparityMapMedianFilter.h
+++ b/Modules/Registration/DisparityMap/include/otbDisparityMapMedianFilter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbDisparityMapMedianFilter_h
-#define __otbDisparityMapMedianFilter_h
+#ifndef otbDisparityMapMedianFilter_h
+#define otbDisparityMapMedianFilter_h
 
 #ifdef ITK_USE_CONSOLIDATED_MORPHOLOGY
 #include "itkOptMedianImageFilter.h"
diff --git a/Modules/Registration/DisparityMap/include/otbDisparityMapMedianFilter.txx b/Modules/Registration/DisparityMap/include/otbDisparityMapMedianFilter.txx
index cf5255f966..e0de95814d 100644
--- a/Modules/Registration/DisparityMap/include/otbDisparityMapMedianFilter.txx
+++ b/Modules/Registration/DisparityMap/include/otbDisparityMapMedianFilter.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbDisparityMapMedianFilter_txx
-#define __otbDisparityMapMedianFilter_txx
+#ifndef otbDisparityMapMedianFilter_txx
+#define otbDisparityMapMedianFilter_txx
 
 #ifdef ITK_USE_CONSOLIDATED_MORPHOLOGY
 #else
diff --git a/Modules/Registration/DisparityMap/include/otbDisparityMapTo3DFilter.h b/Modules/Registration/DisparityMap/include/otbDisparityMapTo3DFilter.h
index 32114ab347..77adb6b9c4 100644
--- a/Modules/Registration/DisparityMap/include/otbDisparityMapTo3DFilter.h
+++ b/Modules/Registration/DisparityMap/include/otbDisparityMapTo3DFilter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbDisparityMapTo3DFilter_h
-#define __otbDisparityMapTo3DFilter_h
+#ifndef otbDisparityMapTo3DFilter_h
+#define otbDisparityMapTo3DFilter_h
 
 #include "itkImageToImageFilter.h"
 #include "otbGenericRSTransform.h"
diff --git a/Modules/Registration/DisparityMap/include/otbDisparityMapTo3DFilter.txx b/Modules/Registration/DisparityMap/include/otbDisparityMapTo3DFilter.txx
index 284e63b2cc..80a2b6fdee 100644
--- a/Modules/Registration/DisparityMap/include/otbDisparityMapTo3DFilter.txx
+++ b/Modules/Registration/DisparityMap/include/otbDisparityMapTo3DFilter.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbDisparityMapTo3DFilter_txx
-#define __otbDisparityMapTo3DFilter_txx
+#ifndef otbDisparityMapTo3DFilter_txx
+#define otbDisparityMapTo3DFilter_txx
 
 #include "otbDisparityMapTo3DFilter.h"
 #include "itkImageRegionConstIteratorWithIndex.h"
diff --git a/Modules/Registration/DisparityMap/include/otbDisparityMapToDEMFilter.h b/Modules/Registration/DisparityMap/include/otbDisparityMapToDEMFilter.h
index b7f0497d7a..4a21701f41 100644
--- a/Modules/Registration/DisparityMap/include/otbDisparityMapToDEMFilter.h
+++ b/Modules/Registration/DisparityMap/include/otbDisparityMapToDEMFilter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbDisparityMapToDEMFilter_h
-#define __otbDisparityMapToDEMFilter_h
+#ifndef otbDisparityMapToDEMFilter_h
+#define otbDisparityMapToDEMFilter_h
 
 #include "itkImageToImageFilter.h"
 #include "otbGenericRSTransform.h"
diff --git a/Modules/Registration/DisparityMap/include/otbDisparityMapToDEMFilter.txx b/Modules/Registration/DisparityMap/include/otbDisparityMapToDEMFilter.txx
index ba5bb46cd7..cb729c9ec5 100644
--- a/Modules/Registration/DisparityMap/include/otbDisparityMapToDEMFilter.txx
+++ b/Modules/Registration/DisparityMap/include/otbDisparityMapToDEMFilter.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbDisparityMapToDEMFilter_txx
-#define __otbDisparityMapToDEMFilter_txx
+#ifndef otbDisparityMapToDEMFilter_txx
+#define otbDisparityMapToDEMFilter_txx
 
 #include "otbDisparityMapToDEMFilter.h"
 #include "itkImageRegionConstIteratorWithIndex.h"
diff --git a/Modules/Registration/DisparityMap/include/otbDisparityTranslateFilter.h b/Modules/Registration/DisparityMap/include/otbDisparityTranslateFilter.h
index 57fd11605e..74585ba7c7 100644
--- a/Modules/Registration/DisparityMap/include/otbDisparityTranslateFilter.h
+++ b/Modules/Registration/DisparityMap/include/otbDisparityTranslateFilter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbDisparityTranslateFilter_h
-#define __otbDisparityTranslateFilter_h
+#ifndef otbDisparityTranslateFilter_h
+#define otbDisparityTranslateFilter_h
 
 #include "itkImageToImageFilter.h"
 #include "otbVectorImage.h"
diff --git a/Modules/Registration/DisparityMap/include/otbDisparityTranslateFilter.txx b/Modules/Registration/DisparityMap/include/otbDisparityTranslateFilter.txx
index afd59f1caf..734f07ac43 100644
--- a/Modules/Registration/DisparityMap/include/otbDisparityTranslateFilter.txx
+++ b/Modules/Registration/DisparityMap/include/otbDisparityTranslateFilter.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbDisparityTranslateFilter_txx
-#define __otbDisparityTranslateFilter_txx
+#ifndef otbDisparityTranslateFilter_txx
+#define otbDisparityTranslateFilter_txx
 
 #include "otbDisparityTranslateFilter.h"
 
diff --git a/Modules/Registration/DisparityMap/include/otbFineRegistrationImageFilter.h b/Modules/Registration/DisparityMap/include/otbFineRegistrationImageFilter.h
index 4b2d9da15e..e964838bae 100644
--- a/Modules/Registration/DisparityMap/include/otbFineRegistrationImageFilter.h
+++ b/Modules/Registration/DisparityMap/include/otbFineRegistrationImageFilter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbFineRegistrationImageFilter_h
-#define __otbFineRegistrationImageFilter_h
+#ifndef otbFineRegistrationImageFilter_h
+#define otbFineRegistrationImageFilter_h
 
 #include "itkImageToImageFilter.h"
 #include "itkInterpolateImageFunction.h"
diff --git a/Modules/Registration/DisparityMap/include/otbFineRegistrationImageFilter.txx b/Modules/Registration/DisparityMap/include/otbFineRegistrationImageFilter.txx
index cc70ab6ba9..48c457f24a 100644
--- a/Modules/Registration/DisparityMap/include/otbFineRegistrationImageFilter.txx
+++ b/Modules/Registration/DisparityMap/include/otbFineRegistrationImageFilter.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbFineRegistrationImageFilter_txx
-#define __otbFineRegistrationImageFilter_txx
+#ifndef otbFineRegistrationImageFilter_txx
+#define otbFineRegistrationImageFilter_txx
 
 #include "otbFineRegistrationImageFilter.h"
 
diff --git a/Modules/Registration/DisparityMap/include/otbMultiDisparityMapTo3DFilter.h b/Modules/Registration/DisparityMap/include/otbMultiDisparityMapTo3DFilter.h
index 526edb25f2..4dd2e19c3a 100644
--- a/Modules/Registration/DisparityMap/include/otbMultiDisparityMapTo3DFilter.h
+++ b/Modules/Registration/DisparityMap/include/otbMultiDisparityMapTo3DFilter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbMultiDisparityMapTo3DFilter_h
-#define __otbMultiDisparityMapTo3DFilter_h
+#ifndef otbMultiDisparityMapTo3DFilter_h
+#define otbMultiDisparityMapTo3DFilter_h
 
 #include "itkImageToImageFilter.h"
 #include "otbGenericRSTransform.h"
diff --git a/Modules/Registration/DisparityMap/include/otbMultiDisparityMapTo3DFilter.txx b/Modules/Registration/DisparityMap/include/otbMultiDisparityMapTo3DFilter.txx
index 14229f5372..ca14ed47d5 100644
--- a/Modules/Registration/DisparityMap/include/otbMultiDisparityMapTo3DFilter.txx
+++ b/Modules/Registration/DisparityMap/include/otbMultiDisparityMapTo3DFilter.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbMultiDisparityMapTo3DFilter_txx
-#define __otbMultiDisparityMapTo3DFilter_txx
+#ifndef otbMultiDisparityMapTo3DFilter_txx
+#define otbMultiDisparityMapTo3DFilter_txx
 
 #include "otbMultiDisparityMapTo3DFilter.h"
 #include "itkImageRegionConstIteratorWithIndex.h"
diff --git a/Modules/Registration/DisparityMap/include/otbNCCRegistrationFilter.h b/Modules/Registration/DisparityMap/include/otbNCCRegistrationFilter.h
index 068cab626b..b802968ef7 100644
--- a/Modules/Registration/DisparityMap/include/otbNCCRegistrationFilter.h
+++ b/Modules/Registration/DisparityMap/include/otbNCCRegistrationFilter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbNCCRegistrationFilter_h
-#define __otbNCCRegistrationFilter_h
+#ifndef otbNCCRegistrationFilter_h
+#define otbNCCRegistrationFilter_h
 
 #include "itkPDEDeformableRegistrationFilter.h"
 #include "otbNCCRegistrationFunction.h"
diff --git a/Modules/Registration/DisparityMap/include/otbNCCRegistrationFilter.txx b/Modules/Registration/DisparityMap/include/otbNCCRegistrationFilter.txx
index c4f3d5a784..9e9edbcb45 100644
--- a/Modules/Registration/DisparityMap/include/otbNCCRegistrationFilter.txx
+++ b/Modules/Registration/DisparityMap/include/otbNCCRegistrationFilter.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbNCCRegistrationFilter_txx
-#define __otbNCCRegistrationFilter_txx
+#ifndef otbNCCRegistrationFilter_txx
+#define otbNCCRegistrationFilter_txx
 #include "otbNCCRegistrationFilter.h"
 
 namespace otb
diff --git a/Modules/Registration/DisparityMap/include/otbNCCRegistrationFunction.h b/Modules/Registration/DisparityMap/include/otbNCCRegistrationFunction.h
index 52de8e8a2f..bbb8f71bc3 100644
--- a/Modules/Registration/DisparityMap/include/otbNCCRegistrationFunction.h
+++ b/Modules/Registration/DisparityMap/include/otbNCCRegistrationFunction.h
@@ -18,8 +18,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbNCCRegistrationFunction_h
-#define __otbNCCRegistrationFunction_h
+#ifndef otbNCCRegistrationFunction_h
+#define otbNCCRegistrationFunction_h
 
 #include "itkPDEDeformableRegistrationFunction.h"
 #include "itkPoint.h"
diff --git a/Modules/Registration/DisparityMap/include/otbNCCRegistrationFunction.txx b/Modules/Registration/DisparityMap/include/otbNCCRegistrationFunction.txx
index ca682d349f..0563fc7fff 100644
--- a/Modules/Registration/DisparityMap/include/otbNCCRegistrationFunction.txx
+++ b/Modules/Registration/DisparityMap/include/otbNCCRegistrationFunction.txx
@@ -18,8 +18,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbNCCRegistrationFunction_txx
-#define __otbNCCRegistrationFunction_txx
+#ifndef otbNCCRegistrationFunction_txx
+#define otbNCCRegistrationFunction_txx
 
 #include "vnl/vnl_math.h"
 #include "itkNeighborhoodIterator.h"
diff --git a/Modules/Registration/DisparityMap/include/otbPixelWiseBlockMatchingImageFilter.h b/Modules/Registration/DisparityMap/include/otbPixelWiseBlockMatchingImageFilter.h
index bb3ff8bff5..db2ee9eac4 100644
--- a/Modules/Registration/DisparityMap/include/otbPixelWiseBlockMatchingImageFilter.h
+++ b/Modules/Registration/DisparityMap/include/otbPixelWiseBlockMatchingImageFilter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbPixelWiseBlockMatchingImageFilter_h
-#define __otbPixelWiseBlockMatchingImageFilter_h
+#ifndef otbPixelWiseBlockMatchingImageFilter_h
+#define otbPixelWiseBlockMatchingImageFilter_h
 
 
 #include "itkImageToImageFilter.h"
diff --git a/Modules/Registration/DisparityMap/include/otbPixelWiseBlockMatchingImageFilter.txx b/Modules/Registration/DisparityMap/include/otbPixelWiseBlockMatchingImageFilter.txx
index 4a1888427f..cf0c92ad81 100644
--- a/Modules/Registration/DisparityMap/include/otbPixelWiseBlockMatchingImageFilter.txx
+++ b/Modules/Registration/DisparityMap/include/otbPixelWiseBlockMatchingImageFilter.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbPixelWiseBlockMatchingImageFilter_txx
-#define __otbPixelWiseBlockMatchingImageFilter_txx
+#ifndef otbPixelWiseBlockMatchingImageFilter_txx
+#define otbPixelWiseBlockMatchingImageFilter_txx
 
 #include "otbPixelWiseBlockMatchingImageFilter.h"
 #include "itkProgressReporter.h"
diff --git a/Modules/Registration/DisparityMap/include/otbSubPixelDisparityImageFilter.h b/Modules/Registration/DisparityMap/include/otbSubPixelDisparityImageFilter.h
index 1c52eac29f..ca042aae9e 100644
--- a/Modules/Registration/DisparityMap/include/otbSubPixelDisparityImageFilter.h
+++ b/Modules/Registration/DisparityMap/include/otbSubPixelDisparityImageFilter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbSubPixelDisparityImageFilter_h
-#define __otbSubPixelDisparityImageFilter_h
+#ifndef otbSubPixelDisparityImageFilter_h
+#define otbSubPixelDisparityImageFilter_h
 
 #include "otbPixelWiseBlockMatchingImageFilter.h"
 
diff --git a/Modules/Registration/DisparityMap/include/otbSubPixelDisparityImageFilter.txx b/Modules/Registration/DisparityMap/include/otbSubPixelDisparityImageFilter.txx
index 2c9e23b6af..617b9e7aae 100644
--- a/Modules/Registration/DisparityMap/include/otbSubPixelDisparityImageFilter.txx
+++ b/Modules/Registration/DisparityMap/include/otbSubPixelDisparityImageFilter.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbSubPixelDisparityImageFilter_txx
-#define __otbSubPixelDisparityImageFilter_txx
+#ifndef otbSubPixelDisparityImageFilter_txx
+#define otbSubPixelDisparityImageFilter_txx
 
 
 namespace otb
diff --git a/Modules/Registration/DisplacementField/include/otbBSplinesInterpolateDisplacementFieldGenerator.h b/Modules/Registration/DisplacementField/include/otbBSplinesInterpolateDisplacementFieldGenerator.h
index 39b9ee004e..724dfbcc0b 100644
--- a/Modules/Registration/DisplacementField/include/otbBSplinesInterpolateDisplacementFieldGenerator.h
+++ b/Modules/Registration/DisplacementField/include/otbBSplinesInterpolateDisplacementFieldGenerator.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbBSplinesInterpolateDisplacementFieldGenerator_h
-#define __otbBSplinesInterpolateDisplacementFieldGenerator_h
+#ifndef otbBSplinesInterpolateDisplacementFieldGenerator_h
+#define otbBSplinesInterpolateDisplacementFieldGenerator_h
 
 #include "otbPointSetToDisplacementFieldGenerator.h"
 
diff --git a/Modules/Registration/DisplacementField/include/otbBSplinesInterpolateDisplacementFieldGenerator.txx b/Modules/Registration/DisplacementField/include/otbBSplinesInterpolateDisplacementFieldGenerator.txx
index 5c080f9c27..c37111188e 100644
--- a/Modules/Registration/DisplacementField/include/otbBSplinesInterpolateDisplacementFieldGenerator.txx
+++ b/Modules/Registration/DisplacementField/include/otbBSplinesInterpolateDisplacementFieldGenerator.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbBSplinesInterpolateDisplacementFieldGenerator_txx
-#define __otbBSplinesInterpolateDisplacementFieldGenerator_txx
+#ifndef otbBSplinesInterpolateDisplacementFieldGenerator_txx
+#define otbBSplinesInterpolateDisplacementFieldGenerator_txx
 
 #include "otbBSplinesInterpolateDisplacementFieldGenerator.h"
 // Disabling deprecation warning if on visual
diff --git a/Modules/Registration/DisplacementField/include/otbBSplinesInterpolateTransformDisplacementFieldGenerator.h b/Modules/Registration/DisplacementField/include/otbBSplinesInterpolateTransformDisplacementFieldGenerator.h
index 8931b796ae..abf0562227 100644
--- a/Modules/Registration/DisplacementField/include/otbBSplinesInterpolateTransformDisplacementFieldGenerator.h
+++ b/Modules/Registration/DisplacementField/include/otbBSplinesInterpolateTransformDisplacementFieldGenerator.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbBSplinesInterpolateTransformDisplacementFieldGenerator_h
-#define __otbBSplinesInterpolateTransformDisplacementFieldGenerator_h
+#ifndef otbBSplinesInterpolateTransformDisplacementFieldGenerator_h
+#define otbBSplinesInterpolateTransformDisplacementFieldGenerator_h
 
 #include "otbPointSetWithTransformToDisplacementFieldGenerator.h"
 #include "itkUnaryFunctorImageFilter.h"
diff --git a/Modules/Registration/DisplacementField/include/otbBSplinesInterpolateTransformDisplacementFieldGenerator.txx b/Modules/Registration/DisplacementField/include/otbBSplinesInterpolateTransformDisplacementFieldGenerator.txx
index cfb6fccecb..a015c12ed6 100644
--- a/Modules/Registration/DisplacementField/include/otbBSplinesInterpolateTransformDisplacementFieldGenerator.txx
+++ b/Modules/Registration/DisplacementField/include/otbBSplinesInterpolateTransformDisplacementFieldGenerator.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbBSplinesInterpolateTransformDisplacementFieldGenerator_txx
-#define __otbBSplinesInterpolateTransformDisplacementFieldGenerator_txx
+#ifndef otbBSplinesInterpolateTransformDisplacementFieldGenerator_txx
+#define otbBSplinesInterpolateTransformDisplacementFieldGenerator_txx
 
 #include "otbBSplinesInterpolateTransformDisplacementFieldGenerator.h"
 #include "itkLandmarkDisplacementFieldSource.h"
diff --git a/Modules/Registration/DisplacementField/include/otbNNearestPointsLinearInterpolateDisplacementFieldGenerator.h b/Modules/Registration/DisplacementField/include/otbNNearestPointsLinearInterpolateDisplacementFieldGenerator.h
index 2c4e64a789..daee0da6c7 100644
--- a/Modules/Registration/DisplacementField/include/otbNNearestPointsLinearInterpolateDisplacementFieldGenerator.h
+++ b/Modules/Registration/DisplacementField/include/otbNNearestPointsLinearInterpolateDisplacementFieldGenerator.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbNNearestPointsLinearInterpolateDisplacementFieldGenerator_h
-#define __otbNNearestPointsLinearInterpolateDisplacementFieldGenerator_h
+#ifndef otbNNearestPointsLinearInterpolateDisplacementFieldGenerator_h
+#define otbNNearestPointsLinearInterpolateDisplacementFieldGenerator_h
 
 #include "otbPointSetToDisplacementFieldGenerator.h"
 
diff --git a/Modules/Registration/DisplacementField/include/otbNNearestPointsLinearInterpolateDisplacementFieldGenerator.txx b/Modules/Registration/DisplacementField/include/otbNNearestPointsLinearInterpolateDisplacementFieldGenerator.txx
index 3c488e3c26..85dcc8a323 100644
--- a/Modules/Registration/DisplacementField/include/otbNNearestPointsLinearInterpolateDisplacementFieldGenerator.txx
+++ b/Modules/Registration/DisplacementField/include/otbNNearestPointsLinearInterpolateDisplacementFieldGenerator.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbNNearestPointsLinearInterpolateDisplacementFieldGenerator_txx
-#define __otbNNearestPointsLinearInterpolateDisplacementFieldGenerator_txx
+#ifndef otbNNearestPointsLinearInterpolateDisplacementFieldGenerator_txx
+#define otbNNearestPointsLinearInterpolateDisplacementFieldGenerator_txx
 
 #define EPSILON 1e-15
 
diff --git a/Modules/Registration/DisplacementField/include/otbNNearestTransformsLinearInterpolateDisplacementFieldGenerator.h b/Modules/Registration/DisplacementField/include/otbNNearestTransformsLinearInterpolateDisplacementFieldGenerator.h
index ef97a01d6d..a7da0b9e68 100644
--- a/Modules/Registration/DisplacementField/include/otbNNearestTransformsLinearInterpolateDisplacementFieldGenerator.h
+++ b/Modules/Registration/DisplacementField/include/otbNNearestTransformsLinearInterpolateDisplacementFieldGenerator.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbNNearestTransformsLinearInterpolateDisplacementFieldGenerator_h
-#define __otbNNearestTransformsLinearInterpolateDisplacementFieldGenerator_h
+#ifndef otbNNearestTransformsLinearInterpolateDisplacementFieldGenerator_h
+#define otbNNearestTransformsLinearInterpolateDisplacementFieldGenerator_h
 
 #include "otbPointSetWithTransformToDisplacementFieldGenerator.h"
 
diff --git a/Modules/Registration/DisplacementField/include/otbNNearestTransformsLinearInterpolateDisplacementFieldGenerator.txx b/Modules/Registration/DisplacementField/include/otbNNearestTransformsLinearInterpolateDisplacementFieldGenerator.txx
index 6df8ffdefe..42f331b68b 100644
--- a/Modules/Registration/DisplacementField/include/otbNNearestTransformsLinearInterpolateDisplacementFieldGenerator.txx
+++ b/Modules/Registration/DisplacementField/include/otbNNearestTransformsLinearInterpolateDisplacementFieldGenerator.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbNNearestTransformsLinearInterpolateDisplacementFieldGenerator_txx
-#define __otbNNearestTransformsLinearInterpolateDisplacementFieldGenerator_txx
+#ifndef otbNNearestTransformsLinearInterpolateDisplacementFieldGenerator_txx
+#define otbNNearestTransformsLinearInterpolateDisplacementFieldGenerator_txx
 
 #define EPSILON 1e-15
 
diff --git a/Modules/Registration/DisplacementField/include/otbNearestPointDisplacementFieldGenerator.h b/Modules/Registration/DisplacementField/include/otbNearestPointDisplacementFieldGenerator.h
index d3102261b7..070bc6d72f 100644
--- a/Modules/Registration/DisplacementField/include/otbNearestPointDisplacementFieldGenerator.h
+++ b/Modules/Registration/DisplacementField/include/otbNearestPointDisplacementFieldGenerator.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbNearestPointDisplacementFieldGenerator_h
-#define __otbNearestPointDisplacementFieldGenerator_h
+#ifndef otbNearestPointDisplacementFieldGenerator_h
+#define otbNearestPointDisplacementFieldGenerator_h
 
 #include "otbPointSetToDisplacementFieldGenerator.h"
 
diff --git a/Modules/Registration/DisplacementField/include/otbNearestPointDisplacementFieldGenerator.txx b/Modules/Registration/DisplacementField/include/otbNearestPointDisplacementFieldGenerator.txx
index 002b806162..c7d149ba27 100644
--- a/Modules/Registration/DisplacementField/include/otbNearestPointDisplacementFieldGenerator.txx
+++ b/Modules/Registration/DisplacementField/include/otbNearestPointDisplacementFieldGenerator.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbNearestPointDisplacementFieldGenerator_txx
-#define __otbNearestPointDisplacementFieldGenerator_txx
+#ifndef otbNearestPointDisplacementFieldGenerator_txx
+#define otbNearestPointDisplacementFieldGenerator_txx
 
 #include "otbNearestPointDisplacementFieldGenerator.h"
 #include "itkImageRegionIteratorWithIndex.h"
diff --git a/Modules/Registration/DisplacementField/include/otbNearestTransformDisplacementFieldGenerator.h b/Modules/Registration/DisplacementField/include/otbNearestTransformDisplacementFieldGenerator.h
index 85ffab67da..027b3cb0b1 100644
--- a/Modules/Registration/DisplacementField/include/otbNearestTransformDisplacementFieldGenerator.h
+++ b/Modules/Registration/DisplacementField/include/otbNearestTransformDisplacementFieldGenerator.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbNearestTransformDisplacementFieldGenerator_h
-#define __otbNearestTransformDisplacementFieldGenerator_h
+#ifndef otbNearestTransformDisplacementFieldGenerator_h
+#define otbNearestTransformDisplacementFieldGenerator_h
 
 #include "otbPointSetWithTransformToDisplacementFieldGenerator.h"
 
diff --git a/Modules/Registration/DisplacementField/include/otbNearestTransformDisplacementFieldGenerator.txx b/Modules/Registration/DisplacementField/include/otbNearestTransformDisplacementFieldGenerator.txx
index eaedebd5b8..36307f0213 100644
--- a/Modules/Registration/DisplacementField/include/otbNearestTransformDisplacementFieldGenerator.txx
+++ b/Modules/Registration/DisplacementField/include/otbNearestTransformDisplacementFieldGenerator.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbNearestTransformDisplacementFieldGenerator_txx
-#define __otbNearestTransformDisplacementFieldGenerator_txx
+#ifndef otbNearestTransformDisplacementFieldGenerator_txx
+#define otbNearestTransformDisplacementFieldGenerator_txx
 
 #include "otbNearestTransformDisplacementFieldGenerator.h"
 #include "itkImageRegionIteratorWithIndex.h"
diff --git a/Modules/Registration/DisplacementField/include/otbPointSetToDisplacementFieldGenerator.h b/Modules/Registration/DisplacementField/include/otbPointSetToDisplacementFieldGenerator.h
index 7bee95770c..219de2132d 100644
--- a/Modules/Registration/DisplacementField/include/otbPointSetToDisplacementFieldGenerator.h
+++ b/Modules/Registration/DisplacementField/include/otbPointSetToDisplacementFieldGenerator.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbPointSetToDisplacementFieldGenerator_h
-#define __otbPointSetToDisplacementFieldGenerator_h
+#ifndef otbPointSetToDisplacementFieldGenerator_h
+#define otbPointSetToDisplacementFieldGenerator_h
 
 #include "itkImageSource.h"
 
diff --git a/Modules/Registration/DisplacementField/include/otbPointSetToDisplacementFieldGenerator.txx b/Modules/Registration/DisplacementField/include/otbPointSetToDisplacementFieldGenerator.txx
index 22f088c18e..a21c18d1ba 100644
--- a/Modules/Registration/DisplacementField/include/otbPointSetToDisplacementFieldGenerator.txx
+++ b/Modules/Registration/DisplacementField/include/otbPointSetToDisplacementFieldGenerator.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbPointSetToDisplacementFieldGenerator_txx
-#define __otbPointSetToDisplacementFieldGenerator_txx
+#ifndef otbPointSetToDisplacementFieldGenerator_txx
+#define otbPointSetToDisplacementFieldGenerator_txx
 
 #include "otbPointSetToDisplacementFieldGenerator.h"
 #include "otbMacro.h"
diff --git a/Modules/Registration/DisplacementField/include/otbPointSetWithTransformToDisplacementFieldGenerator.h b/Modules/Registration/DisplacementField/include/otbPointSetWithTransformToDisplacementFieldGenerator.h
index 15e1da4af2..2d1ae6a6b9 100644
--- a/Modules/Registration/DisplacementField/include/otbPointSetWithTransformToDisplacementFieldGenerator.h
+++ b/Modules/Registration/DisplacementField/include/otbPointSetWithTransformToDisplacementFieldGenerator.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbPointSetWithTransformToDisplacementFieldGenerator_h
-#define __otbPointSetWithTransformToDisplacementFieldGenerator_h
+#ifndef otbPointSetWithTransformToDisplacementFieldGenerator_h
+#define otbPointSetWithTransformToDisplacementFieldGenerator_h
 
 #include "otbPointSetToDisplacementFieldGenerator.h"
 #include "itkTransform.h"
diff --git a/Modules/Registration/DisplacementField/include/otbPointSetWithTransformToDisplacementFieldGenerator.txx b/Modules/Registration/DisplacementField/include/otbPointSetWithTransformToDisplacementFieldGenerator.txx
index da172dac0c..92deb82347 100644
--- a/Modules/Registration/DisplacementField/include/otbPointSetWithTransformToDisplacementFieldGenerator.txx
+++ b/Modules/Registration/DisplacementField/include/otbPointSetWithTransformToDisplacementFieldGenerator.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbPointSetWithTransformToDisplacementFieldGenerator_txx
-#define __otbPointSetWithTransformToDisplacementFieldGenerator_txx
+#ifndef otbPointSetWithTransformToDisplacementFieldGenerator_txx
+#define otbPointSetWithTransformToDisplacementFieldGenerator_txx
 
 #include "otbPointSetWithTransformToDisplacementFieldGenerator.h"
 
diff --git a/Modules/Registration/Stereo/include/otbAdhesionCorrectionFilter.h b/Modules/Registration/Stereo/include/otbAdhesionCorrectionFilter.h
index a520c6791c..5b365d2646 100644
--- a/Modules/Registration/Stereo/include/otbAdhesionCorrectionFilter.h
+++ b/Modules/Registration/Stereo/include/otbAdhesionCorrectionFilter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbAdhesionCorrectionFilter_h
-#define __otbAdhesionCorrectionFilter_h
+#ifndef otbAdhesionCorrectionFilter_h
+#define otbAdhesionCorrectionFilter_h
 
 #include "itkImageToImageFilter.h"
 #include "otbImage.h"
diff --git a/Modules/Registration/Stereo/include/otbAdhesionCorrectionFilter.txx b/Modules/Registration/Stereo/include/otbAdhesionCorrectionFilter.txx
index 7f9cd034e0..69a3db5c85 100644
--- a/Modules/Registration/Stereo/include/otbAdhesionCorrectionFilter.txx
+++ b/Modules/Registration/Stereo/include/otbAdhesionCorrectionFilter.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbAdhesionCorrectionFilter_txx
-#define __otbAdhesionCorrectionFilter_txx
+#ifndef otbAdhesionCorrectionFilter_txx
+#define otbAdhesionCorrectionFilter_txx
 
 #include "otbAdhesionCorrectionFilter.h"
 
diff --git a/Modules/Registration/Stereo/include/otbBijectionCoherencyFilter.txx b/Modules/Registration/Stereo/include/otbBijectionCoherencyFilter.txx
index c4f6307af3..0f68fdc88c 100644
--- a/Modules/Registration/Stereo/include/otbBijectionCoherencyFilter.txx
+++ b/Modules/Registration/Stereo/include/otbBijectionCoherencyFilter.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbBijectionCoherencyFilter_txx
-#define __otbBijectionCoherencyFilter_txx
+#ifndef otbBijectionCoherencyFilter_txx
+#define otbBijectionCoherencyFilter_txx
 
 #include "otbBijectionCoherencyFilter.h"
 
diff --git a/Modules/Registration/Stereo/include/otbLineOfSightOptimizer.h b/Modules/Registration/Stereo/include/otbLineOfSightOptimizer.h
index 0400d0d92e..af29d7c2bf 100644
--- a/Modules/Registration/Stereo/include/otbLineOfSightOptimizer.h
+++ b/Modules/Registration/Stereo/include/otbLineOfSightOptimizer.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbLineOfSightOptimizer_h
-#define __otbLineOfSightOptimizer_h
+#ifndef otbLineOfSightOptimizer_h
+#define otbLineOfSightOptimizer_h
 
 #include "itkObject.h"
 
diff --git a/Modules/Registration/Stereo/include/otbLineOfSightOptimizer.txx b/Modules/Registration/Stereo/include/otbLineOfSightOptimizer.txx
index 93681a28e6..273662f316 100644
--- a/Modules/Registration/Stereo/include/otbLineOfSightOptimizer.txx
+++ b/Modules/Registration/Stereo/include/otbLineOfSightOptimizer.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbLineOfSightOptimizer_txx
-#define __otbLineOfSightOptimizer_txx
+#ifndef otbLineOfSightOptimizer_txx
+#define otbLineOfSightOptimizer_txx
 
 #include "otbLineOfSightOptimizer.h"
 
diff --git a/Modules/Registration/Stereo/include/otbMulti3DMapToDEMFilter.h b/Modules/Registration/Stereo/include/otbMulti3DMapToDEMFilter.h
index c6e10156e0..440b2348f4 100644
--- a/Modules/Registration/Stereo/include/otbMulti3DMapToDEMFilter.h
+++ b/Modules/Registration/Stereo/include/otbMulti3DMapToDEMFilter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbMulti3DMapToDEMFilter_h
-#define __otbMulti3DMapToDEMFilter_h
+#ifndef otbMulti3DMapToDEMFilter_h
+#define otbMulti3DMapToDEMFilter_h
 
 #include "itkImageToImageFilter.h"
 #include "otbImageToGenericRSOutputParameters.h"
diff --git a/Modules/Registration/Stereo/include/otbMulti3DMapToDEMFilter.txx b/Modules/Registration/Stereo/include/otbMulti3DMapToDEMFilter.txx
index 28c605bd22..58ddda9229 100644
--- a/Modules/Registration/Stereo/include/otbMulti3DMapToDEMFilter.txx
+++ b/Modules/Registration/Stereo/include/otbMulti3DMapToDEMFilter.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbMulti3DMapToDEMFilter_txx
-#define __otbMulti3DMapToDEMFilter_txx
+#ifndef otbMulti3DMapToDEMFilter_txx
+#define otbMulti3DMapToDEMFilter_txx
 
 #include "otbMulti3DMapToDEMFilter.h"
 #include "itkImageRegionConstIteratorWithIndex.h"
diff --git a/Modules/Registration/Stereo/include/otbStereoSensorModelToElevationMapFilter.h b/Modules/Registration/Stereo/include/otbStereoSensorModelToElevationMapFilter.h
index 1284b3068d..805ea3d865 100644
--- a/Modules/Registration/Stereo/include/otbStereoSensorModelToElevationMapFilter.h
+++ b/Modules/Registration/Stereo/include/otbStereoSensorModelToElevationMapFilter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbStereoSensorModelToElevationMapFilter_h
-#define __otbStereoSensorModelToElevationMapFilter_h
+#ifndef otbStereoSensorModelToElevationMapFilter_h
+#define otbStereoSensorModelToElevationMapFilter_h
 
 #include "itkImageToImageFilter.h"
 #include "itkInterpolateImageFunction.h"
diff --git a/Modules/Registration/Stereo/include/otbStereoSensorModelToElevationMapFilter.txx b/Modules/Registration/Stereo/include/otbStereoSensorModelToElevationMapFilter.txx
index 253a73496a..01ecbc0812 100644
--- a/Modules/Registration/Stereo/include/otbStereoSensorModelToElevationMapFilter.txx
+++ b/Modules/Registration/Stereo/include/otbStereoSensorModelToElevationMapFilter.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbStereoSensorModelToElevationMapFilter_txx
-#define __otbStereoSensorModelToElevationMapFilter_txx
+#ifndef otbStereoSensorModelToElevationMapFilter_txx
+#define otbStereoSensorModelToElevationMapFilter_txx
 
 #include "otbStereoSensorModelToElevationMapFilter.h"
 
diff --git a/Modules/Registration/Stereo/include/otbStereorectificationDisplacementFieldSource.h b/Modules/Registration/Stereo/include/otbStereorectificationDisplacementFieldSource.h
index 9b3f8acfbd..0698b5aaac 100644
--- a/Modules/Registration/Stereo/include/otbStereorectificationDisplacementFieldSource.h
+++ b/Modules/Registration/Stereo/include/otbStereorectificationDisplacementFieldSource.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbStereorectificationDisplacementFieldSource_h
-#define __otbStereorectificationDisplacementFieldSource_h
+#ifndef otbStereorectificationDisplacementFieldSource_h
+#define otbStereorectificationDisplacementFieldSource_h
 
 #include "itkImageSource.h"
 #include "otbGenericRSTransform.h"
diff --git a/Modules/Registration/Stereo/include/otbStereorectificationDisplacementFieldSource.txx b/Modules/Registration/Stereo/include/otbStereorectificationDisplacementFieldSource.txx
index aa66e6ec4d..0c4c07c791 100644
--- a/Modules/Registration/Stereo/include/otbStereorectificationDisplacementFieldSource.txx
+++ b/Modules/Registration/Stereo/include/otbStereorectificationDisplacementFieldSource.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbStereoSensorModelToElevationMapFilter_txx
-#define __otbStereoSensorModelToElevationMapFilter_txx
+#ifndef otbStereoSensorModelToElevationMapFilter_txx
+#define otbStereoSensorModelToElevationMapFilter_txx
 
 #include "otbStereorectificationDisplacementFieldSource.h"
 #include "itkProgressReporter.h"
diff --git a/Modules/Segmentation/CCOBIA/include/otbConnectedComponentMuParserFunctor.h b/Modules/Segmentation/CCOBIA/include/otbConnectedComponentMuParserFunctor.h
index 606403ddad..c473d8bdba 100644
--- a/Modules/Segmentation/CCOBIA/include/otbConnectedComponentMuParserFunctor.h
+++ b/Modules/Segmentation/CCOBIA/include/otbConnectedComponentMuParserFunctor.h
@@ -19,8 +19,8 @@
 
  =========================================================================*/
 
-#ifndef __otbConnectedComponentMuParserFunctor_h
-#define __otbConnectedComponentMuParserFunctor_h
+#ifndef otbConnectedComponentMuParserFunctor_h
+#define otbConnectedComponentMuParserFunctor_h
 
 #include "otbParser.h"
 #include "otbMacro.h"
diff --git a/Modules/Segmentation/CCOBIA/include/otbLabelObjectOpeningMuParserFilter.h b/Modules/Segmentation/CCOBIA/include/otbLabelObjectOpeningMuParserFilter.h
index 1c85494c27..8153ac1a5c 100644
--- a/Modules/Segmentation/CCOBIA/include/otbLabelObjectOpeningMuParserFilter.h
+++ b/Modules/Segmentation/CCOBIA/include/otbLabelObjectOpeningMuParserFilter.h
@@ -19,8 +19,8 @@
 
  =========================================================================*/
 
-#ifndef __otbLabelObjectOpeningMuParserFilter_h
-#define __otbLabelObjectOpeningMuParserFilter_h
+#ifndef otbLabelObjectOpeningMuParserFilter_h
+#define otbLabelObjectOpeningMuParserFilter_h
 
 #include "itkProgressReporter.h"
 #include <iostream>
diff --git a/Modules/Segmentation/CCOBIA/include/otbLabelObjectOpeningMuParserFilter.txx b/Modules/Segmentation/CCOBIA/include/otbLabelObjectOpeningMuParserFilter.txx
index cfa2060bb3..bff200e684 100644
--- a/Modules/Segmentation/CCOBIA/include/otbLabelObjectOpeningMuParserFilter.txx
+++ b/Modules/Segmentation/CCOBIA/include/otbLabelObjectOpeningMuParserFilter.txx
@@ -15,8 +15,8 @@
  PURPOSE.  See the above copyright notices for more information.
 
  =========================================================================*/
-#ifndef __otbLabelObjectOpeningMuParserFilter_txx
-#define __otbLabelObjectOpeningMuParserFilter_txx
+#ifndef otbLabelObjectOpeningMuParserFilter_txx
+#define otbLabelObjectOpeningMuParserFilter_txx
 
 #include "otbLabelObjectOpeningMuParserFilter.h"
 #include <iostream>
diff --git a/Modules/Segmentation/CCOBIA/include/otbStreamingConnectedComponentSegmentationOBIAToVectorDataFilter.h b/Modules/Segmentation/CCOBIA/include/otbStreamingConnectedComponentSegmentationOBIAToVectorDataFilter.h
index 23b5ff14ee..f974b79879 100644
--- a/Modules/Segmentation/CCOBIA/include/otbStreamingConnectedComponentSegmentationOBIAToVectorDataFilter.h
+++ b/Modules/Segmentation/CCOBIA/include/otbStreamingConnectedComponentSegmentationOBIAToVectorDataFilter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbStreamingConnectedComponentSegmentationOBIAToVectorDataFilter_h
-#define __otbStreamingConnectedComponentSegmentationOBIAToVectorDataFilter_h
+#ifndef otbStreamingConnectedComponentSegmentationOBIAToVectorDataFilter_h
+#define otbStreamingConnectedComponentSegmentationOBIAToVectorDataFilter_h
 
 #include "otbPersistentImageToVectorDataFilter.h"
 #include "otbPersistentFilterStreamingDecorator.h"
diff --git a/Modules/Segmentation/CCOBIA/include/otbStreamingConnectedComponentSegmentationOBIAToVectorDataFilter.txx b/Modules/Segmentation/CCOBIA/include/otbStreamingConnectedComponentSegmentationOBIAToVectorDataFilter.txx
index 4516c786c4..4090a9c43d 100644
--- a/Modules/Segmentation/CCOBIA/include/otbStreamingConnectedComponentSegmentationOBIAToVectorDataFilter.txx
+++ b/Modules/Segmentation/CCOBIA/include/otbStreamingConnectedComponentSegmentationOBIAToVectorDataFilter.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbStreamingConnectedComponentSegmentationOBIAToVectorDataFilter_txx
-#define __otbStreamingConnectedComponentSegmentationOBIAToVectorDataFilter_txx
+#ifndef otbStreamingConnectedComponentSegmentationOBIAToVectorDataFilter_txx
+#define otbStreamingConnectedComponentSegmentationOBIAToVectorDataFilter_txx
 
 #include "otbStreamingConnectedComponentSegmentationOBIAToVectorDataFilter.h"
 #include "otbVectorDataTransformFilter.h"
diff --git a/Modules/Segmentation/Conversion/include/otbLabelImageRegionMergingFilter.h b/Modules/Segmentation/Conversion/include/otbLabelImageRegionMergingFilter.h
index 7e951a1515..d01eb0dc07 100644
--- a/Modules/Segmentation/Conversion/include/otbLabelImageRegionMergingFilter.h
+++ b/Modules/Segmentation/Conversion/include/otbLabelImageRegionMergingFilter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbLabelImageRegionMergingFilter_h
-#define __otbLabelImageRegionMergingFilter_h
+#ifndef otbLabelImageRegionMergingFilter_h
+#define otbLabelImageRegionMergingFilter_h
 
 #include "otbImage.h"
 #include "otbVectorImage.h"
diff --git a/Modules/Segmentation/Conversion/include/otbLabelImageRegionMergingFilter.txx b/Modules/Segmentation/Conversion/include/otbLabelImageRegionMergingFilter.txx
index e4b0da7747..07cedbc9b6 100644
--- a/Modules/Segmentation/Conversion/include/otbLabelImageRegionMergingFilter.txx
+++ b/Modules/Segmentation/Conversion/include/otbLabelImageRegionMergingFilter.txx
@@ -16,8 +16,8 @@
 
 =========================================================================*/
 
-#ifndef __otbLabelImageRegionMergingFilter_txx
-#define __otbLabelImageRegionMergingFilter_txx
+#ifndef otbLabelImageRegionMergingFilter_txx
+#define otbLabelImageRegionMergingFilter_txx
 
 #include "otbLabelImageRegionMergingFilter.h"
 #include "itkImageRegionConstIteratorWithIndex.h"
diff --git a/Modules/Segmentation/Conversion/include/otbLabelImageRegionPruningFilter.h b/Modules/Segmentation/Conversion/include/otbLabelImageRegionPruningFilter.h
index f3a264769e..ae01edf098 100644
--- a/Modules/Segmentation/Conversion/include/otbLabelImageRegionPruningFilter.h
+++ b/Modules/Segmentation/Conversion/include/otbLabelImageRegionPruningFilter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbLabelImageRegionPruningFilter_h
-#define __otbLabelImageRegionPruningFilter_h
+#ifndef otbLabelImageRegionPruningFilter_h
+#define otbLabelImageRegionPruningFilter_h
 
 #include "otbImage.h"
 #include "otbVectorImage.h"
diff --git a/Modules/Segmentation/Conversion/include/otbLabelImageRegionPruningFilter.txx b/Modules/Segmentation/Conversion/include/otbLabelImageRegionPruningFilter.txx
index ed0adf9ddb..1ad390d878 100644
--- a/Modules/Segmentation/Conversion/include/otbLabelImageRegionPruningFilter.txx
+++ b/Modules/Segmentation/Conversion/include/otbLabelImageRegionPruningFilter.txx
@@ -16,8 +16,8 @@
 
 =========================================================================*/
 
-#ifndef __otbLabelImageRegionPruningFilter_txx
-#define __otbLabelImageRegionPruningFilter_txx
+#ifndef otbLabelImageRegionPruningFilter_txx
+#define otbLabelImageRegionPruningFilter_txx
 
 #include "otbLabelImageRegionPruningFilter.h"
 #include "itkImageRegionConstIteratorWithIndex.h"
diff --git a/Modules/Segmentation/Conversion/include/otbLabelImageToOGRDataSourceFilter.h b/Modules/Segmentation/Conversion/include/otbLabelImageToOGRDataSourceFilter.h
index 2e1c71fa19..8b59caa41d 100644
--- a/Modules/Segmentation/Conversion/include/otbLabelImageToOGRDataSourceFilter.h
+++ b/Modules/Segmentation/Conversion/include/otbLabelImageToOGRDataSourceFilter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbLabelImageToOGRDataSourceFilter_h
-#define __otbLabelImageToOGRDataSourceFilter_h
+#ifndef otbLabelImageToOGRDataSourceFilter_h
+#define otbLabelImageToOGRDataSourceFilter_h
 
 #include "itkProcessObject.h"
 #include "otbOGRDataSourceWrapper.h"
diff --git a/Modules/Segmentation/Conversion/include/otbLabelImageToOGRDataSourceFilter.txx b/Modules/Segmentation/Conversion/include/otbLabelImageToOGRDataSourceFilter.txx
index 395e5d87d3..d6673f0980 100644
--- a/Modules/Segmentation/Conversion/include/otbLabelImageToOGRDataSourceFilter.txx
+++ b/Modules/Segmentation/Conversion/include/otbLabelImageToOGRDataSourceFilter.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbLabelImageToOGRDataSourceFilter_txx
-#define __otbLabelImageToOGRDataSourceFilter_txx
+#ifndef otbLabelImageToOGRDataSourceFilter_txx
+#define otbLabelImageToOGRDataSourceFilter_txx
 
 #include "otbLabelImageToOGRDataSourceFilter.h"
 #include "otbGdalDataTypeBridge.h"
diff --git a/Modules/Segmentation/Conversion/include/otbLabelImageToVectorDataFilter.h b/Modules/Segmentation/Conversion/include/otbLabelImageToVectorDataFilter.h
index 700e5adaa8..771989924b 100644
--- a/Modules/Segmentation/Conversion/include/otbLabelImageToVectorDataFilter.h
+++ b/Modules/Segmentation/Conversion/include/otbLabelImageToVectorDataFilter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbLabelImageToVectorDataFilter_h
-#define __otbLabelImageToVectorDataFilter_h
+#ifndef otbLabelImageToVectorDataFilter_h
+#define otbLabelImageToVectorDataFilter_h
 
 #include "otbVectorDataSource.h"
 #include "otbVectorData.h"
diff --git a/Modules/Segmentation/Conversion/include/otbLabelImageToVectorDataFilter.txx b/Modules/Segmentation/Conversion/include/otbLabelImageToVectorDataFilter.txx
index 4e40994ad7..493127e115 100644
--- a/Modules/Segmentation/Conversion/include/otbLabelImageToVectorDataFilter.txx
+++ b/Modules/Segmentation/Conversion/include/otbLabelImageToVectorDataFilter.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbLabelImageToVectorDataFilter_txx
-#define __otbLabelImageToVectorDataFilter_txx
+#ifndef otbLabelImageToVectorDataFilter_txx
+#define otbLabelImageToVectorDataFilter_txx
 
 #include "otbLabelImageToVectorDataFilter.h"
 #include "otbOGRIOHelper.h"
diff --git a/Modules/Segmentation/Conversion/include/otbLabelMapToVectorDataFilter.h b/Modules/Segmentation/Conversion/include/otbLabelMapToVectorDataFilter.h
index c1f0f3773a..f1e0913c8a 100644
--- a/Modules/Segmentation/Conversion/include/otbLabelMapToVectorDataFilter.h
+++ b/Modules/Segmentation/Conversion/include/otbLabelMapToVectorDataFilter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbLabelMapToVectorDataFilter_h
-#define __otbLabelMapToVectorDataFilter_h
+#ifndef otbLabelMapToVectorDataFilter_h
+#define otbLabelMapToVectorDataFilter_h
 
 #include "otbVectorDataSource.h"
 #include "itkLabelMap.h"
diff --git a/Modules/Segmentation/Conversion/include/otbLabelMapToVectorDataFilter.txx b/Modules/Segmentation/Conversion/include/otbLabelMapToVectorDataFilter.txx
index 54d1dca9b2..046971179d 100644
--- a/Modules/Segmentation/Conversion/include/otbLabelMapToVectorDataFilter.txx
+++ b/Modules/Segmentation/Conversion/include/otbLabelMapToVectorDataFilter.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbLabelMapToVectorDataFilter_txx
-#define __otbLabelMapToVectorDataFilter_txx
+#ifndef otbLabelMapToVectorDataFilter_txx
+#define otbLabelMapToVectorDataFilter_txx
 
 #include "otbLabelMapToVectorDataFilter.h"
 
diff --git a/Modules/Segmentation/Conversion/include/otbOGRDataSourceToLabelImageFilter.h b/Modules/Segmentation/Conversion/include/otbOGRDataSourceToLabelImageFilter.h
index 1646b6ae68..ac5cbcda41 100644
--- a/Modules/Segmentation/Conversion/include/otbOGRDataSourceToLabelImageFilter.h
+++ b/Modules/Segmentation/Conversion/include/otbOGRDataSourceToLabelImageFilter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbOGRDataSourceToLabelImageFilter_h
-#define __otbOGRDataSourceToLabelImageFilter_h
+#ifndef otbOGRDataSourceToLabelImageFilter_h
+#define otbOGRDataSourceToLabelImageFilter_h
 
 #include "itkImageToImageFilter.h"
 #include "otbMacro.h"
diff --git a/Modules/Segmentation/Conversion/include/otbPersistentImageToOGRDataFilter.h b/Modules/Segmentation/Conversion/include/otbPersistentImageToOGRDataFilter.h
index c591ae3e99..2131a7df7c 100644
--- a/Modules/Segmentation/Conversion/include/otbPersistentImageToOGRDataFilter.h
+++ b/Modules/Segmentation/Conversion/include/otbPersistentImageToOGRDataFilter.h
@@ -18,8 +18,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbPersistentImageToOGRDataFilter_h
-#define __otbPersistentImageToOGRDataFilter_h
+#ifndef otbPersistentImageToOGRDataFilter_h
+#define otbPersistentImageToOGRDataFilter_h
 
 #include "otbPersistentImageFilter.h"
 
diff --git a/Modules/Segmentation/Conversion/include/otbPersistentImageToOGRDataFilter.txx b/Modules/Segmentation/Conversion/include/otbPersistentImageToOGRDataFilter.txx
index 8fd0538615..8081581371 100644
--- a/Modules/Segmentation/Conversion/include/otbPersistentImageToOGRDataFilter.txx
+++ b/Modules/Segmentation/Conversion/include/otbPersistentImageToOGRDataFilter.txx
@@ -18,8 +18,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbPersistentImageToOGRDataFilter_txx
-#define __otbPersistentImageToOGRDataFilter_txx
+#ifndef otbPersistentImageToOGRDataFilter_txx
+#define otbPersistentImageToOGRDataFilter_txx
 
 #include "otbPersistentImageToOGRDataFilter.h"
 #include "itkTimeProbe.h"
diff --git a/Modules/Segmentation/Conversion/include/otbPersistentImageToOGRLayerFilter.h b/Modules/Segmentation/Conversion/include/otbPersistentImageToOGRLayerFilter.h
index 90ed44da9d..8d54301fd2 100644
--- a/Modules/Segmentation/Conversion/include/otbPersistentImageToOGRLayerFilter.h
+++ b/Modules/Segmentation/Conversion/include/otbPersistentImageToOGRLayerFilter.h
@@ -18,8 +18,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbPersistentImageToOGRLayerFilter_h
-#define __otbPersistentImageToOGRLayerFilter_h
+#ifndef otbPersistentImageToOGRLayerFilter_h
+#define otbPersistentImageToOGRLayerFilter_h
 
 #include "otbPersistentImageFilter.h"
 
diff --git a/Modules/Segmentation/Conversion/include/otbPersistentImageToOGRLayerFilter.txx b/Modules/Segmentation/Conversion/include/otbPersistentImageToOGRLayerFilter.txx
index 290dd18f0f..94c0ac94fa 100644
--- a/Modules/Segmentation/Conversion/include/otbPersistentImageToOGRLayerFilter.txx
+++ b/Modules/Segmentation/Conversion/include/otbPersistentImageToOGRLayerFilter.txx
@@ -18,8 +18,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbPersistentImageToOGRLayerFilter_txx
-#define __otbPersistentImageToOGRLayerFilter_txx
+#ifndef otbPersistentImageToOGRLayerFilter_txx
+#define otbPersistentImageToOGRLayerFilter_txx
 
 #include "otbPersistentImageToOGRLayerFilter.h"
 #include "itkTimeProbe.h"
diff --git a/Modules/Segmentation/Conversion/include/otbPersistentImageToVectorDataFilter.h b/Modules/Segmentation/Conversion/include/otbPersistentImageToVectorDataFilter.h
index 0ca3567ba6..d408b75c8f 100644
--- a/Modules/Segmentation/Conversion/include/otbPersistentImageToVectorDataFilter.h
+++ b/Modules/Segmentation/Conversion/include/otbPersistentImageToVectorDataFilter.h
@@ -18,8 +18,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbPersistentImageToVectorDataFilter_h
-#define __otbPersistentImageToVectorDataFilter_h
+#ifndef otbPersistentImageToVectorDataFilter_h
+#define otbPersistentImageToVectorDataFilter_h
 
 #include "otbPersistentImageFilter.h"
 #include "itkExtractImageFilter.h"
diff --git a/Modules/Segmentation/Conversion/include/otbPersistentImageToVectorDataFilter.txx b/Modules/Segmentation/Conversion/include/otbPersistentImageToVectorDataFilter.txx
index c5ed5a20e7..0ad32752b3 100644
--- a/Modules/Segmentation/Conversion/include/otbPersistentImageToVectorDataFilter.txx
+++ b/Modules/Segmentation/Conversion/include/otbPersistentImageToVectorDataFilter.txx
@@ -18,8 +18,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbPersistentImageToVectorDataFilter_txx
-#define __otbPersistentImageToVectorDataFilter_txx
+#ifndef otbPersistentImageToVectorDataFilter_txx
+#define otbPersistentImageToVectorDataFilter_txx
 
 #include "otbPersistentImageToVectorDataFilter.h"
 
diff --git a/Modules/Segmentation/Conversion/include/otbRasterizeVectorDataFilter.h b/Modules/Segmentation/Conversion/include/otbRasterizeVectorDataFilter.h
index 693e7f0587..0e330f01d0 100644
--- a/Modules/Segmentation/Conversion/include/otbRasterizeVectorDataFilter.h
+++ b/Modules/Segmentation/Conversion/include/otbRasterizeVectorDataFilter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbRasterizeVectorDataFilter_h
-#define __otbRasterizeVectorDataFilter_h
+#ifndef otbRasterizeVectorDataFilter_h
+#define otbRasterizeVectorDataFilter_h
 
 #include "itkUnaryFunctorImageFilter.h"
 #include "itkImageToImageFilter.h"
diff --git a/Modules/Segmentation/Conversion/include/otbVectorDataToLabelImageFilter.h b/Modules/Segmentation/Conversion/include/otbVectorDataToLabelImageFilter.h
index 6ddb883859..e06e5da6b9 100644
--- a/Modules/Segmentation/Conversion/include/otbVectorDataToLabelImageFilter.h
+++ b/Modules/Segmentation/Conversion/include/otbVectorDataToLabelImageFilter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbVectorDataToLabelImageFilter_h
-#define __otbVectorDataToLabelImageFilter_h
+#ifndef otbVectorDataToLabelImageFilter_h
+#define otbVectorDataToLabelImageFilter_h
 
 #include "itkImageToImageFilter.h"
 #include "itkImageRegionIterator.h"
diff --git a/Modules/Segmentation/Conversion/include/otbVectorDataToLabelImageFilter.txx b/Modules/Segmentation/Conversion/include/otbVectorDataToLabelImageFilter.txx
index 94b4157c54..105b2e8d07 100644
--- a/Modules/Segmentation/Conversion/include/otbVectorDataToLabelImageFilter.txx
+++ b/Modules/Segmentation/Conversion/include/otbVectorDataToLabelImageFilter.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbVectorDataToLabelImageFilter_txx
-#define __otbVectorDataToLabelImageFilter_txx
+#ifndef otbVectorDataToLabelImageFilter_txx
+#define otbVectorDataToLabelImageFilter_txx
 
 #include "gdal_alg.h"
 #include "ogr_srs_api.h"
diff --git a/Modules/Segmentation/Conversion/include/otbVectorDataToLabelMapFilter.h b/Modules/Segmentation/Conversion/include/otbVectorDataToLabelMapFilter.h
index 822efbde85..ca2eae4f84 100644
--- a/Modules/Segmentation/Conversion/include/otbVectorDataToLabelMapFilter.h
+++ b/Modules/Segmentation/Conversion/include/otbVectorDataToLabelMapFilter.h
@@ -16,8 +16,8 @@
 
 =========================================================================*/
 
-#ifndef __otbVectorDataToLabelMapFilter_h
-#define __otbVectorDataToLabelMapFilter_h
+#ifndef otbVectorDataToLabelMapFilter_h
+#define otbVectorDataToLabelMapFilter_h
 
 #include "itkLabelObject.h"
 #include "itkProgressReporter.h"
diff --git a/Modules/Segmentation/Conversion/include/otbVectorDataToLabelMapFilter.txx b/Modules/Segmentation/Conversion/include/otbVectorDataToLabelMapFilter.txx
index e4d85af4fe..a05c5be410 100644
--- a/Modules/Segmentation/Conversion/include/otbVectorDataToLabelMapFilter.txx
+++ b/Modules/Segmentation/Conversion/include/otbVectorDataToLabelMapFilter.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbVectorDataToLabelMapFilter_txx
-#define __otbVectorDataToLabelMapFilter_txx
+#ifndef otbVectorDataToLabelMapFilter_txx
+#define otbVectorDataToLabelMapFilter_txx
 
 #include "itkBinaryImageToLabelMapFilter.h"
 #include "itkNumericTraits.h"
diff --git a/Modules/Segmentation/Conversion/include/otbVectorDataToLabelMapWithAttributesFilter.h b/Modules/Segmentation/Conversion/include/otbVectorDataToLabelMapWithAttributesFilter.h
index bc83a850ed..2286de75b6 100644
--- a/Modules/Segmentation/Conversion/include/otbVectorDataToLabelMapWithAttributesFilter.h
+++ b/Modules/Segmentation/Conversion/include/otbVectorDataToLabelMapWithAttributesFilter.h
@@ -16,8 +16,8 @@
 
 =========================================================================*/
 
-#ifndef __otbVectorDataToLabelMapWithAttributesFilter_h
-#define __otbVectorDataToLabelMapWithAttributesFilter_h
+#ifndef otbVectorDataToLabelMapWithAttributesFilter_h
+#define otbVectorDataToLabelMapWithAttributesFilter_h
 
 #include "itkLabelObject.h"
 #include "itkProgressReporter.h"
diff --git a/Modules/Segmentation/Conversion/include/otbVectorDataToLabelMapWithAttributesFilter.txx b/Modules/Segmentation/Conversion/include/otbVectorDataToLabelMapWithAttributesFilter.txx
index 138ef6608f..21fa5200d1 100644
--- a/Modules/Segmentation/Conversion/include/otbVectorDataToLabelMapWithAttributesFilter.txx
+++ b/Modules/Segmentation/Conversion/include/otbVectorDataToLabelMapWithAttributesFilter.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbVectorDataToLabelMapWithAttributesFilter_txx
-#define __otbVectorDataToLabelMapWithAttributesFilter_txx
+#ifndef otbVectorDataToLabelMapWithAttributesFilter_txx
+#define otbVectorDataToLabelMapWithAttributesFilter_txx
 
 #include "itkBinaryImageToLabelMapFilter.h"
 #include "itkNumericTraits.h"
diff --git a/Modules/Segmentation/Labelling/include/otbLabelToBoundaryImageFilter.h b/Modules/Segmentation/Labelling/include/otbLabelToBoundaryImageFilter.h
index 205e1bbd94..e8a0b4f338 100644
--- a/Modules/Segmentation/Labelling/include/otbLabelToBoundaryImageFilter.h
+++ b/Modules/Segmentation/Labelling/include/otbLabelToBoundaryImageFilter.h
@@ -14,8 +14,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbLabelToBoundaryImageFilter_h
-#define __otbLabelToBoundaryImageFilter_h
+#ifndef otbLabelToBoundaryImageFilter_h
+#define otbLabelToBoundaryImageFilter_h
 
 #include "otbUnaryFunctorNeighborhoodImageFilter.h"
 
diff --git a/Modules/Segmentation/Labelling/include/otbLabeledOutputAccessor.h b/Modules/Segmentation/Labelling/include/otbLabeledOutputAccessor.h
index 7c2edab223..2fd7036086 100644
--- a/Modules/Segmentation/Labelling/include/otbLabeledOutputAccessor.h
+++ b/Modules/Segmentation/Labelling/include/otbLabeledOutputAccessor.h
@@ -18,8 +18,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbLabeledOutputAccessor_h
-#define __otbLabeledOutputAccessor_h
+#ifndef otbLabeledOutputAccessor_h
+#define otbLabeledOutputAccessor_h
 
 #include "itkMacro.h"
 
diff --git a/Modules/Segmentation/Labelling/include/otbLabelizeConfidenceConnectedImageFilter.h b/Modules/Segmentation/Labelling/include/otbLabelizeConfidenceConnectedImageFilter.h
index e085380139..df0f0776b3 100644
--- a/Modules/Segmentation/Labelling/include/otbLabelizeConfidenceConnectedImageFilter.h
+++ b/Modules/Segmentation/Labelling/include/otbLabelizeConfidenceConnectedImageFilter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbLabelizeConfidenceConnectedImageFilter_h
-#define __otbLabelizeConfidenceConnectedImageFilter_h
+#ifndef otbLabelizeConfidenceConnectedImageFilter_h
+#define otbLabelizeConfidenceConnectedImageFilter_h
 
 #include "itkConfidenceConnectedImageFilter.h"
 #include "otbLabelizeImageFilterBase.h"
diff --git a/Modules/Segmentation/Labelling/include/otbLabelizeConfidenceConnectedImageFilter.txx b/Modules/Segmentation/Labelling/include/otbLabelizeConfidenceConnectedImageFilter.txx
index 4e63b8fac7..cd51d29bf7 100644
--- a/Modules/Segmentation/Labelling/include/otbLabelizeConfidenceConnectedImageFilter.txx
+++ b/Modules/Segmentation/Labelling/include/otbLabelizeConfidenceConnectedImageFilter.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbLabelizeConfidenceConnectedImageFilter_txx
-#define __otbLabelizeConfidenceConnectedImageFilter_txx
+#ifndef otbLabelizeConfidenceConnectedImageFilter_txx
+#define otbLabelizeConfidenceConnectedImageFilter_txx
 
 #include "itkNumericTraits.h"
 
diff --git a/Modules/Segmentation/Labelling/include/otbLabelizeConnectedThresholdImageFilter.h b/Modules/Segmentation/Labelling/include/otbLabelizeConnectedThresholdImageFilter.h
index 2e5e17e1ee..ddab2da4b4 100644
--- a/Modules/Segmentation/Labelling/include/otbLabelizeConnectedThresholdImageFilter.h
+++ b/Modules/Segmentation/Labelling/include/otbLabelizeConnectedThresholdImageFilter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbLabelizeConnectedThresholdImageFilter_h
-#define __otbLabelizeConnectedThresholdImageFilter_h
+#ifndef otbLabelizeConnectedThresholdImageFilter_h
+#define otbLabelizeConnectedThresholdImageFilter_h
 
 #include "itkConnectedThresholdImageFilter.h"
 #include "otbLabelizeImageFilterBase.h"
diff --git a/Modules/Segmentation/Labelling/include/otbLabelizeConnectedThresholdImageFilter.txx b/Modules/Segmentation/Labelling/include/otbLabelizeConnectedThresholdImageFilter.txx
index 9052c27183..9ffa89dc92 100644
--- a/Modules/Segmentation/Labelling/include/otbLabelizeConnectedThresholdImageFilter.txx
+++ b/Modules/Segmentation/Labelling/include/otbLabelizeConnectedThresholdImageFilter.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbLabelizeConnectedThresholdImageFilter_txx
-#define __otbLabelizeConnectedThresholdImageFilter_txx
+#ifndef otbLabelizeConnectedThresholdImageFilter_txx
+#define otbLabelizeConnectedThresholdImageFilter_txx
 
 #include "itkNumericTraits.h"
 
diff --git a/Modules/Segmentation/Labelling/include/otbLabelizeImageFilterBase.h b/Modules/Segmentation/Labelling/include/otbLabelizeImageFilterBase.h
index 47c929dd42..060889ae2e 100644
--- a/Modules/Segmentation/Labelling/include/otbLabelizeImageFilterBase.h
+++ b/Modules/Segmentation/Labelling/include/otbLabelizeImageFilterBase.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbLabelizeImageFilterBase_h
-#define __otbLabelizeImageFilterBase_h
+#ifndef otbLabelizeImageFilterBase_h
+#define otbLabelizeImageFilterBase_h
 
 #include "itkImageToImageFilter.h"
 #include "itkAddImageFilter.h"
diff --git a/Modules/Segmentation/Labelling/include/otbLabelizeImageFilterBase.txx b/Modules/Segmentation/Labelling/include/otbLabelizeImageFilterBase.txx
index 0fb39b1072..209ceba458 100644
--- a/Modules/Segmentation/Labelling/include/otbLabelizeImageFilterBase.txx
+++ b/Modules/Segmentation/Labelling/include/otbLabelizeImageFilterBase.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbLabelizeImageFilterBase_txx
-#define __otbLabelizeImageFilterBase_txx
+#ifndef otbLabelizeImageFilterBase_txx
+#define otbLabelizeImageFilterBase_txx
 
 #include "otbLabelizeImageFilterBase.h"
 
diff --git a/Modules/Segmentation/Labelling/include/otbLabelizeNeighborhoodConnectedImageFilter.h b/Modules/Segmentation/Labelling/include/otbLabelizeNeighborhoodConnectedImageFilter.h
index 9297700f18..2eb07b8d09 100644
--- a/Modules/Segmentation/Labelling/include/otbLabelizeNeighborhoodConnectedImageFilter.h
+++ b/Modules/Segmentation/Labelling/include/otbLabelizeNeighborhoodConnectedImageFilter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbLabelizeNeighborhoodConnectedImageFilter_h
-#define __otbLabelizeNeighborhoodConnectedImageFilter_h
+#ifndef otbLabelizeNeighborhoodConnectedImageFilter_h
+#define otbLabelizeNeighborhoodConnectedImageFilter_h
 
 #include "itkNeighborhoodConnectedImageFilter.h"
 #include "otbLabelizeImageFilterBase.h"
diff --git a/Modules/Segmentation/Labelling/include/otbLabelizeNeighborhoodConnectedImageFilter.txx b/Modules/Segmentation/Labelling/include/otbLabelizeNeighborhoodConnectedImageFilter.txx
index a1c51148ad..fb190b8a49 100644
--- a/Modules/Segmentation/Labelling/include/otbLabelizeNeighborhoodConnectedImageFilter.txx
+++ b/Modules/Segmentation/Labelling/include/otbLabelizeNeighborhoodConnectedImageFilter.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbLabelizeNeighborhoodConnectedImageFilter_txx
-#define __otbLabelizeNeighborhoodConnectedImageFilter_txx
+#ifndef otbLabelizeNeighborhoodConnectedImageFilter_txx
+#define otbLabelizeNeighborhoodConnectedImageFilter_txx
 
 #include "otbLabelizeNeighborhoodConnectedImageFilter.h"
 
diff --git a/Modules/Segmentation/Labelling/include/otbRelabelComponentImageFilter.h b/Modules/Segmentation/Labelling/include/otbRelabelComponentImageFilter.h
index 5c289b8209..1ebeccfe33 100644
--- a/Modules/Segmentation/Labelling/include/otbRelabelComponentImageFilter.h
+++ b/Modules/Segmentation/Labelling/include/otbRelabelComponentImageFilter.h
@@ -14,8 +14,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbRelabelComponentImageFilter_h
-#define __otbRelabelComponentImageFilter_h
+#ifndef otbRelabelComponentImageFilter_h
+#define otbRelabelComponentImageFilter_h
 
 #include "itkRelabelComponentImageFilter.h"
 #include <vector>
diff --git a/Modules/Segmentation/Labelling/include/otbRelabelComponentImageFilter.txx b/Modules/Segmentation/Labelling/include/otbRelabelComponentImageFilter.txx
index 926517686f..84898fea59 100644
--- a/Modules/Segmentation/Labelling/include/otbRelabelComponentImageFilter.txx
+++ b/Modules/Segmentation/Labelling/include/otbRelabelComponentImageFilter.txx
@@ -14,8 +14,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbRelabelComponentImageFilter_txx
-#define __otbRelabelComponentImageFilter_txx
+#ifndef otbRelabelComponentImageFilter_txx
+#define otbRelabelComponentImageFilter_txx
 
 #include "otbRelabelComponentImageFilter.h"
 #include "itkImageRegionIterator.h"
diff --git a/Modules/Segmentation/MeanShift/include/otbMeanShiftConnectedComponentSegmentationFilter.h b/Modules/Segmentation/MeanShift/include/otbMeanShiftConnectedComponentSegmentationFilter.h
index 50f4ff7eb6..1a99bc5306 100644
--- a/Modules/Segmentation/MeanShift/include/otbMeanShiftConnectedComponentSegmentationFilter.h
+++ b/Modules/Segmentation/MeanShift/include/otbMeanShiftConnectedComponentSegmentationFilter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbMeanShiftConnectedComponentSegmentationFilter_h
-#define __otbMeanShiftConnectedComponentSegmentationFilter_h
+#ifndef otbMeanShiftConnectedComponentSegmentationFilter_h
+#define otbMeanShiftConnectedComponentSegmentationFilter_h
 
 #include "itkMacro.h"
 
diff --git a/Modules/Segmentation/MeanShift/include/otbMeanShiftConnectedComponentSegmentationFilter.txx b/Modules/Segmentation/MeanShift/include/otbMeanShiftConnectedComponentSegmentationFilter.txx
index 21f4a819c8..d8f221871b 100644
--- a/Modules/Segmentation/MeanShift/include/otbMeanShiftConnectedComponentSegmentationFilter.txx
+++ b/Modules/Segmentation/MeanShift/include/otbMeanShiftConnectedComponentSegmentationFilter.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbMeanShiftConnectedComponentSegmentationFilter_txx
-#define __otbMeanShiftConnectedComponentSegmentationFilter_txx
+#ifndef otbMeanShiftConnectedComponentSegmentationFilter_txx
+#define otbMeanShiftConnectedComponentSegmentationFilter_txx
 
 #include "otbMeanShiftConnectedComponentSegmentationFilter.h"
 #include "itkExtractImageFilter.h"
diff --git a/Modules/Segmentation/MeanShift/include/otbMeanShiftSegmentationFilter.h b/Modules/Segmentation/MeanShift/include/otbMeanShiftSegmentationFilter.h
index 6c85ef4fec..9a6904629a 100644
--- a/Modules/Segmentation/MeanShift/include/otbMeanShiftSegmentationFilter.h
+++ b/Modules/Segmentation/MeanShift/include/otbMeanShiftSegmentationFilter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbMeanShiftSegmentationFilter_h
-#define __otbMeanShiftSegmentationFilter_h
+#ifndef otbMeanShiftSegmentationFilter_h
+#define otbMeanShiftSegmentationFilter_h
 
 #include "itkMacro.h"
 
diff --git a/Modules/Segmentation/MeanShift/include/otbMeanShiftSegmentationFilter.txx b/Modules/Segmentation/MeanShift/include/otbMeanShiftSegmentationFilter.txx
index 52ecb44e89..4a5790611f 100644
--- a/Modules/Segmentation/MeanShift/include/otbMeanShiftSegmentationFilter.txx
+++ b/Modules/Segmentation/MeanShift/include/otbMeanShiftSegmentationFilter.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbMeanShiftSegmentationFilter_txx
-#define __otbMeanShiftSegmentationFilter_txx
+#ifndef otbMeanShiftSegmentationFilter_txx
+#define otbMeanShiftSegmentationFilter_txx
 
 #include "otbMeanShiftSegmentationFilter.h"
 
diff --git a/Modules/Segmentation/Metrics/include/otbHooverInstanceFilter.h b/Modules/Segmentation/Metrics/include/otbHooverInstanceFilter.h
index 249be41249..5d2a3aff08 100644
--- a/Modules/Segmentation/Metrics/include/otbHooverInstanceFilter.h
+++ b/Modules/Segmentation/Metrics/include/otbHooverInstanceFilter.h
@@ -16,8 +16,8 @@
 
 =========================================================================*/
 
-#ifndef __otbHooverInstanceFilter_h
-#define __otbHooverInstanceFilter_h
+#ifndef otbHooverInstanceFilter_h
+#define otbHooverInstanceFilter_h
 
 #include <set>
 #include "itkInPlaceLabelMapFilter.h"
diff --git a/Modules/Segmentation/Metrics/include/otbHooverInstanceFilter.txx b/Modules/Segmentation/Metrics/include/otbHooverInstanceFilter.txx
index b64bad1248..b67aba2948 100644
--- a/Modules/Segmentation/Metrics/include/otbHooverInstanceFilter.txx
+++ b/Modules/Segmentation/Metrics/include/otbHooverInstanceFilter.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbHooverInstanceFilter_txx
-#define __otbHooverInstanceFilter_txx
+#ifndef otbHooverInstanceFilter_txx
+#define otbHooverInstanceFilter_txx
 
 #include "otbHooverInstanceFilter.h"
 #include "otbMacro.h"
diff --git a/Modules/Segmentation/Metrics/include/otbHooverMatrixFilter.h b/Modules/Segmentation/Metrics/include/otbHooverMatrixFilter.h
index 2b6e907d50..1dd0cd314d 100644
--- a/Modules/Segmentation/Metrics/include/otbHooverMatrixFilter.h
+++ b/Modules/Segmentation/Metrics/include/otbHooverMatrixFilter.h
@@ -16,8 +16,8 @@
 
 =========================================================================*/
 
-#ifndef __otbHooverMatrixFilter_h
-#define __otbHooverMatrixFilter_h
+#ifndef otbHooverMatrixFilter_h
+#define otbHooverMatrixFilter_h
 
 #include "itkLabelMapFilter.h"
 #include "itkVariableSizeMatrix.h"
diff --git a/Modules/Segmentation/Metrics/include/otbHooverMatrixFilter.txx b/Modules/Segmentation/Metrics/include/otbHooverMatrixFilter.txx
index 3377f2b23e..1dcf0bce23 100644
--- a/Modules/Segmentation/Metrics/include/otbHooverMatrixFilter.txx
+++ b/Modules/Segmentation/Metrics/include/otbHooverMatrixFilter.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbHooverMatrixFilter_txx
-#define __otbHooverMatrixFilter_txx
+#ifndef otbHooverMatrixFilter_txx
+#define otbHooverMatrixFilter_txx
 
 #include "otbHooverMatrixFilter.h"
 
diff --git a/Modules/Segmentation/MorphologicalProfiles/include/otbClosingOpeningMorphologicalFilter.h b/Modules/Segmentation/MorphologicalProfiles/include/otbClosingOpeningMorphologicalFilter.h
index 3cb0fd9b2f..9d31c45d8f 100644
--- a/Modules/Segmentation/MorphologicalProfiles/include/otbClosingOpeningMorphologicalFilter.h
+++ b/Modules/Segmentation/MorphologicalProfiles/include/otbClosingOpeningMorphologicalFilter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbClosingOpeningMorphologicalFilter_h
-#define __otbClosingOpeningMorphologicalFilter_h
+#ifndef otbClosingOpeningMorphologicalFilter_h
+#define otbClosingOpeningMorphologicalFilter_h
 
 #include "itkImageToImageFilter.h"
 
diff --git a/Modules/Segmentation/MorphologicalProfiles/include/otbClosingOpeningMorphologicalFilter.txx b/Modules/Segmentation/MorphologicalProfiles/include/otbClosingOpeningMorphologicalFilter.txx
index a463e52350..39140b8b3f 100644
--- a/Modules/Segmentation/MorphologicalProfiles/include/otbClosingOpeningMorphologicalFilter.txx
+++ b/Modules/Segmentation/MorphologicalProfiles/include/otbClosingOpeningMorphologicalFilter.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbClosingOpeningMorphologicalFilter_txx
-#define __otbClosingOpeningMorphologicalFilter_txx
+#ifndef otbClosingOpeningMorphologicalFilter_txx
+#define otbClosingOpeningMorphologicalFilter_txx
 
 #include "otbClosingOpeningMorphologicalFilter.h"
 #include "itkUnaryFunctorImageFilter.h"
diff --git a/Modules/Segmentation/MorphologicalProfiles/include/otbConvexOrConcaveClassificationFilter.h b/Modules/Segmentation/MorphologicalProfiles/include/otbConvexOrConcaveClassificationFilter.h
index dc06d0fb3b..5cca5ac425 100644
--- a/Modules/Segmentation/MorphologicalProfiles/include/otbConvexOrConcaveClassificationFilter.h
+++ b/Modules/Segmentation/MorphologicalProfiles/include/otbConvexOrConcaveClassificationFilter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbConvexOrConcaveClassificationFilter_h
-#define __otbConvexOrConcaveClassificationFilter_h
+#ifndef otbConvexOrConcaveClassificationFilter_h
+#define otbConvexOrConcaveClassificationFilter_h
 
 #include "itkBinaryFunctorImageFilter.h"
 namespace otb
diff --git a/Modules/Segmentation/MorphologicalProfiles/include/otbGeodesicMorphologyDecompositionImageFilter.h b/Modules/Segmentation/MorphologicalProfiles/include/otbGeodesicMorphologyDecompositionImageFilter.h
index de12c24e38..bc8a2915b3 100644
--- a/Modules/Segmentation/MorphologicalProfiles/include/otbGeodesicMorphologyDecompositionImageFilter.h
+++ b/Modules/Segmentation/MorphologicalProfiles/include/otbGeodesicMorphologyDecompositionImageFilter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbGeodesicMorphologyDecompositionImageFilter_h
-#define __otbGeodesicMorphologyDecompositionImageFilter_h
+#ifndef otbGeodesicMorphologyDecompositionImageFilter_h
+#define otbGeodesicMorphologyDecompositionImageFilter_h
 
 #include "otbGeodesicMorphologyLevelingFilter.h"
 #include "itkUnaryFunctorImageFilter.h"
diff --git a/Modules/Segmentation/MorphologicalProfiles/include/otbGeodesicMorphologyDecompositionImageFilter.txx b/Modules/Segmentation/MorphologicalProfiles/include/otbGeodesicMorphologyDecompositionImageFilter.txx
index c44308f34a..e830f7e5fa 100644
--- a/Modules/Segmentation/MorphologicalProfiles/include/otbGeodesicMorphologyDecompositionImageFilter.txx
+++ b/Modules/Segmentation/MorphologicalProfiles/include/otbGeodesicMorphologyDecompositionImageFilter.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbGeodesicMorphologyDecompositionImageFilter_txx
-#define __otbGeodesicMorphologyDecompositionImageFilter_txx
+#ifndef otbGeodesicMorphologyDecompositionImageFilter_txx
+#define otbGeodesicMorphologyDecompositionImageFilter_txx
 
 #include "otbGeodesicMorphologyDecompositionImageFilter.h"
 
diff --git a/Modules/Segmentation/MorphologicalProfiles/include/otbGeodesicMorphologyIterativeDecompositionImageFilter.h b/Modules/Segmentation/MorphologicalProfiles/include/otbGeodesicMorphologyIterativeDecompositionImageFilter.h
index 45661292d3..e37c89b1a7 100644
--- a/Modules/Segmentation/MorphologicalProfiles/include/otbGeodesicMorphologyIterativeDecompositionImageFilter.h
+++ b/Modules/Segmentation/MorphologicalProfiles/include/otbGeodesicMorphologyIterativeDecompositionImageFilter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbGeodesicMorphologyIterativeDecompositionImageFilter_h
-#define __otbGeodesicMorphologyIterativeDecompositionImageFilter_h
+#ifndef otbGeodesicMorphologyIterativeDecompositionImageFilter_h
+#define otbGeodesicMorphologyIterativeDecompositionImageFilter_h
 
 #include "otbImageToImageListFilter.h"
 #include "otbGeodesicMorphologyDecompositionImageFilter.h"
diff --git a/Modules/Segmentation/MorphologicalProfiles/include/otbGeodesicMorphologyIterativeDecompositionImageFilter.txx b/Modules/Segmentation/MorphologicalProfiles/include/otbGeodesicMorphologyIterativeDecompositionImageFilter.txx
index 7896e12cab..7300212e24 100644
--- a/Modules/Segmentation/MorphologicalProfiles/include/otbGeodesicMorphologyIterativeDecompositionImageFilter.txx
+++ b/Modules/Segmentation/MorphologicalProfiles/include/otbGeodesicMorphologyIterativeDecompositionImageFilter.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbGeodesicMorphologyIterativeDecompositionImageFilter_txx
-#define __otbGeodesicMorphologyIterativeDecompositionImageFilter_txx
+#ifndef otbGeodesicMorphologyIterativeDecompositionImageFilter_txx
+#define otbGeodesicMorphologyIterativeDecompositionImageFilter_txx
 
 #include "otbGeodesicMorphologyIterativeDecompositionImageFilter.h"
 
diff --git a/Modules/Segmentation/MorphologicalProfiles/include/otbGeodesicMorphologyLevelingFilter.h b/Modules/Segmentation/MorphologicalProfiles/include/otbGeodesicMorphologyLevelingFilter.h
index 90086726cb..d28301b032 100644
--- a/Modules/Segmentation/MorphologicalProfiles/include/otbGeodesicMorphologyLevelingFilter.h
+++ b/Modules/Segmentation/MorphologicalProfiles/include/otbGeodesicMorphologyLevelingFilter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbGeodesicMorphologyLevelingFilter_h
-#define __otbGeodesicMorphologyLevelingFilter_h
+#ifndef otbGeodesicMorphologyLevelingFilter_h
+#define otbGeodesicMorphologyLevelingFilter_h
 
 #include "itkTernaryFunctorImageFilter.h"
 
diff --git a/Modules/Segmentation/MorphologicalProfiles/include/otbImageToProfileFilter.h b/Modules/Segmentation/MorphologicalProfiles/include/otbImageToProfileFilter.h
index c6c20f4ef7..f8d61dff77 100644
--- a/Modules/Segmentation/MorphologicalProfiles/include/otbImageToProfileFilter.h
+++ b/Modules/Segmentation/MorphologicalProfiles/include/otbImageToProfileFilter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbImageToProfileFilter_h
-#define __otbImageToProfileFilter_h
+#ifndef otbImageToProfileFilter_h
+#define otbImageToProfileFilter_h
 
 #include "otbImageToImageListFilter.h"
 
diff --git a/Modules/Segmentation/MorphologicalProfiles/include/otbImageToProfileFilter.txx b/Modules/Segmentation/MorphologicalProfiles/include/otbImageToProfileFilter.txx
index 461c38d0be..2111e40c77 100644
--- a/Modules/Segmentation/MorphologicalProfiles/include/otbImageToProfileFilter.txx
+++ b/Modules/Segmentation/MorphologicalProfiles/include/otbImageToProfileFilter.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbImageToProfileFilter_txx
-#define __otbImageToProfileFilter_txx
+#ifndef otbImageToProfileFilter_txx
+#define otbImageToProfileFilter_txx
 
 #include "otbImageToProfileFilter.h"
 
diff --git a/Modules/Segmentation/MorphologicalProfiles/include/otbMorphologicalClosingProfileFilter.h b/Modules/Segmentation/MorphologicalProfiles/include/otbMorphologicalClosingProfileFilter.h
index 39f39cbdb8..b290c526fb 100644
--- a/Modules/Segmentation/MorphologicalProfiles/include/otbMorphologicalClosingProfileFilter.h
+++ b/Modules/Segmentation/MorphologicalProfiles/include/otbMorphologicalClosingProfileFilter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbMorphologicalClosingProfileFilter_h
-#define __otbMorphologicalClosingProfileFilter_h
+#ifndef otbMorphologicalClosingProfileFilter_h
+#define otbMorphologicalClosingProfileFilter_h
 
 #include "otbImageToProfileFilter.h"
 #include "itkUnaryFunctorImageFilter.h"
diff --git a/Modules/Segmentation/MorphologicalProfiles/include/otbMorphologicalOpeningProfileFilter.h b/Modules/Segmentation/MorphologicalProfiles/include/otbMorphologicalOpeningProfileFilter.h
index 44a2c1916b..6caac39a23 100644
--- a/Modules/Segmentation/MorphologicalProfiles/include/otbMorphologicalOpeningProfileFilter.h
+++ b/Modules/Segmentation/MorphologicalProfiles/include/otbMorphologicalOpeningProfileFilter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbMorphologicalOpeningProfileFilter_h
-#define __otbMorphologicalOpeningProfileFilter_h
+#ifndef otbMorphologicalOpeningProfileFilter_h
+#define otbMorphologicalOpeningProfileFilter_h
 
 #include "otbImageToProfileFilter.h"
 #include "itkUnaryFunctorImageFilter.h"
diff --git a/Modules/Segmentation/MorphologicalProfiles/include/otbMorphologicalProfilesSegmentationFilter.h b/Modules/Segmentation/MorphologicalProfiles/include/otbMorphologicalProfilesSegmentationFilter.h
index 44d8e23529..38d68415e6 100644
--- a/Modules/Segmentation/MorphologicalProfiles/include/otbMorphologicalProfilesSegmentationFilter.h
+++ b/Modules/Segmentation/MorphologicalProfiles/include/otbMorphologicalProfilesSegmentationFilter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbMorphologicalProfilesSegmentationFilter_h
-#define __otbMorphologicalProfilesSegmentationFilter_h
+#ifndef otbMorphologicalProfilesSegmentationFilter_h
+#define otbMorphologicalProfilesSegmentationFilter_h
 
 #include "otbMorphologicalOpeningProfileFilter.h"
 #include "otbMorphologicalClosingProfileFilter.h"
diff --git a/Modules/Segmentation/MorphologicalProfiles/include/otbMorphologicalProfilesSegmentationFilter.txx b/Modules/Segmentation/MorphologicalProfiles/include/otbMorphologicalProfilesSegmentationFilter.txx
index 770ea76512..6c3caf76cb 100644
--- a/Modules/Segmentation/MorphologicalProfiles/include/otbMorphologicalProfilesSegmentationFilter.txx
+++ b/Modules/Segmentation/MorphologicalProfiles/include/otbMorphologicalProfilesSegmentationFilter.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbMorphologicalProfilesSegmentationFilter_txx
-#define __otbMorphologicalProfilesSegmentationFilter_txx
+#ifndef otbMorphologicalProfilesSegmentationFilter_txx
+#define otbMorphologicalProfilesSegmentationFilter_txx
 
 #include "otbMorphologicalProfilesSegmentationFilter.h"
 
diff --git a/Modules/Segmentation/MorphologicalProfiles/include/otbMultiScaleConvexOrConcaveClassificationFilter.h b/Modules/Segmentation/MorphologicalProfiles/include/otbMultiScaleConvexOrConcaveClassificationFilter.h
index 3ff845f4d0..32d0899e01 100644
--- a/Modules/Segmentation/MorphologicalProfiles/include/otbMultiScaleConvexOrConcaveClassificationFilter.h
+++ b/Modules/Segmentation/MorphologicalProfiles/include/otbMultiScaleConvexOrConcaveClassificationFilter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbMultiScaleConvexOrConcaveClassificationFilter_h
-#define __otbMultiScaleConvexOrConcaveClassificationFilter_h
+#ifndef otbMultiScaleConvexOrConcaveClassificationFilter_h
+#define otbMultiScaleConvexOrConcaveClassificationFilter_h
 
 #include "otbQuaternaryFunctorImageFilter.h"
 namespace otb
diff --git a/Modules/Segmentation/MorphologicalProfiles/include/otbOpeningClosingMorphologicalFilter.h b/Modules/Segmentation/MorphologicalProfiles/include/otbOpeningClosingMorphologicalFilter.h
index a610b9b825..6c9e641899 100644
--- a/Modules/Segmentation/MorphologicalProfiles/include/otbOpeningClosingMorphologicalFilter.h
+++ b/Modules/Segmentation/MorphologicalProfiles/include/otbOpeningClosingMorphologicalFilter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbOpeningClosingMorphologicalFilter_h
-#define __otbOpeningClosingMorphologicalFilter_h
+#ifndef otbOpeningClosingMorphologicalFilter_h
+#define otbOpeningClosingMorphologicalFilter_h
 
 #include "itkImageToImageFilter.h"
 
diff --git a/Modules/Segmentation/MorphologicalProfiles/include/otbOpeningClosingMorphologicalFilter.txx b/Modules/Segmentation/MorphologicalProfiles/include/otbOpeningClosingMorphologicalFilter.txx
index 66955a3e74..2ed171df0c 100644
--- a/Modules/Segmentation/MorphologicalProfiles/include/otbOpeningClosingMorphologicalFilter.txx
+++ b/Modules/Segmentation/MorphologicalProfiles/include/otbOpeningClosingMorphologicalFilter.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbOpeningClosingMorphologicalFilter_txx
-#define __otbOpeningClosingMorphologicalFilter_txx
+#ifndef otbOpeningClosingMorphologicalFilter_txx
+#define otbOpeningClosingMorphologicalFilter_txx
 
 #include "otbOpeningClosingMorphologicalFilter.h"
 #include "itkUnaryFunctorImageFilter.h"
diff --git a/Modules/Segmentation/MorphologicalProfiles/include/otbProfileDerivativeToMultiScaleCharacteristicsFilter.h b/Modules/Segmentation/MorphologicalProfiles/include/otbProfileDerivativeToMultiScaleCharacteristicsFilter.h
index a698af343a..b842d74208 100644
--- a/Modules/Segmentation/MorphologicalProfiles/include/otbProfileDerivativeToMultiScaleCharacteristicsFilter.h
+++ b/Modules/Segmentation/MorphologicalProfiles/include/otbProfileDerivativeToMultiScaleCharacteristicsFilter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbProfileDerivativeToMultiScaleCharacteristicsFilter_h
-#define __otbProfileDerivativeToMultiScaleCharacteristicsFilter_h
+#ifndef otbProfileDerivativeToMultiScaleCharacteristicsFilter_h
+#define otbProfileDerivativeToMultiScaleCharacteristicsFilter_h
 
 #include "otbImageListToImageFilter.h"
 
diff --git a/Modules/Segmentation/MorphologicalProfiles/include/otbProfileDerivativeToMultiScaleCharacteristicsFilter.txx b/Modules/Segmentation/MorphologicalProfiles/include/otbProfileDerivativeToMultiScaleCharacteristicsFilter.txx
index b6eff77051..ea6dfc405b 100644
--- a/Modules/Segmentation/MorphologicalProfiles/include/otbProfileDerivativeToMultiScaleCharacteristicsFilter.txx
+++ b/Modules/Segmentation/MorphologicalProfiles/include/otbProfileDerivativeToMultiScaleCharacteristicsFilter.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbProfileDerivativeToMultiScaleCharacteristicsFilter_txx
-#define __otbProfileDerivativeToMultiScaleCharacteristicsFilter_txx
+#ifndef otbProfileDerivativeToMultiScaleCharacteristicsFilter_txx
+#define otbProfileDerivativeToMultiScaleCharacteristicsFilter_txx
 
 #include "otbProfileDerivativeToMultiScaleCharacteristicsFilter.h"
 #include "itkImageRegionIterator.h"
diff --git a/Modules/Segmentation/MorphologicalProfiles/include/otbProfileToProfileDerivativeFilter.h b/Modules/Segmentation/MorphologicalProfiles/include/otbProfileToProfileDerivativeFilter.h
index e0046df414..8f0387087a 100644
--- a/Modules/Segmentation/MorphologicalProfiles/include/otbProfileToProfileDerivativeFilter.h
+++ b/Modules/Segmentation/MorphologicalProfiles/include/otbProfileToProfileDerivativeFilter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbProfileToProfileDerivativeFilter_h
-#define __otbProfileToProfileDerivativeFilter_h
+#ifndef otbProfileToProfileDerivativeFilter_h
+#define otbProfileToProfileDerivativeFilter_h
 
 #include "otbImageListToImageListFilter.h"
 #include "itkUnaryFunctorImageFilter.h"
diff --git a/Modules/Segmentation/MorphologicalProfiles/include/otbProfileToProfileDerivativeFilter.txx b/Modules/Segmentation/MorphologicalProfiles/include/otbProfileToProfileDerivativeFilter.txx
index b3e0f9577c..6f7674de79 100644
--- a/Modules/Segmentation/MorphologicalProfiles/include/otbProfileToProfileDerivativeFilter.txx
+++ b/Modules/Segmentation/MorphologicalProfiles/include/otbProfileToProfileDerivativeFilter.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbProfileToProfileDerivativeFilter_txx
-#define __otbProfileToProfileDerivativeFilter_txx
+#ifndef otbProfileToProfileDerivativeFilter_txx
+#define otbProfileToProfileDerivativeFilter_txx
 
 #include "otbProfileToProfileDerivativeFilter.h"
 
diff --git a/Modules/Segmentation/OGRProcessing/include/otbOGRLayerStreamStitchingFilter.h b/Modules/Segmentation/OGRProcessing/include/otbOGRLayerStreamStitchingFilter.h
index 839659e70d..b749bca797 100644
--- a/Modules/Segmentation/OGRProcessing/include/otbOGRLayerStreamStitchingFilter.h
+++ b/Modules/Segmentation/OGRProcessing/include/otbOGRLayerStreamStitchingFilter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbOGRLayerStreamStitchingFilter_h
-#define __otbOGRLayerStreamStitchingFilter_h
+#ifndef otbOGRLayerStreamStitchingFilter_h
+#define otbOGRLayerStreamStitchingFilter_h
 
 #include "otbOGRDataSourceWrapper.h"
 #include "otbMacro.h"
diff --git a/Modules/Segmentation/OGRProcessing/include/otbOGRLayerStreamStitchingFilter.txx b/Modules/Segmentation/OGRProcessing/include/otbOGRLayerStreamStitchingFilter.txx
index a077dca97c..d9073ed4cd 100644
--- a/Modules/Segmentation/OGRProcessing/include/otbOGRLayerStreamStitchingFilter.txx
+++ b/Modules/Segmentation/OGRProcessing/include/otbOGRLayerStreamStitchingFilter.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbOGRLayerStreamStitchingFilter_txx
-#define __otbOGRLayerStreamStitchingFilter_txx
+#ifndef otbOGRLayerStreamStitchingFilter_txx
+#define otbOGRLayerStreamStitchingFilter_txx
 
 #include "otbOGRLayerStreamStitchingFilter.h"
 #include "itkContinuousIndex.h"
diff --git a/Modules/Segmentation/OGRProcessing/include/otbStreamingImageToOGRLayerSegmentationFilter.h b/Modules/Segmentation/OGRProcessing/include/otbStreamingImageToOGRLayerSegmentationFilter.h
index 497878d132..e62521a5a2 100644
--- a/Modules/Segmentation/OGRProcessing/include/otbStreamingImageToOGRLayerSegmentationFilter.h
+++ b/Modules/Segmentation/OGRProcessing/include/otbStreamingImageToOGRLayerSegmentationFilter.h
@@ -18,8 +18,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbStreamingImageToOGRLayerSegmentationFilter_h
-#define __otbStreamingImageToOGRLayerSegmentationFilter_h
+#ifndef otbStreamingImageToOGRLayerSegmentationFilter_h
+#define otbStreamingImageToOGRLayerSegmentationFilter_h
 
 #include "itkExtractImageFilter.h"
 
diff --git a/Modules/Segmentation/OGRProcessing/include/otbStreamingImageToOGRLayerSegmentationFilter.txx b/Modules/Segmentation/OGRProcessing/include/otbStreamingImageToOGRLayerSegmentationFilter.txx
index c9f94d006c..bf952c9939 100644
--- a/Modules/Segmentation/OGRProcessing/include/otbStreamingImageToOGRLayerSegmentationFilter.txx
+++ b/Modules/Segmentation/OGRProcessing/include/otbStreamingImageToOGRLayerSegmentationFilter.txx
@@ -18,8 +18,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbStreamingImageToOGRLayerSegmentationFilter_txx
-#define __otbStreamingImageToOGRLayerSegmentationFilter_txx
+#ifndef otbStreamingImageToOGRLayerSegmentationFilter_txx
+#define otbStreamingImageToOGRLayerSegmentationFilter_txx
 
 #include "otbStreamingImageToOGRLayerSegmentationFilter.h"
 
diff --git a/Modules/Segmentation/Watersheds/include/otbWatershedSegmentationFilter.h b/Modules/Segmentation/Watersheds/include/otbWatershedSegmentationFilter.h
index 5befddd5d9..9972ff9a24 100644
--- a/Modules/Segmentation/Watersheds/include/otbWatershedSegmentationFilter.h
+++ b/Modules/Segmentation/Watersheds/include/otbWatershedSegmentationFilter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbWatershedSegmentationFilter_h
-#define __otbWatershedSegmentationFilter_h
+#ifndef otbWatershedSegmentationFilter_h
+#define otbWatershedSegmentationFilter_h
 
 #include "otbMacro.h"
 #include "itkUnaryFunctorImageFilter.h"
diff --git a/Modules/Segmentation/Watersheds/include/otbWatershedSegmentationFilter.txx b/Modules/Segmentation/Watersheds/include/otbWatershedSegmentationFilter.txx
index 4e60d088d7..6fb1c509d7 100644
--- a/Modules/Segmentation/Watersheds/include/otbWatershedSegmentationFilter.txx
+++ b/Modules/Segmentation/Watersheds/include/otbWatershedSegmentationFilter.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbWatershedSegmentationFilter_txx
-#define __otbWatershedSegmentationFilter_txx
+#ifndef otbWatershedSegmentationFilter_txx
+#define otbWatershedSegmentationFilter_txx
 
 #include "otbWatershedSegmentationFilter.h"
 
diff --git a/Modules/ThirdParty/Boost/src/otbBoostDox.h b/Modules/ThirdParty/Boost/src/otbBoostDox.h
index d019018f2b..368507c105 100644
--- a/Modules/ThirdParty/Boost/src/otbBoostDox.h
+++ b/Modules/ThirdParty/Boost/src/otbBoostDox.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbBoostDox_h
-#define __otbBoostDox_h
+#ifndef otbBoostDox_h
+#define otbBoostDox_h
 
 /**\defgroup boost Boost alike helpers
  * \ingroup  Thematic
@@ -27,4 +27,4 @@
 namespace boost { }
 //@}
 
-#endif // __otbBoostDox_h
+#endif // otbBoostDox_h
diff --git a/Modules/ThirdParty/ITK/include/otbWarpImageFilter.h b/Modules/ThirdParty/ITK/include/otbWarpImageFilter.h
index 4b80ef4885..eabdfd9845 100644
--- a/Modules/ThirdParty/ITK/include/otbWarpImageFilter.h
+++ b/Modules/ThirdParty/ITK/include/otbWarpImageFilter.h
@@ -15,8 +15,8 @@
   PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbWarpImageFilter_h
-#define __otbWarpImageFilter_h
+#ifndef otbWarpImageFilter_h
+#define otbWarpImageFilter_h
 #include "itkImageBase.h"
 #include "itkImageToImageFilter.h"
 #include "itkLinearInterpolateImageFunction.h"
diff --git a/Modules/ThirdParty/ITK/include/otbWarpImageFilter.txx b/Modules/ThirdParty/ITK/include/otbWarpImageFilter.txx
index 7f0719b187..14341e4168 100644
--- a/Modules/ThirdParty/ITK/include/otbWarpImageFilter.txx
+++ b/Modules/ThirdParty/ITK/include/otbWarpImageFilter.txx
@@ -15,8 +15,8 @@
   PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbWarpImageFilter_txx
-#define __otbWarpImageFilter_txx
+#ifndef otbWarpImageFilter_txx
+#define otbWarpImageFilter_txx
 #include "otbWarpImageFilter.h"
 
 #include "itkImageRegionIterator.h"
diff --git a/Modules/ThirdParty/SiftFast/src/otb_siftfast.h b/Modules/ThirdParty/SiftFast/src/otb_siftfast.h
index 6341da75ce..945b6f7c35 100644
--- a/Modules/ThirdParty/SiftFast/src/otb_siftfast.h
+++ b/Modules/ThirdParty/SiftFast/src/otb_siftfast.h
@@ -15,7 +15,7 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otb_siftfast_h
+#ifndef otb_siftfast_h
 
 #include "otbsiftfast/siftfast.h"
 
diff --git a/Modules/Wrappers/ApplicationEngine/include/otbWrapperAddProcessToWatchEvent.h b/Modules/Wrappers/ApplicationEngine/include/otbWrapperAddProcessToWatchEvent.h
index b2c130f3e9..f99ae35449 100644
--- a/Modules/Wrappers/ApplicationEngine/include/otbWrapperAddProcessToWatchEvent.h
+++ b/Modules/Wrappers/ApplicationEngine/include/otbWrapperAddProcessToWatchEvent.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbWrapperAddProcessToWatchEvent_h
-#define __otbWrapperAddProcessToWatchEvent_h
+#ifndef otbWrapperAddProcessToWatchEvent_h
+#define otbWrapperAddProcessToWatchEvent_h
 
 #include "itkEventObject.h"
 #include "itkProcessObject.h"
diff --git a/Modules/Wrappers/ApplicationEngine/include/otbWrapperApplication.h b/Modules/Wrappers/ApplicationEngine/include/otbWrapperApplication.h
index 137fb11f0f..1ec72194ec 100644
--- a/Modules/Wrappers/ApplicationEngine/include/otbWrapperApplication.h
+++ b/Modules/Wrappers/ApplicationEngine/include/otbWrapperApplication.h
@@ -15,8 +15,8 @@
   PURPOSE.  See the above copyright notices for more information.
 
   =========================================================================*/
-#ifndef __otbWrapperApplication_h
-#define __otbWrapperApplication_h
+#ifndef otbWrapperApplication_h
+#define otbWrapperApplication_h
 
 #include <string>
 #include "otbWrapperTypes.h"
@@ -833,4 +833,4 @@ private:
 //#include "otbWrapperApplication.txx"
 //#endif
 
-#endif // __otbWrapperApplication_h_
+#endif // otbWrapperApplication_h_
diff --git a/Modules/Wrappers/ApplicationEngine/include/otbWrapperApplicationFactory.h b/Modules/Wrappers/ApplicationEngine/include/otbWrapperApplicationFactory.h
index d38adeab07..854568a3c6 100644
--- a/Modules/Wrappers/ApplicationEngine/include/otbWrapperApplicationFactory.h
+++ b/Modules/Wrappers/ApplicationEngine/include/otbWrapperApplicationFactory.h
@@ -15,8 +15,8 @@
  PURPOSE.  See the above copyright notices for more information.
 
  =========================================================================*/
-#ifndef __otbWrapperApplicationFactory_h
-#define __otbWrapperApplicationFactory_h
+#ifndef otbWrapperApplicationFactory_h
+#define otbWrapperApplicationFactory_h
 
 #include "otbWrapperApplicationFactoryBase.h"
 #include "itkVersion.h"
@@ -133,4 +133,4 @@ private:
   }
 
 
-#endif // __otbWrapperApplication_h_
+#endif // otbWrapperApplication_h_
diff --git a/Modules/Wrappers/ApplicationEngine/include/otbWrapperApplicationFactoryBase.h b/Modules/Wrappers/ApplicationEngine/include/otbWrapperApplicationFactoryBase.h
index e26932323d..5be4af950c 100644
--- a/Modules/Wrappers/ApplicationEngine/include/otbWrapperApplicationFactoryBase.h
+++ b/Modules/Wrappers/ApplicationEngine/include/otbWrapperApplicationFactoryBase.h
@@ -15,8 +15,8 @@
  PURPOSE.  See the above copyright notices for more information.
 
  =========================================================================*/
-#ifndef __otbWrapperApplicationFactoryBase_h
-#define __otbWrapperApplicationFactoryBase_h
+#ifndef otbWrapperApplicationFactoryBase_h
+#define otbWrapperApplicationFactoryBase_h
 
 #include "itkObjectFactoryBase.h"
 #include "otbWrapperApplication.h"
diff --git a/Modules/Wrappers/ApplicationEngine/include/otbWrapperApplicationHtmlDocGenerator.h b/Modules/Wrappers/ApplicationEngine/include/otbWrapperApplicationHtmlDocGenerator.h
index 407aa35f29..29fda60cc1 100644
--- a/Modules/Wrappers/ApplicationEngine/include/otbWrapperApplicationHtmlDocGenerator.h
+++ b/Modules/Wrappers/ApplicationEngine/include/otbWrapperApplicationHtmlDocGenerator.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbWrapperApplicationHtmlDocGenerator_h
-#define __otbWrapperApplicationHtmlDocGenerator_h
+#ifndef otbWrapperApplicationHtmlDocGenerator_h
+#define otbWrapperApplicationHtmlDocGenerator_h
 
 #include "otbWrapperApplication.h"
 
diff --git a/Modules/Wrappers/ApplicationEngine/include/otbWrapperApplicationRegistry.h b/Modules/Wrappers/ApplicationEngine/include/otbWrapperApplicationRegistry.h
index cdf2cffd4f..6b0e95f0f9 100644
--- a/Modules/Wrappers/ApplicationEngine/include/otbWrapperApplicationRegistry.h
+++ b/Modules/Wrappers/ApplicationEngine/include/otbWrapperApplicationRegistry.h
@@ -15,8 +15,8 @@
  PURPOSE.  See the above copyright notices for more information.
 
  =========================================================================*/
-#ifndef __otbWrapperApplicationRegistry_h
-#define __otbWrapperApplicationRegistry_h
+#ifndef otbWrapperApplicationRegistry_h
+#define otbWrapperApplicationRegistry_h
 
 #include <string>
 #include "itkObject.h"
@@ -90,4 +90,4 @@ private:
 } // end namespace Wrapper
 } //end namespace otb
 
-#endif // __otbWrapperApplication_h_
+#endif // otbWrapperApplication_h_
diff --git a/Modules/Wrappers/ApplicationEngine/include/otbWrapperChoiceParameter.h b/Modules/Wrappers/ApplicationEngine/include/otbWrapperChoiceParameter.h
index e17a6cb94c..fe81a7e776 100644
--- a/Modules/Wrappers/ApplicationEngine/include/otbWrapperChoiceParameter.h
+++ b/Modules/Wrappers/ApplicationEngine/include/otbWrapperChoiceParameter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbWrapperChoiceParameter_h
-#define __otbWrapperChoiceParameter_h
+#ifndef otbWrapperChoiceParameter_h
+#define otbWrapperChoiceParameter_h
 
 #include "otbWrapperParameterGroup.h"
 
diff --git a/Modules/Wrappers/ApplicationEngine/include/otbWrapperComplexInputImageParameter.h b/Modules/Wrappers/ApplicationEngine/include/otbWrapperComplexInputImageParameter.h
index 8720c610e5..04ff1e1a4b 100644
--- a/Modules/Wrappers/ApplicationEngine/include/otbWrapperComplexInputImageParameter.h
+++ b/Modules/Wrappers/ApplicationEngine/include/otbWrapperComplexInputImageParameter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbWrapperComplexInputImageParameter_h
-#define __otbWrapperComplexInputImageParameter_h
+#ifndef otbWrapperComplexInputImageParameter_h
+#define otbWrapperComplexInputImageParameter_h
 
 #include "otbImageFileReader.h"
 #include "itkImageBase.h"
diff --git a/Modules/Wrappers/ApplicationEngine/include/otbWrapperComplexInputImageParameter.txx b/Modules/Wrappers/ApplicationEngine/include/otbWrapperComplexInputImageParameter.txx
index a9c9ac2c8f..e4359ecfba 100644
--- a/Modules/Wrappers/ApplicationEngine/include/otbWrapperComplexInputImageParameter.txx
+++ b/Modules/Wrappers/ApplicationEngine/include/otbWrapperComplexInputImageParameter.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbWrapperComplexInputImageParameter_txx
-#define __otbWrapperComplexInputImageParameter_txx
+#ifndef otbWrapperComplexInputImageParameter_txx
+#define otbWrapperComplexInputImageParameter_txx
 
 #include "otbWrapperComplexInputImageParameter.h"
 
diff --git a/Modules/Wrappers/ApplicationEngine/include/otbWrapperComplexOutputImageParameter.h b/Modules/Wrappers/ApplicationEngine/include/otbWrapperComplexOutputImageParameter.h
index 4cc2863499..b1019af68f 100644
--- a/Modules/Wrappers/ApplicationEngine/include/otbWrapperComplexOutputImageParameter.h
+++ b/Modules/Wrappers/ApplicationEngine/include/otbWrapperComplexOutputImageParameter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbWrapperComplexOutputImageParameter_h
-#define __otbWrapperComplexOutputImageParameter_h
+#ifndef otbWrapperComplexOutputImageParameter_h
+#define otbWrapperComplexOutputImageParameter_h
 
 #include "itkImageBase.h"
 #include "otbWrapperParameter.h"
diff --git a/Modules/Wrappers/ApplicationEngine/include/otbWrapperDirectoryParameter.h b/Modules/Wrappers/ApplicationEngine/include/otbWrapperDirectoryParameter.h
index 1c174b94ce..965f08fe7d 100644
--- a/Modules/Wrappers/ApplicationEngine/include/otbWrapperDirectoryParameter.h
+++ b/Modules/Wrappers/ApplicationEngine/include/otbWrapperDirectoryParameter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbWrapperDirectoryParameter_h
-#define __otbWrapperDirectoryParameter_h
+#ifndef otbWrapperDirectoryParameter_h
+#define otbWrapperDirectoryParameter_h
 
 #include "otbWrapperStringParameter.h"
 #include "otbMacro.h"
diff --git a/Modules/Wrappers/ApplicationEngine/include/otbWrapperDocExampleStructure.h b/Modules/Wrappers/ApplicationEngine/include/otbWrapperDocExampleStructure.h
index 8f417442d9..7ba66bb1ca 100644
--- a/Modules/Wrappers/ApplicationEngine/include/otbWrapperDocExampleStructure.h
+++ b/Modules/Wrappers/ApplicationEngine/include/otbWrapperDocExampleStructure.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbWrapperDocExampleStructure_h
-#define __otbWrapperDocExampleStructure_h
+#ifndef otbWrapperDocExampleStructure_h
+#define otbWrapperDocExampleStructure_h
 
 #include "itkObject.h"
 #include "itkObjectFactory.h"
diff --git a/Modules/Wrappers/ApplicationEngine/include/otbWrapperElevationParametersHandler.h b/Modules/Wrappers/ApplicationEngine/include/otbWrapperElevationParametersHandler.h
index a7b2750f1e..225400704c 100644
--- a/Modules/Wrappers/ApplicationEngine/include/otbWrapperElevationParametersHandler.h
+++ b/Modules/Wrappers/ApplicationEngine/include/otbWrapperElevationParametersHandler.h
@@ -15,8 +15,8 @@
   PURPOSE.  See the above copyright notices for more information.
 
   =========================================================================*/
-#ifndef __otbWrapperElevationParametersHandler_h
-#define __otbWrapperElevationParametersHandler_h
+#ifndef otbWrapperElevationParametersHandler_h
+#define otbWrapperElevationParametersHandler_h
 
 #include "otbWrapperApplication.h"
 
@@ -67,4 +67,4 @@ protected:
 }
 
 
-#endif // __otbWrapperElevationParametersHandler_h_
+#endif // otbWrapperElevationParametersHandler_h_
diff --git a/Modules/Wrappers/ApplicationEngine/include/otbWrapperEmptyParameter.h b/Modules/Wrappers/ApplicationEngine/include/otbWrapperEmptyParameter.h
index 6f87aedbee..1ff87d48a9 100644
--- a/Modules/Wrappers/ApplicationEngine/include/otbWrapperEmptyParameter.h
+++ b/Modules/Wrappers/ApplicationEngine/include/otbWrapperEmptyParameter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbWrapperEmptyParameter_h
-#define __otbWrapperEmptyParameter_h
+#ifndef otbWrapperEmptyParameter_h
+#define otbWrapperEmptyParameter_h
 
 #include "otbWrapperParameter.h"
 
diff --git a/Modules/Wrappers/ApplicationEngine/include/otbWrapperInputFilenameListParameter.h b/Modules/Wrappers/ApplicationEngine/include/otbWrapperInputFilenameListParameter.h
index ae18b7e794..11c34b61ef 100644
--- a/Modules/Wrappers/ApplicationEngine/include/otbWrapperInputFilenameListParameter.h
+++ b/Modules/Wrappers/ApplicationEngine/include/otbWrapperInputFilenameListParameter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbWrapperInputFilenameListParameter_h
-#define __otbWrapperInputFilenameListParameter_h
+#ifndef otbWrapperInputFilenameListParameter_h
+#define otbWrapperInputFilenameListParameter_h
 
 #include <string>
 #include "otbWrapperStringParameter.h"
diff --git a/Modules/Wrappers/ApplicationEngine/include/otbWrapperInputFilenameParameter.h b/Modules/Wrappers/ApplicationEngine/include/otbWrapperInputFilenameParameter.h
index f093bda549..f35349024c 100644
--- a/Modules/Wrappers/ApplicationEngine/include/otbWrapperInputFilenameParameter.h
+++ b/Modules/Wrappers/ApplicationEngine/include/otbWrapperInputFilenameParameter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbWrapperInputFilenameParameter_h
-#define __otbWrapperInputFilenameParameter_h
+#ifndef otbWrapperInputFilenameParameter_h
+#define otbWrapperInputFilenameParameter_h
 
 #include <string>
 #include "otbWrapperStringParameter.h"
diff --git a/Modules/Wrappers/ApplicationEngine/include/otbWrapperInputImageListParameter.h b/Modules/Wrappers/ApplicationEngine/include/otbWrapperInputImageListParameter.h
index 32c7e90c07..9fc934287e 100644
--- a/Modules/Wrappers/ApplicationEngine/include/otbWrapperInputImageListParameter.h
+++ b/Modules/Wrappers/ApplicationEngine/include/otbWrapperInputImageListParameter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbWrapperInputImageListParameter_h
-#define __otbWrapperInputImageListParameter_h
+#ifndef otbWrapperInputImageListParameter_h
+#define otbWrapperInputImageListParameter_h
 
 #include "otbImageFileReader.h"
 
diff --git a/Modules/Wrappers/ApplicationEngine/include/otbWrapperInputImageParameter.h b/Modules/Wrappers/ApplicationEngine/include/otbWrapperInputImageParameter.h
index 7d3e8c8b65..df467e6adf 100644
--- a/Modules/Wrappers/ApplicationEngine/include/otbWrapperInputImageParameter.h
+++ b/Modules/Wrappers/ApplicationEngine/include/otbWrapperInputImageParameter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbWrapperInputImageParameter_h
-#define __otbWrapperInputImageParameter_h
+#ifndef otbWrapperInputImageParameter_h
+#define otbWrapperInputImageParameter_h
 
 #include "otbImageFileReader.h"
 #include "itkImageBase.h"
diff --git a/Modules/Wrappers/ApplicationEngine/include/otbWrapperInputImageParameter.txx b/Modules/Wrappers/ApplicationEngine/include/otbWrapperInputImageParameter.txx
index 3c16f47a18..ccec52397e 100644
--- a/Modules/Wrappers/ApplicationEngine/include/otbWrapperInputImageParameter.txx
+++ b/Modules/Wrappers/ApplicationEngine/include/otbWrapperInputImageParameter.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbWrapperInputImageParameter_txx
-#define __otbWrapperInputImageParameter_txx
+#ifndef otbWrapperInputImageParameter_txx
+#define otbWrapperInputImageParameter_txx
 
 #include "otbWrapperInputImageParameter.h"
 
diff --git a/Modules/Wrappers/ApplicationEngine/include/otbWrapperInputProcessXMLParameter.h b/Modules/Wrappers/ApplicationEngine/include/otbWrapperInputProcessXMLParameter.h
index 9d43c95d2a..3f596e4a49 100644
--- a/Modules/Wrappers/ApplicationEngine/include/otbWrapperInputProcessXMLParameter.h
+++ b/Modules/Wrappers/ApplicationEngine/include/otbWrapperInputProcessXMLParameter.h
@@ -1,5 +1,5 @@
-#ifndef __otbWrapperInputProcessXMLParameter_h
-#define __otbWrapperInputProcessXMLParameter_h
+#ifndef otbWrapperInputProcessXMLParameter_h
+#define otbWrapperInputProcessXMLParameter_h
 #include "otbWrapperApplication.h"
 #include "otb_tinyxml.h"
 #include <sstream>
diff --git a/Modules/Wrappers/ApplicationEngine/include/otbWrapperInputVectorDataListParameter.h b/Modules/Wrappers/ApplicationEngine/include/otbWrapperInputVectorDataListParameter.h
index f66ed006d3..35920d5ad0 100644
--- a/Modules/Wrappers/ApplicationEngine/include/otbWrapperInputVectorDataListParameter.h
+++ b/Modules/Wrappers/ApplicationEngine/include/otbWrapperInputVectorDataListParameter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbWrapperInputVectorDataListParameter_h
-#define __otbWrapperInputVectorDataListParameter_h
+#ifndef otbWrapperInputVectorDataListParameter_h
+#define otbWrapperInputVectorDataListParameter_h
 
 #include "otbVectorDataFileReader.h"
 
diff --git a/Modules/Wrappers/ApplicationEngine/include/otbWrapperInputVectorDataParameter.h b/Modules/Wrappers/ApplicationEngine/include/otbWrapperInputVectorDataParameter.h
index c87251bd2f..494408bb58 100644
--- a/Modules/Wrappers/ApplicationEngine/include/otbWrapperInputVectorDataParameter.h
+++ b/Modules/Wrappers/ApplicationEngine/include/otbWrapperInputVectorDataParameter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbWrapperInputVectorDataParameter_h
-#define __otbWrapperInputVectorDataParameter_h
+#ifndef otbWrapperInputVectorDataParameter_h
+#define otbWrapperInputVectorDataParameter_h
 
 #include "otbVectorDataFileReader.h"
 #include "otbWrapperParameter.h"
diff --git a/Modules/Wrappers/ApplicationEngine/include/otbWrapperListViewParameter.h b/Modules/Wrappers/ApplicationEngine/include/otbWrapperListViewParameter.h
index 4518c3874a..daf800d6e8 100644
--- a/Modules/Wrappers/ApplicationEngine/include/otbWrapperListViewParameter.h
+++ b/Modules/Wrappers/ApplicationEngine/include/otbWrapperListViewParameter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbWrapperListViewParameter_h
-#define __otbWrapperListViewParameter_h
+#ifndef otbWrapperListViewParameter_h
+#define otbWrapperListViewParameter_h
 
 #include "otbWrapperParameterGroup.h"
 
diff --git a/Modules/Wrappers/ApplicationEngine/include/otbWrapperMacros.h b/Modules/Wrappers/ApplicationEngine/include/otbWrapperMacros.h
index 71a46fae16..75b584f9da 100644
--- a/Modules/Wrappers/ApplicationEngine/include/otbWrapperMacros.h
+++ b/Modules/Wrappers/ApplicationEngine/include/otbWrapperMacros.h
@@ -15,8 +15,8 @@
  PURPOSE.  See the above copyright notices for more information.
 
  =========================================================================*/
-#ifndef __otbWrapperMacros_h
-#define __otbWrapperMacros_h
+#ifndef otbWrapperMacros_h
+#define otbWrapperMacros_h
 
 
 #define otbAppLogFATAL(x) \
diff --git a/Modules/Wrappers/ApplicationEngine/include/otbWrapperMapProjectionParametersHandler.h b/Modules/Wrappers/ApplicationEngine/include/otbWrapperMapProjectionParametersHandler.h
index 08d1de8cf8..491949433c 100644
--- a/Modules/Wrappers/ApplicationEngine/include/otbWrapperMapProjectionParametersHandler.h
+++ b/Modules/Wrappers/ApplicationEngine/include/otbWrapperMapProjectionParametersHandler.h
@@ -15,8 +15,8 @@
   PURPOSE.  See the above copyright notices for more information.
 
   =========================================================================*/
-#ifndef __otbWrapperMapProjectionParametersHandler_h
-#define __otbWrapperMapProjectionParametersHandler_h
+#ifndef otbWrapperMapProjectionParametersHandler_h
+#define otbWrapperMapProjectionParametersHandler_h
 
 #include "otbWrapperApplication.h"
 
@@ -82,4 +82,4 @@ protected:
 }
 
 
-#endif // __otbWrapperMapProjectionParametersHandler_h_
+#endif // otbWrapperMapProjectionParametersHandler_h_
diff --git a/Modules/Wrappers/ApplicationEngine/include/otbWrapperNumericalParameter.h b/Modules/Wrappers/ApplicationEngine/include/otbWrapperNumericalParameter.h
index 1eb3606d02..c15e8f8825 100644
--- a/Modules/Wrappers/ApplicationEngine/include/otbWrapperNumericalParameter.h
+++ b/Modules/Wrappers/ApplicationEngine/include/otbWrapperNumericalParameter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbWrapperNumericalParameter_h
-#define __otbWrapperNumericalParameter_h
+#ifndef otbWrapperNumericalParameter_h
+#define otbWrapperNumericalParameter_h
 
 #include "otbWrapperParameter.h"
 #include "itkNumericTraits.h"
diff --git a/Modules/Wrappers/ApplicationEngine/include/otbWrapperOutputFilenameParameter.h b/Modules/Wrappers/ApplicationEngine/include/otbWrapperOutputFilenameParameter.h
index ed4fb25d91..62d10fc93d 100644
--- a/Modules/Wrappers/ApplicationEngine/include/otbWrapperOutputFilenameParameter.h
+++ b/Modules/Wrappers/ApplicationEngine/include/otbWrapperOutputFilenameParameter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbWrapperOutputFilenameParameter_h
-#define __otbWrapperOutputFilenameParameter_h
+#ifndef otbWrapperOutputFilenameParameter_h
+#define otbWrapperOutputFilenameParameter_h
 
 #include <string>
 #include "otbWrapperStringParameter.h"
diff --git a/Modules/Wrappers/ApplicationEngine/include/otbWrapperOutputImageParameter.h b/Modules/Wrappers/ApplicationEngine/include/otbWrapperOutputImageParameter.h
index 01b522f102..4c2c0960d5 100644
--- a/Modules/Wrappers/ApplicationEngine/include/otbWrapperOutputImageParameter.h
+++ b/Modules/Wrappers/ApplicationEngine/include/otbWrapperOutputImageParameter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbWrapperOutputImageParameter_h
-#define __otbWrapperOutputImageParameter_h
+#ifndef otbWrapperOutputImageParameter_h
+#define otbWrapperOutputImageParameter_h
 
 //#include "otbVectorImage.h"
 #include "itkImageBase.h"
diff --git a/Modules/Wrappers/ApplicationEngine/include/otbWrapperOutputProcessXMLParameter.h b/Modules/Wrappers/ApplicationEngine/include/otbWrapperOutputProcessXMLParameter.h
index ac45c32a59..8a983b3a8a 100644
--- a/Modules/Wrappers/ApplicationEngine/include/otbWrapperOutputProcessXMLParameter.h
+++ b/Modules/Wrappers/ApplicationEngine/include/otbWrapperOutputProcessXMLParameter.h
@@ -1,5 +1,5 @@
-#ifndef __otbWrapperOutputProcessXMLParameter_h
-#define __otbWrapperOutputProcessXMLParameter_h
+#ifndef otbWrapperOutputProcessXMLParameter_h
+#define otbWrapperOutputProcessXMLParameter_h
 #include "otbWrapperApplication.h"
 #include "otb_tinyxml.h"
 
diff --git a/Modules/Wrappers/ApplicationEngine/include/otbWrapperOutputVectorDataParameter.h b/Modules/Wrappers/ApplicationEngine/include/otbWrapperOutputVectorDataParameter.h
index afeabe8d67..155a728802 100644
--- a/Modules/Wrappers/ApplicationEngine/include/otbWrapperOutputVectorDataParameter.h
+++ b/Modules/Wrappers/ApplicationEngine/include/otbWrapperOutputVectorDataParameter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbWrapperOutputVectorDataParameter_h
-#define __otbWrapperOutputVectorDataParameter_h
+#ifndef otbWrapperOutputVectorDataParameter_h
+#define otbWrapperOutputVectorDataParameter_h
 
 #include "otbWrapperParameter.h"
 
diff --git a/Modules/Wrappers/ApplicationEngine/include/otbWrapperParameter.h b/Modules/Wrappers/ApplicationEngine/include/otbWrapperParameter.h
index d990f4a635..aed8f88916 100644
--- a/Modules/Wrappers/ApplicationEngine/include/otbWrapperParameter.h
+++ b/Modules/Wrappers/ApplicationEngine/include/otbWrapperParameter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbWrapperParameter_h
-#define __otbWrapperParameter_h
+#ifndef otbWrapperParameter_h
+#define otbWrapperParameter_h
 
 #include "otbMacro.h"
 #include "itkObjectFactory.h"
diff --git a/Modules/Wrappers/ApplicationEngine/include/otbWrapperParameterGroup.h b/Modules/Wrappers/ApplicationEngine/include/otbWrapperParameterGroup.h
index 3ef9f0d5c0..31600e9103 100644
--- a/Modules/Wrappers/ApplicationEngine/include/otbWrapperParameterGroup.h
+++ b/Modules/Wrappers/ApplicationEngine/include/otbWrapperParameterGroup.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbWrapperParameterGroup_h
-#define __otbWrapperParameterGroup_h
+#ifndef otbWrapperParameterGroup_h
+#define otbWrapperParameterGroup_h
 
 #include "itkObject.h"
 #include "otbWrapperParameter.h"
diff --git a/Modules/Wrappers/ApplicationEngine/include/otbWrapperParameterKey.h b/Modules/Wrappers/ApplicationEngine/include/otbWrapperParameterKey.h
index d7f17907df..ac0f9d616a 100644
--- a/Modules/Wrappers/ApplicationEngine/include/otbWrapperParameterKey.h
+++ b/Modules/Wrappers/ApplicationEngine/include/otbWrapperParameterKey.h
@@ -15,8 +15,8 @@
  PURPOSE.  See the above copyright notices for more information.
 
  =========================================================================*/
-#ifndef __otbWrapperParameterKey_h
-#define __otbWrapperParameterKey_h
+#ifndef otbWrapperParameterKey_h
+#define otbWrapperParameterKey_h
 
 #include <string>
 #include <vector>
@@ -117,4 +117,4 @@ private:
 } // end namespace Wrapper
 } //end namespace otb
 
-#endif // __otbWrapperParameterKey_h_
+#endif // otbWrapperParameterKey_h_
diff --git a/Modules/Wrappers/ApplicationEngine/include/otbWrapperRAMParameter.h b/Modules/Wrappers/ApplicationEngine/include/otbWrapperRAMParameter.h
index 23aab70a13..1a234e9d99 100644
--- a/Modules/Wrappers/ApplicationEngine/include/otbWrapperRAMParameter.h
+++ b/Modules/Wrappers/ApplicationEngine/include/otbWrapperRAMParameter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbWrapperRAMParameter_h
-#define __otbWrapperRAMParameter_h
+#ifndef otbWrapperRAMParameter_h
+#define otbWrapperRAMParameter_h
 
 #include "otbWrapperNumericalParameter.h"
 
diff --git a/Modules/Wrappers/ApplicationEngine/include/otbWrapperRadiusParameter.h b/Modules/Wrappers/ApplicationEngine/include/otbWrapperRadiusParameter.h
index f0d2ff9be0..29d88153f4 100644
--- a/Modules/Wrappers/ApplicationEngine/include/otbWrapperRadiusParameter.h
+++ b/Modules/Wrappers/ApplicationEngine/include/otbWrapperRadiusParameter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbWrapperRadiusParameter_h
-#define __otbWrapperRadiusParameter_h
+#ifndef otbWrapperRadiusParameter_h
+#define otbWrapperRadiusParameter_h
 
 #include "otbWrapperNumericalParameter.h"
 
diff --git a/Modules/Wrappers/ApplicationEngine/include/otbWrapperStringListParameter.h b/Modules/Wrappers/ApplicationEngine/include/otbWrapperStringListParameter.h
index 6f5ce3af76..8ca0637523 100644
--- a/Modules/Wrappers/ApplicationEngine/include/otbWrapperStringListParameter.h
+++ b/Modules/Wrappers/ApplicationEngine/include/otbWrapperStringListParameter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbWrapperStringListParameter_h
-#define __otbWrapperStringListParameter_h
+#ifndef otbWrapperStringListParameter_h
+#define otbWrapperStringListParameter_h
 
 #include <string>
 #include "otbWrapperParameter.h"
diff --git a/Modules/Wrappers/ApplicationEngine/include/otbWrapperStringParameter.h b/Modules/Wrappers/ApplicationEngine/include/otbWrapperStringParameter.h
index 66722afa38..e023b8f6ad 100644
--- a/Modules/Wrappers/ApplicationEngine/include/otbWrapperStringParameter.h
+++ b/Modules/Wrappers/ApplicationEngine/include/otbWrapperStringParameter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbWrapperStringParameter_h
-#define __otbWrapperStringParameter_h
+#ifndef otbWrapperStringParameter_h
+#define otbWrapperStringParameter_h
 
 #include <string>
 #include "otbWrapperParameter.h"
diff --git a/Modules/Wrappers/ApplicationEngine/include/otbWrapperTags.h b/Modules/Wrappers/ApplicationEngine/include/otbWrapperTags.h
index 0def0d95d2..c19a1a50e0 100644
--- a/Modules/Wrappers/ApplicationEngine/include/otbWrapperTags.h
+++ b/Modules/Wrappers/ApplicationEngine/include/otbWrapperTags.h
@@ -15,8 +15,8 @@
  PURPOSE.  See the above copyright notices for more information.
 
  =========================================================================*/
-#ifndef __otbWrapperTags_h
-#define __otbWrapperTags_h
+#ifndef otbWrapperTags_h
+#define otbWrapperTags_h
 
 #include <string>
 
@@ -51,4 +51,4 @@ static const std::string Vector="Vector Data Manipulation";
 } // end namespace Tags
 } // end namespace otb
 
-#endif // __otbWrapperTags_h_
+#endif // otbWrapperTags_h_
diff --git a/Modules/Wrappers/ApplicationEngine/include/otbWrapperTypes.h b/Modules/Wrappers/ApplicationEngine/include/otbWrapperTypes.h
index b976af24e3..56985c0060 100644
--- a/Modules/Wrappers/ApplicationEngine/include/otbWrapperTypes.h
+++ b/Modules/Wrappers/ApplicationEngine/include/otbWrapperTypes.h
@@ -15,8 +15,8 @@
  PURPOSE.  See the above copyright notices for more information.
 
  =========================================================================*/
-#ifndef __otbWrapperTypes_h
-#define __otbWrapperTypes_h
+#ifndef otbWrapperTypes_h
+#define otbWrapperTypes_h
 
 #include <complex>
 #include "itkRGBPixel.h"
@@ -142,4 +142,4 @@ typedef otb::ObjectList<FloatImageType>       FloatImageListType;
 } // end namespace Wrapper
 } // end namespace otb
 
-#endif // __otbWrapperApplication_h_
+#endif // otbWrapperApplication_h_
diff --git a/Modules/Wrappers/ApplicationEngine/src/otbWrapperInputImageParameterMacros.h b/Modules/Wrappers/ApplicationEngine/src/otbWrapperInputImageParameterMacros.h
index f68248d4c5..038cae0207 100644
--- a/Modules/Wrappers/ApplicationEngine/src/otbWrapperInputImageParameterMacros.h
+++ b/Modules/Wrappers/ApplicationEngine/src/otbWrapperInputImageParameterMacros.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbWrapperInputImageParameterMacros__h
-#define __otbWrapperInputImageParameterMacros__h
+#ifndef otbWrapperInputImageParameterMacros__h
+#define otbWrapperInputImageParameterMacros__h
 
 #define otbGetImageMacro(image)                       \
   image##Type *                                       \
diff --git a/Modules/Wrappers/CommandLine/include/otbWrapperCommandLineLauncher.h b/Modules/Wrappers/CommandLine/include/otbWrapperCommandLineLauncher.h
index 384fa97964..1f03dcf906 100644
--- a/Modules/Wrappers/CommandLine/include/otbWrapperCommandLineLauncher.h
+++ b/Modules/Wrappers/CommandLine/include/otbWrapperCommandLineLauncher.h
@@ -15,8 +15,8 @@
   PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbWrapperCommandLineLauncher_h
-#define __otbWrapperCommandLineLauncher_h
+#ifndef otbWrapperCommandLineLauncher_h
+#define otbWrapperCommandLineLauncher_h
 
 
 #include "otbWrapperApplication.h"
@@ -190,4 +190,4 @@ private:
 } // end namespace Wrapper
 } //end namespace otb
 
-#endif // __otbWrapperCommandLineLauncher_h_
+#endif // otbWrapperCommandLineLauncher_h_
diff --git a/Modules/Wrappers/CommandLine/include/otbWrapperCommandLineParser.h b/Modules/Wrappers/CommandLine/include/otbWrapperCommandLineParser.h
index 7c815f215a..12cfe91226 100644
--- a/Modules/Wrappers/CommandLine/include/otbWrapperCommandLineParser.h
+++ b/Modules/Wrappers/CommandLine/include/otbWrapperCommandLineParser.h
@@ -15,8 +15,8 @@
   PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbWrapperCommandLineParser_h
-#define __otbWrapperCommandLineParser_h
+#ifndef otbWrapperCommandLineParser_h
+#define otbWrapperCommandLineParser_h
 
 #include "itkObjectFactory.h"
 
@@ -103,4 +103,4 @@ private:
 } // end namespace Wrapper
 } //end namespace otb
 
-#endif // __otbWrapperCommandLineParser_h_
+#endif // otbWrapperCommandLineParser_h_
diff --git a/Modules/Wrappers/QtWidget/include/otbQtApplication.h b/Modules/Wrappers/QtWidget/include/otbQtApplication.h
index 1221efad58..0ca7fd6572 100644
--- a/Modules/Wrappers/QtWidget/include/otbQtApplication.h
+++ b/Modules/Wrappers/QtWidget/include/otbQtApplication.h
@@ -16,8 +16,8 @@
 
 =========================================================================*/
 
-#ifndef __otbQtApplication_h
-#define __otbQtApplication_h
+#ifndef otbQtApplication_h
+#define otbQtApplication_h
 
 #include <QtGui>
 #include <QString>
diff --git a/Modules/Wrappers/QtWidget/include/otbQtFileSelectionWidget.h b/Modules/Wrappers/QtWidget/include/otbQtFileSelectionWidget.h
index 336d0d38cb..9ddaacc42a 100644
--- a/Modules/Wrappers/QtWidget/include/otbQtFileSelectionWidget.h
+++ b/Modules/Wrappers/QtWidget/include/otbQtFileSelectionWidget.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbQtFileSelectionWidget_h
-#define __otbQtFileSelectionWidget_h
+#ifndef otbQtFileSelectionWidget_h
+#define otbQtFileSelectionWidget_h
 
 #include <QtGui>
 #ifndef Q_MOC_RUN  // See: https://bugreports.qt-project.org/browse/QTBUG-22829  //tag=QT4-boost-compatibility
diff --git a/Modules/Wrappers/QtWidget/include/otbQtLogOutput.h b/Modules/Wrappers/QtWidget/include/otbQtLogOutput.h
index 15f46d1b63..e0e411cae3 100644
--- a/Modules/Wrappers/QtWidget/include/otbQtLogOutput.h
+++ b/Modules/Wrappers/QtWidget/include/otbQtLogOutput.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbQtLogOutput_h
-#define __otbQtLogOutput_h
+#ifndef otbQtLogOutput_h
+#define otbQtLogOutput_h
 
 #include <QtGui>
 #ifndef Q_MOC_RUN  // See: https://bugreports.qt-project.org/browse/QTBUG-22829  //tag=QT4-boost-compatibility
diff --git a/Modules/Wrappers/QtWidget/include/otbQtStringSelectionWidget.h b/Modules/Wrappers/QtWidget/include/otbQtStringSelectionWidget.h
index 280ce698dc..6d830fafb4 100644
--- a/Modules/Wrappers/QtWidget/include/otbQtStringSelectionWidget.h
+++ b/Modules/Wrappers/QtWidget/include/otbQtStringSelectionWidget.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbQtStringSelectionWidget_h
-#define __otbQtStringSelectionWidget_h
+#ifndef otbQtStringSelectionWidget_h
+#define otbQtStringSelectionWidget_h
 
 #include <QtGui>
 #ifndef Q_MOC_RUN  // See: https://bugreports.qt-project.org/browse/QTBUG-22829  //tag=QT4-boost-compatibility
diff --git a/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetChoiceParameter.h b/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetChoiceParameter.h
index 8c88498760..f347bac670 100644
--- a/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetChoiceParameter.h
+++ b/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetChoiceParameter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbWrapperQtWidgetChoiceParameter_h
-#define __otbWrapperQtWidgetChoiceParameter_h
+#ifndef otbWrapperQtWidgetChoiceParameter_h
+#define otbWrapperQtWidgetChoiceParameter_h
 
 #include <QtGui>
 #ifndef Q_MOC_RUN  // See: https://bugreports.qt-project.org/browse/QTBUG-22829  //tag=QT4-boost-compatibility
diff --git a/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetComplexInputImageParameter.h b/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetComplexInputImageParameter.h
index bb020b662a..c09ebe7d71 100644
--- a/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetComplexInputImageParameter.h
+++ b/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetComplexInputImageParameter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbWrapperQtWidgetComplexInputImageParameter_h
-#define __otbWrapperQtWidgetComplexInputImageParameter_h
+#ifndef otbWrapperQtWidgetComplexInputImageParameter_h
+#define otbWrapperQtWidgetComplexInputImageParameter_h
 
 #include <QtGui>
 #ifndef Q_MOC_RUN  // See: https://bugreports.qt-project.org/browse/QTBUG-22829  //tag=QT4-boost-compatibility
diff --git a/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetComplexOutputImageParameter.h b/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetComplexOutputImageParameter.h
index 90b504b9f1..2aab53c181 100644
--- a/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetComplexOutputImageParameter.h
+++ b/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetComplexOutputImageParameter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbWrapperQtWidgetComplexOutputImageParameter_h
-#define __otbWrapperQtWidgetComplexOutputImageParameter_h
+#ifndef otbWrapperQtWidgetComplexOutputImageParameter_h
+#define otbWrapperQtWidgetComplexOutputImageParameter_h
 
 #include <QtGui>
 #ifndef Q_MOC_RUN  // See: https://bugreports.qt-project.org/browse/QTBUG-22829  //tag=QT4-boost-compatibility
diff --git a/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetDirectoryParameter.h b/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetDirectoryParameter.h
index 08c118df7f..561ffe38b8 100644
--- a/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetDirectoryParameter.h
+++ b/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetDirectoryParameter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbWrapperQtWidgetDirectoryParameter_h
-#define __otbWrapperQtWidgetDirectoryParameter_h
+#ifndef otbWrapperQtWidgetDirectoryParameter_h
+#define otbWrapperQtWidgetDirectoryParameter_h
 
 #include <QtGui>
 #ifndef Q_MOC_RUN  // See: https://bugreports.qt-project.org/browse/QTBUG-22829  //tag=QT4-boost-compatibility
diff --git a/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetEmptyParameter.h b/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetEmptyParameter.h
index 0c9f25ea17..ec1273f3c8 100644
--- a/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetEmptyParameter.h
+++ b/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetEmptyParameter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbWrapperQtWidgetEmptyParameter_h
-#define __otbWrapperQtWidgetEmptyParameter_h
+#ifndef otbWrapperQtWidgetEmptyParameter_h
+#define otbWrapperQtWidgetEmptyParameter_h
 
 #include <QtGui>
 #ifndef Q_MOC_RUN  // See: https://bugreports.qt-project.org/browse/QTBUG-22829  //tag=QT4-boost-compatibility
diff --git a/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetFloatParameter.h b/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetFloatParameter.h
index 2b98a89982..6ed4196ce0 100644
--- a/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetFloatParameter.h
+++ b/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetFloatParameter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbWrapperQtWidgetFloatParameter_h
-#define __otbWrapperQtWidgetFloatParameter_h
+#ifndef otbWrapperQtWidgetFloatParameter_h
+#define otbWrapperQtWidgetFloatParameter_h
 
 #include <QtGui>
 #ifndef Q_MOC_RUN  // See: https://bugreports.qt-project.org/browse/QTBUG-22829  //tag=QT4-boost-compatibility
diff --git a/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetInputFilenameListParameter.h b/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetInputFilenameListParameter.h
index 4d17c06e15..9b44f3dee7 100644
--- a/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetInputFilenameListParameter.h
+++ b/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetInputFilenameListParameter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbWrapperQtWidgetInputFilenameListParameter_h
-#define __otbWrapperQtWidgetInputFilenameListParameter_h
+#ifndef otbWrapperQtWidgetInputFilenameListParameter_h
+#define otbWrapperQtWidgetInputFilenameListParameter_h
 
 #include <QtGui>
 #ifndef Q_MOC_RUN  // See: https://bugreports.qt-project.org/browse/QTBUG-22829  //tag=QT4-boost-compatibility
diff --git a/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetInputFilenameParameter.h b/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetInputFilenameParameter.h
index e82aefc57f..38c345bffe 100644
--- a/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetInputFilenameParameter.h
+++ b/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetInputFilenameParameter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbWrapperQtWidgetInputFilenameParameter_h
-#define __otbWrapperQtWidgetInputFilenameParameter_h
+#ifndef otbWrapperQtWidgetInputFilenameParameter_h
+#define otbWrapperQtWidgetInputFilenameParameter_h
 
 #include <QtGui>
 #ifndef Q_MOC_RUN  // See: https://bugreports.qt-project.org/browse/QTBUG-22829  //tag=QT4-boost-compatibility
diff --git a/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetInputImageListParameter.h b/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetInputImageListParameter.h
index 3a0b1ce2e6..86133f60a8 100644
--- a/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetInputImageListParameter.h
+++ b/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetInputImageListParameter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbWrapperQtWidgetInputImageListParameter_h
-#define __otbWrapperQtWidgetInputImageListParameter_h
+#ifndef otbWrapperQtWidgetInputImageListParameter_h
+#define otbWrapperQtWidgetInputImageListParameter_h
 
 #include <QtGui>
 #ifndef Q_MOC_RUN  // See: https://bugreports.qt-project.org/browse/QTBUG-22829  //tag=QT4-boost-compatibility
diff --git a/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetInputImageParameter.h b/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetInputImageParameter.h
index f0d634c372..70552c8666 100644
--- a/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetInputImageParameter.h
+++ b/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetInputImageParameter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbWrapperQtWidgetInputImageParameter_h
-#define __otbWrapperQtWidgetInputImageParameter_h
+#ifndef otbWrapperQtWidgetInputImageParameter_h
+#define otbWrapperQtWidgetInputImageParameter_h
 
 #include <QtGui>
 #ifndef Q_MOC_RUN  // See: https://bugreports.qt-project.org/browse/QTBUG-22829  //tag=QT4-boost-compatibility
diff --git a/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetInputProcessXMLParameter.h b/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetInputProcessXMLParameter.h
index 49a40dc793..10fc787a2b 100644
--- a/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetInputProcessXMLParameter.h
+++ b/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetInputProcessXMLParameter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbWrapperQtWidgetInputProcessXMLParameter_h
-#define __otbWrapperQtWidgetInputProcessXMLParameter_h
+#ifndef otbWrapperQtWidgetInputProcessXMLParameter_h
+#define otbWrapperQtWidgetInputProcessXMLParameter_h
 
 #include <QtGui>
 #ifndef Q_MOC_RUN  // See: https://bugreports.qt-project.org/browse/QTBUG-22829  //tag=QT4-boost-compatibility
diff --git a/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetInputVectorDataListParameter.h b/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetInputVectorDataListParameter.h
index 595b13ef7b..4796c4d90f 100644
--- a/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetInputVectorDataListParameter.h
+++ b/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetInputVectorDataListParameter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbWrapperQtWidgetInputVectorDataListParameter_h
-#define __otbWrapperQtWidgetInputVectorDataListParameter_h
+#ifndef otbWrapperQtWidgetInputVectorDataListParameter_h
+#define otbWrapperQtWidgetInputVectorDataListParameter_h
 
 #include <QtGui>
 #ifndef Q_MOC_RUN  // See: https://bugreports.qt-project.org/browse/QTBUG-22829  //tag=QT4-boost-compatibility
diff --git a/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetInputVectorDataParameter.h b/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetInputVectorDataParameter.h
index 0b0843411f..4a265d7bc8 100644
--- a/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetInputVectorDataParameter.h
+++ b/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetInputVectorDataParameter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbWrapperQtWidgetInputVectorDataParameter_h
-#define __otbWrapperQtWidgetInputVectorDataParameter_h
+#ifndef otbWrapperQtWidgetInputVectorDataParameter_h
+#define otbWrapperQtWidgetInputVectorDataParameter_h
 
 #include <QtGui>
 #ifndef Q_MOC_RUN  // See: https://bugreports.qt-project.org/browse/QTBUG-22829  //tag=QT4-boost-compatibility
diff --git a/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetIntParameter.h b/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetIntParameter.h
index 175a0ebf90..fe62aec905 100644
--- a/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetIntParameter.h
+++ b/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetIntParameter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbWrapperQtWidgetIntParameter_h
-#define __otbWrapperQtWidgetIntParameter_h
+#ifndef otbWrapperQtWidgetIntParameter_h
+#define otbWrapperQtWidgetIntParameter_h
 
 #include <QtGui>
 #ifndef Q_MOC_RUN  // See: https://bugreports.qt-project.org/browse/QTBUG-22829  //tag=QT4-boost-compatibility
diff --git a/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetListViewParameter.h b/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetListViewParameter.h
index 6ad7eda8b4..15dbefee24 100644
--- a/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetListViewParameter.h
+++ b/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetListViewParameter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbWrapperQtWidgetListViewParameter_h
-#define __otbWrapperQtWidgetListViewParameter_h
+#ifndef otbWrapperQtWidgetListViewParameter_h
+#define otbWrapperQtWidgetListViewParameter_h
 
 #include <QtGui>
 #ifndef Q_MOC_RUN  // See: https://bugreports.qt-project.org/browse/QTBUG-22829  //tag=QT4-boost-compatibility
diff --git a/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetModel.h b/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetModel.h
index 12301eda5e..b723940afa 100644
--- a/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetModel.h
+++ b/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetModel.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbWrapperQtWidgetModel_h
-#define __otbWrapperQtWidgetModel_h
+#ifndef otbWrapperQtWidgetModel_h
+#define otbWrapperQtWidgetModel_h
 
 #include <QtGui>
 #ifndef Q_MOC_RUN  // See: https://bugreports.qt-project.org/browse/QTBUG-22829  //tag=QT4-boost-compatibility
diff --git a/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetOutputFilenameParameter.h b/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetOutputFilenameParameter.h
index 13e6e54ded..bef9917995 100644
--- a/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetOutputFilenameParameter.h
+++ b/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetOutputFilenameParameter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbWrapperQtWidgetOutputFilenameParameter_h
-#define __otbWrapperQtWidgetOutputFilenameParameter_h
+#ifndef otbWrapperQtWidgetOutputFilenameParameter_h
+#define otbWrapperQtWidgetOutputFilenameParameter_h
 
 #include <QtGui>
 #ifndef Q_MOC_RUN  // See: https://bugreports.qt-project.org/browse/QTBUG-22829  //tag=QT4-boost-compatibility
diff --git a/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetOutputImageParameter.h b/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetOutputImageParameter.h
index f4628127a6..7481978e24 100644
--- a/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetOutputImageParameter.h
+++ b/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetOutputImageParameter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbWrapperQtWidgetOutputImageParameter_h
-#define __otbWrapperQtWidgetOutputImageParameter_h
+#ifndef otbWrapperQtWidgetOutputImageParameter_h
+#define otbWrapperQtWidgetOutputImageParameter_h
 
 #include <QtGui>
 #ifndef Q_MOC_RUN  // See: https://bugreports.qt-project.org/browse/QTBUG-22829  //tag=QT4-boost-compatibility
diff --git a/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetOutputProcessXMLParameter.h b/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetOutputProcessXMLParameter.h
index e6840cab73..1de0fb0fde 100644
--- a/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetOutputProcessXMLParameter.h
+++ b/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetOutputProcessXMLParameter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbWrapperQtWidgetOutputProcessXMLParameter_h
-#define __otbWrapperQtWidgetOutputProcessXMLParameter_h
+#ifndef otbWrapperQtWidgetOutputProcessXMLParameter_h
+#define otbWrapperQtWidgetOutputProcessXMLParameter_h
 
 #include <QtGui>
 #ifndef Q_MOC_RUN  // See: https://bugreports.qt-project.org/browse/QTBUG-22829  //tag=QT4-boost-compatibility
diff --git a/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetOutputVectorDataParameter.h b/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetOutputVectorDataParameter.h
index 73e4d7b1f8..432116b590 100644
--- a/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetOutputVectorDataParameter.h
+++ b/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetOutputVectorDataParameter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbWrapperQtWidgetOutputVectorDataParameter_h
-#define __otbWrapperQtWidgetOutputVectorDataParameter_h
+#ifndef otbWrapperQtWidgetOutputVectorDataParameter_h
+#define otbWrapperQtWidgetOutputVectorDataParameter_h
 
 #include <QtGui>
 #ifndef Q_MOC_RUN  // See: https://bugreports.qt-project.org/browse/QTBUG-22829  //tag=QT4-boost-compatibility
diff --git a/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetParameterBase.h b/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetParameterBase.h
index fc59e97d08..43bca0ef6c 100644
--- a/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetParameterBase.h
+++ b/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetParameterBase.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbWrapperQtWidgetParameterBase_h
-#define __otbWrapperQtWidgetParameterBase_h
+#ifndef otbWrapperQtWidgetParameterBase_h
+#define otbWrapperQtWidgetParameterBase_h
 
 #include <QtGui>
 #ifndef Q_MOC_RUN  // See: https://bugreports.qt-project.org/browse/QTBUG-22829  //tag=QT4-boost-compatibility
diff --git a/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetParameterFactory.h b/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetParameterFactory.h
index 20803e254b..0c8c71459b 100644
--- a/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetParameterFactory.h
+++ b/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetParameterFactory.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbWrapperQtWidgetFactory_h
-#define __otbWrapperQtWidgetFactory_h
+#ifndef otbWrapperQtWidgetFactory_h
+#define otbWrapperQtWidgetFactory_h
 
 #include <QtGui>
 #ifndef Q_MOC_RUN  // See: https://bugreports.qt-project.org/browse/QTBUG-22829  //tag=QT4-boost-compatibility
diff --git a/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetParameterGroup.h b/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetParameterGroup.h
index 78064e746b..0d0558cfb1 100644
--- a/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetParameterGroup.h
+++ b/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetParameterGroup.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbWrapperQtWidgetParameterGroup_h
-#define __otbWrapperQtWidgetParameterGroup_h
+#ifndef otbWrapperQtWidgetParameterGroup_h
+#define otbWrapperQtWidgetParameterGroup_h
 
 #include <QtGui>
 #ifndef Q_MOC_RUN  // See: https://bugreports.qt-project.org/browse/QTBUG-22829  //tag=QT4-boost-compatibility
diff --git a/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetParameterLabel.h b/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetParameterLabel.h
index b0da81025e..e02de71faf 100644
--- a/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetParameterLabel.h
+++ b/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetParameterLabel.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbWrapperQtWidgetParameterLabel_h
-#define __otbWrapperQtWidgetParameterLabel_h
+#ifndef otbWrapperQtWidgetParameterLabel_h
+#define otbWrapperQtWidgetParameterLabel_h
 
 #include <QtGui>
 #ifndef Q_MOC_RUN  // See: https://bugreports.qt-project.org/browse/QTBUG-22829  //tag=QT4-boost-compatibility
diff --git a/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetProgressReport.h b/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetProgressReport.h
index 8eda6f0de7..48828cfd4e 100644
--- a/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetProgressReport.h
+++ b/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetProgressReport.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbWrapperQtWidgetProgressReport_h
-#define __otbWrapperQtWidgetProgressReport_h
+#ifndef otbWrapperQtWidgetProgressReport_h
+#define otbWrapperQtWidgetProgressReport_h
 
 #include <QtGui>
 #ifndef Q_MOC_RUN  // See: https://bugreports.qt-project.org/browse/QTBUG-22829  //tag=QT4-boost-compatibility
diff --git a/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetRAMParameter.h b/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetRAMParameter.h
index 97d748defb..0fa0a33dbb 100644
--- a/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetRAMParameter.h
+++ b/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetRAMParameter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbWrapperQtWidgetRAMParameter_h
-#define __otbWrapperQtWidgetRAMParameter_h
+#ifndef otbWrapperQtWidgetRAMParameter_h
+#define otbWrapperQtWidgetRAMParameter_h
 
 #include <QtGui>
 #ifndef Q_MOC_RUN  // See: https://bugreports.qt-project.org/browse/QTBUG-22829  //tag=QT4-boost-compatibility
diff --git a/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetSimpleProgressReport.h b/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetSimpleProgressReport.h
index 66d776414b..29d34484fb 100644
--- a/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetSimpleProgressReport.h
+++ b/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetSimpleProgressReport.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbWrapperQtWidgetSimpleProgressReport_h
-#define __otbWrapperQtWidgetSimpleProgressReport_h
+#ifndef otbWrapperQtWidgetSimpleProgressReport_h
+#define otbWrapperQtWidgetSimpleProgressReport_h
 
 #include <QtGui>
 #ifndef Q_MOC_RUN  // See: https://bugreports.qt-project.org/browse/QTBUG-22829  //tag=QT4-boost-compatibility
diff --git a/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetStringListParameter.h b/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetStringListParameter.h
index 78d8cf4731..b65ebc9d85 100644
--- a/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetStringListParameter.h
+++ b/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetStringListParameter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbWrapperQtWidgetStringListParameter_h
-#define __otbWrapperQtWidgetStringListParameter_h
+#ifndef otbWrapperQtWidgetStringListParameter_h
+#define otbWrapperQtWidgetStringListParameter_h
 
 #include <QtGui>
 #ifndef Q_MOC_RUN  // See: https://bugreports.qt-project.org/browse/QTBUG-22829  //tag=QT4-boost-compatibility
diff --git a/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetStringParameter.h b/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetStringParameter.h
index e6527661f7..145d9036e5 100644
--- a/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetStringParameter.h
+++ b/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetStringParameter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbWrapperQtWidgetStringParameter_h
-#define __otbWrapperQtWidgetStringParameter_h
+#ifndef otbWrapperQtWidgetStringParameter_h
+#define otbWrapperQtWidgetStringParameter_h
 
 #include <QtGui>
 #ifndef Q_MOC_RUN  // See: https://bugreports.qt-project.org/browse/QTBUG-22829  //tag=QT4-boost-compatibility
diff --git a/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetView.h b/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetView.h
index 4ae011e026..ebfb20509b 100644
--- a/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetView.h
+++ b/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetView.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbWrapperQtWidgetView_h
-#define __otbWrapperQtWidgetView_h
+#ifndef otbWrapperQtWidgetView_h
+#define otbWrapperQtWidgetView_h
 
 #include <QtGui>
 #include <QObject>
diff --git a/Modules/Wrappers/SWIG/src/otbWrapperSWIGIncludes.h b/Modules/Wrappers/SWIG/src/otbWrapperSWIGIncludes.h
index 80459d30c6..bd2af22261 100644
--- a/Modules/Wrappers/SWIG/src/otbWrapperSWIGIncludes.h
+++ b/Modules/Wrappers/SWIG/src/otbWrapperSWIGIncludes.h
@@ -18,8 +18,8 @@
  PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbWrapperSWIGIncludes_h
-#define __otbWrapperSWIGIncludes_h
+#ifndef otbWrapperSWIGIncludes_h
+#define otbWrapperSWIGIncludes_h
 
 #include "otbWrapperApplicationRegistry.h"
 #include "otbWrapperAddProcessToWatchEvent.h"
-- 
GitLab