diff --git a/Accelerators/Dax/vtkDaxContour.h b/Accelerators/Dax/vtkDaxContour.h
index d25d99cc314fe49ab9c76bc0e9eef1fe52f97883..16363a496e3163ba258b78af55dfef1afe87731a 100644
--- a/Accelerators/Dax/vtkDaxContour.h
+++ b/Accelerators/Dax/vtkDaxContour.h
@@ -14,8 +14,8 @@
 //
 //=============================================================================
 
-#ifndef __vtkDaxContour_h
-#define __vtkDaxContour_h
+#ifndef vtkDaxContour_h
+#define vtkDaxContour_h
 
 #include "vtkContourFilter.h"
 #include "vtkAcceleratorsDaxModule.h" //required for correct implementation
diff --git a/Accelerators/Dax/vtkDaxContourImpl.h b/Accelerators/Dax/vtkDaxContourImpl.h
index 71d569dd66be19c0f61b5ff3134f8dafeb92aaa7..2832043eba8b6fb471aa6a04a97f93bc455d1d6d 100644
--- a/Accelerators/Dax/vtkDaxContourImpl.h
+++ b/Accelerators/Dax/vtkDaxContourImpl.h
@@ -14,8 +14,8 @@
 //
 //=============================================================================
 
-#ifndef __vtkDaxContourImpl_h
-#define __vtkDaxContourImpl_h
+#ifndef vtkDaxContourImpl_h
+#define vtkDaxContourImpl_h
 
 // Common code
 #include "vtkDaxConfig.h"
diff --git a/Accelerators/Dax/vtkDaxDetailCommon.h b/Accelerators/Dax/vtkDaxDetailCommon.h
index b78605c87f34038d5a30227bc6893d390cf5f9f3..2838306df6ada23747817f314cb239ffb58ac0f3 100644
--- a/Accelerators/Dax/vtkDaxDetailCommon.h
+++ b/Accelerators/Dax/vtkDaxDetailCommon.h
@@ -14,8 +14,8 @@
 //
 //=============================================================================
 
-#ifndef __vtkDaxDetailCommon_h
-#define __vtkDaxDetailCommon_h
+#ifndef vtkDaxDetailCommon_h
+#define vtkDaxDetailCommon_h
 
 #include "vtkCellTypes.h"
 #include "vtkDataSet.h"
diff --git a/Accelerators/Dax/vtkDaxThreshold.h b/Accelerators/Dax/vtkDaxThreshold.h
index 5e0c522d2be913573886cce06a4f198d45732b44..c33cb01895e90af75693375f879d2d8b20cc6ab9 100644
--- a/Accelerators/Dax/vtkDaxThreshold.h
+++ b/Accelerators/Dax/vtkDaxThreshold.h
@@ -14,8 +14,8 @@
 //
 //=============================================================================
 
-#ifndef __vtkDaxThreshold_h
-#define __vtkDaxThreshold_h
+#ifndef vtkDaxThreshold_h
+#define vtkDaxThreshold_h
 
 #include "vtkThreshold.h"
 #include "vtkAcceleratorsDaxModule.h" //required for correct implementation
@@ -41,4 +41,4 @@ private:
   void operator=(const vtkDaxThreshold&); // Not implemented
 };
 
-#endif // __vtkDaxThreshold_h
+#endif // vtkDaxThreshold_h
diff --git a/Accelerators/Dax/vtkDaxThresholdImpl.h b/Accelerators/Dax/vtkDaxThresholdImpl.h
index 36cd1936913ab512185459ab07643cbd19e85390..6c1d55d5ddf397a0127c94892b84193a79e58076 100644
--- a/Accelerators/Dax/vtkDaxThresholdImpl.h
+++ b/Accelerators/Dax/vtkDaxThresholdImpl.h
@@ -14,8 +14,8 @@
 //
 //=============================================================================
 
-#ifndef __vtkDaxThresholdImpl_h
-#define __vtkDaxThresholdImpl_h
+#ifndef vtkDaxThresholdImpl_h
+#define vtkDaxThresholdImpl_h
 
 // Common code
 #include "vtkDaxConfig.h"
diff --git a/Accelerators/Piston/vtkDataSetToPiston.h b/Accelerators/Piston/vtkDataSetToPiston.h
index 819d75122fedf067c1a01f542fc37f09b5faac00..d82df0e7d35ef930a2e3c99cb2d8999a8a9705c4 100644
--- a/Accelerators/Piston/vtkDataSetToPiston.h
+++ b/Accelerators/Piston/vtkDataSetToPiston.h
@@ -21,8 +21,8 @@
 // .SECTION See Also
 // vtkPistonToDataSet
 
-#ifndef __vtkDataSetToPiston_h
-#define __vtkDataSetToPiston_h
+#ifndef vtkDataSetToPiston_h
+#define vtkDataSetToPiston_h
 
 #include "vtkPistonAlgorithm.h"
 
diff --git a/Accelerators/Piston/vtkPistonAlgorithm.h b/Accelerators/Piston/vtkPistonAlgorithm.h
index c1f4a6857cac2472fd11c63c24f88efe09a2b470..81cf00f87d30858c515f3df874025bcc30cd6076 100644
--- a/Accelerators/Piston/vtkPistonAlgorithm.h
+++ b/Accelerators/Piston/vtkPistonAlgorithm.h
@@ -30,8 +30,8 @@
 // class breaks out the downstream requests into separate functions such as
 // ExecuteData and ExecuteInformation.
 
-#ifndef __vtkPistonAlgorithm_h
-#define __vtkPistonAlgorithm_h
+#ifndef vtkPistonAlgorithm_h
+#define vtkPistonAlgorithm_h
 
 #include "vtkAcceleratorsPistonModule.h" // For export macro
 #include "vtkAlgorithm.h"
diff --git a/Accelerators/Piston/vtkPistonContour.h b/Accelerators/Piston/vtkPistonContour.h
index 3e88ca9895950db51b3636250eca25cf39dec035..a7acad64fdc8cce013c2d071c5b648caab85a606 100644
--- a/Accelerators/Piston/vtkPistonContour.h
+++ b/Accelerators/Piston/vtkPistonContour.h
@@ -16,8 +16,8 @@
 // .SECTION Description
 // This filter uses LANL's Piston library to isocontour on the GPU.
 
-#ifndef __vtkPistonContour_h
-#define __vtkPistonContour_h
+#ifndef vtkPistonContour_h
+#define vtkPistonContour_h
 
 #include "vtkPistonAlgorithm.h"
 
diff --git a/Accelerators/Piston/vtkPistonDataObject.h b/Accelerators/Piston/vtkPistonDataObject.h
index c3ee5a90fe0d17b32f3a0adcb5da2fbbf0bcbc8e..c1ca8eecc2ccba4c59544f3b10c88d971f001ef6 100644
--- a/Accelerators/Piston/vtkPistonDataObject.h
+++ b/Accelerators/Piston/vtkPistonDataObject.h
@@ -25,8 +25,8 @@
 // .SECTION See Also
 // vtkPistonReference
 
-#ifndef __vtkPistonDataObject_h
-#define __vtkPistonDataObject_h
+#ifndef vtkPistonDataObject_h
+#define vtkPistonDataObject_h
 
 #include "vtkAcceleratorsPistonModule.h" // For export macro
 #include "vtkDataObject.h"
diff --git a/Accelerators/Piston/vtkPistonDataWrangling.h b/Accelerators/Piston/vtkPistonDataWrangling.h
index 633aa0cd0a2eca31ce862c9039715caa0ac261e3..eb4cf1fe965de766d407a8f7f00281da0eb23769 100644
--- a/Accelerators/Piston/vtkPistonDataWrangling.h
+++ b/Accelerators/Piston/vtkPistonDataWrangling.h
@@ -18,8 +18,8 @@
 // The vtk_polydata struct is important as that is how piston's polygonal
 // results get brought back to the CPU.
 
-#ifndef __vtkPistonDataWrangling_h
-#define __vtkPistonDataWrangling_h
+#ifndef vtkPistonDataWrangling_h
+#define vtkPistonDataWrangling_h
 
 #include <thrust/version.h>
 #if THRUST_VERSION >= 100600
@@ -67,5 +67,5 @@ struct float4tofloat3 : thrust::unary_function<float4, float3>
 
 } //namespace
 
-#endif //__vtkPistonDataWrangling_h
+#endif //vtkPistonDataWrangling_h
 // VTK-HeaderTest-Exclude: vtkPistonDataWrangling.h
diff --git a/Accelerators/Piston/vtkPistonMapper.h b/Accelerators/Piston/vtkPistonMapper.h
index 3abc568de89911611934afe6578598308dc0220e..f807b71f4125d1544509b3bee60eceac96288c9c 100644
--- a/Accelerators/Piston/vtkPistonMapper.h
+++ b/Accelerators/Piston/vtkPistonMapper.h
@@ -18,8 +18,8 @@
 // The important capability it has is to produce images without bringing
 // data back to the CPU.
 
-#ifndef __vtkPistonMapper_h
-#define __vtkPistonMapper_h
+#ifndef vtkPistonMapper_h
+#define vtkPistonMapper_h
 
 #include "vtkAcceleratorsPistonModule.h" // For export macro
 #include "vtkMapper.h"
diff --git a/Accelerators/Piston/vtkPistonMinMax.h b/Accelerators/Piston/vtkPistonMinMax.h
index be92c4b93961d1f45ce1ee5356b24ab442503a56..cd1ef4e29430134521c70157b930ea5102821c38 100644
--- a/Accelerators/Piston/vtkPistonMinMax.h
+++ b/Accelerators/Piston/vtkPistonMinMax.h
@@ -17,8 +17,8 @@
 // Used in vtkPistonMapper to determine data range as part of color mapping
 // process.
 
-#ifndef __vtkPistonMinMax_h
-#define __vtkPistonMinMax_h
+#ifndef vtkPistonMinMax_h
+#define vtkPistonMinMax_h
 
 #include <thrust/device_vector.h>
 #include <thrust/host_vector.h>
@@ -93,5 +93,5 @@ namespace vtkPiston
   }
 }
 
-#endif // __vtkPistonMinMax_h
+#endif // vtkPistonMinMax_h
 // VTK-HeaderTest-Exclude: vtkPistonMinMax.h
diff --git a/Accelerators/Piston/vtkPistonScalarsColors.h b/Accelerators/Piston/vtkPistonScalarsColors.h
index 64cd60a6d2e6c7bf32476e65e02e4248667cefa9..51f74fb02e8023010a1ef21ffc20fe2afba6a23f 100644
--- a/Accelerators/Piston/vtkPistonScalarsColors.h
+++ b/Accelerators/Piston/vtkPistonScalarsColors.h
@@ -18,8 +18,8 @@
 // vtkPistonMapper uses this class to interface vtkScalarsToColors to GPU
 // side code that implements color mapping.
 
-#ifndef __vtkPistonScalarsColors_h
-#define __vtkPistonScalarsColors_h
+#ifndef vtkPistonScalarsColors_h
+#define vtkPistonScalarsColors_h
 
 #include "vtkAcceleratorsPistonModule.h" // For export macro
 #include "vtkObject.h"
@@ -101,4 +101,4 @@ private:
   void operator=(const vtkPistonScalarsColors&);  // Not implemented.
 };
 
-#endif // __vtkPistonScalarsColors_h
+#endif // vtkPistonScalarsColors_h
diff --git a/Accelerators/Piston/vtkPistonSlice.h b/Accelerators/Piston/vtkPistonSlice.h
index 2d8fdd2880cab885189051a60bd254fff1f055ed..90b4f0056689a8db6d9ec56a298dff5ebf2edbb1 100644
--- a/Accelerators/Piston/vtkPistonSlice.h
+++ b/Accelerators/Piston/vtkPistonSlice.h
@@ -16,8 +16,8 @@
 // .SECTION Description
 // This filter uses LANL's Piston library to slice on the GPU.
 
-#ifndef __vtkPistonSlice_h
-#define __vtkPistonSlice_h
+#ifndef vtkPistonSlice_h
+#define vtkPistonSlice_h
 
 #include "vtkPistonAlgorithm.h"
 
diff --git a/Accelerators/Piston/vtkPistonSort.h b/Accelerators/Piston/vtkPistonSort.h
index e05d0b63f9f0009e683fd34eea280fae26865685..04573ccb2131a32eb8852eb2ca113e270ec85433 100644
--- a/Accelerators/Piston/vtkPistonSort.h
+++ b/Accelerators/Piston/vtkPistonSort.h
@@ -20,8 +20,8 @@
 // keeps the same data type while producing a result which is verifiably
 // correct.
 
-#ifndef __vtkPistonSort_h
-#define __vtkPistonSort_h
+#ifndef vtkPistonSort_h
+#define vtkPistonSort_h
 
 #include "vtkPistonAlgorithm.h"
 
diff --git a/Accelerators/Piston/vtkPistonThreshold.h b/Accelerators/Piston/vtkPistonThreshold.h
index 74a8c2b3563eccbdf24ca28704eef98fbd116775..1e40e0fec656936145d918bda3f4ad595cd1979a 100644
--- a/Accelerators/Piston/vtkPistonThreshold.h
+++ b/Accelerators/Piston/vtkPistonThreshold.h
@@ -16,8 +16,8 @@
 // .SECTION Description
 // This filter uses LANL's Piston library to isocontour on the GPU.
 
-#ifndef __vtkPistonThreshold_h
-#define __vtkPistonThreshold_h
+#ifndef vtkPistonThreshold_h
+#define vtkPistonThreshold_h
 
 #include "vtkPistonAlgorithm.h"
 
diff --git a/Accelerators/Piston/vtkPistonToDataSet.h b/Accelerators/Piston/vtkPistonToDataSet.h
index 4147aeb730220403945c7d90c649b4d10f0822d5..05695e9033a5e86fe5a51a457d279e7c49ed8bbe 100644
--- a/Accelerators/Piston/vtkPistonToDataSet.h
+++ b/Accelerators/Piston/vtkPistonToDataSet.h
@@ -21,8 +21,8 @@
 // .SECTION See Also
 // vtkDataSetToPiston
 
-#ifndef __vtkPistonToDataSet_h
-#define __vtkPistonToDataSet_h
+#ifndef vtkPistonToDataSet_h
+#define vtkPistonToDataSet_h
 
 #include "vtkPistonAlgorithm.h"
 
diff --git a/Charts/Core/vtkAxis.h b/Charts/Core/vtkAxis.h
index 964318419bf053f1135ae6f75ec86708e8814bf1..6e9e8bbc5020ac5dce01c7375f4d9ce9b0837e2d 100644
--- a/Charts/Core/vtkAxis.h
+++ b/Charts/Core/vtkAxis.h
@@ -45,8 +45,8 @@
 // old Limit values in NonLogUnscaled{Min,Max}Limit so that behavior is
 // consistent when LogScale is changed from false to true and back again.
 
-#ifndef __vtkAxis_h
-#define __vtkAxis_h
+#ifndef vtkAxis_h
+#define vtkAxis_h
 
 #include "vtkChartsCoreModule.h" // For export macro
 #include "vtkContextItem.h"
@@ -581,4 +581,4 @@ private:
 //ETX
 };
 
-#endif //__vtkAxis_h
+#endif //vtkAxis_h
diff --git a/Charts/Core/vtkAxisExtended.h b/Charts/Core/vtkAxisExtended.h
index a59b95aebcb398af9f627294ce44cff48486aeba..b7c8b076d65c51187a9bbe7c5a30509851a205e4 100644
--- a/Charts/Core/vtkAxisExtended.h
+++ b/Charts/Core/vtkAxisExtended.h
@@ -22,8 +22,8 @@
 // .SECTION See Also
 // vtkAxis
 
-#ifndef __vtkAxisExtended_h
-#define __vtkAxisExtended_h
+#ifndef vtkAxisExtended_h
+#define vtkAxisExtended_h
 #endif
 
 #include "vtkChartsCoreModule.h" // For export macro
diff --git a/Charts/Core/vtkCategoryLegend.h b/Charts/Core/vtkCategoryLegend.h
index e5f56b0b8d0a73a63d0a5a1318677ad069b59c11..a4df8f696ab1f82bac14d410f7a66aa300f0f79b 100644
--- a/Charts/Core/vtkCategoryLegend.h
+++ b/Charts/Core/vtkCategoryLegend.h
@@ -22,8 +22,8 @@
 // annotated values from the vtkScalarsToColors that you wish to include
 // within the legend.
 
-#ifndef __vtkCategoryLegend_h
-#define __vtkCategoryLegend_h
+#ifndef vtkCategoryLegend_h
+#define vtkCategoryLegend_h
 
 #include "vtkChartsCoreModule.h" // For export macro
 #include "vtkChartLegend.h"
diff --git a/Charts/Core/vtkChart.h b/Charts/Core/vtkChart.h
index 0a0c12aecbad0142ebf834d880991188e1087762..ae1b2b909452c9081937011e88e96f09f7bc4a5a 100644
--- a/Charts/Core/vtkChart.h
+++ b/Charts/Core/vtkChart.h
@@ -18,8 +18,8 @@
 // .SECTION Description
 // This defines the interface for a chart.
 
-#ifndef __vtkChart_h
-#define __vtkChart_h
+#ifndef vtkChart_h
+#define vtkChart_h
 
 #include "vtkChartsCoreModule.h" // For export macro
 #include "vtkContextItem.h"
@@ -391,4 +391,4 @@ private:
   void operator=(const vtkChart &);   // Not implemented.
 };
 
-#endif //__vtkChart_h
+#endif //vtkChart_h
diff --git a/Charts/Core/vtkChartBox.h b/Charts/Core/vtkChartBox.h
index ef510dd784324cdddd2c6ea18fbeddfc9b40947c..16ab529cd2f242fd6f899547f6b7ee751436c325 100644
--- a/Charts/Core/vtkChartBox.h
+++ b/Charts/Core/vtkChartBox.h
@@ -18,8 +18,8 @@
 // .SECTION Description
 // This defines the interface for a box plot chart.
 
-#ifndef __vtkChartBox_h
-#define __vtkChartBox_h
+#ifndef vtkChartBox_h
+#define vtkChartBox_h
 
 #include "vtkChartsCoreModule.h" // For export macro
 #include "vtkChart.h"
@@ -202,4 +202,4 @@ struct vtkChartBoxData
   int Index;
 };
 
-#endif //__vtkChartBox_h
+#endif //vtkChartBox_h
diff --git a/Charts/Core/vtkChartHistogram2D.h b/Charts/Core/vtkChartHistogram2D.h
index 4e00a3e6a8a00f92610b8eb205ce13093375a680..e8d410c2745084b107ed3701a95b1cf7001c81ae 100644
--- a/Charts/Core/vtkChartHistogram2D.h
+++ b/Charts/Core/vtkChartHistogram2D.h
@@ -18,8 +18,8 @@
 // .SECTION Description
 // This defines the interface for a 2D histogram chart.
 
-#ifndef __vtkChart2DHistogram_h
-#define __vtkChart2DHistogram_h
+#ifndef vtkChart2DHistogram_h
+#define vtkChart2DHistogram_h
 
 #include "vtkChartsCoreModule.h" // For export macro
 #include "vtkChartXY.h"
@@ -77,4 +77,4 @@ private:
   void operator=(const vtkChartHistogram2D &);   // Not implemented.
 };
 
-#endif //__vtkChart2DHistogram_h
+#endif //vtkChart2DHistogram_h
diff --git a/Charts/Core/vtkChartLegend.h b/Charts/Core/vtkChartLegend.h
index 1927aaaf3e42562d13cff338e270b3acac5dd5b6..446b237c8df3c99ca969193bfbfbc9447dfcd489 100644
--- a/Charts/Core/vtkChartLegend.h
+++ b/Charts/Core/vtkChartLegend.h
@@ -20,8 +20,8 @@
 // last elements of a chart to be drawn. It renders the the mark/line for each
 // plot, and the plot labels.
 
-#ifndef __vtkChartLegend_h
-#define __vtkChartLegend_h
+#ifndef vtkChartLegend_h
+#define vtkChartLegend_h
 
 #include "vtkChartsCoreModule.h" // For export macro
 #include "vtkContextItem.h"
@@ -247,4 +247,4 @@ private:
   void operator=(const vtkChartLegend &); // Not implemented.
 };
 
-#endif //__vtkChartLegend_h
+#endif //vtkChartLegend_h
diff --git a/Charts/Core/vtkChartMatrix.h b/Charts/Core/vtkChartMatrix.h
index 390a87cb5add12abe788c0df778eadb6d0d2db7b..1dc0ca2cb9c736cbc1029e7dab3a883df776182b 100644
--- a/Charts/Core/vtkChartMatrix.h
+++ b/Charts/Core/vtkChartMatrix.h
@@ -20,8 +20,8 @@
 // vtkChartXY by default, but this can be overridden. The class will manage
 // their layout and object lifetime.
 
-#ifndef __vtkChartMatrix_h
-#define __vtkChartMatrix_h
+#ifndef vtkChartMatrix_h
+#define vtkChartMatrix_h
 
 #include "vtkChartsCoreModule.h" // For export macro
 #include "vtkAbstractContextItem.h"
@@ -135,4 +135,4 @@ private:
   void operator=(const vtkChartMatrix &); // Not implemented.
 };
 
-#endif //__vtkChartMatrix_h
+#endif //vtkChartMatrix_h
diff --git a/Charts/Core/vtkChartParallelCoordinates.h b/Charts/Core/vtkChartParallelCoordinates.h
index 5bb9214000f99e92e3e10d41c2b964586720139e..5d444a77525b9905ea032486a1173bdc358f6b99 100644
--- a/Charts/Core/vtkChartParallelCoordinates.h
+++ b/Charts/Core/vtkChartParallelCoordinates.h
@@ -18,8 +18,8 @@
 // .SECTION Description
 // This defines the interface for a parallel coordinates chart.
 
-#ifndef __vtkChartParallelCoordinates_h
-#define __vtkChartParallelCoordinates_h
+#ifndef vtkChartParallelCoordinates_h
+#define vtkChartParallelCoordinates_h
 
 #include "vtkChartsCoreModule.h" // For export macro
 #include "vtkChart.h"
@@ -157,4 +157,4 @@ private:
 //ETX
 };
 
-#endif //__vtkChartParallelCoordinates_h
+#endif //vtkChartParallelCoordinates_h
diff --git a/Charts/Core/vtkChartPie.h b/Charts/Core/vtkChartPie.h
index aaa5338f3ec0b4f83e45cb98f2f1406547295c82..219e510a56ce1044bab3ee4ee5bed83ed253b323 100644
--- a/Charts/Core/vtkChartPie.h
+++ b/Charts/Core/vtkChartPie.h
@@ -18,8 +18,8 @@
 // .SECTION Description
 // This class implements an pie chart.
 
-#ifndef __vtkChartPie_h
-#define __vtkChartPie_h
+#ifndef vtkChartPie_h
+#define vtkChartPie_h
 
 #include "vtkChartsCoreModule.h" // For export macro
 #include "vtkChart.h"
@@ -144,4 +144,4 @@ private:
 //ETX
 };
 
-#endif //__vtkChartPie_h
+#endif //vtkChartPie_h
diff --git a/Charts/Core/vtkChartSelectionHelper.h b/Charts/Core/vtkChartSelectionHelper.h
index e819a5ecde5bc1677c594e4b7faac5f68c0b0904..d20f54a0408a48cde1393784ee0fa7ecd33c8db3 100644
--- a/Charts/Core/vtkChartSelectionHelper.h
+++ b/Charts/Core/vtkChartSelectionHelper.h
@@ -21,8 +21,8 @@
 // implementations to make chart selections easier. This is intended for
 // internal use and the API should not be considered stable.
 
-#ifndef __vtkChartSelectionHelper_h
-#define __vtkChartSelectionHelper_h
+#ifndef vtkChartSelectionHelper_h
+#define vtkChartSelectionHelper_h
 
 #include "vtkNew.h"
 #include "vtkSmartPointer.h"
@@ -269,5 +269,5 @@ static int GetMouseSelectionMode(const vtkContextMouseEvent &mouse, int selectio
 
 } // End vtkChartSelectionHelper namespace
 
-#endif // __vtkChartSelectionHelper_h
+#endif // vtkChartSelectionHelper_h
 // VTK-HeaderTest-Exclude: vtkChartSelectionHelper.h
diff --git a/Charts/Core/vtkChartXY.h b/Charts/Core/vtkChartXY.h
index c063c649511198d00c0e930954c6bd1f5cfb7128..e64fa3114e326127835c6709cafae95b5f3e5419 100644
--- a/Charts/Core/vtkChartXY.h
+++ b/Charts/Core/vtkChartXY.h
@@ -21,8 +21,8 @@
 // .SECTION See Also
 // vtkBarChartActor
 
-#ifndef __vtkChartXY_h
-#define __vtkChartXY_h
+#ifndef vtkChartXY_h
+#define vtkChartXY_h
 
 #include "vtkChartsCoreModule.h" // For export macro
 #include "vtkChart.h"
@@ -348,4 +348,4 @@ struct vtkChartPlotData
   int Index;
 };
 
-#endif //__vtkChartXY_h
+#endif //vtkChartXY_h
diff --git a/Charts/Core/vtkChartXYZ.h b/Charts/Core/vtkChartXYZ.h
index f583f106e64dbb16f8c999c7a639d6a66ffdd450..52974ccb498881a1e3c4ace789cdc75f5c762830 100644
--- a/Charts/Core/vtkChartXYZ.h
+++ b/Charts/Core/vtkChartXYZ.h
@@ -17,8 +17,8 @@
 //
 // .SECTION Description
 
-#ifndef __vtkChartXYZ_h
-#define __vtkChartXYZ_h
+#ifndef vtkChartXYZ_h
+#define vtkChartXYZ_h
 
 #include "vtkChartsCoreModule.h" // For export macro
 #include "vtkContextItem.h"
diff --git a/Charts/Core/vtkColorLegend.h b/Charts/Core/vtkColorLegend.h
index 1ed0d8fc68c9a8be20a0e72697a5f2ab7e067f0e..233cb82a01779e75df6871bce85f26d2ad883eb0 100644
--- a/Charts/Core/vtkColorLegend.h
+++ b/Charts/Core/vtkColorLegend.h
@@ -18,8 +18,8 @@
 // vtkColorLegend is an item that will display the vtkScalarsToColors
 // using a 1D texture, and a vtkAxis to show both the color and numerical range.
 
-#ifndef __vtkColorLegend_h
-#define __vtkColorLegend_h
+#ifndef vtkColorLegend_h
+#define vtkColorLegend_h
 
 #include "vtkChartsCoreModule.h" // For export macro
 #include "vtkChartLegend.h"
diff --git a/Charts/Core/vtkColorTransferControlPointsItem.h b/Charts/Core/vtkColorTransferControlPointsItem.h
index bc796ff84eaa756cd094b9ee70b00cb5b646fb2e..60b918c19c91d7c4e040beaf550b7e5f7eafddbd 100644
--- a/Charts/Core/vtkColorTransferControlPointsItem.h
+++ b/Charts/Core/vtkColorTransferControlPointsItem.h
@@ -22,8 +22,8 @@
 // vtkColorTransferFunctionItem
 // vtkCompositeTransferFunctionItem
 
-#ifndef __vtkColorTransferControlPointsItem_h
-#define __vtkColorTransferControlPointsItem_h
+#ifndef vtkColorTransferControlPointsItem_h
+#define vtkColorTransferControlPointsItem_h
 
 #include "vtkChartsCoreModule.h" // For export macro
 #include "vtkControlPointsItem.h"
diff --git a/Charts/Core/vtkColorTransferFunctionItem.h b/Charts/Core/vtkColorTransferFunctionItem.h
index a86c0bb606ef01dc9d9cddcf77a25dcb25e6e7ea..02a314a88c56532093b819abeb2f00b93ac0b181 100644
--- a/Charts/Core/vtkColorTransferFunctionItem.h
+++ b/Charts/Core/vtkColorTransferFunctionItem.h
@@ -13,8 +13,8 @@
 
 =========================================================================*/
 
-#ifndef __vtkColorTransferFunctionItem_h
-#define __vtkColorTransferFunctionItem_h
+#ifndef vtkColorTransferFunctionItem_h
+#define vtkColorTransferFunctionItem_h
 
 #include "vtkChartsCoreModule.h" // For export macro
 #include "vtkScalarsToColorsItem.h"
diff --git a/Charts/Core/vtkCompositeControlPointsItem.h b/Charts/Core/vtkCompositeControlPointsItem.h
index 16ce9c02fbe061d953d901f9954df96353635cd5..b689c92f694117ed9413e0a65c85d697ffe5fa2d 100644
--- a/Charts/Core/vtkCompositeControlPointsItem.h
+++ b/Charts/Core/vtkCompositeControlPointsItem.h
@@ -24,8 +24,8 @@
 // vtkCompositeTransferFunctionItem
 // vtkPiecewisePointHandleItem
 
-#ifndef __vtkCompositeControlPointsItem_h
-#define __vtkCompositeControlPointsItem_h
+#ifndef vtkCompositeControlPointsItem_h
+#define vtkCompositeControlPointsItem_h
 
 #include "vtkChartsCoreModule.h" // For export macro
 #include "vtkColorTransferControlPointsItem.h"
diff --git a/Charts/Core/vtkCompositeTransferFunctionItem.h b/Charts/Core/vtkCompositeTransferFunctionItem.h
index a8a71321e97f0a6fcbb041728720161ec98dd49c..aac2b1256b8a943b59e76e4de2c03d12291c9bb7 100644
--- a/Charts/Core/vtkCompositeTransferFunctionItem.h
+++ b/Charts/Core/vtkCompositeTransferFunctionItem.h
@@ -13,8 +13,8 @@
 
 =========================================================================*/
 
-#ifndef __vtkCompositeTransferFunctionItem_h
-#define __vtkCompositeTransferFunctionItem_h
+#ifndef vtkCompositeTransferFunctionItem_h
+#define vtkCompositeTransferFunctionItem_h
 
 #include "vtkChartsCoreModule.h" // For export macro
 #include "vtkColorTransferFunctionItem.h"
diff --git a/Charts/Core/vtkControlPointsItem.h b/Charts/Core/vtkControlPointsItem.h
index 97d11aba8112daf88c1acb40bc18da9cd4de0440..3419e6f6639eeccdb319a4615309cecab34c5ed4 100644
--- a/Charts/Core/vtkControlPointsItem.h
+++ b/Charts/Core/vtkControlPointsItem.h
@@ -22,8 +22,8 @@
 // vtkScalarsToColorsItem
 // vtkPiecewiseControlPointsItem
 
-#ifndef __vtkControlPointsItem_h
-#define __vtkControlPointsItem_h
+#ifndef vtkControlPointsItem_h
+#define vtkControlPointsItem_h
 
 #include "vtkChartsCoreModule.h" // For export macro
 #include "vtkCommand.h" // For vtkCommand enum
diff --git a/Charts/Core/vtkLookupTableItem.h b/Charts/Core/vtkLookupTableItem.h
index ccfd56931c14eefebf360837cdefecad16452432..dbc2c5068d2f42d653b8bfda2d6f912db087db3b 100644
--- a/Charts/Core/vtkLookupTableItem.h
+++ b/Charts/Core/vtkLookupTableItem.h
@@ -13,8 +13,8 @@
 
 =========================================================================*/
 
-#ifndef __vtkLookupTableItem_h
-#define __vtkLookupTableItem_h
+#ifndef vtkLookupTableItem_h
+#define vtkLookupTableItem_h
 
 #include "vtkChartsCoreModule.h" // For export macro
 #include "vtkScalarsToColorsItem.h"
diff --git a/Charts/Core/vtkPiecewiseControlPointsItem.h b/Charts/Core/vtkPiecewiseControlPointsItem.h
index 55cd7de1627a93b4a76602b8753048f6daf76f1f..af3ed2c982800a0b319007554f50895b92d770e3 100644
--- a/Charts/Core/vtkPiecewiseControlPointsItem.h
+++ b/Charts/Core/vtkPiecewiseControlPointsItem.h
@@ -22,8 +22,8 @@
 // vtkPiecewiseFunctionItem
 // vtkCompositeTransferFunctionItem
 
-#ifndef __vtkPiecewiseControlPointsItem_h
-#define __vtkPiecewiseControlPointsItem_h
+#ifndef vtkPiecewiseControlPointsItem_h
+#define vtkPiecewiseControlPointsItem_h
 
 #include "vtkChartsCoreModule.h" // For export macro
 #include "vtkControlPointsItem.h"
diff --git a/Charts/Core/vtkPiecewiseFunctionItem.h b/Charts/Core/vtkPiecewiseFunctionItem.h
index 05eb5ada2dfc8b82e5824c4b9fa3d355b8df0be3..7e162d4bcd6224cbd5dbab3cc34a319a9b1fe70a 100644
--- a/Charts/Core/vtkPiecewiseFunctionItem.h
+++ b/Charts/Core/vtkPiecewiseFunctionItem.h
@@ -13,8 +13,8 @@
 
 =========================================================================*/
 
-#ifndef __vtkPiecewiseFunctionItem_h
-#define __vtkPiecewiseFunctionItem_h
+#ifndef vtkPiecewiseFunctionItem_h
+#define vtkPiecewiseFunctionItem_h
 
 #include "vtkChartsCoreModule.h" // For export macro
 #include "vtkScalarsToColorsItem.h"
diff --git a/Charts/Core/vtkPiecewisePointHandleItem.h b/Charts/Core/vtkPiecewisePointHandleItem.h
index 9b1920794a9ee1d09b5ceb9d765fb040f4ef169b..cfa7888545ddc8fb905f45f5e6e2ce391afbc153 100644
--- a/Charts/Core/vtkPiecewisePointHandleItem.h
+++ b/Charts/Core/vtkPiecewisePointHandleItem.h
@@ -21,8 +21,8 @@
 // handles around a given point of a piecewise function so that the curve can
 // be adjusted using these handles.
 
-#ifndef __vtkPiecewisePointHandleItem_h
-#define __vtkPiecewisePointHandleItem_h
+#ifndef vtkPiecewisePointHandleItem_h
+#define vtkPiecewisePointHandleItem_h
 
 #include "vtkChartsCoreModule.h" // For export macro
 #include "vtkContextItem.h"
@@ -106,4 +106,4 @@ private:
 //ETX
 };
 
-#endif //__vtkPiecewisePointHandleItem_h
+#endif //vtkPiecewisePointHandleItem_h
diff --git a/Charts/Core/vtkPlot.h b/Charts/Core/vtkPlot.h
index b0b9a60dc1bcebf0038d658988d046a0b3adf05d..75a39644669f1691232c885b55d5d228ffd46b7e 100644
--- a/Charts/Core/vtkPlot.h
+++ b/Charts/Core/vtkPlot.h
@@ -21,8 +21,8 @@
 // .SECTION See Also
 // vtkPlotPoints vtkPlotLine vtkPlotBar vtkChart vtkChartXY
 
-#ifndef __vtkPlot_h
-#define __vtkPlot_h
+#ifndef vtkPlot_h
+#define vtkPlot_h
 
 #include "vtkChartsCoreModule.h" // For export macro
 #include "vtkContextItem.h"
@@ -339,4 +339,4 @@ private:
 //ETX
 };
 
-#endif //__vtkPlot_h
+#endif //vtkPlot_h
diff --git a/Charts/Core/vtkPlot3D.h b/Charts/Core/vtkPlot3D.h
index 19f78cd186140c8837f493ced230c1fe624c3a65..e561a49fc1099c1fd81891deb5b3d815812b1d87 100644
--- a/Charts/Core/vtkPlot3D.h
+++ b/Charts/Core/vtkPlot3D.h
@@ -21,8 +21,8 @@
 // .SECTION See Also
 // vtkPlot3DPoints vtkPlot3DLine vtkPlot3DBar vtkChart vtkChartXY
 
-#ifndef __vtkPlot3D_h
-#define __vtkPlot3D_h
+#ifndef vtkPlot3D_h
+#define vtkPlot3D_h
 
 #include "vtkChartsCoreModule.h" // For export macro
 #include "vtkContextItem.h"
@@ -159,4 +159,4 @@ private:
 //ETX
 };
 
-#endif //__vtkPlot3D_h
+#endif //vtkPlot3D_h
diff --git a/Charts/Core/vtkPlotBag.h b/Charts/Core/vtkPlotBag.h
index 5d59dfbafd2df4c6b8fbe069993107cd2d949aee..d85f256189bda48eb0f698dd973c6dbfb721f4ee 100644
--- a/Charts/Core/vtkPlotBag.h
+++ b/Charts/Core/vtkPlotBag.h
@@ -27,8 +27,8 @@
 // .SECTION See Also
 // vtkHighestDensityRegionsStatistics
 
-#ifndef __vtkPlotBag_h
-#define __vtkPlotBag_h
+#ifndef vtkPlotBag_h
+#define vtkPlotBag_h
 
 #include "vtkChartsCoreModule.h" // For export macro
 #include "vtkPlotPoints.h"
@@ -120,4 +120,4 @@ private:
   void operator=(const vtkPlotBag &); // Not implemented.
 };
 
-#endif //__vtkPlotBag_h
+#endif //vtkPlotBag_h
diff --git a/Charts/Core/vtkPlotBar.h b/Charts/Core/vtkPlotBar.h
index 535180c95f3acd47932ddbab355bca22492e58e3..cd81eaf8b7373fcf72d161a44d513e935f3ee9df 100644
--- a/Charts/Core/vtkPlotBar.h
+++ b/Charts/Core/vtkPlotBar.h
@@ -19,8 +19,8 @@
 // .SECTION Description
 //
 
-#ifndef __vtkPlotBar_h
-#define __vtkPlotBar_h
+#ifndef vtkPlotBar_h
+#define vtkPlotBar_h
 
 #include "vtkChartsCoreModule.h" // For export macro
 #include "vtkPlot.h"
@@ -244,4 +244,4 @@ private:
 //ETX
 };
 
-#endif //__vtkPlotBar_h
+#endif //vtkPlotBar_h
diff --git a/Charts/Core/vtkPlotBox.h b/Charts/Core/vtkPlotBox.h
index 6b446da9f4976b509a29a030da8da6a8675517c6..b507d4974bea9566464f5eeb22f038a1b385f415 100644
--- a/Charts/Core/vtkPlotBox.h
+++ b/Charts/Core/vtkPlotBox.h
@@ -19,8 +19,8 @@
 // Plots to draw box plots given columns from a vtkTable that may contains
 // 5 lines with quartiles and median.
 
-#ifndef __vtkPlotBox_h
-#define __vtkPlotBox_h
+#ifndef vtkPlotBox_h
+#define vtkPlotBox_h
 
 #include "vtkChartsCoreModule.h" // For export macro
 #include "vtkPlot.h"
@@ -144,4 +144,4 @@ private:
 //ETX
 };
 
-#endif //__vtkPlotBox_h
+#endif //vtkPlotBox_h
diff --git a/Charts/Core/vtkPlotFunctionalBag.h b/Charts/Core/vtkPlotFunctionalBag.h
index 48478af9770b97f017eeec4debbdff4648f24ae9..9ce6f879f1a29adba68bd0886a1ec9e96a0c9c81 100644
--- a/Charts/Core/vtkPlotFunctionalBag.h
+++ b/Charts/Core/vtkPlotFunctionalBag.h
@@ -26,8 +26,8 @@
 // .SECTION See Also
 // vtkExtractFunctionalBagPlot
 
-#ifndef __vtkPlotFunctionalBag_h
-#define __vtkPlotFunctionalBag_h
+#ifndef vtkPlotFunctionalBag_h
+#define vtkPlotFunctionalBag_h
 
 #include "vtkChartsCoreModule.h" // For export macro
 #include "vtkPlot.h"
@@ -131,4 +131,4 @@ private:
   void operator=(const vtkPlotFunctionalBag &); // Not implemented.
 };
 
-#endif //__vtkPlotFunctionalBag_h
+#endif //vtkPlotFunctionalBag_h
diff --git a/Charts/Core/vtkPlotGrid.h b/Charts/Core/vtkPlotGrid.h
index 1fff308496128945e318a8d31345b3fd8b639b03..f683291d22984a338bf501a724690b293b69ac06 100644
--- a/Charts/Core/vtkPlotGrid.h
+++ b/Charts/Core/vtkPlotGrid.h
@@ -21,8 +21,8 @@
 // by all other elements of the chart. It builds up its own plot locations
 // from the parameters of the x and y axis of the plot.
 
-#ifndef __vtkPlotGrid_h
-#define __vtkPlotGrid_h
+#ifndef vtkPlotGrid_h
+#define vtkPlotGrid_h
 
 #include "vtkChartsCoreModule.h" // For export macro
 #include "vtkContextItem.h"
@@ -71,4 +71,4 @@ private:
 //ETX
 };
 
-#endif //__vtkPlotGrid_h
+#endif //vtkPlotGrid_h
diff --git a/Charts/Core/vtkPlotHistogram2D.h b/Charts/Core/vtkPlotHistogram2D.h
index fe03f4cb182999f783a93c69a0b7496381ac1377..3dade6e67490538b1527d6cbe711b020c8566a8e 100644
--- a/Charts/Core/vtkPlotHistogram2D.h
+++ b/Charts/Core/vtkPlotHistogram2D.h
@@ -18,8 +18,8 @@
 // .SECTION Description
 //
 
-#ifndef __vtk2DHistogramItem_h
-#define __vtk2DHistogramItem_h
+#ifndef vtk2DHistogramItem_h
+#define vtk2DHistogramItem_h
 
 #include "vtkChartsCoreModule.h" // For export macro
 #include "vtkPlot.h"
@@ -128,4 +128,4 @@ private:
 //ETX
 };
 
-#endif //__vtk2DHistogramItem_h
+#endif //vtk2DHistogramItem_h
diff --git a/Charts/Core/vtkPlotLine.h b/Charts/Core/vtkPlotLine.h
index 0ccc3254b62caf3937c13c5ceb43ab155f3d5f3c..57118357234cb42af5d963f801c286f87cfcc9d3 100644
--- a/Charts/Core/vtkPlotLine.h
+++ b/Charts/Core/vtkPlotLine.h
@@ -19,8 +19,8 @@
 // .SECTION Description
 //
 
-#ifndef __vtkPlotLine_h
-#define __vtkPlotLine_h
+#ifndef vtkPlotLine_h
+#define vtkPlotLine_h
 
 #include "vtkChartsCoreModule.h" // For export macro
 #include "vtkPlotPoints.h"
@@ -59,4 +59,4 @@ private:
 //ETX
 };
 
-#endif //__vtkPlotLine_h
+#endif //vtkPlotLine_h
diff --git a/Charts/Core/vtkPlotLine3D.h b/Charts/Core/vtkPlotLine3D.h
index bc4d4e3c8474ecc8c779bc6603c4140c9169b514..090e2808c4e224ed27a162c9ab24af0538524ef7 100644
--- a/Charts/Core/vtkPlotLine3D.h
+++ b/Charts/Core/vtkPlotLine3D.h
@@ -25,8 +25,8 @@
 // vtkPlotLine
 //
 
-#ifndef __vtkPlotLine3D_h
-#define __vtkPlotLine3D_h
+#ifndef vtkPlotLine3D_h
+#define vtkPlotLine3D_h
 
 #include "vtkChartsCoreModule.h" // For export macro
 #include "vtkPlotPoints3D.h"
@@ -57,4 +57,4 @@ private:
 //ETX
 };
 
-#endif //__vtkPlotLine3D_h
+#endif //vtkPlotLine3D_h
diff --git a/Charts/Core/vtkPlotParallelCoordinates.h b/Charts/Core/vtkPlotParallelCoordinates.h
index ce057e1d59176ec1d5d831185b648abf36e8d3ed..d23e3b71532b37072e3dd462b726812de3fd9587 100644
--- a/Charts/Core/vtkPlotParallelCoordinates.h
+++ b/Charts/Core/vtkPlotParallelCoordinates.h
@@ -19,8 +19,8 @@
 // .SECTION Description
 //
 
-#ifndef __vtkPlotParallelCoordinates_h
-#define __vtkPlotParallelCoordinates_h
+#ifndef vtkPlotParallelCoordinates_h
+#define vtkPlotParallelCoordinates_h
 
 #include "vtkChartsCoreModule.h" // For export macro
 #include "vtkPlot.h"
@@ -141,4 +141,4 @@ private:
 //ETX
 };
 
-#endif //__vtkPlotParallelCoordinates_h
+#endif //vtkPlotParallelCoordinates_h
diff --git a/Charts/Core/vtkPlotPie.h b/Charts/Core/vtkPlotPie.h
index 8e6d2ba4fb60685830355c40ce1d80975b8158b3..520dcf387a7275b6533fcb90050e0db9617aae9c 100644
--- a/Charts/Core/vtkPlotPie.h
+++ b/Charts/Core/vtkPlotPie.h
@@ -17,8 +17,8 @@
 //
 // .SECTION Description
 
-#ifndef __vtkPlotPie_h
-#define __vtkPlotPie_h
+#ifndef vtkPlotPie_h
+#define vtkPlotPie_h
 
 #include "vtkChartsCoreModule.h" // For export macro
 #include "vtkPlot.h"
@@ -111,4 +111,4 @@ private:
 //ETX
 };
 
-#endif //__vtkPlotPie_h
+#endif //vtkPlotPie_h
diff --git a/Charts/Core/vtkPlotPoints.h b/Charts/Core/vtkPlotPoints.h
index 0fbb72c4567f4d7be15579cda5d176fa3b1d390f..8a018796f864a620f09b359a10a3dcaf0bf17bce 100644
--- a/Charts/Core/vtkPlotPoints.h
+++ b/Charts/Core/vtkPlotPoints.h
@@ -24,8 +24,8 @@
 // .SECTION See Also
 // vtkPlotLine
 
-#ifndef __vtkPlotPoints_h
-#define __vtkPlotPoints_h
+#ifndef vtkPlotPoints_h
+#define vtkPlotPoints_h
 
 #include "vtkChartsCoreModule.h" // For export macro
 #include "vtkPlot.h"
@@ -244,4 +244,4 @@ private:
 //ETX
 };
 
-#endif //__vtkPlotPoints_h
+#endif //vtkPlotPoints_h
diff --git a/Charts/Core/vtkPlotPoints3D.h b/Charts/Core/vtkPlotPoints3D.h
index a5ab78f1826222d906629c865c95190f49a4ce63..9dbeb7bdaca1861fb2267f3d135591b6da88ad96 100644
--- a/Charts/Core/vtkPlotPoints3D.h
+++ b/Charts/Core/vtkPlotPoints3D.h
@@ -23,8 +23,8 @@
 // vtkPlotPoints
 //
 
-#ifndef __vtkPlotPoints3D_h
-#define __vtkPlotPoints3D_h
+#ifndef vtkPlotPoints3D_h
+#define vtkPlotPoints3D_h
 
 #include "vtkChartsCoreModule.h" // For export macro
 #include "vtkPlot3D.h"
@@ -64,4 +64,4 @@ private:
 
 };
 
-#endif //__vtkPlotPoints3D_h
+#endif //vtkPlotPoints3D_h
diff --git a/Charts/Core/vtkPlotStacked.h b/Charts/Core/vtkPlotStacked.h
index 36b6d4d1732dc8b7ea7219981308512cecd94bc6..77702fbfac285499d0e5710c0cf6164bf81a6860 100644
--- a/Charts/Core/vtkPlotStacked.h
+++ b/Charts/Core/vtkPlotStacked.h
@@ -19,8 +19,8 @@
 // .SECTION Description
 //
 
-#ifndef __vtkPlotStacked_h
-#define __vtkPlotStacked_h
+#ifndef vtkPlotStacked_h
+#define vtkPlotStacked_h
 
 #include "vtkChartsCoreModule.h" // For export macro
 #include "vtkPlot.h"
@@ -156,4 +156,4 @@ private:
 //ETX
 };
 
-#endif //__vtkPlotStacked_h
+#endif //vtkPlotStacked_h
diff --git a/Charts/Core/vtkPlotSurface.h b/Charts/Core/vtkPlotSurface.h
index 9179b52a4c16a9f9875bd761043e101fb302e847..f343e48991910ca469ec2f4490450c5c87a2adf0 100644
--- a/Charts/Core/vtkPlotSurface.h
+++ b/Charts/Core/vtkPlotSurface.h
@@ -19,8 +19,8 @@
 // 3D surface plot.
 //
 
-#ifndef __vtkPlotSurface_h
-#define __vtkPlotSurface_h
+#ifndef vtkPlotSurface_h
+#define vtkPlotSurface_h
 
 #include "vtkChartsCoreModule.h" // For export macro
 #include "vtkNew.h"              //  For vtkNew ivar
@@ -149,4 +149,4 @@ private:
 //ETX
 };
 
-#endif //__vtkPlotSurface_h
+#endif //vtkPlotSurface_h
diff --git a/Charts/Core/vtkScalarsToColorsItem.h b/Charts/Core/vtkScalarsToColorsItem.h
index ba1ae2e18d7f4b4b3619e1be7033985850e3ed9e..edb85769f5aa33f45a425425a7aa3eabdea7f13d 100644
--- a/Charts/Core/vtkScalarsToColorsItem.h
+++ b/Charts/Core/vtkScalarsToColorsItem.h
@@ -24,8 +24,8 @@
 // vtkCompositeTransferFunctionItem
 // vtkPiecewiseItemFunctionItem
 
-#ifndef __vtkScalarsToColorsItem_h
-#define __vtkScalarsToColorsItem_h
+#ifndef vtkScalarsToColorsItem_h
+#define vtkScalarsToColorsItem_h
 
 #include "vtkChartsCoreModule.h" // For export macro
 #include "vtkPlot.h"
diff --git a/Charts/Core/vtkScatterPlotMatrix.h b/Charts/Core/vtkScatterPlotMatrix.h
index 174cad30745d1cf04b63f94cd0a58a129328a4d8..3f1d5e098efd0908157f81672539cbd947d82eb8 100644
--- a/Charts/Core/vtkScatterPlotMatrix.h
+++ b/Charts/Core/vtkScatterPlotMatrix.h
@@ -20,8 +20,8 @@
 // vtkChartXY by default, but this can be overridden. The class will manage
 // their layout and object lifetime.
 
-#ifndef __vtkScatterPlotMatrix_h
-#define __vtkScatterPlotMatrix_h
+#ifndef vtkScatterPlotMatrix_h
+#define vtkScatterPlotMatrix_h
 
 #include "vtkChartsCoreModule.h" // For export macro
 #include "vtkChartMatrix.h"
@@ -387,4 +387,4 @@ private:
                         const vtkStdString &y);
 };
 
-#endif //__vtkScatterPlotMatrix_h
+#endif //vtkScatterPlotMatrix_h
diff --git a/Common/Color/vtkColorSeries.h b/Common/Color/vtkColorSeries.h
index e585f12ef64a0e0e8015a6ae4a7494625b209705..43ce226a4273dc54ba2bbe57a098fd1640edbe63 100644
--- a/Common/Color/vtkColorSeries.h
+++ b/Common/Color/vtkColorSeries.h
@@ -35,8 +35,8 @@
 // Cynthia A. Brewer (Dept. of Geography, Pennsylvania State University)
 // and present under the Apache License. See the source code for details.
 
-#ifndef __vtkColorSeries_h
-#define __vtkColorSeries_h
+#ifndef vtkColorSeries_h
+#define vtkColorSeries_h
 
 #include "vtkCommonColorModule.h" // For export macro
 #include "vtkObject.h"
@@ -319,4 +319,4 @@ private:
 //ETX
 };
 
-#endif //__vtkColorSeries_h
+#endif //vtkColorSeries_h
diff --git a/Common/Color/vtkNamedColors.h b/Common/Color/vtkNamedColors.h
index 4f593eaea9b7b53cd5993d7de71d45c7580b1913..747412b5ef588d3b1b2a7cfc95cfb79c148ddeb4 100644
--- a/Common/Color/vtkNamedColors.h
+++ b/Common/Color/vtkNamedColors.h
@@ -63,8 +63,8 @@
 // - rgba(r, g, b, a)      (where r, g, b, are in 0..255 or percentage values, a is in 0.0..1.0)
 // - a CSS3 color name     (e.g. "steelblue")
 
-#ifndef __vtkNamedColors_h
-#define __vtkNamedColors_h
+#ifndef vtkNamedColors_h
+#define vtkNamedColors_h
 
 #include "vtkCommonColorModule.h" // For export macro
 #include "vtkObject.h"
@@ -364,4 +364,4 @@ private:
   void operator=(const vtkNamedColors&);  // Not implemented.
 };
 
-#endif /* __vtkNamedColors_h */
+#endif /* vtkNamedColors_h */
diff --git a/Common/ComputationalGeometry/vtkCardinalSpline.h b/Common/ComputationalGeometry/vtkCardinalSpline.h
index 41393ceb973146eb605f49dffe4b0e060cd8f4f2..eaeb37ec53cf72106c131cbdd0ea4c491c501780 100644
--- a/Common/ComputationalGeometry/vtkCardinalSpline.h
+++ b/Common/ComputationalGeometry/vtkCardinalSpline.h
@@ -23,8 +23,8 @@
 // vtkSpline vtkKochanekSpline
 
 
-#ifndef __vtkCardinalSpline_h
-#define __vtkCardinalSpline_h
+#ifndef vtkCardinalSpline_h
+#define vtkCardinalSpline_h
 
 #include "vtkCommonComputationalGeometryModule.h" // For export macro
 #include "vtkSpline.h"
diff --git a/Common/ComputationalGeometry/vtkKochanekSpline.h b/Common/ComputationalGeometry/vtkKochanekSpline.h
index 3b1f98df571c5cb3fe44f6714fa12960628f0b36..3253d4bb98f98b9cf6aee035973ee58e83065846 100644
--- a/Common/ComputationalGeometry/vtkKochanekSpline.h
+++ b/Common/ComputationalGeometry/vtkKochanekSpline.h
@@ -40,8 +40,8 @@
 // vtkSpline vtkCardinalSpline
 
 
-#ifndef __vtkKochanekSpline_h
-#define __vtkKochanekSpline_h
+#ifndef vtkKochanekSpline_h
+#define vtkKochanekSpline_h
 
 #include "vtkCommonComputationalGeometryModule.h" // For export macro
 #include "vtkSpline.h"
diff --git a/Common/ComputationalGeometry/vtkParametricBoy.h b/Common/ComputationalGeometry/vtkParametricBoy.h
index ec9a7a60e5ad814c5b340e1db103eeac831a3bdd..014481ae138f0daa940e24459f7c31432062b4bc 100644
--- a/Common/ComputationalGeometry/vtkParametricBoy.h
+++ b/Common/ComputationalGeometry/vtkParametricBoy.h
@@ -26,8 +26,8 @@
 // Andrew Maclean andrew.amaclean@gmail.com for creating and contributing the
 // class.
 //
-#ifndef __vtkParametricBoy_h
-#define __vtkParametricBoy_h
+#ifndef vtkParametricBoy_h
+#define vtkParametricBoy_h
 
 #include "vtkCommonComputationalGeometryModule.h" // For export macro
 #include "vtkParametricFunction.h"
diff --git a/Common/ComputationalGeometry/vtkParametricConicSpiral.h b/Common/ComputationalGeometry/vtkParametricConicSpiral.h
index 5c19a357ab57a662c4baab2c16c7963d98bac411..464da112885aff0113bccc56942ec4d81adbf169 100644
--- a/Common/ComputationalGeometry/vtkParametricConicSpiral.h
+++ b/Common/ComputationalGeometry/vtkParametricConicSpiral.h
@@ -25,8 +25,8 @@
 // Andrew Maclean andrew.amaclean@gmail.com for creating and contributing the
 // class.
 //
-#ifndef __vtkParametricConicSpiral_h
-#define __vtkParametricConicSpiral_h
+#ifndef vtkParametricConicSpiral_h
+#define vtkParametricConicSpiral_h
 
 #include "vtkCommonComputationalGeometryModule.h" // For export macro
 #include "vtkParametricFunction.h"
diff --git a/Common/ComputationalGeometry/vtkParametricCrossCap.h b/Common/ComputationalGeometry/vtkParametricCrossCap.h
index ee90254e3f583fa9a7d416ab9cd6090ac560207f..db9bf010f373aab47664f3f13e658f23dea62dcf 100644
--- a/Common/ComputationalGeometry/vtkParametricCrossCap.h
+++ b/Common/ComputationalGeometry/vtkParametricCrossCap.h
@@ -26,8 +26,8 @@
 // Andrew Maclean andrew.amaclean@gmail.com for creating and contributing the
 // class.
 //
-#ifndef __vtkParametricCrossCap_h
-#define __vtkParametricCrossCap_h
+#ifndef vtkParametricCrossCap_h
+#define vtkParametricCrossCap_h
 
 #include "vtkCommonComputationalGeometryModule.h" // For export macro
 #include "vtkParametricFunction.h"
diff --git a/Common/ComputationalGeometry/vtkParametricDini.h b/Common/ComputationalGeometry/vtkParametricDini.h
index 9861fb7ee90ab52be63941b36967dedee16aa205..81060758f036aa8a2829b9817f221105791a6588 100644
--- a/Common/ComputationalGeometry/vtkParametricDini.h
+++ b/Common/ComputationalGeometry/vtkParametricDini.h
@@ -26,8 +26,8 @@
 // Andrew Maclean andrew.amaclean@gmail.com for creating and contributing the
 // class.
 //
-#ifndef __vtkParametricDini_h
-#define __vtkParametricDini_h
+#ifndef vtkParametricDini_h
+#define vtkParametricDini_h
 
 #include "vtkCommonComputationalGeometryModule.h" // For export macro
 #include "vtkParametricFunction.h"
diff --git a/Common/ComputationalGeometry/vtkParametricEllipsoid.h b/Common/ComputationalGeometry/vtkParametricEllipsoid.h
index 08869af089d848e326dce9fc112974e1bf0a4f9f..4da0031dddad7aad019699163f66e72ccfc1dd11 100644
--- a/Common/ComputationalGeometry/vtkParametricEllipsoid.h
+++ b/Common/ComputationalGeometry/vtkParametricEllipsoid.h
@@ -29,8 +29,8 @@
 // Andrew Maclean andrew.amaclean@gmail.com for creating and contributing the
 // class.
 //
-#ifndef __vtkParametricEllipsoid_h
-#define __vtkParametricEllipsoid_h
+#ifndef vtkParametricEllipsoid_h
+#define vtkParametricEllipsoid_h
 
 #include "vtkCommonComputationalGeometryModule.h" // For export macro
 #include "vtkParametricFunction.h"
diff --git a/Common/ComputationalGeometry/vtkParametricEnneper.h b/Common/ComputationalGeometry/vtkParametricEnneper.h
index 8d76b61321244ca497cee788578cc0cd4c89b4aa..dc075a8191f9847e5db2b26cef0b524c32341327 100644
--- a/Common/ComputationalGeometry/vtkParametricEnneper.h
+++ b/Common/ComputationalGeometry/vtkParametricEnneper.h
@@ -26,8 +26,8 @@
 // Andrew Maclean andrew.amaclean@gmail.com for creating and contributing the
 // class.
 //
-#ifndef __vtkParametricEnneper_h
-#define __vtkParametricEnneper_h
+#ifndef vtkParametricEnneper_h
+#define vtkParametricEnneper_h
 
 #include "vtkCommonComputationalGeometryModule.h" // For export macro
 #include "vtkParametricFunction.h"
diff --git a/Common/ComputationalGeometry/vtkParametricFigure8Klein.h b/Common/ComputationalGeometry/vtkParametricFigure8Klein.h
index d7d45d69dacb0287efd4d8cc90ca66b660fda64f..09910c8c495e9da9bea023e171f6f1e5045ac255 100644
--- a/Common/ComputationalGeometry/vtkParametricFigure8Klein.h
+++ b/Common/ComputationalGeometry/vtkParametricFigure8Klein.h
@@ -33,8 +33,8 @@
 // Andrew Maclean andrew.amaclean@gmail.com for creating and contributing the
 // class.
 //
-#ifndef __vtkParametricFigure8Klein_h
-#define __vtkParametricFigure8Klein_h
+#ifndef vtkParametricFigure8Klein_h
+#define vtkParametricFigure8Klein_h
 
 #include "vtkCommonComputationalGeometryModule.h" // For export macro
 #include "vtkParametricFunction.h"
diff --git a/Common/ComputationalGeometry/vtkParametricFunction.h b/Common/ComputationalGeometry/vtkParametricFunction.h
index 37899cb6d0c05625b2c838d256c46788bc2d24b8..840df8a1886b4f89ca15ca3f59c00af2b9ef1117 100644
--- a/Common/ComputationalGeometry/vtkParametricFunction.h
+++ b/Common/ComputationalGeometry/vtkParametricFunction.h
@@ -47,8 +47,8 @@
 // vtkParametricEnneper vtkParametricRandomHills vtkParametricSuperEllipsoid
 // vtkParametricSuperToroid vtkParametricTorus
 //
-#ifndef __vtkParametricFunction_h
-#define __vtkParametricFunction_h
+#ifndef vtkParametricFunction_h
+#define vtkParametricFunction_h
 
 #include "vtkCommonComputationalGeometryModule.h" // For export macro
 #include "vtkObject.h"
diff --git a/Common/ComputationalGeometry/vtkParametricKlein.h b/Common/ComputationalGeometry/vtkParametricKlein.h
index 3e5a915a48f47b08afdb4ddc13a2ee46bd03715a..632eea1fd33a6f28aed9f31b6455a905d016443c 100644
--- a/Common/ComputationalGeometry/vtkParametricKlein.h
+++ b/Common/ComputationalGeometry/vtkParametricKlein.h
@@ -33,8 +33,8 @@
 // Andrew Maclean andrew.amaclean@gmail.com for creating and contributing the
 // class.
 //
-#ifndef __vtkParametricKlein_h
-#define __vtkParametricKlein_h
+#ifndef vtkParametricKlein_h
+#define vtkParametricKlein_h
 
 #include "vtkCommonComputationalGeometryModule.h" // For export macro
 #include "vtkParametricFunction.h"
diff --git a/Common/ComputationalGeometry/vtkParametricMobius.h b/Common/ComputationalGeometry/vtkParametricMobius.h
index e8047e33cd563a542d36c475508fb36f79622c1d..4b2df9e57b8640549a06ff991155e4705cf72f90 100644
--- a/Common/ComputationalGeometry/vtkParametricMobius.h
+++ b/Common/ComputationalGeometry/vtkParametricMobius.h
@@ -24,8 +24,8 @@
 // Andrew Maclean andrew.amaclean@gmail.com for creating and contributing the
 // class.
 //
-#ifndef __vtkParametricMobius_h
-#define __vtkParametricMobius_h
+#ifndef vtkParametricMobius_h
+#define vtkParametricMobius_h
 
 #include "vtkCommonComputationalGeometryModule.h" // For export macro
 #include "vtkParametricFunction.h"
diff --git a/Common/ComputationalGeometry/vtkParametricRandomHills.h b/Common/ComputationalGeometry/vtkParametricRandomHills.h
index 0f02fd4ea630138b31014a221e3250fb17d7ddaa..2d51a9af529e4301595dea7539c220bac0212702 100644
--- a/Common/ComputationalGeometry/vtkParametricRandomHills.h
+++ b/Common/ComputationalGeometry/vtkParametricRandomHills.h
@@ -28,8 +28,8 @@
 // Andrew Maclean andrew.amaclean@gmail.com for creating and contributing the
 // class.
 //
-#ifndef __vtkParametricRandomHills_h
-#define __vtkParametricRandomHills_h
+#ifndef vtkParametricRandomHills_h
+#define vtkParametricRandomHills_h
 
 #include "vtkCommonComputationalGeometryModule.h" // For export macro
 #include "vtkParametricFunction.h"
diff --git a/Common/ComputationalGeometry/vtkParametricRoman.h b/Common/ComputationalGeometry/vtkParametricRoman.h
index ce1c5e1d0519ce20cd027f4a82611047cb2391ab..c3e8f87aeffdf030996ea8b19da3838181b453b7 100644
--- a/Common/ComputationalGeometry/vtkParametricRoman.h
+++ b/Common/ComputationalGeometry/vtkParametricRoman.h
@@ -24,8 +24,8 @@
 // Andrew Maclean andrew.amaclean@gmail.com for creating and contributing the
 // class.
 //
-#ifndef __vtkParametricRoman_h
-#define __vtkParametricRoman_h
+#ifndef vtkParametricRoman_h
+#define vtkParametricRoman_h
 
 #include "vtkCommonComputationalGeometryModule.h" // For export macro
 #include "vtkParametricFunction.h"
diff --git a/Common/ComputationalGeometry/vtkParametricSpline.h b/Common/ComputationalGeometry/vtkParametricSpline.h
index b9b82de2611b9df5c432fa78c392dc32917b080f..554fed934c63ed2a5169ce876c92e755d7d11f70 100644
--- a/Common/ComputationalGeometry/vtkParametricSpline.h
+++ b/Common/ComputationalGeometry/vtkParametricSpline.h
@@ -32,8 +32,8 @@
 // .SECTION See Also
 // vtkSpline vtkKochanekSpline vtkCardinalSpline
 
-#ifndef __vtkParametricSpline_h
-#define __vtkParametricSpline_h
+#ifndef vtkParametricSpline_h
+#define vtkParametricSpline_h
 
 class vtkSpline;
 class vtkPoints;
diff --git a/Common/ComputationalGeometry/vtkParametricSuperEllipsoid.h b/Common/ComputationalGeometry/vtkParametricSuperEllipsoid.h
index ee8114b14acdddc2ebf6e1241ebf34b37ef011c2..61a536f370cd443dc8a3c5f4a38ea17af9a7dc4f 100644
--- a/Common/ComputationalGeometry/vtkParametricSuperEllipsoid.h
+++ b/Common/ComputationalGeometry/vtkParametricSuperEllipsoid.h
@@ -33,8 +33,8 @@
 // Andrew Maclean andrew.amaclean@gmail.com for creating and contributing the
 // class.
 //
-#ifndef __vtkParametricSuperEllipsoid_h
-#define __vtkParametricSuperEllipsoid_h
+#ifndef vtkParametricSuperEllipsoid_h
+#define vtkParametricSuperEllipsoid_h
 
 #include "vtkCommonComputationalGeometryModule.h" // For export macro
 #include "vtkParametricFunction.h"
diff --git a/Common/ComputationalGeometry/vtkParametricSuperToroid.h b/Common/ComputationalGeometry/vtkParametricSuperToroid.h
index bd9e7fed7916fe744fcaf1c716797b7821059867..e858361a14131bb2115279ef4ab9a5cf27b99819 100644
--- a/Common/ComputationalGeometry/vtkParametricSuperToroid.h
+++ b/Common/ComputationalGeometry/vtkParametricSuperToroid.h
@@ -37,8 +37,8 @@
 // Andrew Maclean andrew.amaclean@gmail.com for creating and contributing the
 // class.
 //
-#ifndef __vtkParametricSuperToroid_h
-#define __vtkParametricSuperToroid_h
+#ifndef vtkParametricSuperToroid_h
+#define vtkParametricSuperToroid_h
 
 #include "vtkCommonComputationalGeometryModule.h" // For export macro
 #include "vtkParametricFunction.h"
diff --git a/Common/ComputationalGeometry/vtkParametricTorus.h b/Common/ComputationalGeometry/vtkParametricTorus.h
index 062c0885c753317db78acb1a6d1c047a3e3fbd0e..bfc0dc726bb528ce3fafd9147ef6a6a34b743036 100644
--- a/Common/ComputationalGeometry/vtkParametricTorus.h
+++ b/Common/ComputationalGeometry/vtkParametricTorus.h
@@ -24,8 +24,8 @@
 // Andrew Maclean andrew.amaclean@gmail.com for creating and contributing the
 // class.
 //
-#ifndef __vtkParametricTorus_h
-#define __vtkParametricTorus_h
+#ifndef vtkParametricTorus_h
+#define vtkParametricTorus_h
 
 #include "vtkCommonComputationalGeometryModule.h" // For export macro
 #include "vtkParametricFunction.h"
diff --git a/Common/Core/Testing/Cxx/vtkTestNewVar.h b/Common/Core/Testing/Cxx/vtkTestNewVar.h
index f1c3cb3cd7fb95767d5a44a875b7c0c8229306a8..2682f9fe0075c9017ce36b7e66c135af6247e610 100644
--- a/Common/Core/Testing/Cxx/vtkTestNewVar.h
+++ b/Common/Core/Testing/Cxx/vtkTestNewVar.h
@@ -16,8 +16,8 @@
 // .SECTION Description
 // Tests instantiations of the vtkNew class template.
 
-#ifndef __vtkTestNewVar_h
-#define __vtkTestNewVar_h
+#ifndef vtkTestNewVar_h
+#define vtkTestNewVar_h
 
 #include "vtkObject.h"
 #include "vtkNew.h"
diff --git a/Common/Core/vtkABI.h b/Common/Core/vtkABI.h
index 92226e457f8a62fca4d47780034659adab4c6841..d6bb4f9437a9d9c1eea7858f67c8c6654a2fef81 100644
--- a/Common/Core/vtkABI.h
+++ b/Common/Core/vtkABI.h
@@ -39,8 +39,8 @@
 // added in GCC 4.0. Currently hidden is not used, but it can be used to
 // explicitly hide symbols from external linkage.
 
-#ifndef __vtkABI_h
-#define __vtkABI_h
+#ifndef vtkABI_h
+#define vtkABI_h
 
 #if defined(_WIN32)
 # define VTK_ABI_IMPORT __declspec(dllimport)
@@ -56,5 +56,5 @@
 # define VTK_ABI_HIDDEN
 #endif
 
-#endif // __vtkABI_h
+#endif // vtkABI_h
 // VTK-HeaderTest-Exclude: vtkABI.h
diff --git a/Common/Core/vtkAbstractArray.h b/Common/Core/vtkAbstractArray.h
index 02bd28ec579f06f30468c68695340b4eab781d1f..45ae1537d1dbd9ed12cb2c2b14d15a5f7cec7cf7 100644
--- a/Common/Core/vtkAbstractArray.h
+++ b/Common/Core/vtkAbstractArray.h
@@ -38,8 +38,8 @@
 // .SECTION See Also
 // vtkDataArray vtkStringArray vtkCellArray
 
-#ifndef __vtkAbstractArray_h
-#define __vtkAbstractArray_h
+#ifndef vtkAbstractArray_h
+#define vtkAbstractArray_h
 
 #include "vtkCommonCoreModule.h" // For export macro
 #include "vtkObject.h"
diff --git a/Common/Core/vtkAndroidOutputWindow.h b/Common/Core/vtkAndroidOutputWindow.h
index 950140b451e1094e1f807fb66c47e3c82d8b03fb..b3f9d1e6c1d5805e4bc4bde0c77020f568712634 100644
--- a/Common/Core/vtkAndroidOutputWindow.h
+++ b/Common/Core/vtkAndroidOutputWindow.h
@@ -22,8 +22,8 @@
 // the vtkObject::GlobalWarningDisplayOff() function is called.  The
 // window is created the next time text is written to the window.
 
-#ifndef __vtkAndroidOutputWindow_h
-#define __vtkAndroidOutputWindow_h
+#ifndef vtkAndroidOutputWindow_h
+#define vtkAndroidOutputWindow_h
 
 #include "vtkCommonCoreModule.h" // For export macro
 #include "vtkOutputWindow.h"
diff --git a/Common/Core/vtkAnimationCue.h b/Common/Core/vtkAnimationCue.h
index f6b522c053d4ec29780a30f004dab75e8db4dcc0..57d29c781582265eb1d703f945087c5ba1fa89a0 100644
--- a/Common/Core/vtkAnimationCue.h
+++ b/Common/Core/vtkAnimationCue.h
@@ -32,8 +32,8 @@
 // .SECTION See Also
 // vtkAnimationScene
 
-#ifndef __vtkAnimationCue_h
-#define __vtkAnimationCue_h
+#ifndef vtkAnimationCue_h
+#define vtkAnimationCue_h
 
 #include "vtkCommonCoreModule.h" // For export macro
 #include "vtkObject.h"
diff --git a/Common/Core/vtkArray.h b/Common/Core/vtkArray.h
index f0fb291fedfd17b34a9d7172ee26bfae2319612d..1f7e39ccd37311cd483953445ec16806ec8a75c2 100644
--- a/Common/Core/vtkArray.h
+++ b/Common/Core/vtkArray.h
@@ -48,8 +48,8 @@
 // Developed by Timothy M. Shead (tshead@sandia.gov) at  Sandia National
 // Laboratories.
 
-#ifndef __vtkArray_h
-#define __vtkArray_h
+#ifndef vtkArray_h
+#define vtkArray_h
 
 #include "vtkCommonCoreModule.h" // For export macro
 #include "vtkArrayCoordinates.h"
diff --git a/Common/Core/vtkArrayCoordinates.h b/Common/Core/vtkArrayCoordinates.h
index 09f9c3f293e7e29e5009107e91c28f2accb9eaa8..373eab66c337f9de858ffc92ed59bedb9dfa4a5e 100644
--- a/Common/Core/vtkArrayCoordinates.h
+++ b/Common/Core/vtkArrayCoordinates.h
@@ -38,8 +38,8 @@
 // Developed by Timothy M. Shead (tshead@sandia.gov) at Sandia National
 // Laboratories.
 
-#ifndef __vtkArrayCoordinates_h
-#define __vtkArrayCoordinates_h
+#ifndef vtkArrayCoordinates_h
+#define vtkArrayCoordinates_h
 
 #include "vtkCommonCoreModule.h" // For export macro
 #include "vtkSystemIncludes.h"
diff --git a/Common/Core/vtkArrayExtents.h b/Common/Core/vtkArrayExtents.h
index 748ce84c957cbe645449150e9c3ef97fd8e3d5ef..403eab34a2f91eadedf6966d85a538250a28f188 100644
--- a/Common/Core/vtkArrayExtents.h
+++ b/Common/Core/vtkArrayExtents.h
@@ -54,8 +54,8 @@
 // Developed by Timothy M. Shead (tshead@sandia.gov) at Sandia National
 // Laboratories.
 
-#ifndef __vtkArrayExtents_h
-#define __vtkArrayExtents_h
+#ifndef vtkArrayExtents_h
+#define vtkArrayExtents_h
 
 #include "vtkCommonCoreModule.h" // For export macro
 #include "vtkSystemIncludes.h"
diff --git a/Common/Core/vtkArrayExtentsList.h b/Common/Core/vtkArrayExtentsList.h
index c1141265d61d0621bbf598ea0c69f0ae894ce0a9..4fef84a4ad7ad4ed43967ced70cef0d71e6d9160 100644
--- a/Common/Core/vtkArrayExtentsList.h
+++ b/Common/Core/vtkArrayExtentsList.h
@@ -38,8 +38,8 @@
 // Developed by Timothy M. Shead (tshead@sandia.gov) at Sandia National
 // Laboratories.
 
-#ifndef __vtkArrayExtentsList_h
-#define __vtkArrayExtentsList_h
+#ifndef vtkArrayExtentsList_h
+#define vtkArrayExtentsList_h
 
 #include "vtkCommonCoreModule.h" // For export macro
 #include "vtkArrayExtents.h"
diff --git a/Common/Core/vtkArrayInterpolate.h b/Common/Core/vtkArrayInterpolate.h
index 43ae2cbc53904e0ce0fb39f95b4b7589648b7c04..8f51e8a68aeb8d85a8929be3f553187a4848f001 100644
--- a/Common/Core/vtkArrayInterpolate.h
+++ b/Common/Core/vtkArrayInterpolate.h
@@ -39,8 +39,8 @@
 // Developed by Timothy M. Shead (tshead@sandia.gov) at Sandia National
 // Laboratories.
 
-#ifndef __vtkArrayInterpolate_h
-#define __vtkArrayInterpolate_h
+#ifndef vtkArrayInterpolate_h
+#define vtkArrayInterpolate_h
 
 #include "vtkTypedArray.h"
 
diff --git a/Common/Core/vtkArrayIterator.h b/Common/Core/vtkArrayIterator.h
index 2fa1c92bbdb2cb7bfd065f51c2a33d8acbb6c8de..b15ee7c44f10ad49d6813c00c522223089305153 100644
--- a/Common/Core/vtkArrayIterator.h
+++ b/Common/Core/vtkArrayIterator.h
@@ -37,8 +37,8 @@
 // iter->Delete();
 // \endcode
 
-#ifndef __vtkArrayIterator_h
-#define __vtkArrayIterator_h
+#ifndef vtkArrayIterator_h
+#define vtkArrayIterator_h
 
 #include "vtkCommonCoreModule.h" // For export macro
 #include "vtkObject.h"
diff --git a/Common/Core/vtkArrayIteratorIncludes.h b/Common/Core/vtkArrayIteratorIncludes.h
index 3371e367e466b45007381c9aac138b239f116225..dfd8887018e8434798283a6c715c6c5a20b09a9d 100644
--- a/Common/Core/vtkArrayIteratorIncludes.h
+++ b/Common/Core/vtkArrayIteratorIncludes.h
@@ -28,8 +28,8 @@
 // vtkArrayIteratorTemplateMacro updated, one needs to update this header
 // file alone.
 
-#ifndef __vtkArrayIteratorIncludes_h
-#define __vtkArrayIteratorIncludes_h
+#ifndef vtkArrayIteratorIncludes_h
+#define vtkArrayIteratorIncludes_h
 
 // Iterators.
 #include "vtkArrayIteratorTemplate.h"
diff --git a/Common/Core/vtkArrayIteratorTemplate.h b/Common/Core/vtkArrayIteratorTemplate.h
index cb79fa5cfd68033c5ffaf59b986e100704c467bd..275c9ecb828b85d88317d08ade43801c46360958 100644
--- a/Common/Core/vtkArrayIteratorTemplate.h
+++ b/Common/Core/vtkArrayIteratorTemplate.h
@@ -20,8 +20,8 @@
 // with arrays that have a contiguous internal storage of values (as in
 // vtkDataArray, vtkStringArray).
 
-#ifndef __vtkArrayIteratorTemplate_h
-#define __vtkArrayIteratorTemplate_h
+#ifndef vtkArrayIteratorTemplate_h
+#define vtkArrayIteratorTemplate_h
 
 #include "vtkCommonCoreModule.h" // For export macro
 #include "vtkTypeTemplate.h" // For templated vtkObject API
@@ -116,7 +116,7 @@ private:
 # define VTK_ARRAY_ITERATOR_TEMPLATE_INSTANTIATE(T)
 #endif // !defined(VTK_NO_EXPLICIT_TEMPLATE_INSTANTIATION)
 
-#endif // !defined(__vtkArrayIteratorTemplate_h)
+#endif // !defined(vtkArrayIteratorTemplate_h)
 
 // This portion must be OUTSIDE the include blockers.  Each
 // vtkArrayIteratorTemplate subclass uses this to give its instantiation
diff --git a/Common/Core/vtkArrayPrint.h b/Common/Core/vtkArrayPrint.h
index 4d8a0e39a5fab25f8bd07b052bb83e0044656638..e074f88c542223b1ca7981e4e267caec00aa9856 100644
--- a/Common/Core/vtkArrayPrint.h
+++ b/Common/Core/vtkArrayPrint.h
@@ -24,8 +24,8 @@
 // Developed by Timothy M. Shead (tshead@sandia.gov) at Sandia National
 // Laboratories.
 
-#ifndef __vtkArrayPrint_h
-#define __vtkArrayPrint_h
+#ifndef vtkArrayPrint_h
+#define vtkArrayPrint_h
 
 #include "vtkTypedArray.h"
 
diff --git a/Common/Core/vtkArrayRange.h b/Common/Core/vtkArrayRange.h
index eca0d1ade98cc697cb49ed4c8c1525f14aa32339..ed714ada88b7996679a7055c6d80c9914764ae62 100644
--- a/Common/Core/vtkArrayRange.h
+++ b/Common/Core/vtkArrayRange.h
@@ -32,8 +32,8 @@
 // Developed by Timothy M. Shead (tshead@sandia.gov) at Sandia National
 // Laboratories.
 
-#ifndef __vtkArrayRange_h
-#define __vtkArrayRange_h
+#ifndef vtkArrayRange_h
+#define vtkArrayRange_h
 
 #include "vtkCommonCoreModule.h" // For export macro
 #include "vtkSystemIncludes.h"
diff --git a/Common/Core/vtkArraySort.h b/Common/Core/vtkArraySort.h
index 605ce659e3d872a523b6f3c2047a0e75a6db4231..b2f7b6ac94fc8c2fba25e4e18cab9b317aaa58c8 100644
--- a/Common/Core/vtkArraySort.h
+++ b/Common/Core/vtkArraySort.h
@@ -37,8 +37,8 @@
 // Developed by Timothy M. Shead (tshead@sandia.gov) at Sandia National
 // Laboratories.
 
-#ifndef __vtkArraySort_h
-#define __vtkArraySort_h
+#ifndef vtkArraySort_h
+#define vtkArraySort_h
 
 #include "vtkCommonCoreModule.h" // For export macro
 #include "vtkSystemIncludes.h"
diff --git a/Common/Core/vtkArrayWeights.h b/Common/Core/vtkArrayWeights.h
index 57aef6968b609f9d0e808bc75abee70ad5a78085..406207965db2c485c3c4122e909186b5cc242f48 100644
--- a/Common/Core/vtkArrayWeights.h
+++ b/Common/Core/vtkArrayWeights.h
@@ -38,8 +38,8 @@
 // Developed by Timothy M. Shead (tshead@sandia.gov) at Sandia National
 // Laboratories.
 
-#ifndef __vtkArrayWeights_h
-#define __vtkArrayWeights_h
+#ifndef vtkArrayWeights_h
+#define vtkArrayWeights_h
 
 #include "vtkCommonCoreModule.h" // For export macro
 #include "vtkSystemIncludes.h"
diff --git a/Common/Core/vtkAutoInit.h b/Common/Core/vtkAutoInit.h
index 7947d513df47bb97d52572e2ea3c10e8373eec38..1bde096cc6b8ab44acece10e3f9b31f7544905c1 100644
--- a/Common/Core/vtkAutoInit.h
+++ b/Common/Core/vtkAutoInit.h
@@ -12,8 +12,8 @@
      PURPOSE.  See the above copyright notice for more information.
 
 =========================================================================*/
-#ifndef __vtkAutoInit_h
-#define __vtkAutoInit_h
+#ifndef vtkAutoInit_h
+#define vtkAutoInit_h
 
 #include "vtkDebugLeaksManager.h" // DebugLeaks exists longer.
 #include "vtkTimeStamp.h" // Here so that TimeStamp Schwarz initializer works
diff --git a/Common/Core/vtkBitArray.h b/Common/Core/vtkBitArray.h
index e45aaab9460532d3fb0c62bf3151155a089a6df5..9e606a09ddb6138cfe1e50d8a14439ed06f61b8c 100644
--- a/Common/Core/vtkBitArray.h
+++ b/Common/Core/vtkBitArray.h
@@ -19,8 +19,8 @@
 // for insertion and retrieval of bits, and will automatically resize
 // itself to hold new data.
 
-#ifndef __vtkBitArray_h
-#define __vtkBitArray_h
+#ifndef vtkBitArray_h
+#define vtkBitArray_h
 
 #include "vtkCommonCoreModule.h" // For export macro
 #include "vtkDataArray.h"
diff --git a/Common/Core/vtkBitArrayIterator.h b/Common/Core/vtkBitArrayIterator.h
index 505c27bbc88cca6523ecf4b3eff0b217418ef75b..494b02eacb9ea8f101821f1f92cc4dc6835d5a12 100644
--- a/Common/Core/vtkBitArrayIterator.h
+++ b/Common/Core/vtkBitArrayIterator.h
@@ -16,8 +16,8 @@
 // This iterator iterates over a vtkBitArray. It uses the double interface
 // to get/set bit values.
 
-#ifndef __vtkBitArrayIterator_h
-#define __vtkBitArrayIterator_h
+#ifndef vtkBitArrayIterator_h
+#define vtkBitArrayIterator_h
 
 #include "vtkCommonCoreModule.h" // For export macro
 #include "vtkArrayIterator.h"
diff --git a/Common/Core/vtkBoxMuellerRandomSequence.h b/Common/Core/vtkBoxMuellerRandomSequence.h
index 10998b1d7bbb9a1d2def8c2bbeaa3152e42c6131..993091afbd396c3a1a7c6d44adb42ec97f34d4aa 100644
--- a/Common/Core/vtkBoxMuellerRandomSequence.h
+++ b/Common/Core/vtkBoxMuellerRandomSequence.h
@@ -20,8 +20,8 @@
 // It based is calculation from a uniformly distributed pseudo random sequence.
 // The initial sequence is a vtkMinimalStandardRandomSequence.
 
-#ifndef __vtkBoxMuellerRandomSequence_h
-#define __vtkBoxMuellerRandomSequence_h
+#ifndef vtkBoxMuellerRandomSequence_h
+#define vtkBoxMuellerRandomSequence_h
 
 #include "vtkCommonCoreModule.h" // For export macro
 #include "vtkGaussianRandomSequence.h"
@@ -62,4 +62,4 @@ private:
   void operator=(const vtkBoxMuellerRandomSequence&);  // Not implemented.
 };
 
-#endif // #ifndef __vtkBoxMuellerRandomSequence_h
+#endif // #ifndef vtkBoxMuellerRandomSequence_h
diff --git a/Common/Core/vtkBreakPoint.h b/Common/Core/vtkBreakPoint.h
index 903dfbdb58545bf222f00267582eaad9d20a4313..5eb71d9165d6b49ad99bf3ee92c084371463b1a9 100644
--- a/Common/Core/vtkBreakPoint.h
+++ b/Common/Core/vtkBreakPoint.h
@@ -30,8 +30,8 @@
 // This function is in Common, not in Parallel because it does not depend on
 // MPI and you may want to call vtkBreakPoint::Break() in any class of VTK.
 
-#ifndef __vtkBreakPoint_h
-#define __vtkBreakPoint_h
+#ifndef vtkBreakPoint_h
+#define vtkBreakPoint_h
 
 #include "vtkCommonCoreModule.h" // For export macro
 #include "vtkObject.h" // to get VTKCOMMONCORE_EXPORT
@@ -45,5 +45,5 @@ public:
   static void Break();
 };
 
-#endif // #ifndef __vtkBreakPoint_h
+#endif // #ifndef vtkBreakPoint_h
 // VTK-HeaderTest-Exclude: vtkBreakPoint.h
diff --git a/Common/Core/vtkByteSwap.h b/Common/Core/vtkByteSwap.h
index c53f450f5f802de2f06d99f28ad5eb7533ae0de9..1e43e284b6c456cda4e8202b00377cfc27ba295b 100644
--- a/Common/Core/vtkByteSwap.h
+++ b/Common/Core/vtkByteSwap.h
@@ -17,8 +17,8 @@
 // vtkByteSwap is used by other classes to perform machine dependent byte
 // swapping. Byte swapping is often used when reading or writing binary
 // files.
-#ifndef __vtkByteSwap_h
-#define __vtkByteSwap_h
+#ifndef vtkByteSwap_h
+#define vtkByteSwap_h
 
 #include "vtkCommonCoreModule.h" // For export macro
 #include "vtkObject.h"
diff --git a/Common/Core/vtkCallbackCommand.h b/Common/Core/vtkCallbackCommand.h
index 2c4ffff2c8c8c0d0818444b8e955e2a428eac6de..130d7beaa9021f15ca4660001a5d6ca373e4f6f5 100644
--- a/Common/Core/vtkCallbackCommand.h
+++ b/Common/Core/vtkCallbackCommand.h
@@ -32,8 +32,8 @@
 // .SECTION See Also
 // vtkCommand vtkOldStyleCallbackCommand
 
-#ifndef __vtkCallbackCommand_h
-#define __vtkCallbackCommand_h
+#ifndef vtkCallbackCommand_h
+#define vtkCallbackCommand_h
 
 #include "vtkCommonCoreModule.h" // For export macro
 #include "vtkCommand.h"
diff --git a/Common/Core/vtkCharArray.h b/Common/Core/vtkCharArray.h
index cb418f84eddf278293a438ddb5ec27b1335dfda8..9bd640325bfad734135f31692622f1d294b0d1e6 100644
--- a/Common/Core/vtkCharArray.h
+++ b/Common/Core/vtkCharArray.h
@@ -18,8 +18,8 @@
 // methods for insertion and retrieval of values and will
 // automatically resize itself to hold new data.
 
-#ifndef __vtkCharArray_h
-#define __vtkCharArray_h
+#ifndef vtkCharArray_h
+#define vtkCharArray_h
 
 // Tell the template header how to give our superclass a DLL interface.
 #if !defined(vtkCharArray_cxx)
diff --git a/Common/Core/vtkCollection.h b/Common/Core/vtkCollection.h
index 37034d0964509ba3251a6090aef86f29b8b80df1..72e6e513528cb63460cdb0f8995af27eaf30f498 100644
--- a/Common/Core/vtkCollection.h
+++ b/Common/Core/vtkCollection.h
@@ -25,8 +25,8 @@
 // vtkRenderWindowCollection vtkRendererCollection
 // vtkStructuredPointsCollection vtkTransformCollection vtkVolumeCollection
 
-#ifndef __vtkCollection_h
-#define __vtkCollection_h
+#ifndef vtkCollection_h
+#define vtkCollection_h
 
 #include "vtkCommonCoreModule.h" // For export macro
 #include "vtkObject.h"
diff --git a/Common/Core/vtkCollectionIterator.h b/Common/Core/vtkCollectionIterator.h
index f000de0d52cf6f254b437cc6fb8da7e183414c46..21299aa991f2daa547cb7b171d140fbc5f83fb5f 100644
--- a/Common/Core/vtkCollectionIterator.h
+++ b/Common/Core/vtkCollectionIterator.h
@@ -22,8 +22,8 @@
 // items are invalidated.  Other iterators will still continue to
 // function normally.
 
-#ifndef __vtkCollectionIterator_h
-#define __vtkCollectionIterator_h
+#ifndef vtkCollectionIterator_h
+#define vtkCollectionIterator_h
 
 #include "vtkCommonCoreModule.h" // For export macro
 #include "vtkObject.h"
diff --git a/Common/Core/vtkCommand.h b/Common/Core/vtkCommand.h
index f1d18ac5fd0e618f188d5b7cd170fcd176ee80ca..c2ee869c5d6c53c114b91c36ba926844dd7d7233 100644
--- a/Common/Core/vtkCommand.h
+++ b/Common/Core/vtkCommand.h
@@ -199,8 +199,8 @@
 // vtkObject vtkCallbackCommand vtkOldStyleCallbackCommand
 // vtkInteractorObserver vtk3DWidget
 
-#ifndef __vtkCommand_h
-#define __vtkCommand_h
+#ifndef vtkCommand_h
+#define vtkCommand_h
 
 #include "vtkCommonCoreModule.h" // For export macro
 #include "vtkObjectBase.h"
@@ -404,6 +404,6 @@ protected:
 //ETX
 };
 
-#endif /* __vtkCommand_h */
+#endif /* vtkCommand_h */
 
 // VTK-HeaderTest-Exclude: vtkCommand.h
diff --git a/Common/Core/vtkCommonInformationKeyManager.h b/Common/Core/vtkCommonInformationKeyManager.h
index f8cabf099fccdf001a63d3ef7d3b730b93508027..c808ec81fe76858bdbde823f1bb8358b49a827d5 100644
--- a/Common/Core/vtkCommonInformationKeyManager.h
+++ b/Common/Core/vtkCommonInformationKeyManager.h
@@ -19,8 +19,8 @@
 // It makes sure that the table of keys is created before and
 // destroyed after it is used.
 
-#ifndef __vtkCommonInformationKeyManager_h
-#define __vtkCommonInformationKeyManager_h
+#ifndef vtkCommonInformationKeyManager_h
+#define vtkCommonInformationKeyManager_h
 
 #include "vtkCommonCoreModule.h" // For export macro
 #include "vtkSystemIncludes.h"
diff --git a/Common/Core/vtkConditionVariable.h b/Common/Core/vtkConditionVariable.h
index a04ce3f674c48b96f7855209de4cfab6e4cfd3a5..cc1374214ec0a153b39507b6de96e186322d29ed 100644
--- a/Common/Core/vtkConditionVariable.h
+++ b/Common/Core/vtkConditionVariable.h
@@ -24,8 +24,8 @@
 // Washington University, St. Louis, Missouri.
 // http://www.cs.wustl.edu/~schmidt/win32-cv-1.html
 
-#ifndef __vtkConditionVariable_h
-#define __vtkConditionVariable_h
+#ifndef vtkConditionVariable_h
+#define vtkConditionVariable_h
 
 #include "vtkCommonCoreModule.h" // For export macro
 #include "vtkObject.h"
@@ -196,4 +196,4 @@ inline int vtkConditionVariable::Wait( vtkMutexLock* lock )
 }
 //ETX
 
-#endif // __vtkConditionVariable_h
+#endif // vtkConditionVariable_h
diff --git a/Common/Core/vtkCriticalSection.h b/Common/Core/vtkCriticalSection.h
index b57f76ae3b7564d26854ab800a9b2755d0f6a486..bc478afb3a4660a714025ae99ab95b8d050b0aa7 100644
--- a/Common/Core/vtkCriticalSection.h
+++ b/Common/Core/vtkCriticalSection.h
@@ -30,8 +30,8 @@
 // for non-Windows platforms (Irix, SunOS, etc) are discovered, they
 // should replace the implementations in this class
 
-#ifndef __vtkCriticalSection_h
-#define __vtkCriticalSection_h
+#ifndef vtkCriticalSection_h
+#define vtkCriticalSection_h
 
 #include "vtkCommonCoreModule.h" // For export macro
 #include "vtkObject.h"
diff --git a/Common/Core/vtkDataArray.h b/Common/Core/vtkDataArray.h
index 54d7b016f207c39c8b8db397e22962873d4233f2..ec25045c769fe10ed45c273db245c526b47b7c75 100644
--- a/Common/Core/vtkDataArray.h
+++ b/Common/Core/vtkDataArray.h
@@ -31,8 +31,8 @@
 // vtkUnsignedShortArray vtkIntArray vtkUnsignedIntArray vtkLongArray
 // vtkUnsignedLongArray vtkDoubleArray vtkDoubleArray
 
-#ifndef __vtkDataArray_h
-#define __vtkDataArray_h
+#ifndef vtkDataArray_h
+#define vtkDataArray_h
 
 #include "vtkCommonCoreModule.h" // For export macro
 #include "vtkAbstractArray.h"
diff --git a/Common/Core/vtkDataArrayCollection.h b/Common/Core/vtkDataArrayCollection.h
index c421b7d53a02765c0ac492d9e811745188bdaf08..6d9b141b2c44ee3af74d54787f6f7cd8fad873eb 100644
--- a/Common/Core/vtkDataArrayCollection.h
+++ b/Common/Core/vtkDataArrayCollection.h
@@ -17,8 +17,8 @@
 // vtkDataArrayCollection is an object that creates and manipulates lists of
 // datasets. See also vtkCollection and subclasses.
 
-#ifndef __vtkDataArrayCollection_h
-#define __vtkDataArrayCollection_h
+#ifndef vtkDataArrayCollection_h
+#define vtkDataArrayCollection_h
 
 #include "vtkCommonCoreModule.h" // For export macro
 #include "vtkCollection.h"
diff --git a/Common/Core/vtkDataArrayCollectionIterator.h b/Common/Core/vtkDataArrayCollectionIterator.h
index 619dd752ea19847cb09e0341d53e09d17e879a72..5e7a4e87e001d1da299604814cbe5dbb351be0f3 100644
--- a/Common/Core/vtkDataArrayCollectionIterator.h
+++ b/Common/Core/vtkDataArrayCollectionIterator.h
@@ -18,8 +18,8 @@
 // vtkCollectionIterator which allows the items to be retrieved with
 // the proper subclass pointer type for vtkDataArrayCollection.
 
-#ifndef __vtkDataArrayCollectionIterator_h
-#define __vtkDataArrayCollectionIterator_h
+#ifndef vtkDataArrayCollectionIterator_h
+#define vtkDataArrayCollectionIterator_h
 
 #include "vtkCommonCoreModule.h" // For export macro
 #include "vtkCollectionIterator.h"
diff --git a/Common/Core/vtkDataArrayIteratorMacro.h b/Common/Core/vtkDataArrayIteratorMacro.h
index bfb7e2d933c5ed9e3509ff213b5fa382f7c63444..079fd7e832fb5cfc94c609d916ece40a00b11a2c 100644
--- a/Common/Core/vtkDataArrayIteratorMacro.h
+++ b/Common/Core/vtkDataArrayIteratorMacro.h
@@ -73,8 +73,8 @@
 // .SECTION See Also
 // vtkTemplateMacro vtkTypedDataArrayIterator
 
-#ifndef __vtkDataArrayIteratorMacro_h
-#define __vtkDataArrayIteratorMacro_h
+#ifndef vtkDataArrayIteratorMacro_h
+#define vtkDataArrayIteratorMacro_h
 
 #include "vtkDataArrayTemplate.h" // For all classes referred to in the macro
 #include "vtkSetGet.h" // For vtkTemplateMacro
@@ -131,6 +131,6 @@
       }                                                                    \
     )
 
-#endif //__vtkDataArrayIteratorMacro_h
+#endif //vtkDataArrayIteratorMacro_h
 
 // VTK-HeaderTest-Exclude: vtkDataArrayIteratorMacro.h
diff --git a/Common/Core/vtkDataArraySelection.h b/Common/Core/vtkDataArraySelection.h
index 96e1c39390bb70c62d62ca26957dfdb2e1ef7973..71d3987401bacdfae241494a52909fe1669690a4 100644
--- a/Common/Core/vtkDataArraySelection.h
+++ b/Common/Core/vtkDataArraySelection.h
@@ -20,8 +20,8 @@
 // allow file readers to configure what data arrays are read from the
 // file.
 
-#ifndef __vtkDataArraySelection_h
-#define __vtkDataArraySelection_h
+#ifndef vtkDataArraySelection_h
+#define vtkDataArraySelection_h
 
 #include "vtkCommonCoreModule.h" // For export macro
 #include "vtkObject.h"
diff --git a/Common/Core/vtkDataArrayTemplate.h b/Common/Core/vtkDataArrayTemplate.h
index 9cf10fbfa05f2554c49226b2bf3df5b759662c57..77a22cf49d05085e09c09489cecc5734d9c78a5d 100644
--- a/Common/Core/vtkDataArrayTemplate.h
+++ b/Common/Core/vtkDataArrayTemplate.h
@@ -18,8 +18,8 @@
 // VTK.  This template is used to implement all the subclasses in the
 // same way while avoiding code duplication.
 
-#ifndef __vtkDataArrayTemplate_h
-#define __vtkDataArrayTemplate_h
+#ifndef vtkDataArrayTemplate_h
+#define vtkDataArrayTemplate_h
 
 #include "vtkCommonCoreModule.h" // For export macro
 #include "vtkTypedDataArray.h"
@@ -392,7 +392,7 @@ private:
   void SetArray(T* array, vtkIdType size, int save); \
   void SetArray(T* array, vtkIdType size, int save, int deleteMethod) */
 
-#endif // !defined(__vtkDataArrayTemplate_h)
+#endif // !defined(vtkDataArrayTemplate_h)
 
 // This portion must be OUTSIDE the include blockers.  Each
 // vtkDataArray subclass uses this to give its instantiation of this
diff --git a/Common/Core/vtkDebugLeaks.h b/Common/Core/vtkDebugLeaks.h
index be15e1558d9ba1190983164838d2ab39a91e9f08..6cf6d2be9c0cb391119096a93770d476d8b76107 100644
--- a/Common/Core/vtkDebugLeaks.h
+++ b/Common/Core/vtkDebugLeaks.h
@@ -23,8 +23,8 @@
 // -DVTK_DEBUG_LEAKS to the compile line, and rebuild vtkObject and
 // vtkObjectFactory.
 
-#ifndef __vtkDebugLeaks_h
-#define __vtkDebugLeaks_h
+#ifndef vtkDebugLeaks_h
+#define vtkDebugLeaks_h
 
 #include "vtkCommonCoreModule.h" // For export macro
 #include "vtkObject.h"
@@ -104,5 +104,5 @@ public:
 };
 //ETX
 
-#endif // __vtkDebugLeaks_h
+#endif // vtkDebugLeaks_h
 // VTK-HeaderTest-Exclude: vtkDebugLeaks.h
diff --git a/Common/Core/vtkDebugLeaksManager.h b/Common/Core/vtkDebugLeaksManager.h
index 705a8e4596b21fcd45c7e46d265f9f186f42d25c..d9856eec6707a7cb575fcfb5573e6b5eb8303a1c 100644
--- a/Common/Core/vtkDebugLeaksManager.h
+++ b/Common/Core/vtkDebugLeaksManager.h
@@ -19,8 +19,8 @@
 // pattern.  It makes sure that the vtkDebugLeaks singleton is created
 // before and destroyed after all other singletons in VTK.
 
-#ifndef __vtkDebugLeaksManager_h
-#define __vtkDebugLeaksManager_h
+#ifndef vtkDebugLeaksManager_h
+#define vtkDebugLeaksManager_h
 
 #include "vtkCommonCoreModule.h" // For export macro
 #include "vtkSystemIncludes.h"
diff --git a/Common/Core/vtkDenseArray.h b/Common/Core/vtkDenseArray.h
index 8953f9036d039327707c42a84501ccbdb93b149c..5d8e6e2aaccb78701cc6cd4e4b045c5f7d3bc184 100644
--- a/Common/Core/vtkDenseArray.h
+++ b/Common/Core/vtkDenseArray.h
@@ -40,8 +40,8 @@
 // .SECTION Thanks
 // Developed by Timothy M. Shead (tshead@sandia.gov) at Sandia National Laboratories.
 
-#ifndef __vtkDenseArray_h
-#define __vtkDenseArray_h
+#ifndef vtkDenseArray_h
+#define vtkDenseArray_h
 
 #include "vtkArrayCoordinates.h"
 #include "vtkObjectFactory.h"
diff --git a/Common/Core/vtkDoubleArray.h b/Common/Core/vtkDoubleArray.h
index 1ad119e1467d262ba3d4ea625491b76c331fde89..82a067807d9a37a2489d5da7c0b78fbfdb372323 100644
--- a/Common/Core/vtkDoubleArray.h
+++ b/Common/Core/vtkDoubleArray.h
@@ -18,8 +18,8 @@
 // methods for insertion and retrieval of values and will
 // automatically resize itself to hold new data.
 
-#ifndef __vtkDoubleArray_h
-#define __vtkDoubleArray_h
+#ifndef vtkDoubleArray_h
+#define vtkDoubleArray_h
 
 // Tell the template header how to give our superclass a DLL interface.
 #if !defined(vtkDoubleArray_cxx)
diff --git a/Common/Core/vtkDynamicLoader.h b/Common/Core/vtkDynamicLoader.h
index 7c2a5e25dcbb019882cc2e6581cca2a8a47cc3ea..26e94d85c1578fd6042318bd37422e0a3e7b88e4 100644
--- a/Common/Core/vtkDynamicLoader.h
+++ b/Common/Core/vtkDynamicLoader.h
@@ -19,8 +19,8 @@
 // .SECTION See Also
 // A more portable and lightweight solution is kwsys::DynamicLoader
 
-#ifndef __vtkDynamicLoader_h
-#define __vtkDynamicLoader_h
+#ifndef vtkDynamicLoader_h
+#define vtkDynamicLoader_h
 
 #include "vtkCommonCoreModule.h" // For export macro
 #include "vtkObject.h"
diff --git a/Common/Core/vtkEventForwarderCommand.h b/Common/Core/vtkEventForwarderCommand.h
index 488f703caab83f73a3188d1cb9668a8324cc5ff5..c73da0cacf6c929db7dfd2117d90edfbb3f030ed 100644
--- a/Common/Core/vtkEventForwarderCommand.h
+++ b/Common/Core/vtkEventForwarderCommand.h
@@ -22,8 +22,8 @@
 // .SECTION See Also
 // vtkCommand
 
-#ifndef __vtkEventForwarderCommand_h
-#define __vtkEventForwarderCommand_h
+#ifndef vtkEventForwarderCommand_h
+#define vtkEventForwarderCommand_h
 
 #include "vtkCommonCoreModule.h" // For export macro
 #include "vtkCommand.h"
@@ -59,6 +59,6 @@ protected:
   ~vtkEventForwarderCommand() {}
 };
 
-#endif /* __vtkEventForwarderCommand_h */
+#endif /* vtkEventForwarderCommand_h */
 
 // VTK-HeaderTest-Exclude: vtkEventForwarderCommand.h
diff --git a/Common/Core/vtkFileOutputWindow.h b/Common/Core/vtkFileOutputWindow.h
index cbe7146f6ebbe132c9e6b102e9ce3452d0d591d2..8facc3337661f930aa59fe2f65ef5b77bf761a77 100644
--- a/Common/Core/vtkFileOutputWindow.h
+++ b/Common/Core/vtkFileOutputWindow.h
@@ -18,8 +18,8 @@
 // To use this class, instantiate it and then call SetInstance(this).
 //
 
-#ifndef __vtkFileOutputWindow_h
-#define __vtkFileOutputWindow_h
+#ifndef vtkFileOutputWindow_h
+#define vtkFileOutputWindow_h
 
 #include "vtkCommonCoreModule.h" // For export macro
 #include "vtkOutputWindow.h"
diff --git a/Common/Core/vtkFloatArray.h b/Common/Core/vtkFloatArray.h
index 1ca59c25da956867e5af112f18498ca4a83be23c..d2a97a1bb47164418594d1ff4ab70c6cdbab4d19 100644
--- a/Common/Core/vtkFloatArray.h
+++ b/Common/Core/vtkFloatArray.h
@@ -18,8 +18,8 @@
 // methods for insertion and retrieval of values and will
 // automatically resize itself to hold new data.
 
-#ifndef __vtkFloatArray_h
-#define __vtkFloatArray_h
+#ifndef vtkFloatArray_h
+#define vtkFloatArray_h
 
 // Tell the template header how to give our superclass a DLL interface.
 #if !defined(vtkFloatArray_cxx)
diff --git a/Common/Core/vtkFloatingPointExceptions.h b/Common/Core/vtkFloatingPointExceptions.h
index 3293d35a30e7752930760b661aa9509786d953a1..ccc5893154e19a6bb272009521ab69f8da66e253 100644
--- a/Common/Core/vtkFloatingPointExceptions.h
+++ b/Common/Core/vtkFloatingPointExceptions.h
@@ -20,8 +20,8 @@
 // Visual studio nor gcc. It is mainly use to optionally enable floating
 // point exceptions in the C++ tests.
 
-#ifndef __vtkFloatingPointExceptions_h
-#define __vtkFloatingPointExceptions_h
+#ifndef vtkFloatingPointExceptions_h
+#define vtkFloatingPointExceptions_h
 
 #include "vtkCommonCoreModule.h" // For export macro
 #include "vtkSystemIncludes.h" // For VTKCOMMONCORE_EXPORT
diff --git a/Common/Core/vtkGarbageCollector.h b/Common/Core/vtkGarbageCollector.h
index 520969b4038925ec478455965fc64f1a59676fff..e44dddb8079c68153089f754b9f8a21c3f5dd91b 100644
--- a/Common/Core/vtkGarbageCollector.h
+++ b/Common/Core/vtkGarbageCollector.h
@@ -73,8 +73,8 @@
 // If subclassing from a class that already supports garbage
 // collection, one need only provide the ReportReferences method.
 
-#ifndef __vtkGarbageCollector_h
-#define __vtkGarbageCollector_h
+#ifndef vtkGarbageCollector_h
+#define vtkGarbageCollector_h
 
 #include "vtkCommonCoreModule.h" // For export macro
 #include "vtkObject.h"
diff --git a/Common/Core/vtkGarbageCollectorManager.h b/Common/Core/vtkGarbageCollectorManager.h
index 3104c3f160c56cb1d01f55d4854f062ec0c36a7a..e98886bba92f3ad9df87930a3ada49a86bed41e2 100644
--- a/Common/Core/vtkGarbageCollectorManager.h
+++ b/Common/Core/vtkGarbageCollectorManager.h
@@ -19,8 +19,8 @@
 // pattern.  It makes sure that the vtkGarbageCollector singleton is created
 // before and destroyed after it is used.
 
-#ifndef __vtkGarbageCollectorManager_h
-#define __vtkGarbageCollectorManager_h
+#ifndef vtkGarbageCollectorManager_h
+#define vtkGarbageCollectorManager_h
 
 #include "vtkCommonCoreModule.h" // For export macro
 #include "vtkSystemIncludes.h"
diff --git a/Common/Core/vtkGaussianRandomSequence.h b/Common/Core/vtkGaussianRandomSequence.h
index d35b4a48b20af001ad159f8272ae540a0438e06b..03c85337f1e4ef1ddd6a314df0cae4b1ed36de10 100644
--- a/Common/Core/vtkGaussianRandomSequence.h
+++ b/Common/Core/vtkGaussianRandomSequence.h
@@ -19,8 +19,8 @@
 //
 // This is just an interface.
 
-#ifndef __vtkGaussianRandomSequence_h
-#define __vtkGaussianRandomSequence_h
+#ifndef vtkGaussianRandomSequence_h
+#define vtkGaussianRandomSequence_h
 
 #include "vtkCommonCoreModule.h" // For export macro
 #include "vtkRandomSequence.h"
@@ -47,4 +47,4 @@ private:
   void operator=(const vtkGaussianRandomSequence&);  // Not implemented.
 };
 
-#endif // #ifndef __vtkGaussianRandomSequence_h
+#endif // #ifndef vtkGaussianRandomSequence_h
diff --git a/Common/Core/vtkIOStream.h b/Common/Core/vtkIOStream.h
index c9fc315168c07afe71a3034ebdc3687470f15a83..c232b435bcb0a5a58b04c9a827e0a067a141a6c5 100644
--- a/Common/Core/vtkIOStream.h
+++ b/Common/Core/vtkIOStream.h
@@ -16,8 +16,8 @@
 // .SECTION Description
 // This header includes the proper streams.
 
-#ifndef __vtkIOStream_h
-#define __vtkIOStream_h
+#ifndef vtkIOStream_h
+#define vtkIOStream_h
 
 #include "vtkCommonCoreModule.h" // For export macro
 #include "vtkConfigure.h"
@@ -97,5 +97,5 @@ inline ostream& operator << (ostream& os, vtkIOStreamULL value)
 
 #endif
 
-#endif // __vtkIOStream_h
+#endif // vtkIOStream_h
 // VTK-HeaderTest-Exclude: vtkIOStream.h
diff --git a/Common/Core/vtkIOStreamFwd.h b/Common/Core/vtkIOStreamFwd.h
index a31f53b6de3d82324790809045187ddf47f23814..5b694291acc19b5f69416303d0f800056e1ebe22 100644
--- a/Common/Core/vtkIOStreamFwd.h
+++ b/Common/Core/vtkIOStreamFwd.h
@@ -16,8 +16,8 @@
 // .SECTION Description
 // This header forward-declares the proper streams.
 
-#ifndef __vtkIOStreamFwd_h
-#define __vtkIOStreamFwd_h
+#ifndef vtkIOStreamFwd_h
+#define vtkIOStreamFwd_h
 
 #include "vtkConfigure.h"
 
@@ -41,5 +41,5 @@ using std::fstream;
 #pragma warning(pop)
 #endif
 
-#endif // __vtkIOStreamFwd_h
+#endif // vtkIOStreamFwd_h
 // VTK-HeaderTest-Exclude: vtkIOStreamFwd.h
diff --git a/Common/Core/vtkIdList.h b/Common/Core/vtkIdList.h
index baac267716d0eca38c404eefd31bb5777a3fff67..f34c11c6734365c8091e80d71f72a785fb66a55a 100644
--- a/Common/Core/vtkIdList.h
+++ b/Common/Core/vtkIdList.h
@@ -18,8 +18,8 @@
 // objects. vtkIdList may represent any type of integer id, but
 // usually represents point and cell ids.
 
-#ifndef __vtkIdList_h
-#define __vtkIdList_h
+#ifndef vtkIdList_h
+#define vtkIdList_h
 
 #include "vtkCommonCoreModule.h" // For export macro
 #include "vtkObject.h"
diff --git a/Common/Core/vtkIdListCollection.h b/Common/Core/vtkIdListCollection.h
index bd8fdcc2f95a4e4b5470a929fe9d5c13de6a2947..359db4c30e68bc3eaf25ab2ff23643caf1fc68a2 100644
--- a/Common/Core/vtkIdListCollection.h
+++ b/Common/Core/vtkIdListCollection.h
@@ -17,8 +17,8 @@
 // vtkIdListCollection is an object that creates and manipulates lists of
 // datasets. See also vtkCollection and subclasses.
 
-#ifndef __vtkIdListCollection_h
-#define __vtkIdListCollection_h
+#ifndef vtkIdListCollection_h
+#define vtkIdListCollection_h
 
 #include "vtkCommonCoreModule.h" // For export macro
 #include "vtkCollection.h"
diff --git a/Common/Core/vtkIdTypeArray.h b/Common/Core/vtkIdTypeArray.h
index 2f62b992865fcbfeb6033a4066c5a279e6605a1d..e40148c284b85ee8905f261bf21bda5909242a16 100644
--- a/Common/Core/vtkIdTypeArray.h
+++ b/Common/Core/vtkIdTypeArray.h
@@ -18,11 +18,11 @@
 // It provides methods for insertion and retrieval of values and will
 // automatically resize itself to hold new data.
 
-#ifndef __vtkIdTypeArray_h
-#define __vtkIdTypeArray_h
+#ifndef vtkIdTypeArray_h
+#define vtkIdTypeArray_h
 
 // Tell the template header how to give our superclass a DLL interface.
-#if !(defined(vtkIdTypeArray_cxx) && defined(VTK_USE_64BIT_IDS)) && (defined(VTK_USE_64BIT_IDS) || !defined(__vtkIntArray_h))
+#if !(defined(vtkIdTypeArray_cxx) && defined(VTK_USE_64BIT_IDS)) && (defined(VTK_USE_64BIT_IDS) || !defined(vtkIntArray_h))
 # define VTK_DATA_ARRAY_TEMPLATE_TYPE vtkIdType
 #endif
 
diff --git a/Common/Core/vtkIndent.h b/Common/Core/vtkIndent.h
index e488affc52cfc2790b038475336f7d0dc2600fac..08294bc999b1c01f8513828bbd81bafd19c84b4c 100644
--- a/Common/Core/vtkIndent.h
+++ b/Common/Core/vtkIndent.h
@@ -18,8 +18,8 @@
 // vtkIndent is used to control indentation during the chaining print
 // process. This way nested objects can correctly indent themselves.
 
-#ifndef __vtkIndent_h
-#define __vtkIndent_h
+#ifndef vtkIndent_h
+#define vtkIndent_h
 
 #include "vtkCommonCoreModule.h" // For export macro
 #include "vtkSystemIncludes.h"
diff --git a/Common/Core/vtkInformation.h b/Common/Core/vtkInformation.h
index 945c525aa6cf0db9962958e1c8c4c38af78a6350..d97c474c77f93d0fa431e46b37f0b8f3c7164f19 100644
--- a/Common/Core/vtkInformation.h
+++ b/Common/Core/vtkInformation.h
@@ -22,8 +22,8 @@
 // data referenced by the instance on a particular input or output
 // define the request made to the vtkAlgorithm instance.
 
-#ifndef __vtkInformation_h
-#define __vtkInformation_h
+#ifndef vtkInformation_h
+#define vtkInformation_h
 
 #include "vtkCommonCoreModule.h" // For export macro
 #include "vtkObject.h"
diff --git a/Common/Core/vtkInformationDataObjectKey.h b/Common/Core/vtkInformationDataObjectKey.h
index c8011e1783b3c26a45945be01e09e47693c0b2c6..935d66b57b2e44d71985ea89e1b43af82c85ebf3 100644
--- a/Common/Core/vtkInformationDataObjectKey.h
+++ b/Common/Core/vtkInformationDataObjectKey.h
@@ -17,8 +17,8 @@
 // vtkInformationDataObjectKey is used to represent keys in
 // vtkInformation for values that are vtkDataObject instances.
 
-#ifndef __vtkInformationDataObjectKey_h
-#define __vtkInformationDataObjectKey_h
+#ifndef vtkInformationDataObjectKey_h
+#define vtkInformationDataObjectKey_h
 
 #include "vtkCommonCoreModule.h" // For export macro
 #include "vtkInformationKey.h"
diff --git a/Common/Core/vtkInformationDoubleKey.h b/Common/Core/vtkInformationDoubleKey.h
index 50fae724f754512fa366129c995fe719c5e02278..8dd6e9b118824e93078b19029a60db1ecde596bd 100644
--- a/Common/Core/vtkInformationDoubleKey.h
+++ b/Common/Core/vtkInformationDoubleKey.h
@@ -17,8 +17,8 @@
 // vtkInformationDoubleKey is used to represent keys for double values
 // in vtkInformation.
 
-#ifndef __vtkInformationDoubleKey_h
-#define __vtkInformationDoubleKey_h
+#ifndef vtkInformationDoubleKey_h
+#define vtkInformationDoubleKey_h
 
 #include "vtkCommonCoreModule.h" // For export macro
 #include "vtkInformationKey.h"
diff --git a/Common/Core/vtkInformationDoubleVectorKey.h b/Common/Core/vtkInformationDoubleVectorKey.h
index 4501b512d0fca1aa8a60c722e6808adac8e84ea7..363d990699d054cfa409709fdd4fd58e2243767d 100644
--- a/Common/Core/vtkInformationDoubleVectorKey.h
+++ b/Common/Core/vtkInformationDoubleVectorKey.h
@@ -17,8 +17,8 @@
 // vtkInformationDoubleVectorKey is used to represent keys for double
 // vector values in vtkInformation.h
 
-#ifndef __vtkInformationDoubleVectorKey_h
-#define __vtkInformationDoubleVectorKey_h
+#ifndef vtkInformationDoubleVectorKey_h
+#define vtkInformationDoubleVectorKey_h
 
 #include "vtkCommonCoreModule.h" // For export macro
 #include "vtkInformationKey.h"
diff --git a/Common/Core/vtkInformationIdTypeKey.h b/Common/Core/vtkInformationIdTypeKey.h
index c0812ebee2f87f5aceb782619449d405b191bbc7..f2aa7f528015aa9277abcd1c99dace3dca5e9ad4 100644
--- a/Common/Core/vtkInformationIdTypeKey.h
+++ b/Common/Core/vtkInformationIdTypeKey.h
@@ -17,8 +17,8 @@
 // vtkInformationIdTypeKey is used to represent keys for vtkIdType values
 // in vtkInformation.
 
-#ifndef __vtkInformationIdTypeKey_h
-#define __vtkInformationIdTypeKey_h
+#ifndef vtkInformationIdTypeKey_h
+#define vtkInformationIdTypeKey_h
 
 #include "vtkCommonCoreModule.h" // For export macro
 #include "vtkInformationKey.h"
diff --git a/Common/Core/vtkInformationInformationKey.h b/Common/Core/vtkInformationInformationKey.h
index 4b1e291c520d5fbc948c298c4a5d1d120c95e2d8..6ce7ecf88359f16af813916d79617520f5e5a47e 100644
--- a/Common/Core/vtkInformationInformationKey.h
+++ b/Common/Core/vtkInformationInformationKey.h
@@ -17,8 +17,8 @@
 // vtkInformationInformationKey is used to represent keys in vtkInformation
 // for other information objects.
 
-#ifndef __vtkInformationInformationKey_h
-#define __vtkInformationInformationKey_h
+#ifndef vtkInformationInformationKey_h
+#define vtkInformationInformationKey_h
 
 #include "vtkCommonCoreModule.h" // For export macro
 #include "vtkInformationKey.h"
diff --git a/Common/Core/vtkInformationInformationVectorKey.h b/Common/Core/vtkInformationInformationVectorKey.h
index efcfe56895a4da40e516f74ff5d22e08437101f9..683fbd91f437645f8356cf3f796949d97f18b63f 100644
--- a/Common/Core/vtkInformationInformationVectorKey.h
+++ b/Common/Core/vtkInformationInformationVectorKey.h
@@ -17,8 +17,8 @@
 // vtkInformationInformationVectorKey is used to represent keys in
 // vtkInformation for vectors of other vtkInformation objects.
 
-#ifndef __vtkInformationInformationVectorKey_h
-#define __vtkInformationInformationVectorKey_h
+#ifndef vtkInformationInformationVectorKey_h
+#define vtkInformationInformationVectorKey_h
 
 #include "vtkCommonCoreModule.h" // For export macro
 #include "vtkInformationKey.h"
diff --git a/Common/Core/vtkInformationIntegerKey.h b/Common/Core/vtkInformationIntegerKey.h
index b02861fd1562a9075628a6b8e3b8c51915c5636f..df2efe5aeccc5023510bdeaaf403b5c4ca40d19f 100644
--- a/Common/Core/vtkInformationIntegerKey.h
+++ b/Common/Core/vtkInformationIntegerKey.h
@@ -17,8 +17,8 @@
 // vtkInformationIntegerKey is used to represent keys for integer values
 // in vtkInformation.
 
-#ifndef __vtkInformationIntegerKey_h
-#define __vtkInformationIntegerKey_h
+#ifndef vtkInformationIntegerKey_h
+#define vtkInformationIntegerKey_h
 
 #include "vtkCommonCoreModule.h" // For export macro
 #include "vtkInformationKey.h"
diff --git a/Common/Core/vtkInformationIntegerPointerKey.h b/Common/Core/vtkInformationIntegerPointerKey.h
index 2c28ae0b5f60c8c44dbbf4bafa51276e00fd6a02..e777dad4088502056d3cae67d8a7feae92c9d39c 100644
--- a/Common/Core/vtkInformationIntegerPointerKey.h
+++ b/Common/Core/vtkInformationIntegerPointerKey.h
@@ -17,8 +17,8 @@
 // vtkInformationIntegerPointerKey is used to represent keys for pointer
 // to integer values in vtkInformation.h
 
-#ifndef __vtkInformationIntegerPointerKey_h
-#define __vtkInformationIntegerPointerKey_h
+#ifndef vtkInformationIntegerPointerKey_h
+#define vtkInformationIntegerPointerKey_h
 
 #include "vtkCommonCoreModule.h" // For export macro
 #include "vtkInformationKey.h"
diff --git a/Common/Core/vtkInformationIntegerVectorKey.h b/Common/Core/vtkInformationIntegerVectorKey.h
index 13c03bcabd345588d4b3db3a28f18b17717ea4e8..3c0f4cc53e280c8c7607f552a506f550b1f013b1 100644
--- a/Common/Core/vtkInformationIntegerVectorKey.h
+++ b/Common/Core/vtkInformationIntegerVectorKey.h
@@ -17,8 +17,8 @@
 // vtkInformationIntegerVectorKey is used to represent keys for integer
 // vector values in vtkInformation.h
 
-#ifndef __vtkInformationIntegerVectorKey_h
-#define __vtkInformationIntegerVectorKey_h
+#ifndef vtkInformationIntegerVectorKey_h
+#define vtkInformationIntegerVectorKey_h
 
 #include "vtkCommonCoreModule.h" // For export macro
 #include "vtkInformationKey.h"
diff --git a/Common/Core/vtkInformationInternals.h b/Common/Core/vtkInformationInternals.h
index b412d08f1f5f0bc44a11cff47218486fdd18dd13..1e0cc56e74b5420df880d0a2a9e232895197ecd5 100644
--- a/Common/Core/vtkInformationInternals.h
+++ b/Common/Core/vtkInformationInternals.h
@@ -18,8 +18,8 @@
 // vtkInformation. This should only be accessed by friends
 // and sub-classes of that class.
 
-#ifndef __vtkInformationInternals_h
-#define __vtkInformationInternals_h
+#ifndef vtkInformationInternals_h
+#define vtkInformationInternals_h
 
 #include "vtkInformationKey.h"
 #include "vtkObjectBase.h"
diff --git a/Common/Core/vtkInformationIterator.h b/Common/Core/vtkInformationIterator.h
index 4b758ad3d66d52b436c9dfbdfad72643ac32f6b0..5005b6683bdda51b4e402271880ead94b8591ea6 100644
--- a/Common/Core/vtkInformationIterator.h
+++ b/Common/Core/vtkInformationIterator.h
@@ -21,8 +21,8 @@
 // .SECTION See Also
 // vtkInformation vtkInformationKey
 
-#ifndef __vtkInformationIterator_h
-#define __vtkInformationIterator_h
+#ifndef vtkInformationIterator_h
+#define vtkInformationIterator_h
 
 #include "vtkCommonCoreModule.h" // For export macro
 #include "vtkObject.h"
diff --git a/Common/Core/vtkInformationKey.h b/Common/Core/vtkInformationKey.h
index 63fe27caa6fff6a5833d723ad63516b1f45bbf32..7b14198231718ff74cad1bfdb9467c1a046ca0b6 100644
--- a/Common/Core/vtkInformationKey.h
+++ b/Common/Core/vtkInformationKey.h
@@ -23,8 +23,8 @@
 // of value stored in a vtkInformation instance corresponding to a
 // given key matches the type expected for that key.
 
-#ifndef __vtkInformationKey_h
-#define __vtkInformationKey_h
+#ifndef vtkInformationKey_h
+#define vtkInformationKey_h
 
 #include "vtkCommonCoreModule.h" // For export macro
 #include "vtkObjectBase.h"
diff --git a/Common/Core/vtkInformationKeyVectorKey.h b/Common/Core/vtkInformationKeyVectorKey.h
index 7fc8c52c3fa26c75a22550c245b7a1ef3c5095c9..3d1ccac08efab4d009561a27e6cf1c3e00cee642 100644
--- a/Common/Core/vtkInformationKeyVectorKey.h
+++ b/Common/Core/vtkInformationKeyVectorKey.h
@@ -17,8 +17,8 @@
 // vtkInformationKeyVectorKey is used to represent keys for
 // vector-of-keys values in vtkInformation.
 
-#ifndef __vtkInformationKeyVectorKey_h
-#define __vtkInformationKeyVectorKey_h
+#ifndef vtkInformationKeyVectorKey_h
+#define vtkInformationKeyVectorKey_h
 
 #include "vtkCommonCoreModule.h" // For export macro
 #include "vtkInformationKey.h"
diff --git a/Common/Core/vtkInformationObjectBaseKey.h b/Common/Core/vtkInformationObjectBaseKey.h
index 4563c920d082443d41c0afceccb4bf22cdc81ea1..31926139bec885a246ab564e2dc6acf96944471b 100644
--- a/Common/Core/vtkInformationObjectBaseKey.h
+++ b/Common/Core/vtkInformationObjectBaseKey.h
@@ -17,8 +17,8 @@
 // vtkInformationObjectBaseKey is used to represent keys in
 // vtkInformation for values that are vtkObjectBase instances.
 
-#ifndef __vtkInformationObjectBaseKey_h
-#define __vtkInformationObjectBaseKey_h
+#ifndef vtkInformationObjectBaseKey_h
+#define vtkInformationObjectBaseKey_h
 
 #include "vtkCommonCoreModule.h" // For export macro
 #include "vtkInformationKey.h"
diff --git a/Common/Core/vtkInformationObjectBaseVectorKey.h b/Common/Core/vtkInformationObjectBaseVectorKey.h
index 474d8db65de161790590da1a7172e40c5774322a..0783aa6f62e768b6b53e70aa94bbfc4c75cfca57 100644
--- a/Common/Core/vtkInformationObjectBaseVectorKey.h
+++ b/Common/Core/vtkInformationObjectBaseVectorKey.h
@@ -19,8 +19,8 @@
 // from that in other similar keys because of our internal use of smart
 // pointers.
 
-#ifndef __vtkInformationObjectBaseVectorKey_h
-#define __vtkInformationObjectBaseVectorKey_h
+#ifndef vtkInformationObjectBaseVectorKey_h
+#define vtkInformationObjectBaseVectorKey_h
 
 #include "vtkCommonCoreModule.h" // For export macro
 #include "vtkInformationKey.h"
diff --git a/Common/Core/vtkInformationRequestKey.h b/Common/Core/vtkInformationRequestKey.h
index 24988113f9ce15050a286d8aeaf0d4a69ca1af03..024400d52d9bb47e7dd1547c776e31695e30fe1b 100644
--- a/Common/Core/vtkInformationRequestKey.h
+++ b/Common/Core/vtkInformationRequestKey.h
@@ -17,8 +17,8 @@
 // vtkInformationRequestKey is used to represent keys for pointer
 // to pointer values in vtkInformation.h
 
-#ifndef __vtkInformationRequestKey_h
-#define __vtkInformationRequestKey_h
+#ifndef vtkInformationRequestKey_h
+#define vtkInformationRequestKey_h
 
 #include "vtkCommonCoreModule.h" // For export macro
 #include "vtkInformationKey.h"
diff --git a/Common/Core/vtkInformationStringKey.h b/Common/Core/vtkInformationStringKey.h
index 7f4e62afa73d5c8ab1f1cfefc1bdb29cd6266796..11193b91e7fb6f9910c134ce7014843d9738ebc3 100644
--- a/Common/Core/vtkInformationStringKey.h
+++ b/Common/Core/vtkInformationStringKey.h
@@ -17,8 +17,8 @@
 // vtkInformationStringKey is used to represent keys for string values
 // in vtkInformation.
 
-#ifndef __vtkInformationStringKey_h
-#define __vtkInformationStringKey_h
+#ifndef vtkInformationStringKey_h
+#define vtkInformationStringKey_h
 
 #include "vtkCommonCoreModule.h" // For export macro
 #include "vtkInformationKey.h"
diff --git a/Common/Core/vtkInformationStringVectorKey.h b/Common/Core/vtkInformationStringVectorKey.h
index 773adf89e0226a974db7c26fca755f12da226b9f..4ff00c83ee0b3fc2606ab7190927dde3bef11794 100644
--- a/Common/Core/vtkInformationStringVectorKey.h
+++ b/Common/Core/vtkInformationStringVectorKey.h
@@ -17,8 +17,8 @@
 // vtkInformationStringVectorKey is used to represent keys for String
 // vector values in vtkInformation.h
 
-#ifndef __vtkInformationStringVectorKey_h
-#define __vtkInformationStringVectorKey_h
+#ifndef vtkInformationStringVectorKey_h
+#define vtkInformationStringVectorKey_h
 
 #include "vtkCommonCoreModule.h" // For export macro
 #include "vtkInformationKey.h"
diff --git a/Common/Core/vtkInformationUnsignedLongKey.h b/Common/Core/vtkInformationUnsignedLongKey.h
index b61426d56e0d965bed44bf8f5083187b11928ae4..0c4611848492c026eb35578c947533e5ea7d83f5 100644
--- a/Common/Core/vtkInformationUnsignedLongKey.h
+++ b/Common/Core/vtkInformationUnsignedLongKey.h
@@ -17,8 +17,8 @@
 // vtkInformationUnsignedLongKey is used to represent keys for unsigned long values
 // in vtkInformation.
 
-#ifndef __vtkInformationUnsignedLongKey_h
-#define __vtkInformationUnsignedLongKey_h
+#ifndef vtkInformationUnsignedLongKey_h
+#define vtkInformationUnsignedLongKey_h
 
 #include "vtkCommonCoreModule.h" // For export macro
 #include "vtkInformationKey.h"
diff --git a/Common/Core/vtkInformationVariantKey.h b/Common/Core/vtkInformationVariantKey.h
index d091b497e8ac29c4b08ac9d1a8a149d65dcdf985..a9f2f92f9ef2895af07d5cfbd09ea0a8940fbc71 100644
--- a/Common/Core/vtkInformationVariantKey.h
+++ b/Common/Core/vtkInformationVariantKey.h
@@ -17,8 +17,8 @@
 // vtkInformationVariantKey is used to represent keys for variant values
 // in vtkInformation.
 
-#ifndef __vtkInformationVariantKey_h
-#define __vtkInformationVariantKey_h
+#ifndef vtkInformationVariantKey_h
+#define vtkInformationVariantKey_h
 
 #include "vtkCommonCoreModule.h" // For export macro
 #include "vtkInformationKey.h"
diff --git a/Common/Core/vtkInformationVariantVectorKey.h b/Common/Core/vtkInformationVariantVectorKey.h
index 4d534e309a96ff150eff5c9b64ff397a05dc8e2a..ad48b5d96535ae6532290981a1ff9296a0913863 100644
--- a/Common/Core/vtkInformationVariantVectorKey.h
+++ b/Common/Core/vtkInformationVariantVectorKey.h
@@ -17,8 +17,8 @@
 // vtkInformationVariantVectorKey is used to represent keys for variant
 // vector values in vtkInformation.h
 
-#ifndef __vtkInformationVariantVectorKey_h
-#define __vtkInformationVariantVectorKey_h
+#ifndef vtkInformationVariantVectorKey_h
+#define vtkInformationVariantVectorKey_h
 
 #include "vtkCommonCoreModule.h" // For export macro
 #include "vtkInformationKey.h"
diff --git a/Common/Core/vtkInformationVector.h b/Common/Core/vtkInformationVector.h
index 7bea2b63b8edc4d3c77644f2ecc98dc4d9991ce7..78847c2b8e0c927d0993d189c02ea70a8dc6fade 100644
--- a/Common/Core/vtkInformationVector.h
+++ b/Common/Core/vtkInformationVector.h
@@ -20,8 +20,8 @@
 // vtkAlgorithm.  An instance of this class is passed to
 // vtkAlgorithm::ProcessRequest calls.
 
-#ifndef __vtkInformationVector_h
-#define __vtkInformationVector_h
+#ifndef vtkInformationVector_h
+#define vtkInformationVector_h
 
 #include "vtkCommonCoreModule.h" // For export macro
 #include "vtkObject.h"
diff --git a/Common/Core/vtkInstantiator.h b/Common/Core/vtkInstantiator.h
index 5fb6213ce3ff2eb28058a3c1f6dd9d7e4e903589..da50fca4f0f96d82d31d618dab0af6e6c6a2899e 100644
--- a/Common/Core/vtkInstantiator.h
+++ b/Common/Core/vtkInstantiator.h
@@ -50,8 +50,8 @@
 // classes from a new library, the generated header must be included.
 //
 
-#ifndef __vtkInstantiator_h
-#define __vtkInstantiator_h
+#ifndef vtkInstantiator_h
+#define vtkInstantiator_h
 
 #include "vtkCommonCoreModule.h" // For export macro
 #include "vtkObject.h"
diff --git a/Common/Core/vtkIntArray.h b/Common/Core/vtkIntArray.h
index b25fbc80d323f49fed4d7ef4d406ab120f8621be..ef54c46a67f2b393c5e5cb9a9893f4321487aa47 100644
--- a/Common/Core/vtkIntArray.h
+++ b/Common/Core/vtkIntArray.h
@@ -18,11 +18,11 @@
 // methods for insertion and retrieval of values and will
 // automatically resize itself to hold new data.
 
-#ifndef __vtkIntArray_h
-#define __vtkIntArray_h
+#ifndef vtkIntArray_h
+#define vtkIntArray_h
 
 // Tell the template header how to give our superclass a DLL interface.
-#if !defined(vtkIntArray_cxx) && (defined(VTK_USE_64BIT_IDS) || !defined(__vtkIdTypeArray_h))
+#if !defined(vtkIntArray_cxx) && (defined(VTK_USE_64BIT_IDS) || !defined(vtkIdTypeArray_h))
 # define VTK_DATA_ARRAY_TEMPLATE_TYPE int
 #endif
 
diff --git a/Common/Core/vtkLargeInteger.h b/Common/Core/vtkLargeInteger.h
index 1068af815a2453d51d488d83d4975a34f9ad7b48..680fcf74c02012ec7f1e5f6d6949bed2889b328c 100644
--- a/Common/Core/vtkLargeInteger.h
+++ b/Common/Core/vtkLargeInteger.h
@@ -14,8 +14,8 @@
 =========================================================================*/
 // .NAME vtkLargeInteger - class for arbitrarily large ints
 
-#ifndef __vtkLargeInteger_h
-#define __vtkLargeInteger_h
+#ifndef vtkLargeInteger_h
+#define vtkLargeInteger_h
 
 #include "vtkCommonCoreModule.h" // For export macro
 #include "vtkObject.h"
diff --git a/Common/Core/vtkLongArray.h b/Common/Core/vtkLongArray.h
index c4119c6334fede2935effbf1dc3c30551ff27119..84977e209da4782b5e047fe1f6ee525e23934830 100644
--- a/Common/Core/vtkLongArray.h
+++ b/Common/Core/vtkLongArray.h
@@ -18,8 +18,8 @@
 // methods for insertion and retrieval of values and will
 // automatically resize itself to hold new data.
 
-#ifndef __vtkLongArray_h
-#define __vtkLongArray_h
+#ifndef vtkLongArray_h
+#define vtkLongArray_h
 
 // Tell the template header how to give our superclass a DLL interface.
 #if !defined(vtkLongArray_cxx)
diff --git a/Common/Core/vtkLongLongArray.h b/Common/Core/vtkLongLongArray.h
index 7770a576c248a1255b961e4f4161e8a654db82ee..cae2a1623c5093861ec3733b53eac667176214b1 100644
--- a/Common/Core/vtkLongLongArray.h
+++ b/Common/Core/vtkLongLongArray.h
@@ -18,8 +18,8 @@
 // It provides methods for insertion and retrieval of values and will
 // automatically resize itself to hold new data.
 
-#ifndef __vtkLongLongArray_h
-#define __vtkLongLongArray_h
+#ifndef vtkLongLongArray_h
+#define vtkLongLongArray_h
 
 // Tell the template header how to give our superclass a DLL interface.
 #if !defined(vtkLongLongArray_cxx)
diff --git a/Common/Core/vtkLookupTable.h b/Common/Core/vtkLookupTable.h
index b97f8e1cd08f3f2f4c2580c607036062f07ed5e9..f233c852f286ebfcc112f102152fa93bcf5ed427 100644
--- a/Common/Core/vtkLookupTable.h
+++ b/Common/Core/vtkLookupTable.h
@@ -48,8 +48,8 @@
 // .SECTION See Also
 // vtkLogLookupTable vtkWindowLevelLookupTable
 
-#ifndef __vtkLookupTable_h
-#define __vtkLookupTable_h
+#ifndef vtkLookupTable_h
+#define vtkLookupTable_h
 
 #include "vtkCommonCoreModule.h" // For export macro
 #include "vtkScalarsToColors.h"
diff --git a/Common/Core/vtkMappedDataArray.h b/Common/Core/vtkMappedDataArray.h
index c1c656ba05f538fa2212ade49296158302783162..1e97b73d86f7aa5d00086ecdcbd22337f16ffd6a 100644
--- a/Common/Core/vtkMappedDataArray.h
+++ b/Common/Core/vtkMappedDataArray.h
@@ -29,8 +29,8 @@
 // Subclasses that hold vtkIdType elements must also
 // reimplement `int GetDataType()` (see Caveat in vtkTypedDataArray).
 
-#ifndef __vtkMappedDataArray_h
-#define __vtkMappedDataArray_h
+#ifndef vtkMappedDataArray_h
+#define vtkMappedDataArray_h
 
 #include "vtkTypedDataArray.h"
 
@@ -153,6 +153,6 @@ private:
   vtkAbstractTypeMacroWithNewInstanceType(thisClass, superClass, vtkDataArray) \
   vtkMappedDataArrayNewInstanceMacro(thisClass)
 
-#endif //__vtkMappedDataArray_h
+#endif //vtkMappedDataArray_h
 
 // VTK-HeaderTest-Exclude: vtkMappedDataArray.h
diff --git a/Common/Core/vtkMath.h b/Common/Core/vtkMath.h
index 65928cc35d7442598a24efcf3044554b10f4be28..a357d56a8d19ed4eba2f8866ff9782f9e12e25c9 100644
--- a/Common/Core/vtkMath.h
+++ b/Common/Core/vtkMath.h
@@ -33,8 +33,8 @@
 // vtkMinimalStandardRandomSequence, vtkBoxMuellerRandomSequence,
 // vtkQuaternion
 
-#ifndef __vtkMath_h
-#define __vtkMath_h
+#ifndef vtkMath_h
+#define vtkMath_h
 
 #include "vtkCommonCoreModule.h" // For export macro
 #include "vtkObject.h"
diff --git a/Common/Core/vtkMathUtilities.h b/Common/Core/vtkMathUtilities.h
index 4cca9a8d912f6610884bb7628bf9146141a0b5bd..321b28b91c88aa501ddbfc614bef0fba58bf83c0 100644
--- a/Common/Core/vtkMathUtilities.h
+++ b/Common/Core/vtkMathUtilities.h
@@ -21,8 +21,8 @@
 // The initial motivation is to provide a few lightweight functions to help in
 // testing and internal implementation files.
 
-#ifndef __vtkMathUtilities_h
-#define __vtkMathUtilities_h
+#ifndef vtkMathUtilities_h
+#define vtkMathUtilities_h
 
 #include <cmath>
 #include <limits>
@@ -87,5 +87,5 @@ bool NearlyEqual(A a, A b, A tol=std::numeric_limits<A>::epsilon())
 
 } // End vtkMathUtilities namespace.
 
-#endif // __vtkMathUtilities_h
+#endif // vtkMathUtilities_h
 // VTK-HeaderTest-Exclude: vtkMathUtilities.h
diff --git a/Common/Core/vtkMinimalStandardRandomSequence.h b/Common/Core/vtkMinimalStandardRandomSequence.h
index 00d3c73429dbd0a17cbd83608347cba90d40903d..0b9a4a7cd8c61082c9360a53e387c63f9a55fd69 100644
--- a/Common/Core/vtkMinimalStandardRandomSequence.h
+++ b/Common/Core/vtkMinimalStandardRandomSequence.h
@@ -29,8 +29,8 @@
 // Correctness test is described in first column, page 1195:
 // A seed of 1 at step 1 should give a seed of 1043618065 at step 10001.
 
-#ifndef __vtkMinimalStandardRandomSequence_h
-#define __vtkMinimalStandardRandomSequence_h
+#ifndef vtkMinimalStandardRandomSequence_h
+#define vtkMinimalStandardRandomSequence_h
 
 #include "vtkCommonCoreModule.h" // For export macro
 #include "vtkRandomSequence.h"
@@ -108,4 +108,4 @@ private:
   void operator=(const vtkMinimalStandardRandomSequence&);  // Not implemented.
 };
 
-#endif // #ifndef __vtkMinimalStandardRandomSequence_h
+#endif // #ifndef vtkMinimalStandardRandomSequence_h
diff --git a/Common/Core/vtkMultiThreader.h b/Common/Core/vtkMultiThreader.h
index 423c4414e238eee0a9b891a4c6eae8d5ca28b479..d79cde709ad6fedf11be30d910c2dc13a73a6f5b 100644
--- a/Common/Core/vtkMultiThreader.h
+++ b/Common/Core/vtkMultiThreader.h
@@ -19,8 +19,8 @@
 // supporting POSIX threads.  This class can be used to execute a single
 // method on multiple threads, or to specify a method per thread.
 
-#ifndef __vtkMultiThreader_h
-#define __vtkMultiThreader_h
+#ifndef vtkMultiThreader_h
+#define vtkMultiThreader_h
 
 #include "vtkCommonCoreModule.h" // For export macro
 #include "vtkObject.h"
diff --git a/Common/Core/vtkMutexLock.h b/Common/Core/vtkMutexLock.h
index 1dcbe1bdfcc80f87c0ed9912119ccabfb2de4520..78583d4192b6e7070c37d57cddfacb2ada85bbc5 100644
--- a/Common/Core/vtkMutexLock.h
+++ b/Common/Core/vtkMutexLock.h
@@ -18,8 +18,8 @@
 // through different threads.  This header file also defines
 // vtkSimpleMutexLock which is not a subclass of vtkObject.
 
-#ifndef __vtkMutexLock_h
-#define __vtkMutexLock_h
+#ifndef vtkMutexLock_h
+#define vtkMutexLock_h
 
 
 #include "vtkCommonCoreModule.h" // For export macro
diff --git a/Common/Core/vtkNew.h b/Common/Core/vtkNew.h
index b0ca7bd73bb6c15370fd59de66c37c791851a394..f3b123ba6ccd3b08ec2dfec9fa8da08040b4ef20 100644
--- a/Common/Core/vtkNew.h
+++ b/Common/Core/vtkNew.h
@@ -47,8 +47,8 @@
 // .SECTION See Also
 // vtkSmartPointer vtkWeakPointer
 
-#ifndef __vtkNew_h
-#define __vtkNew_h
+#ifndef vtkNew_h
+#define vtkNew_h
 
 #include "vtkIOStream.h"
 
diff --git a/Common/Core/vtkOStrStreamWrapper.h b/Common/Core/vtkOStrStreamWrapper.h
index aa4bf0d3cfba29adbeb85088e9ffc41c0909b80a..9d6c73f5502bf70980d41bc77776109a7cc3157f 100644
--- a/Common/Core/vtkOStrStreamWrapper.h
+++ b/Common/Core/vtkOStrStreamWrapper.h
@@ -21,8 +21,8 @@
 // less time for compilation depending on the platform.  This wrapper
 // is used by the macros in vtkSetGet.h.
 
-#ifndef __vtkOStrStreamWrapper_h
-#define __vtkOStrStreamWrapper_h
+#ifndef vtkOStrStreamWrapper_h
+#define vtkOStrStreamWrapper_h
 
 #ifndef __VTK_SYSTEM_INCLUDES__INSIDE
 Do_not_include_vtkOStrStreamWrapper_directly__vtkSystemIncludes_includes_it;
diff --git a/Common/Core/vtkOStreamWrapper.h b/Common/Core/vtkOStreamWrapper.h
index f0e57308ecd658fc6a8e36ecb73ee6d22aed95ab..2a9625f756d2e45555cfc4d3f0dfa35a04a70fa7 100644
--- a/Common/Core/vtkOStreamWrapper.h
+++ b/Common/Core/vtkOStreamWrapper.h
@@ -21,8 +21,8 @@
 // time for compilation depending on the platform.  This wrapper is
 // used by the macros in vtkSetGet.h.
 
-#ifndef __vtkOStreamWrapper_h
-#define __vtkOStreamWrapper_h
+#ifndef vtkOStreamWrapper_h
+#define vtkOStreamWrapper_h
 
 #include "vtkCommonCoreModule.h"
 
diff --git a/Common/Core/vtkObject.h b/Common/Core/vtkObject.h
index 6f2eddd656e065c4381194db130811c295cbcffa..cca9dc89482abe3c677f99a7ff2528a7c561ebd0 100644
--- a/Common/Core/vtkObject.h
+++ b/Common/Core/vtkObject.h
@@ -35,8 +35,8 @@
 // .SECTION See also
 // vtkCommand vtkTimeStamp
 
-#ifndef __vtkObject_h
-#define __vtkObject_h
+#ifndef vtkObject_h
+#define vtkObject_h
 
 #include "vtkCommonCoreModule.h" // For export macro
 #include "vtkObjectBase.h"
diff --git a/Common/Core/vtkObjectBase.h b/Common/Core/vtkObjectBase.h
index fdd29ad786ff5724f496733376689ad5d319ddbe..8770c3a040f4d208e70c91fc80cb18685dfcc104 100644
--- a/Common/Core/vtkObjectBase.h
+++ b/Common/Core/vtkObjectBase.h
@@ -37,8 +37,8 @@
 // .SECTION See also
 // vtkObject vtkCommand vtkInformationKey
 
-#ifndef __vtkObjectBase_h
-#define __vtkObjectBase_h
+#ifndef vtkObjectBase_h
+#define vtkObjectBase_h
 
 #include "vtkCommonCoreModule.h" // For export macro
 #include "vtkAtomicInt.h"
diff --git a/Common/Core/vtkObjectFactory.h b/Common/Core/vtkObjectFactory.h
index 371817992d423f11757b535539d2595f225675bd..c5d9c578171b95e53086051c5b2224be99e25aa1 100644
--- a/Common/Core/vtkObjectFactory.h
+++ b/Common/Core/vtkObjectFactory.h
@@ -32,8 +32,8 @@
 // with the vtkObjectFactory::RegisterFactory method.
 //
 
-#ifndef __vtkObjectFactory_h
-#define __vtkObjectFactory_h
+#ifndef vtkObjectFactory_h
+#define vtkObjectFactory_h
 
 #include "vtkCommonCoreModule.h" // For export macro
 #include "vtkObject.h"
diff --git a/Common/Core/vtkObjectFactoryCollection.h b/Common/Core/vtkObjectFactoryCollection.h
index 6ffb72588fdbefe284b1fe9d12525832115193e5..3e6bcd0af41aae4799dffa782ce3bdab3559ea81 100644
--- a/Common/Core/vtkObjectFactoryCollection.h
+++ b/Common/Core/vtkObjectFactoryCollection.h
@@ -20,8 +20,8 @@
 // .SECTION see also
 // vtkCollection vtkObjectFactory
 
-#ifndef __vtkObjectFactoryCollection_h
-#define __vtkObjectFactoryCollection_h
+#ifndef vtkObjectFactoryCollection_h
+#define vtkObjectFactoryCollection_h
 
 #include "vtkCommonCoreModule.h" // For export macro
 #include "vtkCollection.h"
diff --git a/Common/Core/vtkOldStyleCallbackCommand.h b/Common/Core/vtkOldStyleCallbackCommand.h
index dc0c44c6182017cf932fca9f87978ad7b6967541..0ddde4c9a58be2bf306d7d7ab0daeb898cb4cc26 100644
--- a/Common/Core/vtkOldStyleCallbackCommand.h
+++ b/Common/Core/vtkOldStyleCallbackCommand.h
@@ -28,8 +28,8 @@
 // .SECTION See Also
 // vtkCommand vtkCallbackCommand
 
-#ifndef __vtkOldStyleCallbackCommand_h
-#define __vtkOldStyleCallbackCommand_h
+#ifndef vtkOldStyleCallbackCommand_h
+#define vtkOldStyleCallbackCommand_h
 
 #include "vtkCommonCoreModule.h" // For export macro
 #include "vtkCommand.h"
@@ -66,6 +66,6 @@ protected:
 };
 
 
-#endif /* __vtkOldStyleCallbackCommand_h */
+#endif /* vtkOldStyleCallbackCommand_h */
 
 // VTK-HeaderTest-Exclude: vtkOldStyleCallbackCommand.h
diff --git a/Common/Core/vtkOutputWindow.h b/Common/Core/vtkOutputWindow.h
index 34a9a71981370cd8ad574afe21a127bfcd4e172b..f5ee8b2811fcdf583c5d9599e4c77ae926fffe6a 100644
--- a/Common/Core/vtkOutputWindow.h
+++ b/Common/Core/vtkOutputWindow.h
@@ -19,8 +19,8 @@
 // do not.  (i.e windows does not).  Sub-classes can be provided which can
 // redirect the output to a window.
 
-#ifndef __vtkOutputWindow_h
-#define __vtkOutputWindow_h
+#ifndef vtkOutputWindow_h
+#define vtkOutputWindow_h
 
 #include "vtkCommonCoreModule.h" // For export macro
 #include "vtkObject.h"
diff --git a/Common/Core/vtkOverrideInformation.h b/Common/Core/vtkOverrideInformation.h
index 8b29ab3dbaaaf1af0ed1dc96e2c52065988dd256..c0fbc46758638ed6ea0e3c0caaf1c4ba7ac2642d 100644
--- a/Common/Core/vtkOverrideInformation.h
+++ b/Common/Core/vtkOverrideInformation.h
@@ -18,8 +18,8 @@
 // a class which is overriden in a vtkObjectFactory.
 //
 
-#ifndef __vtkOverrideInformation_h
-#define __vtkOverrideInformation_h
+#ifndef vtkOverrideInformation_h
+#define vtkOverrideInformation_h
 
 #include "vtkCommonCoreModule.h" // For export macro
 #include "vtkObject.h"
diff --git a/Common/Core/vtkOverrideInformationCollection.h b/Common/Core/vtkOverrideInformationCollection.h
index cd13a66cab3163d1608a3d0acb8059061d49e87d..3e11dc0b15ff7456f0632997836f672aae505fb8 100644
--- a/Common/Core/vtkOverrideInformationCollection.h
+++ b/Common/Core/vtkOverrideInformationCollection.h
@@ -19,8 +19,8 @@
 // .SECTION See Also
 // vtkCollection
 
-#ifndef __vtkOverrideInformationCollection_h
-#define __vtkOverrideInformationCollection_h
+#ifndef vtkOverrideInformationCollection_h
+#define vtkOverrideInformationCollection_h
 
 #include "vtkCommonCoreModule.h" // For export macro
 #include "vtkCollection.h"
diff --git a/Common/Core/vtkPoints.h b/Common/Core/vtkPoints.h
index ed861392d3eb0c52cc672d37c00fe62ec989c4e4..8d17d4064532fb1381c8678a8b5216ecdcaf9891 100644
--- a/Common/Core/vtkPoints.h
+++ b/Common/Core/vtkPoints.h
@@ -17,8 +17,8 @@
 // vtkPoints represents 3D points. The data model for vtkPoints is an
 // array of vx-vy-vz triplets accessible by (point or cell) id.
 
-#ifndef __vtkPoints_h
-#define __vtkPoints_h
+#ifndef vtkPoints_h
+#define vtkPoints_h
 
 #include "vtkCommonCoreModule.h" // For export macro
 #include "vtkObject.h"
diff --git a/Common/Core/vtkPoints2D.h b/Common/Core/vtkPoints2D.h
index a43f5312efc2888c4cc31b25f90c1188af8a69f3..9a29e97d14957ab241dc664e9b00a7f12e83efe0 100644
--- a/Common/Core/vtkPoints2D.h
+++ b/Common/Core/vtkPoints2D.h
@@ -17,8 +17,8 @@
 // vtkPoints2D represents 2D points. The data model for vtkPoints2D is an
 // array of vx-vy doublets accessible by (point or cell) id.
 
-#ifndef __vtkPoints2D_h
-#define __vtkPoints2D_h
+#ifndef vtkPoints2D_h
+#define vtkPoints2D_h
 
 #include "vtkCommonCoreModule.h" // For export macro
 #include "vtkObject.h"
diff --git a/Common/Core/vtkPriorityQueue.h b/Common/Core/vtkPriorityQueue.h
index e38ae73180ca4bea9158632913b71516ad5a7faf..f755a78fbae2826b68c2a6b4f5d3bf5eba368eba 100644
--- a/Common/Core/vtkPriorityQueue.h
+++ b/Common/Core/vtkPriorityQueue.h
@@ -32,8 +32,8 @@
 // array. This avoids the overhead associated with parent/child pointers,
 // and frequent memory allocation and deallocation.
 
-#ifndef __vtkPriorityQueue_h
-#define __vtkPriorityQueue_h
+#ifndef vtkPriorityQueue_h
+#define vtkPriorityQueue_h
 
 #include "vtkCommonCoreModule.h" // For export macro
 #include "vtkObject.h"
diff --git a/Common/Core/vtkRandomSequence.h b/Common/Core/vtkRandomSequence.h
index 011c7c28de1f3d8596cf1e751901b7a83a8e85d6..e1b0af4a41ce946ef24b3d12ea12b91e68fafdb1 100644
--- a/Common/Core/vtkRandomSequence.h
+++ b/Common/Core/vtkRandomSequence.h
@@ -25,8 +25,8 @@
 // "Object-Oriented Software Construction", 2nd Edition, by Bertrand Meyer.
 // chapter 23, "Principles of class design", "Pseudo-random number generators:
 // a design exercise", page 754--755.
-#ifndef __vtkRandomSequence_h
-#define __vtkRandomSequence_h
+#ifndef vtkRandomSequence_h
+#define vtkRandomSequence_h
 
 #include "vtkCommonCoreModule.h" // For export macro
 #include "vtkObject.h"
@@ -53,4 +53,4 @@ private:
   void operator=(const vtkRandomSequence&);  // Not implemented.
 };
 
-#endif // #ifndef __vtkRandomSequence_h
+#endif // #ifndef vtkRandomSequence_h
diff --git a/Common/Core/vtkReferenceCount.h b/Common/Core/vtkReferenceCount.h
index 5d70396e15bfc75a69f694d4072092cee765f51d..2efd42cc4162e5dccdb5496d8b800fcd96cd5caa 100644
--- a/Common/Core/vtkReferenceCount.h
+++ b/Common/Core/vtkReferenceCount.h
@@ -18,8 +18,8 @@
 // .SECTION See Also
 // vtkObject
 
-#ifndef __vtkReferenceCount_h
-#define __vtkReferenceCount_h
+#ifndef vtkReferenceCount_h
+#define vtkReferenceCount_h
 
 #include "vtkCommonCoreModule.h" // For export macro
 #include "vtkObject.h"
diff --git a/Common/Core/vtkSMPThreadLocalObject.h b/Common/Core/vtkSMPThreadLocalObject.h
index f1fd7324bc8fa2f2e4da3c379e3e391d71b7433a..1dfef97194609f1a71e6f111e362f3a6c3357873 100644
--- a/Common/Core/vtkSMPThreadLocalObject.h
+++ b/Common/Core/vtkSMPThreadLocalObject.h
@@ -64,8 +64,8 @@
 // .SECTION See Also
 // vtkSMPThreadLocal
 
-#ifndef __vtkSMPThreadLocalObject_h
-#define __vtkSMPThreadLocalObject_h
+#ifndef vtkSMPThreadLocalObject_h
+#define vtkSMPThreadLocalObject_h
 
 #include "vtkSMPThreadLocal.h"
 
diff --git a/Common/Core/vtkSMPTools.h b/Common/Core/vtkSMPTools.h
index 99e3907264b337d2b351d870c89619b6fbd0173b..dc4932227360fa45c3e726b2efdf49489fca26f4 100644
--- a/Common/Core/vtkSMPTools.h
+++ b/Common/Core/vtkSMPTools.h
@@ -20,8 +20,8 @@
 // (currently Sequential, TBB and X-Kaapi) that actual execution is
 // delegated to.
 
-#ifndef __vtkSMPTools_h__
-#define __vtkSMPTools_h__
+#ifndef vtkSMPTools_h__
+#define vtkSMPTools_h__
 
 #include "vtkCommonCoreModule.h" // For export macro
 #include "vtkObject.h"
diff --git a/Common/Core/vtkScalarsToColors.h b/Common/Core/vtkScalarsToColors.h
index bd606eac31db0e71c43b530efe452fbc86baa36c..32e05fe7be233c58d3028f2e073880083733e9f7 100644
--- a/Common/Core/vtkScalarsToColors.h
+++ b/Common/Core/vtkScalarsToColors.h
@@ -40,8 +40,8 @@
 // .SECTION See Also
 // vtkLookupTable vtkColorTransferFunction
 
-#ifndef __vtkScalarsToColors_h
-#define __vtkScalarsToColors_h
+#ifndef vtkScalarsToColors_h
+#define vtkScalarsToColors_h
 
 #include "vtkCommonCoreModule.h" // For export macro
 #include "vtkVariant.h" // Set/get annotation methods require variants.
diff --git a/Common/Core/vtkSetGet.h b/Common/Core/vtkSetGet.h
index 2269f46fc5107dcfaeea9167e074d6e0e4df3822..2ca8d422d2d0e3ef8d7bda6d8d29a000aa920842 100644
--- a/Common/Core/vtkSetGet.h
+++ b/Common/Core/vtkSetGet.h
@@ -22,8 +22,8 @@
 // vector arrays of built-in types size 2,3,4; for setting objects; and
 // debug, warning, and error printout information.
 
-#ifndef __vtkSetGet_h
-#define __vtkSetGet_h
+#ifndef vtkSetGet_h
+#define vtkSetGet_h
 
 #include "vtkCommonCoreModule.h" // For export macro
 #include "vtkSystemIncludes.h"
diff --git a/Common/Core/vtkShortArray.h b/Common/Core/vtkShortArray.h
index ed9e2b54e304a1f4c920d5a6d31a4f144a9009b6..2a4a0b45d4b999caf370f74274f688000a14fea2 100644
--- a/Common/Core/vtkShortArray.h
+++ b/Common/Core/vtkShortArray.h
@@ -18,8 +18,8 @@
 // methods for insertion and retrieval of values and will
 // automatically resize itself to hold new data.
 
-#ifndef __vtkShortArray_h
-#define __vtkShortArray_h
+#ifndef vtkShortArray_h
+#define vtkShortArray_h
 
 // Tell the template header how to give our superclass a DLL interface.
 #if !defined(vtkShortArray_cxx)
diff --git a/Common/Core/vtkSignedCharArray.h b/Common/Core/vtkSignedCharArray.h
index d2cb47e8ab2441c96c7137b08012ccc2b9d274ed..d458884e7ced655133a358225dc88e12b2621b57 100644
--- a/Common/Core/vtkSignedCharArray.h
+++ b/Common/Core/vtkSignedCharArray.h
@@ -18,8 +18,8 @@
 // It provides methods for insertion and retrieval of values and will
 // automatically resize itself to hold new data.
 
-#ifndef __vtkSignedCharArray_h
-#define __vtkSignedCharArray_h
+#ifndef vtkSignedCharArray_h
+#define vtkSignedCharArray_h
 
 // Tell the template header how to give our superclass a DLL interface.
 #if !defined(vtkSignedCharArray_cxx)
diff --git a/Common/Core/vtkSimpleCriticalSection.h b/Common/Core/vtkSimpleCriticalSection.h
index 6447a8d30aceb9e363b0c5862e03a3460b8ae84e..aa7656e37e36299707f68fc448a7eb212fa130c9 100644
--- a/Common/Core/vtkSimpleCriticalSection.h
+++ b/Common/Core/vtkSimpleCriticalSection.h
@@ -30,8 +30,8 @@
 // for non-Windows platforms (Irix, SunOS, etc) are discovered, they
 // should replace the implementations in this class
 
-#ifndef __vtkSimpleCriticalSection_h
-#define __vtkSimpleCriticalSection_h
+#ifndef vtkSimpleCriticalSection_h
+#define vtkSimpleCriticalSection_h
 
 #include "vtkCommonCoreModule.h" // For export macro
 #include "vtkSystemIncludes.h"
diff --git a/Common/Core/vtkSmartPointer.h b/Common/Core/vtkSmartPointer.h
index 34fa35a3352b3fa53a44404bcd7aede14b4250df..7563b8f912aca4f140440aff246133609cf139c6 100644
--- a/Common/Core/vtkSmartPointer.h
+++ b/Common/Core/vtkSmartPointer.h
@@ -17,8 +17,8 @@
 // vtkSmartPointer is a class template that provides automatic casting
 // for objects held by the vtkSmartPointerBase superclass.
 
-#ifndef __vtkSmartPointer_h
-#define __vtkSmartPointer_h
+#ifndef vtkSmartPointer_h
+#define vtkSmartPointer_h
 
 #include "vtkSmartPointerBase.h"
 
diff --git a/Common/Core/vtkSmartPointerBase.h b/Common/Core/vtkSmartPointerBase.h
index 2a7ef4842dc5f5a161e616eb990a75a478711721..8b6d9a52dde4c903c2ddc0a9d0f8c9529c9d9dd1 100644
--- a/Common/Core/vtkSmartPointerBase.h
+++ b/Common/Core/vtkSmartPointerBase.h
@@ -20,8 +20,8 @@
 // intended to be used directly.  Instead, use the vtkSmartPointer
 // class template to automatically perform proper cast operations.
 
-#ifndef __vtkSmartPointerBase_h
-#define __vtkSmartPointerBase_h
+#ifndef vtkSmartPointerBase_h
+#define vtkSmartPointerBase_h
 
 #include "vtkCommonCoreModule.h" // For export macro
 #include "vtkObjectBase.h"
diff --git a/Common/Core/vtkSortDataArray.h b/Common/Core/vtkSortDataArray.h
index ee766f2d4d65837ede88a30233e1d0de91780542..88da8339ef3b146602e60ecf5352524c53384161 100644
--- a/Common/Core/vtkSortDataArray.h
+++ b/Common/Core/vtkSortDataArray.h
@@ -24,8 +24,8 @@
 
 // .NAME vtkSortDataArray - Provides several methods for sorting vtk arrays.
 
-#ifndef __vtkSortDataArray_h
-#define __vtkSortDataArray_h
+#ifndef vtkSortDataArray_h
+#define vtkSortDataArray_h
 
 #include "vtkCommonCoreModule.h" // For export macro
 #include "vtkObject.h"
@@ -71,4 +71,4 @@ private:
   void operator=(const vtkSortDataArray &);  // Not implemented.
 };
 
-#endif //__vtkSortDataArray_h
+#endif //vtkSortDataArray_h
diff --git a/Common/Core/vtkSparseArray.h b/Common/Core/vtkSparseArray.h
index c82f077aa6883ff3324e623c22d66ffd2769d667..0cf6b6fe1522adfc0522735a9cc4d09eff814761 100644
--- a/Common/Core/vtkSparseArray.h
+++ b/Common/Core/vtkSparseArray.h
@@ -60,8 +60,8 @@
 // .SECTION Thanks
 // Developed by Timothy M. Shead (tshead@sandia.gov) at Sandia National Laboratories.
 
-#ifndef __vtkSparseArray_h
-#define __vtkSparseArray_h
+#ifndef vtkSparseArray_h
+#define vtkSparseArray_h
 
 #include "vtkArrayCoordinates.h"
 #include "vtkArraySort.h"
diff --git a/Common/Core/vtkStdString.h b/Common/Core/vtkStdString.h
index 78a31ebd1d0c2c410e665090231eea69c116764b..0706175b24d959a28c5cb8dde9c4e38961e336e5 100644
--- a/Common/Core/vtkStdString.h
+++ b/Common/Core/vtkStdString.h
@@ -18,8 +18,8 @@
 // names than basic_string<...> in namespace std given by the standard
 // STL string.
 
-#ifndef __vtkStdString_h
-#define __vtkStdString_h
+#ifndef vtkStdString_h
+#define vtkStdString_h
 
 #include "vtkCommonCoreModule.h" // For export macro
 #include "vtkSystemIncludes.h" // For VTKCOMMONCORE_EXPORT.
diff --git a/Common/Core/vtkStringArray.h b/Common/Core/vtkStringArray.h
index 0e6114875f1f7a2209c14f7993b25894c0754d08..3aaf7d28a2f40b2632f83f687e75ca89dfdee601 100644
--- a/Common/Core/vtkStringArray.h
+++ b/Common/Core/vtkStringArray.h
@@ -23,8 +23,8 @@
 // .SECTION Thanks
 // Andy Wilson (atwilso@sandia.gov) wrote this class.
 
-#ifndef __vtkStringArray_h
-#define __vtkStringArray_h
+#ifndef vtkStringArray_h
+#define vtkStringArray_h
 
 #include "vtkCommonCoreModule.h" // For export macro
 #include "vtkAbstractArray.h"
diff --git a/Common/Core/vtkSystemIncludes.h b/Common/Core/vtkSystemIncludes.h
index 07c0b220942a94ab7353c86b38f4dd03b15bb6e1..f959a908e0b3a4fc0ec091b26660755c6d4915d0 100644
--- a/Common/Core/vtkSystemIncludes.h
+++ b/Common/Core/vtkSystemIncludes.h
@@ -18,8 +18,8 @@
 // The vtkSystemIncludes centralizes the inclusion of system include
 // files.
 
-#ifndef __vtkSystemIncludes_h
-#define __vtkSystemIncludes_h
+#ifndef vtkSystemIncludes_h
+#define vtkSystemIncludes_h
 
 /* first include the local configuration for this machine */
 #define __VTK_SYSTEM_INCLUDES__INSIDE
diff --git a/Common/Core/vtkTemplateAliasMacro.h b/Common/Core/vtkTemplateAliasMacro.h
index e06a1024921da42c26732ffced924e5a1bc7a5f3..f397059ac43d639c94207b6bc4d2676d3145d9ff 100644
--- a/Common/Core/vtkTemplateAliasMacro.h
+++ b/Common/Core/vtkTemplateAliasMacro.h
@@ -33,8 +33,8 @@
 //     vtkTemplateAliasMacro(vtkMyTemplateFunction(static_cast<VTK_TT*>(p)));
 //     }
 
-#ifndef __vtkTemplateAliasMacro_h
-#define __vtkTemplateAliasMacro_h
+#ifndef vtkTemplateAliasMacro_h
+#define vtkTemplateAliasMacro_h
 
 #include "vtkTypeTraits.h"
 
diff --git a/Common/Core/vtkTimePointUtility.h b/Common/Core/vtkTimePointUtility.h
index f3c3b9e2ee3a62bd6542e397cbd6c1043636d7ea..0f20ad1da6dddb5d6947cae50f1ce0ba6886def3 100644
--- a/Common/Core/vtkTimePointUtility.h
+++ b/Common/Core/vtkTimePointUtility.h
@@ -22,8 +22,8 @@
 //
 // vtkTimePointUtility is provides methods to perform common time operations.
 
-#ifndef __vtkTimePointUtility_h
-#define __vtkTimePointUtility_h
+#ifndef vtkTimePointUtility_h
+#define vtkTimePointUtility_h
 
 #include "vtkCommonCoreModule.h" // For export macro
 #include "vtkObject.h"
diff --git a/Common/Core/vtkTimeStamp.h b/Common/Core/vtkTimeStamp.h
index 20a137ae64e016dbd5bb6676befe47a4432ab5bf..da66922bb9460e8e970ff6f9afbeffc0f3285fa0 100644
--- a/Common/Core/vtkTimeStamp.h
+++ b/Common/Core/vtkTimeStamp.h
@@ -20,8 +20,8 @@
 // There is built in support for the binary < and > comparison
 // operators between two vtkTimeStamp objects.
 
-#ifndef __vtkTimeStamp_h
-#define __vtkTimeStamp_h
+#ifndef vtkTimeStamp_h
+#define vtkTimeStamp_h
 
 #include "vtkCommonCoreModule.h" // For export macro
 #include "vtkSystemIncludes.h"
diff --git a/Common/Core/vtkType.h b/Common/Core/vtkType.h
index 0c5ca082692767aa8365dca89a92976a540c10a7..7401d1d54084f733731beb1f3df6102ae65b5b3c 100644
--- a/Common/Core/vtkType.h
+++ b/Common/Core/vtkType.h
@@ -12,8 +12,8 @@
      PURPOSE.  See the above copyright notice for more information.
 
 =========================================================================*/
-#ifndef __vtkType_h
-#define __vtkType_h
+#ifndef vtkType_h
+#define vtkType_h
 
 #include "vtkConfigure.h"
 
diff --git a/Common/Core/vtkTypeTemplate.h b/Common/Core/vtkTypeTemplate.h
index b3518c2693c20fa8383a8b3c091e46cbb4f2d72a..6ae8f80701b0db68e9154244e91bee8221d352b3 100644
--- a/Common/Core/vtkTypeTemplate.h
+++ b/Common/Core/vtkTypeTemplate.h
@@ -25,8 +25,8 @@
 // .SECTION Thanks
 // Developed by Timothy M. Shead (tshead@sandia.gov) at Sandia National Laboratories.
 
-#ifndef __vtkTypeTemplate_h
-#define __vtkTypeTemplate_h
+#ifndef vtkTypeTemplate_h
+#define vtkTypeTemplate_h
 
 #include "vtkObjectBase.h"
 #include <string>
diff --git a/Common/Core/vtkTypeTraits.h b/Common/Core/vtkTypeTraits.h
index 6b90d935b71106f9fecf0f4614b59f96f3e96c4f..25b544230fbcf96d13f8686283092907a6911ba2 100644
--- a/Common/Core/vtkTypeTraits.h
+++ b/Common/Core/vtkTypeTraits.h
@@ -16,8 +16,8 @@
 // .SECTION Description
 // vtkTypeTraits provides information about VTK's supported scalar types
 // that is useful for templates.
-#ifndef __vtkTypeTraits_h
-#define __vtkTypeTraits_h
+#ifndef vtkTypeTraits_h
+#define vtkTypeTraits_h
 
 #include "vtkSystemIncludes.h"
 
diff --git a/Common/Core/vtkTypedArray.h b/Common/Core/vtkTypedArray.h
index 455dfcaec58e38284c001005261606f720ad4568..07ef8cf1a497456da9ef508d6425e0f6216d19e7 100644
--- a/Common/Core/vtkTypedArray.h
+++ b/Common/Core/vtkTypedArray.h
@@ -41,8 +41,8 @@
 // .SECTION Thanks
 // Developed by Timothy M. Shead (tshead@sandia.gov) at Sandia National Laboratories.
 
-#ifndef __vtkTypedArray_h
-#define __vtkTypedArray_h
+#ifndef vtkTypedArray_h
+#define vtkTypedArray_h
 
 #include "vtkArray.h"
 #include "vtkTypeTemplate.h"
diff --git a/Common/Core/vtkTypedDataArray.h b/Common/Core/vtkTypedDataArray.h
index 987e48988c4a2241ae2247c25c35824c4c05de30..1f761d45f9ef99099f2fe5a2d728a760cc2140d5 100644
--- a/Common/Core/vtkTypedDataArray.h
+++ b/Common/Core/vtkTypedDataArray.h
@@ -25,8 +25,8 @@
 // GetDataType(). To fix this, such subclasses should override GetDataType() to
 // return VTK_ID_TYPE.
 
-#ifndef __vtkTypedDataArray_h
-#define __vtkTypedDataArray_h
+#ifndef vtkTypedDataArray_h
+#define vtkTypedDataArray_h
 
 #include "vtkDataArray.h"
 
@@ -163,6 +163,6 @@ typename vtkTypedDataArray<Scalar>::Iterator vtkTypedDataArray<Scalar>::End()
 
 #include "vtkTypedDataArray.txx"
 
-#endif //__vtkTypedDataArray_h
+#endif //vtkTypedDataArray_h
 
 // VTK-HeaderTest-Exclude: vtkTypedDataArray.h
diff --git a/Common/Core/vtkTypedDataArrayIterator.h b/Common/Core/vtkTypedDataArrayIterator.h
index db55c5dbf532df9e5b8093e728f6d342dcee2a28..dd2883380dd49a7904608f04723462269f69640a 100644
--- a/Common/Core/vtkTypedDataArrayIterator.h
+++ b/Common/Core/vtkTypedDataArrayIterator.h
@@ -24,8 +24,8 @@
 // for safely iterating through subclasses of vtkMappedDataArray, which may
 // not use the same memory layout as a typical vtkDataArray.
 
-#ifndef __vtkTypedDataArrayIterator_h
-#define __vtkTypedDataArrayIterator_h
+#ifndef vtkTypedDataArrayIterator_h
+#define vtkTypedDataArrayIterator_h
 
 #include <iterator> // For iterator traits
 
@@ -164,6 +164,6 @@ private:
   vtkIdType Index;
 };
 
-#endif // __vtkTypedDataArrayIterator_h
+#endif // vtkTypedDataArrayIterator_h
 
 // VTK-HeaderTest-Exclude: vtkTypedDataArrayIterator.h
diff --git a/Common/Core/vtkUnicodeString.h b/Common/Core/vtkUnicodeString.h
index 565a7eb8ad3112f74ea8329a9ce8a87c22df3665..2ae940f728db9b78fc7a073b0c97380a5a143166 100644
--- a/Common/Core/vtkUnicodeString.h
+++ b/Common/Core/vtkUnicodeString.h
@@ -41,8 +41,8 @@
 // .SECTION Thanks
 // Developed by Timothy M. Shead (tshead@sandia.gov) at Sandia National Laboratories.
 
-#ifndef __vtkUnicodeString_h
-#define __vtkUnicodeString_h
+#ifndef vtkUnicodeString_h
+#define vtkUnicodeString_h
 
 #include "vtkCommonCoreModule.h" // For export macro
 #include "vtkSystemIncludes.h"
diff --git a/Common/Core/vtkUnicodeStringArray.h b/Common/Core/vtkUnicodeStringArray.h
index 7a19081cc9fd49e7bd8417caf43f6002ee708604..0a2bfa805f80d072bc4b6cfafa130fb5efbc37df 100644
--- a/Common/Core/vtkUnicodeStringArray.h
+++ b/Common/Core/vtkUnicodeStringArray.h
@@ -26,8 +26,8 @@
 // .SECTION Thanks
 // Developed by Timothy M. Shead (tshead@sandia.gov) at Sandia National Laboratories.
 
-#ifndef __vtkUnicodeStringArray_h
-#define __vtkUnicodeStringArray_h
+#ifndef vtkUnicodeStringArray_h
+#define vtkUnicodeStringArray_h
 
 #include "vtkCommonCoreModule.h" // For export macro
 #include "vtkAbstractArray.h"
diff --git a/Common/Core/vtkUnsignedCharArray.h b/Common/Core/vtkUnsignedCharArray.h
index a0fa1ff45d85ac6c36bca4352d6b0edb6c714c2c..e10cf0d4d4578b343172cdbb744211df5a9fe2cf 100644
--- a/Common/Core/vtkUnsignedCharArray.h
+++ b/Common/Core/vtkUnsignedCharArray.h
@@ -18,8 +18,8 @@
 // It provides methods for insertion and retrieval of values and will
 // automatically resize itself to hold new data.
 
-#ifndef __vtkUnsignedCharArray_h
-#define __vtkUnsignedCharArray_h
+#ifndef vtkUnsignedCharArray_h
+#define vtkUnsignedCharArray_h
 
 // Tell the template header how to give our superclass a DLL interface.
 #if !defined(vtkUnsignedCharArray_cxx)
diff --git a/Common/Core/vtkUnsignedIntArray.h b/Common/Core/vtkUnsignedIntArray.h
index 85a1d47d16014bb7e43a27397c79ad39cdf51683..8844471b1bf801d9ab3c10945323772465498ca8 100644
--- a/Common/Core/vtkUnsignedIntArray.h
+++ b/Common/Core/vtkUnsignedIntArray.h
@@ -18,8 +18,8 @@
 // provides methods for insertion and retrieval of values and will
 // automatically resize itself to hold new data.
 
-#ifndef __vtkUnsignedIntArray_h
-#define __vtkUnsignedIntArray_h
+#ifndef vtkUnsignedIntArray_h
+#define vtkUnsignedIntArray_h
 
 // Tell the template header how to give our superclass a DLL interface.
 #if !defined(vtkUnsignedIntArray_cxx)
diff --git a/Common/Core/vtkUnsignedLongArray.h b/Common/Core/vtkUnsignedLongArray.h
index 441ad8317a6c0cc7ba3179ff4716cade591427cf..6813a4908a83112be5af473a5111375df2968702 100644
--- a/Common/Core/vtkUnsignedLongArray.h
+++ b/Common/Core/vtkUnsignedLongArray.h
@@ -18,8 +18,8 @@
 // It provides methods for insertion and retrieval of values and will
 // automatically resize itself to hold new data.
 
-#ifndef __vtkUnsignedLongArray_h
-#define __vtkUnsignedLongArray_h
+#ifndef vtkUnsignedLongArray_h
+#define vtkUnsignedLongArray_h
 
 // Tell the template header how to give our superclass a DLL interface.
 #if !defined(vtkUnsignedLongArray_cxx)
diff --git a/Common/Core/vtkUnsignedLongLongArray.h b/Common/Core/vtkUnsignedLongLongArray.h
index d971e9a9e4f1d827169c96cbadabf60114096691..bd4aa2dc2bfa477e1ecb4692055258c368641f7d 100644
--- a/Common/Core/vtkUnsignedLongLongArray.h
+++ b/Common/Core/vtkUnsignedLongLongArray.h
@@ -18,8 +18,8 @@
 // It provides methods for insertion and retrieval of values and will
 // automatically resize itself to hold new data.
 
-#ifndef __vtkUnsignedLongLongArray_h
-#define __vtkUnsignedLongLongArray_h
+#ifndef vtkUnsignedLongLongArray_h
+#define vtkUnsignedLongLongArray_h
 
 // Tell the template header how to give our superclass a DLL interface.
 #if !defined(vtkUnsignedLongLongArray_cxx)
diff --git a/Common/Core/vtkUnsignedShortArray.h b/Common/Core/vtkUnsignedShortArray.h
index 3095f62313a9c8fb389da2cec53670587aa47efc..b730ad02e0cc4e5ee93e385bf5b5c17971c12f26 100644
--- a/Common/Core/vtkUnsignedShortArray.h
+++ b/Common/Core/vtkUnsignedShortArray.h
@@ -18,8 +18,8 @@
 // It provides methods for insertion and retrieval of values and will
 // automatically resize itself to hold new data.
 
-#ifndef __vtkUnsignedShortArray_h
-#define __vtkUnsignedShortArray_h
+#ifndef vtkUnsignedShortArray_h
+#define vtkUnsignedShortArray_h
 
 // Tell the template header how to give our superclass a DLL interface.
 #if !defined(vtkUnsignedShortArray_cxx)
diff --git a/Common/Core/vtkUnsigned__Int64Array.h b/Common/Core/vtkUnsigned__Int64Array.h
index cff9262f9ef708964d891d9f1e78f1a3f03c0e9e..bcea6795f4fa90c6938e9fe64ab515bec2666d89 100644
--- a/Common/Core/vtkUnsigned__Int64Array.h
+++ b/Common/Core/vtkUnsigned__Int64Array.h
@@ -18,8 +18,8 @@
 // It provides methods for insertion and retrieval of values and will
 // automatically resize itself to hold new data.
 
-#ifndef __vtkUnsigned__Int64Array_h
-#define __vtkUnsigned__Int64Array_h
+#ifndef vtkUnsigned__Int64Array_h
+#define vtkUnsigned__Int64Array_h
 
 // Tell the template header how to give our superclass a DLL interface.
 #if !defined(vtkUnsigned__Int64Array_cxx)
diff --git a/Common/Core/vtkVariant.h b/Common/Core/vtkVariant.h
index 0a5472dd2bb9276486c04a061639b4dc3ab9d358..ffdb00bfd1fac9481dbe75e0fa02b77f1cbda932 100644
--- a/Common/Core/vtkVariant.h
+++ b/Common/Core/vtkVariant.h
@@ -26,8 +26,8 @@
 // Sandia National Laboratories for their help in developing this class.
 
 
-#ifndef __vtkVariant_h
-#define __vtkVariant_h
+#ifndef vtkVariant_h
+#define vtkVariant_h
 
 #include "vtkCommonCoreModule.h" // For export macro
 #include "vtkType.h"           // To define type IDs and VTK_TYPE_USE_* flags
diff --git a/Common/Core/vtkVariantArray.h b/Common/Core/vtkVariantArray.h
index 57315dbe0a662021c917c44e5678c7e2b25f0238..fadc4ec685b3bf09a86310e7d9040ca6bcf010ed 100644
--- a/Common/Core/vtkVariantArray.h
+++ b/Common/Core/vtkVariantArray.h
@@ -26,8 +26,8 @@
 // Sandia National Laboratories for their help in developing this class.
 
 
-#ifndef __vtkVariantArray_h
-#define __vtkVariantArray_h
+#ifndef vtkVariantArray_h
+#define vtkVariantArray_h
 
 #include "vtkCommonCoreModule.h" // For export macro
 #include "vtkAbstractArray.h"
diff --git a/Common/Core/vtkVariantCast.h b/Common/Core/vtkVariantCast.h
index 3e7ea8c5631ba120f70d987b0ff52fb7d0ffce3a..1c4f58229c8e45313796a00465b14a8597ca7efb 100644
--- a/Common/Core/vtkVariantCast.h
+++ b/Common/Core/vtkVariantCast.h
@@ -31,8 +31,8 @@
 // .SECTION Thanks
 // Developed by Timothy M. Shead (tshead@sandia.gov) at Sandia National Laboratories.
 
-#ifndef __vtkVariantCast_h
-#define __vtkVariantCast_h
+#ifndef vtkVariantCast_h
+#define vtkVariantCast_h
 
 #include "vtkUnicodeString.h"
 #include <typeinfo> // for warnings
diff --git a/Common/Core/vtkVariantCreate.h b/Common/Core/vtkVariantCreate.h
index da808067c67d419072c024838b51d5cc997c1e40..1e083b541d5fde30071a07c64cb44bab91489911 100644
--- a/Common/Core/vtkVariantCreate.h
+++ b/Common/Core/vtkVariantCreate.h
@@ -27,8 +27,8 @@
 // .SECTION Thanks
 // Developed by Timothy M. Shead (tshead@sandia.gov) at Sandia National Laboratories.
 
-#ifndef __vtkVariantCreate_h
-#define __vtkVariantCreate_h
+#ifndef vtkVariantCreate_h
+#define vtkVariantCreate_h
 
 #include <typeinfo> // for warnings
 
diff --git a/Common/Core/vtkVariantExtract.h b/Common/Core/vtkVariantExtract.h
index a39b218ec172f99141b68892f3d665b9508a3b2b..af97b602b6b34ac56146fac81cbf4c77cdf77b80 100644
--- a/Common/Core/vtkVariantExtract.h
+++ b/Common/Core/vtkVariantExtract.h
@@ -30,8 +30,8 @@
 // .SECTION Thanks
 // Developed by Timothy M. Shead (tshead@sandia.gov) at Sandia National Laboratories.
 
-#ifndef __vtkVariantExtract_h
-#define __vtkVariantExtract_h
+#ifndef vtkVariantExtract_h
+#define vtkVariantExtract_h
 
 #include <typeinfo> // for typeid
 
diff --git a/Common/Core/vtkVersion.h b/Common/Core/vtkVersion.h
index bca226aa6dec28f33f7346dd0e3cf1430e84bf9f..d6fd59ad21346fd1062a8a1d1de362f367ee0d26 100644
--- a/Common/Core/vtkVersion.h
+++ b/Common/Core/vtkVersion.h
@@ -22,8 +22,8 @@
 // timestamps a particular source release.
 
 
-#ifndef __vtkVersion_h
-#define __vtkVersion_h
+#ifndef vtkVersion_h
+#define vtkVersion_h
 
 
 #include "vtkCommonCoreModule.h" // For export macro
diff --git a/Common/Core/vtkVoidArray.h b/Common/Core/vtkVoidArray.h
index ca3f60300630788a1a99e026eaa841547eff527b..52393295246f406edb910ad7300d64bd8f76e070 100644
--- a/Common/Core/vtkVoidArray.h
+++ b/Common/Core/vtkVoidArray.h
@@ -18,8 +18,8 @@
 // for insertion and retrieval of these pointers values, and will
 // automatically resize itself to hold new data.
 
-#ifndef __vtkVoidArray_h
-#define __vtkVoidArray_h
+#ifndef vtkVoidArray_h
+#define vtkVoidArray_h
 
 #include "vtkCommonCoreModule.h" // For export macro
 #include "vtkObject.h"
diff --git a/Common/Core/vtkWeakPointer.h b/Common/Core/vtkWeakPointer.h
index 0f17aef7b6df89ea90f840c6b4144f6d4833ba5c..400646260293100666f12e24883038aaaba2b7be 100644
--- a/Common/Core/vtkWeakPointer.h
+++ b/Common/Core/vtkWeakPointer.h
@@ -37,8 +37,8 @@
 //   }
 // \endcode
 
-#ifndef __vtkWeakPointer_h
-#define __vtkWeakPointer_h
+#ifndef vtkWeakPointer_h
+#define vtkWeakPointer_h
 
 #include "vtkWeakPointerBase.h"
 
diff --git a/Common/Core/vtkWeakPointerBase.h b/Common/Core/vtkWeakPointerBase.h
index 71fcb1d1ae3f286a494da15c9accc10dd560b4b2..18f94fbdac70a6fc0c1c6b0434b44789466b8c10 100644
--- a/Common/Core/vtkWeakPointerBase.h
+++ b/Common/Core/vtkWeakPointerBase.h
@@ -19,8 +19,8 @@
 // when the vtkObjectBase referred to is destroyed, the pointer gets initialized to
 // NULL, thus avoid dangling references.
 
-#ifndef __vtkWeakPointerBase_h
-#define __vtkWeakPointerBase_h
+#ifndef vtkWeakPointerBase_h
+#define vtkWeakPointerBase_h
 
 #include "vtkCommonCoreModule.h" // For export macro
 #include "vtkObjectBase.h"
diff --git a/Common/Core/vtkWin32Header.h b/Common/Core/vtkWin32Header.h
index bd403df435a7c1ec7c345729f787f058105c2afd..a60e73031df6f81a3ea38a7e1bab661b869219ab 100644
--- a/Common/Core/vtkWin32Header.h
+++ b/Common/Core/vtkWin32Header.h
@@ -17,8 +17,8 @@
 // The vtkWin32Header captures some system differences between Unix and
 // Windows operating systems.
 
-#ifndef __vtkWIN32Header_h
-#define __vtkWIN32Header_h
+#ifndef vtkWIN32Header_h
+#define vtkWIN32Header_h
 
 #ifndef __VTK_SYSTEM_INCLUDES__INSIDE
 Do_not_include_vtkWin32Header_directly__vtkSystemIncludes_includes_it;
diff --git a/Common/Core/vtkWin32OutputWindow.h b/Common/Core/vtkWin32OutputWindow.h
index e5c79c8d1ea8ece57f55bcead11fda3c6d54f23d..dcc633e3fd7b3b0022a99835a91503bfe2a6d219 100644
--- a/Common/Core/vtkWin32OutputWindow.h
+++ b/Common/Core/vtkWin32OutputWindow.h
@@ -22,8 +22,8 @@
 // the vtkObject::GlobalWarningDisplayOff() function is called.  The
 // window is created the next time text is written to the window.
 
-#ifndef __vtkWin32OutputWindow_h
-#define __vtkWin32OutputWindow_h
+#ifndef vtkWin32OutputWindow_h
+#define vtkWin32OutputWindow_h
 
 #include "vtkCommonCoreModule.h" // For export macro
 #include "vtkOutputWindow.h"
diff --git a/Common/Core/vtkWin32ProcessOutputWindow.h b/Common/Core/vtkWin32ProcessOutputWindow.h
index 013cc106ea6fc906419b6c9ce02ccedc6606eb66..ca98cb14bc97e29864508b908335b172c2bca95a 100644
--- a/Common/Core/vtkWin32ProcessOutputWindow.h
+++ b/Common/Core/vtkWin32ProcessOutputWindow.h
@@ -19,8 +19,8 @@
 // process display VTK errors so that if a VTK application crashes,
 // the error messages are still available.
 
-#ifndef __vtkWin32ProcessOutputWindow_h
-#define __vtkWin32ProcessOutputWindow_h
+#ifndef vtkWin32ProcessOutputWindow_h
+#define vtkWin32ProcessOutputWindow_h
 
 #include "vtkCommonCoreModule.h" // For export macro
 #include "vtkOutputWindow.h"
diff --git a/Common/Core/vtkWindow.h b/Common/Core/vtkWindow.h
index 395e29a23db2c64086d5b1aaadd9f33b6980f314..3f54942a6958c6e77d893a623339571341803c49 100644
--- a/Common/Core/vtkWindow.h
+++ b/Common/Core/vtkWindow.h
@@ -20,8 +20,8 @@
 // .SECTION see also
 // vtkRenderWindow vtkViewport
 
-#ifndef __vtkWindow_h
-#define __vtkWindow_h
+#ifndef vtkWindow_h
+#define vtkWindow_h
 
 #include "vtkCommonCoreModule.h" // For export macro
 #include "vtkObject.h"
diff --git a/Common/Core/vtkWindows.h b/Common/Core/vtkWindows.h
index 9d6c1c0ecc7ece5a1be169be85dfa00f594eddda..d3c1d26fd9fd7fa3baf88b41d5b54380587a7352 100644
--- a/Common/Core/vtkWindows.h
+++ b/Common/Core/vtkWindows.h
@@ -12,8 +12,8 @@
      PURPOSE.  See the above copyright notice for more information.
 
 =========================================================================*/
-#ifndef __vtkWindows_h
-#define __vtkWindows_h
+#ifndef vtkWindows_h
+#define vtkWindows_h
 
 /* This header is useless when not on windows or when the windows
    header has already been included at the top of VTK.  Block the
diff --git a/Common/Core/vtkXMLFileOutputWindow.h b/Common/Core/vtkXMLFileOutputWindow.h
index 09acdecc7a5473e6ccac713691fff13a12ec53bd..9882c0b75c2bb451e40846507e8c663a14e0542f 100644
--- a/Common/Core/vtkXMLFileOutputWindow.h
+++ b/Common/Core/vtkXMLFileOutputWindow.h
@@ -32,8 +32,8 @@
 // class, instantiate it and then call SetInstance(this).
 
 
-#ifndef __vtkXMLFileOutputWindow_h
-#define __vtkXMLFileOutputWindow_h
+#ifndef vtkXMLFileOutputWindow_h
+#define vtkXMLFileOutputWindow_h
 
 #include "vtkCommonCoreModule.h" // For export macro
 #include "vtkFileOutputWindow.h"
diff --git a/Common/Core/vtk__Int64Array.h b/Common/Core/vtk__Int64Array.h
index 59a2c94ee906834d2ce93d9f5125c8e4b3e4d07e..538277b271f45c997905c8d845adb718c110319f 100644
--- a/Common/Core/vtk__Int64Array.h
+++ b/Common/Core/vtk__Int64Array.h
@@ -18,8 +18,8 @@
 // It provides methods for insertion and retrieval of values and will
 // automatically resize itself to hold new data.
 
-#ifndef __vtk__Int64Array_h
-#define __vtk__Int64Array_h
+#ifndef vtk__Int64Array_h
+#define vtk__Int64Array_h
 
 // Tell the template header how to give our superclass a DLL interface.
 #if !defined(vtk__Int64Array_cxx)
diff --git a/Common/DataModel/vtkAMRBox.h b/Common/DataModel/vtkAMRBox.h
index 911e08eaca25e1523a463e5fc068473d92e6b2ef..e73bfa83872d03b9b37d40935df687580a0968b6 100644
--- a/Common/DataModel/vtkAMRBox.h
+++ b/Common/DataModel/vtkAMRBox.h
@@ -20,8 +20,8 @@
 // .SECTION See Also
 // vtkAMRInformation
 
-#ifndef __vtkAMRBox_h
-#define __vtkAMRBox_h
+#ifndef vtkAMRBox_h
+#define vtkAMRBox_h
 
 #include "vtkCommonDataModelModule.h" // For export macro
 #include "vtkObject.h"
diff --git a/Common/DataModel/vtkAMRDataInternals.h b/Common/DataModel/vtkAMRDataInternals.h
index 1344fdfa24370d94a4191a5ba430a620014bbc35..8618c1588da488faa39c284079378d230c8f883f 100644
--- a/Common/DataModel/vtkAMRDataInternals.h
+++ b/Common/DataModel/vtkAMRDataInternals.h
@@ -20,8 +20,8 @@
 // .SECTION See Also
 // vtkOverlappingAMR, vtkAMRBox
 
-#ifndef __vtkAMRDataInternals_h
-#define __vtkAMRDataInternals_h
+#ifndef vtkAMRDataInternals_h
+#define vtkAMRDataInternals_h
 
 #include "vtkCommonDataModelModule.h" // For export macro
 #include "vtkObject.h"
diff --git a/Common/DataModel/vtkAMRInformation.h b/Common/DataModel/vtkAMRInformation.h
index 466be53c1901921abd773597997e7277d5636fdb..1a615e7ad7dad4b047b38212d1565c83098b5d4d 100644
--- a/Common/DataModel/vtkAMRInformation.h
+++ b/Common/DataModel/vtkAMRInformation.h
@@ -25,8 +25,8 @@
 // .SECTION See Also
 // vtkOverlappingAMR, vtkAMRBox
 
-#ifndef __vtkAMRInformation_h
-#define __vtkAMRInformation_h
+#ifndef vtkAMRInformation_h
+#define vtkAMRInformation_h
 
 #include "vtkCommonDataModelModule.h" // For export macro
 #include "vtkObject.h"
diff --git a/Common/DataModel/vtkAbstractCellLocator.h b/Common/DataModel/vtkAbstractCellLocator.h
index 114fd24f751c67f22ca70e6cd8527ba98bff63e4..88e751bc840362d74c9184dece0d2ba0caadbe31 100644
--- a/Common/DataModel/vtkAbstractCellLocator.h
+++ b/Common/DataModel/vtkAbstractCellLocator.h
@@ -33,8 +33,8 @@
 // .SECTION See Also
 // vtkLocator vtkPointLocator vtkOBBTree vtkCellLocator
 
-#ifndef __vtkAbstractCellLocator_h
-#define __vtkAbstractCellLocator_h
+#ifndef vtkAbstractCellLocator_h
+#define vtkAbstractCellLocator_h
 
 #include "vtkCommonDataModelModule.h" // For export macro
 #include "vtkLocator.h"
diff --git a/Common/DataModel/vtkAbstractElectronicData.h b/Common/DataModel/vtkAbstractElectronicData.h
index 42103786fae337aa4156f7bf9522aff643112954..2792e33f29b03c092249ac943da345f38f13e7d6 100644
--- a/Common/DataModel/vtkAbstractElectronicData.h
+++ b/Common/DataModel/vtkAbstractElectronicData.h
@@ -16,8 +16,8 @@
 // chemical electronic data
 // .SECTION Description
 
-#ifndef __vtkAbstractElectronicData_h
-#define __vtkAbstractElectronicData_h
+#ifndef vtkAbstractElectronicData_h
+#define vtkAbstractElectronicData_h
 
 #include "vtkCommonDataModelModule.h" // For export macro
 #include "vtkDataObject.h"
diff --git a/Common/DataModel/vtkAbstractPointLocator.h b/Common/DataModel/vtkAbstractPointLocator.h
index 68c0cd34c7bc521a785288646339f4a5682a889c..ac60507ee9b27427d4f9f0d5cdd3d9196a430564 100644
--- a/Common/DataModel/vtkAbstractPointLocator.h
+++ b/Common/DataModel/vtkAbstractPointLocator.h
@@ -21,8 +21,8 @@
 // and finding the closest point.  The points are provided from the specified
 // dataset input.
 
-#ifndef __vtkAbstractPointLocator_h
-#define __vtkAbstractPointLocator_h
+#ifndef vtkAbstractPointLocator_h
+#define vtkAbstractPointLocator_h
 
 #include "vtkCommonDataModelModule.h" // For export macro
 #include "vtkLocator.h"
diff --git a/Common/DataModel/vtkAdjacentVertexIterator.h b/Common/DataModel/vtkAdjacentVertexIterator.h
index 74aa4f521a479fdaab88f5be340533fce9a526e0..e00a0a569af6f1fcf74e9f2951fc7cdf8c76a1c3 100644
--- a/Common/DataModel/vtkAdjacentVertexIterator.h
+++ b/Common/DataModel/vtkAdjacentVertexIterator.h
@@ -30,8 +30,8 @@
 // .SECTION Thanks
 //
 
-#ifndef __vtkAdjacentVertexIterator_h
-#define __vtkAdjacentVertexIterator_h
+#ifndef vtkAdjacentVertexIterator_h
+#define vtkAdjacentVertexIterator_h
 
 #include "vtkCommonDataModelModule.h" // For export macro
 #include "vtkObject.h"
diff --git a/Common/DataModel/vtkAnimationScene.h b/Common/DataModel/vtkAnimationScene.h
index e327275f2262ca355f24d8d7099bc9b53528acb7..e6368a307e836e744cc0f0b789f55e40257c38bf 100644
--- a/Common/DataModel/vtkAnimationScene.h
+++ b/Common/DataModel/vtkAnimationScene.h
@@ -24,8 +24,8 @@
 // .SECTION See Also
 // vtkAnimationCue
 
-#ifndef __vtkAnimationScene_h
-#define __vtkAnimationScene_h
+#ifndef vtkAnimationScene_h
+#define vtkAnimationScene_h
 
 #include "vtkCommonDataModelModule.h" // For export macro
 #include "vtkAnimationCue.h"
diff --git a/Common/DataModel/vtkAnnotation.h b/Common/DataModel/vtkAnnotation.h
index e4795ccf92cae824c3fb9fa96b2290a985b608f9..40301dfe72c0585773d24e94824dd3c216aed9d6 100644
--- a/Common/DataModel/vtkAnnotation.h
+++ b/Common/DataModel/vtkAnnotation.h
@@ -30,8 +30,8 @@
 // Timothy M. Shead (tshead@sandia.gov) at Sandia National Laboratories
 // contributed code to this class.
 
-#ifndef __vtkAnnotation_h
-#define __vtkAnnotation_h
+#ifndef vtkAnnotation_h
+#define vtkAnnotation_h
 
 #include "vtkCommonDataModelModule.h" // For export macro
 #include "vtkDataObject.h"
diff --git a/Common/DataModel/vtkAnnotationLayers.h b/Common/DataModel/vtkAnnotationLayers.h
index 047a8a7eb7841d65878a89cba0693e23a4af491a..898762dd1ef3929dd5376b6ab3fa2453eb7be896 100644
--- a/Common/DataModel/vtkAnnotationLayers.h
+++ b/Common/DataModel/vtkAnnotationLayers.h
@@ -27,8 +27,8 @@
 // layers introduces a prioritization of annotations. Annotations in
 // higher layers may obscure annotations in lower layers.
 
-#ifndef __vtkAnnotationLayers_h
-#define __vtkAnnotationLayers_h
+#ifndef vtkAnnotationLayers_h
+#define vtkAnnotationLayers_h
 
 #include "vtkCommonDataModelModule.h" // For export macro
 #include "vtkDataObject.h"
diff --git a/Common/DataModel/vtkArrayData.h b/Common/DataModel/vtkArrayData.h
index 8f2509ae367b96aae3a30c90ae22514bc9d44a91..b020bff7778e0c92e1226b28781a5e8ff7b8b400 100644
--- a/Common/DataModel/vtkArrayData.h
+++ b/Common/DataModel/vtkArrayData.h
@@ -34,8 +34,8 @@
 // .SECTION Thanks
 // Developed by Timothy M. Shead (tshead@sandia.gov) at Sandia National Laboratories.
 
-#ifndef __vtkArrayData_h
-#define __vtkArrayData_h
+#ifndef vtkArrayData_h
+#define vtkArrayData_h
 
 #include "vtkCommonDataModelModule.h" // For export macro
 #include "vtkArray.h"
diff --git a/Common/DataModel/vtkAtom.h b/Common/DataModel/vtkAtom.h
index aeaa50da1176c63f6975873a5c3b95f07c5e6c7e..bf698cd2fd5e38ac2705135e8ba593e63bd9ba29 100644
--- a/Common/DataModel/vtkAtom.h
+++ b/Common/DataModel/vtkAtom.h
@@ -15,8 +15,8 @@
 // .NAME vtkAtom - convenience proxy for vtkMolecule
 // .SECTION Description
 
-#ifndef __vtkAtom_h
-#define __vtkAtom_h
+#ifndef vtkAtom_h
+#define vtkAtom_h
 
 #include "vtkCommonDataModelModule.h" // For export macro
 #include "vtkObject.h" // For macros, defines, etc
diff --git a/Common/DataModel/vtkAttributesErrorMetric.h b/Common/DataModel/vtkAttributesErrorMetric.h
index bf3476eaa1d8d329b1c83212f190f185d028be01..3e1875fd77a042db69df6c76e3fcb5591c061f22 100644
--- a/Common/DataModel/vtkAttributesErrorMetric.h
+++ b/Common/DataModel/vtkAttributesErrorMetric.h
@@ -22,8 +22,8 @@
 // .SECTION See Also
 // vtkGenericCellTessellator vtkGenericSubdivisionErrorMetric
 
-#ifndef __vtkAttributesErrorMetric_h
-#define __vtkAttributesErrorMetric_h
+#ifndef vtkAttributesErrorMetric_h
+#define vtkAttributesErrorMetric_h
 
 #include "vtkCommonDataModelModule.h" // For export macro
 #include "vtkGenericSubdivisionErrorMetric.h"
diff --git a/Common/DataModel/vtkBSPCuts.h b/Common/DataModel/vtkBSPCuts.h
index b42766367f02c80b6c4c916c5db0e810ef8aeca3..98f1f1a798374d0deaa58526820b9c3b6e5590a5 100644
--- a/Common/DataModel/vtkBSPCuts.h
+++ b/Common/DataModel/vtkBSPCuts.h
@@ -30,8 +30,8 @@
 // .SECTION See Also
 //      vtkKdTree vtkKdNode vtkDistributedDataFilter
 
-#ifndef __vtkBSPCuts_h
-#define __vtkBSPCuts_h
+#ifndef vtkBSPCuts_h
+#define vtkBSPCuts_h
 
 #include "vtkCommonDataModelModule.h" // For export macro
 #include "vtkDataObject.h"
diff --git a/Common/DataModel/vtkBSPIntersections.h b/Common/DataModel/vtkBSPIntersections.h
index 216b2798fa8afff5059a4f4fd40cea008536c7f0..f67a34edf26224092b1771af857e6dc7cc49c922 100644
--- a/Common/DataModel/vtkBSPIntersections.h
+++ b/Common/DataModel/vtkBSPIntersections.h
@@ -28,8 +28,8 @@
 // .SECTION See Also
 //    vtkBSPCuts  vtkKdTree
 
-#ifndef __vtkBSPIntersections_h
-#define __vtkBSPIntersections_h
+#ifndef vtkBSPIntersections_h
+#define vtkBSPIntersections_h
 
 #include "vtkCommonDataModelModule.h" // For export macro
 #include "vtkObject.h"
diff --git a/Common/DataModel/vtkBiQuadraticQuad.h b/Common/DataModel/vtkBiQuadraticQuad.h
index 429975d7a836e95d962a082531a880b156f1badf..dd0d26f57fc0f156925a9f3d3fdfc7682fc688d3 100644
--- a/Common/DataModel/vtkBiQuadraticQuad.h
+++ b/Common/DataModel/vtkBiQuadraticQuad.h
@@ -34,8 +34,8 @@
 // Thanks to Soeren Gebbert  who developed this class and
 // integrated it into VTK 5.0.
 
-#ifndef __vtkBiQuadraticQuad_h
-#define __vtkBiQuadraticQuad_h
+#ifndef vtkBiQuadraticQuad_h
+#define vtkBiQuadraticQuad_h
 
 #include "vtkCommonDataModelModule.h" // For export macro
 #include "vtkNonLinearCell.h"
diff --git a/Common/DataModel/vtkBiQuadraticQuadraticHexahedron.h b/Common/DataModel/vtkBiQuadraticQuadraticHexahedron.h
index f1f77daf5da3a687c6b56bff05bd3f4e7d0ae173..fd008a548b396f19dd8b7f73e6933cedcb5a5367 100644
--- a/Common/DataModel/vtkBiQuadraticQuadraticHexahedron.h
+++ b/Common/DataModel/vtkBiQuadraticQuadraticHexahedron.h
@@ -63,8 +63,8 @@
 // integrated it into VTK 5.0.
 
 
-#ifndef __vtkBiQuadraticQuadraticHexahedron_h
-#define __vtkBiQuadraticQuadraticHexahedron_h
+#ifndef vtkBiQuadraticQuadraticHexahedron_h
+#define vtkBiQuadraticQuadraticHexahedron_h
 
 #include "vtkCommonDataModelModule.h" // For export macro
 #include "vtkNonLinearCell.h"
diff --git a/Common/DataModel/vtkBiQuadraticQuadraticWedge.h b/Common/DataModel/vtkBiQuadraticQuadraticWedge.h
index 7da60eee8f4879245f8cd54ff358207a5eb05603..d1f3e3de28791fdbeaca90fd6693025afce3fc8b 100644
--- a/Common/DataModel/vtkBiQuadraticQuadraticWedge.h
+++ b/Common/DataModel/vtkBiQuadraticQuadraticWedge.h
@@ -36,8 +36,8 @@
 // integrated it into VTK 5.0.
 
 
-#ifndef __vtkBiQuadraticQuadraticWedge_h
-#define __vtkBiQuadraticQuadraticWedge_h
+#ifndef vtkBiQuadraticQuadraticWedge_h
+#define vtkBiQuadraticQuadraticWedge_h
 
 #include "vtkCommonDataModelModule.h" // For export macro
 #include "vtkNonLinearCell.h"
diff --git a/Common/DataModel/vtkBiQuadraticTriangle.h b/Common/DataModel/vtkBiQuadraticTriangle.h
index fd575bb42b2fa66192e1cb0a7a56f64ffbd246ed..3733e563cfae4c5d506e615423c272f2d64d3fc8 100644
--- a/Common/DataModel/vtkBiQuadraticTriangle.h
+++ b/Common/DataModel/vtkBiQuadraticTriangle.h
@@ -32,8 +32,8 @@
 // Copyright (c) EDF - www.edf.fr
 // </verbatim>
 
-#ifndef __vtkBiQuadraticTriangle_h
-#define __vtkBiQuadraticTriangle_h
+#ifndef vtkBiQuadraticTriangle_h
+#define vtkBiQuadraticTriangle_h
 
 #include "vtkCommonDataModelModule.h" // For export macro
 #include "vtkNonLinearCell.h"
diff --git a/Common/DataModel/vtkBond.h b/Common/DataModel/vtkBond.h
index 38bf66e711e76f716242f8bbe1d4f70691bb6b6d..2f51022517834894fba9c20bc8ec1d19ba01c280 100644
--- a/Common/DataModel/vtkBond.h
+++ b/Common/DataModel/vtkBond.h
@@ -15,8 +15,8 @@
 // .NAME vtkBond - convenience proxy for vtkMolecule
 // .SECTION Description
 
-#ifndef __vtkBond_h
-#define __vtkBond_h
+#ifndef vtkBond_h
+#define vtkBond_h
 
 #include "vtkCommonDataModelModule.h" // For export macro
 #include "vtkObject.h" // For macros, etc
diff --git a/Common/DataModel/vtkBoundingBox.h b/Common/DataModel/vtkBoundingBox.h
index 493926b83e7f081f342dacc60398959365530a50..f2816ecbfd5106cdaf13bfb9898235af84fa47cf 100644
--- a/Common/DataModel/vtkBoundingBox.h
+++ b/Common/DataModel/vtkBoundingBox.h
@@ -21,8 +21,8 @@ PURPOSE.  See the above copyright notice for more information.
 // .SECTION see also
 // vtkBox
 
-#ifndef __vtkBoundingBox_h
-#define __vtkBoundingBox_h
+#ifndef vtkBoundingBox_h
+#define vtkBoundingBox_h
 #include "vtkCommonDataModelModule.h" // For export macro
 #include "vtkSystemIncludes.h"
 
diff --git a/Common/DataModel/vtkBox.h b/Common/DataModel/vtkBox.h
index 90abfcb7559c8b3d250655334327d525f9e16aa0..7b7900671ba13cf8dee5896adc48f041b1791045 100644
--- a/Common/DataModel/vtkBox.h
+++ b/Common/DataModel/vtkBox.h
@@ -25,8 +25,8 @@
 // .SECTION See Also
 // vtkCubeSource vtkImplicitFunction
 
-#ifndef __vtkBox_h
-#define __vtkBox_h
+#ifndef vtkBox_h
+#define vtkBox_h
 
 #include "vtkCommonDataModelModule.h" // For export macro
 #include "vtkImplicitFunction.h"
diff --git a/Common/DataModel/vtkCell.h b/Common/DataModel/vtkCell.h
index ea6b36c3115c08e6858b05197687456305d9bc1b..f6e9c94c779e90da319f858a32d417af6a60460a 100644
--- a/Common/DataModel/vtkCell.h
+++ b/Common/DataModel/vtkCell.h
@@ -31,8 +31,8 @@
 // vtkPolygon vtkQuad vtkTetra vtkTriangle
 // vtkTriangleStrip vtkVertex vtkVoxel vtkWedge vtkPyramid
 
-#ifndef __vtkCell_h
-#define __vtkCell_h
+#ifndef vtkCell_h
+#define vtkCell_h
 
 #define VTK_CELL_SIZE 512
 #define VTK_TOL 1.e-05 // Tolerance for geometric calculation
diff --git a/Common/DataModel/vtkCell3D.h b/Common/DataModel/vtkCell3D.h
index f6d4eaccd23ef4049a05928d9f0f3f1d0c1df647..86f5c6f2364744703974f43ddf04f23ed121f06f 100644
--- a/Common/DataModel/vtkCell3D.h
+++ b/Common/DataModel/vtkCell3D.h
@@ -21,8 +21,8 @@
 // .SECTION See Also
 // vtkTetra vtkHexahedron vtkVoxel vtkWedge vtkPyramid
 
-#ifndef __vtkCell3D_h
-#define __vtkCell3D_h
+#ifndef vtkCell3D_h
+#define vtkCell3D_h
 
 #include "vtkCommonDataModelModule.h" // For export macro
 #include "vtkCell.h"
diff --git a/Common/DataModel/vtkCellArray.h b/Common/DataModel/vtkCellArray.h
index 9e429045d7d5ee03fe38e9bda69d43a6f72c5134..de15bfee7031df0c4a4b5c7ac033cb89aaea6ec9 100644
--- a/Common/DataModel/vtkCellArray.h
+++ b/Common/DataModel/vtkCellArray.h
@@ -29,8 +29,8 @@
 // .SECTION See Also
 // vtkCellTypes vtkCellLinks
 
-#ifndef __vtkCellArray_h
-#define __vtkCellArray_h
+#ifndef vtkCellArray_h
+#define vtkCellArray_h
 
 #include "vtkCommonDataModelModule.h" // For export macro
 #include "vtkObject.h"
diff --git a/Common/DataModel/vtkCellData.h b/Common/DataModel/vtkCellData.h
index ee95f246fb74feda02404688d454ba0b8733e28c..0e3f8740e0fcd84e65eaf8c57051da3eb4725594 100644
--- a/Common/DataModel/vtkCellData.h
+++ b/Common/DataModel/vtkCellData.h
@@ -20,8 +20,8 @@
 // objects, such as passing data through filter, copying data from one
 // cell to another, and interpolating data given cell interpolation weights.
 
-#ifndef __vtkCellData_h
-#define __vtkCellData_h
+#ifndef vtkCellData_h
+#define vtkCellData_h
 
 #include "vtkCommonDataModelModule.h" // For export macro
 #include "vtkDataSetAttributes.h"
diff --git a/Common/DataModel/vtkCellIterator.h b/Common/DataModel/vtkCellIterator.h
index 6de0d1703a9ab2bf1a7c4f16007e631e257f093f..0b4c6c8a883bdacd9c6618e7cb683a597bdbd501 100644
--- a/Common/DataModel/vtkCellIterator.h
+++ b/Common/DataModel/vtkCellIterator.h
@@ -59,8 +59,8 @@
 // fetching unnecessary data. Also note that at the end of the loop, the
 // iterator must be deleted as these iterators are vtkObject subclasses.
 
-#ifndef __vtkCellIterator_h
-#define __vtkCellIterator_h
+#ifndef vtkCellIterator_h
+#define vtkCellIterator_h
 
 #include "vtkCommonDataModelModule.h" // For export macro
 #include "vtkObject.h"
@@ -281,4 +281,4 @@ inline vtkIdType vtkCellIterator::GetNumberOfFaces()
   return this->Faces->GetNumberOfIds() != 0 ? this->Faces->GetId(0) : 0;
 }
 
-#endif //__vtkCellIterator_h
+#endif //vtkCellIterator_h
diff --git a/Common/DataModel/vtkCellLinks.h b/Common/DataModel/vtkCellLinks.h
index 71fae1a5bb8634cb0e6d14112f6655ddfdccde8a..49a2ef0932d132bfb20a51beeca57b1bb20193bf 100644
--- a/Common/DataModel/vtkCellLinks.h
+++ b/Common/DataModel/vtkCellLinks.h
@@ -22,8 +22,8 @@
 // .SECTION See Also
 // vtkCellArray vtkCellTypes
 
-#ifndef __vtkCellLinks_h
-#define __vtkCellLinks_h
+#ifndef vtkCellLinks_h
+#define vtkCellLinks_h
 
 #include "vtkCommonDataModelModule.h" // For export macro
 #include "vtkObject.h"
diff --git a/Common/DataModel/vtkCellLocator.h b/Common/DataModel/vtkCellLocator.h
index 7ab2afa54cd5e801ae4bf8fb1dda50cd9cbb8f17..89866e74697e96c516f7b0658f0c3f4b1d867add 100644
--- a/Common/DataModel/vtkCellLocator.h
+++ b/Common/DataModel/vtkCellLocator.h
@@ -32,8 +32,8 @@
 // .SECTION See Also
 // vtkLocator vtkPointLocator vtkOBBTree
 
-#ifndef __vtkCellLocator_h
-#define __vtkCellLocator_h
+#ifndef vtkCellLocator_h
+#define vtkCellLocator_h
 
 #include "vtkCommonDataModelModule.h" // For export macro
 #include "vtkAbstractCellLocator.h"
diff --git a/Common/DataModel/vtkCellType.h b/Common/DataModel/vtkCellType.h
index 82dafe107b7d3792dbd097b098f3cc433c49d340..72b16cfad7638a6645882bdf4ec0009b13fd0864 100644
--- a/Common/DataModel/vtkCellType.h
+++ b/Common/DataModel/vtkCellType.h
@@ -20,8 +20,8 @@
 // explicitly represented (as in vtkPolyData), or may be implicit to the
 // data type (as in vtkStructuredPoints).
 
-#ifndef __vtkCellType_h
-#define __vtkCellType_h
+#ifndef vtkCellType_h
+#define vtkCellType_h
 
 // To add a new cell type, define a new integer type flag here, then
 // create a subclass of vtkCell to implement the proper behavior. You
diff --git a/Common/DataModel/vtkCellTypes.h b/Common/DataModel/vtkCellTypes.h
index cd3a89df996a01e58423370ad73bce7118c8aa9f..eadfa92901e2ba3b17e3a8653ce502f4725aa7ad 100644
--- a/Common/DataModel/vtkCellTypes.h
+++ b/Common/DataModel/vtkCellTypes.h
@@ -30,8 +30,8 @@
 // .SECTION See Also
 // vtkCellArray vtkCellLinks
 
-#ifndef __vtkCellTypes_h
-#define __vtkCellTypes_h
+#ifndef vtkCellTypes_h
+#define vtkCellTypes_h
 
 #include "vtkCommonDataModelModule.h" // For export macro
 #include "vtkObject.h"
diff --git a/Common/DataModel/vtkColor.h b/Common/DataModel/vtkColor.h
index 7bc744ae898fb74b9447e7d491e49d42ba3cc6de..464a5e4f1d25215bbc5094af4dd9112cc981752c 100644
--- a/Common/DataModel/vtkColor.h
+++ b/Common/DataModel/vtkColor.h
@@ -19,8 +19,8 @@
 // This class is a templated data type for storing and manipulating fixed size
 // colors. It derives from the vtkVector templated data structure.
 
-#ifndef __vtkColor_h
-#define __vtkColor_h
+#ifndef vtkColor_h
+#define vtkColor_h
 
 #include "vtkTuple.h"
 #include "vtkObject.h" // for legacy macros
@@ -337,5 +337,5 @@ const T& vtkColor4<T>::Alpha() const
 }
 #endif // VTK_LEGACY_REMOVE
 
-#endif // __vtkColor_h
+#endif // vtkColor_h
 // VTK-HeaderTest-Exclude: vtkColor.h
diff --git a/Common/DataModel/vtkCompositeDataIterator.h b/Common/DataModel/vtkCompositeDataIterator.h
index d1d49c9dbb583ce36dffd7ed81358b77cf3bc4b7..26a85808c143ed1760231d571730175556ddac54 100644
--- a/Common/DataModel/vtkCompositeDataIterator.h
+++ b/Common/DataModel/vtkCompositeDataIterator.h
@@ -16,8 +16,8 @@
 // .SECTION Description
 // vtkCompositeDataIterator provides an interface for accessing datasets
 // in a collection (vtkCompositeDataIterator).
-#ifndef __vtkCompositeDataIterator_h
-#define __vtkCompositeDataIterator_h
+#ifndef vtkCompositeDataIterator_h
+#define vtkCompositeDataIterator_h
 
 #include "vtkCommonDataModelModule.h" // For export macro
 #include "vtkObject.h"
diff --git a/Common/DataModel/vtkCompositeDataSet.h b/Common/DataModel/vtkCompositeDataSet.h
index 7d014fd16c2aa984d150f1b3a1021ec40227706d..2df4ec96676ce02dd86a5b418bced2e6d9dd29d6 100644
--- a/Common/DataModel/vtkCompositeDataSet.h
+++ b/Common/DataModel/vtkCompositeDataSet.h
@@ -27,8 +27,8 @@
 // .SECTION See Also
 // vtkCompositeDataIterator
 
-#ifndef __vtkCompositeDataSet_h
-#define __vtkCompositeDataSet_h
+#ifndef vtkCompositeDataSet_h
+#define vtkCompositeDataSet_h
 
 #include "vtkCommonDataModelModule.h" // For export macro
 #include "vtkDataObject.h"
diff --git a/Common/DataModel/vtkCone.h b/Common/DataModel/vtkCone.h
index 7caf1bee0ba4f59ebfeba56022c3122ccf63ecf3..8346b276b457fe3cea806ad08e70b4b9f293b22b 100644
--- a/Common/DataModel/vtkCone.h
+++ b/Common/DataModel/vtkCone.h
@@ -25,8 +25,8 @@
 // The cone is infinite in extent. To truncate the cone use the
 // vtkImplicitBoolean in combination with clipping planes.
 
-#ifndef __vtkCone_h
-#define __vtkCone_h
+#ifndef vtkCone_h
+#define vtkCone_h
 
 #include "vtkCommonDataModelModule.h" // For export macro
 #include "vtkImplicitFunction.h"
diff --git a/Common/DataModel/vtkConvexPointSet.h b/Common/DataModel/vtkConvexPointSet.h
index c9d8b7610f0ca494da350887cc572f415a3acfad..c0ad2cf667990a8c400c2b9df8a237a073418ec9 100644
--- a/Common/DataModel/vtkConvexPointSet.h
+++ b/Common/DataModel/vtkConvexPointSet.h
@@ -24,8 +24,8 @@
 // .SECTION See Also
 // vtkHexahedron vtkPyramid vtkTetra vtkVoxel vtkWedge
 
-#ifndef __vtkConvexPointSet_h
-#define __vtkConvexPointSet_h
+#ifndef vtkConvexPointSet_h
+#define vtkConvexPointSet_h
 
 #include "vtkCommonDataModelModule.h" // For export macro
 #include "vtkCell3D.h"
diff --git a/Common/DataModel/vtkCubicLine.h b/Common/DataModel/vtkCubicLine.h
index 5e1255253ae722ca24926619dab41e3414aafd04..ca272bd6303dbdebd086416e178cb3efd6106ee9 100644
--- a/Common/DataModel/vtkCubicLine.h
+++ b/Common/DataModel/vtkCubicLine.h
@@ -28,8 +28,8 @@
 // </verbatim>
 
 
-#ifndef __vtkCubicLine_h
-#define __vtkCubicLine_h
+#ifndef vtkCubicLine_h
+#define vtkCubicLine_h
 
 #include "vtkCommonDataModelModule.h" // For export macro
 #include "vtkNonLinearCell.h"
diff --git a/Common/DataModel/vtkCylinder.h b/Common/DataModel/vtkCylinder.h
index d047a219a811e383ffa6459273694daf1d915fa8..3fd82fbb16d138876184a36e423c7649209f25b7 100644
--- a/Common/DataModel/vtkCylinder.h
+++ b/Common/DataModel/vtkCylinder.h
@@ -25,8 +25,8 @@
 // vtkImplicitBoolean in combination with clipping planes.
 
 
-#ifndef __vtkCylinder_h
-#define __vtkCylinder_h
+#ifndef vtkCylinder_h
+#define vtkCylinder_h
 
 #include "vtkCommonDataModelModule.h" // For export macro
 #include "vtkImplicitFunction.h"
diff --git a/Common/DataModel/vtkDataArrayDispatcher.h b/Common/DataModel/vtkDataArrayDispatcher.h
index 9401abf4440d40a6e7392155fa630f604111ebb0..dcd479f9eef030142e6f83d687d98a98c2e366fb 100644
--- a/Common/DataModel/vtkDataArrayDispatcher.h
+++ b/Common/DataModel/vtkDataArrayDispatcher.h
@@ -46,8 +46,8 @@
 // .SECTION See Also
 // vtkDispatcher vtkDoubleDispatcher
 
-#ifndef __vtkDataArrayDispatcher_h
-#define __vtkDataArrayDispatcher_h
+#ifndef vtkDataArrayDispatcher_h
+#define vtkDataArrayDispatcher_h
 
 #include "vtkType.h" //Required for vtkIdType
 #include "vtkDataArray.h" //required for constructor of the vtkDataArrayFunctor
@@ -168,5 +168,5 @@ ReturnType vtkDataArrayDispatcher<DefaultFunctorType,ReturnType>
   return ReturnType();
   }
 
-#endif // __vtkDataArrayDispatcher_h
+#endif // vtkDataArrayDispatcher_h
 // VTK-HeaderTest-Exclude: vtkDataArrayDispatcher.h
diff --git a/Common/DataModel/vtkDataObject.h b/Common/DataModel/vtkDataObject.h
index 8fbbc1a2c6d54dd8c89ad8524c5ff21e6892bd7d..e1fbad51a19a9e3e84d55767435da45416eb1f00 100644
--- a/Common/DataModel/vtkDataObject.h
+++ b/Common/DataModel/vtkDataObject.h
@@ -29,8 +29,8 @@
 // vtkDataObjectMapper vtkDataObjectToDataSet
 // vtkFieldDataToAttributeDataFilter
 
-#ifndef __vtkDataObject_h
-#define __vtkDataObject_h
+#ifndef vtkDataObject_h
+#define vtkDataObject_h
 
 #include "vtkCommonDataModelModule.h" // For export macro
 #include "vtkObject.h"
diff --git a/Common/DataModel/vtkDataObjectCollection.h b/Common/DataModel/vtkDataObjectCollection.h
index 4b34f6d78c755bbd5b62aa4d6f53608db348b69b..9276c020eada5d967eef30ac89db2a5fddf0efa9 100644
--- a/Common/DataModel/vtkDataObjectCollection.h
+++ b/Common/DataModel/vtkDataObjectCollection.h
@@ -17,8 +17,8 @@
 // vtkDataObjectCollection is an object that creates and manipulates lists of
 // data objects. See also vtkCollection and subclasses.
 
-#ifndef __vtkDataObjectCollection_h
-#define __vtkDataObjectCollection_h
+#ifndef vtkDataObjectCollection_h
+#define vtkDataObjectCollection_h
 
 #include "vtkCommonDataModelModule.h" // For export macro
 #include "vtkCollection.h"
diff --git a/Common/DataModel/vtkDataObjectTree.h b/Common/DataModel/vtkDataObjectTree.h
index b9680d50cbd2e021e5bab35ca0b8325d709ca473..6a980ffa698deda970ee1f96270fd0a051b93e8f 100644
--- a/Common/DataModel/vtkDataObjectTree.h
+++ b/Common/DataModel/vtkDataObjectTree.h
@@ -27,8 +27,8 @@
 // .SECTION See Also
 // vtkDataObjectTreeIterator
 
-#ifndef __vtkDataObjectTree_h
-#define __vtkDataObjectTree_h
+#ifndef vtkDataObjectTree_h
+#define vtkDataObjectTree_h
 
 #include "vtkCommonDataModelModule.h" // For export macro
 #include "vtkCompositeDataSet.h"
diff --git a/Common/DataModel/vtkDataObjectTreeInternals.h b/Common/DataModel/vtkDataObjectTreeInternals.h
index fac4e98aef74e2c63b7746fcd156fd025f2c0cd1..3a0fb4c01a8c16d0dcc3e2af58c19d996cd4d45f 100644
--- a/Common/DataModel/vtkDataObjectTreeInternals.h
+++ b/Common/DataModel/vtkDataObjectTreeInternals.h
@@ -15,8 +15,8 @@
 // .NAME vtkDataObjectTreeInternals
 // .SECTION Description
 
-#ifndef __vtkDataObjectTreeInternals_h
-#define __vtkDataObjectTreeInternals_h
+#ifndef vtkDataObjectTreeInternals_h
+#define vtkDataObjectTreeInternals_h
 
 #include "vtkDataObject.h"
 #include "vtkInformation.h"
diff --git a/Common/DataModel/vtkDataObjectTreeIterator.h b/Common/DataModel/vtkDataObjectTreeIterator.h
index 914ffc7bdca0ad6d96a6d8c32d344e91eba42c6e..aae3d9fa2dc57302f72a6e4852fd62518d0c1149 100644
--- a/Common/DataModel/vtkDataObjectTreeIterator.h
+++ b/Common/DataModel/vtkDataObjectTreeIterator.h
@@ -16,8 +16,8 @@
 // .SECTION Description
 // vtkDataObjectTreeIterator provides an interface for accessing datasets
 // in a collection (vtkDataObjectTreeIterator).
-#ifndef __vtkDataObjectTreeIterator_h
-#define __vtkDataObjectTreeIterator_h
+#ifndef vtkDataObjectTreeIterator_h
+#define vtkDataObjectTreeIterator_h
 
 #include "vtkCommonDataModelModule.h" // For export macro
 #include "vtkCompositeDataIterator.h"
diff --git a/Common/DataModel/vtkDataObjectTypes.h b/Common/DataModel/vtkDataObjectTypes.h
index d81a2e4ec0b6ffefd36b72edfa6dbdf6d58501b0..05fbb8cb5d0f48227b8e594aba9cb1267cbd11a1 100644
--- a/Common/DataModel/vtkDataObjectTypes.h
+++ b/Common/DataModel/vtkDataObjectTypes.h
@@ -21,8 +21,8 @@
 // .SECTION See Also
 // vtkDataObject
 
-#ifndef __vtkDataObjectTypes_h
-#define __vtkDataObjectTypes_h
+#ifndef vtkDataObjectTypes_h
+#define vtkDataObjectTypes_h
 
 #include "vtkCommonDataModelModule.h" // For export macro
 #include "vtkObject.h"
diff --git a/Common/DataModel/vtkDataSet.h b/Common/DataModel/vtkDataSet.h
index 61c5800db6c8e06a50aa029f672d175afb5f8e70..d5b2f9165ead24facb04249f3d733d5be928c999 100644
--- a/Common/DataModel/vtkDataSet.h
+++ b/Common/DataModel/vtkDataSet.h
@@ -34,8 +34,8 @@
 // vtkRectilinearGrid vtkPolyData vtkPointData vtkCellData
 // vtkDataObject vtkFieldData
 
-#ifndef __vtkDataSet_h
-#define __vtkDataSet_h
+#ifndef vtkDataSet_h
+#define vtkDataSet_h
 
 #include "vtkCommonDataModelModule.h" // For export macro
 #include "vtkDataObject.h"
diff --git a/Common/DataModel/vtkDataSetAttributes.h b/Common/DataModel/vtkDataSetAttributes.h
index e7f9afe9ca1fe8c4cd2c7568a7f19e349d013100..ae1b78b9fe874ad2d224aed84992d601bc0b3ecc 100644
--- a/Common/DataModel/vtkDataSetAttributes.h
+++ b/Common/DataModel/vtkDataSetAttributes.h
@@ -38,8 +38,8 @@
 // group of sources have in common, and to copy tuples from a source into
 // the destination, for only those attributes that are held by all.
 
-#ifndef __vtkDataSetAttributes_h
-#define __vtkDataSetAttributes_h
+#ifndef vtkDataSetAttributes_h
+#define vtkDataSetAttributes_h
 
 #include "vtkCommonDataModelModule.h" // For export macro
 #include "vtkFieldData.h"
diff --git a/Common/DataModel/vtkDataSetCellIterator.h b/Common/DataModel/vtkDataSetCellIterator.h
index ce43fe28522beed991c32c2c3a7bb97d0ef38736..fc24f1e157d6c99d2c73a2eea69f903de93364af 100644
--- a/Common/DataModel/vtkDataSetCellIterator.h
+++ b/Common/DataModel/vtkDataSetCellIterator.h
@@ -15,8 +15,8 @@
 // .NAME vtkDataSetCellIterator - Implementation of vtkCellIterator using
 // vtkDataSet API.
 
-#ifndef __vtkDataSetCellIterator_h
-#define __vtkDataSetCellIterator_h
+#ifndef vtkDataSetCellIterator_h
+#define vtkDataSetCellIterator_h
 
 #include "vtkCommonDataModelModule.h" // For export macro
 #include "vtkCellIterator.h"
@@ -55,4 +55,4 @@ private:
   void operator=(const vtkDataSetCellIterator &);   // Not implemented.
 };
 
-#endif //__vtkDataSetCellIterator_h
+#endif //vtkDataSetCellIterator_h
diff --git a/Common/DataModel/vtkDataSetCollection.h b/Common/DataModel/vtkDataSetCollection.h
index 76cf16b945463ba1a7cc0b4c4fc4ddd9e75641c9..17393afb1401f35de4ba7008ee1f08d9f328f636 100644
--- a/Common/DataModel/vtkDataSetCollection.h
+++ b/Common/DataModel/vtkDataSetCollection.h
@@ -17,8 +17,8 @@
 // vtkDataSetCollection is an object that creates and manipulates lists of
 // datasets. See also vtkCollection and subclasses.
 
-#ifndef __vtkDataSetCollection_h
-#define __vtkDataSetCollection_h
+#ifndef vtkDataSetCollection_h
+#define vtkDataSetCollection_h
 
 #include "vtkCommonDataModelModule.h" // For export macro
 #include "vtkCollection.h"
diff --git a/Common/DataModel/vtkDirectedAcyclicGraph.h b/Common/DataModel/vtkDirectedAcyclicGraph.h
index c4a494131b2ac508395bb594c1775a798c10aa0d..7b4f7e4d78290c4129b04a62628558faaa6b7042 100644
--- a/Common/DataModel/vtkDirectedAcyclicGraph.h
+++ b/Common/DataModel/vtkDirectedAcyclicGraph.h
@@ -40,8 +40,8 @@
 // .SECTION See Also
 // vtkDirectedGraph vtkMutableDirectedGraph vtkGraph
 
-#ifndef __vtkDirectedAcyclicGraph_h
-#define __vtkDirectedAcyclicGraph_h
+#ifndef vtkDirectedAcyclicGraph_h
+#define vtkDirectedAcyclicGraph_h
 
 #include "vtkCommonDataModelModule.h" // For export macro
 #include "vtkDirectedGraph.h"
diff --git a/Common/DataModel/vtkDirectedGraph.h b/Common/DataModel/vtkDirectedGraph.h
index 02a16e88db059774c3f2bb6b5dad680c0530acc3..3abb3832fc54751259e8c465ecaa6a57b17cbe78 100644
--- a/Common/DataModel/vtkDirectedGraph.h
+++ b/Common/DataModel/vtkDirectedGraph.h
@@ -32,8 +32,8 @@
 // .SECTION See Also
 // vtkGraph vtkMutableDirectedGraph
 
-#ifndef __vtkDirectedGraph_h
-#define __vtkDirectedGraph_h
+#ifndef vtkDirectedGraph_h
+#define vtkDirectedGraph_h
 
 #include "vtkCommonDataModelModule.h" // For export macro
 #include "vtkGraph.h"
diff --git a/Common/DataModel/vtkDispatcher.h b/Common/DataModel/vtkDispatcher.h
index e2a35b6253f7aa743e7272145e2e0bdc94904101..8c5ecab12e158c62f2fcf84c5039bf977be40689 100644
--- a/Common/DataModel/vtkDispatcher.h
+++ b/Common/DataModel/vtkDispatcher.h
@@ -67,8 +67,8 @@
 // .SECTION See Also
 // vtkDispatcher
 
-#ifndef __vtkDispatcher_h
-#define __vtkDispatcher_h
+#ifndef vtkDispatcher_h
+#define vtkDispatcher_h
 
 #include "vtkDispatcher_Private.h" //needed for Functor,CastingPolicy,TypeInfo
 #include <map> //Required for the storage of template params to runtime params
@@ -209,5 +209,5 @@ ReturnType vtkDispatcher<BaseLhs,ReturnType,CastingPolicy>
   return (i->second)(*lhs);
   }
 
-#endif // __vtkDispatcher_h
+#endif // vtkDispatcher_h
 // VTK-HeaderTest-Exclude: vtkDispatcher.h
diff --git a/Common/DataModel/vtkDispatcher_Private.h b/Common/DataModel/vtkDispatcher_Private.h
index 1ce9b2185fe4b4d0f4a1bc851a2af828986a6431..e39a66fc1f2eb33e149856d97e4db55e347ee925 100644
--- a/Common/DataModel/vtkDispatcher_Private.h
+++ b/Common/DataModel/vtkDispatcher_Private.h
@@ -27,8 +27,8 @@
 //     suitability of this software for any purpose. It is provided "as is"
 //     without express or implied warranty.
 ////////////////////////////////////////////////////////////////////////////////
-#ifndef __vtkDispatcher_Private_h
-#define __vtkDispatcher_Private_h
+#ifndef vtkDispatcher_Private_h
+#define vtkDispatcher_Private_h
 
 #include <typeinfo>
 #include <cassert>
@@ -426,5 +426,5 @@ inline bool operator>=(const TypeInfo& lhs, const TypeInfo& rhs)
 
 }
 
-#endif // __vtkDispatcherPrivate_h
+#endif // vtkDispatcherPrivate_h
 // VTK-HeaderTest-Exclude: vtkDispatcher_Private.h
diff --git a/Common/DataModel/vtkDistributedGraphHelper.h b/Common/DataModel/vtkDistributedGraphHelper.h
index 1b38fbbd8e0f69dfc52e4c1d82859abb07993729..ff30b5f09662625e2b8ec6802c91307b691b781f 100644
--- a/Common/DataModel/vtkDistributedGraphHelper.h
+++ b/Common/DataModel/vtkDistributedGraphHelper.h
@@ -46,8 +46,8 @@
 //
 // .SECTION See Also
 // vtkGraph
-#ifndef __vtkDistributedGraphHelper_h
-#define __vtkDistributedGraphHelper_h
+#ifndef vtkDistributedGraphHelper_h
+#define vtkDistributedGraphHelper_h
 
 #include "vtkCommonDataModelModule.h" // For export macro
 #include "vtkObject.h"
@@ -256,4 +256,4 @@ class VTKCOMMONDATAMODEL_EXPORT vtkDistributedGraphHelper : public vtkObject
   //ETX
 };
 
-#endif // __vtkDistributedGraphHelper_h
+#endif // vtkDistributedGraphHelper_h
diff --git a/Common/DataModel/vtkDoubleDispatcher.h b/Common/DataModel/vtkDoubleDispatcher.h
index 78669217aec7508dabb038a81e7bf37aca940e3d..8223be3b32c1feb32114cc626a2dd4968aeb33ed 100644
--- a/Common/DataModel/vtkDoubleDispatcher.h
+++ b/Common/DataModel/vtkDoubleDispatcher.h
@@ -64,8 +64,8 @@
 // .SECTION See Also
 // vtkDispatcher
 
-#ifndef __vtkDoubleDispatcher_h
-#define __vtkDoubleDispatcher_h
+#ifndef vtkDoubleDispatcher_h
+#define vtkDoubleDispatcher_h
 
 #include "vtkDispatcher_Private.h" //needed for Functor,CastingPolicy,TypeInfo
 #include <map> //Required for the storage of template params to runtime params
@@ -212,5 +212,5 @@ ReturnType vtkDoubleDispatcher<BaseLhs,BaseRhs,ReturnType,CastingPolicy>
   return (i->second)(*lhs,*rhs);
   }
 
-#endif // __vtkDoubleDispatcher_h
+#endif // vtkDoubleDispatcher_h
 // VTK-HeaderTest-Exclude: vtkDoubleDispatcher.h
diff --git a/Common/DataModel/vtkEdgeListIterator.h b/Common/DataModel/vtkEdgeListIterator.h
index 3bba13e784c61ace059ee48ed877c293487375ab..0fec6225f9fbf876131590ad72ef6e31504d6139 100644
--- a/Common/DataModel/vtkEdgeListIterator.h
+++ b/Common/DataModel/vtkEdgeListIterator.h
@@ -32,8 +32,8 @@
 // .SECTION See Also
 // vtkGraph
 
-#ifndef __vtkEdgeListIterator_h
-#define __vtkEdgeListIterator_h
+#ifndef vtkEdgeListIterator_h
+#define vtkEdgeListIterator_h
 
 #include "vtkCommonDataModelModule.h" // For export macro
 #include "vtkObject.h"
diff --git a/Common/DataModel/vtkEdgeTable.h b/Common/DataModel/vtkEdgeTable.h
index 1ff89102badc228603ee0ffcb0018f7139153bc9..5c6c31950ebbcfa67f243209c0f09014a9259598 100644
--- a/Common/DataModel/vtkEdgeTable.h
+++ b/Common/DataModel/vtkEdgeTable.h
@@ -24,8 +24,8 @@
 // If points are inserted, use the methods InitPointInsertion() and
 // InsertUniquePoint().
 
-#ifndef __vtkEdgeTable_h
-#define __vtkEdgeTable_h
+#ifndef vtkEdgeTable_h
+#define vtkEdgeTable_h
 
 #include "vtkCommonDataModelModule.h" // For export macro
 #include "vtkObject.h"
diff --git a/Common/DataModel/vtkEmptyCell.h b/Common/DataModel/vtkEmptyCell.h
index 99c8341a0efae8a220776cecc9708f0af80e4636..89b10f5ad1a38fb369c93cde6622c1fafa690f69 100644
--- a/Common/DataModel/vtkEmptyCell.h
+++ b/Common/DataModel/vtkEmptyCell.h
@@ -17,8 +17,8 @@
 // vtkEmptyCell is a concrete implementation of vtkCell. It is used
 // during processing to represented a deleted element.
 
-#ifndef __vtkEmptyCell_h
-#define __vtkEmptyCell_h
+#ifndef vtkEmptyCell_h
+#define vtkEmptyCell_h
 
 #include "vtkCommonDataModelModule.h" // For export macro
 #include "vtkCell.h"
diff --git a/Common/DataModel/vtkExplicitCell.h b/Common/DataModel/vtkExplicitCell.h
index 2c34e4be71b8f64b1d2c160ee5d99ff1a1691a49..066d49895df13bb7c42bbbacf55fac28950cedf7 100644
--- a/Common/DataModel/vtkExplicitCell.h
+++ b/Common/DataModel/vtkExplicitCell.h
@@ -21,8 +21,8 @@
 // require explicit face/edge descriptions. Most cells in VTK are
 // implicitly represented.
 
-#ifndef __vtkExplicitCell_h
-#define __vtkExplicitCell_h
+#ifndef vtkExplicitCell_h
+#define vtkExplicitCell_h
 
 #include "vtkCommonDataModelModule.h" // For export macro
 #include "vtkNonLinearCell.h"
diff --git a/Common/DataModel/vtkExtractStructuredGridHelper.h b/Common/DataModel/vtkExtractStructuredGridHelper.h
index 343d05f485b862fac54545f81739a7fd191fde63..f0b7ea0ff3696c4cb845692fc24cb13118a4303e 100644
--- a/Common/DataModel/vtkExtractStructuredGridHelper.h
+++ b/Common/DataModel/vtkExtractStructuredGridHelper.h
@@ -24,8 +24,8 @@
 // .SECTION See Also
 // vtkExtractGrid vtkExtractVOI vtkExtractRectilinearGrid
 
-#ifndef __vtkExtractStructuredGridHelper_h
-#define __vtkExtractStructuredGridHelper_h
+#ifndef vtkExtractStructuredGridHelper_h
+#define vtkExtractStructuredGridHelper_h
 
 #include "vtkCommonDataModelModule.h" // For export macro
 #include "vtkObject.h"
diff --git a/Common/DataModel/vtkFieldData.h b/Common/DataModel/vtkFieldData.h
index 7a04004198ca8fc655d297cac35ba33a77691f13..ae11ada33ea1e3d0f080079b5ff2a1651d2d1935 100644
--- a/Common/DataModel/vtkFieldData.h
+++ b/Common/DataModel/vtkFieldData.h
@@ -37,8 +37,8 @@
 // .SECTION See Also
 // vtkAbstractArray vtkDataSetAttributes vtkPointData vtkCellData
 
-#ifndef __vtkFieldData_h
-#define __vtkFieldData_h
+#ifndef vtkFieldData_h
+#define vtkFieldData_h
 
 #include "vtkCommonDataModelModule.h" // For export macro
 #include "vtkObject.h"
diff --git a/Common/DataModel/vtkGenericAdaptorCell.h b/Common/DataModel/vtkGenericAdaptorCell.h
index fec90053f1f21bdcce447141f6748b06f5a906d0..2dcbd7c205d367b81e62de259a6aaafc43cfe04c 100644
--- a/Common/DataModel/vtkGenericAdaptorCell.h
+++ b/Common/DataModel/vtkGenericAdaptorCell.h
@@ -53,8 +53,8 @@
 // .SECTION See Also
 // vtkGenericDataSet
 
-#ifndef __vtkGenericAdaptorCell_h
-#define __vtkGenericAdaptorCell_h
+#ifndef vtkGenericAdaptorCell_h
+#define vtkGenericAdaptorCell_h
 
 
 #include "vtkCommonDataModelModule.h" // For export macro
diff --git a/Common/DataModel/vtkGenericAttribute.h b/Common/DataModel/vtkGenericAttribute.h
index a7796a8747b2e462d165ccfa1ac2dfa3f8140ae6..9bb476ced3963adbfe27f40b46fc76c7d918cfd4 100644
--- a/Common/DataModel/vtkGenericAttribute.h
+++ b/Common/DataModel/vtkGenericAttribute.h
@@ -24,8 +24,8 @@
 // array). It adopts an iterator interface, and allows attributes to be
 // associated with points, edges, faces, or edges.
 
-#ifndef __vtkGenericAttribute_h
-#define __vtkGenericAttribute_h
+#ifndef vtkGenericAttribute_h
+#define vtkGenericAttribute_h
 
 #include "vtkCommonDataModelModule.h" // For export macro
 #include "vtkObject.h"
diff --git a/Common/DataModel/vtkGenericAttributeCollection.h b/Common/DataModel/vtkGenericAttributeCollection.h
index 4d91fcd9719a780fecf8c4e1f29cead7923ffa37..667aaecdfbabb4161c76c184c6f5d74691915f85 100644
--- a/Common/DataModel/vtkGenericAttributeCollection.h
+++ b/Common/DataModel/vtkGenericAttributeCollection.h
@@ -17,8 +17,8 @@
 // vtkGenericAttributeCollection is a class that collects attributes
 // (represented by vtkGenericAttribute).
 
-#ifndef __vtkGenericAttributeCollection_h
-#define __vtkGenericAttributeCollection_h
+#ifndef vtkGenericAttributeCollection_h
+#define vtkGenericAttributeCollection_h
 
 #include "vtkCommonDataModelModule.h" // For export macro
 #include "vtkObject.h"
diff --git a/Common/DataModel/vtkGenericCell.h b/Common/DataModel/vtkGenericCell.h
index 37340c6b417a91319ae5e243c9c74d40ece0b746..50419a849ae32fb317ac8ef761f4bef0e1a335f8 100644
--- a/Common/DataModel/vtkGenericCell.h
+++ b/Common/DataModel/vtkGenericCell.h
@@ -24,8 +24,8 @@
 // .SECTION See Also
 // vtkCell vtkDataSet
 
-#ifndef __vtkGenericCell_h
-#define __vtkGenericCell_h
+#ifndef vtkGenericCell_h
+#define vtkGenericCell_h
 
 #include "vtkCommonDataModelModule.h" // For export macro
 #include "vtkCell.h"
diff --git a/Common/DataModel/vtkGenericCellIterator.h b/Common/DataModel/vtkGenericCellIterator.h
index 4a7aeef4124fa65b76a9c16bf7d402db42f5c1db..d36b0efd1ecd7cab8610922fbc3bd9e22084b5a3 100644
--- a/Common/DataModel/vtkGenericCellIterator.h
+++ b/Common/DataModel/vtkGenericCellIterator.h
@@ -27,8 +27,8 @@
 //   }
 // </pre>
 
-#ifndef __vtkGenericCellIterator_h
-#define __vtkGenericCellIterator_h
+#ifndef vtkGenericCellIterator_h
+#define vtkGenericCellIterator_h
 
 #include "vtkCommonDataModelModule.h" // For export macro
 #include "vtkObject.h"
diff --git a/Common/DataModel/vtkGenericCellTessellator.h b/Common/DataModel/vtkGenericCellTessellator.h
index 9535331c7699c5ac56e59b6fd6d3e02d547f5fe8..36a413d74a477228a89bda279b50965180f07b1f 100644
--- a/Common/DataModel/vtkGenericCellTessellator.h
+++ b/Common/DataModel/vtkGenericCellTessellator.h
@@ -35,8 +35,8 @@
 // relative value of the point ids.
 
 
-#ifndef __vtkGenericCellTessellator_h
-#define __vtkGenericCellTessellator_h
+#ifndef vtkGenericCellTessellator_h
+#define vtkGenericCellTessellator_h
 
 #include "vtkCommonDataModelModule.h" // For export macro
 #include "vtkObject.h"
diff --git a/Common/DataModel/vtkGenericDataSet.h b/Common/DataModel/vtkGenericDataSet.h
index 4df508189c1df21bd7449ad5ad0497c6e60a63ab..4a544998319a965e63b16bfbce5f1fbbafe619ed 100644
--- a/Common/DataModel/vtkGenericDataSet.h
+++ b/Common/DataModel/vtkGenericDataSet.h
@@ -51,8 +51,8 @@
 // .SECTION See Also
 // vtkGenericAdaptorCell vtkDataSet
 
-#ifndef __vtkGenericDataSet_h
-#define __vtkGenericDataSet_h
+#ifndef vtkGenericDataSet_h
+#define vtkGenericDataSet_h
 
 #include "vtkCommonDataModelModule.h" // For export macro
 #include "vtkDataObject.h"
diff --git a/Common/DataModel/vtkGenericEdgeTable.h b/Common/DataModel/vtkGenericEdgeTable.h
index 58eb0be225950d1b5977656167bd50c000ae13dd..631b91ad319640698e90c814cbe0e6af4fb7f699 100644
--- a/Common/DataModel/vtkGenericEdgeTable.h
+++ b/Common/DataModel/vtkGenericEdgeTable.h
@@ -24,8 +24,8 @@
 // error metric on each edge. This avoids recomputing the error metric each
 // time the same edge is visited.
 
-#ifndef __vtkGenericEdgeTable_h
-#define __vtkGenericEdgeTable_h
+#ifndef vtkGenericEdgeTable_h
+#define vtkGenericEdgeTable_h
 
 #include "vtkCommonDataModelModule.h" // For export macro
 #include "vtkObject.h"
diff --git a/Common/DataModel/vtkGenericInterpolatedVelocityField.h b/Common/DataModel/vtkGenericInterpolatedVelocityField.h
index 4779e8ef27ef7e7ad78f42c3cdf05405c5830baf..f2f70552c1d92171c75baac59bd96bec1e188e69 100644
--- a/Common/DataModel/vtkGenericInterpolatedVelocityField.h
+++ b/Common/DataModel/vtkGenericInterpolatedVelocityField.h
@@ -36,8 +36,8 @@
 // .SECTION See Also
 // vtkFunctionSet vtkGenericStreamTracer
 
-#ifndef __vtkGenericInterpolatedVelocityField_h
-#define __vtkGenericInterpolatedVelocityField_h
+#ifndef vtkGenericInterpolatedVelocityField_h
+#define vtkGenericInterpolatedVelocityField_h
 
 #include "vtkCommonDataModelModule.h" // For export macro
 #include "vtkFunctionSet.h"
diff --git a/Common/DataModel/vtkGenericPointIterator.h b/Common/DataModel/vtkGenericPointIterator.h
index 35344c96027a96c5d56f172449d509ac2a7b0978..a958cdee082ac26472d0bddbede44d0668df4dea 100644
--- a/Common/DataModel/vtkGenericPointIterator.h
+++ b/Common/DataModel/vtkGenericPointIterator.h
@@ -28,8 +28,8 @@
 // </pre>
 
 
-#ifndef __vtkGenericPointIterator_h
-#define __vtkGenericPointIterator_h
+#ifndef vtkGenericPointIterator_h
+#define vtkGenericPointIterator_h
 
 #include "vtkCommonDataModelModule.h" // For export macro
 #include "vtkObject.h"
diff --git a/Common/DataModel/vtkGenericSubdivisionErrorMetric.h b/Common/DataModel/vtkGenericSubdivisionErrorMetric.h
index 46c1b4c665396b53cd0caef1765cee5b4ef240f6..45b0c5ddc1b85ef7125d48902b3473d574f0d170 100644
--- a/Common/DataModel/vtkGenericSubdivisionErrorMetric.h
+++ b/Common/DataModel/vtkGenericSubdivisionErrorMetric.h
@@ -32,8 +32,8 @@
 // .SECTION See Also
 // vtkGenericCellTessellator
 
-#ifndef __vtkGenericSubdivisionErrorMetric_h
-#define __vtkGenericSubdivisionErrorMetric_h
+#ifndef vtkGenericSubdivisionErrorMetric_h
+#define vtkGenericSubdivisionErrorMetric_h
 
 #include "vtkCommonDataModelModule.h" // For export macro
 #include "vtkObject.h"
diff --git a/Common/DataModel/vtkGeometricErrorMetric.h b/Common/DataModel/vtkGeometricErrorMetric.h
index 2f97d1b84d06fe76dc216c41f0043832f6ce6bc1..ffa933767f1d44f8c8c658365ccc756bac70733e 100644
--- a/Common/DataModel/vtkGeometricErrorMetric.h
+++ b/Common/DataModel/vtkGeometricErrorMetric.h
@@ -22,8 +22,8 @@
 // .SECTION See Also
 // vtkGenericCellTessellator vtkGenericSubdivisionErrorMetric
 
-#ifndef __vtkGeometricErrorMetric_h
-#define __vtkGeometricErrorMetric_h
+#ifndef vtkGeometricErrorMetric_h
+#define vtkGeometricErrorMetric_h
 
 #include "vtkCommonDataModelModule.h" // For export macro
 #include "vtkGenericSubdivisionErrorMetric.h"
diff --git a/Common/DataModel/vtkGraph.h b/Common/DataModel/vtkGraph.h
index 85a809e0b3d293295aa43cccdc346c69c664e516..030aed11c379e64b4d486bda97ab5c1d1f1f39b6 100644
--- a/Common/DataModel/vtkGraph.h
+++ b/Common/DataModel/vtkGraph.h
@@ -199,8 +199,8 @@
 // Laboratories and Douglas Gregor of Indiana University for designing these
 // classes.
 
-#ifndef __vtkGraph_h
-#define __vtkGraph_h
+#ifndef vtkGraph_h
+#define vtkGraph_h
 
 #include "vtkCommonDataModelModule.h" // For export macro
 #include "vtkDataObject.h"
diff --git a/Common/DataModel/vtkGraphEdge.h b/Common/DataModel/vtkGraphEdge.h
index cd32f5365992efb4d9b2f39c12ef251e8147ad3b..a387b2419ae6242d46899dd75c7c74974cef2546 100644
--- a/Common/DataModel/vtkGraphEdge.h
+++ b/Common/DataModel/vtkGraphEdge.h
@@ -27,8 +27,8 @@
 // .SECTION See Also
 // vtkGraph
 
-#ifndef __vtkGraphEdge_h
-#define __vtkGraphEdge_h
+#ifndef vtkGraphEdge_h
+#define vtkGraphEdge_h
 
 #include "vtkCommonDataModelModule.h" // For export macro
 #include "vtkObject.h"
diff --git a/Common/DataModel/vtkGraphInternals.h b/Common/DataModel/vtkGraphInternals.h
index 6c85b20049f532e15e2f85001ee95ba83a342d80..eb27618efebf3e683a8c6bc21c3bb7e582686714 100644
--- a/Common/DataModel/vtkGraphInternals.h
+++ b/Common/DataModel/vtkGraphInternals.h
@@ -22,8 +22,8 @@
 // This is the internal representation of vtkGraph, used only in rare cases
 // where one must modify that representation.
 
-#ifndef __vtkGraphInternals_h
-#define __vtkGraphInternals_h
+#ifndef vtkGraphInternals_h
+#define vtkGraphInternals_h
 
 #include "vtkCommonDataModelModule.h" // For export macro
 #include "vtkGraph.h"
@@ -94,6 +94,6 @@ private:
   void operator=(const vtkGraphInternals&);  // Not implemented.
 };
 
-#endif // __vtkGraphInternals_h
+#endif // vtkGraphInternals_h
 
 // VTK-HeaderTest-Exclude: vtkGraphInternals.h
diff --git a/Common/DataModel/vtkHexagonalPrism.h b/Common/DataModel/vtkHexagonalPrism.h
index 4470e0b74b25a45155f419daf08cf3b7b565f4b6..5046f9ea63ea9bb1ab113c3584e95dd0e85af606 100644
--- a/Common/DataModel/vtkHexagonalPrism.h
+++ b/Common/DataModel/vtkHexagonalPrism.h
@@ -30,8 +30,8 @@
 // Please address all comments to Jean Favre (jfavre at cscs.ch).
 
 
-#ifndef __vtkHexagonalPrism_h
-#define __vtkHexagonalPrism_h
+#ifndef vtkHexagonalPrism_h
+#define vtkHexagonalPrism_h
 
 #include "vtkCommonDataModelModule.h" // For export macro
 #include "vtkCell3D.h"
diff --git a/Common/DataModel/vtkHexahedron.h b/Common/DataModel/vtkHexahedron.h
index 7b1a3eef74308c8e8b780884c9eb7479c6dfdbec..64b5310294c66d777772e231f57a193aea49c1ba 100644
--- a/Common/DataModel/vtkHexahedron.h
+++ b/Common/DataModel/vtkHexahedron.h
@@ -25,8 +25,8 @@
 // .SECTION See Also
 // vtkConvexPointSet vtkPyramid vtkTetra vtkVoxel vtkWedge
 
-#ifndef __vtkHexahedron_h
-#define __vtkHexahedron_h
+#ifndef vtkHexahedron_h
+#define vtkHexahedron_h
 
 #include "vtkCommonDataModelModule.h" // For export macro
 #include "vtkCell3D.h"
diff --git a/Common/DataModel/vtkHyperOctree.h b/Common/DataModel/vtkHyperOctree.h
index 5476505d094262616c38418dea890a745c39d4f5..9ce5463b6d557352941d86ba2927ee79980ded11 100644
--- a/Common/DataModel/vtkHyperOctree.h
+++ b/Common/DataModel/vtkHyperOctree.h
@@ -113,8 +113,8 @@
 // .SECTION See Also
 // vtkHyperOctreeAlgorithm
 
-#ifndef __vtkHyperOctree_h
-#define __vtkHyperOctree_h
+#ifndef vtkHyperOctree_h
+#define vtkHyperOctree_h
 
 #include "vtkCommonDataModelModule.h" // For export macro
 #include "vtkDataSet.h"
diff --git a/Common/DataModel/vtkHyperOctreeCursor.h b/Common/DataModel/vtkHyperOctreeCursor.h
index 1c41630ca1cbbd255e061847f784f9df9572ee08..1d584d2bea01187593ed302d6258e0ee54982e55 100644
--- a/Common/DataModel/vtkHyperOctreeCursor.h
+++ b/Common/DataModel/vtkHyperOctreeCursor.h
@@ -19,8 +19,8 @@
 // .SECTION See Also
 // vtkDataObject vtkFieldData vtkHyperOctreeAlgorithm
 
-#ifndef __vtkHyperOctreeCursor_h
-#define __vtkHyperOctreeCursor_h
+#ifndef vtkHyperOctreeCursor_h
+#define vtkHyperOctreeCursor_h
 
 #include "vtkCommonDataModelModule.h" // For export macro
 #include "vtkObject.h"
diff --git a/Common/DataModel/vtkHyperOctreePointsGrabber.h b/Common/DataModel/vtkHyperOctreePointsGrabber.h
index 0c85d44de767dabb9f03cde1f27d2f56467147ca..f1b3322c19bba9b38d004a2b4adbc55e1eeec9f1 100644
--- a/Common/DataModel/vtkHyperOctreePointsGrabber.h
+++ b/Common/DataModel/vtkHyperOctreePointsGrabber.h
@@ -23,8 +23,8 @@
 // vtkHyperOctree, vtkHyperOctreeClipCutPointsGrabber,
 // vtkClipHyperOctree, vtkHyperOctreeCutter
 
-#ifndef __vtkHyperOctreePointsGrabber_h
-#define __vtkHyperOctreePointsGrabber_h
+#ifndef vtkHyperOctreePointsGrabber_h
+#define vtkHyperOctreePointsGrabber_h
 
 #include "vtkCommonDataModelModule.h" // For export macro
 #include "vtkObject.h"
diff --git a/Common/DataModel/vtkHyperTree.h b/Common/DataModel/vtkHyperTree.h
index b69a1633ce10475dc9ab2cc72e473a80089f12d1..9e4cb3a321d6b611b719e3ffd350586388e27142 100644
--- a/Common/DataModel/vtkHyperTree.h
+++ b/Common/DataModel/vtkHyperTree.h
@@ -116,8 +116,8 @@
 // This class was written by Philippe Pebay, Joachim Pouderoux and Charles Law, Kitware 2013
 // This work was supported in part by Commissariat a l'Energie Atomique (CEA/DIF)
 
-#ifndef __vtkHyperTree_h
-#define __vtkHyperTree_h
+#ifndef vtkHyperTree_h
+#define vtkHyperTree_h
 
 #include "vtkCommonDataModelModule.h" // For export macro
 #include "vtkObject.h"
diff --git a/Common/DataModel/vtkHyperTreeCursor.h b/Common/DataModel/vtkHyperTreeCursor.h
index 853647374e1e0eb0d3d9e2bdb45a4e3534e4bdc8..265c894e89da2751d66ceea69947bd268b3b9a84 100644
--- a/Common/DataModel/vtkHyperTreeCursor.h
+++ b/Common/DataModel/vtkHyperTreeCursor.h
@@ -23,8 +23,8 @@
 // Kitware 2013
 // This work was supported in part by Commissariat a l'Energie Atomique (CEA/DIF)
 
-#ifndef __vtkHyperTreeCursor_h
-#define __vtkHyperTreeCursor_h
+#ifndef vtkHyperTreeCursor_h
+#define vtkHyperTreeCursor_h
 
 #include "vtkCommonDataModelModule.h" // For export macro
 #include "vtkObject.h"
diff --git a/Common/DataModel/vtkHyperTreeGrid.h b/Common/DataModel/vtkHyperTreeGrid.h
index a2a433ee8d162a9a1c3dc484e1a1a0b2fe62301a..5b07763816fcc9e84bee4ca8e0df971bcdad5489 100644
--- a/Common/DataModel/vtkHyperTreeGrid.h
+++ b/Common/DataModel/vtkHyperTreeGrid.h
@@ -35,8 +35,8 @@
 // Kitware 2013
 // This work was supported in part by Commissariat a l'Energie Atomique (CEA/DIF)
 
-#ifndef __vtkHyperTreeGrid_h
-#define __vtkHyperTreeGrid_h
+#ifndef vtkHyperTreeGrid_h
+#define vtkHyperTreeGrid_h
 
 #include "vtkCommonDataModelModule.h" // For export macro
 #include "vtkDataSet.h"
diff --git a/Common/DataModel/vtkImageData.h b/Common/DataModel/vtkImageData.h
index da72f10b693196da62b072df55f87c7a665c32f5..28b96313f5437e282413fb7b1fc46372c080f666 100644
--- a/Common/DataModel/vtkImageData.h
+++ b/Common/DataModel/vtkImageData.h
@@ -19,8 +19,8 @@
 // a topological and geometrical regular array of points. Examples include
 // volumes (voxel data) and pixmaps.
 
-#ifndef __vtkImageData_h
-#define __vtkImageData_h
+#ifndef vtkImageData_h
+#define vtkImageData_h
 
 #include "vtkCommonDataModelModule.h" // For export macro
 #include "vtkDataSet.h"
diff --git a/Common/DataModel/vtkImageIterator.h b/Common/DataModel/vtkImageIterator.h
index bea4009f941e439d73914f0d03c733aea884e586..6b624a8542b22c849520aacdffcfa320c483e458 100644
--- a/Common/DataModel/vtkImageIterator.h
+++ b/Common/DataModel/vtkImageIterator.h
@@ -20,8 +20,8 @@
 // .SECTION See also
 // vtkImageData vtkImageProgressIterator
 
-#ifndef __vtkImageIterator_h
-#define __vtkImageIterator_h
+#ifndef vtkImageIterator_h
+#define vtkImageIterator_h
 
 #include "vtkCommonDataModelModule.h" // For export macro
 #include "vtkSystemIncludes.h"
diff --git a/Common/DataModel/vtkImplicitBoolean.h b/Common/DataModel/vtkImplicitBoolean.h
index d0df617a40aa3d4659e9a42ac3501ee15c77683c..e9a1d9a511859a0e422c068318542c107efe0e7d 100644
--- a/Common/DataModel/vtkImplicitBoolean.h
+++ b/Common/DataModel/vtkImplicitBoolean.h
@@ -29,8 +29,8 @@
 // VTK_UNION_OF_MAGNITUDES takes the minimum absolute value of the
 // implicit functions.
 
-#ifndef __vtkImplicitBoolean_h
-#define __vtkImplicitBoolean_h
+#ifndef vtkImplicitBoolean_h
+#define vtkImplicitBoolean_h
 
 #include "vtkCommonDataModelModule.h" // For export macro
 #include "vtkImplicitFunction.h"
diff --git a/Common/DataModel/vtkImplicitDataSet.h b/Common/DataModel/vtkImplicitDataSet.h
index 3879aa5d6a98a4d23f7b0878a0bbd34bbe742dc6..e15a1eaf310bdc09507d9c541d823c7f8ee38145 100644
--- a/Common/DataModel/vtkImplicitDataSet.h
+++ b/Common/DataModel/vtkImplicitDataSet.h
@@ -34,8 +34,8 @@
 // vtkImplicitFunction vtkImplicitVolume vtkClipPolyData vtkCutter
 // vtkImplicitWindowFunction
 
-#ifndef __vtkImplicitDataSet_h
-#define __vtkImplicitDataSet_h
+#ifndef vtkImplicitDataSet_h
+#define vtkImplicitDataSet_h
 
 #include "vtkCommonDataModelModule.h" // For export macro
 #include "vtkImplicitFunction.h"
diff --git a/Common/DataModel/vtkImplicitFunction.h b/Common/DataModel/vtkImplicitFunction.h
index 947406c4f32accc2c4389274ff642159281b6c02..6650ceb7b97bea8e70f8028b7e4a77b94a52213b 100644
--- a/Common/DataModel/vtkImplicitFunction.h
+++ b/Common/DataModel/vtkImplicitFunction.h
@@ -44,8 +44,8 @@
 // vtkPlanes vtkQuadric vtkImplicitVolume vtkSampleFunction vtkCutter
 // vtkClipPolyData
 
-#ifndef __vtkImplicitFunction_h
-#define __vtkImplicitFunction_h
+#ifndef vtkImplicitFunction_h
+#define vtkImplicitFunction_h
 
 #include "vtkCommonDataModelModule.h" // For export macro
 #include "vtkObject.h"
diff --git a/Common/DataModel/vtkImplicitFunctionCollection.h b/Common/DataModel/vtkImplicitFunctionCollection.h
index 457e410bcde8531edbfb9caf7dc86ffe95ae16df..2f0855580e72bf035576a582768ed887f12397d8 100644
--- a/Common/DataModel/vtkImplicitFunctionCollection.h
+++ b/Common/DataModel/vtkImplicitFunctionCollection.h
@@ -19,8 +19,8 @@
 // .SECTION See Also
 // vtkCollection vtkPlaneCollection
 
-#ifndef __vtkImplicitFunctionCollection_h
-#define __vtkImplicitFunctionCollection_h
+#ifndef vtkImplicitFunctionCollection_h
+#define vtkImplicitFunctionCollection_h
 
 #include "vtkCommonDataModelModule.h" // For export macro
 #include "vtkCollection.h"
diff --git a/Common/DataModel/vtkImplicitHalo.h b/Common/DataModel/vtkImplicitHalo.h
index d327710dfa0a51a0d754e5218c636cb1baae99fb..d393471050dfc6be34e62c84459cc9f88a323cf8 100644
--- a/Common/DataModel/vtkImplicitHalo.h
+++ b/Common/DataModel/vtkImplicitHalo.h
@@ -26,8 +26,8 @@
 // .SECTION Caveats
 // It does not implement the gradient.
 
-#ifndef __vtkImplicitHalo_h
-#define __vtkImplicitHalo_h
+#ifndef vtkImplicitHalo_h
+#define vtkImplicitHalo_h
 
 #include "vtkCommonDataModelModule.h" // For export macro
 #include "vtkImplicitFunction.h"
diff --git a/Common/DataModel/vtkImplicitSelectionLoop.h b/Common/DataModel/vtkImplicitSelectionLoop.h
index 26e022d66d6f83370d8d537d89754b9fdfea4f5b..107cac9eb17b59a4edefe537c0a4d0cd1b13cd21 100644
--- a/Common/DataModel/vtkImplicitSelectionLoop.h
+++ b/Common/DataModel/vtkImplicitSelectionLoop.h
@@ -42,8 +42,8 @@
 // vtkImplicitFunction vtkImplicitBoolean vtkExtractGeometry vtkClipPolyData
 // vtkConnectivityFilter vtkPolyDataConnectivityFilter
 
-#ifndef __vtkImplicitSelectionLoop_h
-#define __vtkImplicitSelectionLoop_h
+#ifndef vtkImplicitSelectionLoop_h
+#define vtkImplicitSelectionLoop_h
 
 #include "vtkCommonDataModelModule.h" // For export macro
 #include "vtkImplicitFunction.h"
diff --git a/Common/DataModel/vtkImplicitSum.h b/Common/DataModel/vtkImplicitSum.h
index 03dbda2ad36539e1a9d474be93ec8ce056943044..12b5d086d2218300ffefea463fb342c28981cede 100644
--- a/Common/DataModel/vtkImplicitSum.h
+++ b/Common/DataModel/vtkImplicitSum.h
@@ -20,8 +20,8 @@
 // scalar weights add up to 1. Note that this function gives accurate
 // sums and gradients only if the input functions are linear.
 
-#ifndef __vtkImplicitSum_h
-#define __vtkImplicitSum_h
+#ifndef vtkImplicitSum_h
+#define vtkImplicitSum_h
 
 #include "vtkCommonDataModelModule.h" // For export macro
 #include "vtkImplicitFunction.h"
diff --git a/Common/DataModel/vtkImplicitVolume.h b/Common/DataModel/vtkImplicitVolume.h
index 662b5ce101a6bf595c4d42b9d86b7fd122757028..1eb487ae60ac29d76cdce490a301523262be7e93 100644
--- a/Common/DataModel/vtkImplicitVolume.h
+++ b/Common/DataModel/vtkImplicitVolume.h
@@ -34,8 +34,8 @@
 // vtkImplicitFunction vtkImplicitDataSet vtkClipPolyData vtkCutter
 // vtkImplicitWindowFunction
 
-#ifndef __vtkImplicitVolume_h
-#define __vtkImplicitVolume_h
+#ifndef vtkImplicitVolume_h
+#define vtkImplicitVolume_h
 
 #include "vtkCommonDataModelModule.h" // For export macro
 #include "vtkImplicitFunction.h"
diff --git a/Common/DataModel/vtkImplicitWindowFunction.h b/Common/DataModel/vtkImplicitWindowFunction.h
index a92e66b87e7b767498d2a8e8f448e6d84a87cd7a..c9d3d91675fa36b41e41ae19ff4b1847c5db13b1 100644
--- a/Common/DataModel/vtkImplicitWindowFunction.h
+++ b/Common/DataModel/vtkImplicitWindowFunction.h
@@ -27,8 +27,8 @@
 // .SECTION See Also
 // vtkImplicitFunction
 
-#ifndef __vtkImplicitWindowFunction_h
-#define __vtkImplicitWindowFunction_h
+#ifndef vtkImplicitWindowFunction_h
+#define vtkImplicitWindowFunction_h
 
 #include "vtkCommonDataModelModule.h" // For export macro
 #include "vtkImplicitFunction.h"
diff --git a/Common/DataModel/vtkInEdgeIterator.h b/Common/DataModel/vtkInEdgeIterator.h
index 79900ec15071e1743a1dbdfe6bf12c08c35b2493..c8bc2f21f5ef58f97406f23abe864eeb5fd73517 100644
--- a/Common/DataModel/vtkInEdgeIterator.h
+++ b/Common/DataModel/vtkInEdgeIterator.h
@@ -29,8 +29,8 @@
 // .SECTION See Also
 // vtkGraph vtkOutEdgeIterator
 
-#ifndef __vtkInEdgeIterator_h
-#define __vtkInEdgeIterator_h
+#ifndef vtkInEdgeIterator_h
+#define vtkInEdgeIterator_h
 
 #include "vtkCommonDataModelModule.h" // For export macro
 #include "vtkObject.h"
diff --git a/Common/DataModel/vtkIncrementalOctreeNode.h b/Common/DataModel/vtkIncrementalOctreeNode.h
index a8206b218e41af097e76d281d1229ee230210b2b..457faba3b4390580dd84fa25b1cb82eb6cc5e240 100644
--- a/Common/DataModel/vtkIncrementalOctreeNode.h
+++ b/Common/DataModel/vtkIncrementalOctreeNode.h
@@ -53,8 +53,8 @@
 // .SECTION See Also
 //  vtkIncrementalOctreePointLocator
 
-#ifndef __vtkIncrementalOctreeNode_h
-#define __vtkIncrementalOctreeNode_h
+#ifndef vtkIncrementalOctreeNode_h
+#define vtkIncrementalOctreeNode_h
 
 #include "vtkCommonDataModelModule.h" // For export macro
 #include "vtkObject.h"
diff --git a/Common/DataModel/vtkIncrementalOctreePointLocator.h b/Common/DataModel/vtkIncrementalOctreePointLocator.h
index f56e3be41e133bab459475436763b8e44ea8b91d..e01419d58a13cf4e4562097722a40fcb355f8a64 100644
--- a/Common/DataModel/vtkIncrementalOctreePointLocator.h
+++ b/Common/DataModel/vtkIncrementalOctreePointLocator.h
@@ -42,8 +42,8 @@
 //  vtkAbstractPointLocator, vtkIncrementalPointLocator, vtkPointLocator,
 //  vtkMergePoints
 
-#ifndef __vtkIncrementalOctreePointLocator_h
-#define __vtkIncrementalOctreePointLocator_h
+#ifndef vtkIncrementalOctreePointLocator_h
+#define vtkIncrementalOctreePointLocator_h
 
 #include "vtkCommonDataModelModule.h" // For export macro
 #include "vtkIncrementalPointLocator.h"
diff --git a/Common/DataModel/vtkIncrementalPointLocator.h b/Common/DataModel/vtkIncrementalPointLocator.h
index 32a3352d5a90f0e0090b201121eebc6fa1f619e9..b5f0c21a6dea5123afe4234dc813e14bbd57f8e5 100644
--- a/Common/DataModel/vtkIncrementalPointLocator.h
+++ b/Common/DataModel/vtkIncrementalPointLocator.h
@@ -36,8 +36,8 @@
 //  vtkLocator, vtkIncrementalOctreePointLocator, vtkPointLocator,
 //  vtkMergePoints
 
-#ifndef __vtkIncrementalPointLocator_h
-#define __vtkIncrementalPointLocator_h
+#ifndef vtkIncrementalPointLocator_h
+#define vtkIncrementalPointLocator_h
 
 #include "vtkCommonDataModelModule.h" // For export macro
 #include "vtkAbstractPointLocator.h"
diff --git a/Common/DataModel/vtkInformationQuadratureSchemeDefinitionVectorKey.h b/Common/DataModel/vtkInformationQuadratureSchemeDefinitionVectorKey.h
index c62c92a9eb02468f97f74c28b4bfffead46dbe95..df9323e3ee8475ef37716585afe07817a8ab504a 100644
--- a/Common/DataModel/vtkInformationQuadratureSchemeDefinitionVectorKey.h
+++ b/Common/DataModel/vtkInformationQuadratureSchemeDefinitionVectorKey.h
@@ -19,8 +19,8 @@
 // from that in other similar keys because of our internal use of smart
 // pointers.
 
-#ifndef __vtkInformationQuadratureSchemeDefinitionVectorKey_h
-#define __vtkInformationQuadratureSchemeDefinitionVectorKey_h
+#ifndef vtkInformationQuadratureSchemeDefinitionVectorKey_h
+#define vtkInformationQuadratureSchemeDefinitionVectorKey_h
 
 #include "vtkCommonDataModelModule.h" // For export macro
 #include "vtkInformationKey.h"
diff --git a/Common/DataModel/vtkIterativeClosestPointTransform.h b/Common/DataModel/vtkIterativeClosestPointTransform.h
index bae6687c4775c0d8d404d2617996aa89da7611cc..02c9e45204b40fd9c5d09f736d873c8489ea7202 100644
--- a/Common/DataModel/vtkIterativeClosestPointTransform.h
+++ b/Common/DataModel/vtkIterativeClosestPointTransform.h
@@ -34,8 +34,8 @@
 // vtkLandmarkTransform
 
 
-#ifndef __vtkIterativeClosestPointTransform_h
-#define __vtkIterativeClosestPointTransform_h
+#ifndef vtkIterativeClosestPointTransform_h
+#define vtkIterativeClosestPointTransform_h
 
 #include "vtkCommonDataModelModule.h" // For export macro
 #include "vtkLinearTransform.h"
diff --git a/Common/DataModel/vtkKdNode.h b/Common/DataModel/vtkKdNode.h
index 2321f30bfeb44215c2ec18eff877dbb30d87d49e..ffb79b2f97937302ed8a896245abefd9ed4e8f00 100644
--- a/Common/DataModel/vtkKdNode.h
+++ b/Common/DataModel/vtkKdNode.h
@@ -27,8 +27,8 @@
 // .SECTION See Also
 //      vtkKdTree vtkOBSPCuts
 
-#ifndef __vtkKdNode_h
-#define __vtkKdNode_h
+#ifndef vtkKdNode_h
+#define vtkKdNode_h
 
 #include "vtkCommonDataModelModule.h" // For export macro
 #include "vtkObject.h"
diff --git a/Common/DataModel/vtkKdTree.h b/Common/DataModel/vtkKdTree.h
index 55a7dd95559849e33eb81906e0c0e8c57b578f65..21a01efe3483a5e6e1424040aa6d7aa147f5ec00 100644
--- a/Common/DataModel/vtkKdTree.h
+++ b/Common/DataModel/vtkKdTree.h
@@ -50,8 +50,8 @@
 // .SECTION See Also
 //      vtkLocator vtkCellLocator vtkPKdTree
 
-#ifndef __vtkKdTree_h
-#define __vtkKdTree_h
+#ifndef vtkKdTree_h
+#define vtkKdTree_h
 
 #include "vtkCommonDataModelModule.h" // For export macro
 #include "vtkLocator.h"
diff --git a/Common/DataModel/vtkKdTreePointLocator.h b/Common/DataModel/vtkKdTreePointLocator.h
index a3576e1fb5dde01796f74862ccead4bfb89f92bc..4edb1b51f5704aefd391453dc6c9fe6b7a2c66c8 100644
--- a/Common/DataModel/vtkKdTreePointLocator.h
+++ b/Common/DataModel/vtkKdTreePointLocator.h
@@ -20,8 +20,8 @@
 // .SECTION See Also
 // vtkKdTree
 
-#ifndef __vtkKdTreePointLocator_h
-#define __vtkKdTreePointLocator_h
+#ifndef vtkKdTreePointLocator_h
+#define vtkKdTreePointLocator_h
 
 #include "vtkCommonDataModelModule.h" // For export macro
 #include "vtkAbstractPointLocator.h"
diff --git a/Common/DataModel/vtkLine.h b/Common/DataModel/vtkLine.h
index f80486e7ba878c9ab3121781ef752aaacfe88ef9..f25516420e0480d7adf63211b86a67eae43f030c 100644
--- a/Common/DataModel/vtkLine.h
+++ b/Common/DataModel/vtkLine.h
@@ -16,8 +16,8 @@
 // .SECTION Description
 // vtkLine is a concrete implementation of vtkCell to represent a 1D line.
 
-#ifndef __vtkLine_h
-#define __vtkLine_h
+#ifndef vtkLine_h
+#define vtkLine_h
 
 #include "vtkCommonDataModelModule.h" // For export macro
 #include "vtkCell.h"
diff --git a/Common/DataModel/vtkLocator.h b/Common/DataModel/vtkLocator.h
index b984dc78d070d23d41a4ce7b2e48c7fc73dbd5aa..33ad965f046d82c40aee00ad649a09e1479453d2 100644
--- a/Common/DataModel/vtkLocator.h
+++ b/Common/DataModel/vtkLocator.h
@@ -47,8 +47,8 @@
 // .SECTION See Also
 // vtkPointLocator vtkCellLocator vtkOBBTree vtkMergePoints
 
-#ifndef __vtkLocator_h
-#define __vtkLocator_h
+#ifndef vtkLocator_h
+#define vtkLocator_h
 
 #include "vtkCommonDataModelModule.h" // For export macro
 #include "vtkObject.h"
diff --git a/Common/DataModel/vtkMappedUnstructuredGrid.h b/Common/DataModel/vtkMappedUnstructuredGrid.h
index 8387f448beae66a75f673af8f677eeb7f9525181..4900f63e240a994d82daaaf9dc653423c72e3340 100644
--- a/Common/DataModel/vtkMappedUnstructuredGrid.h
+++ b/Common/DataModel/vtkMappedUnstructuredGrid.h
@@ -137,8 +137,8 @@
 // vtkMappedUnstructuredGrid usage, adapting the Exodus II data structures for
 // the VTK pipeline.
 
-#ifndef __vtkMappedUnstructuredGrid_h
-#define __vtkMappedUnstructuredGrid_h
+#ifndef vtkMappedUnstructuredGrid_h
+#define vtkMappedUnstructuredGrid_h
 
 #include "vtkUnstructuredGridBase.h"
 
@@ -289,6 +289,6 @@ private: \
 #define vtkMakeMappedUnstructuredGridWithIter(_className, _impl, _cIter, _exportDecl) \
   vtkMakeExportedMappedUnstructuredGridWithIter(_className, _impl, _cIter, )
 
-#endif //__vtkMappedUnstructuredGrid_h
+#endif //vtkMappedUnstructuredGrid_h
 
 // VTK-HeaderTest-Exclude: vtkMappedUnstructuredGrid.h
diff --git a/Common/DataModel/vtkMappedUnstructuredGridCellIterator.h b/Common/DataModel/vtkMappedUnstructuredGridCellIterator.h
index 3164aeec901a48d3458ee886073d717f7e488252..d26f01fc6146051652875c123d98814a5cae92e3 100644
--- a/Common/DataModel/vtkMappedUnstructuredGridCellIterator.h
+++ b/Common/DataModel/vtkMappedUnstructuredGridCellIterator.h
@@ -21,8 +21,8 @@
 // uses random access for data lookups. Custom vtkCellIterator implementations
 // should be used instead when random-access is inefficient.
 
-#ifndef __vtkMappedUnstructuredGridCellIterator_h
-#define __vtkMappedUnstructuredGridCellIterator_h
+#ifndef vtkMappedUnstructuredGridCellIterator_h
+#define vtkMappedUnstructuredGridCellIterator_h
 
 #include "vtkCellIterator.h"
 #include "vtkSmartPointer.h" // For vtkSmartPointer
@@ -70,6 +70,6 @@ private:
 
 #include "vtkMappedUnstructuredGridCellIterator.txx"
 
-#endif //__vtkMappedUnstructuredGridCellIterator_h
+#endif //vtkMappedUnstructuredGridCellIterator_h
 
 // VTK-HeaderTest-Exclude: vtkMappedUnstructuredGridCellIterator.h
diff --git a/Common/DataModel/vtkMarchingCubesTriangleCases.h b/Common/DataModel/vtkMarchingCubesTriangleCases.h
index 203d9c6eec251e8b2e9e469c488489e6fec91775..89849002cc3e7df097753b89bfc8223700c71ecb 100644
--- a/Common/DataModel/vtkMarchingCubesTriangleCases.h
+++ b/Common/DataModel/vtkMarchingCubesTriangleCases.h
@@ -12,8 +12,8 @@
      PURPOSE.  See the above copyright notice for more information.
 
 =========================================================================*/
-#ifndef __vtkMarchingCubesCases_h
-#define __vtkMarchingCubesCases_h
+#ifndef vtkMarchingCubesCases_h
+#define vtkMarchingCubesCases_h
 //
 // marching cubes case table for generating isosurfaces
 //
diff --git a/Common/DataModel/vtkMarchingSquaresLineCases.h b/Common/DataModel/vtkMarchingSquaresLineCases.h
index f33ce3fba14ec63a05cb60276a990071393d038c..665ef146ddb591e0769e6ae167b9a06700dc4441 100644
--- a/Common/DataModel/vtkMarchingSquaresLineCases.h
+++ b/Common/DataModel/vtkMarchingSquaresLineCases.h
@@ -12,8 +12,8 @@
      PURPOSE.  See the above copyright notice for more information.
 
 =========================================================================*/
-#ifndef __vtkMarchingSquaresLineCases_h
-#define __vtkMarchingSquaresLineCases_h
+#ifndef vtkMarchingSquaresLineCases_h
+#define vtkMarchingSquaresLineCases_h
 //
 // Marching squares cases for generating isolines.
 //
diff --git a/Common/DataModel/vtkMeanValueCoordinatesInterpolator.h b/Common/DataModel/vtkMeanValueCoordinatesInterpolator.h
index e21f10ae2d443b55a532ad2185fb06d4cf6f3f05..0aa308173b2242a068fe9a9a00c2b3fbcc220fc1 100644
--- a/Common/DataModel/vtkMeanValueCoordinatesInterpolator.h
+++ b/Common/DataModel/vtkMeanValueCoordinatesInterpolator.h
@@ -36,8 +36,8 @@ PURPOSE.  See the above copyright notice for more information.
 // .SECTION See Also
 // vtkPolyhedralCell
 
-#ifndef __vtkMeanValueCoordinatesInterpolator_h
-#define __vtkMeanValueCoordinatesInterpolator_h
+#ifndef vtkMeanValueCoordinatesInterpolator_h
+#define vtkMeanValueCoordinatesInterpolator_h
 
 #include "vtkCommonDataModelModule.h" // For export macro
 #include "vtkObject.h"
diff --git a/Common/DataModel/vtkMergePoints.h b/Common/DataModel/vtkMergePoints.h
index db711e79c5c22c9ecf5b1db4f1d787603ad60a05..d5c1fc72892cfc7df42617e31a144ba6c85fa574 100644
--- a/Common/DataModel/vtkMergePoints.h
+++ b/Common/DataModel/vtkMergePoints.h
@@ -21,8 +21,8 @@
 // .SECTION See Also
 // vtkCleanPolyData
 
-#ifndef __vtkMergePoints_h
-#define __vtkMergePoints_h
+#ifndef vtkMergePoints_h
+#define vtkMergePoints_h
 
 #include "vtkCommonDataModelModule.h" // For export macro
 #include "vtkPointLocator.h"
diff --git a/Common/DataModel/vtkMolecule.h b/Common/DataModel/vtkMolecule.h
index 452c54f6e0df7c679abd1ade12c6464726fda775..b89274db89718af0c97fa2d94dadfa7ce2eeae7a 100644
--- a/Common/DataModel/vtkMolecule.h
+++ b/Common/DataModel/vtkMolecule.h
@@ -63,8 +63,8 @@
 // .SECTION See Also
 // vtkAtom vtkBond vtkMoleculeMapper vtkPeriodicTable
 
-#ifndef __vtkMolecule_h
-#define __vtkMolecule_h
+#ifndef vtkMolecule_h
+#define vtkMolecule_h
 
 #include "vtkCommonDataModelModule.h" // For export macro
 #include "vtkUndirectedGraph.h"
diff --git a/Common/DataModel/vtkMultiBlockDataSet.h b/Common/DataModel/vtkMultiBlockDataSet.h
index 37e8bc7b3f936296800068aa08ee6462a50aeff4..59f26e58f7ff5903cfbe018cc7c7948e6cb1b4d1 100644
--- a/Common/DataModel/vtkMultiBlockDataSet.h
+++ b/Common/DataModel/vtkMultiBlockDataSet.h
@@ -33,8 +33,8 @@
 //   * ds 1
 // @endverbatim
 
-#ifndef __vtkMultiBlockDataSet_h
-#define __vtkMultiBlockDataSet_h
+#ifndef vtkMultiBlockDataSet_h
+#define vtkMultiBlockDataSet_h
 
 #include "vtkCommonDataModelModule.h" // For export macro
 #include "vtkDataObjectTree.h"
diff --git a/Common/DataModel/vtkMultiPieceDataSet.h b/Common/DataModel/vtkMultiPieceDataSet.h
index 926dd7f68dd80eef9807e35c79f4b6f6b3047a46..aed75bda195abaf9ca266de616deccbe9301e8f5 100644
--- a/Common/DataModel/vtkMultiPieceDataSet.h
+++ b/Common/DataModel/vtkMultiPieceDataSet.h
@@ -27,8 +27,8 @@
 // datasets eg. vtkMultiBlockDataSet, vtkHierarchicalBoxDataSet. Hence the lack
 // of algorithms producting vtkMultiPieceDataSet.
 
-#ifndef __vtkMultiPieceDataSet_h
-#define __vtkMultiPieceDataSet_h
+#ifndef vtkMultiPieceDataSet_h
+#define vtkMultiPieceDataSet_h
 
 #include "vtkCommonDataModelModule.h" // For export macro
 #include "vtkDataObjectTree.h"
diff --git a/Common/DataModel/vtkMutableDirectedGraph.h b/Common/DataModel/vtkMutableDirectedGraph.h
index e279edb52e961aae9203ceed540f1e4d4ded5b40..3a013d6776f1a04f7026f1ce8123176b72339e34 100644
--- a/Common/DataModel/vtkMutableDirectedGraph.h
+++ b/Common/DataModel/vtkMutableDirectedGraph.h
@@ -29,8 +29,8 @@
 // .SECTION See Also
 // vtkDirectedGraph vtkGraph vtkTree
 
-#ifndef __vtkMutableDirectedGraph_h
-#define __vtkMutableDirectedGraph_h
+#ifndef vtkMutableDirectedGraph_h
+#define vtkMutableDirectedGraph_h
 
 #include "vtkCommonDataModelModule.h" // For export macro
 #include "vtkDirectedGraph.h"
diff --git a/Common/DataModel/vtkMutableUndirectedGraph.h b/Common/DataModel/vtkMutableUndirectedGraph.h
index 350297a1902fcf8774a75259e46b6f34596c1465..9f0b95b4cd2e53121fb71415bce37039b1af0697 100644
--- a/Common/DataModel/vtkMutableUndirectedGraph.h
+++ b/Common/DataModel/vtkMutableUndirectedGraph.h
@@ -28,8 +28,8 @@
 // .SECTION See Also
 // vtkUndirectedGraph vtkGraph
 
-#ifndef __vtkMutableUndirectedGraph_h
-#define __vtkMutableUndirectedGraph_h
+#ifndef vtkMutableUndirectedGraph_h
+#define vtkMutableUndirectedGraph_h
 
 #include "vtkCommonDataModelModule.h" // For export macro
 #include "vtkUndirectedGraph.h"
diff --git a/Common/DataModel/vtkNonLinearCell.h b/Common/DataModel/vtkNonLinearCell.h
index c2ac9a49a06e9dfe8db72cc069ba8d611854ffad..632cd546a2669c3d78f86547940a992cedd3e515 100644
--- a/Common/DataModel/vtkNonLinearCell.h
+++ b/Common/DataModel/vtkNonLinearCell.h
@@ -24,8 +24,8 @@
 // non-linear interpolation functions (a product of three linear functions
 // in r-s-t) even thought vtkHexahedron is considered linear.)
 
-#ifndef __vtkNonLinearCell_h
-#define __vtkNonLinearCell_h
+#ifndef vtkNonLinearCell_h
+#define vtkNonLinearCell_h
 
 #include "vtkCommonDataModelModule.h" // For export macro
 #include "vtkCell.h"
diff --git a/Common/DataModel/vtkNonMergingPointLocator.h b/Common/DataModel/vtkNonMergingPointLocator.h
index ecf3b3fec834a6c1645cef32f3b8df7a8125b85f..ac0ae845bb22e8e731dcc6925d4acf227f412a2c 100644
--- a/Common/DataModel/vtkNonMergingPointLocator.h
+++ b/Common/DataModel/vtkNonMergingPointLocator.h
@@ -28,8 +28,8 @@
 // .SECTION See Also
 //  vtkIncrementalPointLocator vtkPointLocator vtkMergePoints
 
-#ifndef __vtkNonMergingPointLocator_h
-#define __vtkNonMergingPointLocator_h
+#ifndef vtkNonMergingPointLocator_h
+#define vtkNonMergingPointLocator_h
 
 #include "vtkCommonDataModelModule.h" // For export macro
 #include "vtkPointLocator.h"
diff --git a/Common/DataModel/vtkOctreePointLocator.h b/Common/DataModel/vtkOctreePointLocator.h
index e93ba5cb7fcd4dcc1c11fae13c289f533f6f505f..505b53612ee7e386e80ccdae35ff6a0b58b70a16 100644
--- a/Common/DataModel/vtkOctreePointLocator.h
+++ b/Common/DataModel/vtkOctreePointLocator.h
@@ -31,8 +31,8 @@
 // .SECTION See Also
 // vtkLocator vtkPointLocator vtkOctreePointLocatorNode
 
-#ifndef __vtkOctreePointLocator_h
-#define __vtkOctreePointLocator_h
+#ifndef vtkOctreePointLocator_h
+#define vtkOctreePointLocator_h
 
 #include "vtkCommonDataModelModule.h" // For export macro
 #include "vtkAbstractPointLocator.h"
diff --git a/Common/DataModel/vtkOctreePointLocatorNode.h b/Common/DataModel/vtkOctreePointLocatorNode.h
index 5162506e11ef57c17226e8aa93447fd049af495f..23050048d159d3ac09785e274bf48b74194a317b 100644
--- a/Common/DataModel/vtkOctreePointLocatorNode.h
+++ b/Common/DataModel/vtkOctreePointLocatorNode.h
@@ -31,8 +31,8 @@
 // .SECTION See Also
 // vtkOctreePointLocator
 
-#ifndef __vtkOctreePointLocatorNode_h
-#define __vtkOctreePointLocatorNode_h
+#ifndef vtkOctreePointLocatorNode_h
+#define vtkOctreePointLocatorNode_h
 
 #include "vtkCommonDataModelModule.h" // For export macro
 #include "vtkObject.h"
diff --git a/Common/DataModel/vtkOrderedTriangulator.h b/Common/DataModel/vtkOrderedTriangulator.h
index 85493e68f3014aef64f10016d9e4a564e6aa94b6..73ecb673e948f8727f724dd3b006966d2b8b77f3 100644
--- a/Common/DataModel/vtkOrderedTriangulator.h
+++ b/Common/DataModel/vtkOrderedTriangulator.h
@@ -75,8 +75,8 @@
 // .SECTION See Also
 // vtkDelaunay2D vtkDelaunay3D vtkPolygon
 
-#ifndef __vtkOrderedTriangulator_h
-#define __vtkOrderedTriangulator_h
+#ifndef vtkOrderedTriangulator_h
+#define vtkOrderedTriangulator_h
 
 #include "vtkCommonDataModelModule.h" // For export macro
 #include "vtkObject.h"
diff --git a/Common/DataModel/vtkOutEdgeIterator.h b/Common/DataModel/vtkOutEdgeIterator.h
index 432d437899476416b1a2a42bf8c6c368329d8f73..743ed5b2b7e96d10056891b2d4365b626fdf3f0d 100644
--- a/Common/DataModel/vtkOutEdgeIterator.h
+++ b/Common/DataModel/vtkOutEdgeIterator.h
@@ -29,8 +29,8 @@
 // .SECTION See Also
 // vtkGraph vtkInEdgeIterator
 
-#ifndef __vtkOutEdgeIterator_h
-#define __vtkOutEdgeIterator_h
+#ifndef vtkOutEdgeIterator_h
+#define vtkOutEdgeIterator_h
 
 #include "vtkCommonDataModelModule.h" // For export macro
 #include "vtkObject.h"
diff --git a/Common/DataModel/vtkOverlappingAMR.h b/Common/DataModel/vtkOverlappingAMR.h
index 66426a5b91d5c6e5341c824cd5d73e5a30f86bfd..0de9b6ca0805adbd32c6782ff8123a2b8013fe39 100644
--- a/Common/DataModel/vtkOverlappingAMR.h
+++ b/Common/DataModel/vtkOverlappingAMR.h
@@ -22,8 +22,8 @@
 // .SECTION See Also
 // vtkAMRInformation
 
-#ifndef __vtkOverlappingAmr_h
-#define __vtkOverlappingAmr_h
+#ifndef vtkOverlappingAmr_h
+#define vtkOverlappingAmr_h
 
 #include "vtkCommonDataModelModule.h" // For export macro
 #include "vtkUniformGridAMR.h"
diff --git a/Common/DataModel/vtkPath.h b/Common/DataModel/vtkPath.h
index 0185bcbda636674f639fc400e78151f6866fae36..485ab0b5aaf13cfdaf9ef7c128c481d8069aa589 100644
--- a/Common/DataModel/vtkPath.h
+++ b/Common/DataModel/vtkPath.h
@@ -18,8 +18,8 @@
 // vtkPath provides a container for paths composed of line segment and
 // 2nd/3rd order Bezier curves.
 
-#ifndef __vtkPath_h
-#define __vtkPath_h
+#ifndef vtkPath_h
+#define vtkPath_h
 
 #include "vtkCommonDataModelModule.h" // For export macro
 #include "vtkPointSet.h"
diff --git a/Common/DataModel/vtkPentagonalPrism.h b/Common/DataModel/vtkPentagonalPrism.h
index 6fca0d88fbbf1a38b5a823f469891ccf165e2702..3b3e087a458252508c2f616665a1a52ed55ab698 100644
--- a/Common/DataModel/vtkPentagonalPrism.h
+++ b/Common/DataModel/vtkPentagonalPrism.h
@@ -29,8 +29,8 @@
 // class in VTK. <br>
 // Please address all comments to Jean Favre (jfavre at cscs.ch).
 
-#ifndef __vtkPentagonalPrism_h
-#define __vtkPentagonalPrism_h
+#ifndef vtkPentagonalPrism_h
+#define vtkPentagonalPrism_h
 
 #include "vtkCommonDataModelModule.h" // For export macro
 #include "vtkCell3D.h"
diff --git a/Common/DataModel/vtkPerlinNoise.h b/Common/DataModel/vtkPerlinNoise.h
index 338cd9287bde3cb68b7432380cf02aca1d6d7ef9..2d0417031c7eb126d2b4fcf2f8262be296998129 100644
--- a/Common/DataModel/vtkPerlinNoise.h
+++ b/Common/DataModel/vtkPerlinNoise.h
@@ -26,8 +26,8 @@
 // .SECTION See Also
 // vtkImplicitFunction
 
-#ifndef __vtkPerlinNoise_h
-#define __vtkPerlinNoise_h
+#ifndef vtkPerlinNoise_h
+#define vtkPerlinNoise_h
 
 #include "vtkCommonDataModelModule.h" // For export macro
 #include "vtkImplicitFunction.h"
diff --git a/Common/DataModel/vtkPiecewiseFunction.h b/Common/DataModel/vtkPiecewiseFunction.h
index f05a245b4783a6602c5f693f8dc9d524cfc2fcf5..eb9f54e6cd0ad324cfcbf47646420c608d285424 100644
--- a/Common/DataModel/vtkPiecewiseFunction.h
+++ b/Common/DataModel/vtkPiecewiseFunction.h
@@ -31,8 +31,8 @@
 // will default to Midpoint = 0.5 (halfway between the control points) and
 // Sharpness = 0.0 (linear).
 
-#ifndef __vtkPiecewiseFunction_h
-#define __vtkPiecewiseFunction_h
+#ifndef vtkPiecewiseFunction_h
+#define vtkPiecewiseFunction_h
 
 #include "vtkCommonDataModelModule.h" // For export macro
 #include "vtkDataObject.h"
diff --git a/Common/DataModel/vtkPixel.h b/Common/DataModel/vtkPixel.h
index 90b04585a69f172b20a87e39619d267de5d0b518..011823b71c709ecd8c5e004f2476132f569c8474 100644
--- a/Common/DataModel/vtkPixel.h
+++ b/Common/DataModel/vtkPixel.h
@@ -19,8 +19,8 @@
 // and aligned along x-y-z coordinate axes leading to large increases in
 // computational efficiency.
 
-#ifndef __vtkPixel_h
-#define __vtkPixel_h
+#ifndef vtkPixel_h
+#define vtkPixel_h
 
 #include "vtkCommonDataModelModule.h" // For export macro
 #include "vtkCell.h"
diff --git a/Common/DataModel/vtkPixelExtent.h b/Common/DataModel/vtkPixelExtent.h
index 95ddae1f6532bfe1726ee5da97022ab7c799fd26..bfc8229c853702562b763c1bd78f4ab3097a0ef3 100644
--- a/Common/DataModel/vtkPixelExtent.h
+++ b/Common/DataModel/vtkPixelExtent.h
@@ -22,8 +22,8 @@
 // NOTE in most cases operation on an empty object produces
 // incorrect results. If it an issue query Empty() first.
 
-#ifndef __vtkPixelExtent_h
-#define __vtkPixelExtent_h
+#ifndef vtkPixelExtent_h
+#define vtkPixelExtent_h
 
 #include "vtkSystemIncludes.h" // for VTK's system header config
 #include "vtkCommonDataModelModule.h" // for export
diff --git a/Common/DataModel/vtkPlane.h b/Common/DataModel/vtkPlane.h
index 645575f5ba8673e8c363cf33fd2ffe59f1a174d0..7927b78d75840a2122ee5a1e7358f2b377a491e0 100644
--- a/Common/DataModel/vtkPlane.h
+++ b/Common/DataModel/vtkPlane.h
@@ -19,8 +19,8 @@
 // returning plane normal. vtkPlane is a concrete implementation of the
 // abstract class vtkImplicitFunction.
 
-#ifndef __vtkPlane_h
-#define __vtkPlane_h
+#ifndef vtkPlane_h
+#define vtkPlane_h
 
 #include "vtkCommonDataModelModule.h" // For export macro
 #include "vtkImplicitFunction.h"
diff --git a/Common/DataModel/vtkPlaneCollection.h b/Common/DataModel/vtkPlaneCollection.h
index 4a76b533adfb7696a8b4f83b1217ef4421ab0aa6..d54c8c13dad41fd457644c469c1dde7b4493246e 100644
--- a/Common/DataModel/vtkPlaneCollection.h
+++ b/Common/DataModel/vtkPlaneCollection.h
@@ -19,8 +19,8 @@
 // .SECTION See Also
 // vtkCollection
 
-#ifndef __vtkPlaneCollection_h
-#define __vtkPlaneCollection_h
+#ifndef vtkPlaneCollection_h
+#define vtkPlaneCollection_h
 
 #include "vtkCommonDataModelModule.h" // For export macro
 #include "vtkCollection.h"
diff --git a/Common/DataModel/vtkPlanes.h b/Common/DataModel/vtkPlanes.h
index 2ce78b86c9fc51bd713d0ced38dd0f6fc3c99715..458060d4bbf65e0a8b3867889ae1513710c2a108 100644
--- a/Common/DataModel/vtkPlanes.h
+++ b/Common/DataModel/vtkPlanes.h
@@ -32,8 +32,8 @@
 // .SECTION See Also
 // vtkCamera
 
-#ifndef __vtkPlanes_h
-#define __vtkPlanes_h
+#ifndef vtkPlanes_h
+#define vtkPlanes_h
 
 #include "vtkCommonDataModelModule.h" // For export macro
 #include "vtkImplicitFunction.h"
diff --git a/Common/DataModel/vtkPlanesIntersection.h b/Common/DataModel/vtkPlanesIntersection.h
index 20e81b587e07274fb91f96570289ca4ac98892f6..605f28bbe0bd4c2c4109549aca92c55294c20cdd 100644
--- a/Common/DataModel/vtkPlanesIntersection.h
+++ b/Common/DataModel/vtkPlanesIntersection.h
@@ -36,8 +36,8 @@
 //    to change the set of planes.
 //
 
-#ifndef __vtkPlanesIntersection_h
-#define __vtkPlanesIntersection_h
+#ifndef vtkPlanesIntersection_h
+#define vtkPlanesIntersection_h
 
 #include "vtkCommonDataModelModule.h" // For export macro
 #include "vtkPlanes.h"
diff --git a/Common/DataModel/vtkPointData.h b/Common/DataModel/vtkPointData.h
index ec520f808d1a7442fa70941cb793e7d9b34b0988..86b9e51064876b290fb8ad39447eea8ad35ee2a0 100644
--- a/Common/DataModel/vtkPointData.h
+++ b/Common/DataModel/vtkPointData.h
@@ -19,8 +19,8 @@
 // coordinates, etc.) Most of the functionality is handled by
 // vtkDataSetAttributes
 
-#ifndef __vtkPointData_h
-#define __vtkPointData_h
+#ifndef vtkPointData_h
+#define vtkPointData_h
 
 #include "vtkCommonDataModelModule.h" // For export macro
 #include "vtkDataSetAttributes.h"
diff --git a/Common/DataModel/vtkPointLocator.h b/Common/DataModel/vtkPointLocator.h
index 2969b92491882cbff5f47afcb4e18d31b0ad03ab..3106a59c4b96b0f8763f175d69f7c446e92a8a82 100644
--- a/Common/DataModel/vtkPointLocator.h
+++ b/Common/DataModel/vtkPointLocator.h
@@ -33,8 +33,8 @@
 // .SECTION See Also
 // vtkCellPicker vtkPointPicker
 
-#ifndef __vtkPointLocator_h
-#define __vtkPointLocator_h
+#ifndef vtkPointLocator_h
+#define vtkPointLocator_h
 
 #include "vtkCommonDataModelModule.h" // For export macro
 #include "vtkIncrementalPointLocator.h"
diff --git a/Common/DataModel/vtkPointSet.h b/Common/DataModel/vtkPointSet.h
index 5f217c8d2d18b3e3bf263420afb4b19e48e60afd..a3d16444a64b571fef39d50dbc1b3260ed6cde6b 100644
--- a/Common/DataModel/vtkPointSet.h
+++ b/Common/DataModel/vtkPointSet.h
@@ -23,8 +23,8 @@
 // .SECTION See Also
 // vtkPolyData vtkStructuredGrid vtkUnstructuredGrid
 
-#ifndef __vtkPointSet_h
-#define __vtkPointSet_h
+#ifndef vtkPointSet_h
+#define vtkPointSet_h
 
 #include "vtkCommonDataModelModule.h" // For export macro
 #include "vtkDataSet.h"
diff --git a/Common/DataModel/vtkPointSetCellIterator.h b/Common/DataModel/vtkPointSetCellIterator.h
index d1019b77e46918f0f7ef6311b65d11438d60a734..0b63338053da96568ebe53f574a2958f1d59617c 100644
--- a/Common/DataModel/vtkPointSetCellIterator.h
+++ b/Common/DataModel/vtkPointSetCellIterator.h
@@ -15,8 +15,8 @@
 // .NAME vtkPointSetCellIterator - Implementation of vtkCellIterator using
 // vtkPointSet API.
 
-#ifndef __vtkPointSetCellIterator_h
-#define __vtkPointSetCellIterator_h
+#ifndef vtkPointSetCellIterator_h
+#define vtkPointSetCellIterator_h
 
 #include "vtkCommonDataModelModule.h" // For export macro
 #include "vtkCellIterator.h"
@@ -57,4 +57,4 @@ private:
   void operator=(const vtkPointSetCellIterator &);   // Not implemented.
 };
 
-#endif //__vtkPointSetCellIterator_h
+#endif //vtkPointSetCellIterator_h
diff --git a/Common/DataModel/vtkPointsProjectedHull.h b/Common/DataModel/vtkPointsProjectedHull.h
index 7cf55644eea2ade8980bf5d5faf42a0a6212086c..dba664b1ad6854408f545f7b956f6c5fb8d6caa7 100644
--- a/Common/DataModel/vtkPointsProjectedHull.h
+++ b/Common/DataModel/vtkPointsProjectedHull.h
@@ -26,8 +26,8 @@
 //    test for intersection of that hull with an axis aligned
 //    rectangle.  This is used for intersection tests of 3D volumes.
 
-#ifndef __vtkPointsProjectedHull_h
-#define __vtkPointsProjectedHull_h
+#ifndef vtkPointsProjectedHull_h
+#define vtkPointsProjectedHull_h
 
 #include "vtkCommonDataModelModule.h" // For export macro
 #include "vtkPoints.h"
diff --git a/Common/DataModel/vtkPolyData.h b/Common/DataModel/vtkPolyData.h
index b8a551f0e2ef3bd640e31f5696e6d6093ca8cdbd..415536be6c93f619e548b6e89b34986752dd36de 100644
--- a/Common/DataModel/vtkPolyData.h
+++ b/Common/DataModel/vtkPolyData.h
@@ -51,8 +51,8 @@
 // expects lines). Read the documentation for each filter carefully to
 // understand how each part of vtkPolyData is processed.
 
-#ifndef __vtkPolyData_h
-#define __vtkPolyData_h
+#ifndef vtkPolyData_h
+#define vtkPolyData_h
 
 #include "vtkCommonDataModelModule.h" // For export macro
 #include "vtkPointSet.h"
diff --git a/Common/DataModel/vtkPolyDataCollection.h b/Common/DataModel/vtkPolyDataCollection.h
index 7309bc97009a1a7dab8a55c18285061d77b48ab9..4ce075f5c7c5d8302a87ddf902e10292368c118a 100644
--- a/Common/DataModel/vtkPolyDataCollection.h
+++ b/Common/DataModel/vtkPolyDataCollection.h
@@ -20,8 +20,8 @@
 // .SECTION See Also
 // vtkDataSetCollection vtkCollection
 
-#ifndef __vtkPolyDataCollection_h
-#define __vtkPolyDataCollection_h
+#ifndef vtkPolyDataCollection_h
+#define vtkPolyDataCollection_h
 
 #include "vtkCommonDataModelModule.h" // For export macro
 #include "vtkCollection.h"
diff --git a/Common/DataModel/vtkPolyLine.h b/Common/DataModel/vtkPolyLine.h
index 38c79f2e12b2945f3a21e195f08c580d30c39090..61e411205ecf0bb43fe7670a6b5f7b24360ed253 100644
--- a/Common/DataModel/vtkPolyLine.h
+++ b/Common/DataModel/vtkPolyLine.h
@@ -17,8 +17,8 @@
 // vtkPolyLine is a concrete implementation of vtkCell to represent a set
 // of 1D lines.
 
-#ifndef __vtkPolyLine_h
-#define __vtkPolyLine_h
+#ifndef vtkPolyLine_h
+#define vtkPolyLine_h
 
 #include "vtkCommonDataModelModule.h" // For export macro
 #include "vtkCell.h"
diff --git a/Common/DataModel/vtkPolyPlane.h b/Common/DataModel/vtkPolyPlane.h
index 68281083fe0f8d3540d943f01294db44f62865b4..b6c5f65ef815dc094a8df3dc889395349db7b40a 100644
--- a/Common/DataModel/vtkPolyPlane.h
+++ b/Common/DataModel/vtkPolyPlane.h
@@ -23,8 +23,8 @@
 // .SECTION ToDo
 // Generalize to extrusions along arbitrary directions.
 
-#ifndef __vtkPolyPlane_h
-#define __vtkPolyPlane_h
+#ifndef vtkPolyPlane_h
+#define vtkPolyPlane_h
 
 #include "vtkCommonDataModelModule.h" // For export macro
 #include "vtkImplicitFunction.h"
diff --git a/Common/DataModel/vtkPolyVertex.h b/Common/DataModel/vtkPolyVertex.h
index bb9ea268729d79147c66253b577f3252331fce20..a924ec04bc149d025da38499440d25a3c0b1d650 100644
--- a/Common/DataModel/vtkPolyVertex.h
+++ b/Common/DataModel/vtkPolyVertex.h
@@ -17,8 +17,8 @@
 // vtkPolyVertex is a concrete implementation of vtkCell to represent a
 // set of 3D vertices.
 
-#ifndef __vtkPolyVertex_h
-#define __vtkPolyVertex_h
+#ifndef vtkPolyVertex_h
+#define vtkPolyVertex_h
 
 #include "vtkCommonDataModelModule.h" // For export macro
 #include "vtkCell.h"
diff --git a/Common/DataModel/vtkPolygon.h b/Common/DataModel/vtkPolygon.h
index 8f09b6bb5b1a3557c8068847d186478928adb3fb..da09d64902dd0bb5afca00603935b42b6916a7a8 100644
--- a/Common/DataModel/vtkPolygon.h
+++ b/Common/DataModel/vtkPolygon.h
@@ -19,8 +19,8 @@
 // self-intersect. Define the polygon with n-points ordered in the counter-
 // clockwise direction; do not repeat the last point.
 
-#ifndef __vtkPolygon_h
-#define __vtkPolygon_h
+#ifndef vtkPolygon_h
+#define vtkPolygon_h
 
 #include "vtkCommonDataModelModule.h" // For export macro
 #include "vtkCell.h"
diff --git a/Common/DataModel/vtkPolyhedron.h b/Common/DataModel/vtkPolyhedron.h
index 237b572ec8e2d9501777c7230c4a744bb269e207..e46071127adc2c4f793cc0e8d9970a3a2b20698f 100644
--- a/Common/DataModel/vtkPolyhedron.h
+++ b/Common/DataModel/vtkPolyhedron.h
@@ -29,8 +29,8 @@
 // .SECTION See Also
 // vtkCell3D vtkConvecPointSet vtkMeanValueCoordinatesInterpolator
 
-#ifndef __vtkPolyhedron_h
-#define __vtkPolyhedron_h
+#ifndef vtkPolyhedron_h
+#define vtkPolyhedron_h
 
 #include "vtkCommonDataModelModule.h" // For export macro
 #include "vtkCell3D.h"
diff --git a/Common/DataModel/vtkPyramid.h b/Common/DataModel/vtkPyramid.h
index 364247d70f564ca546da694fbb272cdf3bda5c8c..a8e956c64664ab9d38349dc883e6a32b0d3d81e2 100644
--- a/Common/DataModel/vtkPyramid.h
+++ b/Common/DataModel/vtkPyramid.h
@@ -25,8 +25,8 @@
 // .SECTION See Also
 // vtkConvexPointSet vtkHexahedron vtkTetra vtkVoxel vtkWedge
 
-#ifndef __vtkPyramid_h
-#define __vtkPyramid_h
+#ifndef vtkPyramid_h
+#define vtkPyramid_h
 
 #include "vtkCommonDataModelModule.h" // For export macro
 #include "vtkCell3D.h"
diff --git a/Common/DataModel/vtkQuad.h b/Common/DataModel/vtkQuad.h
index f729659ec0bb196f1cbb2da572af3e43cbe81f4b..3e6647cc5ed3a0ce99c2d7749870dcafbbf30f85 100644
--- a/Common/DataModel/vtkQuad.h
+++ b/Common/DataModel/vtkQuad.h
@@ -19,8 +19,8 @@
 // counterclockwise order. vtkQuad uses the standard isoparametric
 // interpolation functions for a linear quadrilateral.
 
-#ifndef __vtkQuad_h
-#define __vtkQuad_h
+#ifndef vtkQuad_h
+#define vtkQuad_h
 
 #include "vtkCommonDataModelModule.h" // For export macro
 #include "vtkCell.h"
diff --git a/Common/DataModel/vtkQuadraticEdge.h b/Common/DataModel/vtkQuadraticEdge.h
index 4fa1ce5a9b535a2a050ace16af2d651a16bfda83..81d94abf328d5234a09481bf40e2f3fadb395e46 100644
--- a/Common/DataModel/vtkQuadraticEdge.h
+++ b/Common/DataModel/vtkQuadraticEdge.h
@@ -25,8 +25,8 @@
 // vtkQuadraticTriangle vtkQuadraticTetra vtkQuadraticWedge
 // vtkQuadraticQuad vtkQuadraticHexahedron vtkQuadraticPyramid
 
-#ifndef __vtkQuadraticEdge_h
-#define __vtkQuadraticEdge_h
+#ifndef vtkQuadraticEdge_h
+#define vtkQuadraticEdge_h
 
 #include "vtkCommonDataModelModule.h" // For export macro
 #include "vtkNonLinearCell.h"
diff --git a/Common/DataModel/vtkQuadraticHexahedron.h b/Common/DataModel/vtkQuadraticHexahedron.h
index 17345edd62b507ec3662c1cf9b17c87a39bbff00..d29f97cfb62cb93fb801c4ee540a5d8ecd0df120 100644
--- a/Common/DataModel/vtkQuadraticHexahedron.h
+++ b/Common/DataModel/vtkQuadraticHexahedron.h
@@ -28,8 +28,8 @@
 // vtkQuadraticEdge vtkQuadraticTriangle vtkQuadraticTetra
 // vtkQuadraticQuad vtkQuadraticPyramid vtkQuadraticWedge
 
-#ifndef __vtkQuadraticHexahedron_h
-#define __vtkQuadraticHexahedron_h
+#ifndef vtkQuadraticHexahedron_h
+#define vtkQuadraticHexahedron_h
 
 #include "vtkCommonDataModelModule.h" // For export macro
 #include "vtkNonLinearCell.h"
diff --git a/Common/DataModel/vtkQuadraticLinearQuad.h b/Common/DataModel/vtkQuadraticLinearQuad.h
index 6ce5160eff08ddbd593e0b6ed7e96149aa8766f1..fe48cdde4f8cbf8353c6248f2132fd07c7f4b164 100644
--- a/Common/DataModel/vtkQuadraticLinearQuad.h
+++ b/Common/DataModel/vtkQuadraticLinearQuad.h
@@ -30,8 +30,8 @@
 // Thanks to Soeren Gebbert  who developed this class and
 // integrated it into VTK 5.0.
 
-#ifndef __vtkQuadraticLinearQuad_h
-#define __vtkQuadraticLinearQuad_h
+#ifndef vtkQuadraticLinearQuad_h
+#define vtkQuadraticLinearQuad_h
 
 #include "vtkCommonDataModelModule.h" // For export macro
 #include "vtkNonLinearCell.h"
diff --git a/Common/DataModel/vtkQuadraticLinearWedge.h b/Common/DataModel/vtkQuadraticLinearWedge.h
index 5313947fb10c9240eb8d23a50ace938b12da0fcd..7c199786948f9c170999b3977a60aff0e4b38559 100644
--- a/Common/DataModel/vtkQuadraticLinearWedge.h
+++ b/Common/DataModel/vtkQuadraticLinearWedge.h
@@ -33,8 +33,8 @@
 // Thanks to Soeren Gebbert  who developed this class and
 // integrated it into VTK 5.0.
 
-#ifndef __vtkQuadraticLinearWedge_h
-#define __vtkQuadraticLinearWedge_h
+#ifndef vtkQuadraticLinearWedge_h
+#define vtkQuadraticLinearWedge_h
 
 #include "vtkCommonDataModelModule.h" // For export macro
 #include "vtkNonLinearCell.h"
diff --git a/Common/DataModel/vtkQuadraticPolygon.h b/Common/DataModel/vtkQuadraticPolygon.h
index 4f10f15227bc29f8f70a152c6d57fc70b901269f..017f915d36155e77a4a1794200541eb50a0c778e 100644
--- a/Common/DataModel/vtkQuadraticPolygon.h
+++ b/Common/DataModel/vtkQuadraticPolygon.h
@@ -28,8 +28,8 @@
 // vtkQuadraticHexahedron vtkQuadraticWedge vtkQuadraticPyramid
 
 
-#ifndef __vtkQuadraticPolygon_h
-#define __vtkQuadraticPolygon_h
+#ifndef vtkQuadraticPolygon_h
+#define vtkQuadraticPolygon_h
 
 #include "vtkCommonDataModelModule.h" // For export macro
 #include "vtkNonLinearCell.h"
diff --git a/Common/DataModel/vtkQuadraticPyramid.h b/Common/DataModel/vtkQuadraticPyramid.h
index ddce3318af103ed5633c783dd31c80e6358770f4..555caba062b4d33de6955c580e0a8894cbd292f7 100644
--- a/Common/DataModel/vtkQuadraticPyramid.h
+++ b/Common/DataModel/vtkQuadraticPyramid.h
@@ -33,8 +33,8 @@
 // the report Pyramid Solid Elements Linear and Quadratic Iso-P Models
 // From Center For Aerospace Structures
 
-#ifndef __vtkQuadraticPyramid_h
-#define __vtkQuadraticPyramid_h
+#ifndef vtkQuadraticPyramid_h
+#define vtkQuadraticPyramid_h
 
 #include "vtkCommonDataModelModule.h" // For export macro
 #include "vtkNonLinearCell.h"
diff --git a/Common/DataModel/vtkQuadraticQuad.h b/Common/DataModel/vtkQuadraticQuad.h
index 59e7b02898639107b46a7e1a077fad8e1b911b10..2b616083d39a8c26f048911a496e0fa207553f50 100644
--- a/Common/DataModel/vtkQuadraticQuad.h
+++ b/Common/DataModel/vtkQuadraticQuad.h
@@ -28,8 +28,8 @@
 // vtkQuadraticHexahedron vtkQuadraticWedge vtkQuadraticPyramid
 
 
-#ifndef __vtkQuadraticQuad_h
-#define __vtkQuadraticQuad_h
+#ifndef vtkQuadraticQuad_h
+#define vtkQuadraticQuad_h
 
 #include "vtkCommonDataModelModule.h" // For export macro
 #include "vtkNonLinearCell.h"
diff --git a/Common/DataModel/vtkQuadraticTetra.h b/Common/DataModel/vtkQuadraticTetra.h
index da42dff757b14f4d987673d73bef1ec91c6504ea..92f48d2f9d70895c719eeca4a9021b8408c34cba 100644
--- a/Common/DataModel/vtkQuadraticTetra.h
+++ b/Common/DataModel/vtkQuadraticTetra.h
@@ -31,8 +31,8 @@
 // vtkQuadraticEdge vtkQuadraticTriangle vtkQuadraticWedge
 // vtkQuadraticQuad vtkQuadraticHexahedron vtkQuadraticPyramid
 
-#ifndef __vtkQuadraticTetra_h
-#define __vtkQuadraticTetra_h
+#ifndef vtkQuadraticTetra_h
+#define vtkQuadraticTetra_h
 
 #include "vtkCommonDataModelModule.h" // For export macro
 #include "vtkNonLinearCell.h"
diff --git a/Common/DataModel/vtkQuadraticTriangle.h b/Common/DataModel/vtkQuadraticTriangle.h
index e9f28a9d381f3e7bc831ccd7ebb8fe14c8504065..2d6d94bd5e29532f0abe493454b41e340da3bb15 100644
--- a/Common/DataModel/vtkQuadraticTriangle.h
+++ b/Common/DataModel/vtkQuadraticTriangle.h
@@ -27,8 +27,8 @@
 // vtkQuadraticEdge vtkQuadraticTetra vtkQuadraticPyramid
 // vtkQuadraticQuad vtkQuadraticHexahedron vtkQuadraticWedge
 
-#ifndef __vtkQuadraticTriangle_h
-#define __vtkQuadraticTriangle_h
+#ifndef vtkQuadraticTriangle_h
+#define vtkQuadraticTriangle_h
 
 #include "vtkCommonDataModelModule.h" // For export macro
 #include "vtkNonLinearCell.h"
diff --git a/Common/DataModel/vtkQuadraticWedge.h b/Common/DataModel/vtkQuadraticWedge.h
index 914abe86f417b9455f3c389d00d1df3d0c25c165..83384128196cdeb0c89aaff4af2349f06702de0f 100644
--- a/Common/DataModel/vtkQuadraticWedge.h
+++ b/Common/DataModel/vtkQuadraticWedge.h
@@ -28,8 +28,8 @@
 // vtkQuadraticEdge vtkQuadraticTriangle vtkQuadraticTetra
 // vtkQuadraticHexahedron vtkQuadraticQuad vtkQuadraticPyramid
 
-#ifndef __vtkQuadraticWedge_h
-#define __vtkQuadraticWedge_h
+#ifndef vtkQuadraticWedge_h
+#define vtkQuadraticWedge_h
 
 #include "vtkCommonDataModelModule.h" // For export macro
 #include "vtkNonLinearCell.h"
diff --git a/Common/DataModel/vtkQuadric.h b/Common/DataModel/vtkQuadric.h
index 531c562d24d5974078317db3e1730b7096528736..73066417a513dc9671435d03730e995d2d31409e 100644
--- a/Common/DataModel/vtkQuadric.h
+++ b/Common/DataModel/vtkQuadric.h
@@ -18,8 +18,8 @@
 // a2*z^2 + a3*x*y + a4*y*z + a5*x*z + a6*x + a7*y + a8*z + a9. vtkQuadric is
 // a concrete implementation of vtkImplicitFunction.
 
-#ifndef __vtkQuadric_h
-#define __vtkQuadric_h
+#ifndef vtkQuadric_h
+#define vtkQuadric_h
 
 #include "vtkCommonDataModelModule.h" // For export macro
 #include "vtkImplicitFunction.h"
diff --git a/Common/DataModel/vtkRect.h b/Common/DataModel/vtkRect.h
index 17ed598057295276b613999f7107df67744f1899..0b6c688d1f46984ec3f70e678874538305ce21ca 100644
--- a/Common/DataModel/vtkRect.h
+++ b/Common/DataModel/vtkRect.h
@@ -21,8 +21,8 @@
 // float[4] can be cast to a vtkRectf and manipulated. Also a float[12] could
 // be cast and used as a vtkRectf[3].
 
-#ifndef __vtkRect_h
-#define __vtkRect_h
+#ifndef vtkRect_h
+#define vtkRect_h
 
 #include "vtkVector.h"
 
@@ -162,5 +162,5 @@ const T& vtkRect<T>::Height() const
 #endif // VTK_LEGACY_REMOVE
 
 
-#endif // __vtkRect_h
+#endif // vtkRect_h
 // VTK-HeaderTest-Exclude: vtkRect.h
diff --git a/Common/DataModel/vtkRectilinearGrid.h b/Common/DataModel/vtkRectilinearGrid.h
index 72c45f62d6900c48b4629c2f9ff2018c2727fe17..567b736483799855bb4280b7d34875d4dd0e8686 100644
--- a/Common/DataModel/vtkRectilinearGrid.h
+++ b/Common/DataModel/vtkRectilinearGrid.h
@@ -30,8 +30,8 @@
 // program failure) may result. Also, you must supply coordinates in all
 // three directions, even if the dataset topology is 2D, 1D, or 0D.
 
-#ifndef __vtkRectilinearGrid_h
-#define __vtkRectilinearGrid_h
+#ifndef vtkRectilinearGrid_h
+#define vtkRectilinearGrid_h
 
 #include "vtkCommonDataModelModule.h" // For export macro
 #include "vtkDataSet.h"
diff --git a/Common/DataModel/vtkReebGraph.h b/Common/DataModel/vtkReebGraph.h
index b4bfe88e81a69a4c7a39e9a0d2700b8527792496..8e4494b73370e1739b8086007485b9cff9a5f19d 100644
--- a/Common/DataModel/vtkReebGraph.h
+++ b/Common/DataModel/vtkReebGraph.h
@@ -112,8 +112,8 @@
 // .SECTION Tests
 //      Graphics/Testing/Cxx/TestReebGraph.cxx
 
-#ifndef __vtkReebGraph_h
-#define __vtkReebGraph_h
+#ifndef vtkReebGraph_h
+#define vtkReebGraph_h
 
 #include "vtkCommonDataModelModule.h" // For export macro
 #include  "vtkMutableDirectedGraph.h"
diff --git a/Common/DataModel/vtkReebGraphSimplificationMetric.h b/Common/DataModel/vtkReebGraphSimplificationMetric.h
index ec8893498d93e07711f5a6b238ed5b7f2dbac2e0..40b2c26c97cc2f422c3cf353727a8d482cdf8d29 100644
--- a/Common/DataModel/vtkReebGraphSimplificationMetric.h
+++ b/Common/DataModel/vtkReebGraphSimplificationMetric.h
@@ -40,8 +40,8 @@
 // See Graphics/Testing/Cxx/TestReebGraph.cxx for an example of concrete
 // implemetnation.
 
-#ifndef __vtkReebGraphSimplificationMetric_h
-#define __vtkReebGraphSimplificationMetric_h
+#ifndef vtkReebGraphSimplificationMetric_h
+#define vtkReebGraphSimplificationMetric_h
 
 #include "vtkCommonDataModelModule.h" // For export macro
 #include "vtkObject.h"
diff --git a/Common/DataModel/vtkSelection.h b/Common/DataModel/vtkSelection.h
index 372b114efb264311777c97da8e558ae172ae3c31..d8e6e036f0747517e68ec58770e34d50c3193ff2 100644
--- a/Common/DataModel/vtkSelection.h
+++ b/Common/DataModel/vtkSelection.h
@@ -22,8 +22,8 @@
 // .SECTION See Also
 // vtkSelectionNode
 
-#ifndef __vtkSelection_h
-#define __vtkSelection_h
+#ifndef vtkSelection_h
+#define vtkSelection_h
 
 #include "vtkCommonDataModelModule.h" // For export macro
 #include "vtkDataObject.h"
diff --git a/Common/DataModel/vtkSelectionNode.h b/Common/DataModel/vtkSelectionNode.h
index eea1ff91755c67de61b12cf845bea1a37798bdca..aba24cb8f2007f90e013b2c22996d5a782120028 100644
--- a/Common/DataModel/vtkSelectionNode.h
+++ b/Common/DataModel/vtkSelectionNode.h
@@ -40,8 +40,8 @@
 // .SECTION Caveats
 // No SelectionList is created by default. It should be assigned.
 
-#ifndef __vtkSelectionNode_h
-#define __vtkSelectionNode_h
+#ifndef vtkSelectionNode_h
+#define vtkSelectionNode_h
 
 #include "vtkCommonDataModelModule.h" // For export macro
 #include "vtkObject.h"
diff --git a/Common/DataModel/vtkSimpleCellTessellator.h b/Common/DataModel/vtkSimpleCellTessellator.h
index 3ecd1da677529247bdcbd8c29a5574604c97bdf3..c14d3bd64f26be82ca1447bdfd43c29c48e001f1 100644
--- a/Common/DataModel/vtkSimpleCellTessellator.h
+++ b/Common/DataModel/vtkSimpleCellTessellator.h
@@ -39,8 +39,8 @@
 // vtkGenericCellTessellator vtkGenericSubdivisionErrorMetric vtkAttributesErrorMetric
 // vtkGeometricErrorMetric vtkViewDependentErrorMetric
 
-#ifndef __vtkSimpleCellTessellator_h
-#define __vtkSimpleCellTessellator_h
+#ifndef vtkSimpleCellTessellator_h
+#define vtkSimpleCellTessellator_h
 
 #include "vtkCommonDataModelModule.h" // For export macro
 #include "vtkGenericCellTessellator.h"
diff --git a/Common/DataModel/vtkSmoothErrorMetric.h b/Common/DataModel/vtkSmoothErrorMetric.h
index 522336602cd147a94033af3125cc94d73642151d..8ae0648884471a771ad83b2b8f17ca49ed31eac8 100644
--- a/Common/DataModel/vtkSmoothErrorMetric.h
+++ b/Common/DataModel/vtkSmoothErrorMetric.h
@@ -25,8 +25,8 @@
 // .SECTION See Also
 // vtkGenericCellTessellator vtkGenericSubdivisionErrorMetric
 
-#ifndef __vtkSmoothErrorMetric_h
-#define __vtkSmoothErrorMetric_h
+#ifndef vtkSmoothErrorMetric_h
+#define vtkSmoothErrorMetric_h
 
 #include "vtkCommonDataModelModule.h" // For export macro
 #include "vtkGenericSubdivisionErrorMetric.h"
diff --git a/Common/DataModel/vtkSphere.h b/Common/DataModel/vtkSphere.h
index 84abad2c2ea996439c88c0d641716c8d71df67e2..f3e980bcb3b9c3d6d2ae81e215993fc70bb06f03 100644
--- a/Common/DataModel/vtkSphere.h
+++ b/Common/DataModel/vtkSphere.h
@@ -19,8 +19,8 @@
 // methods are available for sphere-related computations, such as computing
 // bounding spheres for a set of points, or set of spheres.
 
-#ifndef __vtkSphere_h
-#define __vtkSphere_h
+#ifndef vtkSphere_h
+#define vtkSphere_h
 
 #include "vtkCommonDataModelModule.h" // For export macro
 #include "vtkImplicitFunction.h"
diff --git a/Common/DataModel/vtkSpline.h b/Common/DataModel/vtkSpline.h
index ce48d2fbe7128e766cf2b18b6cd748df7af39306..96b0397438aad9c413e8d6c9db784a7311ac928e 100644
--- a/Common/DataModel/vtkSpline.h
+++ b/Common/DataModel/vtkSpline.h
@@ -49,8 +49,8 @@
 // vtkParametricFunctionSource
 
 
-#ifndef __vtkSpline_h
-#define __vtkSpline_h
+#ifndef vtkSpline_h
+#define vtkSpline_h
 
 #include "vtkCommonDataModelModule.h" // For export macro
 #include "vtkObject.h"
diff --git a/Common/DataModel/vtkStructuredData.h b/Common/DataModel/vtkStructuredData.h
index 981776ba075c0b120929f5ef7da38eb00025a366..2474dee7b553e29ea3f16bf167948a31b06daac0 100644
--- a/Common/DataModel/vtkStructuredData.h
+++ b/Common/DataModel/vtkStructuredData.h
@@ -23,8 +23,8 @@
 // .SECTION See Also
 // vtkStructuredGrid vtkUniformGrid vtkRectilinearGrid vtkRectilinearGrid
 
-#ifndef __vtkStructuredData_h
-#define __vtkStructuredData_h
+#ifndef vtkStructuredData_h
+#define vtkStructuredData_h
 
 #include "vtkCommonDataModelModule.h" // For export macro
 #include "vtkObject.h"
diff --git a/Common/DataModel/vtkStructuredExtent.h b/Common/DataModel/vtkStructuredExtent.h
index 1d76f07e4eed5eb10fa97405a028349248b1d14c..c4cdb5ea1405abf2fb73e21ec625215eda855258 100644
--- a/Common/DataModel/vtkStructuredExtent.h
+++ b/Common/DataModel/vtkStructuredExtent.h
@@ -20,8 +20,8 @@
 //  structured extents. It defines a bunch of static methods (most of which are
 //  inlined) to aid in dealing with extents.
 
-#ifndef __vtkStructuredExtent_h
-#define __vtkStructuredExtent_h
+#ifndef vtkStructuredExtent_h
+#define vtkStructuredExtent_h
 
 #include "vtkCommonDataModelModule.h" // For export macro
 #include "vtkObject.h"
diff --git a/Common/DataModel/vtkStructuredGrid.h b/Common/DataModel/vtkStructuredGrid.h
index a999d9988d94b69f5b4fb4c657426413c997a472..8f77c48f302e1e82ad8a3a16a5586049cda73625 100644
--- a/Common/DataModel/vtkStructuredGrid.h
+++ b/Common/DataModel/vtkStructuredGrid.h
@@ -36,8 +36,8 @@
 // defining a "blanking array" whose values (0,1) specify whether
 // a point should be blanked or not.
 
-#ifndef __vtkStructuredGrid_h
-#define __vtkStructuredGrid_h
+#ifndef vtkStructuredGrid_h
+#define vtkStructuredGrid_h
 
 #include "vtkCommonDataModelModule.h" // For export macro
 #include "vtkPointSet.h"
diff --git a/Common/DataModel/vtkStructuredPoints.h b/Common/DataModel/vtkStructuredPoints.h
index 85c3085d80b3e41d1089c540f5d29c6c976fc6b3..b15cbb6de7c978ed371cad4ed0593e8f803d7f16 100644
--- a/Common/DataModel/vtkStructuredPoints.h
+++ b/Common/DataModel/vtkStructuredPoints.h
@@ -24,8 +24,8 @@
 // have special methods for setting/getting the origin/extents.
 
 
-#ifndef __vtkStructuredPoints_h
-#define __vtkStructuredPoints_h
+#ifndef vtkStructuredPoints_h
+#define vtkStructuredPoints_h
 
 #include "vtkCommonDataModelModule.h" // For export macro
 #include "vtkImageData.h"
diff --git a/Common/DataModel/vtkStructuredPointsCollection.h b/Common/DataModel/vtkStructuredPointsCollection.h
index 343be9693a42034e5a57fb4fe56a14761332779b..fcb2f56e06bfe0a0fbddb8803e3226888ce5d04a 100644
--- a/Common/DataModel/vtkStructuredPointsCollection.h
+++ b/Common/DataModel/vtkStructuredPointsCollection.h
@@ -18,8 +18,8 @@
 // lists of structured points datasets. See also vtkCollection and
 // subclasses.
 
-#ifndef __vtkStructuredPointsCollection_h
-#define __vtkStructuredPointsCollection_h
+#ifndef vtkStructuredPointsCollection_h
+#define vtkStructuredPointsCollection_h
 
 #include "vtkCommonDataModelModule.h" // For export macro
 #include "vtkCollection.h"
diff --git a/Common/DataModel/vtkStructuredVisibilityConstraint.h b/Common/DataModel/vtkStructuredVisibilityConstraint.h
index 1b342a51219a2af35f1ba41c709439d5141a795d..e498e8109a7c4ba725a3ea434c0ac0fefa9720c3 100644
--- a/Common/DataModel/vtkStructuredVisibilityConstraint.h
+++ b/Common/DataModel/vtkStructuredVisibilityConstraint.h
@@ -23,8 +23,8 @@
 // Make sure to call Initialize() with the right dimensions before
 // calling any methods that set/get visibility.
 
-#ifndef __vtkStructuredVisibilityConstraint_h
-#define __vtkStructuredVisibilityConstraint_h
+#ifndef vtkStructuredVisibilityConstraint_h
+#define vtkStructuredVisibilityConstraint_h
 
 #include "vtkCommonDataModelModule.h" // For export macro
 #include "vtkObject.h"
diff --git a/Common/DataModel/vtkSuperquadric.h b/Common/DataModel/vtkSuperquadric.h
index 47babb3769157856bba59b87dcb8514fdba51b93..ebfe2911232d70a9279207d11a7c78b12f3a1d64 100644
--- a/Common/DataModel/vtkSuperquadric.h
+++ b/Common/DataModel/vtkSuperquadric.h
@@ -36,8 +36,8 @@
 // generation, and may do not exactly describe the size of the superquadric.
 //
 
-#ifndef __vtkSuperquadric_h
-#define __vtkSuperquadric_h
+#ifndef vtkSuperquadric_h
+#define vtkSuperquadric_h
 
 #include "vtkCommonDataModelModule.h" // For export macro
 #include "vtkImplicitFunction.h"
diff --git a/Common/DataModel/vtkTable.h b/Common/DataModel/vtkTable.h
index 14a95e7b2cb348843c04b359acdac9b218ff5e50..d1414fcd52b0303bbaa386da44a45065bed4a293 100644
--- a/Common/DataModel/vtkTable.h
+++ b/Common/DataModel/vtkTable.h
@@ -44,8 +44,8 @@
 // Thanks to Patricia Crossno, Ken Moreland, Andrew Wilson and Brian Wylie from
 // Sandia National Laboratories for their help in developing this class API.
 
-#ifndef __vtkTable_h
-#define __vtkTable_h
+#ifndef vtkTable_h
+#define vtkTable_h
 
 #include "vtkCommonDataModelModule.h" // For export macro
 #include "vtkDataObject.h"
diff --git a/Common/DataModel/vtkTensor.h b/Common/DataModel/vtkTensor.h
index b21fe4fc7b2f753852448f284ccd3030de9a18bf..ea824865a66ff389f7b6015b9e491d107fe3cbfb 100644
--- a/Common/DataModel/vtkTensor.h
+++ b/Common/DataModel/vtkTensor.h
@@ -23,8 +23,8 @@
 // responsible for supplying data storage (if necessary) if local copies
 // of data are being made.
 
-#ifndef __vtkTensor_h
-#define __vtkTensor_h
+#ifndef vtkTensor_h
+#define vtkTensor_h
 
 #include "vtkCommonDataModelModule.h" // For export macro
 #include "vtkObject.h"
diff --git a/Common/DataModel/vtkTetra.h b/Common/DataModel/vtkTetra.h
index 41b9f3129afc085c9a0b86423a1321caf308e29c..4f875c6fba8bc09450b608da89fe5fb80d1be0b4 100644
--- a/Common/DataModel/vtkTetra.h
+++ b/Common/DataModel/vtkTetra.h
@@ -24,8 +24,8 @@
 // .SECTION See Also
 // vtkConvexPointSet vtkHexahedron vtkPyramid vtkVoxel vtkWedge
 
-#ifndef __vtkTetra_h
-#define __vtkTetra_h
+#ifndef vtkTetra_h
+#define vtkTetra_h
 
 #include "vtkCommonDataModelModule.h" // For export macro
 #include "vtkCell3D.h"
diff --git a/Common/DataModel/vtkTree.h b/Common/DataModel/vtkTree.h
index a9c83f14622e734ff69e4a7f899e08c8ca0ba617..31903869701c4b382b1bc086a945189a6f11564e 100644
--- a/Common/DataModel/vtkTree.h
+++ b/Common/DataModel/vtkTree.h
@@ -40,8 +40,8 @@
 // .SECTION See Also
 // vtkDirectedGraph vtkMutableDirectedGraph vtkGraph
 
-#ifndef __vtkTree_h
-#define __vtkTree_h
+#ifndef vtkTree_h
+#define vtkTree_h
 
 #include "vtkCommonDataModelModule.h" // For export macro
 #include "vtkDirectedAcyclicGraph.h"
diff --git a/Common/DataModel/vtkTreeBFSIterator.h b/Common/DataModel/vtkTreeBFSIterator.h
index 61dae840f23795c2ff4c53a9e6a98a127195cabc..d98e2a70a40bc4d960bfbd83ee8c5a83f0cab53e 100644
--- a/Common/DataModel/vtkTreeBFSIterator.h
+++ b/Common/DataModel/vtkTreeBFSIterator.h
@@ -25,8 +25,8 @@
 // .SECTION Thanks
 // Thanks to David Doria for submitting this class.
 
-#ifndef __vtkTreeBFSIterator_h
-#define __vtkTreeBFSIterator_h
+#ifndef vtkTreeBFSIterator_h
+#define vtkTreeBFSIterator_h
 
 #include "vtkCommonDataModelModule.h" // For export macro
 #include "vtkTreeIterator.h"
diff --git a/Common/DataModel/vtkTreeDFSIterator.h b/Common/DataModel/vtkTreeDFSIterator.h
index 5182b8ae8ac379114b2eba54fb8ca4d4faee5267..5fbccd648b742446cddbd90510a44393d8ddd5d4 100644
--- a/Common/DataModel/vtkTreeDFSIterator.h
+++ b/Common/DataModel/vtkTreeDFSIterator.h
@@ -33,8 +33,8 @@
 // <code>vtkIdType vertex = iter->Next()</code> inside the loop.
 
 
-#ifndef __vtkTreeDFSIterator_h
-#define __vtkTreeDFSIterator_h
+#ifndef vtkTreeDFSIterator_h
+#define vtkTreeDFSIterator_h
 
 #include "vtkCommonDataModelModule.h" // For export macro
 #include "vtkTreeIterator.h"
diff --git a/Common/DataModel/vtkTreeIterator.h b/Common/DataModel/vtkTreeIterator.h
index f19a30f9601f98de98f90a2462eb2d505287ab2a..48a65e7f5aedc2002be16e1911f805ffa59cf8a2 100644
--- a/Common/DataModel/vtkTreeIterator.h
+++ b/Common/DataModel/vtkTreeIterator.h
@@ -25,8 +25,8 @@
 // .SECTION See Also
 // vtkTreeBFSIterator vtkTreeDFSIterator
 
-#ifndef __vtkTreeIterator_h
-#define __vtkTreeIterator_h
+#ifndef vtkTreeIterator_h
+#define vtkTreeIterator_h
 
 #include "vtkCommonDataModelModule.h" // For export macro
 #include "vtkObject.h"
diff --git a/Common/DataModel/vtkTriQuadraticHexahedron.h b/Common/DataModel/vtkTriQuadraticHexahedron.h
index 3aaf5fe751429e704787b6f1f01446b0ebdfece7..6fa7f5527d4d41fa56f9120e86c020a5d37682f4 100644
--- a/Common/DataModel/vtkTriQuadraticHexahedron.h
+++ b/Common/DataModel/vtkTriQuadraticHexahedron.h
@@ -65,8 +65,8 @@
 // Thanks to Soeren Gebbert  who developed this class and
 // integrated it into VTK 5.0.
 
-#ifndef __vtkTriQuadraticHexahedron_h
-#define __vtkTriQuadraticHexahedron_h
+#ifndef vtkTriQuadraticHexahedron_h
+#define vtkTriQuadraticHexahedron_h
 
 #include "vtkCommonDataModelModule.h" // For export macro
 #include "vtkNonLinearCell.h"
diff --git a/Common/DataModel/vtkTriangle.h b/Common/DataModel/vtkTriangle.h
index 1a5e2c7b7f3b38e51332ca8c283d88da168bb8eb..14d98b07040afe5360824a7bdf8e1f3b1effb1c8 100644
--- a/Common/DataModel/vtkTriangle.h
+++ b/Common/DataModel/vtkTriangle.h
@@ -17,8 +17,8 @@
 // vtkTriangle is a concrete implementation of vtkCell to represent a triangle
 // located in 3-space.
 
-#ifndef __vtkTriangle_h
-#define __vtkTriangle_h
+#ifndef vtkTriangle_h
+#define vtkTriangle_h
 
 #include "vtkCommonDataModelModule.h" // For export macro
 #include "vtkCell.h"
diff --git a/Common/DataModel/vtkTriangleStrip.h b/Common/DataModel/vtkTriangleStrip.h
index a02a559e943ade44888e27c93d7b56314c025fe5..e37e43ec8768edd090577c85a68f882b8bbe4fbe 100644
--- a/Common/DataModel/vtkTriangleStrip.h
+++ b/Common/DataModel/vtkTriangleStrip.h
@@ -21,8 +21,8 @@
 // additional triangle, a single point that, combined with the previous two
 // points, defines the next triangle.
 
-#ifndef __vtkTriangleStrip_h
-#define __vtkTriangleStrip_h
+#ifndef vtkTriangleStrip_h
+#define vtkTriangleStrip_h
 
 #include "vtkCommonDataModelModule.h" // For export macro
 #include "vtkCell.h"
diff --git a/Common/DataModel/vtkUndirectedGraph.h b/Common/DataModel/vtkUndirectedGraph.h
index e873354d3e7f19faadf1523d8d87b898a28f1ec9..29fad86dc89f402f33729f5905d33db197c8a8be 100644
--- a/Common/DataModel/vtkUndirectedGraph.h
+++ b/Common/DataModel/vtkUndirectedGraph.h
@@ -36,8 +36,8 @@
 // .SECTION See Also
 // vtkGraph vtkMutableUndirectedGraph
 
-#ifndef __vtkUndirectedGraph_h
-#define __vtkUndirectedGraph_h
+#ifndef vtkUndirectedGraph_h
+#define vtkUndirectedGraph_h
 
 #include "vtkCommonDataModelModule.h" // For export macro
 #include "vtkGraph.h"
diff --git a/Common/DataModel/vtkUniformGrid.h b/Common/DataModel/vtkUniformGrid.h
index f38ed389fbaf3228bf70f75fa0d0b28cdfaf921b..ce8d336dade1af8337a4783ea67bb2d1472dbbee 100644
--- a/Common/DataModel/vtkUniformGrid.h
+++ b/Common/DataModel/vtkUniformGrid.h
@@ -17,8 +17,8 @@
 // vtkUniformGrid is a subclass of vtkImageData. In addition to all
 // the image data functionality, it supports blanking.
 
-#ifndef __vtkUniformGrid_h
-#define __vtkUniformGrid_h
+#ifndef vtkUniformGrid_h
+#define vtkUniformGrid_h
 
 #include "vtkCommonDataModelModule.h" // For export macro
 #include "vtkImageData.h"
diff --git a/Common/DataModel/vtkUniformGridAMR.h b/Common/DataModel/vtkUniformGridAMR.h
index db3d53575e3e22b57b627a0bf20c72b335545fa0..b6168944e2af17dffdf0effca7c71b81f83d2f99 100644
--- a/Common/DataModel/vtkUniformGridAMR.h
+++ b/Common/DataModel/vtkUniformGridAMR.h
@@ -19,8 +19,8 @@
 // vtkUniformGrid.
 
 
-#ifndef __vtkUniformGridAMR_h
-#define __vtkUniformGridAMR_h
+#ifndef vtkUniformGridAMR_h
+#define vtkUniformGridAMR_h
 
 #include "vtkCommonDataModelModule.h" // For export macro
 #include "vtkCompositeDataSet.h"
diff --git a/Common/DataModel/vtkUniformGridAMRDataIterator.h b/Common/DataModel/vtkUniformGridAMRDataIterator.h
index 41a212033431f61559737df023ba46c02b5ad9a9..234b7a9a0d83c24d4dad5275aa1ffb04e19a25a1 100644
--- a/Common/DataModel/vtkUniformGridAMRDataIterator.h
+++ b/Common/DataModel/vtkUniformGridAMRDataIterator.h
@@ -16,8 +16,8 @@
 // with API to get current level and dataset index.
 // .SECTION Description
 
-#ifndef __vtkUniformGridAMRDataIterator_h
-#define __vtkUniformGridAMRDataIterator_h
+#ifndef vtkUniformGridAMRDataIterator_h
+#define vtkUniformGridAMRDataIterator_h
 
 #include "vtkCommonDataModelModule.h" // For export macro
 #include "vtkCompositeDataIterator.h"
diff --git a/Common/DataModel/vtkUnstructuredGrid.h b/Common/DataModel/vtkUnstructuredGrid.h
index 4aace48709aa30e6c164e1b558b91b26476a9544..8d0d3400e9b6017b07e3039c027b178a1ab65f88 100644
--- a/Common/DataModel/vtkUnstructuredGrid.h
+++ b/Common/DataModel/vtkUnstructuredGrid.h
@@ -21,8 +21,8 @@
 // (e.g., triangles, polygons), and 3D (e.g., hexahedron, tetrahedron,
 // polyhedron, etc.).
 
-#ifndef __vtkUnstructuredGrid_h
-#define __vtkUnstructuredGrid_h
+#ifndef vtkUnstructuredGrid_h
+#define vtkUnstructuredGrid_h
 
 #include "vtkCommonDataModelModule.h" // For export macro
 #include "vtkUnstructuredGridBase.h"
diff --git a/Common/DataModel/vtkUnstructuredGridBase.h b/Common/DataModel/vtkUnstructuredGridBase.h
index 423e97ae5cf2c5c3409ba936f36329ba82b60392..bc8a6c7a9aaf71b1d88fbd2aa407eaaf3c64f1b7 100644
--- a/Common/DataModel/vtkUnstructuredGridBase.h
+++ b/Common/DataModel/vtkUnstructuredGridBase.h
@@ -22,8 +22,8 @@
 // .SECTION See Also
 // vtkMappedDataArray vtkUnstructuredGrid
 
-#ifndef __vtkUnstructuredGridBase_h
-#define __vtkUnstructuredGridBase_h
+#ifndef vtkUnstructuredGridBase_h
+#define vtkUnstructuredGridBase_h
 
 #include "vtkCommonDataModelModule.h" // For export macro
 #include "vtkPointSet.h"
diff --git a/Common/DataModel/vtkUnstructuredGridCellIterator.h b/Common/DataModel/vtkUnstructuredGridCellIterator.h
index b49bdf260ba6282e87911f46f1fe96a754973957..41089870ec93e1638bf0261c1fef2f13d02efdc8 100644
--- a/Common/DataModel/vtkUnstructuredGridCellIterator.h
+++ b/Common/DataModel/vtkUnstructuredGridCellIterator.h
@@ -15,8 +15,8 @@
 // .NAME vtkUnstructuredGridCellIterator - Implementation of vtkCellIterator
 // specialized for vtkUnstructuredGrid.
 
-#ifndef __vtkUnstructuredGridCellIterator_h
-#define __vtkUnstructuredGridCellIterator_h
+#ifndef vtkUnstructuredGridCellIterator_h
+#define vtkUnstructuredGridCellIterator_h
 
 #include "vtkCommonDataModelModule.h" // For export macro
 #include "vtkCellIterator.h"
@@ -75,4 +75,4 @@ private:
   void operator=(const vtkUnstructuredGridCellIterator &);   // Not implemented.
 };
 
-#endif //__vtkUnstructuredGridCellIterator_h
+#endif //vtkUnstructuredGridCellIterator_h
diff --git a/Common/DataModel/vtkVector.h b/Common/DataModel/vtkVector.h
index 86b4f255d9284024402db36968813ceca5d6a872..e71dba383900e3c972190b5c0bca56371944aa70 100644
--- a/Common/DataModel/vtkVector.h
+++ b/Common/DataModel/vtkVector.h
@@ -22,8 +22,8 @@
 // float[2] can be cast to a vtkVector2f and manipulated. Also a float[6] could
 // be cast and used as a vtkVector2f[3].
 
-#ifndef __vtkVector_h
-#define __vtkVector_h
+#ifndef vtkVector_h
+#define vtkVector_h
 
 #include "vtkTuple.h"
 #include "vtkObject.h" // for legacy macros
@@ -379,5 +379,5 @@ const T& vtkVector3<T>::Z() const
 }
 #endif // VTK_LEGACY_REMOVE
 
-#endif // __vtkVector_h
+#endif // vtkVector_h
 // VTK-HeaderTest-Exclude: vtkVector.h
diff --git a/Common/DataModel/vtkVectorOperators.h b/Common/DataModel/vtkVectorOperators.h
index 1025e988438f58f8824563032ff35dabe2e48b23..424f341a89b7d53a2d396f7d03b8f982f7cafc4e 100644
--- a/Common/DataModel/vtkVectorOperators.h
+++ b/Common/DataModel/vtkVectorOperators.h
@@ -13,8 +13,8 @@
 
 =========================================================================*/
 
-#ifndef __vtkVectorOperators_h
-#define __vtkVectorOperators_h
+#ifndef vtkVectorOperators_h
+#define vtkVectorOperators_h
 
 // This set of operators enhance the vtkVector classes, allowing various
 // operator overloads one might expect.
diff --git a/Common/DataModel/vtkVertex.h b/Common/DataModel/vtkVertex.h
index 34424bc14968b5f0467748d496383a88d2956bec..6f29bb74f4974b990095848775abbf6d7cae8064 100644
--- a/Common/DataModel/vtkVertex.h
+++ b/Common/DataModel/vtkVertex.h
@@ -16,8 +16,8 @@
 // .SECTION Description
 // vtkVertex is a concrete implementation of vtkCell to represent a 3D point.
 
-#ifndef __vtkVertex_h
-#define __vtkVertex_h
+#ifndef vtkVertex_h
+#define vtkVertex_h
 
 #include "vtkCommonDataModelModule.h" // For export macro
 #include "vtkCell.h"
diff --git a/Common/DataModel/vtkVertexListIterator.h b/Common/DataModel/vtkVertexListIterator.h
index 3bb1e312ac723b5e87a838344c47f316bc22ef4b..fd883ebed89afca6fc1f686cd41e334be2ddcb19 100644
--- a/Common/DataModel/vtkVertexListIterator.h
+++ b/Common/DataModel/vtkVertexListIterator.h
@@ -28,8 +28,8 @@
 // .SECTION See Also
 // vtkGraph
 
-#ifndef __vtkVertexListIterator_h
-#define __vtkVertexListIterator_h
+#ifndef vtkVertexListIterator_h
+#define vtkVertexListIterator_h
 
 #include "vtkCommonDataModelModule.h" // For export macro
 #include "vtkObject.h"
diff --git a/Common/DataModel/vtkVoxel.h b/Common/DataModel/vtkVoxel.h
index 5ddfa4826101db92bace92047dc8a5bafa30a3a9..62d111054b012e9df666c6113730618d7e13f732 100644
--- a/Common/DataModel/vtkVoxel.h
+++ b/Common/DataModel/vtkVoxel.h
@@ -22,8 +22,8 @@
 // .SECTION See Also
 // vtkConvexPointSet vtkHexahedron vtkPyramid vtkTetra vtkWedge
 
-#ifndef __vtkVoxel_h
-#define __vtkVoxel_h
+#ifndef vtkVoxel_h
+#define vtkVoxel_h
 
 #include "vtkCommonDataModelModule.h" // For export macro
 #include "vtkCell3D.h"
diff --git a/Common/DataModel/vtkWedge.h b/Common/DataModel/vtkWedge.h
index b7cb3917913dab1b9886d9fa6cff1ea4a83e1f7d..0480d32037fb23a0e11fb2bd79983d1218e81fab 100644
--- a/Common/DataModel/vtkWedge.h
+++ b/Common/DataModel/vtkWedge.h
@@ -25,8 +25,8 @@
 // .SECTION See Also
 // vtkConvexPointSet vtkHexahedron vtkPyramid vtkTetra vtkVoxel
 
-#ifndef __vtkWedge_h
-#define __vtkWedge_h
+#ifndef vtkWedge_h
+#define vtkWedge_h
 
 #include "vtkCommonDataModelModule.h" // For export macro
 #include "vtkCell3D.h"
diff --git a/Common/DataModel/vtkXMLDataElement.h b/Common/DataModel/vtkXMLDataElement.h
index d09ba971b43712314d7344c5306923b90b3a47ea..0b582592c7d86428c46622b8691254c1e40e5bf5 100644
--- a/Common/DataModel/vtkXMLDataElement.h
+++ b/Common/DataModel/vtkXMLDataElement.h
@@ -22,8 +22,8 @@
 // .SECTION See Also
 // vtkXMLDataParser
 
-#ifndef __vtkXMLDataElement_h
-#define __vtkXMLDataElement_h
+#ifndef vtkXMLDataElement_h
+#define vtkXMLDataElement_h
 
 #include "vtkCommonDataModelModule.h" // For export macro
 #include "vtkObject.h"
diff --git a/Common/ExecutionModel/vtkAlgorithm.h b/Common/ExecutionModel/vtkAlgorithm.h
index be18d01d82a2058e224087fc7e860a98cfac5ccb..a9555fd74520e9646a6a809450d7e2d0619b8d4c 100644
--- a/Common/ExecutionModel/vtkAlgorithm.h
+++ b/Common/ExecutionModel/vtkAlgorithm.h
@@ -26,8 +26,8 @@
 // instance has an associated vtkExecutive when it is used in a
 // pipeline.  The executive is responsible for data flow.
 
-#ifndef __vtkAlgorithm_h
-#define __vtkAlgorithm_h
+#ifndef vtkAlgorithm_h
+#define vtkAlgorithm_h
 
 #include "vtkCommonExecutionModelModule.h" // For export macro
 #include "vtkObject.h"
diff --git a/Common/ExecutionModel/vtkAlgorithmOutput.h b/Common/ExecutionModel/vtkAlgorithmOutput.h
index a573c266005855bbf8979eee25c5458faafd5a15..e0d8fd5529118efd64b2db61a918464bc78928e4 100644
--- a/Common/ExecutionModel/vtkAlgorithmOutput.h
+++ b/Common/ExecutionModel/vtkAlgorithmOutput.h
@@ -22,8 +22,8 @@
 // proxy object: it is simply a convenience for creating or removing
 // connections.
 
-#ifndef __vtkAlgorithmOutput_h
-#define __vtkAlgorithmOutput_h
+#ifndef vtkAlgorithmOutput_h
+#define vtkAlgorithmOutput_h
 
 #include "vtkCommonExecutionModelModule.h" // For export macro
 #include "vtkObject.h"
diff --git a/Common/ExecutionModel/vtkAnnotationLayersAlgorithm.h b/Common/ExecutionModel/vtkAnnotationLayersAlgorithm.h
index f7ae2c66d21f2141865f178a6aab623b69efe957..dbbd9416b9590d9dde24a3a76698fb0c785b6c5b 100644
--- a/Common/ExecutionModel/vtkAnnotationLayersAlgorithm.h
+++ b/Common/ExecutionModel/vtkAnnotationLayersAlgorithm.h
@@ -28,8 +28,8 @@
 // RequestData( request, inputVec, outputVec).
 
 
-#ifndef __vtkAnnotationLayersAlgorithm_h
-#define __vtkAnnotationLayersAlgorithm_h
+#ifndef vtkAnnotationLayersAlgorithm_h
+#define vtkAnnotationLayersAlgorithm_h
 
 #include "vtkCommonExecutionModelModule.h" // For export macro
 #include "vtkAlgorithm.h"
diff --git a/Common/ExecutionModel/vtkArrayDataAlgorithm.h b/Common/ExecutionModel/vtkArrayDataAlgorithm.h
index 0953641be6ba699c651b0bf2753e3093d5ef107a..e4e61497314fd4e2935f6c138d2e5005e0fa0679 100644
--- a/Common/ExecutionModel/vtkArrayDataAlgorithm.h
+++ b/Common/ExecutionModel/vtkArrayDataAlgorithm.h
@@ -38,8 +38,8 @@
 // .SECTION Thanks
 // Developed by Timothy M. Shead (tshead@sandia.gov) at Sandia National Laboratories.
 
-#ifndef __vtkArrayDataAlgorithm_h
-#define __vtkArrayDataAlgorithm_h
+#ifndef vtkArrayDataAlgorithm_h
+#define vtkArrayDataAlgorithm_h
 
 #include "vtkCommonExecutionModelModule.h" // For export macro
 #include "vtkAlgorithm.h"
diff --git a/Common/ExecutionModel/vtkCachedStreamingDemandDrivenPipeline.h b/Common/ExecutionModel/vtkCachedStreamingDemandDrivenPipeline.h
index 2880ce4a3a31e77b1b70ca108cd71bf84f307d2f..becf58e570d0a5ff70898be6a28cf5aa0e3a0ce7 100644
--- a/Common/ExecutionModel/vtkCachedStreamingDemandDrivenPipeline.h
+++ b/Common/ExecutionModel/vtkCachedStreamingDemandDrivenPipeline.h
@@ -16,8 +16,8 @@
 // .SECTION Description
 // vtkCachedStreamingDemandDrivenPipeline
 
-#ifndef __vtkCachedStreamingDemandDrivenPipeline_h
-#define __vtkCachedStreamingDemandDrivenPipeline_h
+#ifndef vtkCachedStreamingDemandDrivenPipeline_h
+#define vtkCachedStreamingDemandDrivenPipeline_h
 
 #include "vtkCommonExecutionModelModule.h" // For export macro
 #include "vtkStreamingDemandDrivenPipeline.h"
diff --git a/Common/ExecutionModel/vtkCastToConcrete.h b/Common/ExecutionModel/vtkCastToConcrete.h
index 16e20ec2713edf8351b3801fad9714fcf33541b6..f351de79fa4b3f72c9eaf451e8619204597e9b6d 100644
--- a/Common/ExecutionModel/vtkCastToConcrete.h
+++ b/Common/ExecutionModel/vtkCastToConcrete.h
@@ -35,8 +35,8 @@
 // .SECTION See Also
 // vtkDataSetAlgorithm vtkPointSetToPointSetFilter
 
-#ifndef __vtkCastToConcrete_h
-#define __vtkCastToConcrete_h
+#ifndef vtkCastToConcrete_h
+#define vtkCastToConcrete_h
 
 #include "vtkCommonExecutionModelModule.h" // For export macro
 #include "vtkDataSetAlgorithm.h"
diff --git a/Common/ExecutionModel/vtkCompositeDataPipeline.h b/Common/ExecutionModel/vtkCompositeDataPipeline.h
index 47a71c0560e6a1f8e1f1160b4ae156ae5707bb44..272c9e8693d8a892485125f370e10f13e51b9275 100644
--- a/Common/ExecutionModel/vtkCompositeDataPipeline.h
+++ b/Common/ExecutionModel/vtkCompositeDataPipeline.h
@@ -38,8 +38,8 @@
 // .SECTION See also
 //  vtkCompositeDataSet
 
-#ifndef __vtkCompositeDataPipeline_h
-#define __vtkCompositeDataPipeline_h
+#ifndef vtkCompositeDataPipeline_h
+#define vtkCompositeDataPipeline_h
 
 #include "vtkCommonExecutionModelModule.h" // For export macro
 #include "vtkStreamingDemandDrivenPipeline.h"
diff --git a/Common/ExecutionModel/vtkCompositeDataSetAlgorithm.h b/Common/ExecutionModel/vtkCompositeDataSetAlgorithm.h
index b57e0975beeb3a3a9625b08fb6c912952f8241e3..67b49824cd2e930f11adbbc39525799c37d456b2 100644
--- a/Common/ExecutionModel/vtkCompositeDataSetAlgorithm.h
+++ b/Common/ExecutionModel/vtkCompositeDataSetAlgorithm.h
@@ -19,8 +19,8 @@
 // class.
 
 
-#ifndef __vtkCompositeDataSetAlgorithm_h
-#define __vtkCompositeDataSetAlgorithm_h
+#ifndef vtkCompositeDataSetAlgorithm_h
+#define vtkCompositeDataSetAlgorithm_h
 
 #include "vtkCommonExecutionModelModule.h" // For export macro
 #include "vtkAlgorithm.h"
diff --git a/Common/ExecutionModel/vtkDataObjectAlgorithm.h b/Common/ExecutionModel/vtkDataObjectAlgorithm.h
index fa14e5b14360986553d090c09032796259153a97..bc879303201a93172f5017014405e45c0debb9a0 100644
--- a/Common/ExecutionModel/vtkDataObjectAlgorithm.h
+++ b/Common/ExecutionModel/vtkDataObjectAlgorithm.h
@@ -28,8 +28,8 @@
 // RequestData( request, inputVec, outputVec).
 
 
-#ifndef __vtkDataObjectAlgorithm_h
-#define __vtkDataObjectAlgorithm_h
+#ifndef vtkDataObjectAlgorithm_h
+#define vtkDataObjectAlgorithm_h
 
 #include "vtkCommonExecutionModelModule.h" // For export macro
 #include "vtkAlgorithm.h"
diff --git a/Common/ExecutionModel/vtkDataSetAlgorithm.h b/Common/ExecutionModel/vtkDataSetAlgorithm.h
index aa3ba6c35984c58f601259842db8c1d5224413e1..531289fe08f9b389f75eb4040fc552610463c2e9 100644
--- a/Common/ExecutionModel/vtkDataSetAlgorithm.h
+++ b/Common/ExecutionModel/vtkDataSetAlgorithm.h
@@ -29,8 +29,8 @@
 // same type as the input.
 
 
-#ifndef __vtkDataSetAlgorithm_h
-#define __vtkDataSetAlgorithm_h
+#ifndef vtkDataSetAlgorithm_h
+#define vtkDataSetAlgorithm_h
 
 #include "vtkCommonExecutionModelModule.h" // For export macro
 #include "vtkAlgorithm.h"
diff --git a/Common/ExecutionModel/vtkDemandDrivenPipeline.h b/Common/ExecutionModel/vtkDemandDrivenPipeline.h
index 60f2f67cc931d6af58fab37dd953220f797089c0..18d5622401bb9e29247643f84f3e244870692626 100644
--- a/Common/ExecutionModel/vtkDemandDrivenPipeline.h
+++ b/Common/ExecutionModel/vtkDemandDrivenPipeline.h
@@ -18,8 +18,8 @@
 // algorithm only when its outputs are out-of-date with respect to its
 // inputs.
 
-#ifndef __vtkDemandDrivenPipeline_h
-#define __vtkDemandDrivenPipeline_h
+#ifndef vtkDemandDrivenPipeline_h
+#define vtkDemandDrivenPipeline_h
 
 #include "vtkCommonExecutionModelModule.h" // For export macro
 #include "vtkExecutive.h"
diff --git a/Common/ExecutionModel/vtkDirectedGraphAlgorithm.h b/Common/ExecutionModel/vtkDirectedGraphAlgorithm.h
index d99161d8713158b70712cf5782adef665aaa6b64..800df704251e9503694e096a06a691461e3bf8c5 100644
--- a/Common/ExecutionModel/vtkDirectedGraphAlgorithm.h
+++ b/Common/ExecutionModel/vtkDirectedGraphAlgorithm.h
@@ -37,8 +37,8 @@
 // Thanks to Patricia Crossno, Ken Moreland, Andrew Wilson and Brian Wylie from
 // Sandia National Laboratories for their help in developing this class.
 
-#ifndef __vtkDirectedGraphAlgorithm_h
-#define __vtkDirectedGraphAlgorithm_h
+#ifndef vtkDirectedGraphAlgorithm_h
+#define vtkDirectedGraphAlgorithm_h
 
 #include "vtkCommonExecutionModelModule.h" // For export macro
 #include "vtkAlgorithm.h"
diff --git a/Common/ExecutionModel/vtkEnsembleSource.h b/Common/ExecutionModel/vtkEnsembleSource.h
index 3df7d02e57118f78f75a41588b81b95faa9971f5..84d10ad15176823b3291bd88b306d98631b85197 100644
--- a/Common/ExecutionModel/vtkEnsembleSource.h
+++ b/Common/ExecutionModel/vtkEnsembleSource.h
@@ -21,8 +21,8 @@
 // Note that it is expected that all ensemble members produce data of the
 // same type.
 
-#ifndef __vtkEnsembleSource_h
-#define __vtkEnsembleSource_h
+#ifndef vtkEnsembleSource_h
+#define vtkEnsembleSource_h
 
 #include "vtkCommonExecutionModelModule.h" // For export macro
 #include "vtkAlgorithm.h"
diff --git a/Common/ExecutionModel/vtkExecutive.h b/Common/ExecutionModel/vtkExecutive.h
index 340d69a2289afab8bb182dbc43c84ec552999c0a..5fade96612fec98f6988b10e3c8cee1cf5d9d126 100644
--- a/Common/ExecutionModel/vtkExecutive.h
+++ b/Common/ExecutionModel/vtkExecutive.h
@@ -21,8 +21,8 @@
 // processing algorithm in the pipeline is implemented in an instance
 // of vtkAlgorithm.
 
-#ifndef __vtkExecutive_h
-#define __vtkExecutive_h
+#ifndef vtkExecutive_h
+#define vtkExecutive_h
 
 #include "vtkCommonExecutionModelModule.h" // For export macro
 #include "vtkObject.h"
diff --git a/Common/ExecutionModel/vtkExtentSplitter.h b/Common/ExecutionModel/vtkExtentSplitter.h
index cd5755f809cba51d778cb160859f82e44c95b89d..7dace509ee1a6d93518f1071a1f467e7e6ca86cf 100644
--- a/Common/ExecutionModel/vtkExtentSplitter.h
+++ b/Common/ExecutionModel/vtkExtentSplitter.h
@@ -23,8 +23,8 @@
 // overlap of the source extents.  This can be used by parallel data
 // readers to read as few piece files as possible.
 
-#ifndef __vtkExtentSplitter_h
-#define __vtkExtentSplitter_h
+#ifndef vtkExtentSplitter_h
+#define vtkExtentSplitter_h
 
 #include "vtkCommonExecutionModelModule.h" // For export macro
 #include "vtkObject.h"
diff --git a/Common/ExecutionModel/vtkExtentTranslator.h b/Common/ExecutionModel/vtkExtentTranslator.h
index e5ea9fcd5796b7edc7da0c91b76ba8e06ea43acb..32ebdd3875e6cae1a87f357207d27955bde5780e 100644
--- a/Common/ExecutionModel/vtkExtentTranslator.h
+++ b/Common/ExecutionModel/vtkExtentTranslator.h
@@ -20,8 +20,8 @@
 // coded extent can be used for a starting point.
 
 
-#ifndef __vtkExtentTranslator_h
-#define __vtkExtentTranslator_h
+#ifndef vtkExtentTranslator_h
+#define vtkExtentTranslator_h
 
 #include "vtkCommonExecutionModelModule.h" // For export macro
 #include "vtkObject.h"
diff --git a/Common/ExecutionModel/vtkFilteringInformationKeyManager.h b/Common/ExecutionModel/vtkFilteringInformationKeyManager.h
index 349b8eac71f09caae5be34d7147cfbb1ab8f2db7..eb6c9612b65f51b3de4977cc6d3636c2b182cba2 100644
--- a/Common/ExecutionModel/vtkFilteringInformationKeyManager.h
+++ b/Common/ExecutionModel/vtkFilteringInformationKeyManager.h
@@ -19,8 +19,8 @@
 // It makes sure that the table of keys is created before and
 // destroyed after it is used.
 
-#ifndef __vtkFilteringInformationKeyManager_h
-#define __vtkFilteringInformationKeyManager_h
+#ifndef vtkFilteringInformationKeyManager_h
+#define vtkFilteringInformationKeyManager_h
 
 #include "vtkCommonExecutionModelModule.h" // For export macro
 #include "vtkSystemIncludes.h"
diff --git a/Common/ExecutionModel/vtkGraphAlgorithm.h b/Common/ExecutionModel/vtkGraphAlgorithm.h
index d21840f9fe11161adc565edc38651ab2e2e9e387..c0c841d8c8ffa13fdddc6dab688b1a58d97d915c 100644
--- a/Common/ExecutionModel/vtkGraphAlgorithm.h
+++ b/Common/ExecutionModel/vtkGraphAlgorithm.h
@@ -36,8 +36,8 @@
 // Thanks to Patricia Crossno, Ken Moreland, Andrew Wilson and Brian Wylie from
 // Sandia National Laboratories for their help in developing this class.
 
-#ifndef __vtkGraphAlgorithm_h
-#define __vtkGraphAlgorithm_h
+#ifndef vtkGraphAlgorithm_h
+#define vtkGraphAlgorithm_h
 
 #include "vtkCommonExecutionModelModule.h" // For export macro
 #include "vtkAlgorithm.h"
diff --git a/Common/ExecutionModel/vtkHierarchicalBoxDataSetAlgorithm.h b/Common/ExecutionModel/vtkHierarchicalBoxDataSetAlgorithm.h
index 0ba0c44b8cfa7d5dc12de9e1dbb6dff977291bdf..eae132099f83a2ac6499e0bf2f22b5b48f920c1a 100644
--- a/Common/ExecutionModel/vtkHierarchicalBoxDataSetAlgorithm.h
+++ b/Common/ExecutionModel/vtkHierarchicalBoxDataSetAlgorithm.h
@@ -19,8 +19,8 @@
 // and produce a vtkHierarchicalBoxDataSet in the output can subclass from this
 // class.
 
-#ifndef __vtkHierarchicalBoxDataSetAlgorithm_h
-#define __vtkHierarchicalBoxDataSetAlgorithm_h
+#ifndef vtkHierarchicalBoxDataSetAlgorithm_h
+#define vtkHierarchicalBoxDataSetAlgorithm_h
 
 #include "vtkCommonExecutionModelModule.h" // For export macro
 #include "vtkAlgorithm.h"
diff --git a/Common/ExecutionModel/vtkHyperOctreeAlgorithm.h b/Common/ExecutionModel/vtkHyperOctreeAlgorithm.h
index 06e757affc127097133251ace8250ad6957ed7f4..d7649801738bc71f72f1e2267841ebcd39d244c4 100644
--- a/Common/ExecutionModel/vtkHyperOctreeAlgorithm.h
+++ b/Common/ExecutionModel/vtkHyperOctreeAlgorithm.h
@@ -25,8 +25,8 @@
 // method that by default says that all inputs will be HyperOctree. If that
 // isn't the case then please override this method in your subclass.
 
-#ifndef __vtkHyperOctreeAlgorithm_h
-#define __vtkHyperOctreeAlgorithm_h
+#ifndef vtkHyperOctreeAlgorithm_h
+#define vtkHyperOctreeAlgorithm_h
 
 #include "vtkCommonExecutionModelModule.h" // For export macro
 #include "vtkAlgorithm.h"
diff --git a/Common/ExecutionModel/vtkHyperTreeGridAlgorithm.h b/Common/ExecutionModel/vtkHyperTreeGridAlgorithm.h
index 85f66f6c9cd28cd5e79e8dab90ac4ac75a68d80a..be253cba00accf24069cfb5fe6650fae7402a828 100644
--- a/Common/ExecutionModel/vtkHyperTreeGridAlgorithm.h
+++ b/Common/ExecutionModel/vtkHyperTreeGridAlgorithm.h
@@ -30,8 +30,8 @@
 // This test was written by Philippe Pebay and Charles Law, Kitware 2012
 // This work was supported in part by Commissariat a l'Energie Atomique (CEA/DIF)
 
-#ifndef __vtkHyperTreeGridAlgorithm_h
-#define __vtkHyperTreeGridAlgorithm_h
+#ifndef vtkHyperTreeGridAlgorithm_h
+#define vtkHyperTreeGridAlgorithm_h
 
 #include "vtkCommonExecutionModelModule.h" // For export macro
 #include "vtkAlgorithm.h"
diff --git a/Common/ExecutionModel/vtkImageAlgorithm.h b/Common/ExecutionModel/vtkImageAlgorithm.h
index 48d6c35a59279d59066739754c806fcd1b73c27d..f2b77c0f45be7ce529b93a8b8870ea7c46465ef0 100644
--- a/Common/ExecutionModel/vtkImageAlgorithm.h
+++ b/Common/ExecutionModel/vtkImageAlgorithm.h
@@ -22,8 +22,8 @@
 // .SECTION See also
 // vtkSimpleImageToImageFilter
 
-#ifndef __vtkImageAlgorithm_h
-#define __vtkImageAlgorithm_h
+#ifndef vtkImageAlgorithm_h
+#define vtkImageAlgorithm_h
 
 #include "vtkCommonExecutionModelModule.h" // For export macro
 #include "vtkAlgorithm.h"
diff --git a/Common/ExecutionModel/vtkImageInPlaceFilter.h b/Common/ExecutionModel/vtkImageInPlaceFilter.h
index 1fbacdab84068696ba7f7a1cbb2603fb455330b7..07dbe0814422f8c472fb9d254c8ca6472e92451c 100644
--- a/Common/ExecutionModel/vtkImageInPlaceFilter.h
+++ b/Common/ExecutionModel/vtkImageInPlaceFilter.h
@@ -20,8 +20,8 @@
 // or some other object is referencing the input region.
 
 
-#ifndef __vtkImageInPlaceFilter_h
-#define __vtkImageInPlaceFilter_h
+#ifndef vtkImageInPlaceFilter_h
+#define vtkImageInPlaceFilter_h
 
 #include "vtkCommonExecutionModelModule.h" // For export macro
 #include "vtkImageAlgorithm.h"
diff --git a/Common/ExecutionModel/vtkImageProgressIterator.h b/Common/ExecutionModel/vtkImageProgressIterator.h
index 2d69a03846e957a3ff841d7108e170a4b453bb2b..a2ba6ec613fc33ec55293ca923c58cc2519b6431 100644
--- a/Common/ExecutionModel/vtkImageProgressIterator.h
+++ b/Common/ExecutionModel/vtkImageProgressIterator.h
@@ -20,8 +20,8 @@
 // .SECTION See also
 // vtkImageData vtkImageIterator
 
-#ifndef __vtkImageProgressIterator_h
-#define __vtkImageProgressIterator_h
+#ifndef vtkImageProgressIterator_h
+#define vtkImageProgressIterator_h
 
 #include "vtkCommonExecutionModelModule.h" // For export macro
 #include "vtkImageIterator.h"
diff --git a/Common/ExecutionModel/vtkImageToStructuredPoints.h b/Common/ExecutionModel/vtkImageToStructuredPoints.h
index fc94a287a0e9694424ef4db418c09414a04599a8..dc23db61e20a584b876299183a9f6662b9ede58e 100644
--- a/Common/ExecutionModel/vtkImageToStructuredPoints.h
+++ b/Common/ExecutionModel/vtkImageToStructuredPoints.h
@@ -21,8 +21,8 @@
 // will try to reference count the data but in some cases it must
 // make a copy.
 
-#ifndef __vtkImageToStructuredPoints_h
-#define __vtkImageToStructuredPoints_h
+#ifndef vtkImageToStructuredPoints_h
+#define vtkImageToStructuredPoints_h
 
 #include "vtkCommonExecutionModelModule.h" // For export macro
 #include "vtkImageAlgorithm.h"
diff --git a/Common/ExecutionModel/vtkInformationDataObjectMetaDataKey.h b/Common/ExecutionModel/vtkInformationDataObjectMetaDataKey.h
index 5976961d44800fadb06c57d7079e0736e3754b2b..77076f1c93f769ea81437599b143992cab78f62d 100644
--- a/Common/ExecutionModel/vtkInformationDataObjectMetaDataKey.h
+++ b/Common/ExecutionModel/vtkInformationDataObjectMetaDataKey.h
@@ -17,8 +17,8 @@
 // that (shallow) copies itself downstream during the REQUEST_INFORMATION pass. Hence
 // it can be used to provide meta-data of type vtkDataObject or any subclass.
 
-#ifndef __vtkInformationDataObjectMetaDataKey_h
-#define __vtkInformationDataObjectMetaDataKey_h
+#ifndef vtkInformationDataObjectMetaDataKey_h
+#define vtkInformationDataObjectMetaDataKey_h
 
 #include "vtkCommonExecutionModelModule.h" // For export macro
 #include "vtkInformationDataObjectKey.h"
diff --git a/Common/ExecutionModel/vtkInformationExecutivePortKey.h b/Common/ExecutionModel/vtkInformationExecutivePortKey.h
index ee7b6bc4a9129ef47d57d641b844b84f05437d77..ea2e4844fc1c5d569f74757e6627fa5d02f22d3c 100644
--- a/Common/ExecutionModel/vtkInformationExecutivePortKey.h
+++ b/Common/ExecutionModel/vtkInformationExecutivePortKey.h
@@ -18,8 +18,8 @@
 // vtkInformation for values that are vtkExecutive instances paired
 // with port numbers.
 
-#ifndef __vtkInformationExecutivePortKey_h
-#define __vtkInformationExecutivePortKey_h
+#ifndef vtkInformationExecutivePortKey_h
+#define vtkInformationExecutivePortKey_h
 
 #include "vtkCommonExecutionModelModule.h" // For export macro
 #include "vtkInformationKey.h"
diff --git a/Common/ExecutionModel/vtkInformationExecutivePortVectorKey.h b/Common/ExecutionModel/vtkInformationExecutivePortVectorKey.h
index 0884c035abfad80efc276946b30335d6f0f7d0de..beb25b9c9ab7dee30a3146d744d2eb6fa705c963 100644
--- a/Common/ExecutionModel/vtkInformationExecutivePortVectorKey.h
+++ b/Common/ExecutionModel/vtkInformationExecutivePortVectorKey.h
@@ -18,8 +18,8 @@
 // vtkInformation for values that are vectors of vtkExecutive
 // instances paired with port numbers.
 
-#ifndef __vtkInformationExecutivePortVectorKey_h
-#define __vtkInformationExecutivePortVectorKey_h
+#ifndef vtkInformationExecutivePortVectorKey_h
+#define vtkInformationExecutivePortVectorKey_h
 
 #include "vtkCommonExecutionModelModule.h" // For export macro
 #include "vtkInformationKey.h"
diff --git a/Common/ExecutionModel/vtkInformationIntegerRequestKey.h b/Common/ExecutionModel/vtkInformationIntegerRequestKey.h
index ca65acfb50b90b00c3c2b8a164d76a38bb25fc20..b4cf22bddb6057e58151bcdc81da7013913dff6e 100644
--- a/Common/ExecutionModel/vtkInformationIntegerRequestKey.h
+++ b/Common/ExecutionModel/vtkInformationIntegerRequestKey.h
@@ -27,8 +27,8 @@
 // The best way to use this class is to subclass it to set the DataKey data member.
 // This is usually done in the subclass' constructor.
 
-#ifndef __vtkInformationIntegerRequestKey_h
-#define __vtkInformationIntegerRequestKey_h
+#ifndef vtkInformationIntegerRequestKey_h
+#define vtkInformationIntegerRequestKey_h
 
 #include "vtkCommonExecutionModelModule.h" // For export macro
 #include "vtkInformationIntegerKey.h"
diff --git a/Common/ExecutionModel/vtkMultiBlockDataSetAlgorithm.h b/Common/ExecutionModel/vtkMultiBlockDataSetAlgorithm.h
index bec0a6e8983316f0da654c63f95f24bc3b203a29..8772d42d6c10dc3f140e8177d6242b92e20bb799 100644
--- a/Common/ExecutionModel/vtkMultiBlockDataSetAlgorithm.h
+++ b/Common/ExecutionModel/vtkMultiBlockDataSetAlgorithm.h
@@ -19,8 +19,8 @@
 // class.
 
 
-#ifndef __vtkMultiBlockDataSetAlgorithm_h
-#define __vtkMultiBlockDataSetAlgorithm_h
+#ifndef vtkMultiBlockDataSetAlgorithm_h
+#define vtkMultiBlockDataSetAlgorithm_h
 
 #include "vtkCommonExecutionModelModule.h" // For export macro
 #include "vtkAlgorithm.h"
diff --git a/Common/ExecutionModel/vtkMultiTimeStepAlgorithm.h b/Common/ExecutionModel/vtkMultiTimeStepAlgorithm.h
index e1e5fb9765759347d2ec261cb1509df6d52dd3b1..c8819680c8eb1701410ca860995e8a149c9e28f7 100644
--- a/Common/ExecutionModel/vtkMultiTimeStepAlgorithm.h
+++ b/Common/ExecutionModel/vtkMultiTimeStepAlgorithm.h
@@ -22,8 +22,8 @@
 // in a vtkMultiBlockDataSet object.
 
 
-#ifndef __vtkMultiTimeStepAlgorithm_h
-#define __vtkMultiTimeStepAlgorithm_h
+#ifndef vtkMultiTimeStepAlgorithm_h
+#define vtkMultiTimeStepAlgorithm_h
 
 #include "vtkCommonExecutionModelModule.h" // For export macro
 #include "vtkAlgorithm.h"
diff --git a/Common/ExecutionModel/vtkPassInputTypeAlgorithm.h b/Common/ExecutionModel/vtkPassInputTypeAlgorithm.h
index 329b716725b29043c95f9583638ad45c730d845c..90abf338d2668079e7d78dd259dfc28f5e49c545 100644
--- a/Common/ExecutionModel/vtkPassInputTypeAlgorithm.h
+++ b/Common/ExecutionModel/vtkPassInputTypeAlgorithm.h
@@ -29,8 +29,8 @@
 // same type as the input.
 
 
-#ifndef __vtkPassInputTypeAlgorithm_h
-#define __vtkPassInputTypeAlgorithm_h
+#ifndef vtkPassInputTypeAlgorithm_h
+#define vtkPassInputTypeAlgorithm_h
 
 #include "vtkCommonExecutionModelModule.h" // For export macro
 #include "vtkAlgorithm.h"
diff --git a/Common/ExecutionModel/vtkPiecewiseFunctionAlgorithm.h b/Common/ExecutionModel/vtkPiecewiseFunctionAlgorithm.h
index 5495f28867ad3c02f4b46f60d1cdaf82d99ae66a..dd7d70e67a57dc760a366326c7b53f12c9043ee5 100644
--- a/Common/ExecutionModel/vtkPiecewiseFunctionAlgorithm.h
+++ b/Common/ExecutionModel/vtkPiecewiseFunctionAlgorithm.h
@@ -27,8 +27,8 @@
 // You should implement the subclass's algorithm into
 // RequestData( request, inputVec, outputVec).
 
-#ifndef __vtkPiecewiseFunctionAlgorithm_h
-#define __vtkPiecewiseFunctionAlgorithm_h
+#ifndef vtkPiecewiseFunctionAlgorithm_h
+#define vtkPiecewiseFunctionAlgorithm_h
 
 #include "vtkCommonExecutionModelModule.h" // For export macro
 #include "vtkAlgorithm.h"
diff --git a/Common/ExecutionModel/vtkPiecewiseFunctionShiftScale.h b/Common/ExecutionModel/vtkPiecewiseFunctionShiftScale.h
index c245a0c3d40949dc8ebe60c87f4c6d277ab2ddfd..3a841811f9c7e6b78ff85d52a0a34a4fe4eb5f96 100644
--- a/Common/ExecutionModel/vtkPiecewiseFunctionShiftScale.h
+++ b/Common/ExecutionModel/vtkPiecewiseFunctionShiftScale.h
@@ -17,8 +17,8 @@
 //
 // .SECTION Description
 
-#ifndef __vtkPiecewiseFunctionShiftScale_h
-#define __vtkPiecewiseFunctionShiftScale_h
+#ifndef vtkPiecewiseFunctionShiftScale_h
+#define vtkPiecewiseFunctionShiftScale_h
 
 #include "vtkCommonExecutionModelModule.h" // For export macro
 #include "vtkPiecewiseFunctionAlgorithm.h"
diff --git a/Common/ExecutionModel/vtkPointSetAlgorithm.h b/Common/ExecutionModel/vtkPointSetAlgorithm.h
index 092f6ca5c34770d1177ba385d6c0ce2de931dfa9..b05603a66774a29a27a87ef6d7c8ec9d730ccec0 100644
--- a/Common/ExecutionModel/vtkPointSetAlgorithm.h
+++ b/Common/ExecutionModel/vtkPointSetAlgorithm.h
@@ -27,8 +27,8 @@
 // RequestData( request, inputVec, outputVec).
 
 
-#ifndef __vtkPointSetAlgorithm_h
-#define __vtkPointSetAlgorithm_h
+#ifndef vtkPointSetAlgorithm_h
+#define vtkPointSetAlgorithm_h
 
 #include "vtkCommonExecutionModelModule.h" // For export macro
 #include "vtkAlgorithm.h"
diff --git a/Common/ExecutionModel/vtkPolyDataAlgorithm.h b/Common/ExecutionModel/vtkPolyDataAlgorithm.h
index 9b62b38e70e0b80a85daf71c940a63cea1c89ed3..52c7008c703f1be400ae8324f1cfdbecf44be14c 100644
--- a/Common/ExecutionModel/vtkPolyDataAlgorithm.h
+++ b/Common/ExecutionModel/vtkPolyDataAlgorithm.h
@@ -25,8 +25,8 @@
 // method that by default says that all inputs will be PolyData. If that
 // isn't the case then please override this method in your subclass.
 
-#ifndef __vtkPolyDataAlgorithm_h
-#define __vtkPolyDataAlgorithm_h
+#ifndef vtkPolyDataAlgorithm_h
+#define vtkPolyDataAlgorithm_h
 
 #include "vtkCommonExecutionModelModule.h" // For export macro
 #include "vtkAlgorithm.h"
diff --git a/Common/ExecutionModel/vtkProgressObserver.h b/Common/ExecutionModel/vtkProgressObserver.h
index ad1a82e1cf353f487cb9d608f5f9ec68e6435d51..df727fb699b3c1e0f1723f00c09c9da98924f6f2 100644
--- a/Common/ExecutionModel/vtkProgressObserver.h
+++ b/Common/ExecutionModel/vtkProgressObserver.h
@@ -24,8 +24,8 @@
 // thread local vtkProgressObserver, which will invoke events separately
 // for each thread.
 
-#ifndef __vtkProgressObserver_h
-#define __vtkProgressObserver_h
+#ifndef vtkProgressObserver_h
+#define vtkProgressObserver_h
 
 #include "vtkCommonExecutionModelModule.h" // For export macro
 #include "vtkObject.h"
diff --git a/Common/ExecutionModel/vtkRectilinearGridAlgorithm.h b/Common/ExecutionModel/vtkRectilinearGridAlgorithm.h
index 76410e6130f1c8663ed6c15653c4f2c6055ba811..4247b05d9fdbc1236d9e1d1b026bcc20962dba57 100644
--- a/Common/ExecutionModel/vtkRectilinearGridAlgorithm.h
+++ b/Common/ExecutionModel/vtkRectilinearGridAlgorithm.h
@@ -27,8 +27,8 @@
 // You should implement the subclass's algorithm into
 // RequestData( request, inputVec, outputVec).
 
-#ifndef __vtkRectilinearGridAlgorithm_h
-#define __vtkRectilinearGridAlgorithm_h
+#ifndef vtkRectilinearGridAlgorithm_h
+#define vtkRectilinearGridAlgorithm_h
 
 #include "vtkCommonExecutionModelModule.h" // For export macro
 #include "vtkAlgorithm.h"
diff --git a/Common/ExecutionModel/vtkSMPProgressObserver.h b/Common/ExecutionModel/vtkSMPProgressObserver.h
index f46d20035a89b383031a46e94b3a537892e1d9bb..3a27333044f4fad9cad4f29a48f2332a98c33011 100644
--- a/Common/ExecutionModel/vtkSMPProgressObserver.h
+++ b/Common/ExecutionModel/vtkSMPProgressObserver.h
@@ -21,8 +21,8 @@
 // thread. Since the execution will be somewhat load balanced,
 // it may be enough to do this only on the main thread.
 
-#ifndef __vtkSMPProgressObserver_h
-#define __vtkSMPProgressObserver_h
+#ifndef vtkSMPProgressObserver_h
+#define vtkSMPProgressObserver_h
 
 #include "vtkCommonExecutionModelModule.h" // For export macro
 #include "vtkProgressObserver.h"
diff --git a/Common/ExecutionModel/vtkScalarTree.h b/Common/ExecutionModel/vtkScalarTree.h
index ab594167fdd82417904250200443a306c465c37b..f23867d1cd602e3e219fbfff3e7c55d1b19adce1 100644
--- a/Common/ExecutionModel/vtkScalarTree.h
+++ b/Common/ExecutionModel/vtkScalarTree.h
@@ -29,8 +29,8 @@
 // .SECTION See Also
 // vtkSimpleScalarTree
 
-#ifndef __vtkScalarTree_h
-#define __vtkScalarTree_h
+#ifndef vtkScalarTree_h
+#define vtkScalarTree_h
 
 #include "vtkCommonExecutionModelModule.h" // For export macro
 #include "vtkObject.h"
diff --git a/Common/ExecutionModel/vtkSelectionAlgorithm.h b/Common/ExecutionModel/vtkSelectionAlgorithm.h
index 64154e1df4265a93cc84132c7a331520b123cccc..a223289a65c3dbfe478f76a2e632f398c200cddb 100644
--- a/Common/ExecutionModel/vtkSelectionAlgorithm.h
+++ b/Common/ExecutionModel/vtkSelectionAlgorithm.h
@@ -31,8 +31,8 @@
 // Thanks to Patricia Crossno, Ken Moreland, Andrew Wilson and Brian Wylie from
 // Sandia National Laboratories for their help in developing this class.
 
-#ifndef __vtkSelectionAlgorithm_h
-#define __vtkSelectionAlgorithm_h
+#ifndef vtkSelectionAlgorithm_h
+#define vtkSelectionAlgorithm_h
 
 #include "vtkCommonExecutionModelModule.h" // For export macro
 #include "vtkAlgorithm.h"
diff --git a/Common/ExecutionModel/vtkSimpleImageToImageFilter.h b/Common/ExecutionModel/vtkSimpleImageToImageFilter.h
index 98b78662696d99d287ce3eb464214661f1947f1f..42c14b4b034c9adf7106f11a1a36eb77331db370 100644
--- a/Common/ExecutionModel/vtkSimpleImageToImageFilter.h
+++ b/Common/ExecutionModel/vtkSimpleImageToImageFilter.h
@@ -34,8 +34,8 @@
 // .SECTION See also
 // vtkImageAlgorithm vtkSimpleImageFilterExample
 
-#ifndef __vtkSimpleImageToImageFilter_h
-#define __vtkSimpleImageToImageFilter_h
+#ifndef vtkSimpleImageToImageFilter_h
+#define vtkSimpleImageToImageFilter_h
 
 #include "vtkCommonExecutionModelModule.h" // For export macro
 #include "vtkImageAlgorithm.h"
diff --git a/Common/ExecutionModel/vtkSimpleScalarTree.h b/Common/ExecutionModel/vtkSimpleScalarTree.h
index caa937056dfda8891e612e5346cda48c29062bc8..0a2664eddd9cf607acff9a393034f6b75084cc02 100644
--- a/Common/ExecutionModel/vtkSimpleScalarTree.h
+++ b/Common/ExecutionModel/vtkSimpleScalarTree.h
@@ -29,8 +29,8 @@
 // and so on. The implication is that there are no direct lists of cell ids
 // per leaf node, instead the cell ids are implicitly known.
 
-#ifndef __vtkSimpleScalarTree_h
-#define __vtkSimpleScalarTree_h
+#ifndef vtkSimpleScalarTree_h
+#define vtkSimpleScalarTree_h
 
 #include "vtkCommonExecutionModelModule.h" // For export macro
 #include "vtkScalarTree.h"
diff --git a/Common/ExecutionModel/vtkStreamingDemandDrivenPipeline.h b/Common/ExecutionModel/vtkStreamingDemandDrivenPipeline.h
index 8d8a6d3a39667bad4ae15783ab02c977b51835e3..fb96f6eef31a8c2d2cf1a49ce843eede2c0cae3d 100644
--- a/Common/ExecutionModel/vtkStreamingDemandDrivenPipeline.h
+++ b/Common/ExecutionModel/vtkStreamingDemandDrivenPipeline.h
@@ -20,8 +20,8 @@
 // 4.x pipeline.  Instead of always updating an entire data set, this
 // executive supports asking for pieces or sub-extents.
 
-#ifndef __vtkStreamingDemandDrivenPipeline_h
-#define __vtkStreamingDemandDrivenPipeline_h
+#ifndef vtkStreamingDemandDrivenPipeline_h
+#define vtkStreamingDemandDrivenPipeline_h
 
 #include "vtkCommonExecutionModelModule.h" // For export macro
 #include "vtkDemandDrivenPipeline.h"
diff --git a/Common/ExecutionModel/vtkStructuredGridAlgorithm.h b/Common/ExecutionModel/vtkStructuredGridAlgorithm.h
index e986b47f218b62cce5028c1f033a26079f4ab4fd..8e77d1c83a1d056c1b429dd3b2f12c7d4a38609e 100644
--- a/Common/ExecutionModel/vtkStructuredGridAlgorithm.h
+++ b/Common/ExecutionModel/vtkStructuredGridAlgorithm.h
@@ -25,8 +25,8 @@
 // method that by default says that all inputs will be StructuredGrid. If that
 // isn't the case then please override this method in your subclass.
 
-#ifndef __vtkStructuredGridAlgorithm_h
-#define __vtkStructuredGridAlgorithm_h
+#ifndef vtkStructuredGridAlgorithm_h
+#define vtkStructuredGridAlgorithm_h
 
 #include "vtkCommonExecutionModelModule.h" // For export macro
 #include "vtkAlgorithm.h"
diff --git a/Common/ExecutionModel/vtkTableAlgorithm.h b/Common/ExecutionModel/vtkTableAlgorithm.h
index dd5447df78b4a7f82edbb7876e21465eb374e381..94e9e01b1d52950b8f53e19a8adfbbfd68f27a2c 100644
--- a/Common/ExecutionModel/vtkTableAlgorithm.h
+++ b/Common/ExecutionModel/vtkTableAlgorithm.h
@@ -33,8 +33,8 @@
 // .SECTION Thanks
 // Thanks to Brian Wylie for creating this class.
 
-#ifndef __vtkTableAlgorithm_h
-#define __vtkTableAlgorithm_h
+#ifndef vtkTableAlgorithm_h
+#define vtkTableAlgorithm_h
 
 #include "vtkCommonExecutionModelModule.h" // For export macro
 #include "vtkAlgorithm.h"
diff --git a/Common/ExecutionModel/vtkThreadedCompositeDataPipeline.h b/Common/ExecutionModel/vtkThreadedCompositeDataPipeline.h
index c1e201ce7ff3f5997ebcf49acd994c6ccdb078fd..0df0b69c0bb2ee47a3d00c82f466b6898f3360c7 100644
--- a/Common/ExecutionModel/vtkThreadedCompositeDataPipeline.h
+++ b/Common/ExecutionModel/vtkThreadedCompositeDataPipeline.h
@@ -22,8 +22,8 @@
 // store/retrieve all state changes using input and output information
 // objects, which are unique to each thread.
 
-#ifndef __vtkThreadedCompositeDataPipeline_h
-#define __vtkThreadedCompositeDataPipeline_h
+#ifndef vtkThreadedCompositeDataPipeline_h
+#define vtkThreadedCompositeDataPipeline_h
 
 #include "vtkCommonExecutionModelModule.h" // For export macro
 #include "vtkCompositeDataPipeline.h"
diff --git a/Common/ExecutionModel/vtkThreadedImageAlgorithm.h b/Common/ExecutionModel/vtkThreadedImageAlgorithm.h
index 649ec6021b9c2f315cfdc5c0dcf62399187e4559..ba2b43712bc4ce8ceea33f66fa2a0e43c811829c 100644
--- a/Common/ExecutionModel/vtkThreadedImageAlgorithm.h
+++ b/Common/ExecutionModel/vtkThreadedImageAlgorithm.h
@@ -22,8 +22,8 @@
 // .SECTION See also
 // vtkSimpleImageToImageAlgorithm
 
-#ifndef __vtkThreadedImageAlgorithm_h
-#define __vtkThreadedImageAlgorithm_h
+#ifndef vtkThreadedImageAlgorithm_h
+#define vtkThreadedImageAlgorithm_h
 
 #include "vtkCommonExecutionModelModule.h" // For export macro
 #include "vtkImageAlgorithm.h"
diff --git a/Common/ExecutionModel/vtkTreeAlgorithm.h b/Common/ExecutionModel/vtkTreeAlgorithm.h
index ea33c8bffc380e924f2d4ea9fef455fbe840dd8c..9d2f53d4c8238049356c90cb4ea71dd36c147958 100644
--- a/Common/ExecutionModel/vtkTreeAlgorithm.h
+++ b/Common/ExecutionModel/vtkTreeAlgorithm.h
@@ -30,8 +30,8 @@
 // method that by default says that all inputs will be Tree. If that
 // isn't the case then please override this method in your subclass.
 
-#ifndef __vtkTreeAlgorithm_h
-#define __vtkTreeAlgorithm_h
+#ifndef vtkTreeAlgorithm_h
+#define vtkTreeAlgorithm_h
 
 #include "vtkCommonExecutionModelModule.h" // For export macro
 #include "vtkAlgorithm.h"
diff --git a/Common/ExecutionModel/vtkTrivialProducer.h b/Common/ExecutionModel/vtkTrivialProducer.h
index 41349ad510a5e63c7dab0c2cf9a2b41d3c4bef38..9c730186b4c2b5d5051a49773de81e4046b2abd6 100644
--- a/Common/ExecutionModel/vtkTrivialProducer.h
+++ b/Common/ExecutionModel/vtkTrivialProducer.h
@@ -20,8 +20,8 @@
 // producer allows data objects that are hand-constructed in a program
 // without another vtk producer to be connected.
 
-#ifndef __vtkTrivialProducer_h
-#define __vtkTrivialProducer_h
+#ifndef vtkTrivialProducer_h
+#define vtkTrivialProducer_h
 
 #include "vtkCommonExecutionModelModule.h" // For export macro
 #include "vtkAlgorithm.h"
diff --git a/Common/ExecutionModel/vtkUndirectedGraphAlgorithm.h b/Common/ExecutionModel/vtkUndirectedGraphAlgorithm.h
index 07cb018b54c854bdcd528ffd18396999f1319f26..59b14830d534435bb3d44f4f4a06180ddc1a147d 100644
--- a/Common/ExecutionModel/vtkUndirectedGraphAlgorithm.h
+++ b/Common/ExecutionModel/vtkUndirectedGraphAlgorithm.h
@@ -34,8 +34,8 @@
 // Thanks to Patricia Crossno, Ken Moreland, Andrew Wilson and Brian Wylie from
 // Sandia National Laboratories for their help in developing this class.
 
-#ifndef __vtkUndirectedGraphAlgorithm_h
-#define __vtkUndirectedGraphAlgorithm_h
+#ifndef vtkUndirectedGraphAlgorithm_h
+#define vtkUndirectedGraphAlgorithm_h
 
 #include "vtkCommonExecutionModelModule.h" // For export macro
 #include "vtkAlgorithm.h"
diff --git a/Common/ExecutionModel/vtkUnstructuredGridAlgorithm.h b/Common/ExecutionModel/vtkUnstructuredGridAlgorithm.h
index 592857f9ebfcefe2b12b619ca149cfdc270635d4..0b21f7afea2b811165cc14326e307b00cf04e900 100644
--- a/Common/ExecutionModel/vtkUnstructuredGridAlgorithm.h
+++ b/Common/ExecutionModel/vtkUnstructuredGridAlgorithm.h
@@ -25,8 +25,8 @@
 // method that by default says that all inputs will be UnstructuredGrid. If that
 // isn't the case then please override this method in your subclass.
 
-#ifndef __vtkUnstructuredGridAlgorithm_h
-#define __vtkUnstructuredGridAlgorithm_h
+#ifndef vtkUnstructuredGridAlgorithm_h
+#define vtkUnstructuredGridAlgorithm_h
 
 #include "vtkCommonExecutionModelModule.h" // For export macro
 #include "vtkAlgorithm.h"
diff --git a/Common/ExecutionModel/vtkUnstructuredGridBaseAlgorithm.h b/Common/ExecutionModel/vtkUnstructuredGridBaseAlgorithm.h
index 278a0d76175e7c1d5942cc3067db1bd029cc6b7a..8c8c8ab0edfa422a89148fc2a0d12b5925b2b8df 100644
--- a/Common/ExecutionModel/vtkUnstructuredGridBaseAlgorithm.h
+++ b/Common/ExecutionModel/vtkUnstructuredGridBaseAlgorithm.h
@@ -24,8 +24,8 @@
 // method that by default says that all inputs will be UnstructuredGridBase. If
 // that isn't the case then please override this method in your subclass.
 
-#ifndef __vtkUnstructuredGridBaseAlgorithm_h
-#define __vtkUnstructuredGridBaseAlgorithm_h
+#ifndef vtkUnstructuredGridBaseAlgorithm_h
+#define vtkUnstructuredGridBaseAlgorithm_h
 
 #include "vtkCommonExecutionModelModule.h" // For export macro
 #include "vtkAlgorithm.h"
diff --git a/Common/Math/vtkAmoebaMinimizer.h b/Common/Math/vtkAmoebaMinimizer.h
index 25095d6ce336893ac2eefe61cef49e769bc0ab1e..bc7bc7d70ae3319bbab0c2d0a49f43cece4db886 100644
--- a/Common/Math/vtkAmoebaMinimizer.h
+++ b/Common/Math/vtkAmoebaMinimizer.h
@@ -23,8 +23,8 @@
 // but is not guaranteed to find the global minimum if several local
 // minima exist.
 
-#ifndef __vtkAmoebaMinimizer_h
-#define __vtkAmoebaMinimizer_h
+#ifndef vtkAmoebaMinimizer_h
+#define vtkAmoebaMinimizer_h
 
 #include "vtkCommonMathModule.h" // For export macro
 #include "vtkObject.h"
diff --git a/Common/Math/vtkFastNumericConversion.h b/Common/Math/vtkFastNumericConversion.h
index b2b66acb998a9496b4f998381f29987bfb5fec63..ba871a8a9aec5e1553bf3fb759f6ae3ac5309737 100644
--- a/Common/Math/vtkFastNumericConversion.h
+++ b/Common/Math/vtkFastNumericConversion.h
@@ -44,8 +44,8 @@
 // Linux, that the default extended precision mode is in effect, and it
 // assumes, on Windows, that the default double precision mode is in effect.
 
-#ifndef __vtkFastNumericConversion_h
-#define __vtkFastNumericConversion_h
+#ifndef vtkFastNumericConversion_h
+#define vtkFastNumericConversion_h
 
 #include "vtkCommonMathModule.h" // For export macro
 #include "vtkObject.h"
diff --git a/Common/Math/vtkFunctionSet.h b/Common/Math/vtkFunctionSet.h
index 1cb792d88bc54dd233152f730e0e4ea99b3a6821..465e7f11eb252cb7c6f7475c125ce6b4aa7b0de9 100644
--- a/Common/Math/vtkFunctionSet.h
+++ b/Common/Math/vtkFunctionSet.h
@@ -23,8 +23,8 @@
 // vtkImplicitDataSet vtkInterpolatedVelocityField
 // vtkInitialValueProblemSolver
 
-#ifndef __vtkFunctionSet_h
-#define __vtkFunctionSet_h
+#ifndef vtkFunctionSet_h
+#define vtkFunctionSet_h
 
 #include "vtkCommonMathModule.h" // For export macro
 #include "vtkObject.h"
diff --git a/Common/Math/vtkInitialValueProblemSolver.h b/Common/Math/vtkInitialValueProblemSolver.h
index b7ea50a1cdb7f763221acfd975eb2c4e5aa8067c..df059917583da9ee9b00cd2c06d7e479a16dc8ee 100644
--- a/Common/Math/vtkInitialValueProblemSolver.h
+++ b/Common/Math/vtkInitialValueProblemSolver.h
@@ -26,8 +26,8 @@
 // .SECTION See Also
 // vtkRungeKutta2 vtkRungeKutta4
 
-#ifndef __vtkInitialValueProblemSolver_h
-#define __vtkInitialValueProblemSolver_h
+#ifndef vtkInitialValueProblemSolver_h
+#define vtkInitialValueProblemSolver_h
 
 #include "vtkCommonMathModule.h" // For export macro
 #include "vtkObject.h"
diff --git a/Common/Math/vtkMatrix3x3.h b/Common/Math/vtkMatrix3x3.h
index a10b52c05729bf1a58c3fbecdcbc370b97d101c3..182c73a908f72e0fbecaf5b1b87b00bf52bed4ff 100644
--- a/Common/Math/vtkMatrix3x3.h
+++ b/Common/Math/vtkMatrix3x3.h
@@ -21,8 +21,8 @@
 // .SECTION See Also
 // vtkTransform2D
 
-#ifndef __vtkMatrix3x3_h
-#define __vtkMatrix3x3_h
+#ifndef vtkMatrix3x3_h
+#define vtkMatrix3x3_h
 
 #include "vtkCommonMathModule.h" // For export macro
 #include "vtkObject.h"
diff --git a/Common/Math/vtkMatrix4x4.h b/Common/Math/vtkMatrix4x4.h
index a5706772eb87edad7b7e982e145e095bbf44f036..39218d551a5c0e7ec730b863381bc1f5c82203f9 100644
--- a/Common/Math/vtkMatrix4x4.h
+++ b/Common/Math/vtkMatrix4x4.h
@@ -21,8 +21,8 @@
 // .SECTION See Also
 // vtkTransform
 
-#ifndef __vtkMatrix4x4_h
-#define __vtkMatrix4x4_h
+#ifndef vtkMatrix4x4_h
+#define vtkMatrix4x4_h
 
 #include "vtkCommonMathModule.h" // For export macro
 #include "vtkObject.h"
diff --git a/Common/Math/vtkPolynomialSolversUnivariate.h b/Common/Math/vtkPolynomialSolversUnivariate.h
index c02d035c3e16b7046134797cbe469c402c1d216b..1a8ee831db45c48bb2d3f7410e881bcf0171b572 100644
--- a/Common/Math/vtkPolynomialSolversUnivariate.h
+++ b/Common/Math/vtkPolynomialSolversUnivariate.h
@@ -43,8 +43,8 @@
 // Thanks to Philippe Pebay, Korben Rusek, David Thompson, and Maurice Rojas
 // for implementing these solvers.
 
-#ifndef __vtkPolynomialSolversUnivariate_h
-#define __vtkPolynomialSolversUnivariate_h
+#ifndef vtkPolynomialSolversUnivariate_h
+#define vtkPolynomialSolversUnivariate_h
 
 #include "vtkCommonMathModule.h" // For export macro
 #include "vtkObject.h"
diff --git a/Common/Math/vtkQuaternion.h b/Common/Math/vtkQuaternion.h
index 8595d1f6b5127133c0195711df8826bfe2f30b89..39bd1cde951009306b7cc67bd66629fa25cdf036 100644
--- a/Common/Math/vtkQuaternion.h
+++ b/Common/Math/vtkQuaternion.h
@@ -27,8 +27,8 @@
 // .SECTION See also
 // vtkQuaternionInterpolator
 
-#ifndef __vtkQuaternion_h
-#define __vtkQuaternion_h
+#ifndef vtkQuaternion_h
+#define vtkQuaternion_h
 
 #include "vtkTuple.h"
 
@@ -379,5 +379,5 @@ public:
 
 #include "vtkQuaternion.txx"
 
-#endif // __vtkQuaternion_h
+#endif // vtkQuaternion_h
 // VTK-HeaderTest-Exclude: vtkQuaternion.h
diff --git a/Common/Math/vtkQuaternionInterpolator.h b/Common/Math/vtkQuaternionInterpolator.h
index 0649eba0283720acf08a26625fa443dd49a02fcd..51bbcf2e6cf82d69c41bf47e80bc3356bbdb291e 100644
--- a/Common/Math/vtkQuaternionInterpolator.h
+++ b/Common/Math/vtkQuaternionInterpolator.h
@@ -49,8 +49,8 @@
 // vtkQuaternion
 
 
-#ifndef __vtkQuaternionInterpolator_h
-#define __vtkQuaternionInterpolator_h
+#ifndef vtkQuaternionInterpolator_h
+#define vtkQuaternionInterpolator_h
 
 #include "vtkCommonMathModule.h" // For export macro
 #include "vtkObject.h"
diff --git a/Common/Math/vtkRungeKutta2.h b/Common/Math/vtkRungeKutta2.h
index 704f24174e6c8ff54f19920204d8cf0336c5e57d..fb60c9061e4749331095b5a092767dce22856e5b 100644
--- a/Common/Math/vtkRungeKutta2.h
+++ b/Common/Math/vtkRungeKutta2.h
@@ -23,8 +23,8 @@
 // .SECTION See Also
 // vtkInitialValueProblemSolver vtkRungeKutta4 vtkRungeKutta45 vtkFunctionSet
 
-#ifndef __vtkRungeKutta2_h
-#define __vtkRungeKutta2_h
+#ifndef vtkRungeKutta2_h
+#define vtkRungeKutta2_h
 
 #include "vtkCommonMathModule.h" // For export macro
 #include "vtkInitialValueProblemSolver.h"
diff --git a/Common/Math/vtkRungeKutta4.h b/Common/Math/vtkRungeKutta4.h
index 729bacda4be8d99f7ffa66f64505d1064bc89293..085848006a2a78b70e1f45aba5e322a52a3467a6 100644
--- a/Common/Math/vtkRungeKutta4.h
+++ b/Common/Math/vtkRungeKutta4.h
@@ -23,8 +23,8 @@
 // .SECTION See Also
 // vtkInitialValueProblemSolver vtkRungeKutta45 vtkRungeKutta2 vtkFunctionSet
 
-#ifndef __vtkRungeKutta4_h
-#define __vtkRungeKutta4_h
+#ifndef vtkRungeKutta4_h
+#define vtkRungeKutta4_h
 
 #include "vtkCommonMathModule.h" // For export macro
 #include "vtkInitialValueProblemSolver.h"
diff --git a/Common/Math/vtkRungeKutta45.h b/Common/Math/vtkRungeKutta45.h
index d8dc9294f8b1dddec6d08729a697bcd28b7242e1..7d49927465c5aace95ae72acf50a5ec36688ef4e 100644
--- a/Common/Math/vtkRungeKutta45.h
+++ b/Common/Math/vtkRungeKutta45.h
@@ -29,8 +29,8 @@
 // .SECTION See Also
 // vtkInitialValueProblemSolver vtkRungeKutta4 vtkRungeKutta2 vtkFunctionSet
 
-#ifndef __vtkRungeKutta45_h
-#define __vtkRungeKutta45_h
+#ifndef vtkRungeKutta45_h
+#define vtkRungeKutta45_h
 
 #include "vtkCommonMathModule.h" // For export macro
 #include "vtkInitialValueProblemSolver.h"
diff --git a/Common/Math/vtkTuple.h b/Common/Math/vtkTuple.h
index 8ef18b4ee56582f582411c3ff72bf7dbdf4cf463..1514ed39f83f11f58b0499f1bec58faf2088fdaa 100644
--- a/Common/Math/vtkTuple.h
+++ b/Common/Math/vtkTuple.h
@@ -18,8 +18,8 @@
 // .SECTION Description
 // This class is a templated data type for storing and manipulating tuples.
 
-#ifndef __vtkTuple_h
-#define __vtkTuple_h
+#ifndef vtkTuple_h
+#define vtkTuple_h
 
 #include "vtkIOStream.h" // For streaming operators
 #include "vtkSystemIncludes.h"
@@ -192,5 +192,5 @@ bool operator!=(const vtkTuple<A, Size>& t1, const vtkTuple<A, Size>& t2)
   return !(t1 == t2);
 }
 
-#endif // __vtkTuple_h
+#endif // vtkTuple_h
 // VTK-HeaderTest-Exclude: vtkTuple.h
diff --git a/Common/Misc/vtkContourValues.h b/Common/Misc/vtkContourValues.h
index d76687a432e904d338fe3d82cf5fbb13356dbccf..ddab30e1db1b7f0317eb9cdf78c209d7e9bf4502 100644
--- a/Common/Misc/vtkContourValues.h
+++ b/Common/Misc/vtkContourValues.h
@@ -21,8 +21,8 @@
 // .SECTION See Also
 // vtkContourFilter
 
-#ifndef __vtkContourValues_h
-#define __vtkContourValues_h
+#ifndef vtkContourValues_h
+#define vtkContourValues_h
 
 #include "vtkCommonMiscModule.h" // For export macro
 #include "vtkObject.h"
diff --git a/Common/Misc/vtkErrorCode.h b/Common/Misc/vtkErrorCode.h
index 715480f4cf743ded86fd421260dcfeaa2f93a991..38124a16d83f33fe796d760600ec9e463995eebc 100644
--- a/Common/Misc/vtkErrorCode.h
+++ b/Common/Misc/vtkErrorCode.h
@@ -17,8 +17,8 @@
 // vtkErrorCode is an mechanism for (currently) reader object to
 // return errors during reading file.
 
-#ifndef __vtkErrorCode_h
-#define __vtkErrorCode_h
+#ifndef vtkErrorCode_h
+#define vtkErrorCode_h
 #include "vtkCommonMiscModule.h" // For export macro
 #include "vtkSystemIncludes.h"
 
@@ -51,6 +51,6 @@ public:
 //ETX
 };
 
-#endif /* __vtkErrorCode_h */
+#endif /* vtkErrorCode_h */
 
 // VTK-HeaderTest-Exclude: vtkErrorCode.h
diff --git a/Common/Misc/vtkFunctionParser.h b/Common/Misc/vtkFunctionParser.h
index ae4e6ebf978e6807c31194129a58279f1f635103..0d77fd8b499e02fa1c633066f8ca39aaec09857e 100644
--- a/Common/Misc/vtkFunctionParser.h
+++ b/Common/Misc/vtkFunctionParser.h
@@ -38,8 +38,8 @@
 // Sid Sydoriak (sxs@lanl.gov) for adding boolean operations and
 // conditional expressions and for fixing a variety of bugs.
 
-#ifndef __vtkFunctionParser_h
-#define __vtkFunctionParser_h
+#ifndef vtkFunctionParser_h
+#define vtkFunctionParser_h
 
 #include "vtkCommonMiscModule.h" // For export macro
 #include "vtkObject.h"
diff --git a/Common/Misc/vtkHeap.h b/Common/Misc/vtkHeap.h
index d4a9df0f4f8272859c5cea1369ab61f3e94678b5..8a0b60532f03a5a64353306bdde32639b845e32a 100644
--- a/Common/Misc/vtkHeap.h
+++ b/Common/Misc/vtkHeap.h
@@ -39,8 +39,8 @@
 // .SECTION See Also
 // vtkVRMLImporter vtkPLY vtkOrderedTriangulator
 
-#ifndef __vtkHeap_h
-#define __vtkHeap_h
+#ifndef vtkHeap_h
+#define vtkHeap_h
 
 #include "vtkCommonMiscModule.h" // For export macro
 #include "vtkObject.h"
diff --git a/Common/Misc/vtkPolygonBuilder.h b/Common/Misc/vtkPolygonBuilder.h
index e7b6cf2d18a4975d46ca311dc5c6b02e9682e0cf..c3d6eb95e85a3464d253fcf5462c2f68940d613a 100644
--- a/Common/Misc/vtkPolygonBuilder.h
+++ b/Common/Misc/vtkPolygonBuilder.h
@@ -23,8 +23,8 @@
 //  currently used to compute polygon for slicing.
 //
 
-#ifndef __vtkPolygonBuilder_h
-#define __vtkPolygonBuilder_h
+#ifndef vtkPolygonBuilder_h
+#define vtkPolygonBuilder_h
 
 #include "vtkCommonMiscModule.h" // For export macro
 #include <vector> //for private data members
diff --git a/Common/System/vtkClientSocket.h b/Common/System/vtkClientSocket.h
index 2594c425bad93105a3535408dd03f02d629b8177..ae71e1e1dd98fdb79dae4577670902bf9bba38fb 100644
--- a/Common/System/vtkClientSocket.h
+++ b/Common/System/vtkClientSocket.h
@@ -14,8 +14,8 @@
 =========================================================================*/
 // .NAME vtkClientSocket - Encapsulates a client socket.
 
-#ifndef __vtkClientSocket_h
-#define __vtkClientSocket_h
+#ifndef vtkClientSocket_h
+#define vtkClientSocket_h
 
 #include "vtkCommonSystemModule.h" // For export macro
 #include "vtkSocket.h"
diff --git a/Common/System/vtkDirectory.h b/Common/System/vtkDirectory.h
index 5ebbca3d40dc8b7c5cdb765753a5c7c3507e84a1..68b53a3ae076aa3a1f5a621da2c3afe32da63b39 100644
--- a/Common/System/vtkDirectory.h
+++ b/Common/System/vtkDirectory.h
@@ -20,8 +20,8 @@
 // .SECTION Caveats
 // vtkDirectory works with windows and unix only.
 
-#ifndef __vtkDirectory_h
-#define __vtkDirectory_h
+#ifndef vtkDirectory_h
+#define vtkDirectory_h
 
 #include "vtkCommonSystemModule.h" // For export macro
 #include "vtkObject.h"
diff --git a/Common/System/vtkServerSocket.h b/Common/System/vtkServerSocket.h
index a32928ca6f2371f7b5eaf57998bbb8b8dec3810b..025c33a675ccebc9438655e7eb3ab247cc8ba626 100644
--- a/Common/System/vtkServerSocket.h
+++ b/Common/System/vtkServerSocket.h
@@ -16,8 +16,8 @@
 // .SECTION Description
 //
 
-#ifndef __vtkServerSocket_h
-#define __vtkServerSocket_h
+#ifndef vtkServerSocket_h
+#define vtkServerSocket_h
 
 #include "vtkCommonSystemModule.h" // For export macro
 #include "vtkSocket.h"
diff --git a/Common/System/vtkSocket.h b/Common/System/vtkSocket.h
index de86f3e8d6a49f24f91eae48e9cec56a9a725dc3..d779ea11df179a52df400d5edf7d8f721cf8eebe 100644
--- a/Common/System/vtkSocket.h
+++ b/Common/System/vtkSocket.h
@@ -17,8 +17,8 @@
 // This abstract class encapsulates a BSD socket. It provides an API for
 // basic socket operations.
 
-#ifndef __vtkSocket_h
-#define __vtkSocket_h
+#ifndef vtkSocket_h
+#define vtkSocket_h
 
 #include "vtkCommonSystemModule.h" // For export macro
 #include "vtkObject.h"
diff --git a/Common/System/vtkSocketCollection.h b/Common/System/vtkSocketCollection.h
index ce6d3476233e180b8c11d2e1bea456f862ac7d5b..9b023353b4c468051f0d2cf7d9d431bfe949d97e 100644
--- a/Common/System/vtkSocketCollection.h
+++ b/Common/System/vtkSocketCollection.h
@@ -18,8 +18,8 @@
 // provides means to wait for activity on all the sockets in the
 // collection simultaneously.
 
-#ifndef __vtkSocketCollection_h
-#define __vtkSocketCollection_h
+#ifndef vtkSocketCollection_h
+#define vtkSocketCollection_h
 
 #include "vtkCommonSystemModule.h" // For export macro
 #include "vtkCollection.h"
diff --git a/Common/System/vtkThreadMessager.h b/Common/System/vtkThreadMessager.h
index 93da65f91c5d6c124ccd459a7b71c6825a3fcfc1..fe4900ab25e444dff016fd793b2a7fae6273a779 100644
--- a/Common/System/vtkThreadMessager.h
+++ b/Common/System/vtkThreadMessager.h
@@ -17,8 +17,8 @@
 // vtkMultithreader is a class that provides support for messaging between
 // threads multithreaded using pthreads or Windows messaging.
 
-#ifndef __vtkThreadMessager_h
-#define __vtkThreadMessager_h
+#ifndef vtkThreadMessager_h
+#define vtkThreadMessager_h
 
 #include "vtkCommonSystemModule.h" // For export macro
 #include "vtkObject.h"
diff --git a/Common/System/vtkTimerLog.h b/Common/System/vtkTimerLog.h
index 1139a9950ce9d6770f159e619e5a496d03774487..ead1082d3847ad07aa63dd811077d1c9a502b660 100644
--- a/Common/System/vtkTimerLog.h
+++ b/Common/System/vtkTimerLog.h
@@ -22,8 +22,8 @@
 // time, and to start/stop a simple timer separate from the timing
 // table logging.
 
-#ifndef __vtkTimerLog_h
-#define __vtkTimerLog_h
+#ifndef vtkTimerLog_h
+#define vtkTimerLog_h
 
 #include "vtkCommonSystemModule.h" // For export macro
 #include "vtkObject.h"
diff --git a/Common/Transforms/vtkAbstractTransform.h b/Common/Transforms/vtkAbstractTransform.h
index 7b9f4cb1e174935dc5e0ad183783007cc59c9449..b9df5b8ba84f5a2d285b2aa5f30035e56bfdc2ce 100644
--- a/Common/Transforms/vtkAbstractTransform.h
+++ b/Common/Transforms/vtkAbstractTransform.h
@@ -33,8 +33,8 @@
 // vtkTransformPolyDataFilter vtkTransformFilter vtkImageReslice
 // vtkImplicitFunction
 
-#ifndef __vtkAbstractTransform_h
-#define __vtkAbstractTransform_h
+#ifndef vtkAbstractTransform_h
+#define vtkAbstractTransform_h
 
 #include "vtkCommonTransformsModule.h" // For export macro
 #include "vtkObject.h"
diff --git a/Common/Transforms/vtkCylindricalTransform.h b/Common/Transforms/vtkCylindricalTransform.h
index 8ef5ad09c500df2a19cde0951a70d8b6dba9f1c3..54bf2bd517eb858c8aa66faa84d3f737789489a3 100644
--- a/Common/Transforms/vtkCylindricalTransform.h
+++ b/Common/Transforms/vtkCylindricalTransform.h
@@ -25,8 +25,8 @@
 // .SECTION see also
 // vtkSphericalTransform vtkGeneralTransform
 
-#ifndef __vtkCylindricalTransform_h
-#define __vtkCylindricalTransform_h
+#ifndef vtkCylindricalTransform_h
+#define vtkCylindricalTransform_h
 
 #include "vtkCommonTransformsModule.h" // For export macro
 #include "vtkWarpTransform.h"
diff --git a/Common/Transforms/vtkGeneralTransform.h b/Common/Transforms/vtkGeneralTransform.h
index 1d6b4cda5795820478b570894f7d459275648cb1..1aa303b85149f3c9c41d9935dd49e7e836205638 100644
--- a/Common/Transforms/vtkGeneralTransform.h
+++ b/Common/Transforms/vtkGeneralTransform.h
@@ -23,8 +23,8 @@
 // .SECTION see also
 // vtkTransform vtkPerspectiveTransform
 
-#ifndef __vtkGeneralTransform_h
-#define __vtkGeneralTransform_h
+#ifndef vtkGeneralTransform_h
+#define vtkGeneralTransform_h
 
 #include "vtkCommonTransformsModule.h" // For export macro
 #include "vtkAbstractTransform.h"
diff --git a/Common/Transforms/vtkHomogeneousTransform.h b/Common/Transforms/vtkHomogeneousTransform.h
index ed4e21bfe87c69c90a90df5d7e6a2caea1586f33..d2f0889f85007f317e3271a834bea196d7aae140 100644
--- a/Common/Transforms/vtkHomogeneousTransform.h
+++ b/Common/Transforms/vtkHomogeneousTransform.h
@@ -21,8 +21,8 @@
 // vtkPerspectiveTransform vtkLinearTransform vtkIdentityTransform
 
 
-#ifndef __vtkHomogeneousTransform_h
-#define __vtkHomogeneousTransform_h
+#ifndef vtkHomogeneousTransform_h
+#define vtkHomogeneousTransform_h
 
 #include "vtkCommonTransformsModule.h" // For export macro
 #include "vtkAbstractTransform.h"
diff --git a/Common/Transforms/vtkIdentityTransform.h b/Common/Transforms/vtkIdentityTransform.h
index 16d2f72d75f65d95f09ba6a56f866a35f9414df6..8110d92c3f53a3327d0b5a1a1ab7c72552fc4dde 100644
--- a/Common/Transforms/vtkIdentityTransform.h
+++ b/Common/Transforms/vtkIdentityTransform.h
@@ -21,8 +21,8 @@
 // vtkLinearTransform
 
 
-#ifndef __vtkIdentityTransform_h
-#define __vtkIdentityTransform_h
+#ifndef vtkIdentityTransform_h
+#define vtkIdentityTransform_h
 
 #include "vtkCommonTransformsModule.h" // For export macro
 #include "vtkLinearTransform.h"
diff --git a/Common/Transforms/vtkLandmarkTransform.h b/Common/Transforms/vtkLandmarkTransform.h
index a083ec1eb7274dd06013b31ca6bffd8719130b40..52145cde527a8dd928db0c77c894ad6e20e6c29d 100644
--- a/Common/Transforms/vtkLandmarkTransform.h
+++ b/Common/Transforms/vtkLandmarkTransform.h
@@ -26,8 +26,8 @@
 // .SECTION see also
 // vtkLinearTransform
 
-#ifndef __vtkLandmarkTransform_h
-#define __vtkLandmarkTransform_h
+#ifndef vtkLandmarkTransform_h
+#define vtkLandmarkTransform_h
 
 #include "vtkCommonTransformsModule.h" // For export macro
 #include "vtkLinearTransform.h"
diff --git a/Common/Transforms/vtkLinearTransform.h b/Common/Transforms/vtkLinearTransform.h
index 69ad8a8ce9d8c699ad183667bb499dbc4a335072..f9996edf23d890df81e4113691110bbf732320ae 100644
--- a/Common/Transforms/vtkLinearTransform.h
+++ b/Common/Transforms/vtkLinearTransform.h
@@ -20,8 +20,8 @@
 // vtkTransform vtkIdentityTransform
 
 
-#ifndef __vtkLinearTransform_h
-#define __vtkLinearTransform_h
+#ifndef vtkLinearTransform_h
+#define vtkLinearTransform_h
 
 #include "vtkCommonTransformsModule.h" // For export macro
 #include "vtkHomogeneousTransform.h"
diff --git a/Common/Transforms/vtkMatrixToHomogeneousTransform.h b/Common/Transforms/vtkMatrixToHomogeneousTransform.h
index 6146266c49087b25c29aada9f717ed0e043196a2..716b6ecdda60937fff2c570ff8e16c34304fb706 100644
--- a/Common/Transforms/vtkMatrixToHomogeneousTransform.h
+++ b/Common/Transforms/vtkMatrixToHomogeneousTransform.h
@@ -23,8 +23,8 @@
 // .SECTION See Also
 // vtkPerspectiveTransform vtkMatrix4x4 vtkMatrixToLinearTransform
 
-#ifndef __vtkMatrixToHomogeneousTransform_h
-#define __vtkMatrixToHomogeneousTransform_h
+#ifndef vtkMatrixToHomogeneousTransform_h
+#define vtkMatrixToHomogeneousTransform_h
 
 #include "vtkCommonTransformsModule.h" // For export macro
 #include "vtkHomogeneousTransform.h"
diff --git a/Common/Transforms/vtkMatrixToLinearTransform.h b/Common/Transforms/vtkMatrixToLinearTransform.h
index 82b16cc98cae1500291bdcc144678abc4eeb42ce..a6df7021b6e6853efb77b17e0ecef74cb28ccd0d 100644
--- a/Common/Transforms/vtkMatrixToLinearTransform.h
+++ b/Common/Transforms/vtkMatrixToLinearTransform.h
@@ -23,8 +23,8 @@
 // .SECTION See Also
 // vtkTransform vtkMatrix4x4 vtkMatrixToHomogeneousTransform
 
-#ifndef __vtkMatrixToLinearTransform_h
-#define __vtkMatrixToLinearTransform_h
+#ifndef vtkMatrixToLinearTransform_h
+#define vtkMatrixToLinearTransform_h
 
 #include "vtkCommonTransformsModule.h" // For export macro
 #include "vtkLinearTransform.h"
diff --git a/Common/Transforms/vtkPerspectiveTransform.h b/Common/Transforms/vtkPerspectiveTransform.h
index 1eb47229db8f3e42bd508fd630df8314da76dd8f..d7a5bf3d6d266552ed3500ae0bcb211080360ec1 100644
--- a/Common/Transforms/vtkPerspectiveTransform.h
+++ b/Common/Transforms/vtkPerspectiveTransform.h
@@ -39,8 +39,8 @@
 // .SECTION See Also
 // vtkGeneralTransform vtkTransform vtkMatrix4x4 vtkCamera
 
-#ifndef __vtkPerspectiveTransform_h
-#define __vtkPerspectiveTransform_h
+#ifndef vtkPerspectiveTransform_h
+#define vtkPerspectiveTransform_h
 
 #include "vtkCommonTransformsModule.h" // For export macro
 #include "vtkHomogeneousTransform.h"
diff --git a/Common/Transforms/vtkSphericalTransform.h b/Common/Transforms/vtkSphericalTransform.h
index 719f17861d4962d2a21cae47aee20e9713450074..d88bdcdb0219fe8f9123574113dcf7dd7aed535e 100644
--- a/Common/Transforms/vtkSphericalTransform.h
+++ b/Common/Transforms/vtkSphericalTransform.h
@@ -26,8 +26,8 @@
 // .SECTION see also
 // vtkCylindricalTransform vtkGeneralTransform
 
-#ifndef __vtkSphericalTransform_h
-#define __vtkSphericalTransform_h
+#ifndef vtkSphericalTransform_h
+#define vtkSphericalTransform_h
 
 #include "vtkCommonTransformsModule.h" // For export macro
 #include "vtkWarpTransform.h"
diff --git a/Common/Transforms/vtkThinPlateSplineTransform.h b/Common/Transforms/vtkThinPlateSplineTransform.h
index 32063077efbef2151e392fb18f2d97d667cda135..20e24d491a9c18f47db4b77762ffd41f13823ff3 100644
--- a/Common/Transforms/vtkThinPlateSplineTransform.h
+++ b/Common/Transforms/vtkThinPlateSplineTransform.h
@@ -34,8 +34,8 @@
 // vtkGridTransform vtkGeneralTransform
 
 
-#ifndef __vtkThinPlateSplineTransform_h
-#define __vtkThinPlateSplineTransform_h
+#ifndef vtkThinPlateSplineTransform_h
+#define vtkThinPlateSplineTransform_h
 
 #include "vtkCommonTransformsModule.h" // For export macro
 #include "vtkWarpTransform.h"
diff --git a/Common/Transforms/vtkTransform.h b/Common/Transforms/vtkTransform.h
index 0478a0c1dd0b935834910c477a20699171738409..e84f66dbca02c9ab7eee0f83612f03cf54b3aeeb 100644
--- a/Common/Transforms/vtkTransform.h
+++ b/Common/Transforms/vtkTransform.h
@@ -40,8 +40,8 @@
 // vtkTransformCollection vtkTransformFilter vtkTransformPolyDataFilter
 // vtkImageReslice
 
-#ifndef __vtkTransform_h
-#define __vtkTransform_h
+#ifndef vtkTransform_h
+#define vtkTransform_h
 
 #include "vtkCommonTransformsModule.h" // For export macro
 #include "vtkLinearTransform.h"
diff --git a/Common/Transforms/vtkTransform2D.h b/Common/Transforms/vtkTransform2D.h
index 8a22ea957ab032f7fb0e7894e8e0b29d0d0720be..c2423e2e9d6ac336aa869eeed93a30d0b6d83a87 100644
--- a/Common/Transforms/vtkTransform2D.h
+++ b/Common/Transforms/vtkTransform2D.h
@@ -25,8 +25,8 @@
 // coordinate system with right handed rotations. Some other graphics
 // libraries use left handed coordinate systems and rotations.
 
-#ifndef __vtkTransform2D_h
-#define __vtkTransform2D_h
+#ifndef vtkTransform2D_h
+#define vtkTransform2D_h
 
 #include "vtkCommonTransformsModule.h" // For export macro
 #include "vtkObject.h"
diff --git a/Common/Transforms/vtkTransformCollection.h b/Common/Transforms/vtkTransformCollection.h
index 69f7e96b683e20047dfee40d7733588868c9133e..c25477f837e5deb29a4107032a8850c7cfdbb00e 100644
--- a/Common/Transforms/vtkTransformCollection.h
+++ b/Common/Transforms/vtkTransformCollection.h
@@ -21,8 +21,8 @@
 // .SECTION see also
 // vtkCollection vtkTransform
 
-#ifndef __vtkTransformCollection_h
-#define __vtkTransformCollection_h
+#ifndef vtkTransformCollection_h
+#define vtkTransformCollection_h
 
 #include "vtkCommonTransformsModule.h" // For export macro
 #include "vtkCollection.h"
diff --git a/Common/Transforms/vtkWarpTransform.h b/Common/Transforms/vtkWarpTransform.h
index 072e0a2e09a980f276af41475c32b2d4c61ef01e..0d05233305df1c139906355ac36eebcc62de5b40 100644
--- a/Common/Transforms/vtkWarpTransform.h
+++ b/Common/Transforms/vtkWarpTransform.h
@@ -20,8 +20,8 @@
 // vtkThinPlateSplineTransform vtkGridTransform vtkGeneralTransform
 
 
-#ifndef __vtkWarpTransform_h
-#define __vtkWarpTransform_h
+#ifndef vtkWarpTransform_h
+#define vtkWarpTransform_h
 
 #include "vtkCommonTransformsModule.h" // For export macro
 #include "vtkAbstractTransform.h"
diff --git a/Deprecated/vtkGraphHierarchicalBundle.h b/Deprecated/vtkGraphHierarchicalBundle.h
index 1b902ccd370983dfdb2db023739df5818261c690..e475b2b556ad9a7c392014fd393a6bba93bdd7ad 100644
--- a/Deprecated/vtkGraphHierarchicalBundle.h
+++ b/Deprecated/vtkGraphHierarchicalBundle.h
@@ -49,8 +49,8 @@
 // Relations in Hierarchical Data. IEEE Transactions on Visualization and
 // Computer Graphics, Vol. 12, No. 5, 2006. pp. 741-748.
 
-#ifndef __vtkGraphHierarchicalBundle_h
-#define __vtkGraphHierarchicalBundle_h
+#ifndef vtkGraphHierarchicalBundle_h
+#define vtkGraphHierarchicalBundle_h
 
 #include "vtkPolyDataAlgorithm.h"
 
diff --git a/Deprecated/vtkStringToTimePoint.h b/Deprecated/vtkStringToTimePoint.h
index 510b0c1bc7d9adb088de93f338a8047a5549062f..4df5bc0e25d3c6afdd544b0a9f481d0df2e707ec 100644
--- a/Deprecated/vtkStringToTimePoint.h
+++ b/Deprecated/vtkStringToTimePoint.h
@@ -31,8 +31,8 @@
 //
 // The output array will be of type vtkTypeUInt64Array.
 
-#ifndef __vtkStringToTimePoint_h
-#define __vtkStringToTimePoint_h
+#ifndef vtkStringToTimePoint_h
+#define vtkStringToTimePoint_h
 
 #include "vtkDataObjectAlgorithm.h"
 
diff --git a/Deprecated/vtkTimePointToString.h b/Deprecated/vtkTimePointToString.h
index 855538d1363f04b1af9b5a289c868ffe60073527..c4d73bb17a1e26faf78bb6b46090dcdd6e05aac6 100644
--- a/Deprecated/vtkTimePointToString.h
+++ b/Deprecated/vtkTimePointToString.h
@@ -32,8 +32,8 @@
 // If the new array name is not specified, the array name will be
 // the old name appended by " [to string]".
 
-#ifndef __vtkTimePointToString_h
-#define __vtkTimePointToString_h
+#ifndef vtkTimePointToString_h
+#define vtkTimePointToString_h
 
 #include "vtkDataObjectAlgorithm.h"
 
diff --git a/Domains/Chemistry/vtkBlueObeliskData.h b/Domains/Chemistry/vtkBlueObeliskData.h
index ec89ff46cf23f3a611455ce535a7d48a484ebac8..e2aecc93245904f6d153bd0d7547081d00f46230 100644
--- a/Domains/Chemistry/vtkBlueObeliskData.h
+++ b/Domains/Chemistry/vtkBlueObeliskData.h
@@ -30,8 +30,8 @@
 // automatically populated on the first instantiation of
 // vtkPeriodicTable.
 
-#ifndef __vtkBlueObeliskData_h
-#define __vtkBlueObeliskData_h
+#ifndef vtkBlueObeliskData_h
+#define vtkBlueObeliskData_h
 
 #include "vtkDomainsChemistryModule.h" // For export macro
 #include "vtkObject.h"
diff --git a/Domains/Chemistry/vtkBlueObeliskDataParser.h b/Domains/Chemistry/vtkBlueObeliskDataParser.h
index 4339c140266e1a5fd9b051b7b47afcfd3c536138..0e11cb05b98b878d07ff9430cdae28530dbe853f 100644
--- a/Domains/Chemistry/vtkBlueObeliskDataParser.h
+++ b/Domains/Chemistry/vtkBlueObeliskDataParser.h
@@ -30,8 +30,8 @@
 // .SECTION See Also
 // vtkPeriodicTable vtkBlueObeliskData
 
-#ifndef __vtkBlueObeliskDataParser_h
-#define __vtkBlueObeliskDataParser_h
+#ifndef vtkBlueObeliskDataParser_h
+#define vtkBlueObeliskDataParser_h
 
 #include "vtkDomainsChemistryModule.h" // For export macro
 #include "vtkXMLParser.h"
diff --git a/Domains/Chemistry/vtkCMLMoleculeReader.h b/Domains/Chemistry/vtkCMLMoleculeReader.h
index f3267402f620981c271f995482ae7a4689a25b5e..7a1233ba90fdaae709c8c90a1cd4e41957ae2806 100644
--- a/Domains/Chemistry/vtkCMLMoleculeReader.h
+++ b/Domains/Chemistry/vtkCMLMoleculeReader.h
@@ -16,8 +16,8 @@
 // vtkMolecule object
 // .SECTION Description
 
-#ifndef __vtkCMLMoleculeReader_h
-#define __vtkCMLMoleculeReader_h
+#ifndef vtkCMLMoleculeReader_h
+#define vtkCMLMoleculeReader_h
 
 #include "vtkDomainsChemistryModule.h" // For export macro
 #include "vtkMoleculeAlgorithm.h"
diff --git a/Domains/Chemistry/vtkMoleculeAlgorithm.h b/Domains/Chemistry/vtkMoleculeAlgorithm.h
index bfd067d480ce931d7d99468c28ca37bc3eac447b..91f1877bff50b006bc7245a0aeeebd61680607a9 100644
--- a/Domains/Chemistry/vtkMoleculeAlgorithm.h
+++ b/Domains/Chemistry/vtkMoleculeAlgorithm.h
@@ -27,8 +27,8 @@
 // then please override this method in your subclass. You should implement
 // the subclass's algorithm into RequestData( request, inputVec, outputVec).
 
-#ifndef __vtkMoleculeAlgorithm_h
-#define __vtkMoleculeAlgorithm_h
+#ifndef vtkMoleculeAlgorithm_h
+#define vtkMoleculeAlgorithm_h
 
 #include "vtkDomainsChemistryModule.h" // For export macro
 #include "vtkAlgorithm.h"
diff --git a/Domains/Chemistry/vtkMoleculeMapper.h b/Domains/Chemistry/vtkMoleculeMapper.h
index 51c141fcfdc1ad7a6013f10abb0a33b838b586d9..835c2d5f5c667d55a2a4429bcceaa6f05dd3457d 100644
--- a/Domains/Chemistry/vtkMoleculeMapper.h
+++ b/Domains/Chemistry/vtkMoleculeMapper.h
@@ -18,8 +18,8 @@
 // vtkMoleculeMapper uses glyphs (display lists) to quickly render a
 // molecule.
 
-#ifndef __vtkMoleculeMapper_h
-#define __vtkMoleculeMapper_h
+#ifndef vtkMoleculeMapper_h
+#define vtkMoleculeMapper_h
 
 #include "vtkDomainsChemistryModule.h" // For export macro
 #include "vtkMapper.h"
diff --git a/Domains/Chemistry/vtkMoleculeToAtomBallFilter.h b/Domains/Chemistry/vtkMoleculeToAtomBallFilter.h
index 1c625c464486beefec11599bcfe08948cffc077c..7f62bd29260ecb008935e0f8943188b03d10532b 100644
--- a/Domains/Chemistry/vtkMoleculeToAtomBallFilter.h
+++ b/Domains/Chemistry/vtkMoleculeToAtomBallFilter.h
@@ -28,8 +28,8 @@
 // .SECTION See Also
 // vtkMoleculeMapper vtkMoleculeToBondStickFilter
 
-#ifndef __vtkMoleculeToAtomBallFilter_h
-#define __vtkMoleculeToAtomBallFilter_h
+#ifndef vtkMoleculeToAtomBallFilter_h
+#define vtkMoleculeToAtomBallFilter_h
 
 #include "vtkDomainsChemistryModule.h" // For export macro
 #include "vtkMoleculeToPolyDataFilter.h"
diff --git a/Domains/Chemistry/vtkMoleculeToBondStickFilter.h b/Domains/Chemistry/vtkMoleculeToBondStickFilter.h
index b240afae2b0052ec9e1246f1501d59761ddf1951..7d8d8ac40aea20df26674a6619b77a071e52f60c 100644
--- a/Domains/Chemistry/vtkMoleculeToBondStickFilter.h
+++ b/Domains/Chemistry/vtkMoleculeToBondStickFilter.h
@@ -15,8 +15,8 @@
 // .NAME vtkMoleculeToBondStickFilter - Generate polydata with cylinders
 // representing bonds
 
-#ifndef __vtkMoleculeToBondStickFilter_h
-#define __vtkMoleculeToBondStickFilter_h
+#ifndef vtkMoleculeToBondStickFilter_h
+#define vtkMoleculeToBondStickFilter_h
 
 #include "vtkDomainsChemistryModule.h" // For export macro
 #include "vtkMoleculeToPolyDataFilter.h"
diff --git a/Domains/Chemistry/vtkMoleculeToPolyDataFilter.h b/Domains/Chemistry/vtkMoleculeToPolyDataFilter.h
index d3701c004b47a39281bdf759d3cf8a5fa3f1f3c8..ea1d4b4b6aecbca004bec77b1f623ead1c33f3a6 100644
--- a/Domains/Chemistry/vtkMoleculeToPolyDataFilter.h
+++ b/Domains/Chemistry/vtkMoleculeToPolyDataFilter.h
@@ -18,8 +18,8 @@
 // subclasses take as input datasets of type vtkMolecule and
 // generate polygonal data on output.
 
-#ifndef __vtkMoleculeToPolyDataFilter_h
-#define __vtkMoleculeToPolyDataFilter_h
+#ifndef vtkMoleculeToPolyDataFilter_h
+#define vtkMoleculeToPolyDataFilter_h
 
 #include "vtkDomainsChemistryModule.h" // For export macro
 #include "vtkPolyDataAlgorithm.h"
diff --git a/Domains/Chemistry/vtkOpenQubeElectronicData.h b/Domains/Chemistry/vtkOpenQubeElectronicData.h
index 833dbbd226574e2f47eec72ef13120ff9f8c0309..238a32cafa6ea07051a10ebee251b1d1949b9c2c 100644
--- a/Domains/Chemistry/vtkOpenQubeElectronicData.h
+++ b/Domains/Chemistry/vtkOpenQubeElectronicData.h
@@ -15,8 +15,8 @@
 // .NAME vtkOpenQubeElectronicData - Provides access to and storage of
 // electronic data calculated by OpenQube.
 
-#ifndef __vtkOpenQubeElectronicData_h
-#define __vtkOpenQubeElectronicData_h
+#ifndef vtkOpenQubeElectronicData_h
+#define vtkOpenQubeElectronicData_h
 
 #include "vtkDomainsChemistryModule.h" // For export macro
 #include "vtkAbstractElectronicData.h"
diff --git a/Domains/Chemistry/vtkOpenQubeMoleculeSource.h b/Domains/Chemistry/vtkOpenQubeMoleculeSource.h
index cf449e981fae9e9af853970e59d296e9ea70fc47..6a931453fc0b114debc3ec7090a2a41be7b5f57b 100644
--- a/Domains/Chemistry/vtkOpenQubeMoleculeSource.h
+++ b/Domains/Chemistry/vtkOpenQubeMoleculeSource.h
@@ -17,8 +17,8 @@
 //
 // .SECTION Description
 
-#ifndef __vtkOpenQubeMoleculeSource_h
-#define __vtkOpenQubeMoleculeSource_h
+#ifndef vtkOpenQubeMoleculeSource_h
+#define vtkOpenQubeMoleculeSource_h
 
 #include "vtkDomainsChemistryModule.h" // For export macro
 #include "vtkDataReader.h"
diff --git a/Domains/Chemistry/vtkPeriodicTable.h b/Domains/Chemistry/vtkPeriodicTable.h
index 91de9bd5e5fce4629c8ffb669b4f0ae210c741a9..95a10203eaaf7e2c8279d53e1a530acdeeb9dcd9 100644
--- a/Domains/Chemistry/vtkPeriodicTable.h
+++ b/Domains/Chemistry/vtkPeriodicTable.h
@@ -20,8 +20,8 @@
 // .SECTION See Also
 // vtkBlueObeliskData vtkBlueObeliskDataParser
 
-#ifndef __vtkPeriodicTable_h
-#define __vtkPeriodicTable_h
+#ifndef vtkPeriodicTable_h
+#define vtkPeriodicTable_h
 
 #include "vtkDomainsChemistryModule.h" // For export macro
 #include "vtkObject.h"
diff --git a/Domains/Chemistry/vtkProgrammableElectronicData.h b/Domains/Chemistry/vtkProgrammableElectronicData.h
index fc8bd894ce579b8266c448fb1c6bb492a5de2b87..60d78a88c243c7d4205d3611be0c908f68c29aaf 100644
--- a/Domains/Chemistry/vtkProgrammableElectronicData.h
+++ b/Domains/Chemistry/vtkProgrammableElectronicData.h
@@ -15,8 +15,8 @@
 // .NAME vtkProgrammableElectronicData - Provides access to and storage of
 // user-generated vtkImageData that describes electrons.
 
-#ifndef __vtkProgrammableElectronicData_h
-#define __vtkProgrammableElectronicData_h
+#ifndef vtkProgrammableElectronicData_h
+#define vtkProgrammableElectronicData_h
 
 #include "vtkDomainsChemistryModule.h" // For export macro
 #include "vtkAbstractElectronicData.h"
diff --git a/Domains/Chemistry/vtkSimpleBondPerceiver.h b/Domains/Chemistry/vtkSimpleBondPerceiver.h
index 4f8a37b71ec8c38886e061edaef8a8688db2fee6..607f5f53503a825c51c8f24faffc6b9feeadb5c0 100644
--- a/Domains/Chemistry/vtkSimpleBondPerceiver.h
+++ b/Domains/Chemistry/vtkSimpleBondPerceiver.h
@@ -28,8 +28,8 @@
 // anything other than atomic separations. It will not produce anything other
 // than single bonds.
 
-#ifndef __vtkSimpleBondPerceiver_h
-#define __vtkSimpleBondPerceiver_h
+#ifndef vtkSimpleBondPerceiver_h
+#define vtkSimpleBondPerceiver_h
 
 #include "vtkDomainsChemistryModule.h" // For export macro
 #include "vtkMoleculeAlgorithm.h"
diff --git a/Domains/ChemistryOpenGL2/vtkOpenGLMoleculeMapper.h b/Domains/ChemistryOpenGL2/vtkOpenGLMoleculeMapper.h
index 5a31944a68024fd732d8d465505e27f95d4f95af..44e506473de331fdb7513c4a59897ae6f079c6eb 100644
--- a/Domains/ChemistryOpenGL2/vtkOpenGLMoleculeMapper.h
+++ b/Domains/ChemistryOpenGL2/vtkOpenGLMoleculeMapper.h
@@ -16,8 +16,8 @@
 // A vtkMoleculeMapper that uses imposters to do the rendering. It uses
 // vtkOpenGLSphereMapper and vtkOpenGLStickMapper to do the rendering.
 
-#ifndef __vtkOpenGLMoleculeMapper_h
-#define __vtkOpenGLMoleculeMapper_h
+#ifndef vtkOpenGLMoleculeMapper_h
+#define vtkOpenGLMoleculeMapper_h
 
 #include "vtkDomainsChemistryOpenGL2Module.h" // For export macro
 #include "vtkMoleculeMapper.h"
diff --git a/Domains/ChemistryOpenGL2/vtkOpenGLSphereMapper.h b/Domains/ChemistryOpenGL2/vtkOpenGLSphereMapper.h
index 5be264eeec16c25403482d3d7256825862734044..c708d1046328fce03c9ac42a6a496e7dae54b8bb 100644
--- a/Domains/ChemistryOpenGL2/vtkOpenGLSphereMapper.h
+++ b/Domains/ChemistryOpenGL2/vtkOpenGLSphereMapper.h
@@ -16,8 +16,8 @@
 // An OpenGL mapper that uses imposters to draw spheres. Supports
 // transparency and picking as well.
 
-#ifndef __vtkOpenGLSphereMapper_h
-#define __vtkOpenGLSphereMapper_h
+#ifndef vtkOpenGLSphereMapper_h
+#define vtkOpenGLSphereMapper_h
 
 #include "vtkDomainsChemistryOpenGL2Module.h" // For export macro
 #include "vtkOpenGLPolyDataMapper.h"
diff --git a/Domains/ChemistryOpenGL2/vtkOpenGLStickMapper.h b/Domains/ChemistryOpenGL2/vtkOpenGLStickMapper.h
index c298d51fb56833596c4cda9dd9c25d0d33b2e113..f17fe34a6e69b7f3a61800672e92f8ed93cbf608 100644
--- a/Domains/ChemistryOpenGL2/vtkOpenGLStickMapper.h
+++ b/Domains/ChemistryOpenGL2/vtkOpenGLStickMapper.h
@@ -16,8 +16,8 @@
 // PolyDataMapper that uses imposters to draw cylinders/sticks
 // for ball/stick style molecular rendering. Supports picking.
 
-#ifndef __vtkOpenGLStickMapper_h
-#define __vtkOpenGLStickMapper_h
+#ifndef vtkOpenGLStickMapper_h
+#define vtkOpenGLStickMapper_h
 
 #include "vtkDomainsChemistryOpenGL2Module.h" // For export macro
 #include "vtkOpenGLPolyDataMapper.h"
diff --git a/Examples/Build/vtkLocal/vtkLocalExample.h b/Examples/Build/vtkLocal/vtkLocalExample.h
index f3c2624c1d0bbfa461b18087836ff415445fbe06..32bf2135e5aa05b8a8ab7e3d6a216156156bc0d6 100644
--- a/Examples/Build/vtkLocal/vtkLocalExample.h
+++ b/Examples/Build/vtkLocal/vtkLocalExample.h
@@ -7,8 +7,8 @@ wishing to create their own VTK classes locally.
 // vtkLocalExample is a simple class that uses VTK.  This class can be
 // copied and modified to produce your own classes.
 
-#ifndef __vtkLocalExample_h
-#define __vtkLocalExample_h
+#ifndef vtkLocalExample_h
+#define vtkLocalExample_h
 
 #include "vtkLocalExampleModule.h" // export macro
 #include "vtkObject.h"
diff --git a/Examples/Build/vtkMy/Common/vtkBar.h b/Examples/Build/vtkMy/Common/vtkBar.h
index 1df295e168a325536ae07df80afd4882eedf4987..43f96cc3f661e89370d3a61d5fd90bf80f5e5503 100644
--- a/Examples/Build/vtkMy/Common/vtkBar.h
+++ b/Examples/Build/vtkMy/Common/vtkBar.h
@@ -16,8 +16,8 @@
 // .SECTION Description
 // None.
 
-#ifndef __vtkBar_h
-#define __vtkBar_h
+#ifndef vtkBar_h
+#define vtkBar_h
 
 #include "vtkObject.h"
 #include "vtkmyCommonWin32Header.h"
diff --git a/Examples/Build/vtkMy/Common/vtkmyCommonWin32Header.h b/Examples/Build/vtkMy/Common/vtkmyCommonWin32Header.h
index 8d5a4f295d55433df1ca38b09e36d2d069542305..3f38827496bc02624bc0c8373ad3bcee08915eef 100644
--- a/Examples/Build/vtkMy/Common/vtkmyCommonWin32Header.h
+++ b/Examples/Build/vtkMy/Common/vtkmyCommonWin32Header.h
@@ -17,8 +17,8 @@
 // The vtkmyCommonWin32Header captures some system differences between Unix
 // and Windows operating systems.
 
-#ifndef __vtkmyCommonWin32Header_h
-#define __vtkmyCommonWin32Header_h
+#ifndef vtkmyCommonWin32Header_h
+#define vtkmyCommonWin32Header_h
 
 #include <vtkmyConfigure.h>
 
diff --git a/Examples/Build/vtkMy/Imaging/vtkImageFoo.h b/Examples/Build/vtkMy/Imaging/vtkImageFoo.h
index ec0ea0ccb9bf9259be6f9856affbce082b8720b2..795e92555913314ad0881ebd0c02f283b219cbaf 100644
--- a/Examples/Build/vtkMy/Imaging/vtkImageFoo.h
+++ b/Examples/Build/vtkMy/Imaging/vtkImageFoo.h
@@ -16,8 +16,8 @@
 // .SECTION Description
 // With vtkImageFoo Pixels are foo'ed.
 
-#ifndef __vtkImageFoo_h
-#define __vtkImageFoo_h
+#ifndef vtkImageFoo_h
+#define vtkImageFoo_h
 
 #include "vtkThreadedImageAlgorithm.h"
 #include "vtkmyImagingWin32Header.h"
diff --git a/Examples/Build/vtkMy/Imaging/vtkmyImagingWin32Header.h b/Examples/Build/vtkMy/Imaging/vtkmyImagingWin32Header.h
index d658dbe711f7324a80e46910a8f624b0f7e498ef..fe807bcf2987905c3433989eff1f1a7429c9b9e4 100644
--- a/Examples/Build/vtkMy/Imaging/vtkmyImagingWin32Header.h
+++ b/Examples/Build/vtkMy/Imaging/vtkmyImagingWin32Header.h
@@ -17,8 +17,8 @@
 // The vtkmyImagingWin32Header captures some system differences between Unix
 // and Windows operating systems.
 
-#ifndef __vtkmyImagingWin32Header_h
-#define __vtkmyImagingWin32Header_h
+#ifndef vtkmyImagingWin32Header_h
+#define vtkmyImagingWin32Header_h
 
 #include <vtkmyConfigure.h>
 
diff --git a/Examples/Build/vtkMy/Unsorted/vtkBar2.h b/Examples/Build/vtkMy/Unsorted/vtkBar2.h
index 90050a5bd5d577548b8d7cba484024128ceff75d..aa656496b2d9cc942fa296ceed74f59f9c2460d5 100644
--- a/Examples/Build/vtkMy/Unsorted/vtkBar2.h
+++ b/Examples/Build/vtkMy/Unsorted/vtkBar2.h
@@ -16,8 +16,8 @@
 // .SECTION Description
 // None.
 
-#ifndef __vtkBar2_h
-#define __vtkBar2_h
+#ifndef vtkBar2_h
+#define vtkBar2_h
 
 #include "vtkObject.h"
 #include "vtkmyUnsortedWin32Header.h"
diff --git a/Examples/Build/vtkMy/Unsorted/vtkmyUnsortedWin32Header.h b/Examples/Build/vtkMy/Unsorted/vtkmyUnsortedWin32Header.h
index b0fc44e3383bea8a09b5a4d92fe2b5c4d0cf52ff..03e81d70f2f58c2c7fa070d27f6fc4535da962ea 100644
--- a/Examples/Build/vtkMy/Unsorted/vtkmyUnsortedWin32Header.h
+++ b/Examples/Build/vtkMy/Unsorted/vtkmyUnsortedWin32Header.h
@@ -17,8 +17,8 @@
 // The vtkmyUnsortedWin32Header captures some system differences between Unix
 // and Windows operating systems.
 
-#ifndef __vtkmyUnsortedWin32Header_h
-#define __vtkmyUnsortedWin32Header_h
+#ifndef vtkmyUnsortedWin32Header_h
+#define vtkmyUnsortedWin32Header_h
 
 #include <vtkmyConfigure.h>
 
diff --git a/Examples/Charts/Cxx/vtkGraphItem.h b/Examples/Charts/Cxx/vtkGraphItem.h
index 848567270efcd5d221a37842c5c188354da966d5..ff36c889b7120daae994caec249d958bf264b50a 100644
--- a/Examples/Charts/Cxx/vtkGraphItem.h
+++ b/Examples/Charts/Cxx/vtkGraphItem.h
@@ -19,8 +19,8 @@
 // This is a vtkContextItem that can be placed into a vtkContextScene. It draws
 // a block of the given dimensions, and reacts to mouse events.
 
-#ifndef __vtkGraphItem_h
-#define __vtkGraphItem_h
+#ifndef vtkGraphItem_h
+#define vtkGraphItem_h
 
 #include "vtkContextItem.h"
 
@@ -92,4 +92,4 @@ private:
 //ETX
 };
 
-#endif //__vtkGraphItem_h
+#endif //vtkGraphItem_h
diff --git a/Examples/ParallelProcessing/SMP/Cxx/vtkAMRDataInternals2.h b/Examples/ParallelProcessing/SMP/Cxx/vtkAMRDataInternals2.h
index aed0d343d81524938790b7cddc7e35a78aa0760e..8b76d7dc5fc945904cefc6948164fb58326860a9 100644
--- a/Examples/ParallelProcessing/SMP/Cxx/vtkAMRDataInternals2.h
+++ b/Examples/ParallelProcessing/SMP/Cxx/vtkAMRDataInternals2.h
@@ -20,8 +20,8 @@
 // .SECTION See Also
 // vtkOverlappingAMR, vtkAMRBox
 
-#ifndef __vtkAMRDataInternals2_h
-#define __vtkAMRDataInternals2_h
+#ifndef vtkAMRDataInternals2_h
+#define vtkAMRDataInternals2_h
 
 #include "vtkObject.h"
 #include "vtkSmartPointer.h" //for storing smart pointers to blocks
diff --git a/Examples/ParallelProcessing/SMP/Cxx/vtkOverlappingAMR2.h b/Examples/ParallelProcessing/SMP/Cxx/vtkOverlappingAMR2.h
index 1008265163882abe61ef5e0bcafd9f40b6b55c17..3186cb37dee3200028a8520a12d2ad391b4737c1 100644
--- a/Examples/ParallelProcessing/SMP/Cxx/vtkOverlappingAMR2.h
+++ b/Examples/ParallelProcessing/SMP/Cxx/vtkOverlappingAMR2.h
@@ -22,8 +22,8 @@
 // .SECTION See Also
 // vtkAMRInformation
 
-#ifndef __vtkOverlappingAMR2_h
-#define __vtkOverlappingAMR2_h
+#ifndef vtkOverlappingAMR2_h
+#define vtkOverlappingAMR2_h
 
 #include "vtkUniformGridAMR2.h"
 
diff --git a/Examples/ParallelProcessing/SMP/Cxx/vtkSMPContourFilterManyPieces.h b/Examples/ParallelProcessing/SMP/Cxx/vtkSMPContourFilterManyPieces.h
index be6ce12ddbc87d01192413b8d4903bf612c6a34b..660a2de14827e80ed8c1d1c0f1133928801e9b90 100644
--- a/Examples/ParallelProcessing/SMP/Cxx/vtkSMPContourFilterManyPieces.h
+++ b/Examples/ParallelProcessing/SMP/Cxx/vtkSMPContourFilterManyPieces.h
@@ -12,8 +12,8 @@
      PURPOSE.  See the above copyright notice for more information.
 
 =========================================================================*/
-#ifndef __vtkSMPContourFilterManyPieces_h
-#define __vtkSMPContourFilterManyPieces_h
+#ifndef vtkSMPContourFilterManyPieces_h
+#define vtkSMPContourFilterManyPieces_h
 
 #include "vtkContourFilter.h"
 
diff --git a/Examples/ParallelProcessing/SMP/Cxx/vtkSMPTools2.h b/Examples/ParallelProcessing/SMP/Cxx/vtkSMPTools2.h
index 885dae330461b600b6b8a8df7050b1438ded8ada..cae662dc890e54171c572ccf33df8dbfeedf87fe 100644
--- a/Examples/ParallelProcessing/SMP/Cxx/vtkSMPTools2.h
+++ b/Examples/ParallelProcessing/SMP/Cxx/vtkSMPTools2.h
@@ -13,8 +13,8 @@
 
 =========================================================================*/
 
-#ifndef __vtkSMPTools2_h__
-#define __vtkSMPTools2_h__
+#ifndef vtkSMPTools2_h__
+#define vtkSMPTools2_h__
 
 #include "vtkCommonCoreModule.h" // For export macro
 #include "vtkObject.h"
diff --git a/Examples/ParallelProcessing/SMP/Cxx/vtkStreamedCompositeDataPipeline.h b/Examples/ParallelProcessing/SMP/Cxx/vtkStreamedCompositeDataPipeline.h
index 73c51c02d38163f6d4afa048d250101547ac7f4e..ddea436ce7bbe90e2824140f02a2dd31638316bf 100644
--- a/Examples/ParallelProcessing/SMP/Cxx/vtkStreamedCompositeDataPipeline.h
+++ b/Examples/ParallelProcessing/SMP/Cxx/vtkStreamedCompositeDataPipeline.h
@@ -1,5 +1,5 @@
-#ifndef __vtkStreamedCompositeDataPipeline_h
-#define __vtkStreamedCompositeDataPipeline_h
+#ifndef vtkStreamedCompositeDataPipeline_h
+#define vtkStreamedCompositeDataPipeline_h
 
 #include "vtkCommonExecutionModelModule.h" // For export macro
 #include "vtkCompositeDataPipeline.h"
diff --git a/Examples/ParallelProcessing/SMP/Cxx/vtkStreamedCompositeSources.h b/Examples/ParallelProcessing/SMP/Cxx/vtkStreamedCompositeSources.h
index 29634b0de059b35cb1d31698163963efdcaab080..d47e628481c4ab72ea918be210bfa2da4ffb9ac9 100644
--- a/Examples/ParallelProcessing/SMP/Cxx/vtkStreamedCompositeSources.h
+++ b/Examples/ParallelProcessing/SMP/Cxx/vtkStreamedCompositeSources.h
@@ -1,5 +1,5 @@
-#ifndef __vtkStreamedCompositeSources_h
-#define __vtkStreamedCompositeSources_h
+#ifndef vtkStreamedCompositeSources_h
+#define vtkStreamedCompositeSources_h
 
 #include "vtkCommonExecutionModelModule.h" // For export macro
 #include "vtkStreamedCompositeDataPipeline.h"
diff --git a/Examples/ParallelProcessing/SMP/Cxx/vtkUniformGridAMR2.h b/Examples/ParallelProcessing/SMP/Cxx/vtkUniformGridAMR2.h
index ca5cc860d58dd42d7234d9e2928924d1de101687..ba3ee4e5bfd13167e534b24f9cf9ae157e02b998 100644
--- a/Examples/ParallelProcessing/SMP/Cxx/vtkUniformGridAMR2.h
+++ b/Examples/ParallelProcessing/SMP/Cxx/vtkUniformGridAMR2.h
@@ -19,8 +19,8 @@
 // vtkUniformGrid.
 
 
-#ifndef __vtkUniformGridAMR2_h
-#define __vtkUniformGridAMR2_h
+#ifndef vtkUniformGridAMR2_h
+#define vtkUniformGridAMR2_h
 
 #include "vtkCompositeDataSet.h"
 
diff --git a/Examples/ParallelProcessing/SMP/Cxx/vtkUniformGridAMRDataIterator2.h b/Examples/ParallelProcessing/SMP/Cxx/vtkUniformGridAMRDataIterator2.h
index dd2d648a3f759e72f8ed8a9033cde271484a07c6..6e7b690d6fe20ad2aa445c0a1f149e3db31011b7 100644
--- a/Examples/ParallelProcessing/SMP/Cxx/vtkUniformGridAMRDataIterator2.h
+++ b/Examples/ParallelProcessing/SMP/Cxx/vtkUniformGridAMRDataIterator2.h
@@ -16,8 +16,8 @@
 // with API to get current level and dataset index.
 // .SECTION Description
 
-#ifndef __vtkUniformGridAMRDataIterator2_h
-#define __vtkUniformGridAMRDataIterator2_h
+#ifndef vtkUniformGridAMRDataIterator2_h
+#define vtkUniformGridAMRDataIterator2_h
 
 #include "vtkCompositeDataIterator.h"
 #include "vtkSmartPointer.h" //for member variable Information
diff --git a/Filters/AMR/vtkAMRResampleFilter.h b/Filters/AMR/vtkAMRResampleFilter.h
index f3de661ea80367ed24dadb501ca172e93a449604..10f47b4910465796683284f519e6a3935cffa2ea 100644
--- a/Filters/AMR/vtkAMRResampleFilter.h
+++ b/Filters/AMR/vtkAMRResampleFilter.h
@@ -28,8 +28,8 @@
 // .SECTION See Also
 //  vtkOverlappingAMR, vtkUniformGrid
 
-#ifndef __vtkAMRResampleFilter_h
-#define __vtkAMRResampleFilter_h
+#ifndef vtkAMRResampleFilter_h
+#define vtkAMRResampleFilter_h
 
 #include "vtkFiltersAMRModule.h" // For export macro
 #include "vtkMultiBlockDataSetAlgorithm.h"
@@ -349,4 +349,4 @@ private:
 
 };
 
-#endif /* __vtkAMRResampleFilter_h */
+#endif /* vtkAMRResampleFilter_h */
diff --git a/Filters/AMR/vtkImageToAMR.h b/Filters/AMR/vtkImageToAMR.h
index 28a68b5976e3d99e0d81c01516e05ea43ee27fab..b762d823ceaeaa30a37eb9e871863b8a36a41d01 100644
--- a/Filters/AMR/vtkImageToAMR.h
+++ b/Filters/AMR/vtkImageToAMR.h
@@ -20,8 +20,8 @@
 // refinement available for the highest level. The lower refinements and the
 // number of blocks is controlled properties specified on the filter.
 
-#ifndef __vtkImageToAMR_h
-#define __vtkImageToAMR_h
+#ifndef vtkImageToAMR_h
+#define vtkImageToAMR_h
 
 #include "vtkOverlappingAMRAlgorithm.h"
 #include "vtkFiltersAMRModule.h" // For export macro
diff --git a/Filters/Core/vtkAppendCompositeDataLeaves.h b/Filters/Core/vtkAppendCompositeDataLeaves.h
index 148a4c2e5e1eb509c023aaa402a216a6d7ebc250..70dae140a544073cf87fe05cc928fd46521f6f14 100644
--- a/Filters/Core/vtkAppendCompositeDataLeaves.h
+++ b/Filters/Core/vtkAppendCompositeDataLeaves.h
@@ -48,8 +48,8 @@
 // .SECTION See Also
 // vtkAppendPolyData vtkAppendFilter
 
-#ifndef __vtkAppendCompositeDataLeaves_h
-#define __vtkAppendCompositeDataLeaves_h
+#ifndef vtkAppendCompositeDataLeaves_h
+#define vtkAppendCompositeDataLeaves_h
 
 #include "vtkFiltersCoreModule.h" // For export macro
 #include "vtkCompositeDataSetAlgorithm.h"
@@ -115,4 +115,4 @@ private:
   void operator = ( const vtkAppendCompositeDataLeaves& ); // Not implemented.
 };
 
-#endif // __vtkAppendCompositeDataLeaves_h
+#endif // vtkAppendCompositeDataLeaves_h
diff --git a/Filters/Core/vtkAppendFilter.h b/Filters/Core/vtkAppendFilter.h
index ea7d92e38d632406854a96db630bb8787d2fbfef..217d792a753405788de7622d41c104f7bda4252c 100644
--- a/Filters/Core/vtkAppendFilter.h
+++ b/Filters/Core/vtkAppendFilter.h
@@ -24,8 +24,8 @@
 // .SECTION See Also
 // vtkAppendPolyData
 
-#ifndef __vtkAppendFilter_h
-#define __vtkAppendFilter_h
+#ifndef vtkAppendFilter_h
+#define vtkAppendFilter_h
 
 #include "vtkFiltersCoreModule.h" // For export macro
 #include "vtkUnstructuredGridAlgorithm.h"
diff --git a/Filters/Core/vtkAppendPolyData.h b/Filters/Core/vtkAppendPolyData.h
index f7e81513fca0950e7bce9520037ff1ef7312d9a1..336f0537fbbdcad14518ae76b2ee0baa96377248 100644
--- a/Filters/Core/vtkAppendPolyData.h
+++ b/Filters/Core/vtkAppendPolyData.h
@@ -25,8 +25,8 @@
 // .SECTION See Also
 // vtkAppendFilter
 
-#ifndef __vtkAppendPolyData_h
-#define __vtkAppendPolyData_h
+#ifndef vtkAppendPolyData_h
+#define vtkAppendPolyData_h
 
 #include "vtkFiltersCoreModule.h" // For export macro
 #include "vtkPolyDataAlgorithm.h"
diff --git a/Filters/Core/vtkAppendSelection.h b/Filters/Core/vtkAppendSelection.h
index bfa78c7ead1530db40d320163647db644fcb35b9..71592cf650b6d2d1d5b883e9c1d04e948d4f1c74 100644
--- a/Filters/Core/vtkAppendSelection.h
+++ b/Filters/Core/vtkAppendSelection.h
@@ -23,8 +23,8 @@
 // a single selection.  All selections must have the same content type unless
 // AppendByUnion is false.
 
-#ifndef __vtkAppendSelection_h
-#define __vtkAppendSelection_h
+#ifndef vtkAppendSelection_h
+#define vtkAppendSelection_h
 
 #include "vtkFiltersCoreModule.h" // For export macro
 #include "vtkSelectionAlgorithm.h"
diff --git a/Filters/Core/vtkArrayCalculator.h b/Filters/Core/vtkArrayCalculator.h
index 53a4eeab21681bcc739aaf52bff7a15521ad4982..8c09aa709f13274d3568e888bba04e953c8c4a29 100644
--- a/Filters/Core/vtkArrayCalculator.h
+++ b/Filters/Core/vtkArrayCalculator.h
@@ -55,8 +55,8 @@
 // .SECTION See Also
 // vtkFunctionParser
 
-#ifndef __vtkArrayCalculator_h
-#define __vtkArrayCalculator_h
+#ifndef vtkArrayCalculator_h
+#define vtkArrayCalculator_h
 
 #include "vtkFiltersCoreModule.h" // For export macro
 #include "vtkDataSetAlgorithm.h"
diff --git a/Filters/Core/vtkAssignAttribute.h b/Filters/Core/vtkAssignAttribute.h
index 0ca527c454484cc51a18011209f1d4169af3107d..a24fa77b2a467285738edb86d8a4541af9eb58f6 100644
--- a/Filters/Core/vtkAssignAttribute.h
+++ b/Filters/Core/vtkAssignAttribute.h
@@ -51,8 +51,8 @@
 // vtkDataSetAttributes vtkDataArray vtkRearrangeFields
 // vtkSplitField vtkMergeFields
 
-#ifndef __vtkAssignAttribute_h
-#define __vtkAssignAttribute_h
+#ifndef vtkAssignAttribute_h
+#define vtkAssignAttribute_h
 
 #include "vtkFiltersCoreModule.h" // For export macro
 #include "vtkPassInputTypeAlgorithm.h"
diff --git a/Filters/Core/vtkAttributeDataToFieldDataFilter.h b/Filters/Core/vtkAttributeDataToFieldDataFilter.h
index 5fe95d197c1110541fdc51676ac866eb7a2e8130..f0f68b355ddab9cecbfaa80e01f39c235a4d5d66 100644
--- a/Filters/Core/vtkAttributeDataToFieldDataFilter.h
+++ b/Filters/Core/vtkAttributeDataToFieldDataFilter.h
@@ -35,8 +35,8 @@
 // .SECTION See Also
 // vtkFieldData vtkDataObject vtkDataSet vtkFieldDataToAttributeDataFilter
 
-#ifndef __vtkAttributeDataToFieldDataFilter_h
-#define __vtkAttributeDataToFieldDataFilter_h
+#ifndef vtkAttributeDataToFieldDataFilter_h
+#define vtkAttributeDataToFieldDataFilter_h
 
 #include "vtkFiltersCoreModule.h" // For export macro
 #include "vtkDataSetAlgorithm.h"
diff --git a/Filters/Core/vtkCellDataToPointData.h b/Filters/Core/vtkCellDataToPointData.h
index 2248b598a0daa6894d104b4d7e99e4e684079da9..bc10617de484ed2462e045f815219e72e3a6ea7f 100644
--- a/Filters/Core/vtkCellDataToPointData.h
+++ b/Filters/Core/vtkCellDataToPointData.h
@@ -30,8 +30,8 @@
 // vtkPointData vtkCellData vtkPointDataToCellData
 
 
-#ifndef __vtkCellDataToPointData_h
-#define __vtkCellDataToPointData_h
+#ifndef vtkCellDataToPointData_h
+#define vtkCellDataToPointData_h
 
 #include "vtkFiltersCoreModule.h" // For export macro
 #include "vtkDataSetAlgorithm.h"
diff --git a/Filters/Core/vtkCenterOfMass.h b/Filters/Core/vtkCenterOfMass.h
index ca6bf0f825263c57bb0447588795da7b4fb5c29a..d8ee2555c7b48c8347f7e4e3b50a9dbb3475d5db 100644
--- a/Filters/Core/vtkCenterOfMass.h
+++ b/Filters/Core/vtkCenterOfMass.h
@@ -22,8 +22,8 @@
 // You must ensure Update() has been called before GetCenter will produce a valid
 // value.
 
-#ifndef __vtkCenterOfMass_h
-#define __vtkCenterOfMass_h
+#ifndef vtkCenterOfMass_h
+#define vtkCenterOfMass_h
 
 #include "vtkFiltersCoreModule.h" // For export macro
 #include "vtkPointSetAlgorithm.h"
diff --git a/Filters/Core/vtkCleanPolyData.h b/Filters/Core/vtkCleanPolyData.h
index 9f05259ee1ad1c4ce6b62084306b23f0d7e10210..3f957bd2c5d71c2e2d749cf81ee01b891afae3e1 100644
--- a/Filters/Core/vtkCleanPolyData.h
+++ b/Filters/Core/vtkCleanPolyData.h
@@ -58,8 +58,8 @@
 // .SECTION See Also
 // vtkQuantizePolyDataPoints
 
-#ifndef __vtkCleanPolyData_h
-#define __vtkCleanPolyData_h
+#ifndef vtkCleanPolyData_h
+#define vtkCleanPolyData_h
 
 #include "vtkFiltersCoreModule.h" // For export macro
 #include "vtkPolyDataAlgorithm.h"
diff --git a/Filters/Core/vtkClipPolyData.h b/Filters/Core/vtkClipPolyData.h
index 86d9bd24bdbc9db30883831b0352fa68a6207c0b..18b6c80f5c453885ec3de36ce3367c58768d678f 100644
--- a/Filters/Core/vtkClipPolyData.h
+++ b/Filters/Core/vtkClipPolyData.h
@@ -53,8 +53,8 @@
 // .SECTION See Also
 // vtkImplicitFunction vtkCutter vtkClipVolume
 
-#ifndef __vtkClipPolyData_h
-#define __vtkClipPolyData_h
+#ifndef vtkClipPolyData_h
+#define vtkClipPolyData_h
 
 #include "vtkFiltersCoreModule.h" // For export macro
 #include "vtkPolyDataAlgorithm.h"
diff --git a/Filters/Core/vtkCompositeCutter.h b/Filters/Core/vtkCompositeCutter.h
index 8184b2b9cc31a454e354c28491a280e8e3a43951..3ebef1cda7641d54517102619c0b08a71aadfdd1 100644
--- a/Filters/Core/vtkCompositeCutter.h
+++ b/Filters/Core/vtkCompositeCutter.h
@@ -18,8 +18,8 @@
 // .SECTION See Also
 // vtkCutter
 
-#ifndef __vtkCompositeCutter_h
-#define __vtkCompositeCutter_h
+#ifndef vtkCompositeCutter_h
+#define vtkCompositeCutter_h
 
 #include "vtkFiltersCoreModule.h" // For export macro
 #include "vtkCutter.h"
diff --git a/Filters/Core/vtkCompositeDataProbeFilter.h b/Filters/Core/vtkCompositeDataProbeFilter.h
index 8ff8ae6b94ae4c348f8da9983015d9ccbc921ff1..ea8e1e5c1a8a82953fd5f11554a75cda1811af20 100644
--- a/Filters/Core/vtkCompositeDataProbeFilter.h
+++ b/Filters/Core/vtkCompositeDataProbeFilter.h
@@ -32,8 +32,8 @@
 // is missing, this filter uses vtkMath::Nan() for double and float arrays,
 // while 0 for all other types of arrays i.e int, char etc.
 
-#ifndef __vtkCompositeDataProbeFilter_h
-#define __vtkCompositeDataProbeFilter_h
+#ifndef vtkCompositeDataProbeFilter_h
+#define vtkCompositeDataProbeFilter_h
 
 #include "vtkFiltersCoreModule.h" // For export macro
 #include "vtkProbeFilter.h"
diff --git a/Filters/Core/vtkConnectivityFilter.h b/Filters/Core/vtkConnectivityFilter.h
index 25bb13c229a9e1d64b7da95c74b1bbcd44857630..3305436e3c5758a6328377fb5c1f00b130ca6bae 100644
--- a/Filters/Core/vtkConnectivityFilter.h
+++ b/Filters/Core/vtkConnectivityFilter.h
@@ -44,8 +44,8 @@
 // .SECTION See Also
 // vtkPolyDataConnectivityFilter
 
-#ifndef __vtkConnectivityFilter_h
-#define __vtkConnectivityFilter_h
+#ifndef vtkConnectivityFilter_h
+#define vtkConnectivityFilter_h
 
 #include "vtkFiltersCoreModule.h" // For export macro
 #include "vtkUnstructuredGridAlgorithm.h"
diff --git a/Filters/Core/vtkContourFilter.h b/Filters/Core/vtkContourFilter.h
index d558dddd32ccedea3acbcb4f1be418d3ba3f7d5f..44e36a82c2a24d979fbc7d07accce00cf095a997 100644
--- a/Filters/Core/vtkContourFilter.h
+++ b/Filters/Core/vtkContourFilter.h
@@ -41,8 +41,8 @@
 // vtkMarchingContourFilter vtkMarchingCubes vtkSliceCubes
 // vtkMarchingSquares vtkImageMarchingCubes
 
-#ifndef __vtkContourFilter_h
-#define __vtkContourFilter_h
+#ifndef vtkContourFilter_h
+#define vtkContourFilter_h
 
 #include "vtkFiltersCoreModule.h" // For export macro
 #include "vtkPolyDataAlgorithm.h"
diff --git a/Filters/Core/vtkContourGrid.h b/Filters/Core/vtkContourGrid.h
index eb6bfa8e9cad371a65601bafce4b349b6ff46526..24bf3e8406fb614d8efa51ffe018b47d46dc0c22 100644
--- a/Filters/Core/vtkContourGrid.h
+++ b/Filters/Core/vtkContourGrid.h
@@ -43,8 +43,8 @@
 // vtkMarchingCubes vtkSliceCubes vtkDividingCubes vtkMarchingSquares
 // vtkImageMarchingCubes
 
-#ifndef __vtkContourGrid_h
-#define __vtkContourGrid_h
+#ifndef vtkContourGrid_h
+#define vtkContourGrid_h
 
 #include "vtkFiltersCoreModule.h" // For export macro
 #include "vtkPolyDataAlgorithm.h"
diff --git a/Filters/Core/vtkContourHelper.h b/Filters/Core/vtkContourHelper.h
index 89c95e35f983ebfa697c7cb4feeea2813ac8941a..f5cc632ca920330026a24a9975fc49715f394906 100644
--- a/Filters/Core/vtkContourHelper.h
+++ b/Filters/Core/vtkContourHelper.h
@@ -19,8 +19,8 @@
 // .SECTION See Also
 // vtkContourGrid vtkCutter vtkContourFilter
 
-#ifndef __vtkContourHelper_h
-#define __vtkContourHelper_h
+#ifndef vtkContourHelper_h
+#define vtkContourHelper_h
 
 #include "vtkFiltersCoreModule.h" // For export macro
 #include "vtkSmartPointer.h" //for a member variable
diff --git a/Filters/Core/vtkCutter.h b/Filters/Core/vtkCutter.h
index 732e1d0f8fde914ed49f8636e1489df206de19f9..50287f681436ecf35b06af0b75b314d8085c0d21 100644
--- a/Filters/Core/vtkCutter.h
+++ b/Filters/Core/vtkCutter.h
@@ -39,8 +39,8 @@
 // .SECTION See Also
 // vtkImplicitFunction vtkClipPolyData
 
-#ifndef __vtkCutter_h
-#define __vtkCutter_h
+#ifndef vtkCutter_h
+#define vtkCutter_h
 
 #include "vtkFiltersCoreModule.h" // For export macro
 #include "vtkPolyDataAlgorithm.h"
diff --git a/Filters/Core/vtkDataObjectGenerator.h b/Filters/Core/vtkDataObjectGenerator.h
index 9a7833d8ed0e754204a40be9c1142f1f2bf91dde..fe9653df23f948e7dd915b52c1d206369f54b263 100644
--- a/Filters/Core/vtkDataObjectGenerator.h
+++ b/Filters/Core/vtkDataObjectGenerator.h
@@ -31,8 +31,8 @@
 // an octree that is three levels deep, in which the firstmost cell in each level
 // is refined.
 
-#ifndef __vtkDataObjectGenerator_h
-#define __vtkDataObjectGenerator_h
+#ifndef vtkDataObjectGenerator_h
+#define vtkDataObjectGenerator_h
 
 #include "vtkFiltersCoreModule.h" // For export macro
 #include "vtkDataObjectAlgorithm.h"
diff --git a/Filters/Core/vtkDataObjectToDataSetFilter.h b/Filters/Core/vtkDataObjectToDataSetFilter.h
index a80c7d4bb3613dd41f3998b846a70f943914e562..6d356fc451fab1ab36fbb6694d0d36fd7e4a9131 100644
--- a/Filters/Core/vtkDataObjectToDataSetFilter.h
+++ b/Filters/Core/vtkDataObjectToDataSetFilter.h
@@ -58,8 +58,8 @@
 // vtkStructuredGrid vtkUnstructuredGrid vtkRectilinearGrid
 // vtkDataSetAttributes vtkDataArray
 
-#ifndef __vtkDataObjectToDataSetFilter_h
-#define __vtkDataObjectToDataSetFilter_h
+#ifndef vtkDataObjectToDataSetFilter_h
+#define vtkDataObjectToDataSetFilter_h
 
 #include "vtkFiltersCoreModule.h" // For export macro
 #include "vtkDataSetAlgorithm.h"
diff --git a/Filters/Core/vtkDataSetEdgeSubdivisionCriterion.h b/Filters/Core/vtkDataSetEdgeSubdivisionCriterion.h
index 5e9e1d8898b5eb6a26cf8ff7f69dbad808e4c5ee..e88c4cd9db9e0e206036baa2340a867c3c99568a 100644
--- a/Filters/Core/vtkDataSetEdgeSubdivisionCriterion.h
+++ b/Filters/Core/vtkDataSetEdgeSubdivisionCriterion.h
@@ -14,8 +14,8 @@
   statement of authorship are reproduced on all copies.
 
 =========================================================================*/
-#ifndef __vtkDataSetEdgeSubdivisionCriterion_h
-#define __vtkDataSetEdgeSubdivisionCriterion_h
+#ifndef vtkDataSetEdgeSubdivisionCriterion_h
+#define vtkDataSetEdgeSubdivisionCriterion_h
 // .NAME vtkDataSetEdgeSubdivisionCriterion - a subclass of vtkEdgeSubdivisionCriterion for vtkDataSet objects.
 //
 // .SECTION Description
@@ -171,4 +171,4 @@ inline const vtkCell* vtkDataSetEdgeSubdivisionCriterion::GetCell() const { retu
 
 //ETX
 
-#endif // __vtkDataSetEdgeSubdivisionCriterion_h
+#endif // vtkDataSetEdgeSubdivisionCriterion_h
diff --git a/Filters/Core/vtkDataSetToDataObjectFilter.h b/Filters/Core/vtkDataSetToDataObjectFilter.h
index 6871ab9ea6727c2d015deb165b6359fea938edd8..e8af00c611be6f5803f99984a1c9345ea2c9bcb6 100644
--- a/Filters/Core/vtkDataSetToDataObjectFilter.h
+++ b/Filters/Core/vtkDataSetToDataObjectFilter.h
@@ -41,8 +41,8 @@
 // .SECTION See Also
 // vtkDataObject vtkFieldData vtkDataObjectToDataSetFilter
 
-#ifndef __vtkDataSetToDataObjectFilter_h
-#define __vtkDataSetToDataObjectFilter_h
+#ifndef vtkDataSetToDataObjectFilter_h
+#define vtkDataSetToDataObjectFilter_h
 
 #include "vtkFiltersCoreModule.h" // For export macro
 #include "vtkDataObjectAlgorithm.h"
diff --git a/Filters/Core/vtkDecimatePolylineFilter.h b/Filters/Core/vtkDecimatePolylineFilter.h
index cf9f66ffa1853d6aadd1ce612eaae4dcad77adee..2344b06e1c758520f37147399f5efbf3ebf7c347 100644
--- a/Filters/Core/vtkDecimatePolylineFilter.h
+++ b/Filters/Core/vtkDecimatePolylineFilter.h
@@ -34,8 +34,8 @@
 // vtkDecimate vtkDecimateProp vtkQuadricClustering vtkQuadricDecimation
 
 
-#ifndef __vtkDecimatePolylineFilter_h
-#define __vtkDecimatePolylineFilter_h
+#ifndef vtkDecimatePolylineFilter_h
+#define vtkDecimatePolylineFilter_h
 
 #include "vtkFiltersCoreModule.h" // For export macro
 #include "vtkSmartPointer.h" // Needed for SP ivars
diff --git a/Filters/Core/vtkDecimatePro.h b/Filters/Core/vtkDecimatePro.h
index d8006dbe7f0570ab06d4d646a9c0fcd231cbf0c4..53c5f74c9bf9e7133184a46da2e64e365aa17711 100644
--- a/Filters/Core/vtkDecimatePro.h
+++ b/Filters/Core/vtkDecimatePro.h
@@ -73,8 +73,8 @@
 // vtkDecimate vtkQuadricClustering vtkQuadricDecimation
 
 
-#ifndef __vtkDecimatePro_h
-#define __vtkDecimatePro_h
+#ifndef vtkDecimatePro_h
+#define vtkDecimatePro_h
 
 #include "vtkFiltersCoreModule.h" // For export macro
 #include "vtkPolyDataAlgorithm.h"
diff --git a/Filters/Core/vtkDelaunay2D.h b/Filters/Core/vtkDelaunay2D.h
index e343d169d7b8be40133d53a0b0d99d0c89cff0ff..3b9f92c008b8e499e887ffec5c9d0c81e5c31b17 100644
--- a/Filters/Core/vtkDelaunay2D.h
+++ b/Filters/Core/vtkDelaunay2D.h
@@ -117,8 +117,8 @@
 // .SECTION See Also
 // vtkDelaunay3D vtkTransformFilter vtkGaussianSplatter
 
-#ifndef __vtkDelaunay2D_h
-#define __vtkDelaunay2D_h
+#ifndef vtkDelaunay2D_h
+#define vtkDelaunay2D_h
 
 #include "vtkFiltersCoreModule.h" // For export macro
 #include "vtkPolyDataAlgorithm.h"
diff --git a/Filters/Core/vtkDelaunay3D.h b/Filters/Core/vtkDelaunay3D.h
index d8f8a35316c99512973196d2c36a1ded9b63eb3d..09fd9c84f55368227134247a26eea8302995c26e 100644
--- a/Filters/Core/vtkDelaunay3D.h
+++ b/Filters/Core/vtkDelaunay3D.h
@@ -85,8 +85,8 @@
 // .SECTION See Also
 // vtkDelaunay2D vtkGaussianSplatter vtkUnstructuredGrid
 
-#ifndef __vtkDelaunay3D_h
-#define __vtkDelaunay3D_h
+#ifndef vtkDelaunay3D_h
+#define vtkDelaunay3D_h
 
 #include "vtkFiltersCoreModule.h" // For export macro
 #include "vtkUnstructuredGridAlgorithm.h"
diff --git a/Filters/Core/vtkEdgeSubdivisionCriterion.h b/Filters/Core/vtkEdgeSubdivisionCriterion.h
index bb77cc446bd35ace15ab20b855e46f8c521450d6..a0d940212aa1a815fe0fe61eda6b44708fa505ce 100644
--- a/Filters/Core/vtkEdgeSubdivisionCriterion.h
+++ b/Filters/Core/vtkEdgeSubdivisionCriterion.h
@@ -14,8 +14,8 @@
   statement of authorship are reproduced on all copies.
 
 =========================================================================*/
-#ifndef __vtkEdgeSubdivisionCriterion_h
-#define __vtkEdgeSubdivisionCriterion_h
+#ifndef vtkEdgeSubdivisionCriterion_h
+#define vtkEdgeSubdivisionCriterion_h
 // .NAME vtkEdgeSubdivisionCriterion - how to decide whether a linear approximation to nonlinear geometry or field should be subdivided
 //
 // .SECTION Description
@@ -175,4 +175,4 @@ inline int vtkEdgeSubdivisionCriterion::GetNumberOfFields() const { return this-
 
 //ETX
 
-#endif // __vtkEdgeSubdivisionCriterion_h
+#endif // vtkEdgeSubdivisionCriterion_h
diff --git a/Filters/Core/vtkElevationFilter.h b/Filters/Core/vtkElevationFilter.h
index 123ea783e7e33181788146ef97d3081a41abbc51..43740a59c6bd82e5503258b7dbfdbe97ddf48b1a 100644
--- a/Filters/Core/vtkElevationFilter.h
+++ b/Filters/Core/vtkElevationFilter.h
@@ -20,8 +20,8 @@
 // a line. The line can be oriented arbitrarily. A typical example is
 // to generate scalars based on elevation or height above a plane.
 
-#ifndef __vtkElevationFilter_h
-#define __vtkElevationFilter_h
+#ifndef vtkElevationFilter_h
+#define vtkElevationFilter_h
 
 #include "vtkFiltersCoreModule.h" // For export macro
 #include "vtkDataSetAlgorithm.h"
diff --git a/Filters/Core/vtkExecutionTimer.h b/Filters/Core/vtkExecutionTimer.h
index 2b3dbd434e17fb9a780d2494fb8532ff82f2d0e0..7b0ca6b5947fa1c91beab5ff989dc1b4c1699d64 100644
--- a/Filters/Core/vtkExecutionTimer.h
+++ b/Filters/Core/vtkExecutionTimer.h
@@ -26,8 +26,8 @@
 // By default we simply store the elapsed time.  You are welcome to
 // subclass and override TimerFinished() to do anything you want.
 
-#ifndef __vtkExecutionTimer_h
-#define __vtkExecutionTimer_h
+#ifndef vtkExecutionTimer_h
+#define vtkExecutionTimer_h
 
 #include "vtkObject.h"
 #include "vtkFiltersCoreModule.h" // For export macro
diff --git a/Filters/Core/vtkFeatureEdges.h b/Filters/Core/vtkFeatureEdges.h
index bb01d7031c2bc946c8168a4088af729a3e7e2712..e4009562fe333e889fbeb24c09dd657950be62c1 100644
--- a/Filters/Core/vtkFeatureEdges.h
+++ b/Filters/Core/vtkFeatureEdges.h
@@ -32,8 +32,8 @@
 // .SECTION See Also
 // vtkExtractEdges
 
-#ifndef __vtkFeatureEdges_h
-#define __vtkFeatureEdges_h
+#ifndef vtkFeatureEdges_h
+#define vtkFeatureEdges_h
 
 #include "vtkFiltersCoreModule.h" // For export macro
 #include "vtkPolyDataAlgorithm.h"
diff --git a/Filters/Core/vtkFieldDataToAttributeDataFilter.h b/Filters/Core/vtkFieldDataToAttributeDataFilter.h
index c8744cf28318a4f40fca55fe968b265bc20cee3a..2f53ca9447d6952d19e37413510d946ae29ace35 100644
--- a/Filters/Core/vtkFieldDataToAttributeDataFilter.h
+++ b/Filters/Core/vtkFieldDataToAttributeDataFilter.h
@@ -49,8 +49,8 @@
 // vtkFieldData vtkDataSet vtkDataObjectToDataSetFilter
 // vtkDataSetAttributes vtkDataArray
 
-#ifndef __vtkFieldDataToAttributeDataFilter_h
-#define __vtkFieldDataToAttributeDataFilter_h
+#ifndef vtkFieldDataToAttributeDataFilter_h
+#define vtkFieldDataToAttributeDataFilter_h
 
 #include "vtkFiltersCoreModule.h" // For export macro
 #include "vtkDataSetAlgorithm.h"
diff --git a/Filters/Core/vtkGlyph2D.h b/Filters/Core/vtkGlyph2D.h
index 1de15441ad38f20f91d096c6a5bea5fa1dcc84de..a3b8ba7f88a8eb2f64a71fe4c181e6f0ed517a65 100644
--- a/Filters/Core/vtkGlyph2D.h
+++ b/Filters/Core/vtkGlyph2D.h
@@ -24,8 +24,8 @@
 // .SECTION See Also
 // vtkTensorGlyph vtkGlyph3D vtkProgrammableGlyphFilter
 
-#ifndef __vtkGlyph2D_h
-#define __vtkGlyph2D_h
+#ifndef vtkGlyph2D_h
+#define vtkGlyph2D_h
 
 #include "vtkFiltersCoreModule.h" // For export macro
 #include "vtkGlyph3D.h"
diff --git a/Filters/Core/vtkGlyph3D.h b/Filters/Core/vtkGlyph3D.h
index b8bd3eac7b688609a0304c0482343422befc12f9..4bd39ed419590eef79572592954d8ad24af6a6f5 100644
--- a/Filters/Core/vtkGlyph3D.h
+++ b/Filters/Core/vtkGlyph3D.h
@@ -69,8 +69,8 @@
 // .SECTION See Also
 // vtkTensorGlyph
 
-#ifndef __vtkGlyph3D_h
-#define __vtkGlyph3D_h
+#ifndef vtkGlyph3D_h
+#define vtkGlyph3D_h
 
 #include "vtkFiltersCoreModule.h" // For export macro
 #include "vtkPolyDataAlgorithm.h"
diff --git a/Filters/Core/vtkGridSynchronizedTemplates3D.h b/Filters/Core/vtkGridSynchronizedTemplates3D.h
index fff45f121ae0e885628e7c1e8fcca68ad24b47c3..133d840a3448a75b6bf3650e04740340f04b7c0c 100644
--- a/Filters/Core/vtkGridSynchronizedTemplates3D.h
+++ b/Filters/Core/vtkGridSynchronizedTemplates3D.h
@@ -24,8 +24,8 @@
 // .SECTION See Also
 // vtkContourFilter vtkSynchronizedTemplates3D
 
-#ifndef __vtkGridSynchronizedTemplates3D_h
-#define __vtkGridSynchronizedTemplates3D_h
+#ifndef vtkGridSynchronizedTemplates3D_h
+#define vtkGridSynchronizedTemplates3D_h
 
 #include "vtkFiltersCoreModule.h" // For export macro
 #include "vtkPolyDataAlgorithm.h"
diff --git a/Filters/Core/vtkHedgeHog.h b/Filters/Core/vtkHedgeHog.h
index eb21f9c983edad57702594ae57672fa0e8b76836..7e82b3f2885a1d2501b85d89ce9f92ab06addd0b 100644
--- a/Filters/Core/vtkHedgeHog.h
+++ b/Filters/Core/vtkHedgeHog.h
@@ -19,8 +19,8 @@
 // factor. If VectorMode is UseNormal, normals determine the orientation
 // of the lines. Lines are colored by scalar data, if available.
 
-#ifndef __vtkHedgeHog_h
-#define __vtkHedgeHog_h
+#ifndef vtkHedgeHog_h
+#define vtkHedgeHog_h
 
 #include "vtkFiltersCoreModule.h" // For export macro
 #include "vtkPolyDataAlgorithm.h"
diff --git a/Filters/Core/vtkHull.h b/Filters/Core/vtkHull.h
index 1ed640b325373b21945dbcee75f33309829142ec..f8bf05a01509300dbcef55ac18c1041870d692a4 100644
--- a/Filters/Core/vtkHull.h
+++ b/Filters/Core/vtkHull.h
@@ -35,8 +35,8 @@
 // polyhedron from the planes (without squeezing the planes towards the
 // input). The method GenerateHull() is used to do this.
 
-#ifndef __vtkHull_h
-#define __vtkHull_h
+#ifndef vtkHull_h
+#define vtkHull_h
 
 #include "vtkFiltersCoreModule.h" // For export macro
 #include "vtkPolyDataAlgorithm.h"
diff --git a/Filters/Core/vtkIdFilter.h b/Filters/Core/vtkIdFilter.h
index 9be9cfab538fd8b3e7b8ca0d152f463debb7110b..96aaa14d19b34fd01cb33376e52f0f376fd049c8 100644
--- a/Filters/Core/vtkIdFilter.h
+++ b/Filters/Core/vtkIdFilter.h
@@ -24,8 +24,8 @@
 // vtkSelectVisiblePoints) to create labels for points and cells, or labels
 // for the point or cell data scalar values.
 
-#ifndef __vtkIdFilter_h
-#define __vtkIdFilter_h
+#ifndef vtkIdFilter_h
+#define vtkIdFilter_h
 
 #include "vtkFiltersCoreModule.h" // For export macro
 #include "vtkDataSetAlgorithm.h"
diff --git a/Filters/Core/vtkImageAppend.h b/Filters/Core/vtkImageAppend.h
index fe48c63bd2bf56b5be4f55a4e732603565b4495f..fe8809da71d2b57f6f31615e9296212c49b503ad 100644
--- a/Filters/Core/vtkImageAppend.h
+++ b/Filters/Core/vtkImageAppend.h
@@ -24,8 +24,8 @@
 // must have the same scalar type.
 
 
-#ifndef __vtkImageAppend_h
-#define __vtkImageAppend_h
+#ifndef vtkImageAppend_h
+#define vtkImageAppend_h
 
 #include "vtkFiltersCoreModule.h" // For export macro
 #include "vtkThreadedImageAlgorithm.h"
diff --git a/Filters/Core/vtkImplicitPolyDataDistance.h b/Filters/Core/vtkImplicitPolyDataDistance.h
index 78b222dc8f7669b41d06aaaaf183941e2e35063d..201c91bac10871872535415ba51d7435f9d017bf 100644
--- a/Filters/Core/vtkImplicitPolyDataDistance.h
+++ b/Filters/Core/vtkImplicitPolyDataDistance.h
@@ -34,8 +34,8 @@
 // http://hdl.handle.net/10380/3262
 // http://www.midasjournal.org/browse/publication/797
 
-#ifndef __vtkImplicitPolyDataDistance_h
-#define __vtkImplicitPolyDataDistance_h
+#ifndef vtkImplicitPolyDataDistance_h
+#define vtkImplicitPolyDataDistance_h
 
 #include "vtkFiltersCoreModule.h" // For export macro
 #include "vtkImplicitFunction.h"
diff --git a/Filters/Core/vtkMarchingCubes.h b/Filters/Core/vtkMarchingCubes.h
index 3c8567af721b7aa0690081dc5b413237b0d1938c..dd6c5888a612d6e04163d6afc90120f800a48518 100644
--- a/Filters/Core/vtkMarchingCubes.h
+++ b/Filters/Core/vtkMarchingCubes.h
@@ -27,8 +27,8 @@
 // .SECTION See Also
 // vtkContourFilter vtkSliceCubes vtkMarchingSquares vtkDividingCubes
 
-#ifndef __vtkMarchingCubes_h
-#define __vtkMarchingCubes_h
+#ifndef vtkMarchingCubes_h
+#define vtkMarchingCubes_h
 
 #include "vtkFiltersCoreModule.h" // For export macro
 #include "vtkPolyDataAlgorithm.h"
diff --git a/Filters/Core/vtkMarchingSquares.h b/Filters/Core/vtkMarchingSquares.h
index 7ed1730dcab317e2acfca841407434129c0dd85f..a9ccabc0d3db5fe32cea1551f18c99184b9840b9 100644
--- a/Filters/Core/vtkMarchingSquares.h
+++ b/Filters/Core/vtkMarchingSquares.h
@@ -33,8 +33,8 @@
 // .SECTION See Also
 // vtkContourFilter vtkMarchingCubes vtkSliceCubes vtkDividingCubes
 
-#ifndef __vtkMarchingSquares_h
-#define __vtkMarchingSquares_h
+#ifndef vtkMarchingSquares_h
+#define vtkMarchingSquares_h
 
 #include "vtkFiltersCoreModule.h" // For export macro
 #include "vtkPolyDataAlgorithm.h"
diff --git a/Filters/Core/vtkMaskFields.h b/Filters/Core/vtkMaskFields.h
index 04f75ad82a86fa47b6e69b9c2e330f9c564ca8ac..6fd52a8dba84c12f3e4eeb68a4ad62a04ef917fa 100644
--- a/Filters/Core/vtkMaskFields.h
+++ b/Filters/Core/vtkMaskFields.h
@@ -24,8 +24,8 @@
 // vtkDataSetAttributes vtkDataArray vtkRearrangeFields
 // vtkSplitField vtkMergeFields vtkAssignAttribute
 
-#ifndef __vtkMaskFields_h
-#define __vtkMaskFields_h
+#ifndef vtkMaskFields_h
+#define vtkMaskFields_h
 
 #include "vtkFiltersCoreModule.h" // For export macro
 #include "vtkDataSetAlgorithm.h"
diff --git a/Filters/Core/vtkMaskPoints.h b/Filters/Core/vtkMaskPoints.h
index f6212a3966e664bad5e7684ce06edde30f25c19c..ba3babb0951c94ce2fc00bb0f60ddb5fccad1d2f 100644
--- a/Filters/Core/vtkMaskPoints.h
+++ b/Filters/Core/vtkMaskPoints.h
@@ -25,8 +25,8 @@
 // primitives) as well as points. This is useful because vertices are
 // rendered while points are not.
 
-#ifndef __vtkMaskPoints_h
-#define __vtkMaskPoints_h
+#ifndef vtkMaskPoints_h
+#define vtkMaskPoints_h
 
 #include "vtkFiltersCoreModule.h" // For export macro
 #include "vtkPolyDataAlgorithm.h"
diff --git a/Filters/Core/vtkMaskPolyData.h b/Filters/Core/vtkMaskPolyData.h
index 2ef6a3e7f8bf8b50d782db7efba213e4ba9dc632..4db5ff3514b6ce273a696e8449cf9f37f0005d5b 100644
--- a/Filters/Core/vtkMaskPolyData.h
+++ b/Filters/Core/vtkMaskPolyData.h
@@ -21,8 +21,8 @@
 // .SECTION See Also
 // vtkMaskPoints
 
-#ifndef __vtkMaskPolyData_h
-#define __vtkMaskPolyData_h
+#ifndef vtkMaskPolyData_h
+#define vtkMaskPolyData_h
 
 #include "vtkFiltersCoreModule.h" // For export macro
 #include "vtkPolyDataAlgorithm.h"
diff --git a/Filters/Core/vtkMassProperties.h b/Filters/Core/vtkMassProperties.h
index cb7f9683837c31c248be97e4ece2164edc05bdde..77fa505f3879d71c4b8d85ba04d2ee5890155a1b 100644
--- a/Filters/Core/vtkMassProperties.h
+++ b/Filters/Core/vtkMassProperties.h
@@ -30,8 +30,8 @@
 // .SECTION See Also
 // vtkTriangleFilter
 
-#ifndef __vtkMassProperties_h
-#define __vtkMassProperties_h
+#ifndef vtkMassProperties_h
+#define vtkMassProperties_h
 
 #include "vtkFiltersCoreModule.h" // For export macro
 #include "vtkPolyDataAlgorithm.h"
diff --git a/Filters/Core/vtkMergeDataObjectFilter.h b/Filters/Core/vtkMergeDataObjectFilter.h
index 16236ae6dc74bda8567abb6f31fb96b547a486c2..48821a928f7c3f37f40293eb22803d9387712863 100644
--- a/Filters/Core/vtkMergeDataObjectFilter.h
+++ b/Filters/Core/vtkMergeDataObjectFilter.h
@@ -35,8 +35,8 @@
 // vtkFieldDataToAttributeData to create a dataset ready for
 // processing in the visualization pipeline.
 
-#ifndef __vtkMergeDataObjectFilter_h
-#define __vtkMergeDataObjectFilter_h
+#ifndef vtkMergeDataObjectFilter_h
+#define vtkMergeDataObjectFilter_h
 
 #include "vtkFiltersCoreModule.h" // For export macro
 #include "vtkDataSetAlgorithm.h"
diff --git a/Filters/Core/vtkMergeFields.h b/Filters/Core/vtkMergeFields.h
index 8f752f3147a25b5d88a8ef3d76c06465d879458f..251fcfa2cf631f242e208c40f5eff55852adb75f 100644
--- a/Filters/Core/vtkMergeFields.h
+++ b/Filters/Core/vtkMergeFields.h
@@ -39,8 +39,8 @@
 // vtkDataSetAttributes vtkDataArray vtkRearrangeFields
 // vtkSplitField vtkAssignAttribute
 
-#ifndef __vtkMergeFields_h
-#define __vtkMergeFields_h
+#ifndef vtkMergeFields_h
+#define vtkMergeFields_h
 
 #include "vtkFiltersCoreModule.h" // For export macro
 #include "vtkDataSetAlgorithm.h"
diff --git a/Filters/Core/vtkMergeFilter.h b/Filters/Core/vtkMergeFilter.h
index e942282da71f9bf915faa7d0840b6b4888d18935..13b6e4ac62a9cace5a5939f793be99777884a9e0 100644
--- a/Filters/Core/vtkMergeFilter.h
+++ b/Filters/Core/vtkMergeFilter.h
@@ -19,8 +19,8 @@
 // this filter is of the same type as the input (i.e., vtkDataSet.) It treats
 // both cell and point data set attributes.
 
-#ifndef __vtkMergeFilter_h
-#define __vtkMergeFilter_h
+#ifndef vtkMergeFilter_h
+#define vtkMergeFilter_h
 
 #include "vtkFiltersCoreModule.h" // For export macro
 #include "vtkDataSetAlgorithm.h"
diff --git a/Filters/Core/vtkPointDataToCellData.h b/Filters/Core/vtkPointDataToCellData.h
index ab396567eebd6eb268a4ae23f617f24d54ac023a..e4371ad710261998190b073e58f730c3ffde75b1 100644
--- a/Filters/Core/vtkPointDataToCellData.h
+++ b/Filters/Core/vtkPointDataToCellData.h
@@ -30,8 +30,8 @@
 // vtkPointData vtkCellData vtkCellDataToPointData
 
 
-#ifndef __vtkPointDataToCellData_h
-#define __vtkPointDataToCellData_h
+#ifndef vtkPointDataToCellData_h
+#define vtkPointDataToCellData_h
 
 #include "vtkFiltersCoreModule.h" // For export macro
 #include "vtkDataSetAlgorithm.h"
diff --git a/Filters/Core/vtkPolyDataConnectivityFilter.h b/Filters/Core/vtkPolyDataConnectivityFilter.h
index 51dcd2ccbf9dfb2eb0d627376416e5b3dac50709..222300e2c69652e7c6f6fec62e786f6ed3e7cfc7 100644
--- a/Filters/Core/vtkPolyDataConnectivityFilter.h
+++ b/Filters/Core/vtkPolyDataConnectivityFilter.h
@@ -44,8 +44,8 @@
 // .SECTION See Also
 // vtkConnectivityFilter
 
-#ifndef __vtkPolyDataConnectivityFilter_h
-#define __vtkPolyDataConnectivityFilter_h
+#ifndef vtkPolyDataConnectivityFilter_h
+#define vtkPolyDataConnectivityFilter_h
 
 #include "vtkFiltersCoreModule.h" // For export macro
 #include "vtkPolyDataAlgorithm.h"
diff --git a/Filters/Core/vtkPolyDataNormals.h b/Filters/Core/vtkPolyDataNormals.h
index 2e06cb1c0be58bc9743a1c5cbc9ba9a2a063d285..fb26364ed1f17786d0606a4d3a7b585715e49883 100644
--- a/Filters/Core/vtkPolyDataNormals.h
+++ b/Filters/Core/vtkPolyDataNormals.h
@@ -44,8 +44,8 @@
 // Triangle strips are broken up into triangle polygons. You may want to
 // restrip the triangles.
 
-#ifndef __vtkPolyDataNormals_h
-#define __vtkPolyDataNormals_h
+#ifndef vtkPolyDataNormals_h
+#define vtkPolyDataNormals_h
 
 #include "vtkFiltersCoreModule.h" // For export macro
 #include "vtkPolyDataAlgorithm.h"
diff --git a/Filters/Core/vtkProbeFilter.h b/Filters/Core/vtkProbeFilter.h
index a388543a5975d9f4e402f90359fbbfbab1dfda85..33be2f0a1a113efdfe34547c5dcb57af7e2f1bf1 100644
--- a/Filters/Core/vtkProbeFilter.h
+++ b/Filters/Core/vtkProbeFilter.h
@@ -32,8 +32,8 @@
 // a line or curve can be used to probe data to produce x-y plots along
 // that line or curve.
 
-#ifndef __vtkProbeFilter_h
-#define __vtkProbeFilter_h
+#ifndef vtkProbeFilter_h
+#define vtkProbeFilter_h
 
 #include "vtkFiltersCoreModule.h" // For export macro
 #include "vtkDataSetAlgorithm.h"
diff --git a/Filters/Core/vtkQuadricClustering.h b/Filters/Core/vtkQuadricClustering.h
index b5c8a6a905a4aeb047868dc211344f7a9ba3cd22..a7614a68f4003fe4c19771020e8bc4617876ab52 100644
--- a/Filters/Core/vtkQuadricClustering.h
+++ b/Filters/Core/vtkQuadricClustering.h
@@ -77,8 +77,8 @@
 // .SECTION See Also
 // vtkQuadricDecimation vtkDecimatePro vtkDecimate vtkQuadricLODActor
 
-#ifndef __vtkQuadricClustering_h
-#define __vtkQuadricClustering_h
+#ifndef vtkQuadricClustering_h
+#define vtkQuadricClustering_h
 
 #include "vtkFiltersCoreModule.h" // For export macro
 #include "vtkPolyDataAlgorithm.h"
diff --git a/Filters/Core/vtkQuadricDecimation.h b/Filters/Core/vtkQuadricDecimation.h
index 7fed9ae1747ddcc1ed8a976a6b00011afd2e2d22..2c562a738f16cfb0a5ffe644554ccc2432c073a0 100644
--- a/Filters/Core/vtkQuadricDecimation.h
+++ b/Filters/Core/vtkQuadricDecimation.h
@@ -50,8 +50,8 @@
 // Thanks to Bradley Lowekamp of the National Library of Medicine/NIH for
 // contributing this class.
 
-#ifndef __vtkQuadricDecimation_h
-#define __vtkQuadricDecimation_h
+#ifndef vtkQuadricDecimation_h
+#define vtkQuadricDecimation_h
 
 #include "vtkFiltersCoreModule.h" // For export macro
 #include "vtkPolyDataAlgorithm.h"
diff --git a/Filters/Core/vtkRearrangeFields.h b/Filters/Core/vtkRearrangeFields.h
index 0448925b58b0e31961014108f322b29b3a6dc0ae..899c657aa1b05b37df14fc95f5fffb606cf771bf 100644
--- a/Filters/Core/vtkRearrangeFields.h
+++ b/Filters/Core/vtkRearrangeFields.h
@@ -52,8 +52,8 @@
 // vtkDataSetAttributes vtkDataArray vtkAssignAttribute
 // vtkSplitField vtkMergeFields
 
-#ifndef __vtkRearrangeFields_h
-#define __vtkRearrangeFields_h
+#ifndef vtkRearrangeFields_h
+#define vtkRearrangeFields_h
 
 #include "vtkFiltersCoreModule.h" // For export macro
 #include "vtkDataSetAlgorithm.h"
diff --git a/Filters/Core/vtkRectilinearSynchronizedTemplates.h b/Filters/Core/vtkRectilinearSynchronizedTemplates.h
index 079a0eef30c3fbf4734945d75b478d896af041ad..f95ba03b136b484e77fc88a8371400902480ebdf 100644
--- a/Filters/Core/vtkRectilinearSynchronizedTemplates.h
+++ b/Filters/Core/vtkRectilinearSynchronizedTemplates.h
@@ -25,8 +25,8 @@
 // .SECTION See Also
 // vtkContourFilter vtkSynchronizedTemplates2D vtkSynchronizedTemplates3D
 
-#ifndef __vtkRectilinearSynchronizedTemplates_h
-#define __vtkRectilinearSynchronizedTemplates_h
+#ifndef vtkRectilinearSynchronizedTemplates_h
+#define vtkRectilinearSynchronizedTemplates_h
 
 #include "vtkFiltersCoreModule.h" // For export macro
 #include "vtkPolyDataAlgorithm.h"
diff --git a/Filters/Core/vtkReverseSense.h b/Filters/Core/vtkReverseSense.h
index a197dec37b384e2cf58dabc9aa860be6cce01152..8ada8394bfc5689ce287b93074fc710b930193f4 100644
--- a/Filters/Core/vtkReverseSense.h
+++ b/Filters/Core/vtkReverseSense.h
@@ -25,8 +25,8 @@
 // .SECTION Caveats
 // Normals can be operated on only if they are present in the data.
 
-#ifndef __vtkReverseSense_h
-#define __vtkReverseSense_h
+#ifndef vtkReverseSense_h
+#define vtkReverseSense_h
 
 #include "vtkFiltersCoreModule.h" // For export macro
 #include "vtkPolyDataAlgorithm.h"
diff --git a/Filters/Core/vtkSimpleElevationFilter.h b/Filters/Core/vtkSimpleElevationFilter.h
index 650b7d8ce8112a5f682b5eaef4293d47638fb079..a59c819b28b2f7ff69f0015feb265fac91e11235 100644
--- a/Filters/Core/vtkSimpleElevationFilter.h
+++ b/Filters/Core/vtkSimpleElevationFilter.h
@@ -21,8 +21,8 @@
 // .SECTION See Also
 // vtkElevationFilter
 
-#ifndef __vtkSimpleElevationFilter_h
-#define __vtkSimpleElevationFilter_h
+#ifndef vtkSimpleElevationFilter_h
+#define vtkSimpleElevationFilter_h
 
 #include "vtkFiltersCoreModule.h" // For export macro
 #include "vtkDataSetAlgorithm.h"
diff --git a/Filters/Core/vtkSmoothPolyDataFilter.h b/Filters/Core/vtkSmoothPolyDataFilter.h
index c757f95f479963f0e354511a237b5c79c16bcc5d..4de604d9498116ae96561a688bc0b90343f532b6 100644
--- a/Filters/Core/vtkSmoothPolyDataFilter.h
+++ b/Filters/Core/vtkSmoothPolyDataFilter.h
@@ -87,8 +87,8 @@
 // .SECTION See Also
 // vtkWindowedSincPolyDataFilter vtkDecimate vtkDecimatePro
 
-#ifndef __vtkSmoothPolyDataFilter_h
-#define __vtkSmoothPolyDataFilter_h
+#ifndef vtkSmoothPolyDataFilter_h
+#define vtkSmoothPolyDataFilter_h
 
 #include "vtkFiltersCoreModule.h" // For export macro
 #include "vtkPolyDataAlgorithm.h"
diff --git a/Filters/Core/vtkStripper.h b/Filters/Core/vtkStripper.h
index a67d549963cbae9e545614af74891cc008ff561d..b6a7f305ee98ad4e47f19a90c61c02a81a8f6a84 100644
--- a/Filters/Core/vtkStripper.h
+++ b/Filters/Core/vtkStripper.h
@@ -51,8 +51,8 @@
 // .SECTION See Also
 // vtkTriangleFilter
 
-#ifndef __vtkStripper_h
-#define __vtkStripper_h
+#ifndef vtkStripper_h
+#define vtkStripper_h
 
 #include "vtkFiltersCoreModule.h" // For export macro
 #include "vtkPolyDataAlgorithm.h"
diff --git a/Filters/Core/vtkStructuredGridAppend.h b/Filters/Core/vtkStructuredGridAppend.h
index b21be6d921e84080c7df9177449c5850625e9285..d6f90472300f2df0619e056de356b26423c0a850 100644
--- a/Filters/Core/vtkStructuredGridAppend.h
+++ b/Filters/Core/vtkStructuredGridAppend.h
@@ -19,8 +19,8 @@
 // All inputs must have the same scalar type.
 
 
-#ifndef __vtkStructuredGridAppend_h
-#define __vtkStructuredGridAppend_h
+#ifndef vtkStructuredGridAppend_h
+#define vtkStructuredGridAppend_h
 
 #include "vtkFiltersCoreModule.h" // For export macro
 #include "vtkStructuredGridAlgorithm.h"
diff --git a/Filters/Core/vtkStructuredGridOutlineFilter.h b/Filters/Core/vtkStructuredGridOutlineFilter.h
index 899d1a755b19ad23d4aa80818337852e1a385e70..74ce537f4890b0c4810d9ce8fca16b6bfb6d2511 100644
--- a/Filters/Core/vtkStructuredGridOutlineFilter.h
+++ b/Filters/Core/vtkStructuredGridOutlineFilter.h
@@ -18,8 +18,8 @@
 // outline of a structured grid (vtkStructuredGrid). Structured data is
 // topologically a cube, so the outline will have 12 "edges".
 
-#ifndef __vtkStructuredGridOutlineFilter_h
-#define __vtkStructuredGridOutlineFilter_h
+#ifndef vtkStructuredGridOutlineFilter_h
+#define vtkStructuredGridOutlineFilter_h
 
 #include "vtkFiltersCoreModule.h" // For export macro
 #include "vtkPolyDataAlgorithm.h"
diff --git a/Filters/Core/vtkSynchronizedTemplates2D.h b/Filters/Core/vtkSynchronizedTemplates2D.h
index 4392a7ce3740efa9614fe70de8faf28f4409f15e..ce82796cb9745ef065bb9437b065a6b8298f042f 100644
--- a/Filters/Core/vtkSynchronizedTemplates2D.h
+++ b/Filters/Core/vtkSynchronizedTemplates2D.h
@@ -24,8 +24,8 @@
 // .SECTION See Also
 // vtkContourFilter vtkSynchronizedTemplates3D
 
-#ifndef __vtkSynchronizedTemplates2D_h
-#define __vtkSynchronizedTemplates2D_h
+#ifndef vtkSynchronizedTemplates2D_h
+#define vtkSynchronizedTemplates2D_h
 
 #include "vtkFiltersCoreModule.h" // For export macro
 #include "vtkPolyDataAlgorithm.h"
diff --git a/Filters/Core/vtkSynchronizedTemplates3D.h b/Filters/Core/vtkSynchronizedTemplates3D.h
index 92ed53220533247f111eaad0f93e3ca439ccec1b..0d17f77cb7745ea6ab992fb8ad6187dc6cd2bd70 100644
--- a/Filters/Core/vtkSynchronizedTemplates3D.h
+++ b/Filters/Core/vtkSynchronizedTemplates3D.h
@@ -25,8 +25,8 @@
 // .SECTION See Also
 // vtkContourFilter vtkSynchronizedTemplates2D
 
-#ifndef __vtkSynchronizedTemplates3D_h
-#define __vtkSynchronizedTemplates3D_h
+#ifndef vtkSynchronizedTemplates3D_h
+#define vtkSynchronizedTemplates3D_h
 
 #include "vtkFiltersCoreModule.h" // For export macro
 #include "vtkPolyDataAlgorithm.h"
diff --git a/Filters/Core/vtkSynchronizedTemplatesCutter3D.h b/Filters/Core/vtkSynchronizedTemplatesCutter3D.h
index ce86a4299075735ff4001e379796f612eddbae35..d8c9a20131905f11fa9aec947e65e974088011b3 100644
--- a/Filters/Core/vtkSynchronizedTemplatesCutter3D.h
+++ b/Filters/Core/vtkSynchronizedTemplatesCutter3D.h
@@ -22,8 +22,8 @@
 // .SECTION See Also
 // vtkContourFilter vtkSynchronizedTemplates3D
 
-#ifndef __vtkSynchronizedTemplatesCutter3D_h
-#define __vtkSynchronizedTemplatesCutter3D_h
+#ifndef vtkSynchronizedTemplatesCutter3D_h
+#define vtkSynchronizedTemplatesCutter3D_h
 
 #include "vtkFiltersCoreModule.h" // For export macro
 #include "vtkSynchronizedTemplates3D.h"
diff --git a/Filters/Core/vtkTensorGlyph.h b/Filters/Core/vtkTensorGlyph.h
index 53f205f92af76f72ac7587d4e9d3f84e62d7ce53..7dde2e09639cd8b67113f5879010f70b2047cfad 100644
--- a/Filters/Core/vtkTensorGlyph.h
+++ b/Filters/Core/vtkTensorGlyph.h
@@ -73,8 +73,8 @@
 // .SECTION See Also
 // vtkGlyph3D vtkPointLoad vtkHyperStreamline
 
-#ifndef __vtkTensorGlyph_h
-#define __vtkTensorGlyph_h
+#ifndef vtkTensorGlyph_h
+#define vtkTensorGlyph_h
 
 #include "vtkFiltersCoreModule.h" // For export macro
 #include "vtkPolyDataAlgorithm.h"
diff --git a/Filters/Core/vtkThreshold.h b/Filters/Core/vtkThreshold.h
index 4cdad59cfd0eb44455b4cb4d811f877ba81f9f21..098dd0e3a045c45cd2abbc6c88b7f83c89afc32b 100644
--- a/Filters/Core/vtkThreshold.h
+++ b/Filters/Core/vtkThreshold.h
@@ -31,8 +31,8 @@
 // .SECTION See Also
 // vtkThresholdPoints vtkThresholdTextureCoords
 
-#ifndef __vtkThreshold_h
-#define __vtkThreshold_h
+#ifndef vtkThreshold_h
+#define vtkThreshold_h
 
 #include "vtkFiltersCoreModule.h" // For export macro
 #include "vtkUnstructuredGridAlgorithm.h"
diff --git a/Filters/Core/vtkThresholdPoints.h b/Filters/Core/vtkThresholdPoints.h
index 2084517833e4ef31dfc5e8263ed94605016bc32d..7d63896a017dd91a3701e0cae7b5fb0defd09cde 100644
--- a/Filters/Core/vtkThresholdPoints.h
+++ b/Filters/Core/vtkThresholdPoints.h
@@ -21,8 +21,8 @@
 // .SECTION See Also
 // vtkThreshold
 
-#ifndef __vtkThresholdPoints_h
-#define __vtkThresholdPoints_h
+#ifndef vtkThresholdPoints_h
+#define vtkThresholdPoints_h
 
 #include "vtkFiltersCoreModule.h" // For export macro
 #include "vtkPolyDataAlgorithm.h"
diff --git a/Filters/Core/vtkTransposeTable.h b/Filters/Core/vtkTransposeTable.h
index bced9633f0cbbfa98f6d5eb4228870c3badd89fa..2a8e3f230df36f1b5a4ca38cf4a3f76621cb3484 100644
--- a/Filters/Core/vtkTransposeTable.h
+++ b/Filters/Core/vtkTransposeTable.h
@@ -24,8 +24,8 @@
 // Note that columns of the output table will have a variant type
 // is the columns of the initial table are not consistant.
 
-#ifndef __vtkTransposeTable_h
-#define __vtkTransposeTable_h
+#ifndef vtkTransposeTable_h
+#define vtkTransposeTable_h
 
 #include "vtkFiltersCoreModule.h" // For export macro
 #include "vtkTableAlgorithm.h"
diff --git a/Filters/Core/vtkTriangleFilter.h b/Filters/Core/vtkTriangleFilter.h
index ddea797d070f12876ee200b9a72bf4fc0d944117..dda5c5d78c419f4a9a82ed7c3f874c2cac70a87b 100644
--- a/Filters/Core/vtkTriangleFilter.h
+++ b/Filters/Core/vtkTriangleFilter.h
@@ -19,8 +19,8 @@
 // is off, and generates individual vertex cells from vtkVertex point lists
 // unless PassVerts is off.
 
-#ifndef __vtkTriangleFilter_h
-#define __vtkTriangleFilter_h
+#ifndef vtkTriangleFilter_h
+#define vtkTriangleFilter_h
 
 #include "vtkFiltersCoreModule.h" // For export macro
 #include "vtkPolyDataAlgorithm.h"
diff --git a/Filters/Core/vtkTubeFilter.h b/Filters/Core/vtkTubeFilter.h
index 4716ab1c5cf403b563b4b6d7568764985923c7d8..2192121f1d9595856328b1614f2a8250eca4db12 100644
--- a/Filters/Core/vtkTubeFilter.h
+++ b/Filters/Core/vtkTubeFilter.h
@@ -47,8 +47,8 @@
 // .SECTION Thanks
 // Michael Finch for absolute scalar radius
 
-#ifndef __vtkTubeFilter_h
-#define __vtkTubeFilter_h
+#ifndef vtkTubeFilter_h
+#define vtkTubeFilter_h
 
 #include "vtkFiltersCoreModule.h" // For export macro
 #include "vtkPolyDataAlgorithm.h"
diff --git a/Filters/Core/vtkVectorDot.h b/Filters/Core/vtkVectorDot.h
index 3f8b3611b451e8f1ac1e9b206966d616a070f614..ff1d5de7865ab862397ca693209ed0c05d88ae15 100644
--- a/Filters/Core/vtkVectorDot.h
+++ b/Filters/Core/vtkVectorDot.h
@@ -20,8 +20,8 @@
 // color map, this can show nodal lines/mode shapes of vibration, or a
 // displacement plot.
 
-#ifndef __vtkVectorDot_h
-#define __vtkVectorDot_h
+#ifndef vtkVectorDot_h
+#define vtkVectorDot_h
 
 #include "vtkFiltersCoreModule.h" // For export macro
 #include "vtkDataSetAlgorithm.h"
diff --git a/Filters/Core/vtkVectorNorm.h b/Filters/Core/vtkVectorNorm.h
index c1499dc728f99705e4d53c2b4ac6b96a36ed54cd..df42a37269a152c52df900346f32e6f9b7661f1b 100644
--- a/Filters/Core/vtkVectorNorm.h
+++ b/Filters/Core/vtkVectorNorm.h
@@ -24,8 +24,8 @@
 // input. Alternatively, you can choose to generate scalar norm values
 // for just cell or point data.
 
-#ifndef __vtkVectorNorm_h
-#define __vtkVectorNorm_h
+#ifndef vtkVectorNorm_h
+#define vtkVectorNorm_h
 
 #define VTK_ATTRIBUTE_MODE_DEFAULT 0
 #define VTK_ATTRIBUTE_MODE_USE_POINT_DATA 1
diff --git a/Filters/Core/vtkWindowedSincPolyDataFilter.h b/Filters/Core/vtkWindowedSincPolyDataFilter.h
index 5b2cfe0277770d7b52d985b5cde6edc184ed675a..c53fcac95feef42d8cdd00f492fa4a764e1e4d0d 100644
--- a/Filters/Core/vtkWindowedSincPolyDataFilter.h
+++ b/Filters/Core/vtkWindowedSincPolyDataFilter.h
@@ -133,8 +133,8 @@
 // vtkSmoothPolyDataFilter vtkDecimate vtkDecimatePro
 
 
-#ifndef __vtkWindowedSincPolyDataFilter_h
-#define __vtkWindowedSincPolyDataFilter_h
+#ifndef vtkWindowedSincPolyDataFilter_h
+#define vtkWindowedSincPolyDataFilter_h
 
 
 #include "vtkFiltersCoreModule.h" // For export macro
diff --git a/Filters/Extraction/vtkConvertSelection.h b/Filters/Extraction/vtkConvertSelection.h
index eb9f4db72293b095e7b2a0c49aa6ab6960384cee..1a683b417f7ca16eea73fd75b4f90d00a9aa6a81 100644
--- a/Filters/Extraction/vtkConvertSelection.h
+++ b/Filters/Extraction/vtkConvertSelection.h
@@ -27,8 +27,8 @@
 // .SECTION See Also
 // vtkSelection vtkSelectionNode vtkExtractSelection vtkExtractSelectedGraph
 
-#ifndef __vtkConvertSelection_h
-#define __vtkConvertSelection_h
+#ifndef vtkConvertSelection_h
+#define vtkConvertSelection_h
 
 #include "vtkFiltersExtractionModule.h" // For export macro
 #include "vtkSelectionAlgorithm.h"
diff --git a/Filters/Extraction/vtkExtractArraysOverTime.h b/Filters/Extraction/vtkExtractArraysOverTime.h
index 57371803c5cb2ec153dc8faad07c74bf39650bda..6ed28a8c8e601a53281220caddcd12be0b8aaace 100644
--- a/Filters/Extraction/vtkExtractArraysOverTime.h
+++ b/Filters/Extraction/vtkExtractArraysOverTime.h
@@ -30,8 +30,8 @@
 // This algorithm works only with source that produce TIME_STEPS().
 // Continuous time range is not yet supported.
 
-#ifndef __vtkExtractArraysOverTime_h
-#define __vtkExtractArraysOverTime_h
+#ifndef vtkExtractArraysOverTime_h
+#define vtkExtractArraysOverTime_h
 
 #include "vtkFiltersExtractionModule.h" // For export macro
 #include "vtkMultiBlockDataSetAlgorithm.h"
diff --git a/Filters/Extraction/vtkExtractBlock.h b/Filters/Extraction/vtkExtractBlock.h
index d8979eb8fe8e93de44e662abb9b134e9a4072b33..de472219cb94eebed06aaca07898e0b2588bf319 100644
--- a/Filters/Extraction/vtkExtractBlock.h
+++ b/Filters/Extraction/vtkExtractBlock.h
@@ -21,8 +21,8 @@
 // Inorder traversal yields: A, B, D, E, C, F, G
 // Index of A is 0, while index of C is 4.
 
-#ifndef __vtkExtractBlock_h
-#define __vtkExtractBlock_h
+#ifndef vtkExtractBlock_h
+#define vtkExtractBlock_h
 
 #include "vtkFiltersExtractionModule.h" // For export macro
 #include "vtkMultiBlockDataSetAlgorithm.h"
diff --git a/Filters/Extraction/vtkExtractCells.h b/Filters/Extraction/vtkExtractCells.h
index 0fb2f5d2efb9450a6830abbc251506f1b5eb912e..8290250f0419269676a8c46d7cd6137595dca58f 100644
--- a/Filters/Extraction/vtkExtractCells.h
+++ b/Filters/Extraction/vtkExtractCells.h
@@ -25,8 +25,8 @@
 //    executes, it will set up the ugrid, point and cell arrays, with no points,
 //    cells or data.
 
-#ifndef __vtkExtractCells_h
-#define __vtkExtractCells_h
+#ifndef vtkExtractCells_h
+#define vtkExtractCells_h
 
 #include "vtkFiltersExtractionModule.h" // For export macro
 #include "vtkUnstructuredGridAlgorithm.h"
diff --git a/Filters/Extraction/vtkExtractDataOverTime.h b/Filters/Extraction/vtkExtractDataOverTime.h
index 40c98c0160ac5c3ace6449c68f28960b1d86a7bd..d3304348f43b6c09fa900195bee02387bb0370ce 100644
--- a/Filters/Extraction/vtkExtractDataOverTime.h
+++ b/Filters/Extraction/vtkExtractDataOverTime.h
@@ -22,8 +22,8 @@
 // the output.  A PointData array is added called "Time" (or "TimeData" if
 // there is already an array called "Time"), which is the time at each index.
 
-#ifndef __vtkExtractDataOverTime_h
-#define __vtkExtractDataOverTime_h
+#ifndef vtkExtractDataOverTime_h
+#define vtkExtractDataOverTime_h
 
 #include "vtkFiltersExtractionModule.h" // For export macro
 #include "vtkPointSetAlgorithm.h"
diff --git a/Filters/Extraction/vtkExtractDataSets.h b/Filters/Extraction/vtkExtractDataSets.h
index 963862d0983683d2d911278dd2ca64846ed05d83..ad3f2d3a2fcbd8321f536855755e018ed37fa778 100644
--- a/Filters/Extraction/vtkExtractDataSets.h
+++ b/Filters/Extraction/vtkExtractDataSets.h
@@ -23,8 +23,8 @@
 // .SECTION See Also
 // vtkHierarchicalBoxDataSet, vtkMultiBlockDataSet vtkMultiPieceDataSet
 
-#ifndef __vtkExtractDataSets_h
-#define __vtkExtractDataSets_h
+#ifndef vtkExtractDataSets_h
+#define vtkExtractDataSets_h
 
 #include "vtkFiltersExtractionModule.h" // For export macro
 #include "vtkMultiBlockDataSetAlgorithm.h"
diff --git a/Filters/Extraction/vtkExtractEdges.h b/Filters/Extraction/vtkExtractEdges.h
index 2aadc56b628d877ae247d841f431f75dbaeb76a1..e01149c7f2361d6fe545228d7b064b5371a665b9 100644
--- a/Filters/Extraction/vtkExtractEdges.h
+++ b/Filters/Extraction/vtkExtractEdges.h
@@ -20,8 +20,8 @@
 // .SECTION See Also
 // vtkFeatureEdges
 
-#ifndef __vtkExtractEdges_h
-#define __vtkExtractEdges_h
+#ifndef vtkExtractEdges_h
+#define vtkExtractEdges_h
 
 #include "vtkFiltersExtractionModule.h" // For export macro
 #include "vtkPolyDataAlgorithm.h"
diff --git a/Filters/Extraction/vtkExtractGeometry.h b/Filters/Extraction/vtkExtractGeometry.h
index 71ed31d4426f867e14c760ba44c6eab686ed3a4c..c8c4351a350d23e96000037ac7c7e92e57e82a39 100644
--- a/Filters/Extraction/vtkExtractGeometry.h
+++ b/Filters/Extraction/vtkExtractGeometry.h
@@ -32,8 +32,8 @@
 // .SECTION See Also
 // vtkExtractPolyDataGeometry vtkGeometryFilter vtkExtractVOI
 
-#ifndef __vtkExtractGeometry_h
-#define __vtkExtractGeometry_h
+#ifndef vtkExtractGeometry_h
+#define vtkExtractGeometry_h
 
 #include "vtkFiltersExtractionModule.h" // For export macro
 #include "vtkUnstructuredGridAlgorithm.h"
diff --git a/Filters/Extraction/vtkExtractGrid.h b/Filters/Extraction/vtkExtractGrid.h
index 2d7f8db674d8df2a2a6a69cb6edf12251dccef2b..3db6013b24a66c782d380b1e1244ed17a0845521 100644
--- a/Filters/Extraction/vtkExtractGrid.h
+++ b/Filters/Extraction/vtkExtractGrid.h
@@ -34,8 +34,8 @@
 // vtkGeometryFilter vtkExtractGeometry vtkExtractVOI
 // vtkStructuredGridGeometryFilter
 
-#ifndef __vtkExtractGrid_h
-#define __vtkExtractGrid_h
+#ifndef vtkExtractGrid_h
+#define vtkExtractGrid_h
 
 #include "vtkFiltersExtractionModule.h" // For export macro
 #include "vtkStructuredGridAlgorithm.h"
diff --git a/Filters/Extraction/vtkExtractLevel.h b/Filters/Extraction/vtkExtractLevel.h
index 8c4b23123ac6a5d2fc728aef4e4ec977e1473591..788a6cb9150553d9fd1b87f7e473646b216c8640 100644
--- a/Filters/Extraction/vtkExtractLevel.h
+++ b/Filters/Extraction/vtkExtractLevel.h
@@ -18,8 +18,8 @@
 // vtkExtractLevel filter extracts the levels between (and including) the user
 // specified min and max levels.
 
-#ifndef __vtkExtractLevel_h
-#define __vtkExtractLevel_h
+#ifndef vtkExtractLevel_h
+#define vtkExtractLevel_h
 
 #include "vtkFiltersExtractionModule.h" // For export macro
 #include "vtkMultiBlockDataSetAlgorithm.h"
diff --git a/Filters/Extraction/vtkExtractPolyDataGeometry.h b/Filters/Extraction/vtkExtractPolyDataGeometry.h
index 18f6bd85f5ea2eda7241064260c52f3e332188de..c6bdaff57bf154c0a83a4449fdaf13e9c198dc3b 100644
--- a/Filters/Extraction/vtkExtractPolyDataGeometry.h
+++ b/Filters/Extraction/vtkExtractPolyDataGeometry.h
@@ -37,8 +37,8 @@
 // .SECTION See Also
 // vtkExtractGeometry vtkClipPolyData
 
-#ifndef __vtkExtractPolyDataGeometry_h
-#define __vtkExtractPolyDataGeometry_h
+#ifndef vtkExtractPolyDataGeometry_h
+#define vtkExtractPolyDataGeometry_h
 
 #include "vtkFiltersExtractionModule.h" // For export macro
 #include "vtkPolyDataAlgorithm.h"
diff --git a/Filters/Extraction/vtkExtractRectilinearGrid.h b/Filters/Extraction/vtkExtractRectilinearGrid.h
index 9f7eb9b789da54679593f6e6d20d87e54dd65d6b..944fc100698a56c98f10d5907db6b270c8025521 100644
--- a/Filters/Extraction/vtkExtractRectilinearGrid.h
+++ b/Filters/Extraction/vtkExtractRectilinearGrid.h
@@ -23,8 +23,8 @@
 // vtkExtractGrid vtkImageClip vtkGeometryFilter vtkExtractGeometry vtkExtractVOI
 // vtkStructuredGridGeometryFilter
 
-#ifndef __vtkExtractRectilinearGrid_h
-#define __vtkExtractRectilinearGrid_h
+#ifndef vtkExtractRectilinearGrid_h
+#define vtkExtractRectilinearGrid_h
 
 #include "vtkFiltersExtractionModule.h" // For export macro
 #include "vtkRectilinearGridAlgorithm.h"
diff --git a/Filters/Extraction/vtkExtractSelectedBlock.h b/Filters/Extraction/vtkExtractSelectedBlock.h
index f509db047c31f9e9d39ba776e1af2260c23d6125..9a282add8473b29a81c9581d75a83e9abd18a8c6 100644
--- a/Filters/Extraction/vtkExtractSelectedBlock.h
+++ b/Filters/Extraction/vtkExtractSelectedBlock.h
@@ -15,8 +15,8 @@
 // .NAME vtkExtractSelectedBlock
 // .SECTION Description
 
-#ifndef __vtkExtractSelectedBlock_h
-#define __vtkExtractSelectedBlock_h
+#ifndef vtkExtractSelectedBlock_h
+#define vtkExtractSelectedBlock_h
 
 #include "vtkFiltersExtractionModule.h" // For export macro
 #include "vtkExtractSelectionBase.h"
diff --git a/Filters/Extraction/vtkExtractSelectedFrustum.h b/Filters/Extraction/vtkExtractSelectedFrustum.h
index 9c0413e7e23b532e0fc5a48c2780a30d2483922d..a5a216303ca8858d4ff7bca0489fd0f445583e24 100644
--- a/Filters/Extraction/vtkExtractSelectedFrustum.h
+++ b/Filters/Extraction/vtkExtractSelectedFrustum.h
@@ -30,8 +30,8 @@
 // .SECTION See Also
 // vtkExtractGeometry, vtkAreaPicker, vtkExtractSelection, vtkSelection
 
-#ifndef __vtkExtractSelectedFrustum_h
-#define __vtkExtractSelectedFrustum_h
+#ifndef vtkExtractSelectedFrustum_h
+#define vtkExtractSelectedFrustum_h
 
 #include "vtkFiltersExtractionModule.h" // For export macro
 #include "vtkExtractSelectionBase.h"
diff --git a/Filters/Extraction/vtkExtractSelectedIds.h b/Filters/Extraction/vtkExtractSelectedIds.h
index fb7bda7a47eb017ec72be24ce54eddd9167d4eeb..0c475eedc3cd74f96e50eb0435fa6bc208b9bb7f 100644
--- a/Filters/Extraction/vtkExtractSelectedIds.h
+++ b/Filters/Extraction/vtkExtractSelectedIds.h
@@ -25,8 +25,8 @@
 // .SECTION See Also
 // vtkSelection vtkExtractSelection
 
-#ifndef __vtkExtractSelectedIds_h
-#define __vtkExtractSelectedIds_h
+#ifndef vtkExtractSelectedIds_h
+#define vtkExtractSelectedIds_h
 
 #include "vtkFiltersExtractionModule.h" // For export macro
 #include "vtkExtractSelectionBase.h"
diff --git a/Filters/Extraction/vtkExtractSelectedLocations.h b/Filters/Extraction/vtkExtractSelectedLocations.h
index d770be2041d124fa3edc2b658d0948daf5e1aeab..3b03ace466b3910f39e2f317d825e5feff7e524e 100644
--- a/Filters/Extraction/vtkExtractSelectedLocations.h
+++ b/Filters/Extraction/vtkExtractSelectedLocations.h
@@ -23,8 +23,8 @@
 // .SECTION See Also
 // vtkSelection vtkExtractSelection
 
-#ifndef __vtkExtractSelectedLocations_h
-#define __vtkExtractSelectedLocations_h
+#ifndef vtkExtractSelectedLocations_h
+#define vtkExtractSelectedLocations_h
 
 #include "vtkFiltersExtractionModule.h" // For export macro
 #include "vtkExtractSelectionBase.h"
diff --git a/Filters/Extraction/vtkExtractSelectedPolyDataIds.h b/Filters/Extraction/vtkExtractSelectedPolyDataIds.h
index aaeb9d69b682f2a28ac4a730d18e98913ab14ff2..960b7d55f4d4735bb2788e1c3c51312ad58b877f 100644
--- a/Filters/Extraction/vtkExtractSelectedPolyDataIds.h
+++ b/Filters/Extraction/vtkExtractSelectedPolyDataIds.h
@@ -19,8 +19,8 @@
 // .SECTION See Also
 // vtkSelection
 
-#ifndef __vtkExtractSelectedPolyDataIds_h
-#define __vtkExtractSelectedPolyDataIds_h
+#ifndef vtkExtractSelectedPolyDataIds_h
+#define vtkExtractSelectedPolyDataIds_h
 
 #include "vtkFiltersExtractionModule.h" // For export macro
 #include "vtkPolyDataAlgorithm.h"
diff --git a/Filters/Extraction/vtkExtractSelectedRows.h b/Filters/Extraction/vtkExtractSelectedRows.h
index 3631fbd8857df057d043516aee5d3ad48d2426b2..2b31602e0a9c56199f82a376fb47b3785b207def 100644
--- a/Filters/Extraction/vtkExtractSelectedRows.h
+++ b/Filters/Extraction/vtkExtractSelectedRows.h
@@ -26,8 +26,8 @@
 // The field type of the input selection is ignored when converted to row
 // indices.
 
-#ifndef __vtkExtractSelectedRows_h
-#define __vtkExtractSelectedRows_h
+#ifndef vtkExtractSelectedRows_h
+#define vtkExtractSelectedRows_h
 
 #include "vtkFiltersExtractionModule.h" // For export macro
 #include "vtkTableAlgorithm.h"
diff --git a/Filters/Extraction/vtkExtractSelectedThresholds.h b/Filters/Extraction/vtkExtractSelectedThresholds.h
index 69740ff2a7a55f86442204445091e99de7c3331c..f50f5814e8a72584159306a26274f0f03c9eb911 100644
--- a/Filters/Extraction/vtkExtractSelectedThresholds.h
+++ b/Filters/Extraction/vtkExtractSelectedThresholds.h
@@ -28,8 +28,8 @@
 // .SECTION See Also
 // vtkSelection vtkExtractSelection vtkThreshold
 
-#ifndef __vtkExtractSelectedThresholds_h
-#define __vtkExtractSelectedThresholds_h
+#ifndef vtkExtractSelectedThresholds_h
+#define vtkExtractSelectedThresholds_h
 
 #include "vtkFiltersExtractionModule.h" // For export macro
 #include "vtkExtractSelectionBase.h"
diff --git a/Filters/Extraction/vtkExtractSelection.h b/Filters/Extraction/vtkExtractSelection.h
index c311bce7d1c9aced58211fd200ff7c4bb91ddb64..a6bcc78bb6e55ed8189ea450e126dd7b74ea3101 100644
--- a/Filters/Extraction/vtkExtractSelection.h
+++ b/Filters/Extraction/vtkExtractSelection.h
@@ -25,8 +25,8 @@
 // vtkSelection vtkExtractSelectedIds vtkExtractSelectedFrustum
 // vtkExtractSelectedLocations vtkExtractSelectedThresholds
 
-#ifndef __vtkExtractSelection_h
-#define __vtkExtractSelection_h
+#ifndef vtkExtractSelection_h
+#define vtkExtractSelection_h
 
 #include "vtkFiltersExtractionModule.h" // For export macro
 #include "vtkExtractSelectionBase.h"
diff --git a/Filters/Extraction/vtkExtractSelectionBase.h b/Filters/Extraction/vtkExtractSelectionBase.h
index 3c3e20b0d341daf19a52f8adb5dacb2597a97fc1..ec26cbb6aa696ab78da5a2ed6cfa701cfe53fc37 100644
--- a/Filters/Extraction/vtkExtractSelectionBase.h
+++ b/Filters/Extraction/vtkExtractSelectionBase.h
@@ -18,8 +18,8 @@
 // vtkExtractSelectionBase is an abstract base class for all extract selection
 // filters. It defines some properties common to all extract selection filters.
 
-#ifndef __vtkExtractSelectionBase_h
-#define __vtkExtractSelectionBase_h
+#ifndef vtkExtractSelectionBase_h
+#define vtkExtractSelectionBase_h
 
 #include "vtkFiltersExtractionModule.h" // For export macro
 #include "vtkDataObjectAlgorithm.h"
diff --git a/Filters/Extraction/vtkExtractTemporalFieldData.h b/Filters/Extraction/vtkExtractTemporalFieldData.h
index c81fb9c7680a2312acc91cc3edb41a66cfbe812a..297933c6259df85341470d2dc37c178d438aa499 100644
--- a/Filters/Extraction/vtkExtractTemporalFieldData.h
+++ b/Filters/Extraction/vtkExtractTemporalFieldData.h
@@ -26,8 +26,8 @@
 // This algorithm works only with source that produce TIME_STEPS().
 // Continuous time range is not yet supported.
 
-#ifndef __vtkExtractTemporalFieldData_h
-#define __vtkExtractTemporalFieldData_h
+#ifndef vtkExtractTemporalFieldData_h
+#define vtkExtractTemporalFieldData_h
 
 #include "vtkFiltersExtractionModule.h" // For export macro
 #include "vtkTableAlgorithm.h"
diff --git a/Filters/Extraction/vtkExtractTensorComponents.h b/Filters/Extraction/vtkExtractTensorComponents.h
index 6b362d0e4dab4efef2ce0848d548a2d612af840e..8bce319ddb0ac1fb806fbaa7375ae4214da88821 100644
--- a/Filters/Extraction/vtkExtractTensorComponents.h
+++ b/Filters/Extraction/vtkExtractTensorComponents.h
@@ -37,8 +37,8 @@
 // ExtractScalars is on, and the appropriate scalar extraction mode is
 // set.
 
-#ifndef __vtkExtractTensorComponents_h
-#define __vtkExtractTensorComponents_h
+#ifndef vtkExtractTensorComponents_h
+#define vtkExtractTensorComponents_h
 
 #include "vtkFiltersExtractionModule.h" // For export macro
 #include "vtkDataSetAlgorithm.h"
diff --git a/Filters/Extraction/vtkExtractUnstructuredGrid.h b/Filters/Extraction/vtkExtractUnstructuredGrid.h
index 6c8a1b49b1d3ecbf069ee4d30d6f8dc0e9b75635..1aa919b4a29ad807cdd9697b78d03e73be2de67a 100644
--- a/Filters/Extraction/vtkExtractUnstructuredGrid.h
+++ b/Filters/Extraction/vtkExtractUnstructuredGrid.h
@@ -33,8 +33,8 @@
 // vtkRectilinearGridGeometryFilter
 // vtkExtractGeometry vtkExtractVOI
 
-#ifndef __vtkExtractUnstructuredGrid_h
-#define __vtkExtractUnstructuredGrid_h
+#ifndef vtkExtractUnstructuredGrid_h
+#define vtkExtractUnstructuredGrid_h
 
 #include "vtkFiltersExtractionModule.h" // For export macro
 #include "vtkUnstructuredGridAlgorithm.h"
diff --git a/Filters/Extraction/vtkExtractVectorComponents.h b/Filters/Extraction/vtkExtractVectorComponents.h
index 6c69965b742f6c54f7a0672f57f1e861edddcbbe..096673444df9589f8d6334bf494b4558a3161057 100644
--- a/Filters/Extraction/vtkExtractVectorComponents.h
+++ b/Filters/Extraction/vtkExtractVectorComponents.h
@@ -28,8 +28,8 @@
 // If you use the GetOutput() method, you will be retrieving the x vector
 // component.
 
-#ifndef __vtkExtractVectorComponents_h
-#define __vtkExtractVectorComponents_h
+#ifndef vtkExtractVectorComponents_h
+#define vtkExtractVectorComponents_h
 
 #include "vtkFiltersExtractionModule.h" // For export macro
 #include "vtkDataSetAlgorithm.h"
diff --git a/Filters/Extraction/vtkHierarchicalDataExtractDataSets.h b/Filters/Extraction/vtkHierarchicalDataExtractDataSets.h
index 8104cc02f425dd203b4a0a0c9821d7a071823e51..219824e01b187ff9a475e41b805c5085879326f5 100644
--- a/Filters/Extraction/vtkHierarchicalDataExtractDataSets.h
+++ b/Filters/Extraction/vtkHierarchicalDataExtractDataSets.h
@@ -19,8 +19,8 @@
 // .SECTION See Also
 // vtkExtractDataSets
 
-#ifndef __vtkHierarchicalDataExtractDataSets_h
-#define __vtkHierarchicalDataExtractDataSets_h
+#ifndef vtkHierarchicalDataExtractDataSets_h
+#define vtkHierarchicalDataExtractDataSets_h
 
 #include "vtkFiltersExtractionModule.h" // For export macro
 #include "vtkExtractDataSets.h"
diff --git a/Filters/Extraction/vtkHierarchicalDataExtractLevel.h b/Filters/Extraction/vtkHierarchicalDataExtractLevel.h
index 9730e085e5bb9beeb9ef243bca736930db246bb7..a42318e313141873ea5add985f8385d27669934a 100644
--- a/Filters/Extraction/vtkHierarchicalDataExtractLevel.h
+++ b/Filters/Extraction/vtkHierarchicalDataExtractLevel.h
@@ -16,8 +16,8 @@
 // .SECTION Description
 // Legacy class. Use vtkExtractLevel instead.
 
-#ifndef __vtkHierarchicalDataExtractLevel_h
-#define __vtkHierarchicalDataExtractLevel_h
+#ifndef vtkHierarchicalDataExtractLevel_h
+#define vtkHierarchicalDataExtractLevel_h
 
 #include "vtkFiltersExtractionModule.h" // For export macro
 #include "vtkExtractLevel.h"
diff --git a/Filters/Extraction/vtkProbeSelectedLocations.h b/Filters/Extraction/vtkProbeSelectedLocations.h
index 231fdf61e589ae6e0e231936e8235beb8ef121dc..4a72908c67627572ecdcef1188ad3a3e500beebb 100644
--- a/Filters/Extraction/vtkProbeSelectedLocations.h
+++ b/Filters/Extraction/vtkProbeSelectedLocations.h
@@ -22,8 +22,8 @@
 // is ignored. The ContentType of the input vtkSelection must be
 // vtkSelection::LOCATIONS.
 
-#ifndef __vtkProbeSelectedLocations_h
-#define __vtkProbeSelectedLocations_h
+#ifndef vtkProbeSelectedLocations_h
+#define vtkProbeSelectedLocations_h
 
 #include "vtkFiltersExtractionModule.h" // For export macro
 #include "vtkExtractSelectionBase.h"
diff --git a/Filters/FlowPaths/vtkAMRInterpolatedVelocityField.h b/Filters/FlowPaths/vtkAMRInterpolatedVelocityField.h
index 15bceecaca211e18f5bc9d621fa76297acf9323e..870979665a53010a713ba6c0827ee7a030cc57eb 100644
--- a/Filters/FlowPaths/vtkAMRInterpolatedVelocityField.h
+++ b/Filters/FlowPaths/vtkAMRInterpolatedVelocityField.h
@@ -19,8 +19,8 @@
 // .SECTION Description
 // The main functionality supported here is the point location inside vtkOverlappingAMR data set.
 
-#ifndef __vtkAMRInterpolatedVelocityField_h
-#define __vtkAMRInterpolatedVelocityField_h
+#ifndef vtkAMRInterpolatedVelocityField_h
+#define vtkAMRInterpolatedVelocityField_h
 
 #include "vtkFiltersFlowPathsModule.h" // For export macro
 
diff --git a/Filters/FlowPaths/vtkAbstractInterpolatedVelocityField.h b/Filters/FlowPaths/vtkAbstractInterpolatedVelocityField.h
index 7b3052beb84259961621a7b33c7c3187c93c57fd..35a5ca79a12b6c174896a13549aa3ce5d1402a43 100644
--- a/Filters/FlowPaths/vtkAbstractInterpolatedVelocityField.h
+++ b/Filters/FlowPaths/vtkAbstractInterpolatedVelocityField.h
@@ -61,8 +61,8 @@
 //  vtkGenericInterpolatedVelocityField vtkCachingInterpolatedVelocityField
 //  vtkTemporalInterpolatedVelocityField vtkFunctionSet vtkStreamer vtkStreamTracer
 
-#ifndef __vtkAbstractInterpolatedVelocityField_h
-#define __vtkAbstractInterpolatedVelocityField_h
+#ifndef vtkAbstractInterpolatedVelocityField_h
+#define vtkAbstractInterpolatedVelocityField_h
 
 #include "vtkFunctionSet.h"
 //BTX
diff --git a/Filters/FlowPaths/vtkCachingInterpolatedVelocityField.h b/Filters/FlowPaths/vtkCachingInterpolatedVelocityField.h
index fb16d7957b407eb254d31d8c9541b12ec45219a3..4b7849ec54ae47da64c65344eb63529a8b0b4311 100644
--- a/Filters/FlowPaths/vtkCachingInterpolatedVelocityField.h
+++ b/Filters/FlowPaths/vtkCachingInterpolatedVelocityField.h
@@ -38,8 +38,8 @@
 // .SECTION TODO
 // Need to clean up style to match vtk/Kitware standards. Please help.
 
-#ifndef __vtkTInterpolatedVelocityField_h
-#define __vtkTInterpolatedVelocityField_h
+#ifndef vtkTInterpolatedVelocityField_h
+#define vtkTInterpolatedVelocityField_h
 
 #include "vtkFiltersFlowPathsModule.h" // For export macro
 #include "vtkFunctionSet.h"
diff --git a/Filters/FlowPaths/vtkCellLocatorInterpolatedVelocityField.h b/Filters/FlowPaths/vtkCellLocatorInterpolatedVelocityField.h
index a48387a740ba54b1c66735d5139c847234b3c0c9..a1c385d9f4abfc0886fd4837589427555f61d1fc 100644
--- a/Filters/FlowPaths/vtkCellLocatorInterpolatedVelocityField.h
+++ b/Filters/FlowPaths/vtkCellLocatorInterpolatedVelocityField.h
@@ -43,8 +43,8 @@
 //  vtkGenericInterpolatedVelocityField vtkCachingInterpolatedVelocityField
 //  vtkTemporalInterpolatedVelocityField vtkFunctionSet vtkStreamer vtkStreamTracer
 
-#ifndef __vtkCellLocatorInterpolatedVelocityField_h
-#define __vtkCellLocatorInterpolatedVelocityField_h
+#ifndef vtkCellLocatorInterpolatedVelocityField_h
+#define vtkCellLocatorInterpolatedVelocityField_h
 
 #include "vtkFiltersFlowPathsModule.h" // For export macro
 #include "vtkCompositeInterpolatedVelocityField.h"
diff --git a/Filters/FlowPaths/vtkCompositeInterpolatedVelocityField.h b/Filters/FlowPaths/vtkCompositeInterpolatedVelocityField.h
index 21cc80c0b33bd510a1afd1f82fe2bcf6db7e8d64..6f19aff4a107cd9df5db13bd13192ab1aa1f8868 100644
--- a/Filters/FlowPaths/vtkCompositeInterpolatedVelocityField.h
+++ b/Filters/FlowPaths/vtkCompositeInterpolatedVelocityField.h
@@ -61,8 +61,8 @@
 //  vtkGenericInterpolatedVelocityField vtkCachingInterpolatedVelocityField
 //  vtkTemporalInterpolatedVelocityField vtkFunctionSet vtkStreamer vtkStreamTracer
 
-#ifndef __vtkCompositeInterpolatedVelocityField_h
-#define __vtkCompositeInterpolatedVelocityField_h
+#ifndef vtkCompositeInterpolatedVelocityField_h
+#define vtkCompositeInterpolatedVelocityField_h
 
 #include "vtkFiltersFlowPathsModule.h" // For export macro
 #include "vtkAbstractInterpolatedVelocityField.h"
diff --git a/Filters/FlowPaths/vtkDashedStreamLine.h b/Filters/FlowPaths/vtkDashedStreamLine.h
index 97c84ec943763348f97836d7cdd19106287c086e..20424a3fd1dc404c058642949776a3edd48f1fce 100644
--- a/Filters/FlowPaths/vtkDashedStreamLine.h
+++ b/Filters/FlowPaths/vtkDashedStreamLine.h
@@ -29,8 +29,8 @@
 // .SECTION See Also
 // vtkStreamer vtkStreamLine vtkStreamPoints
 
-#ifndef __vtkDashedStreamLine_h
-#define __vtkDashedStreamLine_h
+#ifndef vtkDashedStreamLine_h
+#define vtkDashedStreamLine_h
 
 #include "vtkFiltersFlowPathsModule.h" // For export macro
 #include "vtkStreamLine.h"
diff --git a/Filters/FlowPaths/vtkInterpolatedVelocityField.h b/Filters/FlowPaths/vtkInterpolatedVelocityField.h
index 7a31f58273d6cbda659f4b4496bbfc774d124d0d..b4d3c16b8bb5229c8819beb7b165ed082a7ec7d6 100644
--- a/Filters/FlowPaths/vtkInterpolatedVelocityField.h
+++ b/Filters/FlowPaths/vtkInterpolatedVelocityField.h
@@ -48,8 +48,8 @@
 //  vtkGenericInterpolatedVelocityField vtkCachingInterpolatedVelocityField
 //  vtkTemporalInterpolatedVelocityField vtkFunctionSet vtkStreamer vtkStreamTracer
 
-#ifndef __vtkInterpolatedVelocityField_h
-#define __vtkInterpolatedVelocityField_h
+#ifndef vtkInterpolatedVelocityField_h
+#define vtkInterpolatedVelocityField_h
 
 #include "vtkFiltersFlowPathsModule.h" // For export macro
 #include "vtkCompositeInterpolatedVelocityField.h"
diff --git a/Filters/FlowPaths/vtkParticlePathFilter.h b/Filters/FlowPaths/vtkParticlePathFilter.h
index c34984192a97cd74ef282a56366995e798f7d076..a7a211f0fffbcf585b2a6d59872e81185e44daa7 100644
--- a/Filters/FlowPaths/vtkParticlePathFilter.h
+++ b/Filters/FlowPaths/vtkParticlePathFilter.h
@@ -21,8 +21,8 @@
 // vtkParticlePathFilterBase has the details of the algorithms
 
 
-#ifndef __vtkParticlePathFilter_h
-#define __vtkParticlePathFilter_h
+#ifndef vtkParticlePathFilter_h
+#define vtkParticlePathFilter_h
 
 #include "vtkFiltersFlowPathsModule.h" // For export macro
 #include "vtkSmartPointer.h" // For protected ivars.
diff --git a/Filters/FlowPaths/vtkParticleTracer.h b/Filters/FlowPaths/vtkParticleTracer.h
index afa971d9f6f5bdce8fdc3dffd40ca37b4e8af483..867346bcfe6ade6818ce136131bc3bb376d301d4 100644
--- a/Filters/FlowPaths/vtkParticleTracer.h
+++ b/Filters/FlowPaths/vtkParticleTracer.h
@@ -21,8 +21,8 @@
 // vtkParticleTracerBase has the details of the algorithms
 
 
-#ifndef __vtkParticleTracer_h
-#define __vtkParticleTracer_h
+#ifndef vtkParticleTracer_h
+#define vtkParticleTracer_h
 
 #include "vtkFiltersFlowPathsModule.h" // For export macro
 #include "vtkSmartPointer.h" // For protected ivars.
diff --git a/Filters/FlowPaths/vtkParticleTracerBase.h b/Filters/FlowPaths/vtkParticleTracerBase.h
index e1af57b8c35b62c7e6a470c2090f35d1f96690f8..6176d047f4ae424d7c11180d662f1f9f8b6e6e57 100644
--- a/Filters/FlowPaths/vtkParticleTracerBase.h
+++ b/Filters/FlowPaths/vtkParticleTracerBase.h
@@ -22,8 +22,8 @@
 // vtkRibbonFilter vtkRuledSurfaceFilter vtkInitialValueProblemSolver
 // vtkRungeKutta2 vtkRungeKutta4 vtkRungeKutta45 vtkStreamTracer
 
-#ifndef __vtkParticleTracerBase_h
-#define __vtkParticleTracerBase_h
+#ifndef vtkParticleTracerBase_h
+#define vtkParticleTracerBase_h
 
 #include "vtkFiltersFlowPathsModule.h" // For export macro
 #include "vtkSmartPointer.h" // For protected ivars.
diff --git a/Filters/FlowPaths/vtkStreaklineFilter.h b/Filters/FlowPaths/vtkStreaklineFilter.h
index 1b6ef406a4f3b57c9bbbb7e342507299414f3765..f3b3b674c1ac60c7e04dd8d62e474145bc214b45 100644
--- a/Filters/FlowPaths/vtkStreaklineFilter.h
+++ b/Filters/FlowPaths/vtkStreaklineFilter.h
@@ -21,8 +21,8 @@
 // vtkParticleTracerBase has the details of the algorithms
 
 
-#ifndef __vtkStreaklineFilter_h
-#define __vtkStreaklineFilter_h
+#ifndef vtkStreaklineFilter_h
+#define vtkStreaklineFilter_h
 
 #include "vtkFiltersFlowPathsModule.h" // For export macro
 #include "vtkSmartPointer.h" // For protected ivars.
diff --git a/Filters/FlowPaths/vtkStreamLine.h b/Filters/FlowPaths/vtkStreamLine.h
index 7e614577293978c65654f2661547ffeda1a52d04..b014b415ed0afd493ce9169e7d3b1fd7483b900c 100644
--- a/Filters/FlowPaths/vtkStreamLine.h
+++ b/Filters/FlowPaths/vtkStreamLine.h
@@ -41,8 +41,8 @@
 // .SECTION See Also
 // vtkStreamer vtkDashedStreamLine vtkStreamPoints
 
-#ifndef __vtkStreamLine_h
-#define __vtkStreamLine_h
+#ifndef vtkStreamLine_h
+#define vtkStreamLine_h
 
 #include "vtkFiltersFlowPathsModule.h" // For export macro
 #include "vtkStreamer.h"
diff --git a/Filters/FlowPaths/vtkStreamPoints.h b/Filters/FlowPaths/vtkStreamPoints.h
index d5761602b3b8dfa241b35cfbba37f7f87116c86d..2167b01df915b32fc81cbe364c3985da647482d5 100644
--- a/Filters/FlowPaths/vtkStreamPoints.h
+++ b/Filters/FlowPaths/vtkStreamPoints.h
@@ -22,8 +22,8 @@
 // .SECTION See Also
 // vtkStreamer vtkStreamLine vtkDashedStreamLine
 
-#ifndef __vtkStreamPoints_h
-#define __vtkStreamPoints_h
+#ifndef vtkStreamPoints_h
+#define vtkStreamPoints_h
 
 #include "vtkFiltersFlowPathsModule.h" // For export macro
 #include "vtkStreamer.h"
diff --git a/Filters/FlowPaths/vtkStreamTracer.h b/Filters/FlowPaths/vtkStreamTracer.h
index 08d3e439e579ca95b2be438e4124f2ed0e5c0856..8eacd5b5afe405b5d00953f31aa22fb437279f02 100644
--- a/Filters/FlowPaths/vtkStreamTracer.h
+++ b/Filters/FlowPaths/vtkStreamTracer.h
@@ -74,8 +74,8 @@
 // vtkCellLocatorInterpolatedVelocityField
 //
 
-#ifndef __vtkStreamTracer_h
-#define __vtkStreamTracer_h
+#ifndef vtkStreamTracer_h
+#define vtkStreamTracer_h
 
 #include "vtkFiltersFlowPathsModule.h" // For export macro
 #include "vtkPolyDataAlgorithm.h"
diff --git a/Filters/FlowPaths/vtkStreamer.h b/Filters/FlowPaths/vtkStreamer.h
index bd5879d5c761e45cbfea89ab492f388d2ec9ef9d..42136507621cea1e814ae57dda763856108410c0 100644
--- a/Filters/FlowPaths/vtkStreamer.h
+++ b/Filters/FlowPaths/vtkStreamer.h
@@ -47,8 +47,8 @@
 // .SECTION See Also
 // vtkStreamLine vtkDashedStreamLine vtkStreamPoints
 
-#ifndef __vtkStreamer_h
-#define __vtkStreamer_h
+#ifndef vtkStreamer_h
+#define vtkStreamer_h
 
 #include "vtkFiltersFlowPathsModule.h" // For export macro
 #include "vtkPolyDataAlgorithm.h"
diff --git a/Filters/FlowPaths/vtkTemporalInterpolatedVelocityField.h b/Filters/FlowPaths/vtkTemporalInterpolatedVelocityField.h
index 353138c97c05f02fd548a903d042206256f460f9..eac389d87ef88709cdc5431e7c23154f52477d7d 100644
--- a/Filters/FlowPaths/vtkTemporalInterpolatedVelocityField.h
+++ b/Filters/FlowPaths/vtkTemporalInterpolatedVelocityField.h
@@ -40,8 +40,8 @@
 //
 // vtkCachingInterpolatedVelocityField vtkTemporalStreamTracer
 
-#ifndef __vtkTemporalInterpolatedVelocityField_h
-#define __vtkTemporalInterpolatedVelocityField_h
+#ifndef vtkTemporalInterpolatedVelocityField_h
+#define vtkTemporalInterpolatedVelocityField_h
 
 #include "vtkFiltersFlowPathsModule.h" // For export macro
 #include "vtkFunctionSet.h"
diff --git a/Filters/FlowPaths/vtkTemporalStreamTracer.h b/Filters/FlowPaths/vtkTemporalStreamTracer.h
index 5cd751d5e3f8f3881edb8a4acf2bdfc739bb25e7..1de45e095c6f7dd1222652177adc78499ab8924c 100644
--- a/Filters/FlowPaths/vtkTemporalStreamTracer.h
+++ b/Filters/FlowPaths/vtkTemporalStreamTracer.h
@@ -21,8 +21,8 @@
 // vtkRibbonFilter vtkRuledSurfaceFilter vtkInitialValueProblemSolver
 // vtkRungeKutta2 vtkRungeKutta4 vtkRungeKutta45 vtkStreamTracer
 
-#ifndef __vtkTemporalStreamTracer_h
-#define __vtkTemporalStreamTracer_h
+#ifndef vtkTemporalStreamTracer_h
+#define vtkTemporalStreamTracer_h
 
 #include "vtkFiltersFlowPathsModule.h" // For export macro
 #include "vtkSmartPointer.h" // For protected ivars.
diff --git a/Filters/General/vtkAnnotationLink.h b/Filters/General/vtkAnnotationLink.h
index efaced3dfb8445223c25dd29126c263ba61f30f7..b7eb67cde1fcc38b1e803fe491d02808abc81cd0 100644
--- a/Filters/General/vtkAnnotationLink.h
+++ b/Filters/General/vtkAnnotationLink.h
@@ -38,8 +38,8 @@
 // As a convenience, this selection is sent to output port 2 so that it
 // can be connected to pipelines requiring a vtkSelection.
 
-#ifndef __vtkAnnotationLink_h
-#define __vtkAnnotationLink_h
+#ifndef vtkAnnotationLink_h
+#define vtkAnnotationLink_h
 
 #include "vtkFiltersGeneralModule.h" // For export macro
 #include "vtkAnnotationLayersAlgorithm.h"
diff --git a/Filters/General/vtkAppendPoints.h b/Filters/General/vtkAppendPoints.h
index d864a52b13b2cf08d737b544cfae65eb3f30daac..dabc520725b4d3c80963bd1da913128036969bcb 100644
--- a/Filters/General/vtkAppendPoints.h
+++ b/Filters/General/vtkAppendPoints.h
@@ -22,8 +22,8 @@
 // .SECTION See Also
 // vtkAppendFilter vtkAppendPolyData
 
-#ifndef __vtkAppendPoints_h
-#define __vtkAppendPoints_h
+#ifndef vtkAppendPoints_h
+#define vtkAppendPoints_h
 
 #include "vtkFiltersGeneralModule.h" // For export macro
 #include "vtkPolyDataAlgorithm.h"
diff --git a/Filters/General/vtkApproximatingSubdivisionFilter.h b/Filters/General/vtkApproximatingSubdivisionFilter.h
index 4ad4997c8a3c54ac63a2e220b1b6e8f6365539c9..9531df74ac092bc0f5fba7aa9e069037fb590807 100644
--- a/Filters/General/vtkApproximatingSubdivisionFilter.h
+++ b/Filters/General/vtkApproximatingSubdivisionFilter.h
@@ -21,8 +21,8 @@
 // This work was supported by PHS Research Grant No. 1 P41 RR13218-01
 // from the National Center for Research Resources.
 
-#ifndef __vtkApproximatingSubdivisionFilter_h
-#define __vtkApproximatingSubdivisionFilter_h
+#ifndef vtkApproximatingSubdivisionFilter_h
+#define vtkApproximatingSubdivisionFilter_h
 
 #include "vtkFiltersGeneralModule.h" // For export macro
 #include "vtkPolyDataAlgorithm.h"
diff --git a/Filters/General/vtkAreaContourSpectrumFilter.h b/Filters/General/vtkAreaContourSpectrumFilter.h
index f7de95c4bced730719281bb5042827e417f8bedb..545bb2fdda598ad644c65612506f5cee9afe0fd2 100644
--- a/Filters/General/vtkAreaContourSpectrumFilter.h
+++ b/Filters/General/vtkAreaContourSpectrumFilter.h
@@ -38,8 +38,8 @@
 // "The contour spectrum",
 // IEEE Visualization, 167-174, 1997.
 
-#ifndef __vtkAreaContourSpectrumFilter_h
-#define __vtkAreaContourSpectrumFilter_h
+#ifndef vtkAreaContourSpectrumFilter_h
+#define vtkAreaContourSpectrumFilter_h
 
 #include "vtkFiltersGeneralModule.h" // For export macro
 #include  "vtkDataObjectAlgorithm.h"
diff --git a/Filters/General/vtkAxes.h b/Filters/General/vtkAxes.h
index ccc7b382c50b5019020a56ca1bd76592e940d62e..d652f8d06fda2b54085834d19a2e29f393a7a577 100644
--- a/Filters/General/vtkAxes.h
+++ b/Filters/General/vtkAxes.h
@@ -19,8 +19,8 @@
 // a scale factor. Three scalar values are generated for the three lines and
 // can be used (via color map) to indicate a particular coordinate axis.
 
-#ifndef __vtkAxes_h
-#define __vtkAxes_h
+#ifndef vtkAxes_h
+#define vtkAxes_h
 
 #include "vtkFiltersGeneralModule.h" // For export macro
 #include "vtkPolyDataAlgorithm.h"
diff --git a/Filters/General/vtkBlankStructuredGrid.h b/Filters/General/vtkBlankStructuredGrid.h
index 0addcf21acd6b26db343c9b18fbfa832e5bd54e7..ac9713a4f99b2c692077f1b072dfefe6eac5e09b 100644
--- a/Filters/General/vtkBlankStructuredGrid.h
+++ b/Filters/General/vtkBlankStructuredGrid.h
@@ -27,8 +27,8 @@
 // .SECTION See Also
 // vtkStructuredGrid
 
-#ifndef __vtkBlankStructuredGrid_h
-#define __vtkBlankStructuredGrid_h
+#ifndef vtkBlankStructuredGrid_h
+#define vtkBlankStructuredGrid_h
 
 #include "vtkFiltersGeneralModule.h" // For export macro
 #include "vtkStructuredGridAlgorithm.h"
diff --git a/Filters/General/vtkBlankStructuredGridWithImage.h b/Filters/General/vtkBlankStructuredGridWithImage.h
index 2c1aa03791bc04d716be7a9f0775ee9cbc10a377..831cc8d8df7e3ef859ebc0495223fa2086cf8d2f 100644
--- a/Filters/General/vtkBlankStructuredGridWithImage.h
+++ b/Filters/General/vtkBlankStructuredGridWithImage.h
@@ -26,8 +26,8 @@
 // .SECTION See Also
 // vtkStructuredGrid
 
-#ifndef __vtkBlankStructuredGridWithImage_h
-#define __vtkBlankStructuredGridWithImage_h
+#ifndef vtkBlankStructuredGridWithImage_h
+#define vtkBlankStructuredGridWithImage_h
 
 #include "vtkFiltersGeneralModule.h" // For export macro
 #include "vtkStructuredGridAlgorithm.h"
diff --git a/Filters/General/vtkBlockIdScalars.h b/Filters/General/vtkBlockIdScalars.h
index c6b58fbc3ba688696a4b93c00ce7a72dd9e0fee6..976f58f09caf476a63bfda4afca0baaf9bb71c70 100644
--- a/Filters/General/vtkBlockIdScalars.h
+++ b/Filters/General/vtkBlockIdScalars.h
@@ -18,8 +18,8 @@
 // for each block. Note that all sub-blocks within a block get the same scalar.
 // The new scalars array is named \c BlockIdScalars.
 
-#ifndef __vtkBlockIdScalars_h
-#define __vtkBlockIdScalars_h
+#ifndef vtkBlockIdScalars_h
+#define vtkBlockIdScalars_h
 
 #include "vtkFiltersGeneralModule.h" // For export macro
 #include "vtkMultiBlockDataSetAlgorithm.h"
diff --git a/Filters/General/vtkBooleanOperationPolyDataFilter.h b/Filters/General/vtkBooleanOperationPolyDataFilter.h
index a9acdcba09cf6fa75635be212941f8e2aa3a4e82..bf7d54eaebd5a77308627ec9d602287823baf714 100644
--- a/Filters/General/vtkBooleanOperationPolyDataFilter.h
+++ b/Filters/General/vtkBooleanOperationPolyDataFilter.h
@@ -29,8 +29,8 @@
 // http://hdl.handle.net/10380/3262
 // http://www.midasjournal.org/browse/publication/797
 
-#ifndef __vtkBooleanOperationPolyDataFilter_h
-#define __vtkBooleanOperationPolyDataFilter_h
+#ifndef vtkBooleanOperationPolyDataFilter_h
+#define vtkBooleanOperationPolyDataFilter_h
 
 #include "vtkFiltersGeneralModule.h" // For export macro
 #include "vtkPolyDataAlgorithm.h"
diff --git a/Filters/General/vtkBoxClipDataSet.h b/Filters/General/vtkBoxClipDataSet.h
index c430070026d9713a14025ce687f4ac8fc1893218..2dec9bf405a23d94bf509573b967f304b10087cc 100644
--- a/Filters/General/vtkBoxClipDataSet.h
+++ b/Filters/General/vtkBoxClipDataSet.h
@@ -42,8 +42,8 @@
 // 2) Apply the GenerateClipScalarsOn()
 // 3) Execute clipping  Update();
 
-#ifndef __vtkBoxClipDataSet_h
-#define __vtkBoxClipDataSet_h
+#ifndef vtkBoxClipDataSet_h
+#define vtkBoxClipDataSet_h
 
 #include "vtkFiltersGeneralModule.h" // For export macro
 #include "vtkUnstructuredGridAlgorithm.h"
diff --git a/Filters/General/vtkBrownianPoints.h b/Filters/General/vtkBrownianPoints.h
index d4060bffae84a8a0a030c4ff48026ec0bd176c9a..9993df8a13c77dc92a00200ec89984492131e886 100644
--- a/Filters/General/vtkBrownianPoints.h
+++ b/Filters/General/vtkBrownianPoints.h
@@ -21,8 +21,8 @@
 // .SECTION See also
 // vtkRandomAttributeGenerator
 
-#ifndef __vtkBrownianPoints_h
-#define __vtkBrownianPoints_h
+#ifndef vtkBrownianPoints_h
+#define vtkBrownianPoints_h
 
 #include "vtkFiltersGeneralModule.h" // For export macro
 #include "vtkDataSetAlgorithm.h"
diff --git a/Filters/General/vtkCellCenters.h b/Filters/General/vtkCellCenters.h
index af7e26efab804aa27c1d4e639cca66d0f562205c..ef7337c2a16713f6c45623e251d8efe5906fd825 100644
--- a/Filters/General/vtkCellCenters.h
+++ b/Filters/General/vtkCellCenters.h
@@ -29,8 +29,8 @@
 // .SECTION See Also
 // vtkGlyph3D vtkLabeledDataMapper
 
-#ifndef __vtkCellCenters_h
-#define __vtkCellCenters_h
+#ifndef vtkCellCenters_h
+#define vtkCellCenters_h
 
 #include "vtkFiltersGeneralModule.h" // For export macro
 #include "vtkPolyDataAlgorithm.h"
diff --git a/Filters/General/vtkCellDerivatives.h b/Filters/General/vtkCellDerivatives.h
index 52f04e791c47d535bd0ffaa4f7caf20e9a072302..349d73efd918b002250a53abcbc49cbad94da507 100644
--- a/Filters/General/vtkCellDerivatives.h
+++ b/Filters/General/vtkCellDerivatives.h
@@ -38,8 +38,8 @@
 // .SECTION See Also
 // vtkVectorNorm
 
-#ifndef __vtkCellDerivatives_h
-#define __vtkCellDerivatives_h
+#ifndef vtkCellDerivatives_h
+#define vtkCellDerivatives_h
 
 #include "vtkFiltersGeneralModule.h" // For export macro
 #include "vtkDataSetAlgorithm.h"
diff --git a/Filters/General/vtkCellTreeLocator.h b/Filters/General/vtkCellTreeLocator.h
index 011cada99d36213aa86a222ec5cc9c20933ea141..02b71b59680dbe6c1ed867103895f8e3121c7e81 100644
--- a/Filters/General/vtkCellTreeLocator.h
+++ b/Filters/General/vtkCellTreeLocator.h
@@ -33,8 +33,8 @@
 // vtkLocator vtkCellLocator vtkModifiedBSPTree
 
 
-#ifndef __vtkCellTreeLocator_h
-#define __vtkCellTreeLocator_h
+#ifndef vtkCellTreeLocator_h
+#define vtkCellTreeLocator_h
 
 #include "vtkFiltersGeneralModule.h" // For export macro
 #include "vtkAbstractCellLocator.h"
diff --git a/Filters/General/vtkClipClosedSurface.h b/Filters/General/vtkClipClosedSurface.h
index 87224c6c4690d62730836d8acb0e384344a3bb13..d65a19260f7637eca24d7d07a7694c4bc4f555be 100644
--- a/Filters/General/vtkClipClosedSurface.h
+++ b/Filters/General/vtkClipClosedSurface.h
@@ -34,8 +34,8 @@
 // .SECTION Thanks
 // Thanks to David Gobbi for contributing this class to VTK.
 
-#ifndef __vtkClipClosedSurface_h
-#define __vtkClipClosedSurface_h
+#ifndef vtkClipClosedSurface_h
+#define vtkClipClosedSurface_h
 
 #include "vtkFiltersGeneralModule.h" // For export macro
 #include "vtkPolyDataAlgorithm.h"
diff --git a/Filters/General/vtkClipConvexPolyData.h b/Filters/General/vtkClipConvexPolyData.h
index 6b157fd9de8ee338e8100b85b58c19d4520d2618..ad13a4f1019edc0aafd2a86b17b056b3fbc561c5 100644
--- a/Filters/General/vtkClipConvexPolyData.h
+++ b/Filters/General/vtkClipConvexPolyData.h
@@ -18,8 +18,8 @@
 // of planes. Its main usage is for clipping a bounding volume with frustum
 // planes (used later one in volume rendering).
 
-#ifndef __vtkClipConvexPolyData_h
-#define __vtkClipConvexPolyData_h
+#ifndef vtkClipConvexPolyData_h
+#define vtkClipConvexPolyData_h
 
 #include "vtkFiltersGeneralModule.h" // For export macro
 #include "vtkPolyDataAlgorithm.h"
diff --git a/Filters/General/vtkClipDataSet.h b/Filters/General/vtkClipDataSet.h
index 8ff907d090c24b18b51533e28687b6238c150215..14859ab8957c85de1a267d1d73bfa750277bdc1a 100644
--- a/Filters/General/vtkClipDataSet.h
+++ b/Filters/General/vtkClipDataSet.h
@@ -54,8 +54,8 @@
 // .SECTION See Also
 // vtkImplicitFunction vtkCutter vtkClipVolume vtkClipPolyData
 
-#ifndef __vtkClipDataSet_h
-#define __vtkClipDataSet_h
+#ifndef vtkClipDataSet_h
+#define vtkClipDataSet_h
 
 #include "vtkFiltersGeneralModule.h" // For export macro
 #include "vtkUnstructuredGridAlgorithm.h"
diff --git a/Filters/General/vtkClipVolume.h b/Filters/General/vtkClipVolume.h
index f96c55df44bca7fcf33e521a912935b6f40be2bf..1dc3b30ab176fb5f3956250f9961b1c818d2296f 100644
--- a/Filters/General/vtkClipVolume.h
+++ b/Filters/General/vtkClipVolume.h
@@ -55,8 +55,8 @@
 // .SECTION See Also
 // vtkImplicitFunction vtkClipPolyData vtkGeometryFilter vtkExtractGeometry
 
-#ifndef __vtkClipVolume_h
-#define __vtkClipVolume_h
+#ifndef vtkClipVolume_h
+#define vtkClipVolume_h
 
 #include "vtkFiltersGeneralModule.h" // For export macro
 #include "vtkUnstructuredGridAlgorithm.h"
diff --git a/Filters/General/vtkCoincidentPoints.h b/Filters/General/vtkCoincidentPoints.h
index 2c1f17ce9461113d13c5d202994ed23f79ca8b2e..0164bc99e4711c91578ebb2a8b6e56d7f9cd9c3d 100644
--- a/Filters/General/vtkCoincidentPoints.h
+++ b/Filters/General/vtkCoincidentPoints.h
@@ -24,8 +24,8 @@
 // each coordinate is stored with a set of point id's of points that are
 // all coincident.
 
-#ifndef __vtkCoincidentPoints_h
-#define __vtkCoincidentPoints_h
+#ifndef vtkCoincidentPoints_h
+#define vtkCoincidentPoints_h
 
 #include "vtkFiltersGeneralModule.h" // For export macro
 #include "vtkObject.h"
@@ -98,4 +98,4 @@ private:
   //ETX
 };
 
-#endif // __vtkCoincidentPoints_h
+#endif // vtkCoincidentPoints_h
diff --git a/Filters/General/vtkContourTriangulator.h b/Filters/General/vtkContourTriangulator.h
index 51b00ae5e27e370800ed10937a46b82ed167df74..7eae3bf187dbc86b216110042ad05c2b29343ef6 100644
--- a/Filters/General/vtkContourTriangulator.h
+++ b/Filters/General/vtkContourTriangulator.h
@@ -28,8 +28,8 @@
 // .SECTION Thanks
 // Thanks to David Gobbi for contributing this class to VTK.
 
-#ifndef __vtkContourTriangulator_h
-#define __vtkContourTriangulator_h
+#ifndef vtkContourTriangulator_h
+#define vtkContourTriangulator_h
 
 #include "vtkFiltersGeneralModule.h" // For export macro
 #include "vtkPolyDataAlgorithm.h"
diff --git a/Filters/General/vtkCursor2D.h b/Filters/General/vtkCursor2D.h
index edf1874d39b46ed8c6e7bf89bddbb6864613ef9b..5b973351b7f967d0540347df063ec0814a76aa97 100644
--- a/Filters/General/vtkCursor2D.h
+++ b/Filters/General/vtkCursor2D.h
@@ -25,8 +25,8 @@
 // on and off independently.
 //
 
-#ifndef __vtkCursor2D_h
-#define __vtkCursor2D_h
+#ifndef vtkCursor2D_h
+#define vtkCursor2D_h
 
 #include "vtkFiltersGeneralModule.h" // For export macro
 #include "vtkPolyDataAlgorithm.h"
diff --git a/Filters/General/vtkCursor3D.h b/Filters/General/vtkCursor3D.h
index c3687be3de03fdca9522d30140fe55ec1e922441..5679c9774b40a3aad4fa8af3c426d071f5ad22e9 100644
--- a/Filters/General/vtkCursor3D.h
+++ b/Filters/General/vtkCursor3D.h
@@ -24,8 +24,8 @@
 // geometric representation of the cursor. The second (Focus) is a single
 // point at the focal point.
 
-#ifndef __vtkCursor3D_h
-#define __vtkCursor3D_h
+#ifndef vtkCursor3D_h
+#define vtkCursor3D_h
 
 #include "vtkFiltersGeneralModule.h" // For export macro
 #include "vtkPolyDataAlgorithm.h"
diff --git a/Filters/General/vtkCurvatures.h b/Filters/General/vtkCurvatures.h
index ef7d45cc9ba4bbb4eca3db237dea37d8cd803fac..c6240b0153da0ec267ddfe362386bda55f6879dc 100644
--- a/Filters/General/vtkCurvatures.h
+++ b/Filters/General/vtkCurvatures.h
@@ -58,8 +58,8 @@
 // .SECTION See Also
 //
 
-#ifndef __vtkCurvatures_h
-#define __vtkCurvatures_h
+#ifndef vtkCurvatures_h
+#define vtkCurvatures_h
 
 #include "vtkFiltersGeneralModule.h" // For export macro
 #include "vtkPolyDataAlgorithm.h"
diff --git a/Filters/General/vtkDataSetGradient.h b/Filters/General/vtkDataSetGradient.h
index 6754f39d020d5236b3fb541bb59c32dfcba4a059..eb2b895662de3322cb8fe3759584cda6d68311c1 100644
--- a/Filters/General/vtkDataSetGradient.h
+++ b/Filters/General/vtkDataSetGradient.h
@@ -25,8 +25,8 @@
 // Implementation by Thierry Carrard (CEA)
 
 
-#ifndef __vtkDataSetGradient_h
-#define __vtkDataSetGradient_h
+#ifndef vtkDataSetGradient_h
+#define vtkDataSetGradient_h
 
 #include "vtkFiltersGeneralModule.h" // For export macro
 #include "vtkDataSetAlgorithm.h"
diff --git a/Filters/General/vtkDataSetGradientPrecompute.h b/Filters/General/vtkDataSetGradientPrecompute.h
index 38e6b47fb45d26d88e1b4d5cd1e2ea42961c871c..6880517f3e6f1b50a90f4619c9f77a8a0ace9098 100644
--- a/Filters/General/vtkDataSetGradientPrecompute.h
+++ b/Filters/General/vtkDataSetGradientPrecompute.h
@@ -25,8 +25,8 @@
 // BP12, F-91297 Arpajon, France. <br>
 // Implementation by Thierry Carrard (CEA)
 
-#ifndef __vtkDataSetGradientPrecompute_h
-#define __vtkDataSetGradientPrecompute_h
+#ifndef vtkDataSetGradientPrecompute_h
+#define vtkDataSetGradientPrecompute_h
 
 #include "vtkFiltersGeneralModule.h" // For export macro
 #include "vtkDataSetAlgorithm.h"
diff --git a/Filters/General/vtkDataSetTriangleFilter.h b/Filters/General/vtkDataSetTriangleFilter.h
index 45919e2d4a2e4f252b16d3faf7d2d42e1ad2da20..3aa41f039fe84dea31e119d142a5be36d2a3598e 100644
--- a/Filters/General/vtkDataSetTriangleFilter.h
+++ b/Filters/General/vtkDataSetTriangleFilter.h
@@ -28,8 +28,8 @@
 // .SECTION See Also
 // vtkOrderedTriangulator vtkTriangleFilter
 
-#ifndef __vtkDataSetTriangleFilter_h
-#define __vtkDataSetTriangleFilter_h
+#ifndef vtkDataSetTriangleFilter_h
+#define vtkDataSetTriangleFilter_h
 
 #include "vtkFiltersGeneralModule.h" // For export macro
 #include "vtkUnstructuredGridAlgorithm.h"
diff --git a/Filters/General/vtkDeformPointSet.h b/Filters/General/vtkDeformPointSet.h
index f476b94a9a6ae20b63dc4d66fcb9998ff39bd03a..2568f515c1663fc8fbdabcee1617f5ee717b1075 100644
--- a/Filters/General/vtkDeformPointSet.h
+++ b/Filters/General/vtkDeformPointSet.h
@@ -54,8 +54,8 @@
 // vtkMeanValueCoordinatesInterpolator vtkProbePolyhedron vtkPolyhedron
 
 
-#ifndef __vtkDeformPointSet_h
-#define __vtkDeformPointSet_h
+#ifndef vtkDeformPointSet_h
+#define vtkDeformPointSet_h
 
 #include "vtkFiltersGeneralModule.h" // For export macro
 #include "vtkPointSetAlgorithm.h"
diff --git a/Filters/General/vtkDensifyPolyData.h b/Filters/General/vtkDensifyPolyData.h
index c002dfcb5281a5f63a60a9b8443b9ba3c325dd44..96a3d90bc2a88f460b97930a851bcb9f570f6826 100644
--- a/Filters/General/vtkDensifyPolyData.h
+++ b/Filters/General/vtkDensifyPolyData.h
@@ -27,8 +27,8 @@
 // The number of subdivisions can be controlled by the parameter
 // NumberOfSubdivisions.
 
-#ifndef __vtkDensifyPolyData_h
-#define __vtkDensifyPolyData_h
+#ifndef vtkDensifyPolyData_h
+#define vtkDensifyPolyData_h
 
 #include "vtkFiltersGeneralModule.h" // For export macro
 #include "vtkPolyDataAlgorithm.h"
diff --git a/Filters/General/vtkDicer.h b/Filters/General/vtkDicer.h
index ad6e76e0d8fa86419428c8d541f9a80437683a07..25e41bc1f6426726862781fde3e3535327aff3a4 100644
--- a/Filters/General/vtkDicer.h
+++ b/Filters/General/vtkDicer.h
@@ -38,8 +38,8 @@
 // .SECTION See Also
 // vtkOBBDicer vtkConnectedDicer vtkSpatialDicer
 
-#ifndef __vtkDicer_h
-#define __vtkDicer_h
+#ifndef vtkDicer_h
+#define vtkDicer_h
 
 #include "vtkFiltersGeneralModule.h" // For export macro
 #include "vtkDataSetAlgorithm.h"
diff --git a/Filters/General/vtkDiscreteMarchingCubes.h b/Filters/General/vtkDiscreteMarchingCubes.h
index f328a98973e40bda1709b2904eb0d78448a9bdbb..95b684f82ba6c165fe56268cff40ad1632818b44 100644
--- a/Filters/General/vtkDiscreteMarchingCubes.h
+++ b/Filters/General/vtkDiscreteMarchingCubes.h
@@ -50,8 +50,8 @@
 // .SECTION See Also
 // vtkContourFilter vtkSliceCubes vtkMarchingSquares vtkDividingCubes
 
-#ifndef __vtkDiscreteMarchingCubes_h
-#define __vtkDiscreteMarchingCubes_h
+#ifndef vtkDiscreteMarchingCubes_h
+#define vtkDiscreteMarchingCubes_h
 
 #include "vtkFiltersGeneralModule.h" // For export macro
 #include "vtkMarchingCubes.h"
diff --git a/Filters/General/vtkDistancePolyDataFilter.h b/Filters/General/vtkDistancePolyDataFilter.h
index 6b9d47ec6322e1ec743087b7bf90e9664f7a2b42..5947625e2841de52963bfbca9c04c66de0326fa5 100644
--- a/Filters/General/vtkDistancePolyDataFilter.h
+++ b/Filters/General/vtkDistancePolyDataFilter.h
@@ -32,8 +32,8 @@
 // http://hdl.handle.net/10380/3262
 // http://www.midasjournal.org/browse/publication/797
 
-#ifndef __vtkDistancePolyDataFilter_h
-#define __vtkDistancePolyDataFilter_h
+#ifndef vtkDistancePolyDataFilter_h
+#define vtkDistancePolyDataFilter_h
 
 #include "vtkFiltersGeneralModule.h" // For export macro
 #include "vtkPolyDataAlgorithm.h"
diff --git a/Filters/General/vtkEdgePoints.h b/Filters/General/vtkEdgePoints.h
index 282a33d2496b5fa31572f69d7ee8e3d85a80afc7..03c1c4110b1407388fa10e929b06bf4fb718ddee 100644
--- a/Filters/General/vtkEdgePoints.h
+++ b/Filters/General/vtkEdgePoints.h
@@ -24,8 +24,8 @@
 // not in the interior, and at lower density than dividing cubes. However, it
 // is more general than dividing cubes since it treats any type of dataset.
 
-#ifndef __vtkEdgePoints_h
-#define __vtkEdgePoints_h
+#ifndef vtkEdgePoints_h
+#define vtkEdgePoints_h
 
 #include "vtkFiltersGeneralModule.h" // For export macro
 #include "vtkPolyDataAlgorithm.h"
diff --git a/Filters/General/vtkExtractArray.h b/Filters/General/vtkExtractArray.h
index 6245b1b12508ced069141317d49857e0d11c4cae..dd45626a2905e6daa6cfedbf45f718d5b88c623e 100644
--- a/Filters/General/vtkExtractArray.h
+++ b/Filters/General/vtkExtractArray.h
@@ -26,8 +26,8 @@
 // .SECTION Thanks
 // Developed by Timothy M. Shead (tshead@sandia.gov) at Sandia National Laboratories.
 
-#ifndef __vtkExtractArray_h
-#define __vtkExtractArray_h
+#ifndef vtkExtractArray_h
+#define vtkExtractArray_h
 
 #include "vtkFiltersGeneralModule.h" // For export macro
 #include "vtkArrayDataAlgorithm.h"
diff --git a/Filters/General/vtkGradientFilter.h b/Filters/General/vtkGradientFilter.h
index 09ca53133dae5ecb170f45f0220d77b8757a7e14..84ece34147737b60ced12272f57e463de5a04583 100644
--- a/Filters/General/vtkGradientFilter.h
+++ b/Filters/General/vtkGradientFilter.h
@@ -30,8 +30,8 @@
 // dw/dy, dw/dz} for an input array {u, v, w}. There are also the options
 // to additionally compute the vorticity and Q criterion of a vector field.
 
-#ifndef __vtkGradientFilter_h
-#define __vtkGradientFilter_h
+#ifndef vtkGradientFilter_h
+#define vtkGradientFilter_h
 
 #include "vtkFiltersGeneralModule.h" // For export macro
 #include "vtkDataSetAlgorithm.h"
diff --git a/Filters/General/vtkGraphLayoutFilter.h b/Filters/General/vtkGraphLayoutFilter.h
index 9e3e63a9386787f4f43cadaf0c798099c3c8e035..13faaed94211690611b27f46c7b40d884c532a43 100644
--- a/Filters/General/vtkGraphLayoutFilter.h
+++ b/Filters/General/vtkGraphLayoutFilter.h
@@ -28,8 +28,8 @@
 // can just use automatic bounds computation); and modify the cool down
 // rate (controls the final process of simulated annealing).
 
-#ifndef __vtkGraphLayoutFilter_h
-#define __vtkGraphLayoutFilter_h
+#ifndef vtkGraphLayoutFilter_h
+#define vtkGraphLayoutFilter_h
 
 #include "vtkFiltersGeneralModule.h" // For export macro
 #include "vtkPolyDataAlgorithm.h"
diff --git a/Filters/General/vtkGraphToPoints.h b/Filters/General/vtkGraphToPoints.h
index 4b283f4dd1ea58c2354aa83721b241df87d413ea..7660fa628a04e260d71b96ce31c3da61363b2be2 100644
--- a/Filters/General/vtkGraphToPoints.h
+++ b/Filters/General/vtkGraphToPoints.h
@@ -25,8 +25,8 @@
 // of the graph have already been filled (perhaps by vtkGraphLayout).
 // The vertex data is passed along to the point data.
 
-#ifndef __vtkGraphToPoints_h
-#define __vtkGraphToPoints_h
+#ifndef vtkGraphToPoints_h
+#define vtkGraphToPoints_h
 
 #include "vtkFiltersGeneralModule.h" // For export macro
 #include "vtkPolyDataAlgorithm.h"
diff --git a/Filters/General/vtkGraphWeightEuclideanDistanceFilter.h b/Filters/General/vtkGraphWeightEuclideanDistanceFilter.h
index df4b3f0c02d359a930a977ba1f9b31e2d3e84e87..7cd4f0773df9bdea7183129862aa5e37e3b6376c 100644
--- a/Filters/General/vtkGraphWeightEuclideanDistanceFilter.h
+++ b/Filters/General/vtkGraphWeightEuclideanDistanceFilter.h
@@ -18,8 +18,8 @@
 // .SECTION Description
 // Weights the edges of a graph based on the Euclidean distance between the points.
 
-#ifndef __vtkGraphWeightEuclideanDistanceFilter_h
-#define __vtkGraphWeightEuclideanDistanceFilter_h
+#ifndef vtkGraphWeightEuclideanDistanceFilter_h
+#define vtkGraphWeightEuclideanDistanceFilter_h
 
 #include "vtkFiltersGeneralModule.h" // For export macro
 #include "vtkGraphWeightFilter.h"
diff --git a/Filters/General/vtkGraphWeightFilter.h b/Filters/General/vtkGraphWeightFilter.h
index a587ab80ab22d0ad17e821061cc8fb7f62f4933a..36a4b4e65f8775d93679f7a5443695a9da8c2d3a 100644
--- a/Filters/General/vtkGraphWeightFilter.h
+++ b/Filters/General/vtkGraphWeightFilter.h
@@ -25,8 +25,8 @@
 // that the input graph has all of the properties that will be required
 // by the ComputeWeight function.
 
-#ifndef __vtkGraphWeightFilter_h
-#define __vtkGraphWeightFilter_h
+#ifndef vtkGraphWeightFilter_h
+#define vtkGraphWeightFilter_h
 
 #include "vtkFiltersGeneralModule.h" // For export macro
 #include "vtkGraphAlgorithm.h"
diff --git a/Filters/General/vtkHierarchicalDataLevelFilter.h b/Filters/General/vtkHierarchicalDataLevelFilter.h
index 5f96a600eb4ad73f90ae269c2018798a28710b99..6f89a2f5444416fbfe69500b95159e276277f7e9 100644
--- a/Filters/General/vtkHierarchicalDataLevelFilter.h
+++ b/Filters/General/vtkHierarchicalDataLevelFilter.h
@@ -19,8 +19,8 @@
 // .SECTION See Also
 // vtkLevelIdScalars
 
-#ifndef __vtkHierarchicalDataLevelFilter_h
-#define __vtkHierarchicalDataLevelFilter_h
+#ifndef vtkHierarchicalDataLevelFilter_h
+#define vtkHierarchicalDataLevelFilter_h
 
 #include "vtkFiltersGeneralModule.h" // For export macro
 #include "vtkLevelIdScalars.h"
diff --git a/Filters/General/vtkHyperStreamline.h b/Filters/General/vtkHyperStreamline.h
index 7b972811450b78e7277db0e14e8a5ed1922afccb..38aee3f5d8ff1d035bbb27813da22d958500177f 100644
--- a/Filters/General/vtkHyperStreamline.h
+++ b/Filters/General/vtkHyperStreamline.h
@@ -42,8 +42,8 @@
 // .SECTION See Also
 // vtkTensorGlyph vtkStreamer
 
-#ifndef __vtkHyperStreamline_h
-#define __vtkHyperStreamline_h
+#ifndef vtkHyperStreamline_h
+#define vtkHyperStreamline_h
 
 #include "vtkFiltersGeneralModule.h" // For export macro
 #include "vtkPolyDataAlgorithm.h"
diff --git a/Filters/General/vtkIconGlyphFilter.h b/Filters/General/vtkIconGlyphFilter.h
index 6f2c5e9ef30fefa578852062867423256b989435..e749c3a879616f68b7bc9dce046755a8f8d4b822 100644
--- a/Filters/General/vtkIconGlyphFilter.h
+++ b/Filters/General/vtkIconGlyphFilter.h
@@ -33,8 +33,8 @@
 // .SECTION See Also
 // vtkPolyDataAlgorithm vtkGlyph3D vtkGlyph2D
 
-#ifndef __vtkIconGlyphFilter_h
-#define __vtkIconGlyphFilter_h
+#ifndef vtkIconGlyphFilter_h
+#define vtkIconGlyphFilter_h
 
 #include "vtkFiltersGeneralModule.h" // For export macro
 #include "vtkPolyDataAlgorithm.h"
diff --git a/Filters/General/vtkImageDataToPointSet.h b/Filters/General/vtkImageDataToPointSet.h
index e5cfdec533d3771e817a512f1cf8fc39a0c26460..4c5f424bfe6b4a4c314c877a798f575bf876cabb 100644
--- a/Filters/General/vtkImageDataToPointSet.h
+++ b/Filters/General/vtkImageDataToPointSet.h
@@ -27,8 +27,8 @@
 // This class was developed by Kenneth Moreland (kmorel@sandia.gov) from
 // Sandia National Laboratories.
 
-#ifndef __vtkImageDataToPointSet_h
-#define __vtkImageDataToPointSet_h
+#ifndef vtkImageDataToPointSet_h
+#define vtkImageDataToPointSet_h
 
 #include "vtkFiltersGeneralModule.h" // For export macro
 #include "vtkStructuredGridAlgorithm.h"
@@ -62,4 +62,4 @@ private:
 };
 
 
-#endif //__vtkImageDataToPointSet_h
+#endif //vtkImageDataToPointSet_h
diff --git a/Filters/General/vtkImageMarchingCubes.h b/Filters/General/vtkImageMarchingCubes.h
index 8b8d3766b717061a864340b8f44b8c58d0ba8544..5b04d86d620deee9b260328d64fafb735b9be866 100644
--- a/Filters/General/vtkImageMarchingCubes.h
+++ b/Filters/General/vtkImageMarchingCubes.h
@@ -31,8 +31,8 @@
 // vtkContourFilter vtkSliceCubes vtkMarchingSquares vtkSynchronizedTemplates3D
 
 
-#ifndef __vtkImageMarchingCubes_h
-#define __vtkImageMarchingCubes_h
+#ifndef vtkImageMarchingCubes_h
+#define vtkImageMarchingCubes_h
 
 #include "vtkFiltersGeneralModule.h" // For export macro
 #include "vtkPolyDataAlgorithm.h"
diff --git a/Filters/General/vtkInterpolateDataSetAttributes.h b/Filters/General/vtkInterpolateDataSetAttributes.h
index 9758a026748357c08f88ba5d4ed8377ba452c4b3..cd0ac79b323540f4db2960e884192b5bd03316e3 100644
--- a/Filters/General/vtkInterpolateDataSetAttributes.h
+++ b/Filters/General/vtkInterpolateDataSetAttributes.h
@@ -27,8 +27,8 @@
 // example, if one input has scalars and vectors, and another has just
 // scalars, then only scalars will be interpolated and output.)
 
-#ifndef __vtkInterpolateDataSetAttributes_h
-#define __vtkInterpolateDataSetAttributes_h
+#ifndef vtkInterpolateDataSetAttributes_h
+#define vtkInterpolateDataSetAttributes_h
 
 #include "vtkFiltersGeneralModule.h" // For export macro
 #include "vtkDataSetAlgorithm.h"
diff --git a/Filters/General/vtkInterpolatingSubdivisionFilter.h b/Filters/General/vtkInterpolatingSubdivisionFilter.h
index a90c775514c00c3bbe86cb9a1483feab30836b38..759d58d96cf1f53855f9064b210f8a797cb6cf52 100644
--- a/Filters/General/vtkInterpolatingSubdivisionFilter.h
+++ b/Filters/General/vtkInterpolatingSubdivisionFilter.h
@@ -24,8 +24,8 @@
 // .SECTION See Also
 // vtkLinearSubdivisionFilter vtkButterflySubdivisionFilter
 
-#ifndef __vtkInterpolatingSubdivisionFilter_h
-#define __vtkInterpolatingSubdivisionFilter_h
+#ifndef vtkInterpolatingSubdivisionFilter_h
+#define vtkInterpolatingSubdivisionFilter_h
 
 #include "vtkFiltersGeneralModule.h" // For export macro
 #include "vtkPolyDataAlgorithm.h"
diff --git a/Filters/General/vtkIntersectionPolyDataFilter.h b/Filters/General/vtkIntersectionPolyDataFilter.h
index 18be053676c4929dc476da48736f7b8b2a469312..80c986a5604063e53af4f3b7dca20d0c91b5b370 100644
--- a/Filters/General/vtkIntersectionPolyDataFilter.h
+++ b/Filters/General/vtkIntersectionPolyDataFilter.h
@@ -28,8 +28,8 @@
 // http://hdl.handle.net/10380/3262
 // http://www.insight-journal.org/browse/publication/797
 
-#ifndef __vtkIntersectionPolyDataFilter_h
-#define __vtkIntersectionPolyDataFilter_h
+#ifndef vtkIntersectionPolyDataFilter_h
+#define vtkIntersectionPolyDataFilter_h
 
 #include "vtkFiltersGeneralModule.h" // For export macro
 #include "vtkPolyDataAlgorithm.h"
@@ -83,4 +83,4 @@ private:
 };
 
 
-#endif // __vtkIntersectionPolyDataFilter_h
+#endif // vtkIntersectionPolyDataFilter_h
diff --git a/Filters/General/vtkLinkEdgels.h b/Filters/General/vtkLinkEdgels.h
index 76144ac7a9e418962c80bede047a07d6ad9305d6..1856f92e174d6f791f7daaa3b8af549a05a1f7b1 100644
--- a/Filters/General/vtkLinkEdgels.h
+++ b/Filters/General/vtkLinkEdgels.h
@@ -42,8 +42,8 @@
 // .SECTION see also
 // vtkImageData vtkImageGradient vtkImageNonMaximumSuppression
 
-#ifndef __vtkLinkEdgels_h
-#define __vtkLinkEdgels_h
+#ifndef vtkLinkEdgels_h
+#define vtkLinkEdgels_h
 
 #include "vtkFiltersGeneralModule.h" // For export macro
 #include "vtkPolyDataAlgorithm.h"
diff --git a/Filters/General/vtkMarchingContourFilter.h b/Filters/General/vtkMarchingContourFilter.h
index faf5dc53e95290d25801855b35f6004896a1ec1a..b543d7a66b7b0784f952d3d88280a904f64bf04f 100644
--- a/Filters/General/vtkMarchingContourFilter.h
+++ b/Filters/General/vtkMarchingContourFilter.h
@@ -48,8 +48,8 @@
 // vtkMarchingCubes vtkSliceCubes vtkDividingCubes vtkMarchingSquares
 // vtkImageMarchingCubes
 
-#ifndef __vtkMarchingContourFilter_h
-#define __vtkMarchingContourFilter_h
+#ifndef vtkMarchingContourFilter_h
+#define vtkMarchingContourFilter_h
 
 #include "vtkFiltersGeneralModule.h" // For export macro
 #include "vtkPolyDataAlgorithm.h"
diff --git a/Filters/General/vtkMatricizeArray.h b/Filters/General/vtkMatricizeArray.h
index cd2d91cb0ce8c2039c07e889886d55c2abe31726..d107f21d2b7ef91748ff229e4b880da64fcf9db2 100644
--- a/Filters/General/vtkMatricizeArray.h
+++ b/Filters/General/vtkMatricizeArray.h
@@ -30,8 +30,8 @@
 // .SECTION Thanks
 // Developed by Timothy M. Shead (tshead@sandia.gov) at Sandia National Laboratories.
 
-#ifndef __vtkMatricizeArray_h
-#define __vtkMatricizeArray_h
+#ifndef vtkMatricizeArray_h
+#define vtkMatricizeArray_h
 
 #include "vtkFiltersGeneralModule.h" // For export macro
 #include "vtkArrayDataAlgorithm.h"
diff --git a/Filters/General/vtkMergeCells.h b/Filters/General/vtkMergeCells.h
index d1d9d68da6432ff830c21bc9a397ef9f488426b1..0804b15f1cf63897d7d6bb445d61c28e64e5daae 100644
--- a/Filters/General/vtkMergeCells.h
+++ b/Filters/General/vtkMergeCells.h
@@ -39,8 +39,8 @@
 //    arrays (3) this class knows duplicate points may be appearing in
 //    the DataSets and can filter those out, (4) this class is not a filter.
 
-#ifndef __vtkMergeCells_h
-#define __vtkMergeCells_h
+#ifndef vtkMergeCells_h
+#define vtkMergeCells_h
 
 #include "vtkFiltersGeneralModule.h" // For export macro
 #include "vtkObject.h"
diff --git a/Filters/General/vtkMultiBlockDataGroupFilter.h b/Filters/General/vtkMultiBlockDataGroupFilter.h
index 0e9680f5d3b2a998b27db996a46bbd7d9d84bdd6..f09c9cdb13ea184ddfc580157a3ebb7f5f7018fd 100644
--- a/Filters/General/vtkMultiBlockDataGroupFilter.h
+++ b/Filters/General/vtkMultiBlockDataGroupFilter.h
@@ -20,8 +20,8 @@
 // as a sub-block. For example, if there are two inputs and four update
 // pieces, the output contains two groups with four datasets each.
 
-#ifndef __vtkMultiBlockDataGroupFilter_h
-#define __vtkMultiBlockDataGroupFilter_h
+#ifndef vtkMultiBlockDataGroupFilter_h
+#define vtkMultiBlockDataGroupFilter_h
 
 #include "vtkFiltersGeneralModule.h" // For export macro
 #include "vtkMultiBlockDataSetAlgorithm.h"
diff --git a/Filters/General/vtkMultiBlockMergeFilter.h b/Filters/General/vtkMultiBlockMergeFilter.h
index 70bb230296fa795ef06bed115250389c67cdf50e..0556720e209d666f859cf2eee264a53aca8e2bda 100644
--- a/Filters/General/vtkMultiBlockMergeFilter.h
+++ b/Filters/General/vtkMultiBlockMergeFilter.h
@@ -21,8 +21,8 @@
 // produce M blocks, each of which has N datasets. Inside the merged group,
 // the i'th data set comes from the i'th data set in the i'th input.
 
-#ifndef __vtkMultiBlockMergeFilter_h
-#define __vtkMultiBlockMergeFilter_h
+#ifndef vtkMultiBlockMergeFilter_h
+#define vtkMultiBlockMergeFilter_h
 
 #include "vtkFiltersGeneralModule.h" // For export macro
 #include "vtkMultiBlockDataSetAlgorithm.h"
diff --git a/Filters/General/vtkMultiThreshold.h b/Filters/General/vtkMultiThreshold.h
index 673f343ab884931255162fb26e0ef2908e28a8c5..411d61c942dc64916677c3004aef557c3afeab83 100644
--- a/Filters/General/vtkMultiThreshold.h
+++ b/Filters/General/vtkMultiThreshold.h
@@ -95,8 +95,8 @@
 // \enddot
 // The filled rectangles represent sets that are output.
 
-#ifndef __vtkMultiThreshold_h
-#define __vtkMultiThreshold_h
+#ifndef vtkMultiThreshold_h
+#define vtkMultiThreshold_h
 
 #include "vtkFiltersGeneralModule.h" // For export macro
 #include "vtkMultiBlockDataSetAlgorithm.h"
@@ -471,4 +471,4 @@ inline vtkMultiThreshold::BooleanSet* vtkMultiThreshold::BooleanSet::GetBooleanS
   return this;
 }
 
-#endif // __vtkMultiThreshold_h
+#endif // vtkMultiThreshold_h
diff --git a/Filters/General/vtkNonOverlappingAMRLevelIdScalars.h b/Filters/General/vtkNonOverlappingAMRLevelIdScalars.h
index 24dac48438358c118d5bdc1211d89013e46a7809..f2dceef4afff8b48c6a53eff2c2eb6fcd0af3b5b 100644
--- a/Filters/General/vtkNonOverlappingAMRLevelIdScalars.h
+++ b/Filters/General/vtkNonOverlappingAMRLevelIdScalars.h
@@ -18,8 +18,8 @@
 // the level number for each level. Note that all datasets within a level get
 // the same scalar. The new scalars array is named \c LevelIdScalars.
 
-#ifndef __vtkNonOverlappingAMRLevelIdScalars_h
-#define __vtkNonOverlappingAMRLevelIdScalars_h
+#ifndef vtkNonOverlappingAMRLevelIdScalars_h
+#define vtkNonOverlappingAMRLevelIdScalars_h
 
 #include "vtkFiltersGeneralModule.h" // For export macro
 #include "vtkNonOverlappingAMRAlgorithm.h"
diff --git a/Filters/General/vtkNormalizeMatrixVectors.h b/Filters/General/vtkNormalizeMatrixVectors.h
index 02495929479c44b0913b5b09e6483fb95cc04de6..9f0049e09180acb356de3d00a6cf2f24dc3864f0 100644
--- a/Filters/General/vtkNormalizeMatrixVectors.h
+++ b/Filters/General/vtkNormalizeMatrixVectors.h
@@ -26,8 +26,8 @@
 // .SECTION Thanks
 // Developed by Timothy M. Shead (tshead@sandia.gov) at Sandia National Laboratories.
 
-#ifndef __vtkNormalizeMatrixVectors_h
-#define __vtkNormalizeMatrixVectors_h
+#ifndef vtkNormalizeMatrixVectors_h
+#define vtkNormalizeMatrixVectors_h
 
 #include "vtkFiltersGeneralModule.h" // For export macro
 #include "vtkArrayDataAlgorithm.h"
diff --git a/Filters/General/vtkOBBDicer.h b/Filters/General/vtkOBBDicer.h
index aa615d8f03da978ac96e6e4be9877df59418c6dd..fda81b4014d06905ce95f3bfc75bae270b789b9f 100644
--- a/Filters/General/vtkOBBDicer.h
+++ b/Filters/General/vtkOBBDicer.h
@@ -25,8 +25,8 @@
 // .SECTION See Also
 // vtkDicer vtkConnectedDicer
 
-#ifndef __vtkOBBDicer_h
-#define __vtkOBBDicer_h
+#ifndef vtkOBBDicer_h
+#define vtkOBBDicer_h
 
 #include "vtkFiltersGeneralModule.h" // For export macro
 #include "vtkDicer.h"
diff --git a/Filters/General/vtkOBBTree.h b/Filters/General/vtkOBBTree.h
index 6082802d0e170dd0c4d17a4c2c5c10134e66bffa..cab0f789fbe098d40e1e0476ecd9cc4a48464813 100644
--- a/Filters/General/vtkOBBTree.h
+++ b/Filters/General/vtkOBBTree.h
@@ -46,8 +46,8 @@
 // .SECTION See Also
 // vtkLocator vtkCellLocator vtkPointLocator
 
-#ifndef __vtkOBBTree_h
-#define __vtkOBBTree_h
+#ifndef vtkOBBTree_h
+#define vtkOBBTree_h
 
 #include "vtkFiltersGeneralModule.h" // For export macro
 #include "vtkAbstractCellLocator.h"
diff --git a/Filters/General/vtkOverlappingAMRLevelIdScalars.h b/Filters/General/vtkOverlappingAMRLevelIdScalars.h
index 94b390610b38c30d7bfd731a1b5c316daf1728c1..b124cb169cb0123c38eee9376d6b1d3df093d1de 100644
--- a/Filters/General/vtkOverlappingAMRLevelIdScalars.h
+++ b/Filters/General/vtkOverlappingAMRLevelIdScalars.h
@@ -18,8 +18,8 @@
 // the level number for each level. Note that all datasets within a level get
 // the same scalar. The new scalars array is named \c LevelIdScalars.
 
-#ifndef __vtkOverlappingAMRLevelIdScalars_h
-#define __vtkOverlappingAMRLevelIdScalars_h
+#ifndef vtkOverlappingAMRLevelIdScalars_h
+#define vtkOverlappingAMRLevelIdScalars_h
 
 #include "vtkFiltersGeneralModule.h" // For export macro
 #include "vtkOverlappingAMRAlgorithm.h"
diff --git a/Filters/General/vtkPassArrays.h b/Filters/General/vtkPassArrays.h
index 61d4911622b58c55cba78caa8ac57514153c16c9..58ca73ea493b8879e559137742983e468eeaacb6 100644
--- a/Filters/General/vtkPassArrays.h
+++ b/Filters/General/vtkPassArrays.h
@@ -54,8 +54,8 @@
 // would be cleared since you did not specify any arrays to pass. Field data would
 // still be untouched.
 
-#ifndef __vtkPassArrays_h
-#define __vtkPassArrays_h
+#ifndef vtkPassArrays_h
+#define vtkPassArrays_h
 
 #include "vtkFiltersGeneralModule.h" // For export macro
 #include "vtkDataObjectAlgorithm.h"
diff --git a/Filters/General/vtkPassThrough.h b/Filters/General/vtkPassThrough.h
index 820875c66cf5b747588067a26d2a7835d1ca3273..0ac6b5664cefa625dc8834953f6e08da58a8a19d 100644
--- a/Filters/General/vtkPassThrough.h
+++ b/Filters/General/vtkPassThrough.h
@@ -17,8 +17,8 @@
 // .SECTION Description
 // The output type is always the same as the input object type.
 
-#ifndef __vtkPassThrough_h
-#define __vtkPassThrough_h
+#ifndef vtkPassThrough_h
+#define vtkPassThrough_h
 
 #include "vtkFiltersGeneralModule.h" // For export macro
 #include "vtkPassInputTypeAlgorithm.h"
diff --git a/Filters/General/vtkPolyDataStreamer.h b/Filters/General/vtkPolyDataStreamer.h
index 53e581f60b02709bf5654efd7ac41187d642234f..6d332bfdaed7c45706114b248b5aabf223befe4a 100644
--- a/Filters/General/vtkPolyDataStreamer.h
+++ b/Filters/General/vtkPolyDataStreamer.h
@@ -27,8 +27,8 @@
 // .SECTION See Also
 // vtkAppendFilter
 
-#ifndef __vtkPolyDataStreamer_h
-#define __vtkPolyDataStreamer_h
+#ifndef vtkPolyDataStreamer_h
+#define vtkPolyDataStreamer_h
 
 #include "vtkFiltersGeneralModule.h" // For export macro
 #include "vtkStreamerBase.h"
diff --git a/Filters/General/vtkPolyDataToReebGraphFilter.h b/Filters/General/vtkPolyDataToReebGraphFilter.h
index 2954e0c819b064bbd63053d7fa33234fb596bd87..84950c68d7576a6a19c18901cd36b96cd43848d2 100644
--- a/Filters/General/vtkPolyDataToReebGraphFilter.h
+++ b/Filters/General/vtkPolyDataToReebGraphFilter.h
@@ -20,8 +20,8 @@
 // If this field does not exist, the filter will use the vtkElevationFilter to
 // generate a default scalar field.
 
-#ifndef __vtkPolyDataToReebGraphFilter_h
-#define __vtkPolyDataToReebGraphFilter_h
+#ifndef vtkPolyDataToReebGraphFilter_h
+#define vtkPolyDataToReebGraphFilter_h
 
 #include "vtkFiltersGeneralModule.h" // For export macro
 #include "vtkDirectedGraphAlgorithm.h"
diff --git a/Filters/General/vtkProbePolyhedron.h b/Filters/General/vtkProbePolyhedron.h
index 33d132af089fe873f4751095860a3e777888bdd1..d09d858b91b7df1acaf74dc98f2eb55073638d8e 100644
--- a/Filters/General/vtkProbePolyhedron.h
+++ b/Filters/General/vtkProbePolyhedron.h
@@ -46,8 +46,8 @@
 // vtkProbeFilter vtkMeanValueCoordinatesInterpolator vtkPolyhedron
 
 
-#ifndef __vtkProbePolyhedron_h
-#define __vtkProbePolyhedron_h
+#ifndef vtkProbePolyhedron_h
+#define vtkProbePolyhedron_h
 
 #include "vtkFiltersGeneralModule.h" // For export macro
 #include "vtkDataSetAlgorithm.h"
diff --git a/Filters/General/vtkQuantizePolyDataPoints.h b/Filters/General/vtkQuantizePolyDataPoints.h
index db4134eee6721480050034bb4521fdea439db719..af0fa30d9d71432f61712f30efb856c650dc19a9 100644
--- a/Filters/General/vtkQuantizePolyDataPoints.h
+++ b/Filters/General/vtkQuantizePolyDataPoints.h
@@ -35,8 +35,8 @@
 // .SECTION See Also
 // vtkCleanPolyData
 
-#ifndef __vtkQuantizePolyDataPoints_h
-#define __vtkQuantizePolyDataPoints_h
+#ifndef vtkQuantizePolyDataPoints_h
+#define vtkQuantizePolyDataPoints_h
 
 #include "vtkFiltersGeneralModule.h" // For export macro
 #include "vtkCleanPolyData.h"
diff --git a/Filters/General/vtkRandomAttributeGenerator.h b/Filters/General/vtkRandomAttributeGenerator.h
index 6b517e78c8754a8b013f1e3fac46895d6bef99a1..ae0fef002b13b20a3c3a88a173c98e1ebb5e8dfb 100644
--- a/Filters/General/vtkRandomAttributeGenerator.h
+++ b/Filters/General/vtkRandomAttributeGenerator.h
@@ -43,8 +43,8 @@
 // vtkBrownianPoints
 
 
-#ifndef __vtkRandomAttributeGenerator_h
-#define __vtkRandomAttributeGenerator_h
+#ifndef vtkRandomAttributeGenerator_h
+#define vtkRandomAttributeGenerator_h
 
 #include "vtkFiltersGeneralModule.h" // For export macro
 #include "vtkPassInputTypeAlgorithm.h"
diff --git a/Filters/General/vtkRectilinearGridClip.h b/Filters/General/vtkRectilinearGridClip.h
index fb076962e972dc4bd7ca6607b51925efc0f35a83..9aeed76bfa83fd801ab35fc85996103fa912674a 100644
--- a/Filters/General/vtkRectilinearGridClip.h
+++ b/Filters/General/vtkRectilinearGridClip.h
@@ -21,8 +21,8 @@
 // Only the whole extent is modified.
 // 2: If ClipDataOn is set, then you will get no more that the clipped
 // extent.
-#ifndef __vtkRectilinearGridClip_h
-#define __vtkRectilinearGridClip_h
+#ifndef vtkRectilinearGridClip_h
+#define vtkRectilinearGridClip_h
 
 // I did not make this a subclass of in place filter because
 // the references on the data do not matter. I make no modifications
diff --git a/Filters/General/vtkRectilinearGridToPointSet.h b/Filters/General/vtkRectilinearGridToPointSet.h
index fc56077c4b7d8aea99356bb26858d9a07b71641f..433c400f976702fb15f6d2e090f2d5a05de1bec6 100644
--- a/Filters/General/vtkRectilinearGridToPointSet.h
+++ b/Filters/General/vtkRectilinearGridToPointSet.h
@@ -28,8 +28,8 @@
 // This class was developed by Kenneth Moreland (kmorel@sandia.gov) from
 // Sandia National Laboratories.
 
-#ifndef __vtkRectilinearGridToPointSet_h
-#define __vtkRectilinearGridToPointSet_h
+#ifndef vtkRectilinearGridToPointSet_h
+#define vtkRectilinearGridToPointSet_h
 
 #include "vtkFiltersGeneralModule.h" // For export macro
 #include "vtkStructuredGridAlgorithm.h"
@@ -63,4 +63,4 @@ private:
 };
 
 
-#endif //__vtkRectilinearGridToPointSet_h
+#endif //vtkRectilinearGridToPointSet_h
diff --git a/Filters/General/vtkRectilinearGridToTetrahedra.h b/Filters/General/vtkRectilinearGridToTetrahedra.h
index 591cc1505be1e3d42a377b90a4e90c20faeeedfc..dbd39ba0a6d8cea4c62b16bc1818019036cc7da6 100644
--- a/Filters/General/vtkRectilinearGridToTetrahedra.h
+++ b/Filters/General/vtkRectilinearGridToTetrahedra.h
@@ -40,8 +40,8 @@
 // .SECTION See Also
 //    vtkDelaunay3D
 
-#ifndef __vtkRectilinearGridToTetrahedra_h
-#define __vtkRectilinearGridToTetrahedra_h
+#ifndef vtkRectilinearGridToTetrahedra_h
+#define vtkRectilinearGridToTetrahedra_h
 
 // ways to create the mesh from voxels
 #define VTK_VOXEL_TO_12_TET      12
@@ -152,5 +152,5 @@ protected:
 //ETX
 };
 
-#endif /* __vtkRectilinearGridToTetrahedra_h */
+#endif /* vtkRectilinearGridToTetrahedra_h */
 
diff --git a/Filters/General/vtkRecursiveDividingCubes.h b/Filters/General/vtkRecursiveDividingCubes.h
index 61d072352eac64a77a32b278beecc1730f1feacf..95ef904bf15dca9dfd7c14078706be83d8b91388 100644
--- a/Filters/General/vtkRecursiveDividingCubes.h
+++ b/Filters/General/vtkRecursiveDividingCubes.h
@@ -31,8 +31,8 @@
 // .SECTION See Also
 // vtkDividingCubes vtkContourFilter vtkMarchingCubes
 
-#ifndef __vtkRecursiveDividingCubes_h
-#define __vtkRecursiveDividingCubes_h
+#ifndef vtkRecursiveDividingCubes_h
+#define vtkRecursiveDividingCubes_h
 
 #include "vtkFiltersGeneralModule.h" // For export macro
 #include "vtkPolyDataAlgorithm.h"
diff --git a/Filters/General/vtkReflectionFilter.h b/Filters/General/vtkReflectionFilter.h
index 9a6d7694f1d3b21165b378368c39633bf64244cd..8d13d54acd48ef8b7254181849639ff609a8b24b 100644
--- a/Filters/General/vtkReflectionFilter.h
+++ b/Filters/General/vtkReflectionFilter.h
@@ -19,8 +19,8 @@
 // Since it converts data sets into unstructured grids, it is not effeicient
 // for structured data sets.
 
-#ifndef __vtkReflectionFilter_h
-#define __vtkReflectionFilter_h
+#ifndef vtkReflectionFilter_h
+#define vtkReflectionFilter_h
 
 #include "vtkFiltersGeneralModule.h" // For export macro
 #include "vtkDataObjectAlgorithm.h"
diff --git a/Filters/General/vtkRotationFilter.h b/Filters/General/vtkRotationFilter.h
index 235c90e2169189c2fee858dd906e565889d36324..81571fb9e04315324ad9f41bb3b99bd1a52588ff 100644
--- a/Filters/General/vtkRotationFilter.h
+++ b/Filters/General/vtkRotationFilter.h
@@ -23,8 +23,8 @@
 // Theophane Foggia of The Swiss National Supercomputing Centre (CSCS)
 // for creating and contributing this filter
 
-#ifndef __vtkRotationFilter_h
-#define __vtkRotationFilter_h
+#ifndef vtkRotationFilter_h
+#define vtkRotationFilter_h
 
 #include "vtkFiltersGeneralModule.h" // For export macro
 #include "vtkUnstructuredGridAlgorithm.h"
diff --git a/Filters/General/vtkShrinkFilter.h b/Filters/General/vtkShrinkFilter.h
index 0a9703b66824de9d4f65db0e830919430a15f6f5..4306114265cdf3a080b7d6b57d5bc1d57851b514 100644
--- a/Filters/General/vtkShrinkFilter.h
+++ b/Filters/General/vtkShrinkFilter.h
@@ -27,8 +27,8 @@
 // .SECTION See Also
 // vtkShrinkPolyData
 
-#ifndef __vtkShrinkFilter_h
-#define __vtkShrinkFilter_h
+#ifndef vtkShrinkFilter_h
+#define vtkShrinkFilter_h
 
 #include "vtkFiltersGeneralModule.h" // For export macro
 #include "vtkUnstructuredGridAlgorithm.h"
diff --git a/Filters/General/vtkShrinkPolyData.h b/Filters/General/vtkShrinkPolyData.h
index 0e1ece27ecf17c144d0486671619c7beb0df17ba..e718971cf2bb682f6cbe7096fcdc1f944c1af163 100644
--- a/Filters/General/vtkShrinkPolyData.h
+++ b/Filters/General/vtkShrinkPolyData.h
@@ -33,8 +33,8 @@
 // .SECTION See Also
 // vtkShrinkFilter
 
-#ifndef __vtkShrinkPolyData_h
-#define __vtkShrinkPolyData_h
+#ifndef vtkShrinkPolyData_h
+#define vtkShrinkPolyData_h
 
 #include "vtkFiltersGeneralModule.h" // For export macro
 #include "vtkPolyDataAlgorithm.h"
diff --git a/Filters/General/vtkSpatialRepresentationFilter.h b/Filters/General/vtkSpatialRepresentationFilter.h
index 59149dd4db30b4b51acc055396200d290e5784ed..a36b7becc6339024115449ae1ac101b0bee2b289 100644
--- a/Filters/General/vtkSpatialRepresentationFilter.h
+++ b/Filters/General/vtkSpatialRepresentationFilter.h
@@ -41,8 +41,8 @@
 // .SECTION See Also
 // vtkLocator vtkPointLocator vtkCellLocator vtkOBBTree
 
-#ifndef __vtkSpatialRepresentationFilter_h
-#define __vtkSpatialRepresentationFilter_h
+#ifndef vtkSpatialRepresentationFilter_h
+#define vtkSpatialRepresentationFilter_h
 
 #include "vtkFiltersGeneralModule.h" // For export macro
 #include "vtkMultiBlockDataSetAlgorithm.h"
diff --git a/Filters/General/vtkSplineFilter.h b/Filters/General/vtkSplineFilter.h
index c9336e7a846d78aae87ef458d46053b9b65307cc..f94a9b239f6d3e956ba82ab086e9f112315c262e 100644
--- a/Filters/General/vtkSplineFilter.h
+++ b/Filters/General/vtkSplineFilter.h
@@ -31,8 +31,8 @@
 // .SECTION See Also
 // vtkRibbonFilter vtkTubeFilter
 
-#ifndef __vtkSplineFilter_h
-#define __vtkSplineFilter_h
+#ifndef vtkSplineFilter_h
+#define vtkSplineFilter_h
 
 #include "vtkFiltersGeneralModule.h" // For export macro
 #include "vtkPolyDataAlgorithm.h"
diff --git a/Filters/General/vtkSplitColumnComponents.h b/Filters/General/vtkSplitColumnComponents.h
index 749e5ac42a5505c80f49f2be385bfc7774ab8b71..fe60629770cdc230d698c35a4baae2ee105c9d86 100644
--- a/Filters/General/vtkSplitColumnComponents.h
+++ b/Filters/General/vtkSplitColumnComponents.h
@@ -31,8 +31,8 @@
 // and "Points (Z)" when NamingMode is NAMES_WITH_PARENS, and into Points_X,
 // Points_Y, and Points_Z when NamingMode is NAMES_WITH_UNDERSCORES.
 
-#ifndef __vtkSplitColumnComponents_h
-#define __vtkSplitColumnComponents_h
+#ifndef vtkSplitColumnComponents_h
+#define vtkSplitColumnComponents_h
 
 #include "vtkFiltersGeneralModule.h" // For export macro
 #include "vtkTableAlgorithm.h"
diff --git a/Filters/General/vtkSplitField.h b/Filters/General/vtkSplitField.h
index 316f3eeeb161bf4b9815ff676288336453926fc5..a126b63a449fdb6653b3144eee35f4ecf1b3df0b 100644
--- a/Filters/General/vtkSplitField.h
+++ b/Filters/General/vtkSplitField.h
@@ -48,8 +48,8 @@
 // vtkDataSetAttributes vtkDataArray vtkRearrangeFields
 // vtkAssignAttribute vtkMergeFields
 
-#ifndef __vtkSplitField_h
-#define __vtkSplitField_h
+#ifndef vtkSplitField_h
+#define vtkSplitField_h
 
 #include "vtkFiltersGeneralModule.h" // For export macro
 #include "vtkDataSetAlgorithm.h"
diff --git a/Filters/General/vtkStructuredGridClip.h b/Filters/General/vtkStructuredGridClip.h
index e97d75e1d693fd9b62526966669a7247c2239414..e24ee7ba26082ac65cb442f8229aaa5ba2dbc78b 100644
--- a/Filters/General/vtkStructuredGridClip.h
+++ b/Filters/General/vtkStructuredGridClip.h
@@ -21,8 +21,8 @@
 // Only the whole extent is modified.
 // 2: If ClipDataOn is set, then you will get no more that the clipped
 // extent.
-#ifndef __vtkStructuredGridClip_h
-#define __vtkStructuredGridClip_h
+#ifndef vtkStructuredGridClip_h
+#define vtkStructuredGridClip_h
 
 // I did not make this a subclass of in place filter because
 // the references on the data do not matter. I make no modifications
diff --git a/Filters/General/vtkSubPixelPositionEdgels.h b/Filters/General/vtkSubPixelPositionEdgels.h
index 65fc22ebf6e98b9b070f8e54d55a2435aefde79c..b7c33a3b10752978d4e913b8de9588eec4f5bf51 100644
--- a/Filters/General/vtkSubPixelPositionEdgels.h
+++ b/Filters/General/vtkSubPixelPositionEdgels.h
@@ -31,8 +31,8 @@
 // .SECTION see also
 // vtkImageData vtkImageGradient vtkLinkEdgels
 
-#ifndef __vtkSubPixelPositionEdgels_h
-#define __vtkSubPixelPositionEdgels_h
+#ifndef vtkSubPixelPositionEdgels_h
+#define vtkSubPixelPositionEdgels_h
 
 #include "vtkFiltersGeneralModule.h" // For export macro
 #include "vtkPolyDataAlgorithm.h"
diff --git a/Filters/General/vtkTableBasedClipDataSet.h b/Filters/General/vtkTableBasedClipDataSet.h
index d64dd960db760da51fcacd056609b618b174bfba..3e93384d6d3b164e75e8e23e97ba7df742ce16c2 100644
--- a/Filters/General/vtkTableBasedClipDataSet.h
+++ b/Filters/General/vtkTableBasedClipDataSet.h
@@ -88,8 +88,8 @@
 //  vtkClipDataSet vtkClipVolume vtkClipPolyData vtkCutter vtkImplicitFunction
 
 
-#ifndef __vtkTableBasedClipDataSet_h
-#define __vtkTableBasedClipDataSet_h
+#ifndef vtkTableBasedClipDataSet_h
+#define vtkTableBasedClipDataSet_h
 
 #include "vtkFiltersGeneralModule.h" // For export macro
 #include "vtkUnstructuredGridAlgorithm.h"
diff --git a/Filters/General/vtkTableToPolyData.h b/Filters/General/vtkTableToPolyData.h
index 6691053566fb38d17d915ac621ad7ec127ec2374..2199dd0369aa1885f5dfda0eb83c06b6d66029ca 100644
--- a/Filters/General/vtkTableToPolyData.h
+++ b/Filters/General/vtkTableToPolyData.h
@@ -18,8 +18,8 @@
 // vtkTableToPolyData is a filter used to convert a vtkTable  to a vtkPolyData
 // consisting of vertices.
 
-#ifndef __vtkTableToPolyData_h
-#define __vtkTableToPolyData_h
+#ifndef vtkTableToPolyData_h
+#define vtkTableToPolyData_h
 
 #include "vtkFiltersGeneralModule.h" // For export macro
 #include "vtkPolyDataAlgorithm.h"
diff --git a/Filters/General/vtkTableToStructuredGrid.h b/Filters/General/vtkTableToStructuredGrid.h
index 0d0e7edeb6c375ffd142ceecac7bf58e3d88f057..3d0eabc2c4577b29802a5acea5a2f2d226c2f3fd 100644
--- a/Filters/General/vtkTableToStructuredGrid.h
+++ b/Filters/General/vtkTableToStructuredGrid.h
@@ -20,8 +20,8 @@
 // (specified using SetWholeExtent()) must match the number of rows in the input
 // table.
 
-#ifndef __vtkTableToStructuredGrid_h
-#define __vtkTableToStructuredGrid_h
+#ifndef vtkTableToStructuredGrid_h
+#define vtkTableToStructuredGrid_h
 
 #include "vtkFiltersGeneralModule.h" // For export macro
 #include "vtkStructuredGridAlgorithm.h"
diff --git a/Filters/General/vtkTessellatorFilter.h b/Filters/General/vtkTessellatorFilter.h
index 4371196959c53a6c119c0376f284b0b8acd7a93d..5410b4b185a1f3325d716270a457c647e4708c59 100644
--- a/Filters/General/vtkTessellatorFilter.h
+++ b/Filters/General/vtkTessellatorFilter.h
@@ -14,8 +14,8 @@ or without modification, are permitted provided that this Notice and any
 statement of authorship are reproduced on all copies.
 
 =========================================================================*/
-#ifndef __vtkTessellatorFilter_h
-#define __vtkTessellatorFilter_h
+#ifndef vtkTessellatorFilter_h
+#define vtkTessellatorFilter_h
 
 // .NAME vtkTessellatorFilter - approximate nonlinear FEM elements with simplices
 // .SECTION Description
@@ -200,4 +200,4 @@ inline int vtkTessellatorFilter::GetOutputDimension() const
 }
 //ETX
 
-#endif // __vtkTessellatorFilter_h
+#endif // vtkTessellatorFilter_h
diff --git a/Filters/General/vtkTimeSourceExample.h b/Filters/General/vtkTimeSourceExample.h
index b2b2b356edcff74e427a8dda9e33b18188747cd0..d567d3aaa2c5e99befa074dfcdbda467b3d6bf81 100644
--- a/Filters/General/vtkTimeSourceExample.h
+++ b/Filters/General/vtkTimeSourceExample.h
@@ -22,8 +22,8 @@
 // over time. The Growing ivar makes the number of cells in the output grow
 // and then shrink over time.
 
-#ifndef __vtkTimeSourceExample_h
-#define __vtkTimeSourceExample_h
+#ifndef vtkTimeSourceExample_h
+#define vtkTimeSourceExample_h
 
 #include "vtkFiltersGeneralModule.h" // For export macro
 #include "vtkUnstructuredGridAlgorithm.h"
diff --git a/Filters/General/vtkTransformFilter.h b/Filters/General/vtkTransformFilter.h
index 030ca273a202366091f36a1ceabb8e85b881205d..7dfffe3e6470d1d782b6d010ce4a915fff2e64c0 100644
--- a/Filters/General/vtkTransformFilter.h
+++ b/Filters/General/vtkTransformFilter.h
@@ -29,8 +29,8 @@
 // .SECTION See Also
 // vtkAbstractTransform vtkTransformPolyDataFilter vtkActor
 
-#ifndef __vtkTransformFilter_h
-#define __vtkTransformFilter_h
+#ifndef vtkTransformFilter_h
+#define vtkTransformFilter_h
 
 #include "vtkFiltersGeneralModule.h" // For export macro
 #include "vtkPointSetAlgorithm.h"
diff --git a/Filters/General/vtkTransformPolyDataFilter.h b/Filters/General/vtkTransformPolyDataFilter.h
index c7493efcdd2bf25c5c4e9e1a3d7675a53752991a..542b515954761603b246bf94c874cf427dd7ac3b 100644
--- a/Filters/General/vtkTransformPolyDataFilter.h
+++ b/Filters/General/vtkTransformPolyDataFilter.h
@@ -31,8 +31,8 @@
 // .SECTION See Also
 // vtkTransform vtkTransformFilter vtkActor
 
-#ifndef __vtkTransformPolyDataFilter_h
-#define __vtkTransformPolyDataFilter_h
+#ifndef vtkTransformPolyDataFilter_h
+#define vtkTransformPolyDataFilter_h
 
 #include "vtkFiltersGeneralModule.h" // For export macro
 #include "vtkPolyDataAlgorithm.h"
diff --git a/Filters/General/vtkUncertaintyTubeFilter.h b/Filters/General/vtkUncertaintyTubeFilter.h
index 0d8380b427d997d4dacd1a7cc2a8c381e5d512ac..9333914e42a0b1ba385e30211c65e6a5ef0510fd 100644
--- a/Filters/General/vtkUncertaintyTubeFilter.h
+++ b/Filters/General/vtkUncertaintyTubeFilter.h
@@ -29,8 +29,8 @@
 // .SECTION See Also
 // vtkTensorGlyph vtkStreamer
 
-#ifndef __vtkUncertaintyTubeFilter_h
-#define __vtkUncertaintyTubeFilter_h
+#ifndef vtkUncertaintyTubeFilter_h
+#define vtkUncertaintyTubeFilter_h
 
 #include "vtkFiltersGeneralModule.h" // For export macro
 #include "vtkPolyDataAlgorithm.h"
diff --git a/Filters/General/vtkVolumeContourSpectrumFilter.h b/Filters/General/vtkVolumeContourSpectrumFilter.h
index b7ba87716063ca6133b39901458f5448947eab72..173817bb1e1fb7e99e50fca35d30dd830cb60a81 100644
--- a/Filters/General/vtkVolumeContourSpectrumFilter.h
+++ b/Filters/General/vtkVolumeContourSpectrumFilter.h
@@ -38,8 +38,8 @@
 // "The contour spectrum",
 // IEEE Visualization, 167-174, 1997.
 
-#ifndef __vtkVolumeContourSpectrumFilter_h
-#define __vtkVolumeContourSpectrumFilter_h
+#ifndef vtkVolumeContourSpectrumFilter_h
+#define vtkVolumeContourSpectrumFilter_h
 
 #include "vtkFiltersGeneralModule.h" // For export macro
 #include  "vtkDataObjectAlgorithm.h"
diff --git a/Filters/General/vtkVoxelContoursToSurfaceFilter.h b/Filters/General/vtkVoxelContoursToSurfaceFilter.h
index f4fab00b08993c7d1c131e12f1d8e117d17aa854..8c2633bc79fb9bbd97f4d2a735a782f812ea9751 100644
--- a/Filters/General/vtkVoxelContoursToSurfaceFilter.h
+++ b/Filters/General/vtkVoxelContoursToSurfaceFilter.h
@@ -37,8 +37,8 @@
 // .SECTION See Also
 // vtkPolyDataAlgorithm
 
-#ifndef __vtkVoxelContoursToSurfaceFilter_h
-#define __vtkVoxelContoursToSurfaceFilter_h
+#ifndef vtkVoxelContoursToSurfaceFilter_h
+#define vtkVoxelContoursToSurfaceFilter_h
 
 #include "vtkFiltersGeneralModule.h" // For export macro
 #include "vtkPolyDataAlgorithm.h"
diff --git a/Filters/General/vtkWarpLens.h b/Filters/General/vtkWarpLens.h
index 08c7ff67e5cd5fc0c3841741445bfd4868dabbdc..9e1810f9523ca60aed6dd65bfd4f38031703e9b5 100644
--- a/Filters/General/vtkWarpLens.h
+++ b/Filters/General/vtkWarpLens.h
@@ -17,8 +17,8 @@
 // vtkWarpLens is a filter that modifies point coordinates by moving
 // in accord with a lens distortion model.
 
-#ifndef __vtkWarpLens_h
-#define __vtkWarpLens_h
+#ifndef vtkWarpLens_h
+#define vtkWarpLens_h
 
 #include "vtkFiltersGeneralModule.h" // For export macro
 #include "vtkPointSetAlgorithm.h"
diff --git a/Filters/General/vtkWarpScalar.h b/Filters/General/vtkWarpScalar.h
index 843e570c436fa2901395c51350a0e584445beb7f..889a76343f2ba9001b5fcba36547d69fff82b522 100644
--- a/Filters/General/vtkWarpScalar.h
+++ b/Filters/General/vtkWarpScalar.h
@@ -33,8 +33,8 @@
 // warping.
 
 
-#ifndef __vtkWarpScalar_h
-#define __vtkWarpScalar_h
+#ifndef vtkWarpScalar_h
+#define vtkWarpScalar_h
 
 #include "vtkFiltersGeneralModule.h" // For export macro
 #include "vtkPointSetAlgorithm.h"
diff --git a/Filters/General/vtkWarpTo.h b/Filters/General/vtkWarpTo.h
index 5f12d984702b024df6976ce2703f5e01e59abdf2..8c47bdc41882770c6a095b2f09e107dc0ac8bc18 100644
--- a/Filters/General/vtkWarpTo.h
+++ b/Filters/General/vtkWarpTo.h
@@ -17,8 +17,8 @@
 // vtkWarpTo is a filter that modifies point coordinates by moving the
 // points towards a user specified position.
 
-#ifndef __vtkWarpTo_h
-#define __vtkWarpTo_h
+#ifndef vtkWarpTo_h
+#define vtkWarpTo_h
 
 #include "vtkFiltersGeneralModule.h" // For export macro
 #include "vtkPointSetAlgorithm.h"
diff --git a/Filters/General/vtkWarpVector.h b/Filters/General/vtkWarpVector.h
index 5701eaee56ec9e9fa2876f3cbe36cc44409edeab..841c490eb38a1e09fc1395049e42eab76280f906 100644
--- a/Filters/General/vtkWarpVector.h
+++ b/Filters/General/vtkWarpVector.h
@@ -20,8 +20,8 @@
 //
 // The filter passes both its point data and cell data to its output.
 
-#ifndef __vtkWarpVector_h
-#define __vtkWarpVector_h
+#ifndef vtkWarpVector_h
+#define vtkWarpVector_h
 
 #include "vtkFiltersGeneralModule.h" // For export macro
 #include "vtkPointSetAlgorithm.h"
diff --git a/Filters/General/vtkYoungsMaterialInterface.h b/Filters/General/vtkYoungsMaterialInterface.h
index 536305843435933ec844ae7c0ede7c459dd211df..cd647846c576cf1c3887776caf3543f031bb2df3 100644
--- a/Filters/General/vtkYoungsMaterialInterface.h
+++ b/Filters/General/vtkYoungsMaterialInterface.h
@@ -28,8 +28,8 @@
 // Implementation by Thierry Carrard (thierry.carrard@cea.fr)
 // Modification by Philippe Pebay (philippe.pebay@kitware.com)
 
-#ifndef __vtkYoungsMaterialInterface_h
-#define __vtkYoungsMaterialInterface_h
+#ifndef vtkYoungsMaterialInterface_h
+#define vtkYoungsMaterialInterface_h
 
 #include "vtkFiltersGeneralModule.h" // For export macro
 #include "vtkMultiBlockDataSetAlgorithm.h"
diff --git a/Filters/Generic/vtkGenericClip.h b/Filters/Generic/vtkGenericClip.h
index 39a64cd02d17fd18b61a4419304d5032b181f026..151975c9f79f628d30d9ced8c488bbbfbd83f4f9 100644
--- a/Filters/Generic/vtkGenericClip.h
+++ b/Filters/Generic/vtkGenericClip.h
@@ -55,8 +55,8 @@
 // vtkClipDataSet vtkClipPolyData vtkClipVolume vtkImplicitFunction
 // vtkGenericDataSet
 
-#ifndef __vtkGenericClip_h
-#define __vtkGenericClip_h
+#ifndef vtkGenericClip_h
+#define vtkGenericClip_h
 
 #include "vtkFiltersGenericModule.h" // For export macro
 #include "vtkUnstructuredGridAlgorithm.h"
diff --git a/Filters/Generic/vtkGenericContourFilter.h b/Filters/Generic/vtkGenericContourFilter.h
index eb21bb331ab97843d2741f8bab6c76c543f44ce0..e2f5cc646c4844f5d24c73a04c6f3e7281d4d6b0 100644
--- a/Filters/Generic/vtkGenericContourFilter.h
+++ b/Filters/Generic/vtkGenericContourFilter.h
@@ -37,8 +37,8 @@
 // .SECTION See Also
 // vtkContourFilter vtkGenericDataSet
 
-#ifndef __vtkGenericContourFilter_h
-#define __vtkGenericContourFilter_h
+#ifndef vtkGenericContourFilter_h
+#define vtkGenericContourFilter_h
 
 #include "vtkFiltersGenericModule.h" // For export macro
 #include "vtkPolyDataAlgorithm.h"
diff --git a/Filters/Generic/vtkGenericCutter.h b/Filters/Generic/vtkGenericCutter.h
index 274e74d8ba923cc13a332c11695acd8230363aa5..2fa2240a0fef3b14c324932a3d1a34b11eb1462d 100644
--- a/Filters/Generic/vtkGenericCutter.h
+++ b/Filters/Generic/vtkGenericCutter.h
@@ -41,8 +41,8 @@
 // .SECTION See Also
 // vtkCutter vtkImplicitFunction vtkClipPolyData vtkGenericDataSet
 
-#ifndef __vtkGenericCutter_h
-#define __vtkGenericCutter_h
+#ifndef vtkGenericCutter_h
+#define vtkGenericCutter_h
 
 #include "vtkFiltersGenericModule.h" // For export macro
 #include "vtkPolyDataAlgorithm.h"
diff --git a/Filters/Generic/vtkGenericDataSetTessellator.h b/Filters/Generic/vtkGenericDataSetTessellator.h
index 32dcf8562d997e2ba2e29820719e9caabce9defc..038421d68a496521b01b047bf0181ae1e6180259 100644
--- a/Filters/Generic/vtkGenericDataSetTessellator.h
+++ b/Filters/Generic/vtkGenericDataSetTessellator.h
@@ -30,8 +30,8 @@
 // .SECTION See Also
 // vtkGenericCellTessellator vtkGenericSubdivisionErrorMetric
 
-#ifndef __vtkGenericDataSetTessellator_h
-#define __vtkGenericDataSetTessellator_h
+#ifndef vtkGenericDataSetTessellator_h
+#define vtkGenericDataSetTessellator_h
 
 #include "vtkFiltersGenericModule.h" // For export macro
 #include "vtkUnstructuredGridAlgorithm.h"
diff --git a/Filters/Generic/vtkGenericGeometryFilter.h b/Filters/Generic/vtkGenericGeometryFilter.h
index 3120ba223071251f4f84077a6f47f16d41efa662..e6bb2aa2a47d05d7d618a8608f6e98c4ec2268ac 100644
--- a/Filters/Generic/vtkGenericGeometryFilter.h
+++ b/Filters/Generic/vtkGenericGeometryFilter.h
@@ -41,8 +41,8 @@
 // vtkImageDataGeometryFilter vtkStructuredGridGeometryFilter
 // vtkExtractGeometry vtkExtractVOI
 
-#ifndef __vtkGenericGeometryFilter_h
-#define __vtkGenericGeometryFilter_h
+#ifndef vtkGenericGeometryFilter_h
+#define vtkGenericGeometryFilter_h
 
 #include "vtkFiltersGenericModule.h" // For export macro
 #include "vtkPolyDataAlgorithm.h"
diff --git a/Filters/Generic/vtkGenericGlyph3DFilter.h b/Filters/Generic/vtkGenericGlyph3DFilter.h
index f6905f7c75d8a8e18e4c4f99e7f52141dceb6754..c913f7b2a8340230a458afa1134dc992a8a2967a 100644
--- a/Filters/Generic/vtkGenericGlyph3DFilter.h
+++ b/Filters/Generic/vtkGenericGlyph3DFilter.h
@@ -68,8 +68,8 @@
 // .SECTION See Also
 // vtkTensorGlyph
 
-#ifndef __vtkGenericGlyph3DFilter_h
-#define __vtkGenericGlyph3DFilter_h
+#ifndef vtkGenericGlyph3DFilter_h
+#define vtkGenericGlyph3DFilter_h
 
 #include "vtkFiltersGenericModule.h" // For export macro
 #include "vtkPolyDataAlgorithm.h"
diff --git a/Filters/Generic/vtkGenericOutlineFilter.h b/Filters/Generic/vtkGenericOutlineFilter.h
index 0d33e82cfd5bec168dddf76f1550309d6fe3ffc0..c072f9111f9b7542fe5043e83e7b7527df979518 100644
--- a/Filters/Generic/vtkGenericOutlineFilter.h
+++ b/Filters/Generic/vtkGenericOutlineFilter.h
@@ -23,8 +23,8 @@
 // .SECTION See Also
 // vtkGenericDataSet
 
-#ifndef __vtkGenericOutlineFilter_h
-#define __vtkGenericOutlineFilter_h
+#ifndef vtkGenericOutlineFilter_h
+#define vtkGenericOutlineFilter_h
 
 #include "vtkFiltersGenericModule.h" // For export macro
 #include "vtkPolyDataAlgorithm.h"
diff --git a/Filters/Generic/vtkGenericProbeFilter.h b/Filters/Generic/vtkGenericProbeFilter.h
index 0952a7e88d92ffb965a51cf639b0b025132d1635..5021acac9cafc743376108734f46bfac497f0e52 100644
--- a/Filters/Generic/vtkGenericProbeFilter.h
+++ b/Filters/Generic/vtkGenericProbeFilter.h
@@ -37,8 +37,8 @@
 // vtkGenericProbeFilter vtkProbeFilter vtkGenericDataSet
 
 
-#ifndef __vtkGenericProbeFilter_h
-#define __vtkGenericProbeFilter_h
+#ifndef vtkGenericProbeFilter_h
+#define vtkGenericProbeFilter_h
 
 #include "vtkFiltersGenericModule.h" // For export macro
 #include "vtkDataSetAlgorithm.h"
diff --git a/Filters/Generic/vtkGenericStreamTracer.h b/Filters/Generic/vtkGenericStreamTracer.h
index b7685d2b417f004f377675a32b7647a84f09ec9c..63f76a76f2836569e277f417af3dcc03707ece0f 100644
--- a/Filters/Generic/vtkGenericStreamTracer.h
+++ b/Filters/Generic/vtkGenericStreamTracer.h
@@ -60,8 +60,8 @@
 // vtkRibbonFilter vtkRuledSurfaceFilter vtkInitialValueProblemSolver
 // vtkRungeKutta2 vtkRungeKutta4 vtkRungeKutta45
 
-#ifndef __vtkGenericStreamTracer_h
-#define __vtkGenericStreamTracer_h
+#ifndef vtkGenericStreamTracer_h
+#define vtkGenericStreamTracer_h
 
 #include "vtkFiltersGenericModule.h" // For export macro
 #include "vtkPolyDataAlgorithm.h"
diff --git a/Filters/Geometry/vtkCompositeDataGeometryFilter.h b/Filters/Geometry/vtkCompositeDataGeometryFilter.h
index 1684cbbe39b6fe6ba60d800cea2548e58691dc5b..2f98e87f8f18afd45948abb75c240623ae576846 100644
--- a/Filters/Geometry/vtkCompositeDataGeometryFilter.h
+++ b/Filters/Geometry/vtkCompositeDataGeometryFilter.h
@@ -19,8 +19,8 @@
 // pipeline before a polydata consumer such as a polydata mapper to extract
 // geometry from all blocks and append them to one polydata object.
 
-#ifndef __vtkCompositeDataGeometryFilter_h
-#define __vtkCompositeDataGeometryFilter_h
+#ifndef vtkCompositeDataGeometryFilter_h
+#define vtkCompositeDataGeometryFilter_h
 
 #include "vtkFiltersGeometryModule.h" // For export macro
 #include "vtkPolyDataAlgorithm.h"
diff --git a/Filters/Geometry/vtkDataSetSurfaceFilter.h b/Filters/Geometry/vtkDataSetSurfaceFilter.h
index 341f6e570d381e381d10be182a8ade1991a80a5f..60229ae66d34297fc87eb5e6b8ecf5d32c684691 100644
--- a/Filters/Geometry/vtkDataSetSurfaceFilter.h
+++ b/Filters/Geometry/vtkDataSetSurfaceFilter.h
@@ -22,8 +22,8 @@
 // .SECTION See Also
 // vtkGeometryFilter vtkStructuredGridGeometryFilter.
 
-#ifndef __vtkDataSetSurfaceFilter_h
-#define __vtkDataSetSurfaceFilter_h
+#ifndef vtkDataSetSurfaceFilter_h
+#define vtkDataSetSurfaceFilter_h
 
 #include "vtkFiltersGeometryModule.h" // For export macro
 #include "vtkPolyDataAlgorithm.h"
diff --git a/Filters/Geometry/vtkGeometryFilter.h b/Filters/Geometry/vtkGeometryFilter.h
index 437d274b130664c9972582e4ae349b080319c649..6016c7ccbc78539b6cd1f23d72d23d4863fa4fd7 100644
--- a/Filters/Geometry/vtkGeometryFilter.h
+++ b/Filters/Geometry/vtkGeometryFilter.h
@@ -46,8 +46,8 @@
 // vtkImageDataGeometryFilter vtkStructuredGridGeometryFilter
 // vtkExtractGeometry vtkExtractVOI
 
-#ifndef __vtkGeometryFilter_h
-#define __vtkGeometryFilter_h
+#ifndef vtkGeometryFilter_h
+#define vtkGeometryFilter_h
 
 #include "vtkFiltersGeometryModule.h" // For export macro
 #include "vtkPolyDataAlgorithm.h"
diff --git a/Filters/Geometry/vtkHierarchicalDataSetGeometryFilter.h b/Filters/Geometry/vtkHierarchicalDataSetGeometryFilter.h
index 59efa78ac4ae72e0ae853738c89c5c6b042da9b2..300ab6f64114d1005f68b54ef2c717da5f162614 100644
--- a/Filters/Geometry/vtkHierarchicalDataSetGeometryFilter.h
+++ b/Filters/Geometry/vtkHierarchicalDataSetGeometryFilter.h
@@ -19,8 +19,8 @@
 // .SECTION See Also
 // vtkCompositeDataGeometryFilter
 
-#ifndef __vtkHierarchicalDataSetGeometryFilter_h
-#define __vtkHierarchicalDataSetGeometryFilter_h
+#ifndef vtkHierarchicalDataSetGeometryFilter_h
+#define vtkHierarchicalDataSetGeometryFilter_h
 
 #include "vtkFiltersGeometryModule.h" // For export macro
 #include "vtkCompositeDataGeometryFilter.h"
diff --git a/Filters/Geometry/vtkImageDataGeometryFilter.h b/Filters/Geometry/vtkImageDataGeometryFilter.h
index 362b105f1bc9f927deadefaefff8e39d7211ad00..8e668f6172fe9ebb549ab851c63cca6be4ac7fc7 100644
--- a/Filters/Geometry/vtkImageDataGeometryFilter.h
+++ b/Filters/Geometry/vtkImageDataGeometryFilter.h
@@ -32,8 +32,8 @@
 // .SECTION See Also
 // vtkGeometryFilter vtkStructuredGridSource
 
-#ifndef __vtkImageDataGeometryFilter_h
-#define __vtkImageDataGeometryFilter_h
+#ifndef vtkImageDataGeometryFilter_h
+#define vtkImageDataGeometryFilter_h
 
 #include "vtkFiltersGeometryModule.h" // For export macro
 #include "vtkPolyDataAlgorithm.h"
diff --git a/Filters/Geometry/vtkImageDataToUniformGrid.h b/Filters/Geometry/vtkImageDataToUniformGrid.h
index 79cf64b484682b514cf90f924ad1c35f26fdeed0..33bdccfc2e35fca0fdf36d6289bd13e998eea9da 100644
--- a/Filters/Geometry/vtkImageDataToUniformGrid.h
+++ b/Filters/Geometry/vtkImageDataToUniformGrid.h
@@ -20,8 +20,8 @@
 // to 1 to indicate that values of 0 will result in the point or
 // cell to not be blanked.
 
-#ifndef __vtkImageDataToUniformGrid_h
-#define __vtkImageDataToUniformGrid_h
+#ifndef vtkImageDataToUniformGrid_h
+#define vtkImageDataToUniformGrid_h
 
 #include "vtkFiltersGeometryModule.h" // For export macro
 #include "vtkDataObjectAlgorithm.h"
diff --git a/Filters/Geometry/vtkProjectSphereFilter.h b/Filters/Geometry/vtkProjectSphereFilter.h
index 98306f87de9958ea87df08f8573fa44ac977ded4..12c38e5d8c01c01e463615e02e2014c1a66f9603 100644
--- a/Filters/Geometry/vtkProjectSphereFilter.h
+++ b/Filters/Geometry/vtkProjectSphereFilter.h
@@ -19,8 +19,8 @@
 
 
 
-#ifndef __vtkProjectSphereFilter_h
-#define __vtkProjectSphereFilter_h
+#ifndef vtkProjectSphereFilter_h
+#define vtkProjectSphereFilter_h
 
 #include "vtkFiltersGeometryModule.h" // For export macro
 #include "vtkPointSetAlgorithm.h"
@@ -106,4 +106,4 @@ private:
   bool TranslateZ;
 };
 
-#endif // __vtkProjectSphereFilter_h
+#endif // vtkProjectSphereFilter_h
diff --git a/Filters/Geometry/vtkRectilinearGridGeometryFilter.h b/Filters/Geometry/vtkRectilinearGridGeometryFilter.h
index f9d72f70e7d678923133a8287126f6cd72acf6ab..efaf9bc482b72c93bbebf8633f20f4e5d730bc13 100644
--- a/Filters/Geometry/vtkRectilinearGridGeometryFilter.h
+++ b/Filters/Geometry/vtkRectilinearGridGeometryFilter.h
@@ -32,8 +32,8 @@
 // .SECTION See Also
 // vtkGeometryFilter vtkExtractGrid
 
-#ifndef __vtkRectilinearGridGeometryFilter_h
-#define __vtkRectilinearGridGeometryFilter_h
+#ifndef vtkRectilinearGridGeometryFilter_h
+#define vtkRectilinearGridGeometryFilter_h
 
 #include "vtkFiltersGeometryModule.h" // For export macro
 #include "vtkPolyDataAlgorithm.h"
diff --git a/Filters/Geometry/vtkStructuredGridGeometryFilter.h b/Filters/Geometry/vtkStructuredGridGeometryFilter.h
index b4749e5c33c74f7dce0d6e332c7d72503ff07efc..f4283c25a47799ef3effd2fbe7a7447710cf6b6e 100644
--- a/Filters/Geometry/vtkStructuredGridGeometryFilter.h
+++ b/Filters/Geometry/vtkStructuredGridGeometryFilter.h
@@ -38,8 +38,8 @@
 // .SECTION See Also
 // vtkGeometryFilter vtkExtractGrid vtkStructuredGrid
 
-#ifndef __vtkStructuredGridGeometryFilter_h
-#define __vtkStructuredGridGeometryFilter_h
+#ifndef vtkStructuredGridGeometryFilter_h
+#define vtkStructuredGridGeometryFilter_h
 
 #include "vtkFiltersGeometryModule.h" // For export macro
 #include "vtkPolyDataAlgorithm.h"
diff --git a/Filters/Geometry/vtkStructuredPointsGeometryFilter.h b/Filters/Geometry/vtkStructuredPointsGeometryFilter.h
index e0106c624a211ba1405235c539f0fe40aab7e046..855a14b5f5d0e67f9fc0869c9d3de46b471f00f5 100644
--- a/Filters/Geometry/vtkStructuredPointsGeometryFilter.h
+++ b/Filters/Geometry/vtkStructuredPointsGeometryFilter.h
@@ -17,8 +17,8 @@
 // vtkStructuredPointsGeometryFilter has been renamed to
 // vtkImageDataGeometryFilter
 
-#ifndef __vtkStructuredPointsGeometryFilter_h
-#define __vtkStructuredPointsGeometryFilter_h
+#ifndef vtkStructuredPointsGeometryFilter_h
+#define vtkStructuredPointsGeometryFilter_h
 
 #include "vtkFiltersGeometryModule.h" // For export macro
 #include "vtkImageDataGeometryFilter.h"
diff --git a/Filters/Geometry/vtkUnstructuredGridGeometryFilter.h b/Filters/Geometry/vtkUnstructuredGridGeometryFilter.h
index 23f0ae92396a031f00a6eebaebbc936393b8f1f3..d3be15284cca7b0b0b9e4f8f9e812936b892e03a 100644
--- a/Filters/Geometry/vtkUnstructuredGridGeometryFilter.h
+++ b/Filters/Geometry/vtkUnstructuredGridGeometryFilter.h
@@ -35,8 +35,8 @@
 // .SECTION See Also
 // vtkGeometryFilter
 
-#ifndef __vtkUnstructuredGridGeometryFilter_h
-#define __vtkUnstructuredGridGeometryFilter_h
+#ifndef vtkUnstructuredGridGeometryFilter_h
+#define vtkUnstructuredGridGeometryFilter_h
 
 #include "vtkFiltersGeometryModule.h" // For export macro
 #include "vtkUnstructuredGridBaseAlgorithm.h"
diff --git a/Filters/Hybrid/vtkBSplineTransform.h b/Filters/Hybrid/vtkBSplineTransform.h
index fb00ad34b7b843ac51db5a9606d3f076b1d85484..9cc903c8dee38dc8ff77dca25cbc9422eb22c9c5 100644
--- a/Filters/Hybrid/vtkBSplineTransform.h
+++ b/Filters/Hybrid/vtkBSplineTransform.h
@@ -29,8 +29,8 @@
 // VTK Journal, 2011,
 // http://hdl.handle.net/10380/3252
 
-#ifndef __vtkBSplineTransform_h
-#define __vtkBSplineTransform_h
+#ifndef vtkBSplineTransform_h
+#define vtkBSplineTransform_h
 
 #include "vtkFiltersHybridModule.h" // For export macro
 #include "vtkWarpTransform.h"
diff --git a/Filters/Hybrid/vtkDSPFilterDefinition.h b/Filters/Hybrid/vtkDSPFilterDefinition.h
index 0a22914faf810801c2439b7e1164862667de346e..7dbd41b00c2e89baa1dccf05505d6339453417f9 100644
--- a/Filters/Hybrid/vtkDSPFilterDefinition.h
+++ b/Filters/Hybrid/vtkDSPFilterDefinition.h
@@ -23,8 +23,8 @@
 // .SECTION See Also
 // vtkDSPFilterGroup vtkExodusReader vtkExodusIIReader vtkPExodusReader
 
-#ifndef __vtkDSPFilterDefinition_h
-#define __vtkDSPFilterDefinition_h
+#ifndef vtkDSPFilterDefinition_h
+#define vtkDSPFilterDefinition_h
 
 
 
diff --git a/Filters/Hybrid/vtkDSPFilterGroup.h b/Filters/Hybrid/vtkDSPFilterGroup.h
index 8f2d5433e24471a72a70e840d5d7d35c1081a1f0..8857ba7ade2f813e9800373c7b75ddb4def5ce32 100644
--- a/Filters/Hybrid/vtkDSPFilterGroup.h
+++ b/Filters/Hybrid/vtkDSPFilterGroup.h
@@ -23,8 +23,8 @@
 // .SECTION See Also
 // vtkDSPFilterDefinition vtkExodusReader vtkExodusIIReader vtkPExodusReader
 
-#ifndef __vtkDSPFilterGroup_h
-#define __vtkDSPFilterGroup_h
+#ifndef vtkDSPFilterGroup_h
+#define vtkDSPFilterGroup_h
 
 #include "vtkFiltersHybridModule.h" // For export macro
 #include "vtkObject.h"
diff --git a/Filters/Hybrid/vtkDepthSortPolyData.h b/Filters/Hybrid/vtkDepthSortPolyData.h
index eabe58c9a59a8905bf39523740dc4e3e9ea46826..e08f85396cbbc1b9d2e72c10890f8efe371fe27a 100644
--- a/Filters/Hybrid/vtkDepthSortPolyData.h
+++ b/Filters/Hybrid/vtkDepthSortPolyData.h
@@ -25,8 +25,8 @@
 // The sort operation will not work well for long, thin primitives, or cells
 // that intersect, overlap, or interpenetrate each other.
 
-#ifndef __vtkDepthSortPolyData_h
-#define __vtkDepthSortPolyData_h
+#ifndef vtkDepthSortPolyData_h
+#define vtkDepthSortPolyData_h
 
 #include "vtkFiltersHybridModule.h" // For export macro
 #include "vtkPolyDataAlgorithm.h"
diff --git a/Filters/Hybrid/vtkEarthSource.h b/Filters/Hybrid/vtkEarthSource.h
index 317c2a69c4c7e50074fd6054d29f6947fdb7f55f..038320df1054cad3ade8862f244f67588eb51dfc 100644
--- a/Filters/Hybrid/vtkEarthSource.h
+++ b/Filters/Hybrid/vtkEarthSource.h
@@ -20,8 +20,8 @@
 // of the sphere at which the continents are placed. Obtains data from
 // an imbedded array of coordinates.
 
-#ifndef __vtkEarthSource_h
-#define __vtkEarthSource_h
+#ifndef vtkEarthSource_h
+#define vtkEarthSource_h
 
 #include "vtkFiltersHybridModule.h" // For export macro
 #include "vtkPolyDataAlgorithm.h"
diff --git a/Filters/Hybrid/vtkFacetReader.h b/Filters/Hybrid/vtkFacetReader.h
index 52ef74a6c489b6a297abf61e88cd3154231d994b..e2bbd8d44c27aba3a2abb749d605db87ef71f91e 100644
--- a/Filters/Hybrid/vtkFacetReader.h
+++ b/Filters/Hybrid/vtkFacetReader.h
@@ -33,8 +33,8 @@ PURPOSE.  See the above copyright notice for more information.
 // p1c2 p2c2 p3c2 ... pnc2 materialnum partnum
 // ...
 
-#ifndef __vtkFacetReader_h
-#define __vtkFacetReader_h
+#ifndef vtkFacetReader_h
+#define vtkFacetReader_h
 
 #include "vtkFiltersHybridModule.h" // For export macro
 #include "vtkPolyDataAlgorithm.h"
diff --git a/Filters/Hybrid/vtkGreedyTerrainDecimation.h b/Filters/Hybrid/vtkGreedyTerrainDecimation.h
index 674525ae79a5a3dbffba1333512a4c2d372caa1f..c598fd554dbc9a1c7bfbb4a8a40d57d695231461 100644
--- a/Filters/Hybrid/vtkGreedyTerrainDecimation.h
+++ b/Filters/Hybrid/vtkGreedyTerrainDecimation.h
@@ -60,8 +60,8 @@
 // .SECTION See Also
 // vtkDecimatePro vtkQuadricDecimation vtkQuadricClustering
 
-#ifndef __vtkGreedyTerrainDecimation_h
-#define __vtkGreedyTerrainDecimation_h
+#ifndef vtkGreedyTerrainDecimation_h
+#define vtkGreedyTerrainDecimation_h
 
 #include "vtkFiltersHybridModule.h" // For export macro
 #include "vtkPolyDataAlgorithm.h"
diff --git a/Filters/Hybrid/vtkGridTransform.h b/Filters/Hybrid/vtkGridTransform.h
index 27e86ddad3b23f0074363d20b8190f78769b6a04..8b2f2acdbebd2cb27b9070100bf8868106ddd1b6 100644
--- a/Filters/Hybrid/vtkGridTransform.h
+++ b/Filters/Hybrid/vtkGridTransform.h
@@ -23,8 +23,8 @@
 // vtkThinPlateSplineTransform vtkGeneralTransform vtkTransformToGrid
 
 
-#ifndef __vtkGridTransform_h
-#define __vtkGridTransform_h
+#ifndef vtkGridTransform_h
+#define vtkGridTransform_h
 
 #include "vtkFiltersHybridModule.h" // For export macro
 #include "vtkWarpTransform.h"
diff --git a/Filters/Hybrid/vtkImageToPolyDataFilter.h b/Filters/Hybrid/vtkImageToPolyDataFilter.h
index fc7d9f65e12d650d9dc9f3914fbb0386f3921dec..1b07121f391599f4172acfaaffd460c25328aca3 100644
--- a/Filters/Hybrid/vtkImageToPolyDataFilter.h
+++ b/Filters/Hybrid/vtkImageToPolyDataFilter.h
@@ -56,8 +56,8 @@
 // .SECTION See Also
 // vtkCGMWriter vtkImageQuantizeRGBToIndex vtkTriangleFilter
 
-#ifndef __vtkImageToPolyDataFilter_h
-#define __vtkImageToPolyDataFilter_h
+#ifndef vtkImageToPolyDataFilter_h
+#define vtkImageToPolyDataFilter_h
 
 #include "vtkFiltersHybridModule.h" // For export macro
 #include "vtkPolyDataAlgorithm.h"
diff --git a/Filters/Hybrid/vtkImplicitModeller.h b/Filters/Hybrid/vtkImplicitModeller.h
index 15ba2b3888f59fd5fe73605ce4f60f52e431c4b4..dd44711d24ba10e28d53168a7fabae3e21ac84a6 100644
--- a/Filters/Hybrid/vtkImplicitModeller.h
+++ b/Filters/Hybrid/vtkImplicitModeller.h
@@ -81,8 +81,8 @@
 // .SECTION See Also
 // vtkSampleFunction vtkContourFilter
 
-#ifndef __vtkImplicitModeller_h
-#define __vtkImplicitModeller_h
+#ifndef vtkImplicitModeller_h
+#define vtkImplicitModeller_h
 
 #include "vtkFiltersHybridModule.h" // For export macro
 #include "vtkImageAlgorithm.h"
diff --git a/Filters/Hybrid/vtkPCAAnalysisFilter.h b/Filters/Hybrid/vtkPCAAnalysisFilter.h
index 80680262e0ed79d6000ddd06c0197c5de5609912..780378bec4b92ba0796b788ae667265c383791ce 100644
--- a/Filters/Hybrid/vtkPCAAnalysisFilter.h
+++ b/Filters/Hybrid/vtkPCAAnalysisFilter.h
@@ -44,8 +44,8 @@
 // .SECTION See Also
 // vtkProcrustesAlignmentFilter
 
-#ifndef __vtkPCAAnalysisFilter_h
-#define __vtkPCAAnalysisFilter_h
+#ifndef vtkPCAAnalysisFilter_h
+#define vtkPCAAnalysisFilter_h
 
 #include "vtkFiltersHybridModule.h" // For export macro
 #include "vtkMultiBlockDataSetAlgorithm.h"
diff --git a/Filters/Hybrid/vtkPolyDataSilhouette.h b/Filters/Hybrid/vtkPolyDataSilhouette.h
index abc23cef7a658bd65ae77bd8c34ebb13a41ac090..8442dc00cd85b27f947a940dacf110905bf406ba 100644
--- a/Filters/Hybrid/vtkPolyDataSilhouette.h
+++ b/Filters/Hybrid/vtkPolyDataSilhouette.h
@@ -32,8 +32,8 @@
 // CEA/DIF - Commissariat a l'Energie Atomique, Centre DAM Ile-De-France <br>
 // BP12, F-91297 Arpajon, France. <br>
 
-#ifndef __vtkPolyDataSilhouette_h
-#define __vtkPolyDataSilhouette_h
+#ifndef vtkPolyDataSilhouette_h
+#define vtkPolyDataSilhouette_h
 
 #include "vtkFiltersHybridModule.h" // For export macro
 #include "vtkPolyDataAlgorithm.h"
diff --git a/Filters/Hybrid/vtkProcrustesAlignmentFilter.h b/Filters/Hybrid/vtkProcrustesAlignmentFilter.h
index de1fc3acd1c0937935ecc4a33218f16b061555c1..8a8c20f61554b6b44e4a6554ef6679269e3c3230 100644
--- a/Filters/Hybrid/vtkProcrustesAlignmentFilter.h
+++ b/Filters/Hybrid/vtkProcrustesAlignmentFilter.h
@@ -46,8 +46,8 @@
 // .SECTION See Also
 // vtkLandmarkTransform
 
-#ifndef __vtkProcrustesAlignmentFilter_h
-#define __vtkProcrustesAlignmentFilter_h
+#ifndef vtkProcrustesAlignmentFilter_h
+#define vtkProcrustesAlignmentFilter_h
 
 #include "vtkFiltersHybridModule.h" // For export macro
 #include "vtkMultiBlockDataSetAlgorithm.h"
diff --git a/Filters/Hybrid/vtkProjectedTerrainPath.h b/Filters/Hybrid/vtkProjectedTerrainPath.h
index f3f84d823e401663a15521dcabda89ba28ab7877..3d9441e4f7b8388b4867887c9dd670e8b06185bf 100644
--- a/Filters/Hybrid/vtkProjectedTerrainPath.h
+++ b/Filters/Hybrid/vtkProjectedTerrainPath.h
@@ -60,8 +60,8 @@
 // .SECTION See Also
 // vtkGreedyTerrainDecimation
 
-#ifndef __vtkProjectedTerrainPath_h
-#define __vtkProjectedTerrainPath_h
+#ifndef vtkProjectedTerrainPath_h
+#define vtkProjectedTerrainPath_h
 
 #include "vtkFiltersHybridModule.h" // For export macro
 #include "vtkPolyDataAlgorithm.h"
diff --git a/Filters/Hybrid/vtkRenderLargeImage.h b/Filters/Hybrid/vtkRenderLargeImage.h
index 26da1d0dcf0f7e6c24d92341c65ddb79daf9a970..0e4ecc69b91cd97047c9247e79f5e44e1ad9e060 100644
--- a/Filters/Hybrid/vtkRenderLargeImage.h
+++ b/Filters/Hybrid/vtkRenderLargeImage.h
@@ -17,8 +17,8 @@
 // vtkRenderLargeImage provides methods needed to read a region from a file.
 
 
-#ifndef __vtkRenderLargeImage_h
-#define __vtkRenderLargeImage_h
+#ifndef vtkRenderLargeImage_h
+#define vtkRenderLargeImage_h
 
 #include "vtkFiltersHybridModule.h" // For export macro
 #include "vtkAlgorithm.h"
diff --git a/Filters/Hybrid/vtkTemporalDataSetCache.h b/Filters/Hybrid/vtkTemporalDataSetCache.h
index 670e7e9cac88c3986550945d502a44f5f7e8044c..11c439a18e1b85bb13ff7946d225fc6a27c73884 100644
--- a/Filters/Hybrid/vtkTemporalDataSetCache.h
+++ b/Filters/Hybrid/vtkTemporalDataSetCache.h
@@ -25,8 +25,8 @@
 // "Time Dependent Processing in a Parallel Pipeline Architecture",
 // IEEE Visualization 2007.
 
-#ifndef __vtkTemporalDataSetCache_h
-#define __vtkTemporalDataSetCache_h
+#ifndef vtkTemporalDataSetCache_h
+#define vtkTemporalDataSetCache_h
 
 #include "vtkFiltersHybridModule.h" // For export macro
 
diff --git a/Filters/Hybrid/vtkTemporalFractal.h b/Filters/Hybrid/vtkTemporalFractal.h
index 6895e7a6deda34deaf93d521200392d7e84aa454..ea8d9bc4383127179d1e884f6190b4c8493859ce 100644
--- a/Filters/Hybrid/vtkTemporalFractal.h
+++ b/Filters/Hybrid/vtkTemporalFractal.h
@@ -22,8 +22,8 @@
 // This source produces a vtkHierarchicalBoxDataSet when
 // GenerateRectilinearGrids is off, otherwise produces a vtkMultiBlockDataSet.
 
-#ifndef __vtkTemporalFractal_h
-#define __vtkTemporalFractal_h
+#ifndef vtkTemporalFractal_h
+#define vtkTemporalFractal_h
 
 #include "vtkFiltersHybridModule.h" // For export macro
 #include "vtkAlgorithm.h"
diff --git a/Filters/Hybrid/vtkTemporalInterpolator.h b/Filters/Hybrid/vtkTemporalInterpolator.h
index 5e8a2563151bffb4a754f66846c060acec9990fa..f1566e884cea060e7303143f9342b757927cddf4 100644
--- a/Filters/Hybrid/vtkTemporalInterpolator.h
+++ b/Filters/Hybrid/vtkTemporalInterpolator.h
@@ -49,8 +49,8 @@
 // "Time Dependent Processing in a Parallel Pipeline Architecture",
 // IEEE Visualization 2007.
 
-#ifndef __vtkTemporalInterpolator_h
-#define __vtkTemporalInterpolator_h
+#ifndef vtkTemporalInterpolator_h
+#define vtkTemporalInterpolator_h
 
 #include "vtkFiltersHybridModule.h" // For export macro
 #include "vtkMultiTimeStepAlgorithm.h"
diff --git a/Filters/Hybrid/vtkTemporalShiftScale.h b/Filters/Hybrid/vtkTemporalShiftScale.h
index 7f111b13ab591de12cccecb72e988bc06cccb71b..77fc3bd6767b6bfe9d5f0c11e4d584066fbbaaa0 100644
--- a/Filters/Hybrid/vtkTemporalShiftScale.h
+++ b/Filters/Hybrid/vtkTemporalShiftScale.h
@@ -27,8 +27,8 @@
 // "Time Dependent Processing in a Parallel Pipeline Architecture",
 // IEEE Visualization 2007.
 
-#ifndef __vtkTemporalShiftScale_h
-#define __vtkTemporalShiftScale_h
+#ifndef vtkTemporalShiftScale_h
+#define vtkTemporalShiftScale_h
 
 #include "vtkFiltersHybridModule.h" // For export macro
 #include "vtkAlgorithm.h"
diff --git a/Filters/Hybrid/vtkTemporalSnapToTimeStep.h b/Filters/Hybrid/vtkTemporalSnapToTimeStep.h
index c75d202d88caca2ac145e3f431c345df1187dcf2..9dd3abc82610b1232a83ee76d02cbafb3b8d2ffd 100644
--- a/Filters/Hybrid/vtkTemporalSnapToTimeStep.h
+++ b/Filters/Hybrid/vtkTemporalSnapToTimeStep.h
@@ -26,8 +26,8 @@
 // "Time Dependent Processing in a Parallel Pipeline Architecture",
 // IEEE Visualization 2007.
 
-#ifndef __vtkTemporalSnapToTimeStep_h
-#define __vtkTemporalSnapToTimeStep_h
+#ifndef vtkTemporalSnapToTimeStep_h
+#define vtkTemporalSnapToTimeStep_h
 
 #include "vtkFiltersHybridModule.h" // For export macro
 #include "vtkAlgorithm.h"
diff --git a/Filters/Hybrid/vtkTransformToGrid.h b/Filters/Hybrid/vtkTransformToGrid.h
index 80291452ac9bf5a3b26cc0981b58ca342cd47251..f316a6d1c3396762299d0513ff4ea9b78205a9ae 100644
--- a/Filters/Hybrid/vtkTransformToGrid.h
+++ b/Filters/Hybrid/vtkTransformToGrid.h
@@ -21,8 +21,8 @@
 // .SECTION See Also
 // vtkGridTransform vtkThinPlateSplineTransform vtkAbstractTransform
 
-#ifndef __vtkTransformToGrid_h
-#define __vtkTransformToGrid_h
+#ifndef vtkTransformToGrid_h
+#define vtkTransformToGrid_h
 
 #include "vtkFiltersHybridModule.h" // For export macro
 #include "vtkAlgorithm.h"
diff --git a/Filters/Hybrid/vtkWeightedTransformFilter.h b/Filters/Hybrid/vtkWeightedTransformFilter.h
index 87eeec116b62fbfc1a652bbff943b9cf83eb11e5..3e957ab886fa6bde38d796e0b61366053d08a583 100644
--- a/Filters/Hybrid/vtkWeightedTransformFilter.h
+++ b/Filters/Hybrid/vtkWeightedTransformFilter.h
@@ -64,8 +64,8 @@
 // .SECTION See Also
 // vtkAbstractTransform vtkLinearTransform vtkTransformPolyDataFilter vtkActor
 
-#ifndef __vtkWeightedTransformFilter_h
-#define __vtkWeightedTransformFilter_h
+#ifndef vtkWeightedTransformFilter_h
+#define vtkWeightedTransformFilter_h
 
 #include "vtkFiltersHybridModule.h" // For export macro
 #include "vtkPointSetAlgorithm.h"
diff --git a/Filters/HyperTree/vtkClipHyperOctree.h b/Filters/HyperTree/vtkClipHyperOctree.h
index eeca317756ce7dcf355c870e4d84769814696c78..18314d3419224512928a053819822773abb0de38 100644
--- a/Filters/HyperTree/vtkClipHyperOctree.h
+++ b/Filters/HyperTree/vtkClipHyperOctree.h
@@ -54,8 +54,8 @@
 // .SECTION See Also
 // vtkImplicitFunction vtkCutter vtkClipVolume vtkClipPolyData
 
-#ifndef __vtkClipHyperOctree_h
-#define __vtkClipHyperOctree_h
+#ifndef vtkClipHyperOctree_h
+#define vtkClipHyperOctree_h
 
 #include "vtkFiltersHyperTreeModule.h" // For export macro
 #include "vtkUnstructuredGridAlgorithm.h"
diff --git a/Filters/HyperTree/vtkHyperOctreeClipCutPointsGrabber.h b/Filters/HyperTree/vtkHyperOctreeClipCutPointsGrabber.h
index 1f41c1813e5a72f45ba24fa790aa027eb6dfefe3..e7a02dcfcf0b095f241038667418f1640ba81aee 100644
--- a/Filters/HyperTree/vtkHyperOctreeClipCutPointsGrabber.h
+++ b/Filters/HyperTree/vtkHyperOctreeClipCutPointsGrabber.h
@@ -19,8 +19,8 @@
 // vtkHyperOctreeClipCut, vtkHyperOctreeClipCutClipCutPointsGrabber,
 // vtkClipHyperOctree, vtkHyperOctreeClipCutCutter
 
-#ifndef __vtkHyperOctreeClipCutPointsGrabber_h
-#define __vtkHyperOctreeClipCutPointsGrabber_h
+#ifndef vtkHyperOctreeClipCutPointsGrabber_h
+#define vtkHyperOctreeClipCutPointsGrabber_h
 
 #include "vtkFiltersHyperTreeModule.h" // For export macro
 #include "vtkHyperOctreePointsGrabber.h"
diff --git a/Filters/HyperTree/vtkHyperOctreeContourFilter.h b/Filters/HyperTree/vtkHyperOctreeContourFilter.h
index 3b58146fcfbafaa50985f176ef6e3a593d7f7557..a807bfebce8aa873cb25424c41fca4e220d97c5a 100644
--- a/Filters/HyperTree/vtkHyperOctreeContourFilter.h
+++ b/Filters/HyperTree/vtkHyperOctreeContourFilter.h
@@ -42,8 +42,8 @@
 // vtkMarchingCubes vtkSliceCubes vtkDividingCubes vtkMarchingSquares
 // vtkImageMarchingCubes
 
-#ifndef __vtkHyperOctreeContourFilter_h
-#define __vtkHyperOctreeContourFilter_h
+#ifndef vtkHyperOctreeContourFilter_h
+#define vtkHyperOctreeContourFilter_h
 
 #include "vtkFiltersHyperTreeModule.h" // For export macro
 #include "vtkPolyDataAlgorithm.h"
diff --git a/Filters/HyperTree/vtkHyperOctreeCutter.h b/Filters/HyperTree/vtkHyperOctreeCutter.h
index 2e2b53ea32c854ff873d2fcd4dbd124160e4c323..f69a61c8ddd5cbdf059b1ee5174474ecf9c57b22 100644
--- a/Filters/HyperTree/vtkHyperOctreeCutter.h
+++ b/Filters/HyperTree/vtkHyperOctreeCutter.h
@@ -40,8 +40,8 @@
 // .SECTION See Also
 // vtkImplicitFunction vtkHyperOctree
 
-#ifndef __vtkHyperOctreeCutter_h
-#define __vtkHyperOctreeCutter_h
+#ifndef vtkHyperOctreeCutter_h
+#define vtkHyperOctreeCutter_h
 
 #include "vtkFiltersHyperTreeModule.h" // For export macro
 #include "vtkPolyDataAlgorithm.h"
diff --git a/Filters/HyperTree/vtkHyperOctreeDepth.h b/Filters/HyperTree/vtkHyperOctreeDepth.h
index 20a1c2ca442530c74529d553c2c21d8b55b6a3ad..cec88bfbb2d1719dba93bcdacacbec912bb00f6e 100644
--- a/Filters/HyperTree/vtkHyperOctreeDepth.h
+++ b/Filters/HyperTree/vtkHyperOctreeDepth.h
@@ -20,8 +20,8 @@
 // .SECTION See Also
 // vtkHyperOctree
 
-#ifndef __vtkHyperOctreeDepth_h
-#define __vtkHyperOctreeDepth_h
+#ifndef vtkHyperOctreeDepth_h
+#define vtkHyperOctreeDepth_h
 
 #include "vtkFiltersHyperTreeModule.h" // For export macro
 #include "vtkDataSetAlgorithm.h"
diff --git a/Filters/HyperTree/vtkHyperOctreeDualGridContourFilter.h b/Filters/HyperTree/vtkHyperOctreeDualGridContourFilter.h
index d39ac5fc83611d54eb8de8d96dddb8513a8fd40b..7cd18359677dc6d1ab3ec9a63a0c754fd2e2cfa6 100644
--- a/Filters/HyperTree/vtkHyperOctreeDualGridContourFilter.h
+++ b/Filters/HyperTree/vtkHyperOctreeDualGridContourFilter.h
@@ -31,8 +31,8 @@
 // vtkMarchingCubes vtkSliceCubes vtkDividingCubes vtkMarchingSquares
 // vtkImageMarchingCubes
 
-#ifndef __vtkHyperOctreeDualGridContourFilter_h
-#define __vtkHyperOctreeDualGridContourFilter_h
+#ifndef vtkHyperOctreeDualGridContourFilter_h
+#define vtkHyperOctreeDualGridContourFilter_h
 
 #include "vtkFiltersHyperTreeModule.h" // For export macro
 #include "vtkPolyDataAlgorithm.h"
diff --git a/Filters/HyperTree/vtkHyperOctreeLimiter.h b/Filters/HyperTree/vtkHyperOctreeLimiter.h
index 4ee53eeff6ca444bbdf3846192e74b26e98cfe84..b43fd9c731de1a77de594bf9cc603aa4b376d1de 100644
--- a/Filters/HyperTree/vtkHyperOctreeLimiter.h
+++ b/Filters/HyperTree/vtkHyperOctreeLimiter.h
@@ -22,8 +22,8 @@
 // .SECTION See Also
 // vtkHyperOctree
 
-#ifndef __vtkHyperOctreeLimiter_h
-#define __vtkHyperOctreeLimiter_h
+#ifndef vtkHyperOctreeLimiter_h
+#define vtkHyperOctreeLimiter_h
 
 #include "vtkFiltersHyperTreeModule.h" // For export macro
 #include "vtkDataSetAlgorithm.h"
diff --git a/Filters/HyperTree/vtkHyperOctreeSampleFunction.h b/Filters/HyperTree/vtkHyperOctreeSampleFunction.h
index 42acb4235672566771b14a86bd021d6dad566e79..e11535eceab586f775e55cd4bf9bb2da05419721 100644
--- a/Filters/HyperTree/vtkHyperOctreeSampleFunction.h
+++ b/Filters/HyperTree/vtkHyperOctreeSampleFunction.h
@@ -23,8 +23,8 @@
 // .SECTION See Also
 // vtkSampleFunction
 
-#ifndef __vtkHyperOctreeSampleFunction_h
-#define __vtkHyperOctreeSampleFunction_h
+#ifndef vtkHyperOctreeSampleFunction_h
+#define vtkHyperOctreeSampleFunction_h
 
 #include "vtkFiltersHyperTreeModule.h" // For export macro
 #include "vtkHyperOctreeAlgorithm.h"
diff --git a/Filters/HyperTree/vtkHyperOctreeSurfaceFilter.h b/Filters/HyperTree/vtkHyperOctreeSurfaceFilter.h
index c0fd2794ffcaa4aaeaaec737bf079426e7f4798b..f257ac69738a7fc9cde5a82f974daa41d059d361 100644
--- a/Filters/HyperTree/vtkHyperOctreeSurfaceFilter.h
+++ b/Filters/HyperTree/vtkHyperOctreeSurfaceFilter.h
@@ -19,8 +19,8 @@
 // .SECTION See Also
 // vtkGeometryFilter vtkStructuredGridGeometryFilter.
 
-#ifndef __vtkHyperOctreeSurfaceFilter_h
-#define __vtkHyperOctreeSurfaceFilter_h
+#ifndef vtkHyperOctreeSurfaceFilter_h
+#define vtkHyperOctreeSurfaceFilter_h
 
 #include "vtkFiltersHyperTreeModule.h" // For export macro
 #include "vtkPolyDataAlgorithm.h"
diff --git a/Filters/HyperTree/vtkHyperOctreeToUniformGridFilter.h b/Filters/HyperTree/vtkHyperOctreeToUniformGridFilter.h
index d12f502479714bea6bfafe94dd00efdea0ec5be3..ef66c7a674a32a840f9b4594d0e26d6f3282582b 100644
--- a/Filters/HyperTree/vtkHyperOctreeToUniformGridFilter.h
+++ b/Filters/HyperTree/vtkHyperOctreeToUniformGridFilter.h
@@ -23,8 +23,8 @@
 // .SECTION See Also
 // vtkGeometryFilter vtkStructuredGridGeometryFilter.
 
-#ifndef __vtkHyperOctreeToUniformGridFilter_h
-#define __vtkHyperOctreeToUniformGridFilter_h
+#ifndef vtkHyperOctreeToUniformGridFilter_h
+#define vtkHyperOctreeToUniformGridFilter_h
 
 #include "vtkFiltersHyperTreeModule.h" // For export macro
 #include "vtkImageAlgorithm.h"
diff --git a/Filters/HyperTree/vtkHyperTreeGridAxisCut.h b/Filters/HyperTree/vtkHyperTreeGridAxisCut.h
index 458bc11594ce03f32ca40f675333f10b89294f65..fa8b67eb9b28ed1b78b351ffa89382b8f3b00622 100644
--- a/Filters/HyperTree/vtkHyperTreeGridAxisCut.h
+++ b/Filters/HyperTree/vtkHyperTreeGridAxisCut.h
@@ -27,8 +27,8 @@
 // This class was written by Philippe Pebay and Charles Law, Kitware 2012
 // This work was supported in part by Commissariat a l'Energie Atomique (CEA/DIF)
 
-#ifndef __vtkHyperTreeGridAxisCut_h
-#define __vtkHyperTreeGridAxisCut_h
+#ifndef vtkHyperTreeGridAxisCut_h
+#define vtkHyperTreeGridAxisCut_h
 
 #include "vtkFiltersHyperTreeModule.h" // For export macro
 #include "vtkPolyDataAlgorithm.h"
diff --git a/Filters/HyperTree/vtkHyperTreeGridGeometry.h b/Filters/HyperTree/vtkHyperTreeGridGeometry.h
index 50f2d59440bb70fb4a821aba8e29ba8808215c03..e86f44657a8e2fe4432aa657c703490f350406b3 100644
--- a/Filters/HyperTree/vtkHyperTreeGridGeometry.h
+++ b/Filters/HyperTree/vtkHyperTreeGridGeometry.h
@@ -22,8 +22,8 @@
 // Kitware 2013
 // This work was supported in part by Commissariat a l'Energie Atomique (CEA/DIF)
 
-#ifndef __vtkHyperTreeGridGeometry_h
-#define __vtkHyperTreeGridGeometry_h
+#ifndef vtkHyperTreeGridGeometry_h
+#define vtkHyperTreeGridGeometry_h
 
 #include "vtkFiltersHyperTreeModule.h" // For export macro
 #include "vtkPolyDataAlgorithm.h"
diff --git a/Filters/HyperTree/vtkHyperTreeGridToUnstructuredGrid.h b/Filters/HyperTree/vtkHyperTreeGridToUnstructuredGrid.h
index 84607f80dd351398fa1c67abb9f9614060790635..314ea5dc8b14b48830723899633ad53ad90dd9c4 100644
--- a/Filters/HyperTree/vtkHyperTreeGridToUnstructuredGrid.h
+++ b/Filters/HyperTree/vtkHyperTreeGridToUnstructuredGrid.h
@@ -29,8 +29,8 @@
 // This class was written by Philippe Pebay and Charles Law, Kitware 2012
 // This work was supported in part by Commissariat a l'Energie Atomique (CEA/DIF)
 
-#ifndef __vtkHyperTreeGridToUnstructuredGrid_h
-#define __vtkHyperTreeGridToUnstructuredGrid_h
+#ifndef vtkHyperTreeGridToUnstructuredGrid_h
+#define vtkHyperTreeGridToUnstructuredGrid_h
 
 #include "vtkFiltersHyperTreeModule.h" // For export macro
 #include "vtkUnstructuredGridAlgorithm.h"
diff --git a/Filters/Imaging/vtkComputeHistogram2DOutliers.h b/Filters/Imaging/vtkComputeHistogram2DOutliers.h
index 4d128e7b3485f6c49173d84965196cf32b1ec9d6..6885029098cb5b5bdb922952cd37cdf461cabe4e 100644
--- a/Filters/Imaging/vtkComputeHistogram2DOutliers.h
+++ b/Filters/Imaging/vtkComputeHistogram2DOutliers.h
@@ -42,8 +42,8 @@
 // .SECTION Thanks
 //  Developed by David Feng at Sandia National Laboratories
 //------------------------------------------------------------------------------
-#ifndef __vtkComputeHistogram2DOutliers_h
-#define __vtkComputeHistogram2DOutliers_h
+#ifndef vtkComputeHistogram2DOutliers_h
+#define vtkComputeHistogram2DOutliers_h
 //------------------------------------------------------------------------------
 #include "vtkFiltersImagingModule.h" // For export macro
 #include "vtkSelectionAlgorithm.h"
diff --git a/Filters/Imaging/vtkExtractHistogram2D.h b/Filters/Imaging/vtkExtractHistogram2D.h
index d26e2631286bcf660de000ebb07272b3fa5d36b9..5acaf0f3143be6ba348a3c5bebae0489343b8f59 100644
--- a/Filters/Imaging/vtkExtractHistogram2D.h
+++ b/Filters/Imaging/vtkExtractHistogram2D.h
@@ -41,8 +41,8 @@
 // .SECTION Thanks
 //  Developed by David Feng and Philippe Pebay at Sandia National Laboratories
 //------------------------------------------------------------------------------
-#ifndef __vtkExtractHistogram2D_h
-#define __vtkExtractHistogram2D_h
+#ifndef vtkExtractHistogram2D_h
+#define vtkExtractHistogram2D_h
 
 #include "vtkFiltersImagingModule.h" // For export macro
 #include "vtkStatisticsAlgorithm.h"
diff --git a/Filters/Imaging/vtkPairwiseExtractHistogram2D.h b/Filters/Imaging/vtkPairwiseExtractHistogram2D.h
index 87b65bb6d140ac0976a2202c1b976045351ba8af..8fcac7e7f005771b658334c0f6b3bafcb019deb0 100644
--- a/Filters/Imaging/vtkPairwiseExtractHistogram2D.h
+++ b/Filters/Imaging/vtkPairwiseExtractHistogram2D.h
@@ -38,8 +38,8 @@
 // .SECTION Thanks
 //  Developed by David Feng and Philippe Pebay at Sandia National Laboratories
 //------------------------------------------------------------------------------
-#ifndef __vtkPairwiseExtractHistogram2D_h
-#define __vtkPairwiseExtractHistogram2D_h
+#ifndef vtkPairwiseExtractHistogram2D_h
+#define vtkPairwiseExtractHistogram2D_h
 
 #include "vtkFiltersImagingModule.h" // For export macro
 #include "vtkStatisticsAlgorithm.h"
diff --git a/Filters/Matlab/vtkMatlabEngineFilter.h b/Filters/Matlab/vtkMatlabEngineFilter.h
index 503e8d1e12a66d99de8846b11488f7522a89a200..4948ab29b40cc4b1c06bed164cd2227cdf26db0e 100644
--- a/Filters/Matlab/vtkMatlabEngineFilter.h
+++ b/Filters/Matlab/vtkMatlabEngineFilter.h
@@ -32,8 +32,8 @@
 //  Developed by Thomas Otahal at Sandia National Laboratories.
 //
 
-#ifndef __vtkMatlabEngineFilter_h
-#define __vtkMatlabEngineFilter_h
+#ifndef vtkMatlabEngineFilter_h
+#define vtkMatlabEngineFilter_h
 
 #include "vtkFiltersMatlabModule.h"
 #include "vtkDataObjectAlgorithm.h"
diff --git a/Filters/Matlab/vtkMatlabEngineInterface.h b/Filters/Matlab/vtkMatlabEngineInterface.h
index 8f186a1e3f15f21a5e3f3873c22170c402158e01..a7cad6415c8129ec2e91b322d1656e72bc13476a 100644
--- a/Filters/Matlab/vtkMatlabEngineInterface.h
+++ b/Filters/Matlab/vtkMatlabEngineInterface.h
@@ -40,8 +40,8 @@
 //
 
 
-#ifndef __vtkMatlabEngineInterface_h
-#define __vtkMatlabEngineInterface_h
+#ifndef vtkMatlabEngineInterface_h
+#define vtkMatlabEngineInterface_h
 
 #include "vtkFiltersMatlabModule.h"
 #include "vtkObject.h"
diff --git a/Filters/Modeling/vtkBandedPolyDataContourFilter.h b/Filters/Modeling/vtkBandedPolyDataContourFilter.h
index 4d52b4a1b8cfd8ab00eab32ff574433922ef4af7..1b1600fee652d3051b861521b210b15e2bf72508 100644
--- a/Filters/Modeling/vtkBandedPolyDataContourFilter.h
+++ b/Filters/Modeling/vtkBandedPolyDataContourFilter.h
@@ -34,8 +34,8 @@
 // .SECTION See Also
 // vtkClipDataSet vtkClipPolyData vtkClipVolume vtkContourFilter
 //
-#ifndef __vtkBandedPolyDataContourFilter_h
-#define __vtkBandedPolyDataContourFilter_h
+#ifndef vtkBandedPolyDataContourFilter_h
+#define vtkBandedPolyDataContourFilter_h
 
 #include "vtkFiltersModelingModule.h" // For export macro
 #include "vtkPolyDataAlgorithm.h"
diff --git a/Filters/Modeling/vtkButterflySubdivisionFilter.h b/Filters/Modeling/vtkButterflySubdivisionFilter.h
index d67026a8d09d418236c0f63462f69a156015f639..37be049baa539d485b57456756908b154a3e9309 100644
--- a/Filters/Modeling/vtkButterflySubdivisionFilter.h
+++ b/Filters/Modeling/vtkButterflySubdivisionFilter.h
@@ -39,8 +39,8 @@
 // .SECTION See Also
 // vtkInterpolatingSubdivisionFilter vtkLinearSubdivisionFilter
 
-#ifndef __vtkButterflySubdivisionFilter_h
-#define __vtkButterflySubdivisionFilter_h
+#ifndef vtkButterflySubdivisionFilter_h
+#define vtkButterflySubdivisionFilter_h
 
 #include "vtkFiltersModelingModule.h" // For export macro
 #include "vtkInterpolatingSubdivisionFilter.h"
diff --git a/Filters/Modeling/vtkDijkstraGraphGeodesicPath.h b/Filters/Modeling/vtkDijkstraGraphGeodesicPath.h
index 9114964604663a8340e6f5d6a5e9ab143c77f738..b23ef3fef36b3d681139e6fdc6af0c5bb0b18847 100644
--- a/Filters/Modeling/vtkDijkstraGraphGeodesicPath.h
+++ b/Filters/Modeling/vtkDijkstraGraphGeodesicPath.h
@@ -32,8 +32,8 @@
 // www.imm.dtu.dk/~rrp/VTK . Also thanks to Alexandre Gouaillard and Shoaib
 // Ghias for bug fixes and enhancements.
 
-#ifndef __vtkDijkstraGraphGeodesicPath_h
-#define __vtkDijkstraGraphGeodesicPath_h
+#ifndef vtkDijkstraGraphGeodesicPath_h
+#define vtkDijkstraGraphGeodesicPath_h
 
 #include "vtkFiltersModelingModule.h" // For export macro
 #include "vtkGraphGeodesicPath.h"
diff --git a/Filters/Modeling/vtkDijkstraGraphInternals.h b/Filters/Modeling/vtkDijkstraGraphInternals.h
index a80cff0897d9ab90d7bafacd4c12df26091aabb5..698a7a299e4d9263a6b4b5155cc97a848e39da09 100644
--- a/Filters/Modeling/vtkDijkstraGraphInternals.h
+++ b/Filters/Modeling/vtkDijkstraGraphInternals.h
@@ -19,8 +19,8 @@
 // .SECTION Warning
 //  Do not include this file in a header file, it will break PIMPL convention
 
-#ifndef __vtkDijkstraGraphInternals_h
-#define __vtkDijkstraGraphInternals_h
+#ifndef vtkDijkstraGraphInternals_h
+#define vtkDijkstraGraphInternals_h
 
 #include <vector>
 #include <map>
diff --git a/Filters/Modeling/vtkDijkstraImageGeodesicPath.h b/Filters/Modeling/vtkDijkstraImageGeodesicPath.h
index edb99e00ba7902f22b27f6cb6d0fc302d1d5ff87..82d0990e3dbef6ba38ef73aa8d26b20d76d9d56b 100644
--- a/Filters/Modeling/vtkDijkstraImageGeodesicPath.h
+++ b/Filters/Modeling/vtkDijkstraImageGeodesicPath.h
@@ -45,8 +45,8 @@
 // The class was contributed by Dean Inglis.
 
 
-#ifndef __vtkDijkstraImageGeodesicPath_h
-#define __vtkDijkstraImageGeodesicPath_h
+#ifndef vtkDijkstraImageGeodesicPath_h
+#define vtkDijkstraImageGeodesicPath_h
 
 #include "vtkFiltersModelingModule.h" // For export macro
 #include "vtkDijkstraGraphGeodesicPath.h"
diff --git a/Filters/Modeling/vtkFillHolesFilter.h b/Filters/Modeling/vtkFillHolesFilter.h
index 41bb3ae72e3b500dcef3c0ea5048d3dc77b47157..66fd403009bcf2f96d95e0654d156d6e6a0b8c50 100644
--- a/Filters/Modeling/vtkFillHolesFilter.h
+++ b/Filters/Modeling/vtkFillHolesFilter.h
@@ -32,8 +32,8 @@
 // Note this filter only operates on polygons and triangle strips.
 // Vertices and polylines are passed through untouched.
 
-#ifndef __vtkFillHolesFilter_h
-#define __vtkFillHolesFilter_h
+#ifndef vtkFillHolesFilter_h
+#define vtkFillHolesFilter_h
 
 #include "vtkFiltersModelingModule.h" // For export macro
 #include "vtkPolyDataAlgorithm.h"
diff --git a/Filters/Modeling/vtkGeodesicPath.h b/Filters/Modeling/vtkGeodesicPath.h
index eb31e47e8ef333907735a35802d94f358c7d341b..dc8279cf8e21a944904f00d56b38018fcdda0e8e 100644
--- a/Filters/Modeling/vtkGeodesicPath.h
+++ b/Filters/Modeling/vtkGeodesicPath.h
@@ -17,8 +17,8 @@
 // Serves as a base class for algorithms that trace a geodesic path on a
 // polygonal dataset.
 
-#ifndef __vtkGeodesicPath_h
-#define __vtkGeodesicPath_h
+#ifndef vtkGeodesicPath_h
+#define vtkGeodesicPath_h
 
 #include "vtkFiltersModelingModule.h" // For export macro
 #include "vtkPolyDataAlgorithm.h"
diff --git a/Filters/Modeling/vtkGraphGeodesicPath.h b/Filters/Modeling/vtkGraphGeodesicPath.h
index 2c81b2870abe1dbf1a7ed566007bbb68208b9725..5eaacab9c80ffa99dc9fee0e54969058bb2d7487 100644
--- a/Filters/Modeling/vtkGraphGeodesicPath.h
+++ b/Filters/Modeling/vtkGraphGeodesicPath.h
@@ -18,8 +18,8 @@
 // polygonal dataset treating it as a graph. ie points connecting the
 // vertices of the graph
 
-#ifndef __vtkGraphGeodesicPath_h
-#define __vtkGraphGeodesicPath_h
+#ifndef vtkGraphGeodesicPath_h
+#define vtkGraphGeodesicPath_h
 
 #include "vtkFiltersModelingModule.h" // For export macro
 #include "vtkGeodesicPath.h"
diff --git a/Filters/Modeling/vtkLinearExtrusionFilter.h b/Filters/Modeling/vtkLinearExtrusionFilter.h
index 2d5b8bb89a263d265e76d191c3734f461b157742..79c91c9abc65b538261b8720196c2ad343130df6 100644
--- a/Filters/Modeling/vtkLinearExtrusionFilter.h
+++ b/Filters/Modeling/vtkLinearExtrusionFilter.h
@@ -45,8 +45,8 @@
 // .SECTION See Also
 // vtkRotationalExtrusionFilter
 
-#ifndef __vtkLinearExtrusionFilter_h
-#define __vtkLinearExtrusionFilter_h
+#ifndef vtkLinearExtrusionFilter_h
+#define vtkLinearExtrusionFilter_h
 
 #include "vtkFiltersModelingModule.h" // For export macro
 #include "vtkPolyDataAlgorithm.h"
diff --git a/Filters/Modeling/vtkLinearSubdivisionFilter.h b/Filters/Modeling/vtkLinearSubdivisionFilter.h
index eb1ffdd8b3ac050bed8eb370ec9c851fcbdcaa98..ac1d83ae75b33963d4adae1cecf02f712e12e6da 100644
--- a/Filters/Modeling/vtkLinearSubdivisionFilter.h
+++ b/Filters/Modeling/vtkLinearSubdivisionFilter.h
@@ -25,8 +25,8 @@
 // .SECTION See Also
 // vtkInterpolatingSubdivisionFilter vtkButterflySubdivisionFilter
 
-#ifndef __vtkLinearSubdivisionFilter_h
-#define __vtkLinearSubdivisionFilter_h
+#ifndef vtkLinearSubdivisionFilter_h
+#define vtkLinearSubdivisionFilter_h
 
 #include "vtkFiltersModelingModule.h" // For export macro
 #include "vtkInterpolatingSubdivisionFilter.h"
diff --git a/Filters/Modeling/vtkLoopSubdivisionFilter.h b/Filters/Modeling/vtkLoopSubdivisionFilter.h
index 4f2e5da8b96760c515ce2d6a56c38b94e529d099..cc98d0ad9209005f34956dfaf586355ab563bd19 100644
--- a/Filters/Modeling/vtkLoopSubdivisionFilter.h
+++ b/Filters/Modeling/vtkLoopSubdivisionFilter.h
@@ -40,8 +40,8 @@
 // .SECTION See Also
 // vtkApproximatingSubdivisionFilter
 
-#ifndef __vtkLoopSubdivisionFilter_h
-#define __vtkLoopSubdivisionFilter_h
+#ifndef vtkLoopSubdivisionFilter_h
+#define vtkLoopSubdivisionFilter_h
 
 #include "vtkFiltersModelingModule.h" // For export macro
 #include "vtkApproximatingSubdivisionFilter.h"
diff --git a/Filters/Modeling/vtkOutlineFilter.h b/Filters/Modeling/vtkOutlineFilter.h
index 814b57a77e647e995354479c6f03e3165829064e..ce136364afae716a8f9b0aeb647dbdf2353cd9dc 100644
--- a/Filters/Modeling/vtkOutlineFilter.h
+++ b/Filters/Modeling/vtkOutlineFilter.h
@@ -18,8 +18,8 @@
 // data set. The outline consists of the twelve edges of the dataset
 // bounding box.
 
-#ifndef __vtkOutlineFilter_h
-#define __vtkOutlineFilter_h
+#ifndef vtkOutlineFilter_h
+#define vtkOutlineFilter_h
 
 #include "vtkFiltersModelingModule.h" // For export macro
 #include "vtkPolyDataAlgorithm.h"
diff --git a/Filters/Modeling/vtkPolyDataPointSampler.h b/Filters/Modeling/vtkPolyDataPointSampler.h
index a51cbc7f5a4cff74b31f0948b8457ad9491cf89c..f8c8866ce5a84da092218d29f07c7315d2f19167 100644
--- a/Filters/Modeling/vtkPolyDataPointSampler.h
+++ b/Filters/Modeling/vtkPolyDataPointSampler.h
@@ -35,8 +35,8 @@
 // .SECTION See Also
 // vtkImplicitModeller
 
-#ifndef __vtkPolyDataPointSampler_h
-#define __vtkPolyDataPointSampler_h
+#ifndef vtkPolyDataPointSampler_h
+#define vtkPolyDataPointSampler_h
 
 #include "vtkFiltersModelingModule.h" // For export macro
 #include "vtkPolyDataAlgorithm.h"
diff --git a/Filters/Modeling/vtkProjectedTexture.h b/Filters/Modeling/vtkProjectedTexture.h
index 730893251a1ccf17b12abada9eb74aa3dc2d8dbd..6f96aaa9ebe140feac781abe4e329d4810ae9c9c 100644
--- a/Filters/Modeling/vtkProjectedTexture.h
+++ b/Filters/Modeling/vtkProjectedTexture.h
@@ -26,8 +26,8 @@
 // it.  A warning is issued if a point in the dataset falls at the focus
 // of the projector.
 
-#ifndef __vtkProjectedTexture_h
-#define __vtkProjectedTexture_h
+#ifndef vtkProjectedTexture_h
+#define vtkProjectedTexture_h
 
 #include "vtkFiltersModelingModule.h" // For export macro
 #include "vtkDataSetAlgorithm.h"
diff --git a/Filters/Modeling/vtkQuadRotationalExtrusionFilter.h b/Filters/Modeling/vtkQuadRotationalExtrusionFilter.h
index 0ce579dc32c8d86516fa2d4b8145cfa781cb91d1..a281a2b1c53da67e04f3cd5f785017221cc2df04 100644
--- a/Filters/Modeling/vtkQuadRotationalExtrusionFilter.h
+++ b/Filters/Modeling/vtkQuadRotationalExtrusionFilter.h
@@ -55,8 +55,8 @@ PURPOSE.  See the above copyright notice for more information.
 // This class was initially developed by Daniel Aguilera, CEA/DIF
 // Ported and modified by Philippe Pebay, Kitware, 2011
 
-#ifndef __vtkQuadRotationalExtrusionFilter_h
-#define __vtkQuadRotationalExtrusionFilter_h
+#ifndef vtkQuadRotationalExtrusionFilter_h
+#define vtkQuadRotationalExtrusionFilter_h
 
 #include "vtkFiltersModelingModule.h" // For export macro
 #include "vtkMultiBlockDataSetAlgorithm.h"
diff --git a/Filters/Modeling/vtkRibbonFilter.h b/Filters/Modeling/vtkRibbonFilter.h
index aa59e96439588066c101755683d5d174f96e711a..392e563d53de700acd53c8944c056ddde9662c44 100644
--- a/Filters/Modeling/vtkRibbonFilter.h
+++ b/Filters/Modeling/vtkRibbonFilter.h
@@ -30,8 +30,8 @@
 // .SECTION See Also
 // vtkTubeFilter
 
-#ifndef __vtkRibbonFilter_h
-#define __vtkRibbonFilter_h
+#ifndef vtkRibbonFilter_h
+#define vtkRibbonFilter_h
 
 #include "vtkFiltersModelingModule.h" // For export macro
 #include "vtkPolyDataAlgorithm.h"
diff --git a/Filters/Modeling/vtkRotationalExtrusionFilter.h b/Filters/Modeling/vtkRotationalExtrusionFilter.h
index 1142e765a862148c39b3d7de0eeee8e13beb0d9a..2ea1b4110a4a2136c79eb0e62c6521db64834535 100644
--- a/Filters/Modeling/vtkRotationalExtrusionFilter.h
+++ b/Filters/Modeling/vtkRotationalExtrusionFilter.h
@@ -51,8 +51,8 @@
 // .SECTION See Also
 // vtkLinearExtrusionFilter
 
-#ifndef __vtkRotationalExtrusionFilter_h
-#define __vtkRotationalExtrusionFilter_h
+#ifndef vtkRotationalExtrusionFilter_h
+#define vtkRotationalExtrusionFilter_h
 
 #include "vtkFiltersModelingModule.h" // For export macro
 #include "vtkPolyDataAlgorithm.h"
diff --git a/Filters/Modeling/vtkRuledSurfaceFilter.h b/Filters/Modeling/vtkRuledSurfaceFilter.h
index a054af0c7f79c89a00d8a5a5b1d413e9ce5b2264..5f65ab309bb75f8679b46089201c27b813b0fb9e 100644
--- a/Filters/Modeling/vtkRuledSurfaceFilter.h
+++ b/Filters/Modeling/vtkRuledSurfaceFilter.h
@@ -48,8 +48,8 @@
 // .SECTION See Also
 // vtkRibbonFilter vtkStreamLine
 
-#ifndef __vtkRuledSurfaceFilter_h
-#define __vtkRuledSurfaceFilter_h
+#ifndef vtkRuledSurfaceFilter_h
+#define vtkRuledSurfaceFilter_h
 
 #include "vtkFiltersModelingModule.h" // For export macro
 #include "vtkPolyDataAlgorithm.h"
diff --git a/Filters/Modeling/vtkSectorSource.h b/Filters/Modeling/vtkSectorSource.h
index c7c56ea29634adf5d583adb87bdb3d2a2c998cbc..8e76dae3749cc0811efe4fc476946b0708d78172 100644
--- a/Filters/Modeling/vtkSectorSource.h
+++ b/Filters/Modeling/vtkSectorSource.h
@@ -21,8 +21,8 @@ PURPOSE.  See the above copyright notice for more information.
 // .SECTION See Also
 // vtkLinearExtrusionFilter
 
-#ifndef __vtkSectorSource_h
-#define __vtkSectorSource_h
+#ifndef vtkSectorSource_h
+#define vtkSectorSource_h
 
 #include "vtkFiltersModelingModule.h" // For export macro
 #include "vtkPolyDataAlgorithm.h"
diff --git a/Filters/Modeling/vtkSelectEnclosedPoints.h b/Filters/Modeling/vtkSelectEnclosedPoints.h
index 106245295939ac182fadaa18e13cf8d9e4c0bb68..4d0d3fc2c85253e4541784c02c31c7017e1e8e92 100644
--- a/Filters/Modeling/vtkSelectEnclosedPoints.h
+++ b/Filters/Modeling/vtkSelectEnclosedPoints.h
@@ -36,8 +36,8 @@
 // .SECTION See Also
 // vtkMaskPoints
 
-#ifndef __vtkSelectEnclosedPoints_h
-#define __vtkSelectEnclosedPoints_h
+#ifndef vtkSelectEnclosedPoints_h
+#define vtkSelectEnclosedPoints_h
 
 #include "vtkFiltersModelingModule.h" // For export macro
 #include "vtkDataSetAlgorithm.h"
diff --git a/Filters/Modeling/vtkSelectPolyData.h b/Filters/Modeling/vtkSelectPolyData.h
index 39a27585ddf240c4396706b17faf137768479777..7782594a46be810c11ced612c342b8745f53bcfe 100644
--- a/Filters/Modeling/vtkSelectPolyData.h
+++ b/Filters/Modeling/vtkSelectPolyData.h
@@ -71,8 +71,8 @@
 // .SECTION See Also
 // vtkImplicitSelectionLoop
 
-#ifndef __vtkSelectPolyData_h
-#define __vtkSelectPolyData_h
+#ifndef vtkSelectPolyData_h
+#define vtkSelectPolyData_h
 
 #include "vtkFiltersModelingModule.h" // For export macro
 #include "vtkPolyDataAlgorithm.h"
diff --git a/Filters/Modeling/vtkSpherePuzzle.h b/Filters/Modeling/vtkSpherePuzzle.h
index 5eec7aadd2ab948ea4076d8e4177041a0b8d06db..5715301b851f56358a49ef8a7f15b126034c881f 100644
--- a/Filters/Modeling/vtkSpherePuzzle.h
+++ b/Filters/Modeling/vtkSpherePuzzle.h
@@ -16,8 +16,8 @@
 // .SECTION Description
 // vtkSpherePuzzle creates
 
-#ifndef __vtkSpherePuzzle_h
-#define __vtkSpherePuzzle_h
+#ifndef vtkSpherePuzzle_h
+#define vtkSpherePuzzle_h
 
 #include "vtkFiltersModelingModule.h" // For export macro
 #include "vtkPolyDataAlgorithm.h"
diff --git a/Filters/Modeling/vtkSpherePuzzleArrows.h b/Filters/Modeling/vtkSpherePuzzleArrows.h
index 3d29dbe39b8eb2d2de7eabc25ce931c02032ea07..0528265eac7f8b6f70e1a1882b492454c576f9cb 100644
--- a/Filters/Modeling/vtkSpherePuzzleArrows.h
+++ b/Filters/Modeling/vtkSpherePuzzleArrows.h
@@ -16,8 +16,8 @@
 // .SECTION Description
 // vtkSpherePuzzleArrows creates
 
-#ifndef __vtkSpherePuzzleArrows_h
-#define __vtkSpherePuzzleArrows_h
+#ifndef vtkSpherePuzzleArrows_h
+#define vtkSpherePuzzleArrows_h
 
 #include "vtkFiltersModelingModule.h" // For export macro
 #include "vtkPolyDataAlgorithm.h"
diff --git a/Filters/Modeling/vtkSubdivideTetra.h b/Filters/Modeling/vtkSubdivideTetra.h
index e9c0e0a1fec840f46c75167097ac152b709483a1..f6a0cf555f4f450879ac1ba01a39c583bd79f8a7 100644
--- a/Filters/Modeling/vtkSubdivideTetra.h
+++ b/Filters/Modeling/vtkSubdivideTetra.h
@@ -17,8 +17,8 @@
 // This filter subdivides tetrahedra in an unstructured grid into twelve tetrahedra.
 
 
-#ifndef __vtkSubdivideTetra_h
-#define __vtkSubdivideTetra_h
+#ifndef vtkSubdivideTetra_h
+#define vtkSubdivideTetra_h
 
 #include "vtkFiltersModelingModule.h" // For export macro
 #include "vtkUnstructuredGridAlgorithm.h"
diff --git a/Filters/Parallel/vtkBlockDistribution.h b/Filters/Parallel/vtkBlockDistribution.h
index 16e30ddec7a7c8cf994d2fcdde14ff08ce463c1c..88d8f31fa8ea64178cf433c328db678320f577ac 100644
--- a/Filters/Parallel/vtkBlockDistribution.h
+++ b/Filters/Parallel/vtkBlockDistribution.h
@@ -22,8 +22,8 @@
 // .SECTION Description
 //
 
-#ifndef __vtkBlockDistribution_h
-#define __vtkBlockDistribution_h
+#ifndef vtkBlockDistribution_h
+#define vtkBlockDistribution_h
 
 class vtkBlockDistribution
 {
diff --git a/Filters/Parallel/vtkCollectGraph.h b/Filters/Parallel/vtkCollectGraph.h
index 96a55ccdc596a5228e1bc8fc97a63022472bea20..3f22e035c4aaedc78fcf3d9be90b78da3e2eaf03 100644
--- a/Filters/Parallel/vtkCollectGraph.h
+++ b/Filters/Parallel/vtkCollectGraph.h
@@ -22,8 +22,8 @@
 // Collection can be turned on or off using the "PassThrough" flag.
 
 
-#ifndef __vtkCollectGraph_h
-#define __vtkCollectGraph_h
+#ifndef vtkCollectGraph_h
+#define vtkCollectGraph_h
 
 #include "vtkFiltersParallelModule.h" // For export macro
 #include "vtkGraphAlgorithm.h"
diff --git a/Filters/Parallel/vtkCollectPolyData.h b/Filters/Parallel/vtkCollectPolyData.h
index f734b824c41d469f842ce6f9a1fe0efa40caffb4..26b66d8db555a81a375a5578d1bd33ad2daa8b26 100644
--- a/Filters/Parallel/vtkCollectPolyData.h
+++ b/Filters/Parallel/vtkCollectPolyData.h
@@ -18,8 +18,8 @@
 // Collection can be turned on or off using the "PassThrough" flag.
 
 
-#ifndef __vtkCollectPolyData_h
-#define __vtkCollectPolyData_h
+#ifndef vtkCollectPolyData_h
+#define vtkCollectPolyData_h
 
 #include "vtkFiltersParallelModule.h" // For export macro
 #include "vtkPolyDataAlgorithm.h"
diff --git a/Filters/Parallel/vtkCollectTable.h b/Filters/Parallel/vtkCollectTable.h
index af9150be160919540d8826f186ceb4b277ee5e47..cf93f5fc9095016b4f2e8d61bf73cc43bf81b340 100644
--- a/Filters/Parallel/vtkCollectTable.h
+++ b/Filters/Parallel/vtkCollectTable.h
@@ -22,8 +22,8 @@
 // Collection can be turned on or off using the "PassThrough" flag.
 
 
-#ifndef __vtkCollectTable_h
-#define __vtkCollectTable_h
+#ifndef vtkCollectTable_h
+#define vtkCollectTable_h
 
 #include "vtkFiltersParallelModule.h" // For export macro
 #include "vtkTableAlgorithm.h"
diff --git a/Filters/Parallel/vtkCutMaterial.h b/Filters/Parallel/vtkCutMaterial.h
index 266c135ff996f4074c38867ecb05989856b28b1f..f1a188854241a9dbdfd5a9c2006135cd54d62622 100644
--- a/Filters/Parallel/vtkCutMaterial.h
+++ b/Filters/Parallel/vtkCutMaterial.h
@@ -20,8 +20,8 @@
 // for the best view of the plane.
 
 
-#ifndef __vtkCutMaterial_h
-#define __vtkCutMaterial_h
+#ifndef vtkCutMaterial_h
+#define vtkCutMaterial_h
 
 #include "vtkFiltersParallelModule.h" // For export macro
 #include "vtkPolyDataAlgorithm.h"
diff --git a/Filters/Parallel/vtkDuplicatePolyData.h b/Filters/Parallel/vtkDuplicatePolyData.h
index e91f88c4ae7644c45973fb5a6d591aa06893f7ea..d999ae7b7b11260acfbd60f2c0c0c4f70d76d95f 100644
--- a/Filters/Parallel/vtkDuplicatePolyData.h
+++ b/Filters/Parallel/vtkDuplicatePolyData.h
@@ -20,8 +20,8 @@
 // display.
 
 
-#ifndef __vtkDuplicatePolyData_h
-#define __vtkDuplicatePolyData_h
+#ifndef vtkDuplicatePolyData_h
+#define vtkDuplicatePolyData_h
 
 #include "vtkFiltersParallelModule.h" // For export macro
 #include "vtkPolyDataAlgorithm.h"
diff --git a/Filters/Parallel/vtkExtractCTHPart.h b/Filters/Parallel/vtkExtractCTHPart.h
index 29f94999c99075dbbbbdb44345df32c0bd821dda..d303e7258ff88050e351ffb1bbde919b6ed77beb 100644
--- a/Filters/Parallel/vtkExtractCTHPart.h
+++ b/Filters/Parallel/vtkExtractCTHPart.h
@@ -34,8 +34,8 @@
 // vtkPolyData for the contour generated on the current process (which may be
 // null, for processes where no contour is generated).
 
-#ifndef __vtkExtractCTHPart_h
-#define __vtkExtractCTHPart_h
+#ifndef vtkExtractCTHPart_h
+#define vtkExtractCTHPart_h
 
 #include "vtkFiltersParallelModule.h" // For export macro
 #include "vtkMultiBlockDataSetAlgorithm.h"
diff --git a/Filters/Parallel/vtkExtractPolyDataPiece.h b/Filters/Parallel/vtkExtractPolyDataPiece.h
index aef2d682342e8fe62749736756313f12bcaa42b8..07affa8fc361429c59516466513f173a64742fde 100644
--- a/Filters/Parallel/vtkExtractPolyDataPiece.h
+++ b/Filters/Parallel/vtkExtractPolyDataPiece.h
@@ -15,8 +15,8 @@
 // .NAME vtkExtractPolyDataPiece - Return specified piece, including specified
 // number of ghost levels.
 
-#ifndef __vtkExtractPolyDataPiece_h
-#define __vtkExtractPolyDataPiece_h
+#ifndef vtkExtractPolyDataPiece_h
+#define vtkExtractPolyDataPiece_h
 
 #include "vtkFiltersParallelModule.h" // For export macro
 #include "vtkPolyDataAlgorithm.h"
diff --git a/Filters/Parallel/vtkExtractUnstructuredGridPiece.h b/Filters/Parallel/vtkExtractUnstructuredGridPiece.h
index 59bd0f334d87b356f00b7765e28166334282982a..b1b5a6dbb07d3f0ec408df16caaeb0dce4798f8a 100644
--- a/Filters/Parallel/vtkExtractUnstructuredGridPiece.h
+++ b/Filters/Parallel/vtkExtractUnstructuredGridPiece.h
@@ -15,8 +15,8 @@
 // .NAME vtkExtractUnstructuredGridPiece - Return specified piece, including specified
 // number of ghost levels.
 
-#ifndef __vtkExtractUnstructuredGridPiece_h
-#define __vtkExtractUnstructuredGridPiece_h
+#ifndef vtkExtractUnstructuredGridPiece_h
+#define vtkExtractUnstructuredGridPiece_h
 
 #include "vtkFiltersParallelModule.h" // For export macro
 #include "vtkUnstructuredGridAlgorithm.h"
diff --git a/Filters/Parallel/vtkExtractUserDefinedPiece.h b/Filters/Parallel/vtkExtractUserDefinedPiece.h
index 65231ac327a02532359ca08f2fdfb202c9b57888..82c1c2a32bc59ae66de16a39b9c5f82aed38fe01 100644
--- a/Filters/Parallel/vtkExtractUserDefinedPiece.h
+++ b/Filters/Parallel/vtkExtractUserDefinedPiece.h
@@ -30,8 +30,8 @@
 // .SECTION See Also
 // vtkExtractUnstructuredGridPiece
 
-#ifndef __vtkExtractUserDefinedPiece_h
-#define __vtkExtractUserDefinedPiece_h
+#ifndef vtkExtractUserDefinedPiece_h
+#define vtkExtractUserDefinedPiece_h
 
 #include "vtkFiltersParallelModule.h" // For export macro
 #include "vtkExtractUnstructuredGridPiece.h"
diff --git a/Filters/Parallel/vtkPCellDataToPointData.h b/Filters/Parallel/vtkPCellDataToPointData.h
index 16ebe105071a06fd207b075dd84d7d586c21616f..240072e9ae9466af700b6f218b058e2de94eea15 100644
--- a/Filters/Parallel/vtkPCellDataToPointData.h
+++ b/Filters/Parallel/vtkPCellDataToPointData.h
@@ -20,8 +20,8 @@
 // "PieceInvariant" flag that lets the user change the behavior
 // of the filter to that of its superclass.
 
-#ifndef __vtkPCellDataToPointData_h
-#define __vtkPCellDataToPointData_h
+#ifndef vtkPCellDataToPointData_h
+#define vtkPCellDataToPointData_h
 
 #include "vtkFiltersParallelModule.h" // For export macro
 #include "vtkCellDataToPointData.h"
diff --git a/Filters/Parallel/vtkPExtractArraysOverTime.h b/Filters/Parallel/vtkPExtractArraysOverTime.h
index 385ab9cdbb296f4ca3e76addbea54dfef76fdb37..e25c6298989276b5d85d204fef9bc5b2178b385f 100644
--- a/Filters/Parallel/vtkPExtractArraysOverTime.h
+++ b/Filters/Parallel/vtkPExtractArraysOverTime.h
@@ -29,8 +29,8 @@
 // .SECTION See Also
 // vtkExtractArraysOverTime
 
-#ifndef __vtkPExtractArraysOverTime_h
-#define __vtkPExtractArraysOverTime_h
+#ifndef vtkPExtractArraysOverTime_h
+#define vtkPExtractArraysOverTime_h
 
 #include "vtkFiltersParallelModule.h" // For export macro
 #include "vtkExtractArraysOverTime.h"
diff --git a/Filters/Parallel/vtkPKdTree.h b/Filters/Parallel/vtkPKdTree.h
index 192878c614e914436c8695264affd7d80f7414ea..32a2e5aa71b8127132a6c9ef89c59c0553231947 100644
--- a/Filters/Parallel/vtkPKdTree.h
+++ b/Filters/Parallel/vtkPKdTree.h
@@ -37,8 +37,8 @@
 // .SECTION See Also
 //      vtkKdTree
 
-#ifndef __vtkPKdTree_h
-#define __vtkPKdTree_h
+#ifndef vtkPKdTree_h
+#define vtkPKdTree_h
 
 #include "vtkFiltersParallelModule.h" // For export macro
 #include "vtkKdTree.h"
diff --git a/Filters/Parallel/vtkPLinearExtrusionFilter.h b/Filters/Parallel/vtkPLinearExtrusionFilter.h
index b44056e05ade772ee0fead57a3c212f32b90e186..f06c5b5c108e35470743071bd78bca0436009f02 100644
--- a/Filters/Parallel/vtkPLinearExtrusionFilter.h
+++ b/Filters/Parallel/vtkPLinearExtrusionFilter.h
@@ -19,8 +19,8 @@
 // .SECTION See Also
 // vtkLinearExtrusionFilter
 
-#ifndef __vtkPLinearExtrusionFilter_h
-#define __vtkPLinearExtrusionFilter_h
+#ifndef vtkPLinearExtrusionFilter_h
+#define vtkPLinearExtrusionFilter_h
 
 #include "vtkFiltersParallelModule.h" // For export macro
 #include "vtkLinearExtrusionFilter.h"
diff --git a/Filters/Parallel/vtkPMaskPoints.h b/Filters/Parallel/vtkPMaskPoints.h
index b6cd37b6c8e09230438336dd0a5eb29fdfc30b55..fa8d896bcedd6386f46a4842f20fd3eab729327e 100644
--- a/Filters/Parallel/vtkPMaskPoints.h
+++ b/Filters/Parallel/vtkPMaskPoints.h
@@ -18,8 +18,8 @@
 // the use of the vtkMultiProcessController and that
 // ProportionalMaximumNumberOfPoints is obeyed.
 
-#ifndef __vtkPMaskPoints_h
-#define __vtkPMaskPoints_h
+#ifndef vtkPMaskPoints_h
+#define vtkPMaskPoints_h
 
 #include "vtkFiltersParallelModule.h" // For export macro
 #include "vtkMaskPoints.h"
diff --git a/Filters/Parallel/vtkPOutlineCornerFilter.h b/Filters/Parallel/vtkPOutlineCornerFilter.h
index 0df235e50bd60305abf601177428362a68aead4c..0590fa8c3d01bd43f37cb1614525816a54898de3 100644
--- a/Filters/Parallel/vtkPOutlineCornerFilter.h
+++ b/Filters/Parallel/vtkPOutlineCornerFilter.h
@@ -21,8 +21,8 @@
 
 
 
-#ifndef __vtkPOutlineCornerFilter_h
-#define __vtkPOutlineCornerFilter_h
+#ifndef vtkPOutlineCornerFilter_h
+#define vtkPOutlineCornerFilter_h
 
 #include "vtkFiltersParallelModule.h" // For export macro
 #include "vtkPolyDataAlgorithm.h"
diff --git a/Filters/Parallel/vtkPOutlineFilter.h b/Filters/Parallel/vtkPOutlineFilter.h
index b981c308b18ed29615ba8ff636434ab042239c72..4503ec30cb0d728b103180b0550b05f6acae12e4 100644
--- a/Filters/Parallel/vtkPOutlineFilter.h
+++ b/Filters/Parallel/vtkPOutlineFilter.h
@@ -18,8 +18,8 @@
 // partitions in other processes.  It assumes the filter is operated
 // in a data parallel pipeline.
 
-#ifndef __vtkPOutlineFilter_h
-#define __vtkPOutlineFilter_h
+#ifndef vtkPOutlineFilter_h
+#define vtkPOutlineFilter_h
 
 #include "vtkFiltersParallelModule.h" // For export macro
 #include "vtkPolyDataAlgorithm.h"
diff --git a/Filters/Parallel/vtkPOutlineFilterInternals.h b/Filters/Parallel/vtkPOutlineFilterInternals.h
index 646588117d5aa7417c24e19d6671f71298a05aea..ec918b7f9475e4a648b9e1b9df0e159ab1a2aed6 100644
--- a/Filters/Parallel/vtkPOutlineFilterInternals.h
+++ b/Filters/Parallel/vtkPOutlineFilterInternals.h
@@ -18,8 +18,8 @@
 // vtkOutlineCornerFilter. It assumes the filter is operated in a data parallel
 // pipeline.
 
-#ifndef __vtkPOutlineFilterInternals_h
-#define __vtkPOutlineFilterInternals_h
+#ifndef vtkPOutlineFilterInternals_h
+#define vtkPOutlineFilterInternals_h
 
 #include "vtkFiltersParallelModule.h" // For export macro
 #include "vtkBoundingBox.h" //  needed for vtkBoundingBox.
diff --git a/Filters/Parallel/vtkPPolyDataNormals.h b/Filters/Parallel/vtkPPolyDataNormals.h
index d319f69d016da9078242ade62d2cb7c6093e4bdf..7501cc4a4c96acd1015addf3cfe45d9bb2a80a23 100644
--- a/Filters/Parallel/vtkPPolyDataNormals.h
+++ b/Filters/Parallel/vtkPPolyDataNormals.h
@@ -15,8 +15,8 @@
 // .NAME vtkPPolyDataNormals - compute normals for polygonal mesh
 // .SECTION Description
 
-#ifndef __vtkPPolyDataNormals_h
-#define __vtkPPolyDataNormals_h
+#ifndef vtkPPolyDataNormals_h
+#define vtkPPolyDataNormals_h
 
 #include "vtkFiltersParallelModule.h" // For export macro
 #include "vtkPolyDataNormals.h"
diff --git a/Filters/Parallel/vtkPProbeFilter.h b/Filters/Parallel/vtkPProbeFilter.h
index ff5cc554c32152eb9e3f285ea19bbbe4407ffcc7..c7397613b02b93b2fd4fea5d2a51c2f70ec03536 100644
--- a/Filters/Parallel/vtkPProbeFilter.h
+++ b/Filters/Parallel/vtkPProbeFilter.h
@@ -15,8 +15,8 @@
 // .NAME vtkPProbeFilter - probe dataset in parallel
 // .SECTION Description
 
-#ifndef __vtkPProbeFilter_h
-#define __vtkPProbeFilter_h
+#ifndef vtkPProbeFilter_h
+#define vtkPProbeFilter_h
 
 #include "vtkFiltersParallelModule.h" // For export macro
 #include "vtkCompositeDataProbeFilter.h"
diff --git a/Filters/Parallel/vtkPProjectSphereFilter.h b/Filters/Parallel/vtkPProjectSphereFilter.h
index 9fb820cd7b0a6e6f09301d58335100d6007f31a3..e0ee5da068bf46992a996a80fb8cacd5562082e0 100644
--- a/Filters/Parallel/vtkPProjectSphereFilter.h
+++ b/Filters/Parallel/vtkPProjectSphereFilter.h
@@ -17,8 +17,8 @@
 //
 // .SECTION Description
 
-#ifndef __vtkPProjectSphereFilter_h
-#define __vtkPProjectSphereFilter_h
+#ifndef vtkPProjectSphereFilter_h
+#define vtkPProjectSphereFilter_h
 
 #include "vtkFiltersParallelModule.h" // For export macro
 #include "vtkProjectSphereFilter.h"
@@ -52,4 +52,4 @@ private:
   void operator=(const vtkPProjectSphereFilter &);    // Not implemented
 };
 
-#endif // __vtkPProjectSphereFilter_h
+#endif // vtkPProjectSphereFilter_h
diff --git a/Filters/Parallel/vtkPReflectionFilter.h b/Filters/Parallel/vtkPReflectionFilter.h
index 57fd196cf359e06f79fb04bc78e50ff9f10876c2..df014ef051c95c145a4012419ad7d2c48b03a0b5 100644
--- a/Filters/Parallel/vtkPReflectionFilter.h
+++ b/Filters/Parallel/vtkPReflectionFilter.h
@@ -16,8 +16,8 @@
 // .SECTION Description
 // vtkPReflectionFilter is a parallel version of vtkReflectionFilter which takes
 // into consideration the full dataset bounds for performing the reflection.
-#ifndef __vtkPReflectionFilter_h
-#define __vtkPReflectionFilter_h
+#ifndef vtkPReflectionFilter_h
+#define vtkPReflectionFilter_h
 
 #include "vtkFiltersParallelModule.h" // For export macro
 #include "vtkReflectionFilter.h"
diff --git a/Filters/Parallel/vtkPResampleFilter.h b/Filters/Parallel/vtkPResampleFilter.h
index 43656e21180f02ee29a9102cfbbd9cfb9efb3ae5..459663b48b1ee1477f1e4a0cdb6b8cf6d77153bb 100644
--- a/Filters/Parallel/vtkPResampleFilter.h
+++ b/Filters/Parallel/vtkPResampleFilter.h
@@ -15,8 +15,8 @@
 // .NAME vtkPResampleFilter - probe dataset in parallel using a vtkImageData
 // .SECTION Description
 
-#ifndef __vtkPResampleFilter_h
-#define __vtkPResampleFilter_h
+#ifndef vtkPResampleFilter_h
+#define vtkPResampleFilter_h
 
 #include "vtkFiltersParallelModule.h" // For export macro
 #include "vtkImageAlgorithm.h"
diff --git a/Filters/Parallel/vtkPSphereSource.h b/Filters/Parallel/vtkPSphereSource.h
index 276ddf16710186d645ef7c4c6f729768a176a4dc..efad0a8c3dd5c36314e32e370b8538a29692c38f 100644
--- a/Filters/Parallel/vtkPSphereSource.h
+++ b/Filters/Parallel/vtkPSphereSource.h
@@ -14,8 +14,8 @@
 =========================================================================*/
 // .NAME vtkPSphereSource - sphere source that supports pieces
 
-#ifndef __vtkPSphereSource_h
-#define __vtkPSphereSource_h
+#ifndef vtkPSphereSource_h
+#define vtkPSphereSource_h
 
 #include "vtkFiltersParallelModule.h" // For export macro
 #include "vtkSphereSource.h"
diff --git a/Filters/Parallel/vtkPYoungsMaterialInterface.h b/Filters/Parallel/vtkPYoungsMaterialInterface.h
index c7c9f92765aaa00e9fb1c616bee0779fc18c9a24..e9b02022346c2ee3926eb9ba057b5fba6fef4c5a 100644
--- a/Filters/Parallel/vtkPYoungsMaterialInterface.h
+++ b/Filters/Parallel/vtkPYoungsMaterialInterface.h
@@ -27,8 +27,8 @@
 // .SECTION See also
 // vtkYoungsMaterialInterface
 
-#ifndef __vtkPYoungsMaterialInterface_h
-#define __vtkPYoungsMaterialInterface_h
+#ifndef vtkPYoungsMaterialInterface_h
+#define vtkPYoungsMaterialInterface_h
 
 #include "vtkFiltersParallelModule.h" // For export macro
 #include "vtkYoungsMaterialInterface.h"
diff --git a/Filters/Parallel/vtkPassThroughFilter.h b/Filters/Parallel/vtkPassThroughFilter.h
index 75593a2fedcf3be5c12b19a3a12bc7815c43b278..cb8c3963c1c6de7bd873a95cd008e83032806214 100644
--- a/Filters/Parallel/vtkPassThroughFilter.h
+++ b/Filters/Parallel/vtkPassThroughFilter.h
@@ -18,8 +18,8 @@
 // used by PVSources with multiple outputs as the VTK filter in the
 // dummy connection objects at each output.
 
-#ifndef __vtkPassThroughFilter_h
-#define __vtkPassThroughFilter_h
+#ifndef vtkPassThroughFilter_h
+#define vtkPassThroughFilter_h
 
 #include "vtkFiltersParallelModule.h" // For export macro
 #include "vtkDataSetAlgorithm.h"
diff --git a/Filters/Parallel/vtkPieceRequestFilter.h b/Filters/Parallel/vtkPieceRequestFilter.h
index 07b36e8bb0f7a3ea844dd0eac54a21a407191980..5a5abf9116e494ebfb3aa5a18cedae23c132be99 100644
--- a/Filters/Parallel/vtkPieceRequestFilter.h
+++ b/Filters/Parallel/vtkPieceRequestFilter.h
@@ -17,8 +17,8 @@
 // Sends the piece and number of pieces to upstream filters; passes the input
 // to the output unmodified.
 
-#ifndef __vtkPieceRequestFilter_h
-#define __vtkPieceRequestFilter_h
+#ifndef vtkPieceRequestFilter_h
+#define vtkPieceRequestFilter_h
 
 #include "vtkFiltersParallelModule.h" // For export macro
 #include "vtkAlgorithm.h"
diff --git a/Filters/Parallel/vtkPieceScalars.h b/Filters/Parallel/vtkPieceScalars.h
index 2841376e0497cf9507bc0bf9aa4736ad6a5a3531..2c268e11a3f81bbb8332359f45bf45183d6d9329 100644
--- a/Filters/Parallel/vtkPieceScalars.h
+++ b/Filters/Parallel/vtkPieceScalars.h
@@ -22,8 +22,8 @@
 // .SECTION See Also
 // vtkPolyDataStreamer
 
-#ifndef __vtkPieceScalars_h
-#define __vtkPieceScalars_h
+#ifndef vtkPieceScalars_h
+#define vtkPieceScalars_h
 
 #include "vtkFiltersParallelModule.h" // For export macro
 #include "vtkDataSetAlgorithm.h"
diff --git a/Filters/Parallel/vtkPipelineSize.h b/Filters/Parallel/vtkPipelineSize.h
index 1f21c80ed842af4122c00ea5529b18a8a6c640e3..6fe9e266bb0279cb303b0ac9b65b60260f320db6 100644
--- a/Filters/Parallel/vtkPipelineSize.h
+++ b/Filters/Parallel/vtkPipelineSize.h
@@ -15,8 +15,8 @@
 // .NAME vtkPipelineSize - compute the memory required by a pipeline
 
 
-#ifndef __vtkPipelineSize_h
-#define __vtkPipelineSize_h
+#ifndef vtkPipelineSize_h
+#define vtkPipelineSize_h
 
 #include "vtkFiltersParallelModule.h" // For export macro
 #include "vtkObject.h"
diff --git a/Filters/Parallel/vtkProcessIdScalars.h b/Filters/Parallel/vtkProcessIdScalars.h
index 5c6eb9f128ad24a0999e589586969f6507e73be4..d5623ba2b27f6e0dc19642eeef1ab7b451bfe3f7 100644
--- a/Filters/Parallel/vtkProcessIdScalars.h
+++ b/Filters/Parallel/vtkProcessIdScalars.h
@@ -22,8 +22,8 @@
 // .SECTION See Also
 // vtkPolyDataStreamer
 
-#ifndef __vtkProcessIdScalars_h
-#define __vtkProcessIdScalars_h
+#ifndef vtkProcessIdScalars_h
+#define vtkProcessIdScalars_h
 
 #include "vtkFiltersParallelModule.h" // For export macro
 #include "vtkDataSetAlgorithm.h"
diff --git a/Filters/Parallel/vtkRectilinearGridOutlineFilter.h b/Filters/Parallel/vtkRectilinearGridOutlineFilter.h
index 2b6793e81c85600b42b81e9e6d1a3d90c9a3f294..84c48422d56ebaa3da36d6b4688e500cd9adc302 100644
--- a/Filters/Parallel/vtkRectilinearGridOutlineFilter.h
+++ b/Filters/Parallel/vtkRectilinearGridOutlineFilter.h
@@ -19,8 +19,8 @@
 // With one piece you can simply use vtkOutlineFilter.  This filter
 // ignores internal edges when the extent is not the whole extent.
 
-#ifndef __vtkRectilinearGridOutlineFilter_h
-#define __vtkRectilinearGridOutlineFilter_h
+#ifndef vtkRectilinearGridOutlineFilter_h
+#define vtkRectilinearGridOutlineFilter_h
 
 #include "vtkFiltersParallelModule.h" // For export macro
 #include "vtkPolyDataAlgorithm.h"
diff --git a/Filters/Parallel/vtkTransmitPolyDataPiece.h b/Filters/Parallel/vtkTransmitPolyDataPiece.h
index d0aa81da56221d983dbe382fb435c6fc844be74d..8a35e72cd3ebda3e351a8bcde54157b7851cd41d 100644
--- a/Filters/Parallel/vtkTransmitPolyDataPiece.h
+++ b/Filters/Parallel/vtkTransmitPolyDataPiece.h
@@ -21,8 +21,8 @@
 // the distributed to others using the multiprocess controller.
 
 
-#ifndef __vtkTransmitPolyDataPiece_h
-#define __vtkTransmitPolyDataPiece_h
+#ifndef vtkTransmitPolyDataPiece_h
+#define vtkTransmitPolyDataPiece_h
 
 #include "vtkFiltersParallelModule.h" // For export macro
 #include "vtkPolyDataAlgorithm.h"
diff --git a/Filters/Parallel/vtkTransmitRectilinearGridPiece.h b/Filters/Parallel/vtkTransmitRectilinearGridPiece.h
index 9468f5c62e6307393408dd66c219ce009a173353..395c60a36ccde485a60cb6927be22b1a56e0f4b6 100644
--- a/Filters/Parallel/vtkTransmitRectilinearGridPiece.h
+++ b/Filters/Parallel/vtkTransmitRectilinearGridPiece.h
@@ -24,8 +24,8 @@
 // can be used directly instead.
 
 
-#ifndef __vtkTransmitRectilinearGridPiece_h
-#define __vtkTransmitRectilinearGridPiece_h
+#ifndef vtkTransmitRectilinearGridPiece_h
+#define vtkTransmitRectilinearGridPiece_h
 
 #include "vtkFiltersParallelModule.h" // For export macro
 #include "vtkTransmitStructuredDataPiece.h"
diff --git a/Filters/Parallel/vtkTransmitStructuredDataPiece.h b/Filters/Parallel/vtkTransmitStructuredDataPiece.h
index 36cc61ea8d51c19882fe2236cb908d713cb0310f..f1a606c931a9ae3b156f64e699156334055f99db 100644
--- a/Filters/Parallel/vtkTransmitStructuredDataPiece.h
+++ b/Filters/Parallel/vtkTransmitStructuredDataPiece.h
@@ -21,8 +21,8 @@
 // the distributed to others using the multiprocess controller.
 
 
-#ifndef __vtkTransmitStructuredDataPiece_h
-#define __vtkTransmitStructuredDataPiece_h
+#ifndef vtkTransmitStructuredDataPiece_h
+#define vtkTransmitStructuredDataPiece_h
 
 #include "vtkFiltersParallelModule.h" // For export macro
 #include "vtkDataSetAlgorithm.h"
diff --git a/Filters/Parallel/vtkTransmitStructuredGridPiece.h b/Filters/Parallel/vtkTransmitStructuredGridPiece.h
index e1f35a21e915d0ecdb7b220ffac80cd20aaf5956..e2204eeb016c4a455c7336e8cb9b1a1151143f8d 100644
--- a/Filters/Parallel/vtkTransmitStructuredGridPiece.h
+++ b/Filters/Parallel/vtkTransmitStructuredGridPiece.h
@@ -24,8 +24,8 @@
 // can be used directly instead.
 
 
-#ifndef __vtkTransmitStructuredGridPiece_h
-#define __vtkTransmitStructuredGridPiece_h
+#ifndef vtkTransmitStructuredGridPiece_h
+#define vtkTransmitStructuredGridPiece_h
 
 #include "vtkFiltersParallelModule.h" // For export macro
 #include "vtkTransmitStructuredDataPiece.h"
diff --git a/Filters/Parallel/vtkTransmitUnstructuredGridPiece.h b/Filters/Parallel/vtkTransmitUnstructuredGridPiece.h
index ad0f133456a2cee33274e3b604fbcf86ed820b26..e9d171836373eef2385371d57fe43c9076fb9898 100644
--- a/Filters/Parallel/vtkTransmitUnstructuredGridPiece.h
+++ b/Filters/Parallel/vtkTransmitUnstructuredGridPiece.h
@@ -21,8 +21,8 @@
 // the distributed to others using the multiprocess controller.
 
 
-#ifndef __vtkTransmitUnstructuredGridPiece_h
-#define __vtkTransmitUnstructuredGridPiece_h
+#ifndef vtkTransmitUnstructuredGridPiece_h
+#define vtkTransmitUnstructuredGridPiece_h
 
 #include "vtkFiltersParallelModule.h" // For export macro
 #include "vtkUnstructuredGridAlgorithm.h"
diff --git a/Filters/ParallelFlowPaths/vtkPParticlePathFilter.h b/Filters/ParallelFlowPaths/vtkPParticlePathFilter.h
index 19126956a45eba6e6a99bc331b89bbfcec5169d5..266093cf4d8ad6caac5a2a060d9abf414fa5f5a6 100644
--- a/Filters/ParallelFlowPaths/vtkPParticlePathFilter.h
+++ b/Filters/ParallelFlowPaths/vtkPParticlePathFilter.h
@@ -21,8 +21,8 @@
 // vtkPParticlePathFilterBase has the details of the algorithms
 
 
-#ifndef __vtkPParticlePathFilter_h
-#define __vtkPParticlePathFilter_h
+#ifndef vtkPParticlePathFilter_h
+#define vtkPParticlePathFilter_h
 
 
 #include "vtkPParticleTracerBase.h"
diff --git a/Filters/ParallelFlowPaths/vtkPParticleTracer.h b/Filters/ParallelFlowPaths/vtkPParticleTracer.h
index 9b97f7bb3b575ae88c0c79b8e6465a7c9ea3c8dd..a29745d088512ee232c4aa35443fda0853ef8835 100644
--- a/Filters/ParallelFlowPaths/vtkPParticleTracer.h
+++ b/Filters/ParallelFlowPaths/vtkPParticleTracer.h
@@ -21,8 +21,8 @@
 // vtkPParticleTracerBase has the details of the algorithms
 
 
-#ifndef __vtkPParticleTracer_h
-#define __vtkPParticleTracer_h
+#ifndef vtkPParticleTracer_h
+#define vtkPParticleTracer_h
 
 #include "vtkSmartPointer.h" // For protected ivars.
 #include "vtkPParticleTracerBase.h"
diff --git a/Filters/ParallelFlowPaths/vtkPParticleTracerBase.h b/Filters/ParallelFlowPaths/vtkPParticleTracerBase.h
index ebedb8806ab8433bd6216411e8555bf12c01c979..ccab1768efafd6f55ef55dcd41fdea56b52a617f 100644
--- a/Filters/ParallelFlowPaths/vtkPParticleTracerBase.h
+++ b/Filters/ParallelFlowPaths/vtkPParticleTracerBase.h
@@ -21,8 +21,8 @@
 // vtkRibbonFilter vtkRuledSurfaceFilter vtkInitialValueProblemSolver
 // vtkRungeKutta2 vtkRungeKutta4 vtkRungeKutta45 vtkStreamTracer
 
-#ifndef __vtkPParticleTracerBase_h
-#define __vtkPParticleTracerBase_h
+#ifndef vtkPParticleTracerBase_h
+#define vtkPParticleTracerBase_h
 
 #include "vtkSmartPointer.h" // For protected ivars.
 #include "vtkParticleTracerBase.h"
diff --git a/Filters/ParallelFlowPaths/vtkPStreaklineFilter.h b/Filters/ParallelFlowPaths/vtkPStreaklineFilter.h
index f3f60c8488672bf4d4866343543679979b4b29de..7e1ee34dee8c233a46b34a5b90aa9826a3b1393a 100644
--- a/Filters/ParallelFlowPaths/vtkPStreaklineFilter.h
+++ b/Filters/ParallelFlowPaths/vtkPStreaklineFilter.h
@@ -21,8 +21,8 @@
 // vtkPStreaklineFilterBase has the details of the algorithms
 
 
-#ifndef __vtkPStreaklineFilter_h
-#define __vtkPStreaklineFilter_h
+#ifndef vtkPStreaklineFilter_h
+#define vtkPStreaklineFilter_h
 
 #include "vtkSmartPointer.h" // For protected ivars.
 #include "vtkStreaklineFilter.h" //for utility
diff --git a/Filters/ParallelFlowPaths/vtkPStreamTracer.h b/Filters/ParallelFlowPaths/vtkPStreamTracer.h
index afb4bf9d10c779a09e5bfa656ad2512821004e16..9fda6f9e1e8392e9ab76290d3a346782ec212419 100644
--- a/Filters/ParallelFlowPaths/vtkPStreamTracer.h
+++ b/Filters/ParallelFlowPaths/vtkPStreamTracer.h
@@ -21,8 +21,8 @@
 // .SECTION See Also
 // vtkStreamTracer
 
-#ifndef __vtkPStreamTracer_h
-#define __vtkPStreamTracer_h
+#ifndef vtkPStreamTracer_h
+#define vtkPStreamTracer_h
 
 #include "vtkStreamTracer.h"
 #include "vtkSmartPointer.h" // This is a leaf node. No need to use PIMPL to avoid compile time penalty.
diff --git a/Filters/ParallelFlowPaths/vtkPTemporalStreamTracer.h b/Filters/ParallelFlowPaths/vtkPTemporalStreamTracer.h
index 491b61beec2abc7a4d34764acbbcf77e58c04657..62d168f09adec1409b381b554c2850bcf641fff1 100644
--- a/Filters/ParallelFlowPaths/vtkPTemporalStreamTracer.h
+++ b/Filters/ParallelFlowPaths/vtkPTemporalStreamTracer.h
@@ -21,8 +21,8 @@
 // vtkRibbonFilter vtkRuledSurfaceFilter vtkInitialValueProblemSolver
 // vtkRungeKutta2 vtkRungeKutta4 vtkRungeKutta45 vtkStreamTracer
 
-#ifndef __vtkPTemporalStreamTracer_h
-#define __vtkPTemporalStreamTracer_h
+#ifndef vtkPTemporalStreamTracer_h
+#define vtkPTemporalStreamTracer_h
 
 #include "vtkFiltersParallelFlowPathsModule.h" // For export macro
 #include "vtkSmartPointer.h" // For protected ivars.
diff --git a/Filters/ParallelImaging/vtkExtractPiece.h b/Filters/ParallelImaging/vtkExtractPiece.h
index 84ba34c8919a8b10c2b34a1c36a9cc9b9eb7001b..e44518a9efc26a2b4e58c599ca2150e4da1ec8d8 100644
--- a/Filters/ParallelImaging/vtkExtractPiece.h
+++ b/Filters/ParallelImaging/vtkExtractPiece.h
@@ -20,8 +20,8 @@
 // vtkRectilinearGrid, vtkStructuredGrid, and vtkUnstructuredGrid; it does
 // not handle sub-grids of type vtkCompositeDataSet.
 
-#ifndef __vtkExtractPiece_h
-#define __vtkExtractPiece_h
+#ifndef vtkExtractPiece_h
+#define vtkExtractPiece_h
 
 #include "vtkFiltersParallelImagingModule.h" // For export macro
 #include "vtkCompositeDataSetAlgorithm.h"
diff --git a/Filters/ParallelImaging/vtkMemoryLimitImageDataStreamer.h b/Filters/ParallelImaging/vtkMemoryLimitImageDataStreamer.h
index 97b2cde77db8c1874aa1a8e49ff6625c51b9e89f..2f0e01dcabe4aa37394383586da21c76fa1aab2d 100644
--- a/Filters/ParallelImaging/vtkMemoryLimitImageDataStreamer.h
+++ b/Filters/ParallelImaging/vtkMemoryLimitImageDataStreamer.h
@@ -18,8 +18,8 @@
 // many times with smaller update extents.  All processing up stream
 // streams smaller pieces.
 
-#ifndef __vtkMemoryLimitImageDataStreamer_h
-#define __vtkMemoryLimitImageDataStreamer_h
+#ifndef vtkMemoryLimitImageDataStreamer_h
+#define vtkMemoryLimitImageDataStreamer_h
 
 #include "vtkFiltersParallelImagingModule.h" // For export macro
 #include "vtkImageDataStreamer.h"
diff --git a/Filters/ParallelImaging/vtkPComputeHistogram2DOutliers.h b/Filters/ParallelImaging/vtkPComputeHistogram2DOutliers.h
index c271cf8c456fab859e0194b12760f0ef93ca32f6..8b3e3bfe96490b0920fa97ec9724ca807552d350 100644
--- a/Filters/ParallelImaging/vtkPComputeHistogram2DOutliers.h
+++ b/Filters/ParallelImaging/vtkPComputeHistogram2DOutliers.h
@@ -36,8 +36,8 @@
 // .SECTION Thanks
 //  Developed by David Feng at Sandia National Laboratories
 //------------------------------------------------------------------------------
-#ifndef __vtkPComputeHistogram2DOutliers_h
-#define __vtkPComputeHistogram2DOutliers_h
+#ifndef vtkPComputeHistogram2DOutliers_h
+#define vtkPComputeHistogram2DOutliers_h
 //------------------------------------------------------------------------------
 #include "vtkFiltersParallelImagingModule.h" // For export macro
 #include "vtkComputeHistogram2DOutliers.h"
diff --git a/Filters/ParallelImaging/vtkPExtractHistogram2D.h b/Filters/ParallelImaging/vtkPExtractHistogram2D.h
index 3091ea49c939e4478be27645ae9514c40dd623af..3bb2686181cfc29713ec5b32251da2f767ae47a3 100644
--- a/Filters/ParallelImaging/vtkPExtractHistogram2D.h
+++ b/Filters/ParallelImaging/vtkPExtractHistogram2D.h
@@ -32,8 +32,8 @@
 // .SECTION Thanks
 //  Developed by David Feng and Philippe Pebay at Sandia National Laboratories
 //------------------------------------------------------------------------------
-#ifndef __vtkPExtractHistogram2D_h
-#define __vtkPExtractHistogram2D_h
+#ifndef vtkPExtractHistogram2D_h
+#define vtkPExtractHistogram2D_h
 
 #include "vtkFiltersParallelImagingModule.h" // For export macro
 #include "vtkExtractHistogram2D.h"
diff --git a/Filters/ParallelImaging/vtkPPairwiseExtractHistogram2D.h b/Filters/ParallelImaging/vtkPPairwiseExtractHistogram2D.h
index 563d546e23449a5d7abcbf4a0a6c968fbe35df17..6d8007ea42903b3029b7b7fd3d9e5f8d8019afbd 100644
--- a/Filters/ParallelImaging/vtkPPairwiseExtractHistogram2D.h
+++ b/Filters/ParallelImaging/vtkPPairwiseExtractHistogram2D.h
@@ -37,8 +37,8 @@
 // .SECTION Thanks
 //  Developed by David Feng and Philippe Pebay at Sandia National Laboratories
 //------------------------------------------------------------------------------
-#ifndef __vtkPPairwiseExtractHistogram2D_h
-#define __vtkPPairwiseExtractHistogram2D_h
+#ifndef vtkPPairwiseExtractHistogram2D_h
+#define vtkPPairwiseExtractHistogram2D_h
 
 #include "vtkFiltersParallelImagingModule.h" // For export macro
 #include "vtkPairwiseExtractHistogram2D.h"
diff --git a/Filters/ParallelImaging/vtkTransmitImageDataPiece.h b/Filters/ParallelImaging/vtkTransmitImageDataPiece.h
index a537c5d50fcba048c28fe661e71a8e80f1552ef6..05cd8fc4a281259dd0b9b6bc687f9588d8bc9a4a 100644
--- a/Filters/ParallelImaging/vtkTransmitImageDataPiece.h
+++ b/Filters/ParallelImaging/vtkTransmitImageDataPiece.h
@@ -24,8 +24,8 @@
 // can be used directly instead.
 
 
-#ifndef __vtkTransmitImageDataPiece_h
-#define __vtkTransmitImageDataPiece_h
+#ifndef vtkTransmitImageDataPiece_h
+#define vtkTransmitImageDataPiece_h
 
 #include "vtkFiltersParallelImagingModule.h" // For export macro
 #include "vtkTransmitStructuredDataPiece.h"
diff --git a/Filters/ParallelMPI/vtkDistributedDataFilter.h b/Filters/ParallelMPI/vtkDistributedDataFilter.h
index 6b826ae87eb82bf181cc94318ea4d08bb0716579..2499bdede55e88e883ceeaa4c044a2c25cc636fe 100644
--- a/Filters/ParallelMPI/vtkDistributedDataFilter.h
+++ b/Filters/ParallelMPI/vtkDistributedDataFilter.h
@@ -83,8 +83,8 @@
 // .SECTION See Also
 // vtkKdTree vtkPKdTree vtkBSPCuts
 
-#ifndef __vtkDistributedDataFilter_h
-#define __vtkDistributedDataFilter_h
+#ifndef vtkDistributedDataFilter_h
+#define vtkDistributedDataFilter_h
 
 #include "vtkFiltersParallelMPIModule.h" // For export macro
 #include "vtkDataObjectAlgorithm.h"
diff --git a/Filters/ParallelMPI/vtkPExtractGrid.h b/Filters/ParallelMPI/vtkPExtractGrid.h
index 08d5154442c51c81f021f614df67c876aa3e676b..93dbca1fc08079a2bd8042fae01c0462827e8bce 100644
--- a/Filters/ParallelMPI/vtkPExtractGrid.h
+++ b/Filters/ParallelMPI/vtkPExtractGrid.h
@@ -25,8 +25,8 @@
 // .SECTION See Also
 //  vtkExtractGrid
 
-#ifndef __vtkPExtractGrid_h
-#define __vtkPExtractGrid_h
+#ifndef vtkPExtractGrid_h
+#define vtkPExtractGrid_h
 
 #include "vtkFiltersParallelMPIModule.h" // For export macro
 #include "vtkExtractGrid.h"
diff --git a/Filters/ParallelMPI/vtkPExtractRectilinearGrid.h b/Filters/ParallelMPI/vtkPExtractRectilinearGrid.h
index f679f1efeea40d0b6561e6ea6fec1a031fbb078a..4d7f0e6b151578afe8e311ed5b38f7ac7717f2e6 100644
--- a/Filters/ParallelMPI/vtkPExtractRectilinearGrid.h
+++ b/Filters/ParallelMPI/vtkPExtractRectilinearGrid.h
@@ -25,8 +25,8 @@
 // .SECTION See Also
 //  vtkExtractRectilinearGrid
 
-#ifndef __vtkPExtractRectilinearGrid_h
-#define __vtkPExtractRectilinearGrid_h
+#ifndef vtkPExtractRectilinearGrid_h
+#define vtkPExtractRectilinearGrid_h
 
 #include "vtkFiltersParallelMPIModule.h" // For export macro
 #include "vtkExtractRectilinearGrid.h"
diff --git a/Filters/ParallelMPI/vtkPExtractVOI.h b/Filters/ParallelMPI/vtkPExtractVOI.h
index 1a908465f94f00269919e1f1b9c3e47f2362de11..8cacf49a3bc3b82225275fd1a6a63617848facff 100644
--- a/Filters/ParallelMPI/vtkPExtractVOI.h
+++ b/Filters/ParallelMPI/vtkPExtractVOI.h
@@ -25,8 +25,8 @@
 // .SECTION See Also
 //  vtkExtractVOI
 
-#ifndef __vtkPExtractVOI_h
-#define __vtkPExtractVOI_h
+#ifndef vtkPExtractVOI_h
+#define vtkPExtractVOI_h
 
 #include "vtkFiltersParallelMPIModule.h" // For export macro
 #include "vtkExtractVOI.h"
diff --git a/Filters/ParallelMPI/vtkStructuredImplicitConnectivity.h b/Filters/ParallelMPI/vtkStructuredImplicitConnectivity.h
index eb583866dc54c6f9bee291eadcd5a4f5c1af6586..dd5f42504759e52760135b4c8a73ce9b3b764fa2 100644
--- a/Filters/ParallelMPI/vtkStructuredImplicitConnectivity.h
+++ b/Filters/ParallelMPI/vtkStructuredImplicitConnectivity.h
@@ -34,8 +34,8 @@
 // </ul>
 //
 
-#ifndef __vtkStructuredImplicitConnectivity_h
-#define __vtkStructuredImplicitConnectivity_h
+#ifndef vtkStructuredImplicitConnectivity_h
+#define vtkStructuredImplicitConnectivity_h
 
 #include "vtkFiltersParallelMPIModule.h" // For export macro
 #include "vtkObject.h"
diff --git a/Filters/ParallelStatistics/vtkPAutoCorrelativeStatistics.h b/Filters/ParallelStatistics/vtkPAutoCorrelativeStatistics.h
index 5c79834878f1341e5f7a6bb791056ea5cd7db73c..91a58fa29f30506b71c56cac0f9dd3e22f4c6705 100644
--- a/Filters/ParallelStatistics/vtkPAutoCorrelativeStatistics.h
+++ b/Filters/ParallelStatistics/vtkPAutoCorrelativeStatistics.h
@@ -21,8 +21,8 @@
 // .SECTION Thanks
 // This class was written by Philippe Pebay, Kitware SAS 2012.
 
-#ifndef __vtkPAutoCorrelativeStatistics_h
-#define __vtkPAutoCorrelativeStatistics_h
+#ifndef vtkPAutoCorrelativeStatistics_h
+#define vtkPAutoCorrelativeStatistics_h
 
 #include "vtkFiltersParallelStatisticsModule.h" // For export macro
 #include "vtkAutoCorrelativeStatistics.h"
diff --git a/Filters/ParallelStatistics/vtkPBivariateLinearTableThreshold.h b/Filters/ParallelStatistics/vtkPBivariateLinearTableThreshold.h
index eed7d87739523190dd4bc531db20bc928bd2ce97..b36936575477eb0c07571afaa2a08aa124d6dab5 100644
--- a/Filters/ParallelStatistics/vtkPBivariateLinearTableThreshold.h
+++ b/Filters/ParallelStatistics/vtkPBivariateLinearTableThreshold.h
@@ -24,8 +24,8 @@ PURPOSE.  See the above copyright notice for more information.
 // Perform the table filtering operations provided by
 // vtkBivariateLinearTableThreshold in parallel.
 
-#ifndef __vtkPBivariateLinearTableThreshold__h
-#define __vtkPBivariateLinearTableThreshold__h
+#ifndef vtkPBivariateLinearTableThreshold__h
+#define vtkPBivariateLinearTableThreshold__h
 
 #include "vtkFiltersParallelStatisticsModule.h" // For export macro
 #include "vtkBivariateLinearTableThreshold.h"
diff --git a/Filters/ParallelStatistics/vtkPContingencyStatistics.h b/Filters/ParallelStatistics/vtkPContingencyStatistics.h
index 30bde81f224ba026745832496e0b4c8293436712..de410faacb191026ae0730ee4957f933adcc0f48 100644
--- a/Filters/ParallelStatistics/vtkPContingencyStatistics.h
+++ b/Filters/ParallelStatistics/vtkPContingencyStatistics.h
@@ -34,8 +34,8 @@
 // .SECTION Thanks
 // Thanks to Philippe Pebay from Sandia National Laboratories for implementing this class.
 
-#ifndef __vtkPContingencyStatistics_h
-#define __vtkPContingencyStatistics_h
+#ifndef vtkPContingencyStatistics_h
+#define vtkPContingencyStatistics_h
 
 #include "vtkFiltersParallelStatisticsModule.h" // For export macro
 #include "vtkContingencyStatistics.h"
diff --git a/Filters/ParallelStatistics/vtkPCorrelativeStatistics.h b/Filters/ParallelStatistics/vtkPCorrelativeStatistics.h
index 39483989bf88ed4cfb457de38792c16e1d56ec89..79f6a40c3b4e9db3f68cfe2ffb482c42f5b40184 100644
--- a/Filters/ParallelStatistics/vtkPCorrelativeStatistics.h
+++ b/Filters/ParallelStatistics/vtkPCorrelativeStatistics.h
@@ -26,8 +26,8 @@
 // .SECTION Thanks
 // Thanks to Philippe Pebay from Sandia National Laboratories for implementing this class.
 
-#ifndef __vtkPCorrelativeStatistics_h
-#define __vtkPCorrelativeStatistics_h
+#ifndef vtkPCorrelativeStatistics_h
+#define vtkPCorrelativeStatistics_h
 
 #include "vtkFiltersParallelStatisticsModule.h" // For export macro
 #include "vtkCorrelativeStatistics.h"
diff --git a/Filters/ParallelStatistics/vtkPDescriptiveStatistics.h b/Filters/ParallelStatistics/vtkPDescriptiveStatistics.h
index d0b0a5c44027b07e0e02db72d766956a806c77c8..b308967553ec320ec47793a1fefd471596ed3da5 100644
--- a/Filters/ParallelStatistics/vtkPDescriptiveStatistics.h
+++ b/Filters/ParallelStatistics/vtkPDescriptiveStatistics.h
@@ -26,8 +26,8 @@
 // .SECTION Thanks
 // Thanks to Philippe Pebay from Sandia National Laboratories for implementing this class.
 
-#ifndef __vtkPDescriptiveStatistics_h
-#define __vtkPDescriptiveStatistics_h
+#ifndef vtkPDescriptiveStatistics_h
+#define vtkPDescriptiveStatistics_h
 
 #include "vtkFiltersParallelStatisticsModule.h" // For export macro
 #include "vtkDescriptiveStatistics.h"
diff --git a/Filters/ParallelStatistics/vtkPKMeansStatistics.h b/Filters/ParallelStatistics/vtkPKMeansStatistics.h
index 41b6389c8baef9f299111f3a842d65ec2a40a7b2..0accdd00f50c4768e0371419b08e579e35d276f8 100644
--- a/Filters/ParallelStatistics/vtkPKMeansStatistics.h
+++ b/Filters/ParallelStatistics/vtkPKMeansStatistics.h
@@ -26,8 +26,8 @@
 // .SECTION Thanks
 // Thanks to Janine Bennett, Philippe Pebay and David Thompson from Sandia National Laboratories for implementing this class.
 
-#ifndef __vtkPKMeanStatistics_h
-#define __vtkPKMeanStatistics_h
+#ifndef vtkPKMeanStatistics_h
+#define vtkPKMeanStatistics_h
 
 #include "vtkFiltersParallelStatisticsModule.h" // For export macro
 #include "vtkKMeansStatistics.h"
diff --git a/Filters/ParallelStatistics/vtkPMultiCorrelativeStatistics.h b/Filters/ParallelStatistics/vtkPMultiCorrelativeStatistics.h
index e610ace6d614b1c7491edac4c3fabacaaed3041c..1a9c3cbfdc13c2269cacfef2de1a4a4c773f81a8 100644
--- a/Filters/ParallelStatistics/vtkPMultiCorrelativeStatistics.h
+++ b/Filters/ParallelStatistics/vtkPMultiCorrelativeStatistics.h
@@ -26,8 +26,8 @@
 // .SECTION Thanks
 // Thanks to Philippe Pebay and David Thompson from Sandia National Laboratories for implementing this class.
 
-#ifndef __vtkPMultiCorrelativeStatistics_h
-#define __vtkPMultiCorrelativeStatistics_h
+#ifndef vtkPMultiCorrelativeStatistics_h
+#define vtkPMultiCorrelativeStatistics_h
 
 #include "vtkFiltersParallelStatisticsModule.h" // For export macro
 #include "vtkMultiCorrelativeStatistics.h"
diff --git a/Filters/ParallelStatistics/vtkPOrderStatistics.h b/Filters/ParallelStatistics/vtkPOrderStatistics.h
index aeaffb8a755af3f405f9a9d69bd8e0a468fa7847..6bc41f60cea47eda66cc0659789120371a2192e7 100644
--- a/Filters/ParallelStatistics/vtkPOrderStatistics.h
+++ b/Filters/ParallelStatistics/vtkPOrderStatistics.h
@@ -34,8 +34,8 @@ PURPOSE.  See the above copyright notice for more information.
 // .SECTION Thanks
 // Thanks to Philippe Pebay from Sandia National Laboratories for implementing this class.
 
-#ifndef __vtkPOrderStatistics_h
-#define __vtkPOrderStatistics_h
+#ifndef vtkPOrderStatistics_h
+#define vtkPOrderStatistics_h
 
 #include "vtkFiltersParallelStatisticsModule.h" // For export macro
 #include "vtkOrderStatistics.h"
diff --git a/Filters/ParallelStatistics/vtkPPCAStatistics.h b/Filters/ParallelStatistics/vtkPPCAStatistics.h
index 933829b61f1b19158753b556d24990846508a7b8..f908eb315db4a10a36ce73d114faef6031a73e55 100644
--- a/Filters/ParallelStatistics/vtkPPCAStatistics.h
+++ b/Filters/ParallelStatistics/vtkPPCAStatistics.h
@@ -27,8 +27,8 @@
 // Thanks to Philippe Pebay, David Thompson and Janine Bennett from
 // Sandia National Laboratories for implementing this class.
 
-#ifndef __vtkPPCAStatistics_h
-#define __vtkPPCAStatistics_h
+#ifndef vtkPPCAStatistics_h
+#define vtkPPCAStatistics_h
 
 #include "vtkFiltersParallelStatisticsModule.h" // For export macro
 #include "vtkPCAStatistics.h"
diff --git a/Filters/Programmable/vtkProgrammableAttributeDataFilter.h b/Filters/Programmable/vtkProgrammableAttributeDataFilter.h
index d0b2d246e327bca9ac68d953e415ffcd5b1ac9b1..b563c81a5201bece1c88dbcdb7bb7609971169de 100644
--- a/Filters/Programmable/vtkProgrammableAttributeDataFilter.h
+++ b/Filters/Programmable/vtkProgrammableAttributeDataFilter.h
@@ -68,8 +68,8 @@
 // you'll want to send a manual Modified() method to the filter to force it
 // to reexecute.
 
-#ifndef __vtkProgrammableAttributeDataFilter_h
-#define __vtkProgrammableAttributeDataFilter_h
+#ifndef vtkProgrammableAttributeDataFilter_h
+#define vtkProgrammableAttributeDataFilter_h
 
 #include "vtkFiltersProgrammableModule.h" // For export macro
 #include "vtkDataSetAlgorithm.h"
diff --git a/Filters/Programmable/vtkProgrammableFilter.h b/Filters/Programmable/vtkProgrammableFilter.h
index 3a46ea6c7c7d37a499610ec605c15167befe58af..0f6f950a2115ce6aa4be6d3cffca07e6717a901f 100644
--- a/Filters/Programmable/vtkProgrammableFilter.h
+++ b/Filters/Programmable/vtkProgrammableFilter.h
@@ -34,8 +34,8 @@
 // .SECTION See Also
 // vtkProgrammablePointDataFilter vtkProgrammableSource
 
-#ifndef __vtkProgrammableFilter_h
-#define __vtkProgrammableFilter_h
+#ifndef vtkProgrammableFilter_h
+#define vtkProgrammableFilter_h
 
 #include "vtkFiltersProgrammableModule.h" // For export macro
 #include "vtkPassInputTypeAlgorithm.h"
diff --git a/Filters/Programmable/vtkProgrammableGlyphFilter.h b/Filters/Programmable/vtkProgrammableGlyphFilter.h
index d9c695d027acfa194de2274eb3f72a17c2da15b4..a199309ce36ff3d96a9f94c6bc03eb4e73f5f19c 100644
--- a/Filters/Programmable/vtkProgrammableGlyphFilter.h
+++ b/Filters/Programmable/vtkProgrammableGlyphFilter.h
@@ -54,8 +54,8 @@
 // .SECTION See Also
 // vtkGlyph3D vtkTensorGlyph vtkCellCenters
 
-#ifndef __vtkProgrammableGlyphFilter_h
-#define __vtkProgrammableGlyphFilter_h
+#ifndef vtkProgrammableGlyphFilter_h
+#define vtkProgrammableGlyphFilter_h
 
 #define VTK_COLOR_BY_INPUT  0
 #define VTK_COLOR_BY_SOURCE 1
diff --git a/Filters/Python/vtkPythonAlgorithm.h b/Filters/Python/vtkPythonAlgorithm.h
index 1e44da8b7f702f3e42bc250793e13a6106ef39f9..d373d92fe852d11c5343da25fc315e37b3247df3 100644
--- a/Filters/Python/vtkPythonAlgorithm.h
+++ b/Filters/Python/vtkPythonAlgorithm.h
@@ -34,8 +34,8 @@
 // .SECTION See Also
 // vtkProgrammableFilter
 
-#ifndef __vtkPythonAlgorithm_h
-#define __vtkPythonAlgorithm_h
+#ifndef vtkPythonAlgorithm_h
+#define vtkPythonAlgorithm_h
 
 #include "vtkPython.h" // Must be first
 
diff --git a/Filters/ReebGraph/vtkReebGraphSimplificationFilter.h b/Filters/ReebGraph/vtkReebGraphSimplificationFilter.h
index 294c23240bb2476e1717c9dfdd15e2c7da916dbc..f10b57b79517447c3705073769038c167058827f 100644
--- a/Filters/ReebGraph/vtkReebGraphSimplificationFilter.h
+++ b/Filters/ReebGraph/vtkReebGraphSimplificationFilter.h
@@ -17,8 +17,8 @@
 // The filter takes an input vtkReebGraph object and outputs a
 // vtkReebGraph object.
 
-#ifndef __vtkReebGraphSimplificationFilter_h
-#define __vtkReebGraphSimplificationFilter_h
+#ifndef vtkReebGraphSimplificationFilter_h
+#define vtkReebGraphSimplificationFilter_h
 
 #include "vtkFiltersReebGraphModule.h" // For export macro
 #include "vtkDirectedGraphAlgorithm.h"
diff --git a/Filters/ReebGraph/vtkReebGraphSurfaceSkeletonFilter.h b/Filters/ReebGraph/vtkReebGraphSurfaceSkeletonFilter.h
index 1800b9e326d2631846dcae496993312d3657285f..02b615a679c751a692e25618ace4f110818008ab 100644
--- a/Filters/ReebGraph/vtkReebGraphSurfaceSkeletonFilter.h
+++ b/Filters/ReebGraph/vtkReebGraphSurfaceSkeletonFilter.h
@@ -37,8 +37,8 @@
 // intermediary samples, see Graphics/Testing/Cxx/TestReebGraph.cxx).
 //
 
-#ifndef __vtkReebGraphSurfaceSkeletonFilter_h
-#define __vtkReebGraphSurfaceSkeletonFilter_h
+#ifndef vtkReebGraphSurfaceSkeletonFilter_h
+#define vtkReebGraphSurfaceSkeletonFilter_h
 
 #include "vtkFiltersReebGraphModule.h" // For export macro
 #include  "vtkDataObjectAlgorithm.h"
diff --git a/Filters/ReebGraph/vtkReebGraphToJoinSplitTreeFilter.h b/Filters/ReebGraph/vtkReebGraphToJoinSplitTreeFilter.h
index 59e1e0507caf50e1f966400ec3ea0336f398db40..69b7e22e64c7318e33c4c56bab8fdba3a0d4e688 100644
--- a/Filters/ReebGraph/vtkReebGraphToJoinSplitTreeFilter.h
+++ b/Filters/ReebGraph/vtkReebGraphToJoinSplitTreeFilter.h
@@ -29,8 +29,8 @@
 // computed on that mesh (port 1).
 // The outputs is vtkReebGraph object describing either a join or split tree.
 
-#ifndef __vtkReebGraphToJoinSplitTreeFilter_h
-#define __vtkReebGraphToJoinSplitTreeFilter_h
+#ifndef vtkReebGraphToJoinSplitTreeFilter_h
+#define vtkReebGraphToJoinSplitTreeFilter_h
 
 #include "vtkFiltersReebGraphModule.h" // For export macro
 #include  "vtkDirectedGraphAlgorithm.h"
diff --git a/Filters/ReebGraph/vtkReebGraphVolumeSkeletonFilter.h b/Filters/ReebGraph/vtkReebGraphVolumeSkeletonFilter.h
index 05a124791cb14730fa0aa3af57a8477edf10cc63..29b1a06ea841ac7c3b65dd639d281c733b635ac5 100644
--- a/Filters/ReebGraph/vtkReebGraphVolumeSkeletonFilter.h
+++ b/Filters/ReebGraph/vtkReebGraphVolumeSkeletonFilter.h
@@ -38,8 +38,8 @@
 // intermediary samples, see Graphics/Testing/Cxx/TestReebGraph.cxx).
 //
 
-#ifndef __vtkReebGraphVolumeSkeletonFilter_h
-#define __vtkReebGraphVolumeSkeletonFilter_h
+#ifndef vtkReebGraphVolumeSkeletonFilter_h
+#define vtkReebGraphVolumeSkeletonFilter_h
 
 #include "vtkFiltersReebGraphModule.h" // For export macro
 #include  "vtkDataObjectAlgorithm.h"
diff --git a/Filters/ReebGraph/vtkUnstructuredGridToReebGraphFilter.h b/Filters/ReebGraph/vtkUnstructuredGridToReebGraphFilter.h
index d1047b2c751a01b4b7961ea4be12123d515e23e8..a5a5089c38ef7fa318fcf96d548c31e227b780ef 100644
--- a/Filters/ReebGraph/vtkUnstructuredGridToReebGraphFilter.h
+++ b/Filters/ReebGraph/vtkUnstructuredGridToReebGraphFilter.h
@@ -20,8 +20,8 @@
 // If this field does not exist, the filter will use the vtkElevationFilter to
 // generate a default scalar field.
 
-#ifndef __vtkUnstructuredGridToReebGraphFilter_h
-#define __vtkUnstructuredGridToReebGraphFilter_h
+#ifndef vtkUnstructuredGridToReebGraphFilter_h
+#define vtkUnstructuredGridToReebGraphFilter_h
 
 #include "vtkFiltersReebGraphModule.h" // For export macro
 #include "vtkDirectedGraphAlgorithm.h"
diff --git a/Filters/SMP/vtkSMPContourGrid.h b/Filters/SMP/vtkSMPContourGrid.h
index ebdf22586d7d3e0a7fb71ba8507688e79f291d09..f4a4c9c6e24c93e9c39df2e4b3a4e561e7ea683a 100644
--- a/Filters/SMP/vtkSMPContourGrid.h
+++ b/Filters/SMP/vtkSMPContourGrid.h
@@ -17,8 +17,8 @@
 // it using multiple threads. This will probably be merged with vtkContourGrid
 // in the future.
 
-#ifndef __vtkSMPContourGrid_h
-#define __vtkSMPContourGrid_h
+#ifndef vtkSMPContourGrid_h
+#define vtkSMPContourGrid_h
 
 #include "vtkFiltersSMPModule.h" // For export macro
 #include "vtkContourGrid.h"
diff --git a/Filters/SMP/vtkSMPContourGridManyPieces.h b/Filters/SMP/vtkSMPContourGridManyPieces.h
index 217421cba799fd79d7ef887c8194436bb37ba911..276d132632fe143353773c602dd06d269b8f1d99 100644
--- a/Filters/SMP/vtkSMPContourGridManyPieces.h
+++ b/Filters/SMP/vtkSMPContourGridManyPieces.h
@@ -20,8 +20,8 @@
 // interested in a filter that merges the piece. This will probably be merged with
 // vtkContourGrid in the future.
 
-#ifndef __vtkSMPContourGridManyPieces_h
-#define __vtkSMPContourGridManyPieces_h
+#ifndef vtkSMPContourGridManyPieces_h
+#define vtkSMPContourGridManyPieces_h
 
 #include "vtkFiltersSMPModule.h" // For export macro
 #include "vtkContourGrid.h"
diff --git a/Filters/SMP/vtkSMPMergePoints.h b/Filters/SMP/vtkSMPMergePoints.h
index b1b0987ead0d438681d08033c969c783a7016912..ccc050c6da48fb045cd7bbe58595d0c048128f8b 100644
--- a/Filters/SMP/vtkSMPMergePoints.h
+++ b/Filters/SMP/vtkSMPMergePoints.h
@@ -25,8 +25,8 @@
 //  - Do bunch of merging with outLocator->Merge(inLocator[i], ...) (this can be done in parallel as long as no two bins are done at the same time)
 //  - Fix the size of points with outLocator->FixSizeOfPointArray()
 
-#ifndef __vtkSMPMergePoints_h__
-#define __vtkSMPMergePoints_h__
+#ifndef vtkSMPMergePoints_h__
+#define vtkSMPMergePoints_h__
 
 #include "vtkFiltersSMPModule.h" // For export macro
 #include "vtkMergePoints.h"
@@ -106,4 +106,4 @@ private:
   void operator=(const vtkSMPMergePoints&); // Not implemented
 };
 
-#endif // __vtkSMPMergePoints_h__
+#endif // vtkSMPMergePoints_h__
diff --git a/Filters/SMP/vtkSMPMergePolyDataHelper.h b/Filters/SMP/vtkSMPMergePolyDataHelper.h
index 9728a50d496e7fd4e01018cacc568462b6f6ab74..58152f11dba32632701624289166369c4be07653 100644
--- a/Filters/SMP/vtkSMPMergePolyDataHelper.h
+++ b/Filters/SMP/vtkSMPMergePolyDataHelper.h
@@ -18,8 +18,8 @@
 // locators. It requires that the filter uses vtkSMPMergePoints which creates
 // a number of necessary data structures.
 
-#ifndef __vtkSMPMergePolyDataHelper_h
-#define __vtkSMPMergePolyDataHelper_h
+#ifndef vtkSMPMergePolyDataHelper_h
+#define vtkSMPMergePolyDataHelper_h
 
 #include "vtkFiltersSMPModule.h"
 
diff --git a/Filters/SMP/vtkSMPTransform.h b/Filters/SMP/vtkSMPTransform.h
index cba62cc6fd758de37bd407b48a67ca93ed7285d0..b8aed7b2a7c116c8a98a428ebf36ee8cffb33704 100644
--- a/Filters/SMP/vtkSMPTransform.h
+++ b/Filters/SMP/vtkSMPTransform.h
@@ -21,8 +21,8 @@
 // .SECTION See Also
 // vtkTransform
 
-#ifndef __vtkSMPTransform_h
-#define __vtkSMPTransform_h
+#ifndef vtkSMPTransform_h
+#define vtkSMPTransform_h
 
 #include "vtkFiltersSMPModule.h" // For export macro
 #include "vtkTransform.h"
diff --git a/Filters/SMP/vtkSMPWarpVector.h b/Filters/SMP/vtkSMPWarpVector.h
index 8ca5ddef6ac1fea02f4a989b6ea76fd2b4f48924..af10d737087a23e0dfe2a1e1517ace480902997b 100644
--- a/Filters/SMP/vtkSMPWarpVector.h
+++ b/Filters/SMP/vtkSMPWarpVector.h
@@ -16,8 +16,8 @@
 // .SECTION Description
 // Just like parent, but uses the SMP framework to do the work on many threads.
 
-#ifndef __vtkSMPWarpVector_h__
-#define __vtkSMPWarpVector_h__
+#ifndef vtkSMPWarpVector_h__
+#define vtkSMPWarpVector_h__
 
 #include "vtkFiltersSMPModule.h" // For export macro
 #include "vtkWarpVector.h"
@@ -49,4 +49,4 @@ private :
 
 };
 
-#endif //__vtkSMPWarpVector_h__
+#endif //vtkSMPWarpVector_h__
diff --git a/Filters/Selection/vtkKdTreeSelector.h b/Filters/Selection/vtkKdTreeSelector.h
index ba6c62a7729d571e7776376129fde5edd6cb14d9..933b590513c847f87c033e252d28d06fb6d42693 100644
--- a/Filters/Selection/vtkKdTreeSelector.h
+++ b/Filters/Selection/vtkKdTreeSelector.h
@@ -25,8 +25,8 @@
 // vtkSelection containing the ids found in the kd-tree using the specified
 // bounds.
 
-#ifndef __vtkKdTreeSelector_h
-#define __vtkKdTreeSelector_h
+#ifndef vtkKdTreeSelector_h
+#define vtkKdTreeSelector_h
 
 #include "vtkFiltersSelectionModule.h" // For export macro
 #include "vtkSelectionAlgorithm.h"
diff --git a/Filters/Sources/vtkArcSource.h b/Filters/Sources/vtkArcSource.h
index bac186d7127863a27d56baf1c5c577cbab7f15ea..e49b6b49da325746df3e3d15fa16e68df2e386d4 100644
--- a/Filters/Sources/vtkArcSource.h
+++ b/Filters/Sources/vtkArcSource.h
@@ -27,8 +27,8 @@
 // Centre DAM Ile-De-France, BP12, F-91297 Arpajon, France, and implemented
 // by Philippe Pebay, Kitware SAS 2012.
 
-#ifndef __vtkArcSource_h
-#define __vtkArcSource_h
+#ifndef vtkArcSource_h
+#define vtkArcSource_h
 
 #include "vtkFiltersSourcesModule.h" // For export macro
 #include "vtkPolyDataAlgorithm.h"
diff --git a/Filters/Sources/vtkArrowSource.h b/Filters/Sources/vtkArrowSource.h
index a139b0158d0da2acb6f53babb68546c0f5359af1..aafaf505d86b9e3f5550ab9ea685762c03581118 100644
--- a/Filters/Sources/vtkArrowSource.h
+++ b/Filters/Sources/vtkArrowSource.h
@@ -23,8 +23,8 @@
 // The length of the tip can also be set, and defaults to 0.35.
 
 
-#ifndef __vtkArrowSource_h
-#define __vtkArrowSource_h
+#ifndef vtkArrowSource_h
+#define vtkArrowSource_h
 
 #include "vtkFiltersSourcesModule.h" // For export macro
 #include "vtkPolyDataAlgorithm.h"
diff --git a/Filters/Sources/vtkButtonSource.h b/Filters/Sources/vtkButtonSource.h
index 712a7d8ec14530dcdd960928235791ef856fff3a..4c22257e769c48e10609f7124b39a3f58715e9dc 100644
--- a/Filters/Sources/vtkButtonSource.h
+++ b/Filters/Sources/vtkButtonSource.h
@@ -39,8 +39,8 @@
 // or vtkGlyph3D to orient the button in a different direction.
 
 
-#ifndef __vtkButtonSource_h
-#define __vtkButtonSource_h
+#ifndef vtkButtonSource_h
+#define vtkButtonSource_h
 
 #include "vtkFiltersSourcesModule.h" // For export macro
 #include "vtkPolyDataAlgorithm.h"
diff --git a/Filters/Sources/vtkConeSource.h b/Filters/Sources/vtkConeSource.h
index 84125fa107837416f6a35f75dd69e999635c681a..e5986b24fac75b2f1811b833b33e1c21db1770ac 100644
--- a/Filters/Sources/vtkConeSource.h
+++ b/Filters/Sources/vtkConeSource.h
@@ -24,8 +24,8 @@
 // whether the bottom of the cone is capped with a (resolution-sided)
 // polygon, and to specify the height and radius of the cone.
 
-#ifndef __vtkConeSource_h
-#define __vtkConeSource_h
+#ifndef vtkConeSource_h
+#define vtkConeSource_h
 
 #include "vtkFiltersSourcesModule.h" // For export macro
 #include "vtkPolyDataAlgorithm.h"
diff --git a/Filters/Sources/vtkCubeSource.h b/Filters/Sources/vtkCubeSource.h
index 6bf90789e0ef857574d1daf36991fcc7433f9b18..db539e315a1774b91c5b09d6a63329f6553945e6 100644
--- a/Filters/Sources/vtkCubeSource.h
+++ b/Filters/Sources/vtkCubeSource.h
@@ -18,8 +18,8 @@
 // with four-sided polygons. It is possible to specify the length, width,
 // and height of the cube independently.
 
-#ifndef __vtkCubeSource_h
-#define __vtkCubeSource_h
+#ifndef vtkCubeSource_h
+#define vtkCubeSource_h
 
 #include "vtkFiltersSourcesModule.h" // For export macro
 #include "vtkPolyDataAlgorithm.h"
diff --git a/Filters/Sources/vtkCylinderSource.h b/Filters/Sources/vtkCylinderSource.h
index 6aa385d448dcd2bfe7757d4f4e73bc05e5eae51f..60a0ffa3f475495a423b47a60976366c340cf463 100644
--- a/Filters/Sources/vtkCylinderSource.h
+++ b/Filters/Sources/vtkCylinderSource.h
@@ -22,8 +22,8 @@
 // should use a vtkLineSource followed by a vtkTubeFilter instead of the
 // vtkCylinderSource.
 
-#ifndef __vtkCylinderSource_h
-#define __vtkCylinderSource_h
+#ifndef vtkCylinderSource_h
+#define vtkCylinderSource_h
 
 #include "vtkFiltersSourcesModule.h" // For export macro
 #include "vtkPolyDataAlgorithm.h"
diff --git a/Filters/Sources/vtkDiagonalMatrixSource.h b/Filters/Sources/vtkDiagonalMatrixSource.h
index c08b3a250324817be375dc9aaa689cc660b24e96..4b0408a2d49c94c5a425ea3615fd8a6a6b0a6443 100644
--- a/Filters/Sources/vtkDiagonalMatrixSource.h
+++ b/Filters/Sources/vtkDiagonalMatrixSource.h
@@ -25,8 +25,8 @@
 // .SECTION Thanks
 // Developed by Timothy M. Shead (tshead@sandia.gov) at Sandia National Laboratories.
 
-#ifndef __vtkDiagonalMatrixSource_h
-#define __vtkDiagonalMatrixSource_h
+#ifndef vtkDiagonalMatrixSource_h
+#define vtkDiagonalMatrixSource_h
 
 #include "vtkFiltersSourcesModule.h" // For export macro
 #include "vtkArrayDataAlgorithm.h"
diff --git a/Filters/Sources/vtkDiskSource.h b/Filters/Sources/vtkDiskSource.h
index 98d2e9c80c07564607a5837e07554a7693c83175..4245fc4be6b8b1bb8ec102415df5382f57bcd58f 100644
--- a/Filters/Sources/vtkDiskSource.h
+++ b/Filters/Sources/vtkDiskSource.h
@@ -21,8 +21,8 @@
 // .SECTION See Also
 // vtkLinearExtrusionFilter
 
-#ifndef __vtkDiskSource_h
-#define __vtkDiskSource_h
+#ifndef vtkDiskSource_h
+#define vtkDiskSource_h
 
 #include "vtkFiltersSourcesModule.h" // For export macro
 #include "vtkPolyDataAlgorithm.h"
diff --git a/Filters/Sources/vtkEllipticalButtonSource.h b/Filters/Sources/vtkEllipticalButtonSource.h
index 9daa9e959290dc67e9a24ee61f79f519edf07ca0..d73c857fb269ff5db21807a29c05541fee08e9fd 100644
--- a/Filters/Sources/vtkEllipticalButtonSource.h
+++ b/Filters/Sources/vtkEllipticalButtonSource.h
@@ -34,8 +34,8 @@
 // .SECTION See Also
 // vtkButtonSource vtkRectangularButtonSource
 
-#ifndef __vtkEllipticalButtonSource_h
-#define __vtkEllipticalButtonSource_h
+#ifndef vtkEllipticalButtonSource_h
+#define vtkEllipticalButtonSource_h
 
 #include "vtkFiltersSourcesModule.h" // For export macro
 #include "vtkButtonSource.h"
diff --git a/Filters/Sources/vtkFrustumSource.h b/Filters/Sources/vtkFrustumSource.h
index 3540b7711973db04f3dbbcd4b51e813f28ce881c..0356df48bc5b4b5813e61f95119a717f9f2929d2 100644
--- a/Filters/Sources/vtkFrustumSource.h
+++ b/Filters/Sources/vtkFrustumSource.h
@@ -26,8 +26,8 @@
 // coefficients
 // 3. pass the vtkPlanes to a vtkFrustumSource.
 
-#ifndef __vtkFrustumSource_h
-#define __vtkFrustumSource_h
+#ifndef vtkFrustumSource_h
+#define vtkFrustumSource_h
 
 #include "vtkFiltersSourcesModule.h" // For export macro
 #include "vtkPolyDataAlgorithm.h"
diff --git a/Filters/Sources/vtkGlyphSource2D.h b/Filters/Sources/vtkGlyphSource2D.h
index 505df8a0149f6b28bc619c0c003b4802504e65a6..7aa50913d108942906b32a913cebe380e25efff1 100644
--- a/Filters/Sources/vtkGlyphSource2D.h
+++ b/Filters/Sources/vtkGlyphSource2D.h
@@ -24,8 +24,8 @@
 // sequence). You can also put a short line through the glyph running from -x
 // to +x (the glyph looks like it's on a line), or a cross.
 
-#ifndef __vtkGlyphSource2D_h
-#define __vtkGlyphSource2D_h
+#ifndef vtkGlyphSource2D_h
+#define vtkGlyphSource2D_h
 
 #include "vtkFiltersSourcesModule.h" // For export macro
 #include "vtkPolyDataAlgorithm.h"
diff --git a/Filters/Sources/vtkGraphToPolyData.h b/Filters/Sources/vtkGraphToPolyData.h
index b7db82e9cf7f5f89f51a29deccf4760905917b52..b82534593a2162c46b11105de27ec4b8b4fd0776 100644
--- a/Filters/Sources/vtkGraphToPolyData.h
+++ b/Filters/Sources/vtkGraphToPolyData.h
@@ -29,8 +29,8 @@
 // Only the owned graph edges (i.e. edges with ghost level 0) are copied
 // into the vtkPolyData.
 
-#ifndef __vtkGraphToPolyData_h
-#define __vtkGraphToPolyData_h
+#ifndef vtkGraphToPolyData_h
+#define vtkGraphToPolyData_h
 
 #include "vtkFiltersSourcesModule.h" // For export macro
 #include "vtkPolyDataAlgorithm.h"
diff --git a/Filters/Sources/vtkHyperOctreeFractalSource.h b/Filters/Sources/vtkHyperOctreeFractalSource.h
index b9d75815fbd11c12d58d52db7782ae47e96f551b..1402b4a59b010adad135198ce598f9f9b314e2db 100644
--- a/Filters/Sources/vtkHyperOctreeFractalSource.h
+++ b/Filters/Sources/vtkHyperOctreeFractalSource.h
@@ -19,8 +19,8 @@
 // .SECTION See Also
 // vtkHyperOctreeSampleFunction
 
-#ifndef __vtkHyperOctreeFractalSource_h
-#define __vtkHyperOctreeFractalSource_h
+#ifndef vtkHyperOctreeFractalSource_h
+#define vtkHyperOctreeFractalSource_h
 
 #include "vtkFiltersSourcesModule.h" // For export macro
 #include "vtkHyperOctreeAlgorithm.h"
diff --git a/Filters/Sources/vtkHyperTreeGridSource.h b/Filters/Sources/vtkHyperTreeGridSource.h
index ca8396ad626aa850af8abc8c3c171b3e0b79fc99..f367f33a2a2aca9853c4f148482e6e9fb0524c40 100644
--- a/Filters/Sources/vtkHyperTreeGridSource.h
+++ b/Filters/Sources/vtkHyperTreeGridSource.h
@@ -37,8 +37,8 @@
 // Kitware 2013
 // This work was supported in part by Commissariat a l'Energie Atomique (CEA/DIF)
 
-#ifndef __vtkHyperTreeGridSource_h
-#define __vtkHyperTreeGridSource_h
+#ifndef vtkHyperTreeGridSource_h
+#define vtkHyperTreeGridSource_h
 
 #include "vtkFiltersSourcesModule.h" // For export macro
 #include "vtkHyperTreeGridAlgorithm.h"
diff --git a/Filters/Sources/vtkLineSource.h b/Filters/Sources/vtkLineSource.h
index def7da90c614d727576f0d39d5b2efd40e380fea..4e42ef897949c2479370be27497617ab6d41480b 100644
--- a/Filters/Sources/vtkLineSource.h
+++ b/Filters/Sources/vtkLineSource.h
@@ -22,8 +22,8 @@
 // This class was extended by Philippe Pebay, Kitware SAS 2011, to support
 // broken lines as well as simple lines.
 
-#ifndef __vtkLineSource_h
-#define __vtkLineSource_h
+#ifndef vtkLineSource_h
+#define vtkLineSource_h
 
 #include "vtkFiltersSourcesModule.h" // For export macro
 #include "vtkPolyDataAlgorithm.h"
diff --git a/Filters/Sources/vtkOutlineCornerFilter.h b/Filters/Sources/vtkOutlineCornerFilter.h
index 27e8aaf059cfc0b34e3a0f1a261871ad53fa5932..75674bf2c70cf7b0fb6b288d65594492b2046870 100644
--- a/Filters/Sources/vtkOutlineCornerFilter.h
+++ b/Filters/Sources/vtkOutlineCornerFilter.h
@@ -18,8 +18,8 @@
 // data set. The outline consists of the eight corners of the dataset
 // bounding box.
 
-#ifndef __vtkOutlineCornerFilter_h
-#define __vtkOutlineCornerFilter_h
+#ifndef vtkOutlineCornerFilter_h
+#define vtkOutlineCornerFilter_h
 
 #include "vtkFiltersSourcesModule.h" // For export macro
 #include "vtkPolyDataAlgorithm.h"
diff --git a/Filters/Sources/vtkOutlineCornerSource.h b/Filters/Sources/vtkOutlineCornerSource.h
index 240ce9563ed35fc729e5e025160eb65fed5cd839..8c4b028ef231ddedb91f062347c7419dbe2a6eeb 100644
--- a/Filters/Sources/vtkOutlineCornerSource.h
+++ b/Filters/Sources/vtkOutlineCornerSource.h
@@ -17,8 +17,8 @@
 // vtkOutlineCornerSource creates wireframe outline corners around a user-specified
 // bounding box.
 
-#ifndef __vtkOutlineCornerSource_h
-#define __vtkOutlineCornerSource_h
+#ifndef vtkOutlineCornerSource_h
+#define vtkOutlineCornerSource_h
 
 #include "vtkFiltersSourcesModule.h" // For export macro
 #include "vtkOutlineSource.h"
diff --git a/Filters/Sources/vtkOutlineSource.h b/Filters/Sources/vtkOutlineSource.h
index 2a5ec52bc7dbcd8a240721e9b31e318b5ba26f8c..4fb60c1294adad31e0003e28dbd87d0f1ff5124e 100644
--- a/Filters/Sources/vtkOutlineSource.h
+++ b/Filters/Sources/vtkOutlineSource.h
@@ -21,8 +21,8 @@
 // box may be arbitrarily aligned, in which case it should be set via
 // the SetCorners() member.
 
-#ifndef __vtkOutlineSource_h
-#define __vtkOutlineSource_h
+#ifndef vtkOutlineSource_h
+#define vtkOutlineSource_h
 
 #include "vtkFiltersSourcesModule.h" // For export macro
 #include "vtkPolyDataAlgorithm.h"
diff --git a/Filters/Sources/vtkParametricFunctionSource.h b/Filters/Sources/vtkParametricFunctionSource.h
index c2e6f4124278cf5c6e7adbc1d90e7a507127d41f..888cfead53c7d06246512cc8b1199af2d21620d1 100644
--- a/Filters/Sources/vtkParametricFunctionSource.h
+++ b/Filters/Sources/vtkParametricFunctionSource.h
@@ -37,8 +37,8 @@
 // vtkParametricEnneper vtkParametricRandomHills vtkParametricSuperEllipsoid
 // vtkParametricSuperToroid vtkParametricTorus
 //
-#ifndef __vtkParametricFunctionSource_h
-#define __vtkParametricFunctionSource_h
+#ifndef vtkParametricFunctionSource_h
+#define vtkParametricFunctionSource_h
 
 #include "vtkFiltersSourcesModule.h" // For export macro
 #include "vtkPolyDataAlgorithm.h"
diff --git a/Filters/Sources/vtkPlaneSource.h b/Filters/Sources/vtkPlaneSource.h
index 548bf49f43a0c8752d9f87d0c96ad1a43d52f621..79c4972c4d26ebf7bd7db5f61a6f56a8f6039061 100644
--- a/Filters/Sources/vtkPlaneSource.h
+++ b/Filters/Sources/vtkPlaneSource.h
@@ -42,8 +42,8 @@
 // of the first axis (Origin->Point1) with the second (Origin->Point2). This
 // also affects the normals to the generated polygons.
 
-#ifndef __vtkPlaneSource_h
-#define __vtkPlaneSource_h
+#ifndef vtkPlaneSource_h
+#define vtkPlaneSource_h
 
 #include "vtkFiltersSourcesModule.h" // For export macro
 #include "vtkPolyDataAlgorithm.h"
diff --git a/Filters/Sources/vtkPlatonicSolidSource.h b/Filters/Sources/vtkPlatonicSolidSource.h
index d477f321650c1a03103fb604432b850b721a1bb5..ca6081acdbc1374c3104bfd03c23a1e715d82e93 100644
--- a/Filters/Sources/vtkPlatonicSolidSource.h
+++ b/Filters/Sources/vtkPlatonicSolidSource.h
@@ -20,8 +20,8 @@
 // To use this class, simply specify the solid to create. Note that this
 // source object creates cell scalars that are (integral value) face numbers.
 
-#ifndef __vtkPlatonicSolidSource_h
-#define __vtkPlatonicSolidSource_h
+#ifndef vtkPlatonicSolidSource_h
+#define vtkPlatonicSolidSource_h
 
 #include "vtkFiltersSourcesModule.h" // For export macro
 #include "vtkPolyDataAlgorithm.h"
diff --git a/Filters/Sources/vtkPointSource.h b/Filters/Sources/vtkPointSource.h
index f34439b50796c6f4cce08d60f655ab08b2dec0bb..cb9cd5a340f1299b407110d93d591a29813bbc0a 100644
--- a/Filters/Sources/vtkPointSource.h
+++ b/Filters/Sources/vtkPointSource.h
@@ -21,8 +21,8 @@
 // sphere. The output PolyData has the specified number of points and
 // 1 cell - a vtkPolyVertex containing all of the points.
 
-#ifndef __vtkPointSource_h
-#define __vtkPointSource_h
+#ifndef vtkPointSource_h
+#define vtkPointSource_h
 
 #include "vtkFiltersSourcesModule.h" // For export macro
 #include "vtkPolyDataAlgorithm.h"
diff --git a/Filters/Sources/vtkProgrammableDataObjectSource.h b/Filters/Sources/vtkProgrammableDataObjectSource.h
index ffca8b23df2a0c55e17e6e6f50bbd407957606fc..c1b398d7cc824deb7573b9ac5053ece427f152c2 100644
--- a/Filters/Sources/vtkProgrammableDataObjectSource.h
+++ b/Filters/Sources/vtkProgrammableDataObjectSource.h
@@ -30,8 +30,8 @@
 // vtkProgrammableFilter vtkProgrammableAttributeDataFilter
 // vtkProgrammableSource vtkDataObjectToDataSetFilter
 
-#ifndef __vtkProgrammableDataObjectSource_h
-#define __vtkProgrammableDataObjectSource_h
+#ifndef vtkProgrammableDataObjectSource_h
+#define vtkProgrammableDataObjectSource_h
 
 #include "vtkFiltersSourcesModule.h" // For export macro
 #include "vtkDataObjectAlgorithm.h"
diff --git a/Filters/Sources/vtkProgrammableSource.h b/Filters/Sources/vtkProgrammableSource.h
index 2863355056724ca0782b928e2730914d6143db0a..3a770ffc97af74e2562ff1f0170270cc7217c93b 100644
--- a/Filters/Sources/vtkProgrammableSource.h
+++ b/Filters/Sources/vtkProgrammableSource.h
@@ -32,8 +32,8 @@
 // vtkProgrammableFilter vtkProgrammableAttributeDataFilter
 // vtkProgrammableDataObjectSource
 
-#ifndef __vtkProgrammableSource_h
-#define __vtkProgrammableSource_h
+#ifndef vtkProgrammableSource_h
+#define vtkProgrammableSource_h
 
 #include "vtkFiltersSourcesModule.h" // For export macro
 #include "vtkDataSetAlgorithm.h"
diff --git a/Filters/Sources/vtkRectangularButtonSource.h b/Filters/Sources/vtkRectangularButtonSource.h
index beee6d4d2ca36962883251008c4ab1f16abc4880..de20ceb5cb5e2721a8a5e38de7e055446afc52be 100644
--- a/Filters/Sources/vtkRectangularButtonSource.h
+++ b/Filters/Sources/vtkRectangularButtonSource.h
@@ -39,8 +39,8 @@
 // or vtkGlyph3D to orient the button in a different direction.
 
 
-#ifndef __vtkRectangularButtonSource_h
-#define __vtkRectangularButtonSource_h
+#ifndef vtkRectangularButtonSource_h
+#define vtkRectangularButtonSource_h
 
 #include "vtkFiltersSourcesModule.h" // For export macro
 #include "vtkButtonSource.h"
diff --git a/Filters/Sources/vtkRegularPolygonSource.h b/Filters/Sources/vtkRegularPolygonSource.h
index 1871e34e1ef7c02c3cef34fa1f8fd778abddc4ea..979b3eae915481d9ad434a4f7871107e6bea7b58 100644
--- a/Filters/Sources/vtkRegularPolygonSource.h
+++ b/Filters/Sources/vtkRegularPolygonSource.h
@@ -21,8 +21,8 @@
 //
 // This object can be used for seeding streamlines or defining regions for clipping/cutting.
 
-#ifndef __vtkRegularPolygonSource_h
-#define __vtkRegularPolygonSource_h
+#ifndef vtkRegularPolygonSource_h
+#define vtkRegularPolygonSource_h
 
 #include "vtkFiltersSourcesModule.h" // For export macro
 #include "vtkPolyDataAlgorithm.h"
diff --git a/Filters/Sources/vtkSelectionSource.h b/Filters/Sources/vtkSelectionSource.h
index 395ff224e2c249f252f02f1e7d0a872c3dc543b2..120bd0a47ca89940d5430831404358c3b58a30bf 100644
--- a/Filters/Sources/vtkSelectionSource.h
+++ b/Filters/Sources/vtkSelectionSource.h
@@ -17,8 +17,8 @@
 // (piece id, cell id) pairs. It will only generate the selection values
 // that match UPDATE_PIECE_NUMBER (i.e. piece == UPDATE_PIECE_NUMBER).
 
-#ifndef __vtkSelectionSource_h
-#define __vtkSelectionSource_h
+#ifndef vtkSelectionSource_h
+#define vtkSelectionSource_h
 
 #include "vtkFiltersSourcesModule.h" // For export macro
 #include "vtkSelectionAlgorithm.h"
diff --git a/Filters/Sources/vtkSphereSource.h b/Filters/Sources/vtkSphereSource.h
index 3284f855e09c341db56684600d63a37dd191e2b2..3cacf2d2e32c4550f3661aa63e924cd03df5c740 100644
--- a/Filters/Sources/vtkSphereSource.h
+++ b/Filters/Sources/vtkSphereSource.h
@@ -26,8 +26,8 @@
 // sphere. If you create partial spheres the number of latitude/longitude
 // lines may be off by one.
 
-#ifndef __vtkSphereSource_h
-#define __vtkSphereSource_h
+#ifndef vtkSphereSource_h
+#define vtkSphereSource_h
 
 #include "vtkFiltersSourcesModule.h" // For export macro
 #include "vtkPolyDataAlgorithm.h"
diff --git a/Filters/Sources/vtkSuperquadricSource.h b/Filters/Sources/vtkSuperquadricSource.h
index af0ec8dbe59a35a4d766bb8d025e5e876f2d1e29..8d0b29a0322afc733e553c5246ea6d0d5eaf0b1e 100644
--- a/Filters/Sources/vtkSuperquadricSource.h
+++ b/Filters/Sources/vtkSuperquadricSource.h
@@ -43,8 +43,8 @@
 // generation, and may do not exactly describe the size of the superquadric.
 //
 
-#ifndef __vtkSuperquadricSource_h
-#define __vtkSuperquadricSource_h
+#ifndef vtkSuperquadricSource_h
+#define vtkSuperquadricSource_h
 
 #include "vtkFiltersSourcesModule.h" // For export macro
 #include "vtkPolyDataAlgorithm.h"
diff --git a/Filters/Sources/vtkTessellatedBoxSource.h b/Filters/Sources/vtkTessellatedBoxSource.h
index 5b909f83faa0036745ee1ba8911c67233941d8f7..3c29cafdd6436742bf276e51ed3485344deaef44 100644
--- a/Filters/Sources/vtkTessellatedBoxSource.h
+++ b/Filters/Sources/vtkTessellatedBoxSource.h
@@ -29,8 +29,8 @@
 // This source only generate geometry, no DataArrays like normals or texture
 // coordinates.
 
-#ifndef __vtkTessellatedBoxSource_h
-#define __vtkTessellatedBoxSource_h
+#ifndef vtkTessellatedBoxSource_h
+#define vtkTessellatedBoxSource_h
 
 #include "vtkFiltersSourcesModule.h" // For export macro
 #include "vtkPolyDataAlgorithm.h"
diff --git a/Filters/Sources/vtkTextSource.h b/Filters/Sources/vtkTextSource.h
index a8ba107f53db3792a4984bf50e3722bc774d0269..32891578d1a99f6359ee983e3c678c5f67622515 100644
--- a/Filters/Sources/vtkTextSource.h
+++ b/Filters/Sources/vtkTextSource.h
@@ -30,8 +30,8 @@
 // .SECTION See Also
 // vtkVectorText
 
-#ifndef __vtkTextSource_h
-#define __vtkTextSource_h
+#ifndef vtkTextSource_h
+#define vtkTextSource_h
 
 #include "vtkFiltersSourcesModule.h" // For export macro
 #include "vtkPolyDataAlgorithm.h"
diff --git a/Filters/Sources/vtkTexturedSphereSource.h b/Filters/Sources/vtkTexturedSphereSource.h
index 6da24eb6df6a79a056f8f4549897ea33c618c41d..b2480ba49d4b2cdae6d05185786547aa1e0cb781 100644
--- a/Filters/Sources/vtkTexturedSphereSource.h
+++ b/Filters/Sources/vtkTexturedSphereSource.h
@@ -20,8 +20,8 @@
 // It also is possible to create partial sphere by specifying maximum phi and
 // theta angles.
 
-#ifndef __vtkTexturedSphereSource_h
-#define __vtkTexturedSphereSource_h
+#ifndef vtkTexturedSphereSource_h
+#define vtkTexturedSphereSource_h
 
 #include "vtkFiltersSourcesModule.h" // For export macro
 #include "vtkPolyDataAlgorithm.h"
diff --git a/Filters/Statistics/vtkAutoCorrelativeStatistics.h b/Filters/Statistics/vtkAutoCorrelativeStatistics.h
index 6679d6ca802115cd93e65908167d1d579a773a1e..0fd1150ae9b2847d9ca97e74261c1a3af5f71806 100644
--- a/Filters/Statistics/vtkAutoCorrelativeStatistics.h
+++ b/Filters/Statistics/vtkAutoCorrelativeStatistics.h
@@ -34,8 +34,8 @@ PURPOSE.  See the above copyright notice for more information.
 // .SECTION Thanks
 // This class was written by Philippe Pebay, Kitware SAS 2012
 
-#ifndef __vtkAutoCorrelativeStatistics_h
-#define __vtkAutoCorrelativeStatistics_h
+#ifndef vtkAutoCorrelativeStatistics_h
+#define vtkAutoCorrelativeStatistics_h
 
 #include "vtkFiltersStatisticsModule.h" // For export macro
 #include "vtkStatisticsAlgorithm.h"
diff --git a/Filters/Statistics/vtkBivariateLinearTableThreshold.h b/Filters/Statistics/vtkBivariateLinearTableThreshold.h
index c8fda512e4cece04386ea2ddb845cf3cc88aa547..21233482087f131b25ddc6d68f786e3faa0bfd64 100644
--- a/Filters/Statistics/vtkBivariateLinearTableThreshold.h
+++ b/Filters/Statistics/vtkBivariateLinearTableThreshold.h
@@ -34,8 +34,8 @@ PURPOSE.  See the above copyright notice for more information.
 // comparisons can be performed in the scaled space by setting the CustomRanges
 // ivar and enabling UseNormalizedDistance.
 
-#ifndef __vtkBivariateLinearTableThreshold__h
-#define __vtkBivariateLinearTableThreshold__h
+#ifndef vtkBivariateLinearTableThreshold__h
+#define vtkBivariateLinearTableThreshold__h
 
 #include "vtkFiltersStatisticsModule.h" // For export macro
 #include "vtkTableAlgorithm.h"
diff --git a/Filters/Statistics/vtkComputeQuartiles.h b/Filters/Statistics/vtkComputeQuartiles.h
index ffcef40b905ce84315666b1ddf30d727e1f5cb81..af09d7f73414b12f0a0c113dbb8b62a8686956fa 100644
--- a/Filters/Statistics/vtkComputeQuartiles.h
+++ b/Filters/Statistics/vtkComputeQuartiles.h
@@ -13,8 +13,8 @@
 
 =========================================================================*/
 
-#ifndef __vtkComputeQuartiles_h
-#define __vtkComputeQuartiles_h
+#ifndef vtkComputeQuartiles_h
+#define vtkComputeQuartiles_h
 
 #include "vtkFiltersStatisticsModule.h" // For export macro
 #include "vtkTableAlgorithm.h"
diff --git a/Filters/Statistics/vtkContingencyStatistics.h b/Filters/Statistics/vtkContingencyStatistics.h
index c207dc68cb603a9251eebe1dcc728df8feedce77..d1a33c9b26162a9aa3745dace76b344a28ed8b68 100644
--- a/Filters/Statistics/vtkContingencyStatistics.h
+++ b/Filters/Statistics/vtkContingencyStatistics.h
@@ -37,8 +37,8 @@ PURPOSE.  See the above copyright notice for more information.
 // for implementing this class.
 // Updated by Philippe Pebay, Kitware SAS 2012
 
-#ifndef __vtkContingencyStatistics_h
-#define __vtkContingencyStatistics_h
+#ifndef vtkContingencyStatistics_h
+#define vtkContingencyStatistics_h
 
 #include "vtkFiltersStatisticsModule.h" // For export macro
 #include "vtkStatisticsAlgorithm.h"
diff --git a/Filters/Statistics/vtkCorrelativeStatistics.h b/Filters/Statistics/vtkCorrelativeStatistics.h
index 665ab284773321da03377f63af880db4075249c6..9fef9b92fce4ce9f6f079a902db3923440d00510 100644
--- a/Filters/Statistics/vtkCorrelativeStatistics.h
+++ b/Filters/Statistics/vtkCorrelativeStatistics.h
@@ -38,8 +38,8 @@ PURPOSE.  See the above copyright notice for more information.
 // for implementing this class.
 // Updated by Philippe Pebay, Kitware SAS 2012
 
-#ifndef __vtkCorrelativeStatistics_h
-#define __vtkCorrelativeStatistics_h
+#ifndef vtkCorrelativeStatistics_h
+#define vtkCorrelativeStatistics_h
 
 #include "vtkFiltersStatisticsModule.h" // For export macro
 #include "vtkStatisticsAlgorithm.h"
diff --git a/Filters/Statistics/vtkDescriptiveStatistics.h b/Filters/Statistics/vtkDescriptiveStatistics.h
index 9438888c31b41bdb657eb0c7e18deca2152630e7..766081d18d0e6aef5249634bb13a43484871048c 100644
--- a/Filters/Statistics/vtkDescriptiveStatistics.h
+++ b/Filters/Statistics/vtkDescriptiveStatistics.h
@@ -43,8 +43,8 @@ PURPOSE.  See the above copyright notice for more information.
 // for implementing this class.
 // Updated by Philippe Pebay, Kitware SAS 2012
 
-#ifndef __vtkDescriptiveStatistics_h
-#define __vtkDescriptiveStatistics_h
+#ifndef vtkDescriptiveStatistics_h
+#define vtkDescriptiveStatistics_h
 
 #include "vtkFiltersStatisticsModule.h" // For export macro
 #include "vtkStatisticsAlgorithm.h"
diff --git a/Filters/Statistics/vtkExtractFunctionalBagPlot.h b/Filters/Statistics/vtkExtractFunctionalBagPlot.h
index c4e80601a50bc45f4e09a3ebe15024df582557bb..6d32b1120ae570c82c13391991c342be8ac16bf4 100644
--- a/Filters/Statistics/vtkExtractFunctionalBagPlot.h
+++ b/Filters/Statistics/vtkExtractFunctionalBagPlot.h
@@ -25,8 +25,8 @@
 // .SECTION See Also
 // vtkFunctionalBagPlot vtkHighestDensityRegionsStatistics
 
-#ifndef __vtkExtractFunctionalBagPlot_h
-#define __vtkExtractFunctionalBagPlot_h
+#ifndef vtkExtractFunctionalBagPlot_h
+#define vtkExtractFunctionalBagPlot_h
 
 #include "vtkFiltersStatisticsModule.h" // For export macro
 #include "vtkTableAlgorithm.h"
@@ -52,4 +52,4 @@ private:
   void operator = ( const vtkExtractFunctionalBagPlot& ); // Not implemented.
 };
 
-#endif // __vtkExtractFunctionalBagPlot_h
+#endif // vtkExtractFunctionalBagPlot_h
diff --git a/Filters/Statistics/vtkHighestDensityRegionsStatistics.h b/Filters/Statistics/vtkHighestDensityRegionsStatistics.h
index 7080261eff8973cd40fd6708f16fe609fe70ab03..f3155d48378cadef9d7b559698f8f1e77965aba0 100644
--- a/Filters/Statistics/vtkHighestDensityRegionsStatistics.h
+++ b/Filters/Statistics/vtkHighestDensityRegionsStatistics.h
@@ -33,8 +33,8 @@ PURPOSE.  See the above copyright notice for more information.
 // * Assess: not implemented.
 // * Test: not implemented.
 
-#ifndef __vtkHighestDensityRegionsStatistics_h
-#define __vtkHighestDensityRegionsStatistics_h
+#ifndef vtkHighestDensityRegionsStatistics_h
+#define vtkHighestDensityRegionsStatistics_h
 
 #include "vtkFiltersStatisticsModule.h" // For export macro
 #include "vtkStatisticsAlgorithm.h"
diff --git a/Filters/Statistics/vtkKMeansAssessFunctor.h b/Filters/Statistics/vtkKMeansAssessFunctor.h
index ec182b9d3f6d5976a4d0ff1cd07a3bdb1c676a2a..0fa3ffa5cadc94e6668100ec2a551a27f9fdb637 100644
--- a/Filters/Statistics/vtkKMeansAssessFunctor.h
+++ b/Filters/Statistics/vtkKMeansAssessFunctor.h
@@ -1,5 +1,5 @@
-#ifndef __vtkKMeansAssessFunctor_h
-#define __vtkKMeansAssessFunctor_h
+#ifndef vtkKMeansAssessFunctor_h
+#define vtkKMeansAssessFunctor_h
 
 class vtkKMeansAssessFunctor : public vtkStatisticsAlgorithm::AssessFunctor
 {
@@ -16,5 +16,5 @@ public:
   int GetNumberOfRuns() { return NumRuns; }
 };
 
-#endif // __vtkKMeansAssessFunctor_h
+#endif // vtkKMeansAssessFunctor_h
 // VTK-HeaderTest-Exclude: vtkKMeansAssessFunctor.h
diff --git a/Filters/Statistics/vtkKMeansDistanceFunctor.h b/Filters/Statistics/vtkKMeansDistanceFunctor.h
index c6787efb3e468cf152c1ef0a689b093779839827..37c07959095c87af2e128cb3f46e0a6a9a7fa669 100644
--- a/Filters/Statistics/vtkKMeansDistanceFunctor.h
+++ b/Filters/Statistics/vtkKMeansDistanceFunctor.h
@@ -1,5 +1,5 @@
-#ifndef __vtkKMeansDistanceFunctor_h
-#define __vtkKMeansDistanceFunctor_h
+#ifndef vtkKMeansDistanceFunctor_h
+#define vtkKMeansDistanceFunctor_h
 
 // .NAME vtkKMeansDistanceFunctor - measure distance from k-means cluster centers
 // .SECTION Description
@@ -93,4 +93,4 @@ private:
   void operator = ( const vtkKMeansDistanceFunctor& ); // Not implemented.
 };
 
-#endif // __vtkKMeansDistanceFunctor_h
+#endif // vtkKMeansDistanceFunctor_h
diff --git a/Filters/Statistics/vtkKMeansDistanceFunctorCalculator.h b/Filters/Statistics/vtkKMeansDistanceFunctorCalculator.h
index 80d1f6e978133df052971e9bfb4369f20b6f3720..8ec0e2bb35563f7dc1ca91e630559dec977757e8 100644
--- a/Filters/Statistics/vtkKMeansDistanceFunctorCalculator.h
+++ b/Filters/Statistics/vtkKMeansDistanceFunctorCalculator.h
@@ -1,5 +1,5 @@
-#ifndef __vtkKMeansDistanceFunctorCalculator_h
-#define __vtkKMeansDistanceFunctorCalculator_h
+#ifndef vtkKMeansDistanceFunctorCalculator_h
+#define vtkKMeansDistanceFunctorCalculator_h
 
 // .NAME vtkKMeansDistanceFunctorCalculator - measure distance from k-means cluster centers using a user-specified expression
 // .SECTION Description
@@ -62,4 +62,4 @@ private:
   void operator = ( const vtkKMeansDistanceFunctorCalculator& ); // Not implemented.
 };
 
-#endif // __vtkKMeansDistanceFunctorCalculator_h
+#endif // vtkKMeansDistanceFunctorCalculator_h
diff --git a/Filters/Statistics/vtkKMeansStatistics.h b/Filters/Statistics/vtkKMeansStatistics.h
index 46ce5a8c0305a50ff56c4bd6cb08356d89cf948d..31553aee86fb2e22f156bbcddcbcfbae54f87993 100644
--- a/Filters/Statistics/vtkKMeansStatistics.h
+++ b/Filters/Statistics/vtkKMeansStatistics.h
@@ -90,8 +90,8 @@ PURPOSE.  See the above copyright notice for more information.
 // Sandia National Laboratories for implementing this class.
 // Updated by Philippe Pebay, Kitware SAS 2012
 
-#ifndef __vtkKMeansStatistics_h
-#define __vtkKMeansStatistics_h
+#ifndef vtkKMeansStatistics_h
+#define vtkKMeansStatistics_h
 
 #include "vtkFiltersStatisticsModule.h" // For export macro
 #include "vtkStatisticsAlgorithm.h"
diff --git a/Filters/Statistics/vtkMultiCorrelativeStatistics.h b/Filters/Statistics/vtkMultiCorrelativeStatistics.h
index ff855f124052ab6b91f2b91ad91addda96eb0966..2dbfa6ac07e1ac38331cc5cb39ebeb16728a1f89 100644
--- a/Filters/Statistics/vtkMultiCorrelativeStatistics.h
+++ b/Filters/Statistics/vtkMultiCorrelativeStatistics.h
@@ -72,8 +72,8 @@ PURPOSE.  See the above copyright notice for more information.
 // Updated by Philippe Pebay, Kitware SAS 2012
 // Updated by Tristan Coulange and Joachim Pouderoux, Kitware SAS 2013
 
-#ifndef __vtkMultiCorrelativeStatistics_h
-#define __vtkMultiCorrelativeStatistics_h
+#ifndef vtkMultiCorrelativeStatistics_h
+#define vtkMultiCorrelativeStatistics_h
 
 #include "vtkFiltersStatisticsModule.h" // For export macro
 #include "vtkStatisticsAlgorithm.h"
diff --git a/Filters/Statistics/vtkMultiCorrelativeStatisticsAssessFunctor.h b/Filters/Statistics/vtkMultiCorrelativeStatisticsAssessFunctor.h
index 82cf606dae30c771b90c7ae3c39f5d73ae11af39..f00cd3cb26d3499b1b65cd44f695d9440d1aa59b 100644
--- a/Filters/Statistics/vtkMultiCorrelativeStatisticsAssessFunctor.h
+++ b/Filters/Statistics/vtkMultiCorrelativeStatisticsAssessFunctor.h
@@ -1,5 +1,5 @@
-#ifndef __vtkMultiCorrelativeStatisticsAssessFunctor_h
-#define __vtkMultiCorrelativeStatisticsAssessFunctor_h
+#ifndef vtkMultiCorrelativeStatisticsAssessFunctor_h
+#define vtkMultiCorrelativeStatisticsAssessFunctor_h
 
 #include "vtkStatisticsAlgorithm.h"
 
@@ -36,5 +36,5 @@ public:
   std::vector<double> EmptyTuple; // Used to quickly initialize Tuple for each datum
 };
 
-#endif // __vtkMultiCorrelativeStatisticsAssessFunctor_h
+#endif // vtkMultiCorrelativeStatisticsAssessFunctor_h
 // VTK-HeaderTest-Exclude: vtkMultiCorrelativeStatisticsAssessFunctor.h
diff --git a/Filters/Statistics/vtkOrderStatistics.h b/Filters/Statistics/vtkOrderStatistics.h
index efd00b3bb091c743aa535c99f758f87904f514e8..c5726a294b7f996f95119628898e52884320b976 100644
--- a/Filters/Statistics/vtkOrderStatistics.h
+++ b/Filters/Statistics/vtkOrderStatistics.h
@@ -37,8 +37,8 @@ PURPOSE.  See the above copyright notice for more information.
 // for implementing this class.
 // Updated by Philippe Pebay, Kitware SAS 2012
 
-#ifndef __vtkOrderStatistics_h
-#define __vtkOrderStatistics_h
+#ifndef vtkOrderStatistics_h
+#define vtkOrderStatistics_h
 
 #include "vtkFiltersStatisticsModule.h" // For export macro
 #include "vtkStatisticsAlgorithm.h"
diff --git a/Filters/Statistics/vtkPCAStatistics.h b/Filters/Statistics/vtkPCAStatistics.h
index 3cc5ff3425f21c821559c6008988a32841ab0a14..0d007ca0dfd4e28c4f107f628f2b8e83b416c9d8 100644
--- a/Filters/Statistics/vtkPCAStatistics.h
+++ b/Filters/Statistics/vtkPCAStatistics.h
@@ -47,8 +47,8 @@ PURPOSE.  See the above copyright notice for more information.
 // Updated by Philippe Pebay, Kitware SAS 2012
 // Updated by Tristan Coulange and Joachim Pouderoux, Kitware SAS 2013
 
-#ifndef __vtkPCAStatistics_h
-#define __vtkPCAStatistics_h
+#ifndef vtkPCAStatistics_h
+#define vtkPCAStatistics_h
 
 #include "vtkFiltersStatisticsModule.h" // For export macro
 #include "vtkMultiCorrelativeStatistics.h"
@@ -270,5 +270,5 @@ private:
   void operator = ( const vtkPCAStatistics& );  // Not implemented
 };
 
-#endif // __vtkPCAStatistics_h
+#endif // vtkPCAStatistics_h
 
diff --git a/Filters/Statistics/vtkStatisticsAlgorithm.h b/Filters/Statistics/vtkStatisticsAlgorithm.h
index 3def25b3e3831ce0d712a494d418316cf9a9fc01..d002743fb9671b6944d9ab004dce45e6ed0f3036 100644
--- a/Filters/Statistics/vtkStatisticsAlgorithm.h
+++ b/Filters/Statistics/vtkStatisticsAlgorithm.h
@@ -50,8 +50,8 @@ PURPOSE.  See the above copyright notice for more information.
 // for implementing this class.
 // Updated by Philippe Pebay, Kitware SAS 2012
 
-#ifndef __vtkStatisticsAlgorithm_h
-#define __vtkStatisticsAlgorithm_h
+#ifndef vtkStatisticsAlgorithm_h
+#define vtkStatisticsAlgorithm_h
 
 #include "vtkFiltersStatisticsModule.h" // For export macro
 #include "vtkTableAlgorithm.h"
diff --git a/Filters/Statistics/vtkStatisticsAlgorithmPrivate.h b/Filters/Statistics/vtkStatisticsAlgorithmPrivate.h
index 42b5f6326e6a053c0e5a75a68bd4a2ca7ae2c687..1c7e558f5866a0d98b83003264778529870fb426 100644
--- a/Filters/Statistics/vtkStatisticsAlgorithmPrivate.h
+++ b/Filters/Statistics/vtkStatisticsAlgorithmPrivate.h
@@ -28,8 +28,8 @@ PURPOSE.  See the above copyright notice for more information.
 // Thanks to Philippe Pebay and David Thompson from Sandia National Laboratories
 // for implementing this class.
 
-#ifndef __vtkStatisticsAlgorithmPrivate_h
-#define __vtkStatisticsAlgorithmPrivate_h
+#ifndef vtkStatisticsAlgorithmPrivate_h
+#define vtkStatisticsAlgorithmPrivate_h
 
 #include "vtkStdString.h"
 
@@ -171,6 +171,6 @@ public:
   vtksys_stl::set<vtkStdString> Buffer;
 };
 
-#endif // __vtkStatisticsAlgorithmPrivate_h
+#endif // vtkStatisticsAlgorithmPrivate_h
 
 // VTK-HeaderTest-Exclude: vtkStatisticsAlgorithmPrivate.h
diff --git a/Filters/Statistics/vtkStrahlerMetric.h b/Filters/Statistics/vtkStrahlerMetric.h
index 99194a934541ff387954819d6151acd06a75d219..bbacf5cd0a33c5ac87e4911375f43ee20136676c 100644
--- a/Filters/Statistics/vtkStrahlerMetric.h
+++ b/Filters/Statistics/vtkStrahlerMetric.h
@@ -38,8 +38,8 @@
 // Thanks to David Duke from the University of Leeds for providing this
 // implementation.
 
-#ifndef __vtkStrahlerMetric_h
-#define __vtkStrahlerMetric_h
+#ifndef vtkStrahlerMetric_h
+#define vtkStrahlerMetric_h
 
 #include "vtkFiltersStatisticsModule.h" // For export macro
 #include "vtkTreeAlgorithm.h"
diff --git a/Filters/Statistics/vtkStreamingStatistics.h b/Filters/Statistics/vtkStreamingStatistics.h
index f0508c02a3b65921f214dcfa50b94685759646eb..ef70738baa8bb1f64f31126b39e86852aa5f86dc 100644
--- a/Filters/Statistics/vtkStreamingStatistics.h
+++ b/Filters/Statistics/vtkStreamingStatistics.h
@@ -28,8 +28,8 @@ PURPOSE.  See the above copyright notice for more information.
 // Thanks to the Universe for unfolding in a way that allowed this class
 // to be implemented, also Godzilla for not crushing my computer.
 
-#ifndef __vtkStreamingStatistics_h
-#define __vtkStreamingStatistics_h
+#ifndef vtkStreamingStatistics_h
+#define vtkStreamingStatistics_h
 
 #include "vtkFiltersStatisticsModule.h" // For export macro
 #include "vtkTableAlgorithm.h"
diff --git a/Filters/StatisticsGnuR/vtkContingencyStatisticsGnuR.h b/Filters/StatisticsGnuR/vtkContingencyStatisticsGnuR.h
index 1823ba5b29b930bcce051521e5702cb1c66c5240..22bfaca25e19e293a59ebd0c3f73c421886525e7 100644
--- a/Filters/StatisticsGnuR/vtkContingencyStatisticsGnuR.h
+++ b/Filters/StatisticsGnuR/vtkContingencyStatisticsGnuR.h
@@ -38,8 +38,8 @@ PURPOSE.  See the above copyright notice for more information.
 // for implementing this class.
 // Updated by Philippe Pebay, Kitware SAS 2012
 
-#ifndef __vtkContingencyStatisticsGnuR_h
-#define __vtkContingencyStatisticsGnuR_h
+#ifndef vtkContingencyStatisticsGnuR_h
+#define vtkContingencyStatisticsGnuR_h
 
 #include "vtkFiltersStatisticsGnuRModule.h" // For export macro
 #include "vtkContingencyStatistics.h"
diff --git a/Filters/StatisticsGnuR/vtkCorrelativeStatisticsGnuR.h b/Filters/StatisticsGnuR/vtkCorrelativeStatisticsGnuR.h
index 7f2e68b712ac83b0d616bd7546f9c0c770ff81c3..53247c40f9997e2cf455f80e9579a9497761a53b 100644
--- a/Filters/StatisticsGnuR/vtkCorrelativeStatisticsGnuR.h
+++ b/Filters/StatisticsGnuR/vtkCorrelativeStatisticsGnuR.h
@@ -39,8 +39,8 @@ PURPOSE.  See the above copyright notice for more information.
 // for implementing this class.
 // Updated by Philippe Pebay, Kitware SAS 2012
 
-#ifndef __vtkCorrelativeStatisticsGnuR_h
-#define __vtkCorrelativeStatisticsGnuR_h
+#ifndef vtkCorrelativeStatisticsGnuR_h
+#define vtkCorrelativeStatisticsGnuR_h
 
 #include "vtkFiltersStatisticsGnuRModule.h" // For export macro
 #include "vtkCorrelativeStatistics.h"
diff --git a/Filters/StatisticsGnuR/vtkDescriptiveStatisticsGnuR.h b/Filters/StatisticsGnuR/vtkDescriptiveStatisticsGnuR.h
index ed7758174d30a6d5cca47d88ee81adeb2109804e..bb8c70f1bad0cf54b4f3a2fe31cccaa36781ee02 100644
--- a/Filters/StatisticsGnuR/vtkDescriptiveStatisticsGnuR.h
+++ b/Filters/StatisticsGnuR/vtkDescriptiveStatisticsGnuR.h
@@ -37,8 +37,8 @@ PURPOSE.  See the above copyright notice for more information.
 // for implementing this class.
 // Updated by Philippe Pebay, Kitware SAS 2012
 
-#ifndef __vtkDescriptiveStatisticsGnuR_h
-#define __vtkDescriptiveStatisticsGnuR_h
+#ifndef vtkDescriptiveStatisticsGnuR_h
+#define vtkDescriptiveStatisticsGnuR_h
 
 #include "vtkFiltersStatisticsGnuRModule.h" // For export macro
 #include "vtkDescriptiveStatistics.h"
diff --git a/Filters/StatisticsGnuR/vtkPCAStatisticsGnuR.h b/Filters/StatisticsGnuR/vtkPCAStatisticsGnuR.h
index eeed825b16dab04aab6a4b7c2022b212764d6bca..c9f7706694d37d6ddaba620309fb2154836af486 100644
--- a/Filters/StatisticsGnuR/vtkPCAStatisticsGnuR.h
+++ b/Filters/StatisticsGnuR/vtkPCAStatisticsGnuR.h
@@ -42,8 +42,8 @@ PURPOSE.  See the above copyright notice for more information.
 // Sandia National Laboratories for implementing this class.
 // Updated by Philippe Pebay, Kitware SAS 2012
 
-#ifndef __vtkPCAStatisticsGnuR_h
-#define __vtkPCAStatisticsGnuR_h
+#ifndef vtkPCAStatisticsGnuR_h
+#define vtkPCAStatisticsGnuR_h
 
 #include "vtkFiltersStatisticsGnuRModule.h" // For export macro
 #include "vtkPCAStatistics.h"
@@ -69,5 +69,5 @@ private:
   void operator=(const vtkPCAStatisticsGnuR&); // Not implemented
 };
 
-#endif // __vtkPCAStatisticsGnuR_h
+#endif // vtkPCAStatisticsGnuR_h
 
diff --git a/Filters/StatisticsGnuR/vtkRCalculatorFilter.h b/Filters/StatisticsGnuR/vtkRCalculatorFilter.h
index cf6b481b8a4e21969b0bbfea89495f9e152afc94..56be7da418d2fe153a95e8ccc36e3182264684c3 100644
--- a/Filters/StatisticsGnuR/vtkRCalculatorFilter.h
+++ b/Filters/StatisticsGnuR/vtkRCalculatorFilter.h
@@ -33,8 +33,8 @@
 //  Developed by Thomas Otahal at Sandia National Laboratories.
 //
 
-#ifndef __vtkRCalculatorFilter_h
-#define __vtkRCalculatorFilter_h
+#ifndef vtkRCalculatorFilter_h
+#define vtkRCalculatorFilter_h
 
 #include "vtkFiltersStatisticsGnuRModule.h" // For export macro
 #include "vtkDataObjectAlgorithm.h"
diff --git a/Filters/StatisticsGnuR/vtkRInterface.h b/Filters/StatisticsGnuR/vtkRInterface.h
index 9892dbab5416f40ad0f3e61ffe589163291fa93b..d144ac85c982ff0e13f39205ccbde8937b277994 100644
--- a/Filters/StatisticsGnuR/vtkRInterface.h
+++ b/Filters/StatisticsGnuR/vtkRInterface.h
@@ -36,8 +36,8 @@
 //
 
 
-#ifndef __vtkRInterface_h
-#define __vtkRInterface_h
+#ifndef vtkRInterface_h
+#define vtkRInterface_h
 
 #include "vtkFiltersStatisticsGnuRModule.h" // For export macro
 #include "vtkObject.h"
diff --git a/Filters/StatisticsGnuR/vtkRRandomTableSource.h b/Filters/StatisticsGnuR/vtkRRandomTableSource.h
index 20420e5a476b6604f26410bc82658d79ebe85f07..e6781d514cc09d66f2967f153d823bce2a4774dc 100644
--- a/Filters/StatisticsGnuR/vtkRRandomTableSource.h
+++ b/Filters/StatisticsGnuR/vtkRRandomTableSource.h
@@ -46,8 +46,8 @@
 // Developed by Thomas J. Otahal (tjotaha@sandia.gov) at Sandia National Laboratories.
 //
 
-#ifndef __vtkRRandomTableSource_h
-#define __vtkRRandomTableSource_h
+#ifndef vtkRRandomTableSource_h
+#define vtkRRandomTableSource_h
 
 #include "vtkFiltersStatisticsGnuRModule.h" // For export macro
 #include "vtkTableAlgorithm.h"
diff --git a/Filters/Texture/vtkImplicitTextureCoords.h b/Filters/Texture/vtkImplicitTextureCoords.h
index 1469c8e0aa6b7fb428343dc03b03ea2c709b01ea..b2dd4fcfc898b733494a87cf9e46c219e1f0dc7c 100644
--- a/Filters/Texture/vtkImplicitTextureCoords.h
+++ b/Filters/Texture/vtkImplicitTextureCoords.h
@@ -43,8 +43,8 @@
 // .SECTION See Also
 // vtkImplicitFunction vtkTexture vtkBooleanTexture vtkTransformTexture
 
-#ifndef __vtkImplicitTextureCoords_h
-#define __vtkImplicitTextureCoords_h
+#ifndef vtkImplicitTextureCoords_h
+#define vtkImplicitTextureCoords_h
 
 #include "vtkFiltersTextureModule.h" // For export macro
 #include "vtkDataSetAlgorithm.h"
diff --git a/Filters/Texture/vtkTextureMapToCylinder.h b/Filters/Texture/vtkTextureMapToCylinder.h
index ff2cc725c07f16000e0a018824cb406d5802d046..4d2a9a2bb9b5514741b6ff4417354e0ad9f39fca 100644
--- a/Filters/Texture/vtkTextureMapToCylinder.h
+++ b/Filters/Texture/vtkTextureMapToCylinder.h
@@ -40,8 +40,8 @@
 // vtkTextureMapToPlane vtkTextureMapToSphere
 // vtkTransformTexture vtkThresholdTextureCoords
 
-#ifndef __vtkTextureMapToCylinder_h
-#define __vtkTextureMapToCylinder_h
+#ifndef vtkTextureMapToCylinder_h
+#define vtkTextureMapToCylinder_h
 
 #include "vtkFiltersTextureModule.h" // For export macro
 #include "vtkDataSetAlgorithm.h"
diff --git a/Filters/Texture/vtkTextureMapToPlane.h b/Filters/Texture/vtkTextureMapToPlane.h
index 462c0b5477c1871f36a5aa2e21f223523d6584ac..1358284a6204fc06f26b396f1d6c31466d958aff 100644
--- a/Filters/Texture/vtkTextureMapToPlane.h
+++ b/Filters/Texture/vtkTextureMapToPlane.h
@@ -34,8 +34,8 @@
 //  vtkPlaneSource vtkTextureMapToCylinder
 // vtkTextureMapToSphere vtkThresholdTextureCoords
 
-#ifndef __vtkTextureMapToPlane_h
-#define __vtkTextureMapToPlane_h
+#ifndef vtkTextureMapToPlane_h
+#define vtkTextureMapToPlane_h
 
 #include "vtkFiltersTextureModule.h" // For export macro
 #include "vtkDataSetAlgorithm.h"
diff --git a/Filters/Texture/vtkTextureMapToSphere.h b/Filters/Texture/vtkTextureMapToSphere.h
index d695692478786d518f455385319d8704543c5258..ace2de744d2dcad6a9c5f6b72d43e35a91716a49 100644
--- a/Filters/Texture/vtkTextureMapToSphere.h
+++ b/Filters/Texture/vtkTextureMapToSphere.h
@@ -38,8 +38,8 @@
 // vtkTextureMapToPlane vtkTextureMapToCylinder
 // vtkTransformTexture vtkThresholdTextureCoords
 
-#ifndef __vtkTextureMapToSphere_h
-#define __vtkTextureMapToSphere_h
+#ifndef vtkTextureMapToSphere_h
+#define vtkTextureMapToSphere_h
 
 #include "vtkFiltersTextureModule.h" // For export macro
 #include "vtkDataSetAlgorithm.h"
diff --git a/Filters/Texture/vtkThresholdTextureCoords.h b/Filters/Texture/vtkThresholdTextureCoords.h
index 9a339da57302e1a846c18dfc0ae26ab4a75d3c5e..fe6017347afc297966ea004879d217f8f6d73ccb 100644
--- a/Filters/Texture/vtkThresholdTextureCoords.h
+++ b/Filters/Texture/vtkThresholdTextureCoords.h
@@ -32,8 +32,8 @@
 // vtkThreshold vtkThresholdPoints vtkTextureMapToPlane vtkTextureMapToSphere
 // vtkTextureMapToCylinder
 
-#ifndef __vtkThresholdTextureCoords_h
-#define __vtkThresholdTextureCoords_h
+#ifndef vtkThresholdTextureCoords_h
+#define vtkThresholdTextureCoords_h
 
 #include "vtkFiltersTextureModule.h" // For export macro
 #include "vtkDataSetAlgorithm.h"
diff --git a/Filters/Texture/vtkTransformTextureCoords.h b/Filters/Texture/vtkTransformTextureCoords.h
index 822d031291403aaf962b4238501366a39cc7300f..c5e426c2d09e7a9af81959d3900a20dfb3d881e9 100644
--- a/Filters/Texture/vtkTransformTextureCoords.h
+++ b/Filters/Texture/vtkTransformTextureCoords.h
@@ -29,8 +29,8 @@
 // vtkTextureMapToPlane  vtkTextureMapToCylinder
 // vtkTextureMapToSphere vtkThresholdTextureCoords vtkTexture
 
-#ifndef __vtkTransformTextureCoords_h
-#define __vtkTransformTextureCoords_h
+#ifndef vtkTransformTextureCoords_h
+#define vtkTransformTextureCoords_h
 
 #include "vtkFiltersTextureModule.h" // For export macro
 #include "vtkDataSetAlgorithm.h"
diff --git a/Filters/Texture/vtkTriangularTCoords.h b/Filters/Texture/vtkTriangularTCoords.h
index 7251c878b6d4531c1b60aae1c007e114089ab8e1..e6411e49ea6a448d954176c94e0e22523f5ec7fa 100644
--- a/Filters/Texture/vtkTriangularTCoords.h
+++ b/Filters/Texture/vtkTriangularTCoords.h
@@ -26,8 +26,8 @@
 // vtkTriangularTexture vtkThresholdPoints vtkTextureMapToPlane
 // vtkTextureMapToSphere vtkTextureMapToCylinder
 
-#ifndef __vtkTriangularTCoords_h
-#define __vtkTriangularTCoords_h
+#ifndef vtkTriangularTCoords_h
+#define vtkTriangularTCoords_h
 
 #include "vtkFiltersTextureModule.h" // For export macro
 #include "vtkPolyDataAlgorithm.h"
diff --git a/Filters/Verdict/vtkCellQuality.h b/Filters/Verdict/vtkCellQuality.h
index b5a920f15e484fceb0e1b23eaea1aecfb712cc55..5ea24d1a95adaae9779c841df67927b7feae938d 100644
--- a/Filters/Verdict/vtkCellQuality.h
+++ b/Filters/Verdict/vtkCellQuality.h
@@ -26,8 +26,8 @@
 // only.  The minimal angle is not, strictly speaking, a quality function, but
 // it is provided because of its usage by many authors.
 
-#ifndef __vtkCellQuality_h
-#define __vtkCellQuality_h
+#ifndef vtkCellQuality_h
+#define vtkCellQuality_h
 
 #include "vtkFiltersVerdictModule.h" // For export macro
 #include "vtkDataSetAlgorithm.h"
diff --git a/Filters/Verdict/vtkMatrixMathFilter.h b/Filters/Verdict/vtkMatrixMathFilter.h
index 9c9512cf4f2f5319f25af22054726950dc5d32b7..1d5df11003073b3c6f2d866b6e3bd65d780bd6b0 100644
--- a/Filters/Verdict/vtkMatrixMathFilter.h
+++ b/Filters/Verdict/vtkMatrixMathFilter.h
@@ -22,8 +22,8 @@
 // quality being queried. Note this filter always assume the data associate with
 // the cells or points are 3 by 3 matrix.
 
-#ifndef __vtkMatrixMathFilter_h
-#define __vtkMatrixMathFilter_h
+#ifndef vtkMatrixMathFilter_h
+#define vtkMatrixMathFilter_h
 
 #include "vtkFiltersVerdictModule.h" // For export macro
 #include "vtkDataSetAlgorithm.h"
@@ -89,4 +89,4 @@ private:
   void operator=(const vtkMatrixMathFilter&); // Not implemented
 };
 
-#endif // __vtkMatrixMathFilter_h
+#endif // vtkMatrixMathFilter_h
diff --git a/Filters/Verdict/vtkMeshQuality.h b/Filters/Verdict/vtkMeshQuality.h
index 64f67a085ee9344cb0e6dc12d831a11432efe23c..9ae62cc39555ad0a90153044129c52577398d682 100644
--- a/Filters/Verdict/vtkMeshQuality.h
+++ b/Filters/Verdict/vtkMeshQuality.h
@@ -58,8 +58,8 @@
 // The minimal angle is not, strictly speaking, a quality function, but it is
 // provided because of its usage by many authors.
 
-#ifndef __vtkMeshQuality_h
-#define __vtkMeshQuality_h
+#ifndef vtkMeshQuality_h
+#define vtkMeshQuality_h
 
 #include "vtkFiltersVerdictModule.h" // For export macro
 #include "vtkDataSetAlgorithm.h"
diff --git a/GUISupport/Qt/vtkQtAbstractModelAdapter.h b/GUISupport/Qt/vtkQtAbstractModelAdapter.h
index c858069386d2cc1ac836eab39c96c312f4111282..098dab2c860c86e61fac8aecf50efad9ce27c569 100644
--- a/GUISupport/Qt/vtkQtAbstractModelAdapter.h
+++ b/GUISupport/Qt/vtkQtAbstractModelAdapter.h
@@ -29,8 +29,8 @@
 // .SECTION See also
 // vtkQtTableModelAdapter vtkQtTreeModelAdapter
 
-#ifndef __vtkQtAbstractModelAdapter_h
-#define __vtkQtAbstractModelAdapter_h
+#ifndef vtkQtAbstractModelAdapter_h
+#define vtkQtAbstractModelAdapter_h
 
 #include "vtkGUISupportQtModule.h" // For export macro
 #include "QVTKWin32Header.h"
diff --git a/GUISupport/Qt/vtkQtAnnotationLayersModelAdapter.h b/GUISupport/Qt/vtkQtAnnotationLayersModelAdapter.h
index d2c8bffc2984ba235330e56687325935f0be9820..de3eeae8e38439ae0d1ead8d005a79283f61a072 100644
--- a/GUISupport/Qt/vtkQtAnnotationLayersModelAdapter.h
+++ b/GUISupport/Qt/vtkQtAnnotationLayersModelAdapter.h
@@ -26,8 +26,8 @@
 // .SECTION See also
 // vtkQtAbstractModelAdapter vtkQtTableModelAdapter
 
-#ifndef __vtkQtAnnotationLayersModelAdapter_h
-#define __vtkQtAnnotationLayersModelAdapter_h
+#ifndef vtkQtAnnotationLayersModelAdapter_h
+#define vtkQtAnnotationLayersModelAdapter_h
 
 #include "vtkGUISupportQtModule.h" // For export macro
 #include "QVTKWin32Header.h"
diff --git a/GUISupport/Qt/vtkQtDebugLeaksModel.h b/GUISupport/Qt/vtkQtDebugLeaksModel.h
index 3e08768d64c6d760190b0a3a1d9049908be626aa..359c288539df59a668e678b4369cce9781e8e33c 100644
--- a/GUISupport/Qt/vtkQtDebugLeaksModel.h
+++ b/GUISupport/Qt/vtkQtDebugLeaksModel.h
@@ -19,8 +19,8 @@
 // observer on the vtkDebugLeaks singleton and uses the observer to maintain
 // a model of all vtkObjectBase dervied objects that are alive in memory.
 
-#ifndef __vtkQtDebugLeaksModel_h
-#define __vtkQtDebugLeaksModel_h
+#ifndef vtkQtDebugLeaksModel_h
+#define vtkQtDebugLeaksModel_h
 
 #include "vtkGUISupportQtModule.h" // For export macro
 #include "QVTKWin32Header.h"
diff --git a/GUISupport/Qt/vtkQtDebugLeaksView.h b/GUISupport/Qt/vtkQtDebugLeaksView.h
index 81b54aaaf1df3ed235cb8575e21affb68b6473a1..52fcd58990bd91491a96754f6052cace61b70b2a 100644
--- a/GUISupport/Qt/vtkQtDebugLeaksView.h
+++ b/GUISupport/Qt/vtkQtDebugLeaksView.h
@@ -20,8 +20,8 @@
 // at program startup and displayed as a top level widget.  Simply create the
 // widget and call show().
 
-#ifndef __vtkQtDebugLeaksView_h
-#define __vtkQtDebugLeaksView_h
+#ifndef vtkQtDebugLeaksView_h
+#define vtkQtDebugLeaksView_h
 
 #include "vtkGUISupportQtModule.h" // For export macro
 #include "QVTKWin32Header.h"
diff --git a/GUISupport/Qt/vtkQtTableModelAdapter.h b/GUISupport/Qt/vtkQtTableModelAdapter.h
index 3d4f59808b0c6d9c37e0f4eff28c12b51acaa6ed..66abd36a9f13cc4095f83de82863035a28e029a2 100644
--- a/GUISupport/Qt/vtkQtTableModelAdapter.h
+++ b/GUISupport/Qt/vtkQtTableModelAdapter.h
@@ -26,8 +26,8 @@
 // .SECTION See also
 // vtkQtAbstractModelAdapter vtkQtTreeModelAdapter
 
-#ifndef __vtkQtTableModelAdapter_h
-#define __vtkQtTableModelAdapter_h
+#ifndef vtkQtTableModelAdapter_h
+#define vtkQtTableModelAdapter_h
 
 #include "vtkGUISupportQtModule.h" // For export macro
 #include "vtkQtAbstractModelAdapter.h"
diff --git a/GUISupport/Qt/vtkQtTreeModelAdapter.h b/GUISupport/Qt/vtkQtTreeModelAdapter.h
index 5e9abebdb57a510cc6934948f7a806dca5586cc9..56954744934615ac096fbd60fafea9570ba102b0 100644
--- a/GUISupport/Qt/vtkQtTreeModelAdapter.h
+++ b/GUISupport/Qt/vtkQtTreeModelAdapter.h
@@ -26,8 +26,8 @@
 // .SECTION See also
 // vtkQtAbstractModelAdapter vtkQtTableModelAdapter
 
-#ifndef __vtkQtTreeModelAdapter_h
-#define __vtkQtTreeModelAdapter_h
+#ifndef vtkQtTreeModelAdapter_h
+#define vtkQtTreeModelAdapter_h
 
 #include "vtkGUISupportQtModule.h" // For export macro
 #include "QVTKWin32Header.h"
diff --git a/GUISupport/Qt/vtkTDxQtUnixDevices.h b/GUISupport/Qt/vtkTDxQtUnixDevices.h
index 11cee19697f05e5a52d3a680a801b4d3b81907be..7a068c9e8942bb2b25d59e13a0aa5b51bf954eee 100644
--- a/GUISupport/Qt/vtkTDxQtUnixDevices.h
+++ b/GUISupport/Qt/vtkTDxQtUnixDevices.h
@@ -20,8 +20,8 @@
 // .SECTION See Also
 // vtkTDxUnixDevice QVTKWidget QVTKApplication
 
-#ifndef __vtkTDxQtUnixDevices_h
-#define __vtkTDxQtUnixDevices_h
+#ifndef vtkTDxQtUnixDevices_h
+#define vtkTDxQtUnixDevices_h
 
 #include "vtkGUISupportQtModule.h" // For export macro
 #include <QObject>
diff --git a/GUISupport/QtSQL/vtkQtSQLDatabase.h b/GUISupport/QtSQL/vtkQtSQLDatabase.h
index 7490e6e087566aa7d3b46151bf989e3df7c3613d..32896575a5ddb7e2fc8ebb9ddb75b04fb8523619 100644
--- a/GUISupport/QtSQL/vtkQtSQLDatabase.h
+++ b/GUISupport/QtSQL/vtkQtSQLDatabase.h
@@ -22,8 +22,8 @@
 // .SECTION Description
 // Implements a vtkSQLDatabase using an underlying Qt QSQLDatabase.
 
-#ifndef __vtkQtSQLDatabase_h
-#define __vtkQtSQLDatabase_h
+#ifndef vtkQtSQLDatabase_h
+#define vtkQtSQLDatabase_h
 
 // Check for Qt SQL module before defining this class.
 #include <qglobal.h>
@@ -173,5 +173,5 @@ private:
 };
 
 #endif // (QT_EDITION & QT_MODULE_SQL)
-#endif // __vtkQtSQLDatabase_h
+#endif // vtkQtSQLDatabase_h
 
diff --git a/GUISupport/QtSQL/vtkQtSQLQuery.h b/GUISupport/QtSQL/vtkQtSQLQuery.h
index d623017843c78d174b96e50ea3634e86ed0c043e..cdbe70a24f7d6520edf7cd7c21807d9cb7173615 100644
--- a/GUISupport/QtSQL/vtkQtSQLQuery.h
+++ b/GUISupport/QtSQL/vtkQtSQLQuery.h
@@ -22,8 +22,8 @@
 // .SECTION Description
 // Implements vtkSQLQuery using an underlying QSQLQuery.
 
-#ifndef __vtkQtSQLQuery_h
-#define __vtkQtSQLQuery_h
+#ifndef vtkQtSQLQuery_h
+#define vtkQtSQLQuery_h
 
 // Check for Qt SQL module before defining this class.
 #include <qglobal.h>
@@ -96,5 +96,5 @@ private:
 };
 
 #endif // (QT_EDITION & QT_MODULE_SQL)
-#endif // __vtkQtSQLQuery_h
+#endif // vtkQtSQLQuery_h
 
diff --git a/GUISupport/QtSQL/vtkQtTimePointUtility.h b/GUISupport/QtSQL/vtkQtTimePointUtility.h
index 55085b1cbfaa02ba3546abe94e96c1e1583d216d..20216fab7633a86c1f5222cc59b66ba40a8d6e10 100644
--- a/GUISupport/QtSQL/vtkQtTimePointUtility.h
+++ b/GUISupport/QtSQL/vtkQtTimePointUtility.h
@@ -22,8 +22,8 @@
 // .SECTION Description
 // vtkQtTimePointUtility is provides methods to perform common time operations.
 
-#ifndef __vtkQtTimePointUtility_h
-#define __vtkQtTimePointUtility_h
+#ifndef vtkQtTimePointUtility_h
+#define vtkQtTimePointUtility_h
 
 #include "vtkGUISupportQtSQLModule.h"
 #include "vtkObject.h"
diff --git a/GUISupport/QtWebkit/vtkQtRichTextView.h b/GUISupport/QtWebkit/vtkQtRichTextView.h
index 5247605eebc5e4509074f3e9da6561c55dbf7f71..207e5054159b03aef58be71c837b5d96c905d2ca 100644
--- a/GUISupport/QtWebkit/vtkQtRichTextView.h
+++ b/GUISupport/QtWebkit/vtkQtRichTextView.h
@@ -28,8 +28,8 @@
 // Thanks to Bob Kerr from Sandia National Laboratories for implementing
 // this class
 
-#ifndef __vtkQtRichTextView_h
-#define __vtkQtRichTextView_h
+#ifndef vtkQtRichTextView_h
+#define vtkQtRichTextView_h
 
 #include "vtkGUISupportQtWebkitModule.h" // For export macro
 #include "QVTKWin32Header.h"
diff --git a/Geovis/Core/vtkCompassRepresentation.h b/Geovis/Core/vtkCompassRepresentation.h
index 62c34060008df25cabb5100ba0749bd495fb9ac2..1c652f93d434b8c62443e7fc82717a9e7fab9e37 100644
--- a/Geovis/Core/vtkCompassRepresentation.h
+++ b/Geovis/Core/vtkCompassRepresentation.h
@@ -24,8 +24,8 @@
 // This class is used to represent and render a compass.
 
 
-#ifndef __vtkCompassRepresentation_h
-#define __vtkCompassRepresentation_h
+#ifndef vtkCompassRepresentation_h
+#define vtkCompassRepresentation_h
 
 #include "vtkGeovisCoreModule.h" // For export macro
 #include "vtkContinuousValueWidgetRepresentation.h"
diff --git a/Geovis/Core/vtkCompassWidget.h b/Geovis/Core/vtkCompassWidget.h
index 8015145042a6044f689585794f9e1808ee1b6de7..a51cab45f014142de676d241661fb59a1ec8b20e 100644
--- a/Geovis/Core/vtkCompassWidget.h
+++ b/Geovis/Core/vtkCompassWidget.h
@@ -57,8 +57,8 @@
 // </pre>
 //
 
-#ifndef __vtkCompassWidget_h
-#define __vtkCompassWidget_h
+#ifndef vtkCompassWidget_h
+#define vtkCompassWidget_h
 
 #include "vtkGeovisCoreModule.h" // For export macro
 #include "vtkAbstractWidget.h"
diff --git a/Geovis/Core/vtkGeoAdaptiveArcs.h b/Geovis/Core/vtkGeoAdaptiveArcs.h
index a9500049c901d7030d8e650c88a79a63774b65b1..fa6f71cfaafa58131c017ad44c0173bf7aa0ac9a 100644
--- a/Geovis/Core/vtkGeoAdaptiveArcs.h
+++ b/Geovis/Core/vtkGeoAdaptiveArcs.h
@@ -23,8 +23,8 @@
 
 // .SECTION Thanks
 
-#ifndef __vtkGeoAdaptiveArcs_h
-#define __vtkGeoAdaptiveArcs_h
+#ifndef vtkGeoAdaptiveArcs_h
+#define vtkGeoAdaptiveArcs_h
 
 #include "vtkGeovisCoreModule.h" // For export macro
 #include "vtkPolyDataAlgorithm.h"
diff --git a/Geovis/Core/vtkGeoAlignedImageRepresentation.h b/Geovis/Core/vtkGeoAlignedImageRepresentation.h
index 167640a250961814bf29ee74841c90a0acf793c0..130e0b3e836eb268f0598aa645aabe384ace91b3 100644
--- a/Geovis/Core/vtkGeoAlignedImageRepresentation.h
+++ b/Geovis/Core/vtkGeoAlignedImageRepresentation.h
@@ -25,8 +25,8 @@
 // for fetching new data. This class keeps the fetched data in a quad-tree
 // structure organized by latitude and longitude.
 
-#ifndef __vtkGeoAlignedImageRepresentation_h
-#define __vtkGeoAlignedImageRepresentation_h
+#ifndef vtkGeoAlignedImageRepresentation_h
+#define vtkGeoAlignedImageRepresentation_h
 
 #include "vtkGeovisCoreModule.h" // For export macro
 #include "vtkDataRepresentation.h"
diff --git a/Geovis/Core/vtkGeoAlignedImageSource.h b/Geovis/Core/vtkGeoAlignedImageSource.h
index 4ce487cbd4620944ba1622c3c7c67d1a70b98115..240893f3690875e0bb3b376d50269eafbb2e0b41 100644
--- a/Geovis/Core/vtkGeoAlignedImageSource.h
+++ b/Geovis/Core/vtkGeoAlignedImageSource.h
@@ -27,8 +27,8 @@
 // .SECTION See Also
 // vtkGeoAlignedImageRepresentation vtkGeoView vtkGeoView2D
 
-#ifndef __vtkGeoAlignedImageSource_h
-#define __vtkGeoAlignedImageSource_h
+#ifndef vtkGeoAlignedImageSource_h
+#define vtkGeoAlignedImageSource_h
 
 #include "vtkGeovisCoreModule.h" // For export macro
 #include "vtkGeoSource.h"
diff --git a/Geovis/Core/vtkGeoArcs.h b/Geovis/Core/vtkGeoArcs.h
index 5ba8378ef53084393a27e015162daca8122a77e0..82caafb85fe09826deb588f7cea127c97497e197 100644
--- a/Geovis/Core/vtkGeoArcs.h
+++ b/Geovis/Core/vtkGeoArcs.h
@@ -24,8 +24,8 @@
 // for viewing lines on a sphere (e.g. the earth). The arcs may "jump" above
 // the sphere's surface using ExplodeFactor.
 
-#ifndef __vtkGeoArcs_h
-#define __vtkGeoArcs_h
+#ifndef vtkGeoArcs_h
+#define vtkGeoArcs_h
 
 #include "vtkGeovisCoreModule.h" // For export macro
 #include "vtkPolyDataAlgorithm.h"
diff --git a/Geovis/Core/vtkGeoAssignCoordinates.h b/Geovis/Core/vtkGeoAssignCoordinates.h
index d98c7318063013174e028140507f1f735c7fd12e..b5ea7bbee341c1f354330349a7e2fbd80d4bd2fc 100644
--- a/Geovis/Core/vtkGeoAssignCoordinates.h
+++ b/Geovis/Core/vtkGeoAssignCoordinates.h
@@ -29,8 +29,8 @@
 // If a transform is given, use the transform to convert latitude and longitude
 // to the world coordinate.
 
-#ifndef __vtkGeoAssignCoordinates_h
-#define __vtkGeoAssignCoordinates_h
+#ifndef vtkGeoAssignCoordinates_h
+#define vtkGeoAssignCoordinates_h
 
 #include "vtkGeovisCoreModule.h" // For export macro
 #include "vtkPassInputTypeAlgorithm.h"
diff --git a/Geovis/Core/vtkGeoCamera.h b/Geovis/Core/vtkGeoCamera.h
index 8d92f05ca2637b462da73a45fb4ed8c2639a0d7c..041f236d11daf4be1d8333a0f83f86b98777637f 100644
--- a/Geovis/Core/vtkGeoCamera.h
+++ b/Geovis/Core/vtkGeoCamera.h
@@ -66,8 +66,8 @@
 // .SECTION See Also
 // vtkGeoInteractorStyle vtkCamera
 
-#ifndef __vtkGeoCamera_h
-#define __vtkGeoCamera_h
+#ifndef vtkGeoCamera_h
+#define vtkGeoCamera_h
 
 #include "vtkGeovisCoreModule.h" // For export macro
 #include "vtkObject.h"
diff --git a/Geovis/Core/vtkGeoGraticule.h b/Geovis/Core/vtkGeoGraticule.h
index 9e7f06675751a96ca24250ce4ab550331850cad9..7ed38d86d3ac8582f2bbc2409ec60aba81ccff8e 100644
--- a/Geovis/Core/vtkGeoGraticule.h
+++ b/Geovis/Core/vtkGeoGraticule.h
@@ -28,8 +28,8 @@
 // of degrees. By default the latitude bounds are [-90,90[ and the longitude
 // bounds are [0,180[.
 
-#ifndef __vtkGeoGraticule_h
-#define __vtkGeoGraticule_h
+#ifndef vtkGeoGraticule_h
+#define vtkGeoGraticule_h
 
 #include "vtkGeovisCoreModule.h" // For export macro
 #include "vtkPolyDataAlgorithm.h"
@@ -121,4 +121,4 @@ private:
   void operator = ( const vtkGeoGraticule& ); // Not implemented.
 };
 
-#endif // __vtkGeoGraticule_h
+#endif // vtkGeoGraticule_h
diff --git a/Geovis/Core/vtkGeoImageNode.h b/Geovis/Core/vtkGeoImageNode.h
index 2b6170d8ec9bf1213d3dcde7b186b8a3d71eba3c..9eafce007ca53e0c6d7e92ae3495fd2a564438ee 100644
--- a/Geovis/Core/vtkGeoImageNode.h
+++ b/Geovis/Core/vtkGeoImageNode.h
@@ -26,8 +26,8 @@
 // .SECTION See Also
 // vtkGeoTreeNode vtkGeoTerrainNode
 
-#ifndef __vtkGeoImageNode_h
-#define __vtkGeoImageNode_h
+#ifndef vtkGeoImageNode_h
+#define vtkGeoImageNode_h
 
 #include "vtkGeovisCoreModule.h" // For export macro
 #include "vtkGeoTreeNode.h"
diff --git a/Geovis/Core/vtkGeoInteractorStyle.h b/Geovis/Core/vtkGeoInteractorStyle.h
index 0d5bd9c0b8b6579d95897bf6c4e2d2b716c0f7da..51dbc16b23734e991d04fa14b061ee69ac76eeee 100644
--- a/Geovis/Core/vtkGeoInteractorStyle.h
+++ b/Geovis/Core/vtkGeoInteractorStyle.h
@@ -27,8 +27,8 @@
 // .SECTION See Also
 // vtkCompassWidget vtkInteractorStyle
 
-#ifndef __vtkGeoInteractorStyle_h
-#define __vtkGeoInteractorStyle_h
+#ifndef vtkGeoInteractorStyle_h
+#define vtkGeoInteractorStyle_h
 
 #include "vtkGeovisCoreModule.h" // For export macro
 #include "vtkInteractorStyleTrackballCamera.h"
diff --git a/Geovis/Core/vtkGeoProjection.h b/Geovis/Core/vtkGeoProjection.h
index 9696c582e9a6f0d4e14ae9a4730f4f7a6410853f..75f50cad9a68faa932751aac86570aa78b8e884d 100644
--- a/Geovis/Core/vtkGeoProjection.h
+++ b/Geovis/Core/vtkGeoProjection.h
@@ -23,8 +23,8 @@
 // This class uses the PROJ.4 library to represent geographic coordinate
 // projections.
 
-#ifndef __vtkGeoProjection_h
-#define __vtkGeoProjection_h
+#ifndef vtkGeoProjection_h
+#define vtkGeoProjection_h
 
 #include "vtkGeovisCoreModule.h" // For export macro
 #include "vtkObject.h"
@@ -136,4 +136,4 @@ private:
   vtkInternals* Internals;
 };
 
-#endif // __vtkGeoProjection_h
+#endif // vtkGeoProjection_h
diff --git a/Geovis/Core/vtkGeoRandomGraphSource.h b/Geovis/Core/vtkGeoRandomGraphSource.h
index 44c0b99e6abf510a656d3aa2df78cca47acd5bbc..d11356634406df91e22a6fcbd5980b96e2f9b2cc 100644
--- a/Geovis/Core/vtkGeoRandomGraphSource.h
+++ b/Geovis/Core/vtkGeoRandomGraphSource.h
@@ -32,8 +32,8 @@
 // .SECTION See Also
 // vtkRandomGraphSource
 
-#ifndef __vtkGeoRandomGraphSource_h
-#define __vtkGeoRandomGraphSource_h
+#ifndef vtkGeoRandomGraphSource_h
+#define vtkGeoRandomGraphSource_h
 
 #include "vtkGeovisCoreModule.h" // For export macro
 #include "vtkRandomGraphSource.h"
diff --git a/Geovis/Core/vtkGeoSampleArcs.h b/Geovis/Core/vtkGeoSampleArcs.h
index 8ecc1d89a39e7598337b528c33651e29347a0207..be4d5d1df4990d555bb90604fbf7f8966e50ec29 100644
--- a/Geovis/Core/vtkGeoSampleArcs.h
+++ b/Geovis/Core/vtkGeoSampleArcs.h
@@ -26,8 +26,8 @@
 // This is useful in order to keep lines such as political boundaries from
 // intersecting the globe and becoming invisible.
 
-#ifndef __vtkGeoSampleArcs_h
-#define __vtkGeoSampleArcs_h
+#ifndef vtkGeoSampleArcs_h
+#define vtkGeoSampleArcs_h
 
 #include "vtkGeovisCoreModule.h" // For export macro
 #include "vtkPolyDataAlgorithm.h"
diff --git a/Geovis/Core/vtkGeoSource.h b/Geovis/Core/vtkGeoSource.h
index 4c38bb50d7d72ba53acef463d1070df0777e907a..40d3345149eda27bbfe2558dd65aaf4d03664c61 100644
--- a/Geovis/Core/vtkGeoSource.h
+++ b/Geovis/Core/vtkGeoSource.h
@@ -35,8 +35,8 @@
 // FetchChild() method is thread-safe, since it may be called from multiple
 // workers simultaneously.
 
-#ifndef __vtkGeoSource_h
-#define __vtkGeoSource_h
+#ifndef vtkGeoSource_h
+#define vtkGeoSource_h
 
 #include "vtkGeovisCoreModule.h" // For export macro
 #include "vtkObject.h"
@@ -115,4 +115,4 @@ private:
   void operator=(const vtkGeoSource&); // Not implemented
 };
 
-#endif // __vtkGeoSource_h
+#endif // vtkGeoSource_h
diff --git a/Geovis/Core/vtkGeoSphereTransform.h b/Geovis/Core/vtkGeoSphereTransform.h
index 969b5502beadf2a0b61ee808fb001bafadf7d889..ed8ef0ae7d59052831cb3408be63b12e71cc9e3f 100644
--- a/Geovis/Core/vtkGeoSphereTransform.h
+++ b/Geovis/Core/vtkGeoSphereTransform.h
@@ -25,8 +25,8 @@
 // - the y axis goes from the origin to the intersection of Greenwitch meridian and equator (longitude=0,latitude=0)
 // - the z axis goes from the origin to the Geographic North Pole (latitude=90)
 // - therefore the frame is right-handed.
-#ifndef __vtkGeoSphereTransform_h
-#define __vtkGeoSphereTransform_h
+#ifndef vtkGeoSphereTransform_h
+#define vtkGeoSphereTransform_h
 
 #include "vtkGeovisCoreModule.h" // For export macro
 #include "vtkAbstractTransform.h"
@@ -89,4 +89,4 @@ private:
   void operator = ( const vtkGeoSphereTransform& ); // Not implemented.
 };
 
-#endif // __vtkGeoSphereTransform_h
+#endif // vtkGeoSphereTransform_h
diff --git a/Geovis/Core/vtkGeoTerrain.h b/Geovis/Core/vtkGeoTerrain.h
index 29f7f004f6c1af287ff53a0494ccf2747d658423..0a7e784c2e0ed10858f54d2cfedfebd5c0a99036 100644
--- a/Geovis/Core/vtkGeoTerrain.h
+++ b/Geovis/Core/vtkGeoTerrain.h
@@ -27,8 +27,8 @@
 // will update the set of actors representing the globe given the current
 // camera position.
 
-#ifndef __vtkGeoTerrain_h
-#define __vtkGeoTerrain_h
+#ifndef vtkGeoTerrain_h
+#define vtkGeoTerrain_h
 
 #include "vtkGeovisCoreModule.h" // For export macro
 #include "vtkObject.h"
diff --git a/Geovis/Core/vtkGeoTerrain2D.h b/Geovis/Core/vtkGeoTerrain2D.h
index 24b6966efa10e345d0d8ee9722e64faa9e33ef6a..2cc50f29c494d9dfa992e2323381801382619c3d 100644
--- a/Geovis/Core/vtkGeoTerrain2D.h
+++ b/Geovis/Core/vtkGeoTerrain2D.h
@@ -27,8 +27,8 @@
 // method which updates the set of actors representing the globe given the
 // current camera position.
 
-#ifndef __vtkGeoTerrain2D_h
-#define __vtkGeoTerrain2D_h
+#ifndef vtkGeoTerrain2D_h
+#define vtkGeoTerrain2D_h
 
 #include "vtkGeovisCoreModule.h" // For export macro
 #include "vtkGeoTerrain.h"
diff --git a/Geovis/Core/vtkGeoTerrainNode.h b/Geovis/Core/vtkGeoTerrainNode.h
index 8844e97d7a95d4fa2c55d21f6ca0336224efaed9..8377233c52b718378f505a26ac6decaeef5a8179 100644
--- a/Geovis/Core/vtkGeoTerrainNode.h
+++ b/Geovis/Core/vtkGeoTerrainNode.h
@@ -24,8 +24,8 @@
 
 // .SECTION See Also
 
-#ifndef __vtkGeoTerrainNode_h
-#define __vtkGeoTerrainNode_h
+#ifndef vtkGeoTerrainNode_h
+#define vtkGeoTerrainNode_h
 
 #include "vtkGeovisCoreModule.h" // For export macro
 #include "vtkGeoTreeNode.h"
diff --git a/Geovis/Core/vtkGeoTransform.h b/Geovis/Core/vtkGeoTransform.h
index 17893e84a27a90fe1fa15e976c8565e711edd38e..ad86a781a72c92845501ca21f0c1a2b15066a8cf 100644
--- a/Geovis/Core/vtkGeoTransform.h
+++ b/Geovis/Core/vtkGeoTransform.h
@@ -22,8 +22,8 @@
 // This class takes two geographic projections and transforms point
 // coordinates between them.
 
-#ifndef __vtkGeoTransform_h
-#define __vtkGeoTransform_h
+#ifndef vtkGeoTransform_h
+#define vtkGeoTransform_h
 
 #include "vtkGeovisCoreModule.h" // For export macro
 #include "vtkAbstractTransform.h"
@@ -87,4 +87,4 @@ private:
   void operator = ( const vtkGeoTransform& ); // Not implemented.
 };
 
-#endif // __vtkGeoTransform_h
+#endif // vtkGeoTransform_h
diff --git a/Geovis/Core/vtkGeoTreeNode.h b/Geovis/Core/vtkGeoTreeNode.h
index bdf690f7cc73b3cdb8864830d6b0a15048af93be..4c82de1bd9ab47040165ecea24075deae5d77ec8 100644
--- a/Geovis/Core/vtkGeoTreeNode.h
+++ b/Geovis/Core/vtkGeoTreeNode.h
@@ -31,8 +31,8 @@
 // .SECTION See Also
 // vtkGeoView vtkGeoView2D vtkGeoTerrain vtkGeoAlignedImageRepresentation
 
-#ifndef __vtkGeoTreeNode_h
-#define __vtkGeoTreeNode_h
+#ifndef vtkGeoTreeNode_h
+#define vtkGeoTreeNode_h
 
 #include "vtkGeovisCoreModule.h" // For export macro
 #include "vtkObject.h"
diff --git a/Geovis/Core/vtkGeoTreeNodeCache.h b/Geovis/Core/vtkGeoTreeNodeCache.h
index 3e01b7e05b9002433782a1fe6fe30d0db6a37775..05e0a5063dc429264e6507994c84421a36c29009 100644
--- a/Geovis/Core/vtkGeoTreeNodeCache.h
+++ b/Geovis/Core/vtkGeoTreeNodeCache.h
@@ -25,8 +25,8 @@
 // delete data from the least used nodes. This is used to recover memory
 // from nodes that store data that hasn't been used in a while.
 
-#ifndef __vtkGeoTreeNodeCache_h
-#define __vtkGeoTreeNodeCache_h
+#ifndef vtkGeoTreeNodeCache_h
+#define vtkGeoTreeNodeCache_h
 
 #include "vtkGeovisCoreModule.h" // For export macro
 #include "vtkObject.h"
diff --git a/Geovis/Core/vtkGlobeSource.h b/Geovis/Core/vtkGlobeSource.h
index 3cc2c9303c75ca71b44de43efb664f9bf691033e..6a934229de348b521b300f8f0d13cc892e977f61 100644
--- a/Geovis/Core/vtkGlobeSource.h
+++ b/Geovis/Core/vtkGlobeSource.h
@@ -30,8 +30,8 @@
 //
 // \image html vtkGlobeSourceSphericalToCartesianFigure.png
 // \image latex vtkGlobeSourceSphericalToCartesianFigure.eps
-#ifndef __vtkGlobeSource_h
-#define __vtkGlobeSource_h
+#ifndef vtkGlobeSource_h
+#define vtkGlobeSource_h
 
 #include "vtkGeovisCoreModule.h" // For export macro
 #include "vtkPolyDataAlgorithm.h"
diff --git a/IO/ADIOS/vtkADIOSDirTree.h b/IO/ADIOS/vtkADIOSDirTree.h
index 9f61526ce12dcecec314620b31f9e5a12ee076c8..80778ed412277b6ca41967233cf284cb83695cd3 100644
--- a/IO/ADIOS/vtkADIOSDirTree.h
+++ b/IO/ADIOS/vtkADIOSDirTree.h
@@ -14,8 +14,8 @@
 =========================================================================*/
 // .NAME vtkADIOSDirTree - A directory tree structure holding ADIOS data
 
-#ifndef __vtkADIOSDirTree_h
-#define __vtkADIOSDirTree_h
+#ifndef vtkADIOSDirTree_h
+#define vtkADIOSDirTree_h
 
 #include <string>
 #include <vector>
diff --git a/IO/ADIOS/vtkADIOSReader.h b/IO/ADIOS/vtkADIOSReader.h
index 1964d3c0d8a59e1c30158232cd115cb08adf5a95..4dd45d1b87700de498cc10f3e05b36fac1b93ac4 100644
--- a/IO/ADIOS/vtkADIOSReader.h
+++ b/IO/ADIOS/vtkADIOSReader.h
@@ -16,8 +16,8 @@
 // .SECTION Description
 // vtkADIOSReader is the base class for all ADIOS writers
 
-#ifndef __vtkADIOSReader_h
-#define __vtkADIOSReader_h
+#ifndef vtkADIOSReader_h
+#define vtkADIOSReader_h
 
 #include <string> // For variable name index mapping
 #include <vector> // For independently time stepped array indexing
diff --git a/IO/ADIOS/vtkADIOSWriter.h b/IO/ADIOS/vtkADIOSWriter.h
index 581c1e7a14a58ba7a6a41c5b2f50281f9546d593..5424b1783c1b9a55a1ee6f8438810bcd99cdcbd6 100644
--- a/IO/ADIOS/vtkADIOSWriter.h
+++ b/IO/ADIOS/vtkADIOSWriter.h
@@ -16,8 +16,8 @@
 // .SECTION Description
 // vtkADIOSWriter is the base class for all ADIOS writers
 
-#ifndef __vtkADIOSWriter_h
-#define __vtkADIOSWriter_h
+#ifndef vtkADIOSWriter_h
+#define vtkADIOSWriter_h
 
 #include <string> // For independently stepped array indexing
 #include <vector> // For independently stepped array indexing
diff --git a/IO/Core/Testing/Cxx/vtkFortran.h b/IO/Core/Testing/Cxx/vtkFortran.h
index b470021250904a0fe5b1198ac92907c82d183e1c..e8fbc5e4aeaa430ccc40d0844b1a0cb4b3148c77 100644
--- a/IO/Core/Testing/Cxx/vtkFortran.h
+++ b/IO/Core/Testing/Cxx/vtkFortran.h
@@ -37,8 +37,8 @@
  *  [ Data Type Compatibility ]
  *  http://www.ictp.trieste.it/~manuals/programming/sun/fortran/prog_guide/11_cfort.doc.html
  */
-#ifndef __vtkFortran_h
-#define __vtkFortran_h
+#ifndef vtkFortran_h
+#define vtkFortran_h
 
 #define VTK_FORTRAN_NAME(name, NAME) \
   name##__
diff --git a/IO/Core/vtkASCIITextCodec.h b/IO/Core/vtkASCIITextCodec.h
index bc3a0a031c68019f9bbf9363a3ef4b862dc9aa71..ae905d0bfdf78e8bfdb11b83d47043b0fba95c02 100644
--- a/IO/Core/vtkASCIITextCodec.h
+++ b/IO/Core/vtkASCIITextCodec.h
@@ -31,8 +31,8 @@ PURPOSE.  See the above copyright notice for more information.
 // vtkASCIITextCodecFactory
 //
 
-#ifndef __vtkASCIITextCodec_h
-#define __vtkASCIITextCodec_h
+#ifndef vtkASCIITextCodec_h
+#define vtkASCIITextCodec_h
 
 #include "vtkIOCoreModule.h" // For export macro
 #include "vtkTextCodec.h"
diff --git a/IO/Core/vtkAbstractParticleWriter.h b/IO/Core/vtkAbstractParticleWriter.h
index b819a566ce4d7db61559e9314c471f7adb375917..2d9e22bdf66515ddfbaf92202992cb0311893015 100644
--- a/IO/Core/vtkAbstractParticleWriter.h
+++ b/IO/Core/vtkAbstractParticleWriter.h
@@ -25,8 +25,8 @@
 // .SECTION See Also
 // vtkTemporalStreamTracer
 
-#ifndef __vtkAbstractParticleWriter_h
-#define __vtkAbstractParticleWriter_h
+#ifndef vtkAbstractParticleWriter_h
+#define vtkAbstractParticleWriter_h
 
 #include "vtkIOCoreModule.h" // For export macro
 #include "vtkWriter.h"
diff --git a/IO/Core/vtkArrayDataReader.h b/IO/Core/vtkArrayDataReader.h
index 3297598e94b359fc22116d12859fa139aa9bcedd..e7565c9d83d6c46d9d9999fcc6249eef4c022cc9 100644
--- a/IO/Core/vtkArrayDataReader.h
+++ b/IO/Core/vtkArrayDataReader.h
@@ -30,8 +30,8 @@
 // .SECTION See Also
 // vtkArrayDataWriter
 
-#ifndef __vtkArrayDataReader_h
-#define __vtkArrayDataReader_h
+#ifndef vtkArrayDataReader_h
+#define vtkArrayDataReader_h
 
 #include "vtkIOCoreModule.h" // For export macro
 #include "vtkArrayDataAlgorithm.h"
diff --git a/IO/Core/vtkArrayDataWriter.h b/IO/Core/vtkArrayDataWriter.h
index e2542f0748c2652a29ad3f0f96f0b006dcc061ec..0e2d911d0d3edb0f78ec3d9c948148e9f186d773 100644
--- a/IO/Core/vtkArrayDataWriter.h
+++ b/IO/Core/vtkArrayDataWriter.h
@@ -46,8 +46,8 @@
 // Developed by Timothy M. Shead (tshead@sandia.gov) at Sandia National Laboratories.
 
 
-#ifndef __vtkArrayDataWriter_h
-#define __vtkArrayDataWriter_h
+#ifndef vtkArrayDataWriter_h
+#define vtkArrayDataWriter_h
 
 #include "vtkIOCoreModule.h" // For export macro
 #include "vtkWriter.h"
diff --git a/IO/Core/vtkArrayReader.h b/IO/Core/vtkArrayReader.h
index ded4e32ae70256e07fca699d4723585c2c1345ae..217bd6e761fdbc6f95f47232993d66f1a2f6c7f0 100644
--- a/IO/Core/vtkArrayReader.h
+++ b/IO/Core/vtkArrayReader.h
@@ -33,8 +33,8 @@
 // .SECTION Thanks
 // Developed by Timothy M. Shead (tshead@sandia.gov) at Sandia National Laboratories.
 
-#ifndef __vtkArrayReader_h
-#define __vtkArrayReader_h
+#ifndef vtkArrayReader_h
+#define vtkArrayReader_h
 
 #include "vtkIOCoreModule.h" // For export macro
 #include "vtkArrayDataAlgorithm.h"
diff --git a/IO/Core/vtkArrayWriter.h b/IO/Core/vtkArrayWriter.h
index ea4ae2fb75bdb1531d72e6e6fdf0bef451132888..532b4670023b167468f706be30eaf80659547e6f 100644
--- a/IO/Core/vtkArrayWriter.h
+++ b/IO/Core/vtkArrayWriter.h
@@ -47,8 +47,8 @@
 // Developed by Timothy M. Shead (tshead@sandia.gov) at Sandia National Laboratories.
 
 
-#ifndef __vtkArrayWriter_h
-#define __vtkArrayWriter_h
+#ifndef vtkArrayWriter_h
+#define vtkArrayWriter_h
 
 #include "vtkIOCoreModule.h" // For export macro
 #include "vtkWriter.h"
diff --git a/IO/Core/vtkBase64InputStream.h b/IO/Core/vtkBase64InputStream.h
index 9fa3b531f9a2ebcfc8861945e6da764f4ca9bc2f..e4bbd0e2ac846f20bd8de6055e795aefaa8fb7e5 100644
--- a/IO/Core/vtkBase64InputStream.h
+++ b/IO/Core/vtkBase64InputStream.h
@@ -17,8 +17,8 @@
 // vtkBase64InputStream implements base64 decoding with the
 // vtkInputStream interface.
 
-#ifndef __vtkBase64InputStream_h
-#define __vtkBase64InputStream_h
+#ifndef vtkBase64InputStream_h
+#define vtkBase64InputStream_h
 
 #include "vtkIOCoreModule.h" // For export macro
 #include "vtkInputStream.h"
diff --git a/IO/Core/vtkBase64OutputStream.h b/IO/Core/vtkBase64OutputStream.h
index c7411fbf28a3ee44db1d75556af61cc559060181..9e612f9aaec0e9bf7ab95b4b6f8b0efc53d4dd5e 100644
--- a/IO/Core/vtkBase64OutputStream.h
+++ b/IO/Core/vtkBase64OutputStream.h
@@ -17,8 +17,8 @@
 // vtkBase64OutputStream implements base64 encoding with the
 // vtkOutputStream interface.
 
-#ifndef __vtkBase64OutputStream_h
-#define __vtkBase64OutputStream_h
+#ifndef vtkBase64OutputStream_h
+#define vtkBase64OutputStream_h
 
 #include "vtkIOCoreModule.h" // For export macro
 #include "vtkOutputStream.h"
diff --git a/IO/Core/vtkBase64Utilities.h b/IO/Core/vtkBase64Utilities.h
index b8b1ff11adb154e446656a8f7df100aae7f6d2bc..cc3edfe8f1e4b5bf87999df1716eae41abbe477b 100644
--- a/IO/Core/vtkBase64Utilities.h
+++ b/IO/Core/vtkBase64Utilities.h
@@ -16,8 +16,8 @@
 // .SECTION Description
 // vtkBase64Utilities implements base64 encoding and decoding.
 
-#ifndef __vtkBase64Utilities_h
-#define __vtkBase64Utilities_h
+#ifndef vtkBase64Utilities_h
+#define vtkBase64Utilities_h
 
 #include "vtkIOCoreModule.h" // For export macro
 #include "vtkObject.h"
diff --git a/IO/Core/vtkDataCompressor.h b/IO/Core/vtkDataCompressor.h
index 32983803a0ddf492570615a8d8bbbd7eba2caf2b..6487fd0d3b5f4d1a821d2a042f3c2a3ce70076b5 100644
--- a/IO/Core/vtkDataCompressor.h
+++ b/IO/Core/vtkDataCompressor.h
@@ -19,8 +19,8 @@
 // decompression method.  The public interface to all compressors
 // remains the same, and is defined by this class.
 
-#ifndef __vtkDataCompressor_h
-#define __vtkDataCompressor_h
+#ifndef vtkDataCompressor_h
+#define vtkDataCompressor_h
 
 #include "vtkIOCoreModule.h" // For export macro
 #include "vtkObject.h"
diff --git a/IO/Core/vtkDelimitedTextWriter.h b/IO/Core/vtkDelimitedTextWriter.h
index 8a545c2fe6db17e93b598cf266680221b87fb832..e4acee2540e527b3717166080b723ac3cd28be43 100644
--- a/IO/Core/vtkDelimitedTextWriter.h
+++ b/IO/Core/vtkDelimitedTextWriter.h
@@ -20,8 +20,8 @@
 
 // .NAME vtkDelimitedTextWriter - Delimited text writer for vtkTable
 // Writes a vtkTable as a delimited text file (such as CSV).
-#ifndef __vtkDelimitedTextWriter_h
-#define __vtkDelimitedTextWriter_h
+#ifndef vtkDelimitedTextWriter_h
+#define vtkDelimitedTextWriter_h
 
 #include "vtkIOCoreModule.h" // For export macro
 #include "vtkWriter.h"
diff --git a/IO/Core/vtkGlobFileNames.h b/IO/Core/vtkGlobFileNames.h
index 353e01d46254a15504b4c91d29b0a221bee53150..9ed5cfa4198b05fbb6eb6ea92792411ad03d4559 100644
--- a/IO/Core/vtkGlobFileNames.h
+++ b/IO/Core/vtkGlobFileNames.h
@@ -30,8 +30,8 @@
 // .SECTION See Also
 // vtkDirectory
 
-#ifndef __vtkGlobFileNames_h
-#define __vtkGlobFileNames_h
+#ifndef vtkGlobFileNames_h
+#define vtkGlobFileNames_h
 
 #include "vtkIOCoreModule.h" // For export macro
 #include "vtkObject.h"
diff --git a/IO/Core/vtkInputStream.h b/IO/Core/vtkInputStream.h
index a09d828c174115b2a110d4c2b9ef27284bd107fb..9d998401082832fd3d881da664e917e42301e54a 100644
--- a/IO/Core/vtkInputStream.h
+++ b/IO/Core/vtkInputStream.h
@@ -21,8 +21,8 @@
 // input data.  The actual length in the stream may differ for
 // subclasses that implement an encoding scheme.
 
-#ifndef __vtkInputStream_h
-#define __vtkInputStream_h
+#ifndef vtkInputStream_h
+#define vtkInputStream_h
 
 #include "vtkIOCoreModule.h" // For export macro
 #include "vtkObject.h"
diff --git a/IO/Core/vtkJavaScriptDataWriter.h b/IO/Core/vtkJavaScriptDataWriter.h
index 5452ce9755ab819d8cf0b0e1ac3ba3e29efd4263..5332266037003d754a0d96cfa5c5f285525a090d 100644
--- a/IO/Core/vtkJavaScriptDataWriter.h
+++ b/IO/Core/vtkJavaScriptDataWriter.h
@@ -20,8 +20,8 @@
 
 // .NAME vtkJavaScriptDataWriter - A Javascript data writer for vtkTable
 // Writes a vtkTable into a Javascript data format.
-#ifndef __vtkJavaScriptDataWriter_h
-#define __vtkJavaScriptDataWriter_h
+#ifndef vtkJavaScriptDataWriter_h
+#define vtkJavaScriptDataWriter_h
 
 #include "vtkIOCoreModule.h" // For export macro
 #include "vtkWriter.h"
diff --git a/IO/Core/vtkOutputStream.h b/IO/Core/vtkOutputStream.h
index c321b2434ead7946716b6d5f5a1af8ad29a6224c..430d29ef46b27a34a970dcf7e9fd7920bffb9533 100644
--- a/IO/Core/vtkOutputStream.h
+++ b/IO/Core/vtkOutputStream.h
@@ -21,8 +21,8 @@
 // The actual length in the stream may differ for subclasses that
 // implement an encoding scheme.
 
-#ifndef __vtkOutputStream_h
-#define __vtkOutputStream_h
+#ifndef vtkOutputStream_h
+#define vtkOutputStream_h
 
 #include "vtkIOCoreModule.h" // For export macro
 #include "vtkObject.h"
diff --git a/IO/Core/vtkSortFileNames.h b/IO/Core/vtkSortFileNames.h
index 74a72a0b688a28e805a45188b76fe250add8a88e..26eada1c096b66a95f94576acb1b4efba147497f 100644
--- a/IO/Core/vtkSortFileNames.h
+++ b/IO/Core/vtkSortFileNames.h
@@ -25,8 +25,8 @@
 // .SECTION See Also
 // vtkImageReader2
 
-#ifndef __vtkSortFileNames_h
-#define __vtkSortFileNames_h
+#ifndef vtkSortFileNames_h
+#define vtkSortFileNames_h
 
 #include "vtkIOCoreModule.h" // For export macro
 #include "vtkObject.h"
diff --git a/IO/Core/vtkTextCodec.h b/IO/Core/vtkTextCodec.h
index 830363fdf9521ed41bdd74746a5358662ef60ce6..48d49856e0efe84909cdbfafb85ee9c5933cf85d 100644
--- a/IO/Core/vtkTextCodec.h
+++ b/IO/Core/vtkTextCodec.h
@@ -31,8 +31,8 @@ PURPOSE.  See the above copyright notice for more information.
 // vtkTextCodecFactory
 //
 
-#ifndef __vtkTextCodec_h
-#define __vtkTextCodec_h
+#ifndef vtkTextCodec_h
+#define vtkTextCodec_h
 
 #include "vtkIOCoreModule.h" // For export macro
 #include "vtkObject.h"
diff --git a/IO/Core/vtkTextCodecFactory.h b/IO/Core/vtkTextCodecFactory.h
index 6254c752923607c43f868f1267eb26a078e09e5d..feafe0ac0c7aae8ca677b7415ef56c2f65560c19 100644
--- a/IO/Core/vtkTextCodecFactory.h
+++ b/IO/Core/vtkTextCodecFactory.h
@@ -33,8 +33,8 @@ PURPOSE.  See the above copyright notice for more information.
 // vtkTextCodec
 //
 
-#ifndef __vtkTextCodecFactory_h
-#define __vtkTextCodecFactory_h
+#ifndef vtkTextCodecFactory_h
+#define vtkTextCodecFactory_h
 
 #include "vtkIOCoreModule.h" // For export macro
 #include "vtkObject.h"
@@ -94,4 +94,4 @@ private:
 //ETX
 };
 
-#endif // __vtkTextCodecFactory_h
+#endif // vtkTextCodecFactory_h
diff --git a/IO/Core/vtkUTF16TextCodec.h b/IO/Core/vtkUTF16TextCodec.h
index 5c3e76b11bfe79fae12ac9b26ef9d81bacaa0a86..07778cbfbac34378dea07340ff33a14b6ac3fb72 100644
--- a/IO/Core/vtkUTF16TextCodec.h
+++ b/IO/Core/vtkUTF16TextCodec.h
@@ -31,8 +31,8 @@ PURPOSE.  See the above copyright notice for more information.
 // vtkUTF16TextCodecFactory
 //
 
-#ifndef __vtkUTF16TextCodec_h
-#define __vtkUTF16TextCodec_h
+#ifndef vtkUTF16TextCodec_h
+#define vtkUTF16TextCodec_h
 
 #include "vtkIOCoreModule.h" // For export macro
 #include "vtkTextCodec.h"
diff --git a/IO/Core/vtkUTF8TextCodec.h b/IO/Core/vtkUTF8TextCodec.h
index 497f659d71e600827f157106cde82fc920010971..db73308e028e1548770a35dbd5d3d85962e138a9 100644
--- a/IO/Core/vtkUTF8TextCodec.h
+++ b/IO/Core/vtkUTF8TextCodec.h
@@ -31,8 +31,8 @@ PURPOSE.  See the above copyright notice for more information.
 // vtkUTF8TextCodecFactory
 //
 
-#ifndef __vtkUTF8TextCodec_h
-#define __vtkUTF8TextCodec_h
+#ifndef vtkUTF8TextCodec_h
+#define vtkUTF8TextCodec_h
 
 #include "vtkIOCoreModule.h" // For export macro
 #include "vtkTextCodec.h"
diff --git a/IO/Core/vtkWriter.h b/IO/Core/vtkWriter.h
index 7ae7490bac90d7a0daf094820e8fdb8f496c9aa3..6b6d1bd761180350f458f6b53f846e23f9cc0de6 100644
--- a/IO/Core/vtkWriter.h
+++ b/IO/Core/vtkWriter.h
@@ -25,8 +25,8 @@
 // .SECTION See Also
 // vtkXMLDataSetWriter vtkDataSetWriter vtkImageWriter vtkMCubesWriter
 
-#ifndef __vtkWriter_h
-#define __vtkWriter_h
+#ifndef vtkWriter_h
+#define vtkWriter_h
 
 #include "vtkIOCoreModule.h" // For export macro
 #include "vtkAlgorithm.h"
diff --git a/IO/Core/vtkZLibDataCompressor.h b/IO/Core/vtkZLibDataCompressor.h
index 9ee94ab1c19794054924a0dbc45c40ca3317164d..557a4f39789dcef6039524e7bdfee361416576cb 100644
--- a/IO/Core/vtkZLibDataCompressor.h
+++ b/IO/Core/vtkZLibDataCompressor.h
@@ -17,8 +17,8 @@
 // vtkZLibDataCompressor provides a concrete vtkDataCompressor class
 // using zlib for compressing and uncompressing data.
 
-#ifndef __vtkZLibDataCompressor_h
-#define __vtkZLibDataCompressor_h
+#ifndef vtkZLibDataCompressor_h
+#define vtkZLibDataCompressor_h
 
 #include "vtkIOCoreModule.h" // For export macro
 #include "vtkDataCompressor.h"
diff --git a/IO/EnSight/vtkEnSight6BinaryReader.h b/IO/EnSight/vtkEnSight6BinaryReader.h
index 8b446bf76a4a9e5f21631489f66974d70c9f9dea..b272dda143ebf10fa25c722dea0e1469b50fbca5 100644
--- a/IO/EnSight/vtkEnSight6BinaryReader.h
+++ b/IO/EnSight/vtkEnSight6BinaryReader.h
@@ -32,8 +32,8 @@
 // This reader can only handle static EnSight datasets (both static geometry
 // and variables).
 
-#ifndef __vtkEnSight6BinaryReader_h
-#define __vtkEnSight6BinaryReader_h
+#ifndef vtkEnSight6BinaryReader_h
+#define vtkEnSight6BinaryReader_h
 
 #include "vtkIOEnSightModule.h" // For export macro
 #include "vtkEnSightReader.h"
diff --git a/IO/EnSight/vtkEnSight6Reader.h b/IO/EnSight/vtkEnSight6Reader.h
index 684428a3b64334454a1ffe1b078c2d8396ba43ae..08b4add19289f512c1015d5b5088a7785a10402f 100644
--- a/IO/EnSight/vtkEnSight6Reader.h
+++ b/IO/EnSight/vtkEnSight6Reader.h
@@ -32,8 +32,8 @@
 // This reader can only handle static EnSight datasets (both static geometry
 // and variables).
 
-#ifndef __vtkEnSight6Reader_h
-#define __vtkEnSight6Reader_h
+#ifndef vtkEnSight6Reader_h
+#define vtkEnSight6Reader_h
 
 #include "vtkIOEnSightModule.h" // For export macro
 #include "vtkEnSightReader.h"
diff --git a/IO/EnSight/vtkEnSightGoldBinaryReader.h b/IO/EnSight/vtkEnSightGoldBinaryReader.h
index 49a8935469fd20fc4a3897a8712174a5a66ae8b8..16840d4580d07d7c1fd533e3aca432b317e91dbc 100644
--- a/IO/EnSight/vtkEnSightGoldBinaryReader.h
+++ b/IO/EnSight/vtkEnSightGoldBinaryReader.h
@@ -34,8 +34,8 @@
 // .SECTION Thanks
 // Thanks to Yvan Fournier for providing the code to support nfaced elements.
 
-#ifndef __vtkEnSightGoldBinaryReader_h
-#define __vtkEnSightGoldBinaryReader_h
+#ifndef vtkEnSightGoldBinaryReader_h
+#define vtkEnSightGoldBinaryReader_h
 
 #include "vtkIOEnSightModule.h" // For export macro
 #include "vtkEnSightReader.h"
diff --git a/IO/EnSight/vtkEnSightGoldReader.h b/IO/EnSight/vtkEnSightGoldReader.h
index 4d33a4632264ac89b80e51277901c26fb4b5467d..0139d147381c373178c2c5dc6d0151b0f090702a 100644
--- a/IO/EnSight/vtkEnSightGoldReader.h
+++ b/IO/EnSight/vtkEnSightGoldReader.h
@@ -34,8 +34,8 @@
 // .SECTION Thanks
 // Thanks to Yvan Fournier for providing the code to support nfaced elements.
 
-#ifndef __vtkEnSightGoldReader_h
-#define __vtkEnSightGoldReader_h
+#ifndef vtkEnSightGoldReader_h
+#define vtkEnSightGoldReader_h
 
 #include "vtkIOEnSightModule.h" // For export macro
 #include "vtkEnSightReader.h"
diff --git a/IO/EnSight/vtkEnSightMasterServerReader.h b/IO/EnSight/vtkEnSightMasterServerReader.h
index b8eb49c50f117299eca976cf53cbc3d040216e15..295c67536a9e3ceebdfb4f7ec4e55ad47553e5d0 100644
--- a/IO/EnSight/vtkEnSightMasterServerReader.h
+++ b/IO/EnSight/vtkEnSightMasterServerReader.h
@@ -14,8 +14,8 @@
 =========================================================================*/
 // .NAME vtkEnSightMasterServerReader - reader for compund EnSight files
 
-#ifndef __vtkEnSightMasterServerReader_h
-#define __vtkEnSightMasterServerReader_h
+#ifndef vtkEnSightMasterServerReader_h
+#define vtkEnSightMasterServerReader_h
 
 #include "vtkIOEnSightModule.h" // For export macro
 #include "vtkGenericEnSightReader.h"
diff --git a/IO/EnSight/vtkEnSightReader.h b/IO/EnSight/vtkEnSightReader.h
index 8e8d8cee529f731296973218bc7f592207bd81f6..fcd4420acb1116a656afaee95ed7e262250735f2 100644
--- a/IO/EnSight/vtkEnSightReader.h
+++ b/IO/EnSight/vtkEnSightReader.h
@@ -14,8 +14,8 @@
 =========================================================================*/
 // .NAME vtkEnSightReader - superclass for EnSight file readers
 
-#ifndef __vtkEnSightReader_h
-#define __vtkEnSightReader_h
+#ifndef vtkEnSightReader_h
+#define vtkEnSightReader_h
 
 #include "vtkIOEnSightModule.h" // For export macro
 #include "vtkGenericEnSightReader.h"
diff --git a/IO/EnSight/vtkGenericEnSightReader.h b/IO/EnSight/vtkGenericEnSightReader.h
index 75be7acf0166998df4f1cc61c4a6d304a738fcef..9e8f13c05e35ab552e23c3da11ea8c5120785c78 100644
--- a/IO/EnSight/vtkGenericEnSightReader.h
+++ b/IO/EnSight/vtkGenericEnSightReader.h
@@ -17,8 +17,8 @@
 // The class vtkGenericEnSightReader allows the user to read an EnSight data
 // set without a priori knowledge of what type of EnSight data set it is.
 
-#ifndef __vtkGenericEnSightReader_h
-#define __vtkGenericEnSightReader_h
+#ifndef vtkGenericEnSightReader_h
+#define vtkGenericEnSightReader_h
 
 #include "vtkIOEnSightModule.h" // For export macro
 #include "vtkMultiBlockDataSetAlgorithm.h"
diff --git a/IO/Exodus/vtkCPExodusIIElementBlock.h b/IO/Exodus/vtkCPExodusIIElementBlock.h
index 028bc9dc5b528e72dd9fb04fff96a8c6f5d75f00..cda9ed4b4a023cfb41188f5179d2c50bdbf30387 100644
--- a/IO/Exodus/vtkCPExodusIIElementBlock.h
+++ b/IO/Exodus/vtkCPExodusIIElementBlock.h
@@ -21,8 +21,8 @@
 // memory layout. Use the vtkCPExodusIIInSituReader to read an Exodus II file's
 // data into this structure.
 
-#ifndef __vtkCPExodusIIElementBlock_h
-#define __vtkCPExodusIIElementBlock_h
+#ifndef vtkCPExodusIIElementBlock_h
+#define vtkCPExodusIIElementBlock_h
 
 #include "vtkObject.h"
 #include "vtkIOExodusModule.h" // For export macro
@@ -110,4 +110,4 @@ vtkMakeExportedMappedUnstructuredGrid(vtkCPExodusIIElementBlock,
                                       vtkCPExodusIIElementBlockImpl,
                                       VTKIOEXODUS_EXPORT)
 
-#endif //__vtkCPExodusIIElementBlock_h
+#endif //vtkCPExodusIIElementBlock_h
diff --git a/IO/Exodus/vtkCPExodusIIElementBlockCellIterator.h b/IO/Exodus/vtkCPExodusIIElementBlockCellIterator.h
index 59ae0a32d63de40c4308bcce12cbf43c5d253ecb..221416964ba50598ce24a4103af3055ebb3d9794 100644
--- a/IO/Exodus/vtkCPExodusIIElementBlockCellIterator.h
+++ b/IO/Exodus/vtkCPExodusIIElementBlockCellIterator.h
@@ -15,8 +15,8 @@
 // .NAME vtkCPExodusIIElementBlockCellIterator - vtkCellIterator subclass
 // specialized for vtkCPExodusIIElementBlock.
 
-#ifndef __vtkCPExodusIIElementBlockCellIterator_h
-#define __vtkCPExodusIIElementBlockCellIterator_h
+#ifndef vtkCPExodusIIElementBlockCellIterator_h
+#define vtkCPExodusIIElementBlockCellIterator_h
 
 #include "vtkCellIterator.h"
 #include "vtkIOExodusModule.h" // For export macro
@@ -61,4 +61,4 @@ private:
   vtkIdType CellId;
 };
 
-#endif //__vtkCPExodusIIElementBlockCellIterator_h
+#endif //vtkCPExodusIIElementBlockCellIterator_h
diff --git a/IO/Exodus/vtkCPExodusIIInSituReader.h b/IO/Exodus/vtkCPExodusIIInSituReader.h
index 2c44aa1d35d3adfe97d48ba51e6251fbbcdf9961..600998e074f62a5eb2274c5790c6e092716d9af0 100644
--- a/IO/Exodus/vtkCPExodusIIInSituReader.h
+++ b/IO/Exodus/vtkCPExodusIIInSituReader.h
@@ -22,8 +22,8 @@
 // the data into the standard VTK memory layout, avoiding the cost of a deep
 // copy.
 
-#ifndef __vtkCPExodusIIInSituReader_h
-#define __vtkCPExodusIIInSituReader_h
+#ifndef vtkCPExodusIIInSituReader_h
+#define vtkCPExodusIIInSituReader_h
 
 #include "vtkIOExodusModule.h" // For export macro
 #include "vtkMultiBlockDataSetAlgorithm.h"
@@ -109,4 +109,4 @@ private:
   int CurrentTimeStep;
 };
 
-#endif //__vtkCPExodusIIInSituReader_h
+#endif //vtkCPExodusIIInSituReader_h
diff --git a/IO/Exodus/vtkCPExodusIINodalCoordinatesTemplate.h b/IO/Exodus/vtkCPExodusIINodalCoordinatesTemplate.h
index e510463121c249831f85ab0c3133bcbd8cf06b86..ed72cbed875d6047158a50577897b7bdf65f6331 100644
--- a/IO/Exodus/vtkCPExodusIINodalCoordinatesTemplate.h
+++ b/IO/Exodus/vtkCPExodusIINodalCoordinatesTemplate.h
@@ -21,8 +21,8 @@
 // the vtkCPExodusIIInSituReader to read an Exodus II file's data into this
 // structure.
 
-#ifndef __vtkCPExodusIINodalCoordinatesTemplate_h
-#define __vtkCPExodusIINodalCoordinatesTemplate_h
+#ifndef vtkCPExodusIINodalCoordinatesTemplate_h
+#define vtkCPExodusIINodalCoordinatesTemplate_h
 
 #include "vtkMappedDataArray.h"
 #include "vtkIOExodusModule.h" // For export macro
@@ -119,6 +119,6 @@ private:
 
 #include "vtkCPExodusIINodalCoordinatesTemplate.txx"
 
-#endif //__vtkCPExodusIINodalCoordinatesTemplate_h
+#endif //vtkCPExodusIINodalCoordinatesTemplate_h
 
 // VTK-HeaderTest-Exclude: vtkCPExodusIINodalCoordinatesTemplate.h
diff --git a/IO/Exodus/vtkCPExodusIIResultsArrayTemplate.h b/IO/Exodus/vtkCPExodusIIResultsArrayTemplate.h
index cefdd1a653320f05ff8fbe1ad1fbe06f20a0a317..dcfc415f089efb2c52e07c880b58a2418d796623 100644
--- a/IO/Exodus/vtkCPExodusIIResultsArrayTemplate.h
+++ b/IO/Exodus/vtkCPExodusIIResultsArrayTemplate.h
@@ -21,8 +21,8 @@
 // the vtkCPExodusIIInSituReader to read an Exodus II file's data into this
 // structure.
 
-#ifndef __vtkCPExodusIIResultsArrayTemplate_h
-#define __vtkCPExodusIIResultsArrayTemplate_h
+#ifndef vtkCPExodusIIResultsArrayTemplate_h
+#define vtkCPExodusIIResultsArrayTemplate_h
 
 #include "vtkMappedDataArray.h"
 
@@ -118,6 +118,6 @@ private:
 
 #include "vtkCPExodusIIResultsArrayTemplate.txx"
 
-#endif //__vtkCPExodusIIResultsArrayTemplate_h
+#endif //vtkCPExodusIIResultsArrayTemplate_h
 
 // VTK-HeaderTest-Exclude: vtkCPExodusIIResultsArrayTemplate.h
diff --git a/IO/Exodus/vtkExodusIICache.h b/IO/Exodus/vtkExodusIICache.h
index c76738abc0f8506f10b17f548cd498ee6fffe0f9..5be529236880de82cef13db441ffb2975e9888fd 100644
--- a/IO/Exodus/vtkExodusIICache.h
+++ b/IO/Exodus/vtkExodusIICache.h
@@ -1,5 +1,5 @@
-#ifndef __vtkExodusIICache_h
-#define __vtkExodusIICache_h
+#ifndef vtkExodusIICache_h
+#define vtkExodusIICache_h
 
 // ============================================================================
 // The following classes define an LRU cache for data arrays
@@ -212,4 +212,4 @@ private:
   vtkExodusIICache( const vtkExodusIICache& ); // Not implemented
   void operator = ( const vtkExodusIICache& ); // Not implemented
 };
-#endif // __vtkExodusIICache_h
+#endif // vtkExodusIICache_h
diff --git a/IO/Exodus/vtkExodusIIReader.h b/IO/Exodus/vtkExodusIIReader.h
index 10de0366f262732d333ba45187917228d428c21e..d405c01277579e5c1679e48d466187360a96e7de 100644
--- a/IO/Exodus/vtkExodusIIReader.h
+++ b/IO/Exodus/vtkExodusIIReader.h
@@ -32,8 +32,8 @@
 //
 
 
-#ifndef __vtkExodusIIReader_h
-#define __vtkExodusIIReader_h
+#ifndef vtkExodusIIReader_h
+#define vtkExodusIIReader_h
 
 #include "vtkIOExodusModule.h" // For export macro
 #include "vtkMultiBlockDataSetAlgorithm.h"
diff --git a/IO/Exodus/vtkExodusIIReaderParser.h b/IO/Exodus/vtkExodusIIReaderParser.h
index 17f741922eb2f1962297ead0d9dc1d3288556faa..16276d2370e8475ea6e617367944fb77addd98ee 100644
--- a/IO/Exodus/vtkExodusIIReaderParser.h
+++ b/IO/Exodus/vtkExodusIIReaderParser.h
@@ -17,8 +17,8 @@
 // vtkExodusIIReaderParser is an internal XML parser used by vtkExodusIIReader.
 // This is not for public use.
 
-#ifndef __vtkExodusIIReaderParser_h
-#define __vtkExodusIIReaderParser_h
+#ifndef vtkExodusIIReaderParser_h
+#define vtkExodusIIReaderParser_h
 
 #include "vtkIOExodusModule.h" // For export macro
 #include "vtkXMLParser.h"
diff --git a/IO/Exodus/vtkExodusIIReaderPrivate.h b/IO/Exodus/vtkExodusIIReaderPrivate.h
index 7bba301edc42030211333939af36604b6ca41fec..d9dd2552766bb30ea2bd4cdaae084b7d60e35cd3 100644
--- a/IO/Exodus/vtkExodusIIReaderPrivate.h
+++ b/IO/Exodus/vtkExodusIIReaderPrivate.h
@@ -1,5 +1,5 @@
-#ifndef __vtkExodusIIReaderPrivate_h
-#define __vtkExodusIIReaderPrivate_h
+#ifndef vtkExodusIIReaderPrivate_h
+#define vtkExodusIIReaderPrivate_h
 
 // Do not include this file directly. It is only for use
 // from inside the ExodusII reader and its descendants.
@@ -825,5 +825,5 @@ private:
   void operator = ( const vtkExodusIIReaderPrivate& ); // Not implemented.
 };
 
-#endif // __vtkExodusIIReaderPrivate_h
+#endif // vtkExodusIIReaderPrivate_h
 // VTK-HeaderTest-Exclude: vtkExodusIIReaderPrivate.h
diff --git a/IO/Exodus/vtkExodusIIReaderVariableCheck.h b/IO/Exodus/vtkExodusIIReaderVariableCheck.h
index 70164594a70a8eb830390bdbf6af3cc8832e1f2f..d2c949e43572ccea39d1db9838e524e057828831 100644
--- a/IO/Exodus/vtkExodusIIReaderVariableCheck.h
+++ b/IO/Exodus/vtkExodusIIReaderVariableCheck.h
@@ -1,5 +1,5 @@
-#ifndef __vtkExodusIIReaderVariableCheck_h
-#define __vtkExodusIIReaderVariableCheck_h
+#ifndef vtkExodusIIReaderVariableCheck_h
+#define vtkExodusIIReaderVariableCheck_h
 
 #include "vtkExodusIIReaderPrivate.h" // for ArrayInfoType
 
@@ -118,5 +118,5 @@ protected:
   bool StillAdding;
 };
 
-#endif // __vtkExodusIIReaderVariableCheck_h
+#endif // vtkExodusIIReaderVariableCheck_h
 // VTK-HeaderTest-Exclude: vtkExodusIIReaderVariableCheck.h
diff --git a/IO/Exodus/vtkExodusIIWriter.h b/IO/Exodus/vtkExodusIIWriter.h
index f3af2e8538da2813731242e6fd0cf22b950780f1..d96dae39c5badb12ca796a287aad34a1435cece3 100644
--- a/IO/Exodus/vtkExodusIIWriter.h
+++ b/IO/Exodus/vtkExodusIIWriter.h
@@ -61,8 +61,8 @@
 //     We use the terms "point" and "node" interchangeably.
 //     Also, we use the terms "element" and "cell" interchangeably.
 
-#ifndef __vtkExodusIIWriter_h
-#define __vtkExodusIIWriter_h
+#ifndef vtkExodusIIWriter_h
+#define vtkExodusIIWriter_h
 
 #include "vtkIOExodusModule.h" // For export macro
 #include "vtkWriter.h"
diff --git a/IO/Exodus/vtkModelMetadata.h b/IO/Exodus/vtkModelMetadata.h
index 3884adaffde65d3ddf2d2f209c095afc162b0b1f..d9edc88352a0df385b62eaac47509b7db6cdb6ab 100644
--- a/IO/Exodus/vtkModelMetadata.h
+++ b/IO/Exodus/vtkModelMetadata.h
@@ -66,8 +66,8 @@
 // .SECTION See also
 //   vtkDistributedDataFilter vtkExtractCells
 
-#ifndef __vtkModelMetadata_h
-#define __vtkModelMetadata_h
+#ifndef vtkModelMetadata_h
+#define vtkModelMetadata_h
 
 #include "vtkIOExodusModule.h" // For export macro
 #include "vtkObject.h"
diff --git a/IO/Export/vtkExporter.h b/IO/Export/vtkExporter.h
index 3ffb9a71bbc12ccb9c8ab391a4d959b663611d00..670337c3957670c568a91e1f2e33e5adea3cbf34 100644
--- a/IO/Export/vtkExporter.h
+++ b/IO/Export/vtkExporter.h
@@ -33,8 +33,8 @@
 // .SECTION See Also
 // vtkOBJExporter vtkRenderWindow vtkWriter
 
-#ifndef __vtkExporter_h
-#define __vtkExporter_h
+#ifndef vtkExporter_h
+#define vtkExporter_h
 
 #include "vtkIOExportModule.h" // For export macro
 #include "vtkObject.h"
diff --git a/IO/Export/vtkGL2PSExporter.h b/IO/Export/vtkGL2PSExporter.h
index 9eb74f8a7d449937f563813efae4e5d9e7bd948e..8152d800821ad49c1c6b507cdef95114552529d9 100644
--- a/IO/Export/vtkGL2PSExporter.h
+++ b/IO/Export/vtkGL2PSExporter.h
@@ -72,8 +72,8 @@
 // Thanks to Goodwin Lawlor and Prabhu Ramachandran for this class.
 
 
-#ifndef __vtkGL2PSExporter_h
-#define __vtkGL2PSExporter_h
+#ifndef vtkGL2PSExporter_h
+#define vtkGL2PSExporter_h
 
 #include "vtkIOExportModule.h" // For export macro
 #include "vtkExporter.h"
diff --git a/IO/Export/vtkIVExporter.h b/IO/Export/vtkIVExporter.h
index b22335d35af2be077b7b5cc3a33411f445ab10cd..94bf0657e14c2ce20a42ced29dc0bec5b46781d5 100644
--- a/IO/Export/vtkIVExporter.h
+++ b/IO/Export/vtkIVExporter.h
@@ -21,8 +21,8 @@
 // vtkExporter
 
 
-#ifndef __vtkIVExporter_h
-#define __vtkIVExporter_h
+#ifndef vtkIVExporter_h
+#define vtkIVExporter_h
 
 #include "vtkIOExportModule.h" // For export macro
 #include "vtkExporter.h"
diff --git a/IO/Export/vtkOBJExporter.h b/IO/Export/vtkOBJExporter.h
index 51d840cfd5daf7fa9861d75a82ae269a1c933d82..6528298c51136d6f5f7978dd8417f6a311140410 100644
--- a/IO/Export/vtkOBJExporter.h
+++ b/IO/Export/vtkOBJExporter.h
@@ -23,8 +23,8 @@
 // vtkExporter
 
 
-#ifndef __vtkOBJExporter_h
-#define __vtkOBJExporter_h
+#ifndef vtkOBJExporter_h
+#define vtkOBJExporter_h
 
 #include "vtkIOExportModule.h" // For export macro
 #include "vtkExporter.h"
diff --git a/IO/Export/vtkOOGLExporter.h b/IO/Export/vtkOOGLExporter.h
index 96ae73c0ef6858d2a08c269cec6b1c7011b976f4..62806fe35be0ae33b7d10ebc7c797d1c9bd412b3 100644
--- a/IO/Export/vtkOOGLExporter.h
+++ b/IO/Export/vtkOOGLExporter.h
@@ -22,8 +22,8 @@
 // vtkExporter
 
 
-#ifndef __vtkOOGLExporter_h
-#define __vtkOOGLExporter_h
+#ifndef vtkOOGLExporter_h
+#define vtkOOGLExporter_h
 
 #include "vtkIOExportModule.h" // For export macro
 #include "vtkExporter.h"
diff --git a/IO/Export/vtkPOVExporter.h b/IO/Export/vtkPOVExporter.h
index 44a387a4d5bae7920aa9d68044b2425e7d5bac22..83501566088c3655156bab8b70d0e8f23a265156 100644
--- a/IO/Export/vtkPOVExporter.h
+++ b/IO/Export/vtkPOVExporter.h
@@ -70,8 +70,8 @@ ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 // Li-Ta Lo (ollie@lanl.gov) and Jim Ahrens (ahrens@lanl.gov)
 // Los Alamos National Laboratory
 
-#ifndef __vtkPOVExporter_h
-#define __vtkPOVExporter_h
+#ifndef vtkPOVExporter_h
+#define vtkPOVExporter_h
 
 #include "vtkIOExportModule.h" // For export macro
 #include "vtkExporter.h"
diff --git a/IO/Export/vtkRIBExporter.h b/IO/Export/vtkRIBExporter.h
index dac2a6fac1f10227579ef2b44cd21eed0900f7f0..01a11e9b48fc0b8cfa2197629e75552fe2ef80f9 100644
--- a/IO/Export/vtkRIBExporter.h
+++ b/IO/Export/vtkRIBExporter.h
@@ -44,8 +44,8 @@
 // vtkExporter vtkRIBProperty
 
 
-#ifndef __vtkRIBExporter_h
-#define __vtkRIBExporter_h
+#ifndef vtkRIBExporter_h
+#define vtkRIBExporter_h
 
 #include "vtkIOExportModule.h" // For export macro
 #include "vtkExporter.h"
diff --git a/IO/Export/vtkRIBLight.h b/IO/Export/vtkRIBLight.h
index 417e95b380983c9a72ab86fd300a17533688ce99..97866764bc88a7d75ea1232a2c3bf4897b4817fd 100644
--- a/IO/Export/vtkRIBLight.h
+++ b/IO/Export/vtkRIBLight.h
@@ -20,8 +20,8 @@
 // .SECTION See Also
 // vtkRIBExporter
 
-#ifndef __vtkRIBLight_h
-#define __vtkRIBLight_h
+#ifndef vtkRIBLight_h
+#define vtkRIBLight_h
 
 #include "vtkIOExportModule.h" // For export macro
 #include "vtkLight.h"
diff --git a/IO/Export/vtkRIBProperty.h b/IO/Export/vtkRIBProperty.h
index ade7e8990bb9f1c252c4e9b0f976f5eff62b4d90..5a797b3fc0423e9b97c625d64df7ef32970d5b9c 100644
--- a/IO/Export/vtkRIBProperty.h
+++ b/IO/Export/vtkRIBProperty.h
@@ -22,8 +22,8 @@
 // .SECTION See Also
 // vtkRIBExporter
 
-#ifndef __vtkRIBProperty_h
-#define __vtkRIBProperty_h
+#ifndef vtkRIBProperty_h
+#define vtkRIBProperty_h
 
 #include "vtkIOExportModule.h" // For export macro
 #include "vtkProperty.h"
diff --git a/IO/Export/vtkVRMLExporter.h b/IO/Export/vtkVRMLExporter.h
index a9ea54c48cf7e83ab1b296ab1a065b6c1897cc8d..563cc18633a4800ff281e01c01794af27df2dd32 100644
--- a/IO/Export/vtkVRMLExporter.h
+++ b/IO/Export/vtkVRMLExporter.h
@@ -22,8 +22,8 @@
 // vtkExporter
 
 
-#ifndef __vtkVRMLExporter_h
-#define __vtkVRMLExporter_h
+#ifndef vtkVRMLExporter_h
+#define vtkVRMLExporter_h
 
 #include "vtkIOExportModule.h" // For export macro
 #include "vtkExporter.h"
diff --git a/IO/Export/vtkX3D.h b/IO/Export/vtkX3D.h
index e57edafcaa5d88626aae100c0c4ec28c8c84671f..3d124a261badad87f3290b92967f3356c5a6ed9b 100644
--- a/IO/Export/vtkX3D.h
+++ b/IO/Export/vtkX3D.h
@@ -12,8 +12,8 @@
      PURPOSE.  See the above copyright notice for more information.
 
 =========================================================================*/
-#ifndef __vtkX3D_h
-#define __vtkX3D_h
+#ifndef vtkX3D_h
+#define vtkX3D_h
 
 extern const char* x3dElementString[];
 extern const char* x3dAttributeString[];
diff --git a/IO/Export/vtkX3DExporter.h b/IO/Export/vtkX3DExporter.h
index 46d967fe190d3cde7d5e479a1828faea2cb40de0..18ff270f3fde3eae43aec55a3f48994753c65370 100644
--- a/IO/Export/vtkX3DExporter.h
+++ b/IO/Export/vtkX3DExporter.h
@@ -21,8 +21,8 @@
 // .SECTION Thanks
 // X3DExporter is contributed by Christophe Mouton at EDF.
 
-#ifndef __vtkX3DExporter_h
-#define __vtkX3DExporter_h
+#ifndef vtkX3DExporter_h
+#define vtkX3DExporter_h
 
 #include "vtkIOExportModule.h" // For export macro
 #include "vtkExporter.h"
diff --git a/IO/Export/vtkX3DExporterFIWriter.h b/IO/Export/vtkX3DExporterFIWriter.h
index fbe65e2e568bb1cda4e4da3c2c99d1ce0676ba25..78b2a5e32dae90fafa5f75b141e16443e666d0e3 100644
--- a/IO/Export/vtkX3DExporterFIWriter.h
+++ b/IO/Export/vtkX3DExporterFIWriter.h
@@ -15,8 +15,8 @@
 // .NAME vtkX3DExporterFIWriter -
 // .SECTION Description
 
-#ifndef __vtkX3DExporterFIWriter_h
-#define __vtkX3DExporterFIWriter_h
+#ifndef vtkX3DExporterFIWriter_h
+#define vtkX3DExporterFIWriter_h
 
 #include "vtkIOExportModule.h" // For export macro
 #include "vtkX3DExporterWriter.h"
diff --git a/IO/Export/vtkX3DExporterFIWriterHelper.h b/IO/Export/vtkX3DExporterFIWriterHelper.h
index 28b3c672ba5e84d06fd4c0a3d1ac3c6809dde958..b3a90efc4dc51598fc69669051237c11f81b59c9 100644
--- a/IO/Export/vtkX3DExporterFIWriterHelper.h
+++ b/IO/Export/vtkX3DExporterFIWriterHelper.h
@@ -15,8 +15,8 @@
 // .NAME vtkX3DExporterFIWriterHelper -
 // .SECTION Description
 
-#ifndef __vtkX3DExporterFIWriterHelper_h
-#define __vtkX3DExporterFIWriterHelper_h
+#ifndef vtkX3DExporterFIWriterHelper_h
+#define vtkX3DExporterFIWriterHelper_h
 
 //#include "vtkX3DExporterFIByteWriter.h"
 #include "vtkZLibDataCompressor.h"
diff --git a/IO/Export/vtkX3DExporterJavaHelper.h b/IO/Export/vtkX3DExporterJavaHelper.h
index c0a8586849c7fa0414153605621e0aa1d2b31aa5..7a3ac0b198ed9d1ef7fe64b38afb3b38fdfdcfda 100644
--- a/IO/Export/vtkX3DExporterJavaHelper.h
+++ b/IO/Export/vtkX3DExporterJavaHelper.h
@@ -15,8 +15,8 @@
 // .NAME vtkX3DExporterJavaHelper - create an x3d file
 // .SECTION Description
 
-#ifndef __vtkX3DExporterJavaHelper_h
-#define __vtkX3DExporterJavaHelper_h
+#ifndef vtkX3DExporterJavaHelper_h
+#define vtkX3DExporterJavaHelper_h
 
 #include "vtkIOExportModule.h" // For export macro
 #include "vtkObject.h"
diff --git a/IO/Export/vtkX3DExporterWriter.h b/IO/Export/vtkX3DExporterWriter.h
index 51d433deb58d3121d38c53c6ba96fabe66ed4cee..5838694f117dff0e567ec0f32da1179f45091eac 100644
--- a/IO/Export/vtkX3DExporterWriter.h
+++ b/IO/Export/vtkX3DExporterWriter.h
@@ -18,8 +18,8 @@
 // classes that implement a encoding for the
 // X3D exporter
 
-#ifndef __vtkX3DExporterWriter_h
-#define __vtkX3DExporterWriter_h
+#ifndef vtkX3DExporterWriter_h
+#define vtkX3DExporterWriter_h
 
 #include "vtkIOExportModule.h" // For export macro
 #include "vtkObject.h"
diff --git a/IO/Export/vtkX3DExporterXMLWriter.h b/IO/Export/vtkX3DExporterXMLWriter.h
index f1b38b21de050b81910bc2e875b7d52fb46b35a3..88a1f9a0eefbd536efcc73bc04842dcb8cc9f0ae 100644
--- a/IO/Export/vtkX3DExporterXMLWriter.h
+++ b/IO/Export/vtkX3DExporterXMLWriter.h
@@ -16,8 +16,8 @@
 // .SECTION Description
 // vtkX3DExporterXMLWriter
 
-#ifndef __vtkX3DExporterXMLWriter_h
-#define __vtkX3DExporterXMLWriter_h
+#ifndef vtkX3DExporterXMLWriter_h
+#define vtkX3DExporterXMLWriter_h
 
 #include "vtkIOExportModule.h" // For export macro
 #include "vtkX3DExporterWriter.h"
diff --git a/IO/FFMPEG/vtkFFMPEGWriter.h b/IO/FFMPEG/vtkFFMPEGWriter.h
index 364c9bbbd86b7676f13a7d9e2925e3b4eb60b890..9832c1f59f366486e39525f517542b2d6a96c895 100644
--- a/IO/FFMPEG/vtkFFMPEGWriter.h
+++ b/IO/FFMPEG/vtkFFMPEGWriter.h
@@ -27,8 +27,8 @@
 //
 // .SECTION See Also vtkGenericMovieWriter vtkAVIWriter vtkMPEG2Writer
 
-#ifndef __vtkFFMPEGWriter_h
-#define __vtkFFMPEGWriter_h
+#ifndef vtkFFMPEGWriter_h
+#define vtkFFMPEGWriter_h
 
 #include "vtkIOFFMPEGModule.h" // For export macro
 #include "vtkGenericMovieWriter.h"
diff --git a/IO/GDAL/vtkGDALRasterReader.h b/IO/GDAL/vtkGDALRasterReader.h
index ead67ada3050198fd680e0f55ed67e79a4fbf235..545dd4e9f53e1837d7f8fd956478a859ea441010 100644
--- a/IO/GDAL/vtkGDALRasterReader.h
+++ b/IO/GDAL/vtkGDALRasterReader.h
@@ -23,8 +23,8 @@
 // .SECTION See Also
 // vtkUniformGrid, vtkImageData
 
-#ifndef __vtkGDALRasterReader_h
-#define __vtkGDALRasterReader_h
+#ifndef vtkGDALRasterReader_h
+#define vtkGDALRasterReader_h
 
 #include <vtkImageReader2.h>
 #include <vtkIOGDALModule.h> // For export macro
@@ -119,4 +119,4 @@ private:
   void operator=(const vtkGDALRasterReader&); // Not implemented
 };
 
-#endif // __vtkGDALRasterReader_h
+#endif // vtkGDALRasterReader_h
diff --git a/IO/GDAL/vtkGDALVectorReader.h b/IO/GDAL/vtkGDALVectorReader.h
index 1747af782eead7244f5403c79f7044733705f828..810705a383b7179f0178236b8c9f0dc4ce267a34 100644
--- a/IO/GDAL/vtkGDALVectorReader.h
+++ b/IO/GDAL/vtkGDALVectorReader.h
@@ -24,8 +24,8 @@
 // .SECTION See Also
 // vtkMultiBlockDataSet
 
-#ifndef __vtkGDALVectorReader_h
-#define __vtkGDALVectorReader_h
+#ifndef vtkGDALVectorReader_h
+#define vtkGDALVectorReader_h
 
 #include "vtkMultiBlockDataSetAlgorithm.h"
 #include "vtkIOGDALModule.h" // For export macro
@@ -135,4 +135,4 @@ private:
   void operator=(const vtkGDALVectorReader&);       // Not implemented.
 };
 
-#endif // __vtkGDALVectorReader_h
+#endif // vtkGDALVectorReader_h
diff --git a/IO/GeoJSON/vtkGeoJSONWriter.h b/IO/GeoJSON/vtkGeoJSONWriter.h
index c15d69da466c72696bca48a970f245e043c66dc7..1bb70e40847b4cb18dccaac99a0d7acc756afe1a 100644
--- a/IO/GeoJSON/vtkGeoJSONWriter.h
+++ b/IO/GeoJSON/vtkGeoJSONWriter.h
@@ -17,8 +17,8 @@
 // Outputs a Geo JSON (http://www.geojson.org) description of the input
 // polydata data set.
 
-#ifndef __vtkGeoJSONWriter_h
-#define __vtkGeoJSONWriter_h
+#ifndef vtkGeoJSONWriter_h
+#define vtkGeoJSONWriter_h
 
 #include "vtkIOGeoJSONModule.h" // For export macro
 #include "vtkWriter.h"
@@ -111,4 +111,4 @@ private:
   void operator=(const vtkGeoJSONWriter&);       // Not implemented.
 };
 
-#endif // __vtkGeoJSONWriter_h
+#endif // vtkGeoJSONWriter_h
diff --git a/IO/Geometry/vtkAVSucdReader.h b/IO/Geometry/vtkAVSucdReader.h
index 55f03ae55a157cc1ee676021423ba4bb144a37c6..6efb2c3bfdd5ac8f288ca77b3841067635b66e70 100644
--- a/IO/Geometry/vtkAVSucdReader.h
+++ b/IO/Geometry/vtkAVSucdReader.h
@@ -30,8 +30,8 @@
 // .SECTION See Also
 // vtkGAMBITReader
 
-#ifndef __vtkAVSucdReader_h
-#define __vtkAVSucdReader_h
+#ifndef vtkAVSucdReader_h
+#define vtkAVSucdReader_h
 
 #include "vtkIOGeometryModule.h" // For export macro
 #include "vtkUnstructuredGridAlgorithm.h"
diff --git a/IO/Geometry/vtkBYUReader.h b/IO/Geometry/vtkBYUReader.h
index a9b4e7737192e6bd1698e888f42a4f3e2f7d0a98..edebb727d17d43bf67b38076991e43428bbc075d 100644
--- a/IO/Geometry/vtkBYUReader.h
+++ b/IO/Geometry/vtkBYUReader.h
@@ -19,8 +19,8 @@
 // displacement or vector file (.d), and a 2D texture coordinate file
 // (.t).
 
-#ifndef __vtkBYUReader_h
-#define __vtkBYUReader_h
+#ifndef vtkBYUReader_h
+#define vtkBYUReader_h
 
 #include "vtkIOGeometryModule.h" // For export macro
 #include "vtkPolyDataAlgorithm.h"
diff --git a/IO/Geometry/vtkBYUWriter.h b/IO/Geometry/vtkBYUWriter.h
index f69a6488b18c2f672037e63c94a5e1aa924ffb22..d9140bc0c2d4779f4472d2c5854821f58c589936 100644
--- a/IO/Geometry/vtkBYUWriter.h
+++ b/IO/Geometry/vtkBYUWriter.h
@@ -23,8 +23,8 @@
 // WARNING: this writer does not currently write triangle strips. Use
 // vtkTriangleFilter to convert strips to triangles.
 
-#ifndef __vtkBYUWriter_h
-#define __vtkBYUWriter_h
+#ifndef vtkBYUWriter_h
+#define vtkBYUWriter_h
 
 #include "vtkIOGeometryModule.h" // For export macro
 #include "vtkWriter.h"
diff --git a/IO/Geometry/vtkCGMWriter.h b/IO/Geometry/vtkCGMWriter.h
index 1204e5630794c596dfc0293d04b3810de688080e..1923f9afb8f35665d217301a652b70f972858570 100644
--- a/IO/Geometry/vtkCGMWriter.h
+++ b/IO/Geometry/vtkCGMWriter.h
@@ -33,8 +33,8 @@
 // vtkPolyDataWriter vtkPointDataToCellData
 
 
-#ifndef __vtkCGMWriter_h
-#define __vtkCGMWriter_h
+#ifndef vtkCGMWriter_h
+#define vtkCGMWriter_h
 
 #include "vtkIOGeometryModule.h" // For export macro
 #include "vtkPolyDataWriter.h"
diff --git a/IO/Geometry/vtkChacoReader.h b/IO/Geometry/vtkChacoReader.h
index 7ad004f73e72758aa53024b538ad858fe35173d7..183ca118e3d23b8c1254aa99b8a117c3665d953c 100644
--- a/IO/Geometry/vtkChacoReader.h
+++ b/IO/Geometry/vtkChacoReader.h
@@ -27,8 +27,8 @@
 // Note that the Chaco "edges" become VTK "cells", and the Chaco
 // "vertices" become VTK "points".
 
-#ifndef __vtkChacoReader_h
-#define __vtkChacoReader_h
+#ifndef vtkChacoReader_h
+#define vtkChacoReader_h
 
 #include "vtkIOGeometryModule.h" // For export macro
 #include "vtkUnstructuredGridAlgorithm.h"
diff --git a/IO/Geometry/vtkFLUENTReader.h b/IO/Geometry/vtkFLUENTReader.h
index bce81bdf327c52297f624ef14572d557d19b9a61..8945198a5dbc8ada54bc57e0e9537a0196381744 100644
--- a/IO/Geometry/vtkFLUENTReader.h
+++ b/IO/Geometry/vtkFLUENTReader.h
@@ -29,8 +29,8 @@
 // .SECTION See Also
 // vtkGAMBITReader
 
-#ifndef __vtkFLUENTReader_h
-#define __vtkFLUENTReader_h
+#ifndef vtkFLUENTReader_h
+#define vtkFLUENTReader_h
 
 #include "vtkIOGeometryModule.h" // For export macro
 #include "vtkMultiBlockDataSetAlgorithm.h"
diff --git a/IO/Geometry/vtkFacetWriter.h b/IO/Geometry/vtkFacetWriter.h
index 188db33e242db1729fe5f953e9035e890f39ff64..e5ad5b8f4dba45bac6be533c2fd6d5f44dd62438 100644
--- a/IO/Geometry/vtkFacetWriter.h
+++ b/IO/Geometry/vtkFacetWriter.h
@@ -33,8 +33,8 @@ PURPOSE.  See the above copyright notice for more information.
 // p1c2 p2c2 p3c2 ... pnc2 materialnum partnum
 // ...
 
-#ifndef __vtkFacetWriter_h
-#define __vtkFacetWriter_h
+#ifndef vtkFacetWriter_h
+#define vtkFacetWriter_h
 
 #include "vtkIOGeometryModule.h" // For export macro
 #include "vtkPolyDataAlgorithm.h"
diff --git a/IO/Geometry/vtkGAMBITReader.h b/IO/Geometry/vtkGAMBITReader.h
index 90337bea5a9a8cfe41ed7a22cf99df72a2b8a5d9..2913d4e0fe27d3d2bbafa9e707383f2af1e157b4 100644
--- a/IO/Geometry/vtkGAMBITReader.h
+++ b/IO/Geometry/vtkGAMBITReader.h
@@ -26,8 +26,8 @@
 // .SECTION See Also
 // vtkAVSucdReader
 
-#ifndef __vtkGAMBITReader_h
-#define __vtkGAMBITReader_h
+#ifndef vtkGAMBITReader_h
+#define vtkGAMBITReader_h
 
 #include "vtkIOGeometryModule.h" // For export macro
 #include "vtkUnstructuredGridAlgorithm.h"
diff --git a/IO/Geometry/vtkGaussianCubeReader.h b/IO/Geometry/vtkGaussianCubeReader.h
index 09a35a5e6cfb7f2408438d504e92d7039e40a3c0..6168ec1d0adc91ef6178a8fddb0ff334664baec8 100644
--- a/IO/Geometry/vtkGaussianCubeReader.h
+++ b/IO/Geometry/vtkGaussianCubeReader.h
@@ -21,8 +21,8 @@
 // .SECTION Thanks
 // Dr. Jean M. Favre who developed and contributed this class.
 
-#ifndef __vtkGaussianCubeReader_h
-#define __vtkGaussianCubeReader_h
+#ifndef vtkGaussianCubeReader_h
+#define vtkGaussianCubeReader_h
 
 #include "vtkIOGeometryModule.h" // For export macro
 #include "vtkMoleculeReaderBase.h"
diff --git a/IO/Geometry/vtkIVWriter.h b/IO/Geometry/vtkIVWriter.h
index 7b9e1e6902586e6898e77cfede39b16170389b3b..a91e6cc99005b459e424853bb709062724850672 100644
--- a/IO/Geometry/vtkIVWriter.h
+++ b/IO/Geometry/vtkIVWriter.h
@@ -21,8 +21,8 @@
 // vtkPolyDataWriter
 
 
-#ifndef __vtkIVWriter_h
-#define __vtkIVWriter_h
+#ifndef vtkIVWriter_h
+#define vtkIVWriter_h
 
 #include "vtkIOGeometryModule.h" // For export macro
 #include "vtkWriter.h"
diff --git a/IO/Geometry/vtkMCubesReader.h b/IO/Geometry/vtkMCubesReader.h
index 492e38fd28797c5a4b6be44c269b31e8d3fe15c6..2b1db7da0eef8502a5e6b230368157f69cad75cf 100644
--- a/IO/Geometry/vtkMCubesReader.h
+++ b/IO/Geometry/vtkMCubesReader.h
@@ -44,8 +44,8 @@
 // .SECTION See Also
 // vtkContourFilter vtkMarchingCubes vtkSliceCubes vtkLocator
 
-#ifndef __vtkMCubesReader_h
-#define __vtkMCubesReader_h
+#ifndef vtkMCubesReader_h
+#define vtkMCubesReader_h
 
 #include "vtkIOGeometryModule.h" // For export macro
 #include "vtkPolyDataAlgorithm.h"
diff --git a/IO/Geometry/vtkMCubesWriter.h b/IO/Geometry/vtkMCubesWriter.h
index c445d164d2e3b800fecdde4f0b03f6c7d3769285..f144dafe82d1c2a0b6c8ea22418c24448b8d9fed 100644
--- a/IO/Geometry/vtkMCubesWriter.h
+++ b/IO/Geometry/vtkMCubesWriter.h
@@ -28,8 +28,8 @@
 // .SECTION See Also
 // vtkMarchingCubes vtkSliceCubes vtkMCubesReader
 
-#ifndef __vtkMCubesWriter_h
-#define __vtkMCubesWriter_h
+#ifndef vtkMCubesWriter_h
+#define vtkMCubesWriter_h
 
 #include "vtkIOGeometryModule.h" // For export macro
 #include "vtkWriter.h"
diff --git a/IO/Geometry/vtkMFIXReader.h b/IO/Geometry/vtkMFIXReader.h
index 9c99b6e659970524d3f5bc0d4163b6af8d327cc0..77e6a7fe55de5805cc71f5d328fff22b372d0559 100644
--- a/IO/Geometry/vtkMFIXReader.h
+++ b/IO/Geometry/vtkMFIXReader.h
@@ -29,8 +29,8 @@
 // .SECTION See Also
 // vtkGAMBITReader
 
-#ifndef __vtkMFIXReader_h
-#define __vtkMFIXReader_h
+#ifndef vtkMFIXReader_h
+#define vtkMFIXReader_h
 
 #include "vtkIOGeometryModule.h" // For export macro
 #include "vtkUnstructuredGridAlgorithm.h"
diff --git a/IO/Geometry/vtkMoleculeReaderBase.h b/IO/Geometry/vtkMoleculeReaderBase.h
index 277c3709e0d294e0ac823022a0c267dac60d6185..92ec7056d43a5980e988719a40be43d6649c141f 100644
--- a/IO/Geometry/vtkMoleculeReaderBase.h
+++ b/IO/Geometry/vtkMoleculeReaderBase.h
@@ -20,8 +20,8 @@
 // .SECTION Thanks
 // Dr. Jean M. Favre who developed and contributed this class
 
-#ifndef __vtkMoleculeReaderBase_h
-#define __vtkMoleculeReaderBase_h
+#ifndef vtkMoleculeReaderBase_h
+#define vtkMoleculeReaderBase_h
 
 #include "vtkIOGeometryModule.h" // For export macro
 #include "vtkPolyDataAlgorithm.h"
diff --git a/IO/Geometry/vtkMultiBlockPLOT3DReader.h b/IO/Geometry/vtkMultiBlockPLOT3DReader.h
index 8b1a4a172609b95b692d865339963723ab84ed7d..59020885f3a40d8ccc6ecd7f28c2c9589b5aa508 100644
--- a/IO/Geometry/vtkMultiBlockPLOT3DReader.h
+++ b/IO/Geometry/vtkMultiBlockPLOT3DReader.h
@@ -80,8 +80,8 @@
 // .SECTION See Also
 // vtkMultiBlockDataSet vtkStructuredGrid vtkPlot3DMetaReader
 
-#ifndef __vtkMultiBlockPLOT3DReader_h
-#define __vtkMultiBlockPLOT3DReader_h
+#ifndef vtkMultiBlockPLOT3DReader_h
+#define vtkMultiBlockPLOT3DReader_h
 
 #include "vtkIOGeometryModule.h" // For export macro
 #include "vtkMultiBlockDataSetAlgorithm.h"
diff --git a/IO/Geometry/vtkMultiBlockPLOT3DReaderInternals.h b/IO/Geometry/vtkMultiBlockPLOT3DReaderInternals.h
index 161d4fb5555fb2740b4c0ab158b8beae6a3a75b6..11bfac64c4107652d6a768cd012c7d701805c006 100644
--- a/IO/Geometry/vtkMultiBlockPLOT3DReaderInternals.h
+++ b/IO/Geometry/vtkMultiBlockPLOT3DReaderInternals.h
@@ -12,8 +12,8 @@
      PURPOSE.  See the above copyright notice for more information.
 
 =========================================================================*/
-#ifndef __vtkMultiBlockPLOT3DReaderInternals_h
-#define __vtkMultiBlockPLOT3DReaderInternals_h
+#ifndef vtkMultiBlockPLOT3DReaderInternals_h
+#define vtkMultiBlockPLOT3DReaderInternals_h
 
 #include "vtkByteSwap.h"
 #include "vtkMultiBlockPLOT3DReader.h"
diff --git a/IO/Geometry/vtkOBJReader.h b/IO/Geometry/vtkOBJReader.h
index 8bcbdf27a2e781d60a904ebb8576473bc5b91039..4b51bfffe81fcf44759633828eb8fb5d419c8e4a 100644
--- a/IO/Geometry/vtkOBJReader.h
+++ b/IO/Geometry/vtkOBJReader.h
@@ -19,8 +19,8 @@
 // .SECTION See Also
 // vtkOBJImporter
 
-#ifndef __vtkOBJReader_h
-#define __vtkOBJReader_h
+#ifndef vtkOBJReader_h
+#define vtkOBJReader_h
 
 #include "vtkIOGeometryModule.h" // For export macro
 #include "vtkPolyDataAlgorithm.h"
diff --git a/IO/Geometry/vtkOpenFOAMReader.h b/IO/Geometry/vtkOpenFOAMReader.h
index 6664adac1e7b84062723cd2f7c131dfe74b308e7..37c022a2e4135a0fa772c2fb21ecb277613baad9 100644
--- a/IO/Geometry/vtkOpenFOAMReader.h
+++ b/IO/Geometry/vtkOpenFOAMReader.h
@@ -35,8 +35,8 @@
 // decomposed cases in conjunction with vtkPOpenFOAMReader, et. al. by
 // Takuya Oshima of Niigata University, Japan (oshima@eng.niigata-u.ac.jp).
 
-#ifndef __vtkOpenFOAMReader_h
-#define __vtkOpenFOAMReader_h
+#ifndef vtkOpenFOAMReader_h
+#define vtkOpenFOAMReader_h
 
 #include "vtkIOGeometryModule.h" // For export macro
 #include "vtkMultiBlockDataSetAlgorithm.h"
diff --git a/IO/Geometry/vtkPDBReader.h b/IO/Geometry/vtkPDBReader.h
index fd3f0d5f40be21ecfc60e7c2a3d90c982447bdca..58b32fdd2b70ce60f6804e07345f4028bb8d73aa 100644
--- a/IO/Geometry/vtkPDBReader.h
+++ b/IO/Geometry/vtkPDBReader.h
@@ -20,8 +20,8 @@
 // .SECTION Thanks
 // Dr. Jean M. Favre who developed and contributed this class
 
-#ifndef __vtkPDBReader_h
-#define __vtkPDBReader_h
+#ifndef vtkPDBReader_h
+#define vtkPDBReader_h
 
 #include "vtkIOGeometryModule.h" // For export macro
 #include "vtkMoleculeReaderBase.h"
diff --git a/IO/Geometry/vtkParticleReader.h b/IO/Geometry/vtkParticleReader.h
index f504412e4f881a558a6a7b8b2f2c0d79499a343f..a3a9c25a46d36b2a8a5c28d492b9bb38aa541cfa 100644
--- a/IO/Geometry/vtkParticleReader.h
+++ b/IO/Geometry/vtkParticleReader.h
@@ -28,8 +28,8 @@
 //  pieces is supported.
 //
 
-#ifndef __vtkParticleReader_h
-#define __vtkParticleReader_h
+#ifndef vtkParticleReader_h
+#define vtkParticleReader_h
 
 #include "vtkIOGeometryModule.h" // For export macro
 #include "vtkPolyDataAlgorithm.h"
diff --git a/IO/Geometry/vtkPlot3DMetaReader.h b/IO/Geometry/vtkPlot3DMetaReader.h
index 0b47db03101c24ccb8ed4fd2289b85cdd50571d6..08a578eb2298df3fe2cff2da1bf417b601acf91f 100644
--- a/IO/Geometry/vtkPlot3DMetaReader.h
+++ b/IO/Geometry/vtkPlot3DMetaReader.h
@@ -70,8 +70,8 @@
 // .SECTION See Also
 // vtkMultiBlockPLOT3DReader
 
-#ifndef __vtkPlot3DMetaReader_h
-#define __vtkPlot3DMetaReader_h
+#ifndef vtkPlot3DMetaReader_h
+#define vtkPlot3DMetaReader_h
 
 #include "vtkIOGeometryModule.h" // For export macro
 #include "vtkMultiBlockDataSetAlgorithm.h"
diff --git a/IO/Geometry/vtkProStarReader.h b/IO/Geometry/vtkProStarReader.h
index 84755667a0ca4ac1108ffe1687fa8f1169e0d5f1..19a8a619b20b5bdc06068024fb36b970d960b91d 100644
--- a/IO/Geometry/vtkProStarReader.h
+++ b/IO/Geometry/vtkProStarReader.h
@@ -21,8 +21,8 @@
 // Reader written by Mark Olesen
 //
 
-#ifndef __vtkProStarReader_h
-#define __vtkProStarReader_h
+#ifndef vtkProStarReader_h
+#define vtkProStarReader_h
 
 #include "vtkIOGeometryModule.h" // For export macro
 #include "vtkUnstructuredGridAlgorithm.h"
diff --git a/IO/Geometry/vtkSTLReader.h b/IO/Geometry/vtkSTLReader.h
index 9ff6a2232484aebd9441c5b6fdbde9ec21a6369d..64f43977868cd0132b76218c028d5787c17c550b 100644
--- a/IO/Geometry/vtkSTLReader.h
+++ b/IO/Geometry/vtkSTLReader.h
@@ -29,8 +29,8 @@
 // Binary files written on one system may not be readable on other systems.
 // vtkSTLWriter uses VAX or PC byte ordering and swaps bytes on other systems.
 
-#ifndef __vtkSTLReader_h
-#define __vtkSTLReader_h
+#ifndef vtkSTLReader_h
+#define vtkSTLReader_h
 
 #include "vtkIOGeometryModule.h" // For export macro
 #include "vtkPolyDataAlgorithm.h"
diff --git a/IO/Geometry/vtkSTLWriter.h b/IO/Geometry/vtkSTLWriter.h
index 1e7b01e7e7e0698cd016ada59368f01b487314a8..8ce3c70799b8357339959aff2367053ab9cb7acf 100644
--- a/IO/Geometry/vtkSTLWriter.h
+++ b/IO/Geometry/vtkSTLWriter.h
@@ -23,8 +23,8 @@
 // Binary files written on one system may not be readable on other systems.
 // vtkSTLWriter uses VAX or PC byte ordering and swaps bytes on other systems.
 
-#ifndef __vtkSTLWriter_h
-#define __vtkSTLWriter_h
+#ifndef vtkSTLWriter_h
+#define vtkSTLWriter_h
 
 #include "vtkIOGeometryModule.h" // For export macro
 #include "vtkWriter.h"
diff --git a/IO/Geometry/vtkTecplotReader.h b/IO/Geometry/vtkTecplotReader.h
index 5a6cc0b91af424dbc1826e1d2ab4ef33951baef3..06f898500b6834bb24cc6c06b1c46419121d773a 100644
--- a/IO/Geometry/vtkTecplotReader.h
+++ b/IO/Geometry/vtkTecplotReader.h
@@ -70,8 +70,8 @@
 //  vtkPoints vtkStructuredGrid vtkUnstructuredGrid vtkPointData vtkCellData
 //  vtkDataSet vtkMultiBlockDataSet
 
-#ifndef __vtkTecplotReader_h
-#define __vtkTecplotReader_h
+#ifndef vtkTecplotReader_h
+#define vtkTecplotReader_h
 
 #include "vtkIOGeometryModule.h" // For export macro
 #include "vtkMultiBlockDataSetAlgorithm.h"
diff --git a/IO/Geometry/vtkUGFacetReader.h b/IO/Geometry/vtkUGFacetReader.h
index 69244ec7af96cf25b1023a3d8dccf8bc699cd229..292812cfb73eb4a443e399169093fc9b6c26afad 100644
--- a/IO/Geometry/vtkUGFacetReader.h
+++ b/IO/Geometry/vtkUGFacetReader.h
@@ -18,8 +18,8 @@
 // Unigraphics is a solid modeling system; facet files are the polygonal
 // plot files it uses to create 3D plots.
 
-#ifndef __vtkUGFacetReader_h
-#define __vtkUGFacetReader_h
+#ifndef vtkUGFacetReader_h
+#define vtkUGFacetReader_h
 
 #include "vtkIOGeometryModule.h" // For export macro
 #include "vtkPolyDataAlgorithm.h"
diff --git a/IO/Geometry/vtkWindBladeReader.h b/IO/Geometry/vtkWindBladeReader.h
index 044c676bd84a02a4d61afb50190981038557619c..28047c45a46cbfaeac4548b693728badf32257e5 100644
--- a/IO/Geometry/vtkWindBladeReader.h
+++ b/IO/Geometry/vtkWindBladeReader.h
@@ -24,8 +24,8 @@
 // with irregular spacing on the Z dimension.  Only the first and
 // second output ports have time dependent data.
 
-#ifndef __vtkWindBladeReader_h
-#define __vtkWindBladeReader_h
+#ifndef vtkWindBladeReader_h
+#define vtkWindBladeReader_h
 
 #include "vtkIOGeometryModule.h" // For export macro
 #include "vtkStructuredGridAlgorithm.h"
diff --git a/IO/Geometry/vtkXYZMolReader.h b/IO/Geometry/vtkXYZMolReader.h
index 091330d44f8a87b5ebcc44488731bfebcbc1c452..e96008f0299216a82b251cee83be5ee1e47261b9 100644
--- a/IO/Geometry/vtkXYZMolReader.h
+++ b/IO/Geometry/vtkXYZMolReader.h
@@ -20,8 +20,8 @@
 // .SECTION Thanks
 // Dr. Jean M. Favre who developed and contributed this class
 
-#ifndef __vtkXYZMolReader_h
-#define __vtkXYZMolReader_h
+#ifndef vtkXYZMolReader_h
+#define vtkXYZMolReader_h
 
 #include "vtkIOGeometryModule.h" // For export macro
 #include "vtkMoleculeReaderBase.h"
diff --git a/IO/Image/vtkBMPReader.h b/IO/Image/vtkBMPReader.h
index 3db4402f678871776fe0d134569ba8c32d550b79..94a557ab1b7611a96d446739e63b166d6bc377c0 100644
--- a/IO/Image/vtkBMPReader.h
+++ b/IO/Image/vtkBMPReader.h
@@ -35,8 +35,8 @@
 // .SECTION See Also
 // vtkBMPWriter
 
-#ifndef __vtkBMPReader_h
-#define __vtkBMPReader_h
+#ifndef vtkBMPReader_h
+#define vtkBMPReader_h
 
 #include "vtkIOImageModule.h" // For export macro
 #include "vtkImageReader.h"
diff --git a/IO/Image/vtkBMPWriter.h b/IO/Image/vtkBMPWriter.h
index f5f8acd1f8e024c48b5bde6241dda659d96b0a8d..fc3c21c59374c0b38232775d92added70402c693 100644
--- a/IO/Image/vtkBMPWriter.h
+++ b/IO/Image/vtkBMPWriter.h
@@ -20,8 +20,8 @@
 // .SECTION See Also
 // vtkBMPReader
 
-#ifndef __vtkBMPWriter_h
-#define __vtkBMPWriter_h
+#ifndef vtkBMPWriter_h
+#define vtkBMPWriter_h
 
 #include "vtkIOImageModule.h" // For export macro
 #include "vtkImageWriter.h"
diff --git a/IO/Image/vtkDEMReader.h b/IO/Image/vtkDEMReader.h
index 9f0a629ba24df701f8f032eed01af75f41d2e83f..3734bdbd5cfc133f5c3180e794a2da71621ae99c 100644
--- a/IO/Image/vtkDEMReader.h
+++ b/IO/Image/vtkDEMReader.h
@@ -22,8 +22,8 @@
 // contains a single scalar component that is the elevation in meters.
 // The spacing is also expressed in meters. A number of get methods
 // provide access to fields on the header.
-#ifndef __vtkDEMReader_h
-#define __vtkDEMReader_h
+#ifndef vtkDEMReader_h
+#define vtkDEMReader_h
 
 #include "vtkIOImageModule.h" // For export macro
 #include "vtkImageAlgorithm.h"
diff --git a/IO/Image/vtkDICOMImageReader.h b/IO/Image/vtkDICOMImageReader.h
index dc7ae853efd5afa5cbebb063330c593d3ac80334..864f1364d36e12276b004b3bd21fcdb3b02f469c 100644
--- a/IO/Image/vtkDICOMImageReader.h
+++ b/IO/Image/vtkDICOMImageReader.h
@@ -31,8 +31,8 @@
 // .SECTION See Also
 // vtkBMPReader vtkPNMReader vtkTIFFReader
 
-#ifndef __vtkDICOMImageReader_h
-#define __vtkDICOMImageReader_h
+#ifndef vtkDICOMImageReader_h
+#define vtkDICOMImageReader_h
 
 #include "vtkIOImageModule.h" // For export macro
 #include "vtkImageReader2.h"
diff --git a/IO/Image/vtkGESignaReader.h b/IO/Image/vtkGESignaReader.h
index c3865cb23a316f448c19f64f1bc4c428c32d0d9d..9d0df5f60404e940c6627d22f9c9d9d70650cca6 100644
--- a/IO/Image/vtkGESignaReader.h
+++ b/IO/Image/vtkGESignaReader.h
@@ -26,8 +26,8 @@
 // .SECTION See Also
 // vtkImageReader2
 
-#ifndef __vtkGESignaReader_h
-#define __vtkGESignaReader_h
+#ifndef vtkGESignaReader_h
+#define vtkGESignaReader_h
 
 #include "vtkIOImageModule.h" // For export macro
 #include "vtkMedicalImageReader2.h"
diff --git a/IO/Image/vtkImageExport.h b/IO/Image/vtkImageExport.h
index 41455d8f23f4f09ec1b724abbc0f657c7beb05d8..e9cdad3775ef19c9e09174793cc3d2aeaef9df1a 100644
--- a/IO/Image/vtkImageExport.h
+++ b/IO/Image/vtkImageExport.h
@@ -26,8 +26,8 @@
 // .SECTION See Also
 // vtkImageImport
 
-#ifndef __vtkImageExport_h
-#define __vtkImageExport_h
+#ifndef vtkImageExport_h
+#define vtkImageExport_h
 
 #include "vtkIOImageModule.h" // For export macro
 #include "vtkImageAlgorithm.h"
diff --git a/IO/Image/vtkImageImport.h b/IO/Image/vtkImageImport.h
index 91c3487bdf9304c725034c984139f5524a66d7fb..467cb4564b7b6ceb856e61b9ebe37e4ab4f816de 100644
--- a/IO/Image/vtkImageImport.h
+++ b/IO/Image/vtkImageImport.h
@@ -26,8 +26,8 @@
 // .SECTION See Also
 // vtkImageExport
 
-#ifndef __vtkImageImport_h
-#define __vtkImageImport_h
+#ifndef vtkImageImport_h
+#define vtkImageImport_h
 
 #include "vtkIOImageModule.h" // For export macro
 #include "vtkImageAlgorithm.h"
diff --git a/IO/Image/vtkImageImportExecutive.h b/IO/Image/vtkImageImportExecutive.h
index f8cd09a75ce315b94c3a83931a609b7a700c235a..e86737a6ee2670891b2c6acb9f3b939f789d3dac 100644
--- a/IO/Image/vtkImageImportExecutive.h
+++ b/IO/Image/vtkImageImportExecutive.h
@@ -16,8 +16,8 @@
 // .SECTION Description
 // vtkImageImportExecutive
 
-#ifndef __vtkImageImportExecutive_h
-#define __vtkImageImportExecutive_h
+#ifndef vtkImageImportExecutive_h
+#define vtkImageImportExecutive_h
 
 #include "vtkIOImageModule.h" // For export macro
 #include "vtkStreamingDemandDrivenPipeline.h"
diff --git a/IO/Image/vtkImageReader.h b/IO/Image/vtkImageReader.h
index d797847a154074e0f0f459af4e4354fc86c6a01f..894bc2b9b50d2cfa23cbb93b149dddb57e297256 100644
--- a/IO/Image/vtkImageReader.h
+++ b/IO/Image/vtkImageReader.h
@@ -21,8 +21,8 @@
 // .SECTION See Also
 // vtkBMPReader vtkPNMReader vtkTIFFReader
 
-#ifndef __vtkImageReader_h
-#define __vtkImageReader_h
+#ifndef vtkImageReader_h
+#define vtkImageReader_h
 
 #include "vtkIOImageModule.h" // For export macro
 #include "vtkImageReader2.h"
diff --git a/IO/Image/vtkImageReader2.h b/IO/Image/vtkImageReader2.h
index 4399f1edc2ee800b3e3e601efa6992b620c5d15b..03ff85c7d4467514ee08667f5d716fee74aa89e0 100644
--- a/IO/Image/vtkImageReader2.h
+++ b/IO/Image/vtkImageReader2.h
@@ -35,8 +35,8 @@
 // .SECTION See Also
 // vtkJPEGReader vtkPNGReader vtkImageReader vtkGESignaReader
 
-#ifndef __vtkImageReader2_h
-#define __vtkImageReader2_h
+#ifndef vtkImageReader2_h
+#define vtkImageReader2_h
 
 #include "vtkIOImageModule.h" // For export macro
 #include "vtkImageAlgorithm.h"
diff --git a/IO/Image/vtkImageReader2Collection.h b/IO/Image/vtkImageReader2Collection.h
index c0e4b4d42630b27e12f9dad423fa1fbe161e0b66..15ba13d2699e8f7632628d23fc07d7f26e8a931f 100644
--- a/IO/Image/vtkImageReader2Collection.h
+++ b/IO/Image/vtkImageReader2Collection.h
@@ -19,8 +19,8 @@
 // .SECTION See Also
 // vtkCollection vtkPlaneCollection
 
-#ifndef __vtkImageReader2Collection_h
-#define __vtkImageReader2Collection_h
+#ifndef vtkImageReader2Collection_h
+#define vtkImageReader2Collection_h
 
 #include "vtkIOImageModule.h" // For export macro
 #include "vtkCollection.h"
diff --git a/IO/Image/vtkImageReader2Factory.h b/IO/Image/vtkImageReader2Factory.h
index 0a947095646de18d8785f4a9e23f097fe03b1c35..e2cbf2cd522ccaba8afd52e77e5f1f12eebe1d65 100644
--- a/IO/Image/vtkImageReader2Factory.h
+++ b/IO/Image/vtkImageReader2Factory.h
@@ -29,8 +29,8 @@
 // .SECTION See Also
 // vtkImageReader2
 
-#ifndef __vtkImageReader2Factory_h
-#define __vtkImageReader2Factory_h
+#ifndef vtkImageReader2Factory_h
+#define vtkImageReader2Factory_h
 
 
 #include "vtkIOImageModule.h" // For export macro
diff --git a/IO/Image/vtkImageWriter.h b/IO/Image/vtkImageWriter.h
index aa1dda838e51912621c1c027157423d8e1811f4d..e3083481073f31886858b1b94b0f02793046e26c 100644
--- a/IO/Image/vtkImageWriter.h
+++ b/IO/Image/vtkImageWriter.h
@@ -20,8 +20,8 @@
 // This class is used as the superclass of most image writing classes
 // such as vtkBMPWriter etc. It supports streaming.
 
-#ifndef __vtkImageWriter_h
-#define __vtkImageWriter_h
+#ifndef vtkImageWriter_h
+#define vtkImageWriter_h
 
 #include "vtkIOImageModule.h" // For export macro
 #include "vtkImageAlgorithm.h"
diff --git a/IO/Image/vtkJPEGReader.h b/IO/Image/vtkJPEGReader.h
index 345765c0a5dad7979f2c1ff0447c67f645c484f7..37b147155cd09638c73dac764c4627d4d00fe938 100644
--- a/IO/Image/vtkJPEGReader.h
+++ b/IO/Image/vtkJPEGReader.h
@@ -22,8 +22,8 @@
 // .SECTION See Also
 // vtkJPEGWriter
 
-#ifndef __vtkJPEGReader_h
-#define __vtkJPEGReader_h
+#ifndef vtkJPEGReader_h
+#define vtkJPEGReader_h
 
 #include "vtkIOImageModule.h" // For export macro
 #include "vtkImageReader2.h"
diff --git a/IO/Image/vtkJPEGWriter.h b/IO/Image/vtkJPEGWriter.h
index bc86bb513e8250c8713e29f48a4c8ce28fcd21db..141993275e64ed71a99ed63185642fc6f66096b8 100644
--- a/IO/Image/vtkJPEGWriter.h
+++ b/IO/Image/vtkJPEGWriter.h
@@ -21,8 +21,8 @@
 // .SECTION See Also
 // vtkJPEGReader
 
-#ifndef __vtkJPEGWriter_h
-#define __vtkJPEGWriter_h
+#ifndef vtkJPEGWriter_h
+#define vtkJPEGWriter_h
 
 #include "vtkIOImageModule.h" // For export macro
 #include "vtkImageWriter.h"
diff --git a/IO/Image/vtkJSONImageWriter.h b/IO/Image/vtkJSONImageWriter.h
index fe4ecb296ee8731dd529babc3b009e2f4e5039b7..db868a990a98419d5d24b635808e120247a4bcdb 100644
--- a/IO/Image/vtkJSONImageWriter.h
+++ b/IO/Image/vtkJSONImageWriter.h
@@ -17,8 +17,8 @@
 // vtkJSONImageWriter writes a JSON file which will describe the
 // data inside a vtkImageData.
 
-#ifndef __vtkJSONImageWriter_h
-#define __vtkJSONImageWriter_h
+#ifndef vtkJSONImageWriter_h
+#define vtkJSONImageWriter_h
 
 #include "vtkIOImageModule.h" // For export macro
 #include "vtkImageAlgorithm.h"
diff --git a/IO/Image/vtkMedicalImageProperties.h b/IO/Image/vtkMedicalImageProperties.h
index 2f6cc6bfa52b7bcfe21ede9216e368ab04695b36..b7d3b76588a328992634db82910a83053a673177 100644
--- a/IO/Image/vtkMedicalImageProperties.h
+++ b/IO/Image/vtkMedicalImageProperties.h
@@ -21,8 +21,8 @@
 // .SECTION See Also
 // vtkMedicalImageReader2
 
-#ifndef __vtkMedicalImageProperties_h
-#define __vtkMedicalImageProperties_h
+#ifndef vtkMedicalImageProperties_h
+#define vtkMedicalImageProperties_h
 
 #include "vtkIOImageModule.h" // For export macro
 #include "vtkObject.h"
diff --git a/IO/Image/vtkMedicalImageReader2.h b/IO/Image/vtkMedicalImageReader2.h
index 29c225c5fe4312a9698a325389a8f31bb7a10fbb..6f83afa36d4da620fc133eadd3923dd43ec56af3 100644
--- a/IO/Image/vtkMedicalImageReader2.h
+++ b/IO/Image/vtkMedicalImageReader2.h
@@ -20,8 +20,8 @@
 // .SECTION See Also
 // vtkImageReader2 vtkGESignaReader vtkMedicalImageProperties
 
-#ifndef __vtkMedicalImageReader2_h
-#define __vtkMedicalImageReader2_h
+#ifndef vtkMedicalImageReader2_h
+#define vtkMedicalImageReader2_h
 
 #include "vtkIOImageModule.h" // For export macro
 #include "vtkImageReader2.h"
diff --git a/IO/Image/vtkMetaImageReader.h b/IO/Image/vtkMetaImageReader.h
index fb3370c02a9816483c2770a7498365301216384e..ca632ae7dec79a81c1166d230b2df6b11c9f4e3a 100644
--- a/IO/Image/vtkMetaImageReader.h
+++ b/IO/Image/vtkMetaImageReader.h
@@ -56,8 +56,8 @@
 
 // .SECTION See Also
 
-#ifndef __vtkMetaImageReader2_h
-#define __vtkMetaImageReader2_h
+#ifndef vtkMetaImageReader2_h
+#define vtkMetaImageReader2_h
 
 #include "vtkIOImageModule.h" // For export macro
 #include "vtkImageReader2.h"
diff --git a/IO/Image/vtkMetaImageWriter.h b/IO/Image/vtkMetaImageWriter.h
index 72f365c8effd3b205635cde4ea491bb96300bdb6..b38ba9d0c5d5fd85446d0357bb534e754a042b59 100644
--- a/IO/Image/vtkMetaImageWriter.h
+++ b/IO/Image/vtkMetaImageWriter.h
@@ -57,8 +57,8 @@
 // .SECTION See Also
 // vtkImageWriter vtkMetaImageReader
 
-#ifndef __vtkMetaImageWriter_h
-#define __vtkMetaImageWriter_h
+#ifndef vtkMetaImageWriter_h
+#define vtkMetaImageWriter_h
 
 #include "vtkIOImageModule.h" // For export macro
 #include "vtkImageWriter.h"
diff --git a/IO/Image/vtkNIFTIImageHeader.h b/IO/Image/vtkNIFTIImageHeader.h
index c7a7f85d1466bc23f12afabecdc1e61398aae25f..754c994af2d83e106fe64b6b5891729e7570b2a8 100644
--- a/IO/Image/vtkNIFTIImageHeader.h
+++ b/IO/Image/vtkNIFTIImageHeader.h
@@ -30,8 +30,8 @@
 // .SECTION See Also
 // vtkNIFTIImageReader, vtkNIFTIImageWriter
 
-#ifndef __vtkNIFTIImageHeader_h
-#define __vtkNIFTIImageHeader_h
+#ifndef vtkNIFTIImageHeader_h
+#define vtkNIFTIImageHeader_h
 
 #include "vtkIOImageModule.h" // For export macro
 #include "vtkObject.h"
@@ -380,4 +380,4 @@ private:
   void operator=(const vtkNIFTIImageHeader&);  // Not implemented.
 };
 
-#endif // __vtkNIFTIImageHeader_h
+#endif // vtkNIFTIImageHeader_h
diff --git a/IO/Image/vtkNIFTIImageReader.h b/IO/Image/vtkNIFTIImageReader.h
index 9aaede4bfa4c2ef5495ca5fd1a64accb5188804b..7d42f1cc555f9a6d76a1dffa929725548e58c889 100644
--- a/IO/Image/vtkNIFTIImageReader.h
+++ b/IO/Image/vtkNIFTIImageReader.h
@@ -29,8 +29,8 @@
 // .SECTION See Also
 // vtkNIFTIImageWriter, vtkNIFTIImageHeader
 
-#ifndef __vtkNIFTIImageReader_h
-#define __vtkNIFTIImageReader_h
+#ifndef vtkNIFTIImageReader_h
+#define vtkNIFTIImageReader_h
 
 #include "vtkIOImageModule.h" // For export macro
 #include "vtkImageReader2.h"
@@ -209,4 +209,4 @@ private:
   void operator=(const vtkNIFTIImageReader&);  // Not implemented.
 };
 
-#endif // __vtkNIFTIImageReader_h
+#endif // vtkNIFTIImageReader_h
diff --git a/IO/Image/vtkNIFTIImageWriter.h b/IO/Image/vtkNIFTIImageWriter.h
index 9729d9f424abd8a616ceb51630e689709d79cf38..cb7fe854b1bb5aa80f743b1add460028786877ba 100644
--- a/IO/Image/vtkNIFTIImageWriter.h
+++ b/IO/Image/vtkNIFTIImageWriter.h
@@ -27,8 +27,8 @@
 // .SECTION See Also
 // vtkNIFTIImageReader
 
-#ifndef __vtkNIFTIImageWriter_h
-#define __vtkNIFTIImageWriter_h
+#ifndef vtkNIFTIImageWriter_h
+#define vtkNIFTIImageWriter_h
 
 #include "vtkIOImageModule.h" // For export macro
 #include "vtkImageWriter.h"
@@ -174,4 +174,4 @@ private:
   void operator=(const vtkNIFTIImageWriter&);  // Not implemented.
 };
 
-#endif // __vtkNIFTIImageWriter_h
+#endif // vtkNIFTIImageWriter_h
diff --git a/IO/Image/vtkNrrdReader.h b/IO/Image/vtkNrrdReader.h
index 2590cc8165620f79091df4b354646c20b6344111..4d37a0082c29d0a3693ffd835eac01a7cadd55bb 100644
--- a/IO/Image/vtkNrrdReader.h
+++ b/IO/Image/vtkNrrdReader.h
@@ -30,8 +30,8 @@
 // supports reading one file that is detached.
 //
 
-#ifndef __vtkNrrdReader_h
-#define __vtkNrrdReader_h
+#ifndef vtkNrrdReader_h
+#define vtkNrrdReader_h
 
 #include "vtkIOImageModule.h" // For export macro
 #include "vtkImageReader.h"
@@ -79,4 +79,4 @@ private:
   void operator=(const vtkNrrdReader &);        // Not implemented.
 };
 
-#endif //__vtkNrrdReader_h
+#endif //vtkNrrdReader_h
diff --git a/IO/Image/vtkPNGReader.h b/IO/Image/vtkPNGReader.h
index c3c673c2d8dce2684037ce50e1dfa80f0789a2a2..85d94254d7f943c96ea6c3fe197be74fa24eaace 100644
--- a/IO/Image/vtkPNGReader.h
+++ b/IO/Image/vtkPNGReader.h
@@ -20,8 +20,8 @@
 // .SECTION See Also
 // vtkPNGWriter
 
-#ifndef __vtkPNGReader_h
-#define __vtkPNGReader_h
+#ifndef vtkPNGReader_h
+#define vtkPNGReader_h
 
 #include "vtkIOImageModule.h" // For export macro
 #include "vtkImageReader2.h"
diff --git a/IO/Image/vtkPNGWriter.h b/IO/Image/vtkPNGWriter.h
index 9f9f258a915a2083a8d29614182d207a159ffd46..ab7681514deb81750754a0ad29259461ede1b174 100644
--- a/IO/Image/vtkPNGWriter.h
+++ b/IO/Image/vtkPNGWriter.h
@@ -20,8 +20,8 @@
 // .SECTION See Also
 // vtkPNGReader
 
-#ifndef __vtkPNGWriter_h
-#define __vtkPNGWriter_h
+#ifndef vtkPNGWriter_h
+#define vtkPNGWriter_h
 
 #include "vtkIOImageModule.h" // For export macro
 #include "vtkImageWriter.h"
diff --git a/IO/Image/vtkPNMReader.h b/IO/Image/vtkPNMReader.h
index 86ad8c4a96280f77ecd44844e1da6c1059e84f72..e2df5e3bd2585b5e36f980c586bc28f54170882c 100644
--- a/IO/Image/vtkPNMReader.h
+++ b/IO/Image/vtkPNMReader.h
@@ -30,8 +30,8 @@
 // files to read.
 
 
-#ifndef __vtkPNMReader_h
-#define __vtkPNMReader_h
+#ifndef vtkPNMReader_h
+#define vtkPNMReader_h
 
 #include "vtkIOImageModule.h" // For export macro
 #include "vtkImageReader.h"
diff --git a/IO/Image/vtkPNMWriter.h b/IO/Image/vtkPNMWriter.h
index b8f0463bf26f9d6f3c5e247201649177aa70ffc1..4f0fdaeaadcc3d9d16541b741e75b6fd00d3d59a 100644
--- a/IO/Image/vtkPNMWriter.h
+++ b/IO/Image/vtkPNMWriter.h
@@ -18,8 +18,8 @@
 // of the file is unsigned char regardless of the input type.
 
 
-#ifndef __vtkPNMWriter_h
-#define __vtkPNMWriter_h
+#ifndef vtkPNMWriter_h
+#define vtkPNMWriter_h
 
 #include "vtkIOImageModule.h" // For export macro
 #include "vtkImageWriter.h"
diff --git a/IO/Image/vtkPostScriptWriter.h b/IO/Image/vtkPostScriptWriter.h
index 8760449552886f099528ba448a38bc5b3b10e6f4..734fd7b4dee6324deccfb885ff57485ce9b196b3 100644
--- a/IO/Image/vtkPostScriptWriter.h
+++ b/IO/Image/vtkPostScriptWriter.h
@@ -20,8 +20,8 @@
 // pnmtops.c. Right now there aren't any real options.
 
 
-#ifndef __vtkPostScriptWriter_h
-#define __vtkPostScriptWriter_h
+#ifndef vtkPostScriptWriter_h
+#define vtkPostScriptWriter_h
 
 #include "vtkIOImageModule.h" // For export macro
 #include "vtkImageWriter.h"
diff --git a/IO/Image/vtkSLCReader.h b/IO/Image/vtkSLCReader.h
index e98f58b39245bcf457f33d6569fb9375322e30d8..7d483025979da62cbacadfdc400c35599bf16ad3 100644
--- a/IO/Image/vtkSLCReader.h
+++ b/IO/Image/vtkSLCReader.h
@@ -19,8 +19,8 @@
 // The size of the volume and the data spacing is set from the SLC file
 // header.
 
-#ifndef __vtkSLCReader_h
-#define __vtkSLCReader_h
+#ifndef vtkSLCReader_h
+#define vtkSLCReader_h
 
 #include "vtkIOImageModule.h" // For export macro
 #include "vtkImageReader2.h"
diff --git a/IO/Image/vtkTIFFReader.h b/IO/Image/vtkTIFFReader.h
index f08841800405d004e51809b03eefc41731f90fc0..e12cf064b1828c2b30de8fe7cf0222e297d18bac 100644
--- a/IO/Image/vtkTIFFReader.h
+++ b/IO/Image/vtkTIFFReader.h
@@ -20,8 +20,8 @@
 // .SECTION See Also
 // vtkTIFFWriter
 
-#ifndef __vtkTIFFReader_h
-#define __vtkTIFFReader_h
+#ifndef vtkTIFFReader_h
+#define vtkTIFFReader_h
 
 #include "vtkImageReader2.h"
 
diff --git a/IO/Image/vtkTIFFWriter.h b/IO/Image/vtkTIFFWriter.h
index 5c95b32eeafe0449d7233339e01e02f54aa93100..35d44e950e50cc849470daf1b540df8b320eb394 100644
--- a/IO/Image/vtkTIFFWriter.h
+++ b/IO/Image/vtkTIFFWriter.h
@@ -21,8 +21,8 @@
 // expires. However, the mechanism for supporting this compression is available
 // for those with a valid license or to whom the patent does not apply.)
 
-#ifndef __vtkTIFFWriter_h
-#define __vtkTIFFWriter_h
+#ifndef vtkTIFFWriter_h
+#define vtkTIFFWriter_h
 
 #include "vtkIOImageModule.h" // For export macro
 #include "vtkImageWriter.h"
diff --git a/IO/Image/vtkVolume16Reader.h b/IO/Image/vtkVolume16Reader.h
index be07cac29b54ee56061cc62c573878f500ba7090..c2a6fd488aea8c747fdb6ebdf2d3f6ebf526ae09 100644
--- a/IO/Image/vtkVolume16Reader.h
+++ b/IO/Image/vtkVolume16Reader.h
@@ -42,8 +42,8 @@
 // .SECTION See Also
 // vtkSliceCubes vtkMarchingCubes vtkImageReader
 
-#ifndef __vtkVolume16Reader_h
-#define __vtkVolume16Reader_h
+#ifndef vtkVolume16Reader_h
+#define vtkVolume16Reader_h
 
 #include "vtkIOImageModule.h" // For export macro
 #include "vtkVolumeReader.h"
diff --git a/IO/Image/vtkVolumeReader.h b/IO/Image/vtkVolumeReader.h
index 312dcb3aa7b9054098d1d99f33c9592bc2caceb3..4d58c0198fe7aaaa445223a5c37e2a12801b54cb 100644
--- a/IO/Image/vtkVolumeReader.h
+++ b/IO/Image/vtkVolumeReader.h
@@ -39,8 +39,8 @@
 // vtkSliceCubes vtkMarchingCubes vtkPNMReader vtkVolume16Reader
 // vtkImageReader
 
-#ifndef __vtkVolumeReader_h
-#define __vtkVolumeReader_h
+#ifndef vtkVolumeReader_h
+#define vtkVolumeReader_h
 
 #include "vtkIOImageModule.h" // For export macro
 #include "vtkImageAlgorithm.h"
diff --git a/IO/Import/vtk3DSImporter.h b/IO/Import/vtk3DSImporter.h
index 6b380595e0c440bc7341808e5c68cae8ac58eace..bf8631141daa9f51c58772500c6af0b9f64592c9 100644
--- a/IO/Import/vtk3DSImporter.h
+++ b/IO/Import/vtk3DSImporter.h
@@ -20,8 +20,8 @@
 // vtkImporter
 
 
-#ifndef __vtk3DSImporter_h
-#define __vtk3DSImporter_h
+#ifndef vtk3DSImporter_h
+#define vtk3DSImporter_h
 
 #include "vtkIOImportModule.h" // For export macro
 #include "vtkImporter.h"
diff --git a/IO/Import/vtkImporter.h b/IO/Import/vtkImporter.h
index f7485dc21d3191ad92d501290c154f1ed3629a2f..d3b3a6eb34f5f7570b086857653d667b285ec6a2 100644
--- a/IO/Import/vtkImporter.h
+++ b/IO/Import/vtkImporter.h
@@ -39,8 +39,8 @@
 // .SECTION See Also
 // vtk3DSImporter vtkExporter
 
-#ifndef __vtkImporter_h
-#define __vtkImporter_h
+#ifndef vtkImporter_h
+#define vtkImporter_h
 
 #include "vtkIOImportModule.h" // For export macro
 #include "vtkObject.h"
diff --git a/IO/Import/vtkVRMLImporter.h b/IO/Import/vtkVRMLImporter.h
index 4044c8838203982528609a0d4650de101e4ecba9..3c1efa7ed8b3d307654c504c1c8c938142d3926b 100644
--- a/IO/Import/vtkVRMLImporter.h
+++ b/IO/Import/vtkVRMLImporter.h
@@ -65,8 +65,8 @@
 
 =======================================================================*/
 
-#ifndef __vtkVRMLImporter_h
-#define __vtkVRMLImporter_h
+#ifndef vtkVRMLImporter_h
+#define vtkVRMLImporter_h
 
 #include "vtkIOImportModule.h" // For export macro
 #include "vtkImporter.h"
diff --git a/IO/Import/vtkVRMLImporter_Yacc.h b/IO/Import/vtkVRMLImporter_Yacc.h
index ed610b6d3517b8b3847bcb3fa963620610cdf366..f227d7d98660b802aa4ccb314526c6b1df18cca9 100644
--- a/IO/Import/vtkVRMLImporter_Yacc.h
+++ b/IO/Import/vtkVRMLImporter_Yacc.h
@@ -15,8 +15,8 @@
 // .NAME vtkVRMLImporter_Yacc.h
 //
 
-#ifndef __vtkVRMLImporter_Yacc_h
-#define __vtkVRMLImporter_Yacc_h
+#ifndef vtkVRMLImporter_Yacc_h
+#define vtkVRMLImporter_Yacc_h
 
 
 #include "vtkFloatArray.h"
diff --git a/IO/Infovis/vtkBiomTableReader.h b/IO/Infovis/vtkBiomTableReader.h
index 814b38970707ded1ee6176e8dbdc45522d0b4829..df7b9887906142a056cc3e09eaafa2005582f9c6 100644
--- a/IO/Infovis/vtkBiomTableReader.h
+++ b/IO/Infovis/vtkBiomTableReader.h
@@ -19,8 +19,8 @@
 // .SECTION See Also
 // vtkTable vtkTableReader vtkDataReader
 
-#ifndef __vtkBiomTableReader_h
-#define __vtkBiomTableReader_h
+#ifndef vtkBiomTableReader_h
+#define vtkBiomTableReader_h
 
 #include "vtkIOInfovisModule.h" // For export macro
 #include "vtkTableReader.h"
diff --git a/IO/Infovis/vtkDIMACSGraphWriter.h b/IO/Infovis/vtkDIMACSGraphWriter.h
index 5b7a3d265b45607ee223aa0654239fd2ca9e812f..73038e5368ad637b4f1415a8ce975aab264a2ebe 100644
--- a/IO/Infovis/vtkDIMACSGraphWriter.h
+++ b/IO/Infovis/vtkDIMACSGraphWriter.h
@@ -42,8 +42,8 @@
 //
 
 
-#ifndef __vtkDIMACSGraphWriter_h
-#define __vtkDIMACSGraphWriter_h
+#ifndef vtkDIMACSGraphWriter_h
+#define vtkDIMACSGraphWriter_h
 
 #include "vtkIOInfovisModule.h" // For export macro
 #include "vtkDataWriter.h"
diff --git a/IO/Infovis/vtkDelimitedTextReader.h b/IO/Infovis/vtkDelimitedTextReader.h
index ed4a22ebb656107305399282fc5f9108f64f2dcc..5c702c2f6dfee15de0ffad42f415f78bff08e01a 100644
--- a/IO/Infovis/vtkDelimitedTextReader.h
+++ b/IO/Infovis/vtkDelimitedTextReader.h
@@ -59,8 +59,8 @@
 // any other line in the file.
 
 
-#ifndef __vtkDelimitedTextReader_h
-#define __vtkDelimitedTextReader_h
+#ifndef vtkDelimitedTextReader_h
+#define vtkDelimitedTextReader_h
 
 #include "vtkIOInfovisModule.h" // For export macro
 #include "vtkTableAlgorithm.h"
diff --git a/IO/Infovis/vtkFixedWidthTextReader.h b/IO/Infovis/vtkFixedWidthTextReader.h
index 655dcb9a2a5f7cf33ad300b27d05ccd6c60f4a77..c662f7f89581360e53db6ac05972fe2f75b880ba 100644
--- a/IO/Infovis/vtkFixedWidthTextReader.h
+++ b/IO/Infovis/vtkFixedWidthTextReader.h
@@ -39,8 +39,8 @@
 // implementing this class.
 
 
-#ifndef __vtkFixedWidthTextReader_h
-#define __vtkFixedWidthTextReader_h
+#ifndef vtkFixedWidthTextReader_h
+#define vtkFixedWidthTextReader_h
 
 #include "vtkIOInfovisModule.h" // For export macro
 #include "vtkTableAlgorithm.h"
diff --git a/IO/Infovis/vtkISIReader.h b/IO/Infovis/vtkISIReader.h
index 8cafd376c8d83000249144df852d28fa227ca591..5473463c9d8d0ab4ee486023df6f0798d0f7bd29 100644
--- a/IO/Infovis/vtkISIReader.h
+++ b/IO/Infovis/vtkISIReader.h
@@ -30,8 +30,8 @@
 // the set of table columns determined dynamically from the contents of the
 // file.
 
-#ifndef __vtkISIReader_h
-#define __vtkISIReader_h
+#ifndef vtkISIReader_h
+#define vtkISIReader_h
 
 #include "vtkIOInfovisModule.h" // For export macro
 #include "vtkTableAlgorithm.h"
diff --git a/IO/Infovis/vtkMultiNewickTreeReader.h b/IO/Infovis/vtkMultiNewickTreeReader.h
index f2d3f683c8f653fb6d063ade0e819383f347e18a..e5f7a1a2ebd64718ae42b59b3ad7e8dc42c7ad98 100644
--- a/IO/Infovis/vtkMultiNewickTreeReader.h
+++ b/IO/Infovis/vtkMultiNewickTreeReader.h
@@ -23,8 +23,8 @@
 // .SECTION See Also
 // vtkTree vtkDataReader
 
-#ifndef __vtkMultiNewickTreeReader_h
-#define __vtkMultiNewickTreeReader_h
+#ifndef vtkMultiNewickTreeReader_h
+#define vtkMultiNewickTreeReader_h
 
 #include "vtkIOInfovisModule.h" // For export macro
 #include "vtkDataReader.h"
diff --git a/IO/Infovis/vtkNewickTreeReader.h b/IO/Infovis/vtkNewickTreeReader.h
index 2f8a3522588f83fafbcd6ea213000286a188accd..b3e6b1ef8e926e4cb088f50a91350bad85cd66d7 100644
--- a/IO/Infovis/vtkNewickTreeReader.h
+++ b/IO/Infovis/vtkNewickTreeReader.h
@@ -25,8 +25,8 @@
 // .SECTION See Also
 // vtkTree vtkDataReader
 
-#ifndef __vtkNewickTreeReader_h
-#define __vtkNewickTreeReader_h
+#ifndef vtkNewickTreeReader_h
+#define vtkNewickTreeReader_h
 
 #include "vtkIOInfovisModule.h" // For export macro
 #include "vtkDataReader.h"
diff --git a/IO/Infovis/vtkNewickTreeWriter.h b/IO/Infovis/vtkNewickTreeWriter.h
index a263133a02bbfb0db2ad6bab7a01668c5023454d..709786995cd4f80917d2c8cb25585733064faeeb 100644
--- a/IO/Infovis/vtkNewickTreeWriter.h
+++ b/IO/Infovis/vtkNewickTreeWriter.h
@@ -17,8 +17,8 @@
 // vtkNewickTreeWriter is writes a vtkTree to a Newick formatted file
 // or string.
 
-#ifndef __vtkNewickTreeWriter_h
-#define __vtkNewickTreeWriter_h
+#ifndef vtkNewickTreeWriter_h
+#define vtkNewickTreeWriter_h
 
 #include "vtkIOInfovisModule.h" // For export macro
 #include "vtkDataWriter.h"
diff --git a/IO/Infovis/vtkPhyloXMLTreeReader.h b/IO/Infovis/vtkPhyloXMLTreeReader.h
index 2731a3f0ffe69a122a721a0db2ac72bbc049e283..d9dc45285365d35244013ace3c6cfb121fedbd98 100644
--- a/IO/Infovis/vtkPhyloXMLTreeReader.h
+++ b/IO/Infovis/vtkPhyloXMLTreeReader.h
@@ -29,8 +29,8 @@
 // .SECTION See Also
 // vtkTree vtkXMLReader vtkPhyloXMLTreeWriter
 
-#ifndef __vtkPhyloXMLTreeReader_h
-#define __vtkPhyloXMLTreeReader_h
+#ifndef vtkPhyloXMLTreeReader_h
+#define vtkPhyloXMLTreeReader_h
 
 #include "vtkIOInfovisModule.h" // For export macro
 #include "vtkSmartPointer.h"    // For SP ivar
diff --git a/IO/Infovis/vtkPhyloXMLTreeWriter.h b/IO/Infovis/vtkPhyloXMLTreeWriter.h
index 88ed4fd6dda3f4fdc08b3200d6214b361de29661..c078828e3d3e12d4f8252f329d533969e0ee98ea 100644
--- a/IO/Infovis/vtkPhyloXMLTreeWriter.h
+++ b/IO/Infovis/vtkPhyloXMLTreeWriter.h
@@ -17,8 +17,8 @@
 // vtkPhyloXMLTreeWriter is writes a vtkTree to a PhyloXML formatted file
 // or string.
 
-#ifndef __vtkPhyloXMLTreeWriter_h
-#define __vtkPhyloXMLTreeWriter_h
+#ifndef vtkPhyloXMLTreeWriter_h
+#define vtkPhyloXMLTreeWriter_h
 
 #include "vtkIOInfovisModule.h" // For export macro
 #include "vtkXMLWriter.h"
diff --git a/IO/Infovis/vtkRISReader.h b/IO/Infovis/vtkRISReader.h
index be8432b969f13e6bf92f7672149dd5625eaf850c..24d1ac500359540e131c7b33e19297bab907281f 100644
--- a/IO/Infovis/vtkRISReader.h
+++ b/IO/Infovis/vtkRISReader.h
@@ -32,8 +32,8 @@
 // the set of table columns determined dynamically from the contents of the
 // file.
 
-#ifndef __vtkRISReader_h
-#define __vtkRISReader_h
+#ifndef vtkRISReader_h
+#define vtkRISReader_h
 
 #include "vtkIOInfovisModule.h" // For export macro
 #include "vtkTableAlgorithm.h"
diff --git a/IO/Infovis/vtkXMLTreeReader.h b/IO/Infovis/vtkXMLTreeReader.h
index 893f6e9d7f170e6d67f637d9d41ecc4e0b6c2bd8..e897115990b1be5848205ebe564401e8f25260ca 100644
--- a/IO/Infovis/vtkXMLTreeReader.h
+++ b/IO/Infovis/vtkXMLTreeReader.h
@@ -83,8 +83,8 @@
 // </pre>
 
 
-#ifndef __vtkXMLTreeReader_h
-#define __vtkXMLTreeReader_h
+#ifndef vtkXMLTreeReader_h
+#define vtkXMLTreeReader_h
 
 #include "vtkIOInfovisModule.h" // For export macro
 #include "vtkTreeAlgorithm.h"
diff --git a/IO/LSDyna/vtkLSDynaPart.h b/IO/LSDyna/vtkLSDynaPart.h
index 7f1fe378a0bbfa74148a3cc7b3d3705d9beac375..ceecb1ff5da7691cffadaf4199d924f168d5edd4 100644
--- a/IO/LSDyna/vtkLSDynaPart.h
+++ b/IO/LSDyna/vtkLSDynaPart.h
@@ -12,8 +12,8 @@
      PURPOSE.  See the above copyright notice for more information.
 =========================================================================*/
 
-#ifndef __vtkLSDynaPart_h
-#define __vtkLSDynaPart_h
+#ifndef vtkLSDynaPart_h
+#define vtkLSDynaPart_h
 
 #include "vtkIOLSDynaModule.h" // For export macro
 #include "vtkObject.h"
diff --git a/IO/LSDyna/vtkLSDynaPartCollection.h b/IO/LSDyna/vtkLSDynaPartCollection.h
index 73fc5add08fe7ca54aca628f1ba753415e2daa23..a439cd4255299210ef7cf7e4740dea2d3aa6263c 100644
--- a/IO/LSDyna/vtkLSDynaPartCollection.h
+++ b/IO/LSDyna/vtkLSDynaPartCollection.h
@@ -12,8 +12,8 @@
      PURPOSE.  See the above copyright notice for more information.
 =========================================================================*/
 
-#ifndef __vtkLSDynaPartCollection_h
-#define __vtkLSDynaPartCollection_h
+#ifndef vtkLSDynaPartCollection_h
+#define vtkLSDynaPartCollection_h
 
 #include "vtkIOLSDynaModule.h" // For export macro
 #include "LSDynaMetaData.h" //needed for LSDynaMetaData::LSDYNA_TYPES enum
diff --git a/IO/LSDyna/vtkLSDynaReader.h b/IO/LSDyna/vtkLSDynaReader.h
index b7fa50c6b0b8fb11a6c7c443a3e07549e68f5014..6b3072914bfce4d662928538cd1380eabc52b97b 100644
--- a/IO/LSDyna/vtkLSDynaReader.h
+++ b/IO/LSDyna/vtkLSDynaReader.h
@@ -142,8 +142,8 @@
 // Perhaps a filter could be applied to "fancify" the geometry.
 //
 
-#ifndef __vtkLSDynaReader_h
-#define __vtkLSDynaReader_h
+#ifndef vtkLSDynaReader_h
+#define vtkLSDynaReader_h
 
 #include "vtkIOLSDynaModule.h" // For export macro
 #include "vtkMultiBlockDataSetAlgorithm.h"
@@ -972,4 +972,4 @@ inline int vtkLSDynaReader::GetPartArrayStatus( const char* partName )
   return 0;
 }
 
-#endif // __vtkLSDynaReader_h
+#endif // vtkLSDynaReader_h
diff --git a/IO/LSDyna/vtkLSDynaSummaryParser.h b/IO/LSDyna/vtkLSDynaSummaryParser.h
index 95e9221606f7bc4f8f32e6b978d449dc262db065..0f3c6683e6ccaa54a60a56c603784f2f648fd40e 100644
--- a/IO/LSDyna/vtkLSDynaSummaryParser.h
+++ b/IO/LSDyna/vtkLSDynaSummaryParser.h
@@ -18,8 +18,8 @@
 // .SECTION See Also
 // vtkLSDynaReader
 
-#ifndef __vtkLSDynaSummaryParser_h
-#define __vtkLSDynaSummaryParser_h
+#ifndef vtkLSDynaSummaryParser_h
+#define vtkLSDynaSummaryParser_h
 
 #include "vtkIOLSDynaModule.h" // For export macro
 #include "vtkXMLParser.h"
@@ -59,4 +59,4 @@ private:
   void operator = ( const vtkLSDynaSummaryParser& ); // Not implemented.
 };
 
-#endif //__vtkLSDynaReader_h
+#endif //vtkLSDynaReader_h
diff --git a/IO/Legacy/vtkCompositeDataReader.h b/IO/Legacy/vtkCompositeDataReader.h
index 3d9f5ea23d2a0246f65a0261ec8be2492585fc13..02f4716bd1b722eaa415b97eed956ce560ce0aaf 100644
--- a/IO/Legacy/vtkCompositeDataReader.h
+++ b/IO/Legacy/vtkCompositeDataReader.h
@@ -19,8 +19,8 @@
 // datasets. Saving composite dataset in legacy VTK format is expected to change
 // in future including changes to the file layout.
 
-#ifndef __vtkCompositeDataReader_h
-#define __vtkCompositeDataReader_h
+#ifndef vtkCompositeDataReader_h
+#define vtkCompositeDataReader_h
 
 #include "vtkIOLegacyModule.h" // For export macro
 #include "vtkDataReader.h"
diff --git a/IO/Legacy/vtkCompositeDataWriter.h b/IO/Legacy/vtkCompositeDataWriter.h
index 01385b134f1cfb186b2b0f990584e73551cf05fa..662d6bc95333fa77d5ffeba4b6957199d2f486f6 100644
--- a/IO/Legacy/vtkCompositeDataWriter.h
+++ b/IO/Legacy/vtkCompositeDataWriter.h
@@ -22,8 +22,8 @@
 // datasets. Saving composite dataset in legacy VTK format is expected to change
 // in future including changes to the file layout.
 
-#ifndef __vtkCompositeDataWriter_h
-#define __vtkCompositeDataWriter_h
+#ifndef vtkCompositeDataWriter_h
+#define vtkCompositeDataWriter_h
 
 #include "vtkIOLegacyModule.h" // For export macro
 #include "vtkDataWriter.h"
diff --git a/IO/Legacy/vtkDataObjectReader.h b/IO/Legacy/vtkDataObjectReader.h
index 903eebcfb7a6908fad832e42caca5a93854dfbee..a634fed994afa153a75e615b294a64c4ea9c9152 100644
--- a/IO/Legacy/vtkDataObjectReader.h
+++ b/IO/Legacy/vtkDataObjectReader.h
@@ -25,8 +25,8 @@
 // .SECTION See Also
 // vtkFieldData vtkDataObjectWriter
 
-#ifndef __vtkDataObjectReader_h
-#define __vtkDataObjectReader_h
+#ifndef vtkDataObjectReader_h
+#define vtkDataObjectReader_h
 
 #include "vtkIOLegacyModule.h" // For export macro
 #include "vtkDataReader.h"
diff --git a/IO/Legacy/vtkDataObjectWriter.h b/IO/Legacy/vtkDataObjectWriter.h
index 1390aedd3de1ae815557b333ee1ae09efd19a32e..9e20b188ccd4780d34544ec0f2464880675f6521 100644
--- a/IO/Legacy/vtkDataObjectWriter.h
+++ b/IO/Legacy/vtkDataObjectWriter.h
@@ -24,8 +24,8 @@
 // .SECTION See Also
 // vtkFieldData vtkFieldDataReader
 
-#ifndef __vtkDataObjectWriter_h
-#define __vtkDataObjectWriter_h
+#ifndef vtkDataObjectWriter_h
+#define vtkDataObjectWriter_h
 
 #include "vtkIOLegacyModule.h" // For export macro
 #include "vtkWriter.h"
diff --git a/IO/Legacy/vtkDataReader.h b/IO/Legacy/vtkDataReader.h
index c58b44a27d24d0f399cfecd61af694048ee618bd..02452bd731a8f9bf3c6d8dc88097dbd7ffc6d543 100644
--- a/IO/Legacy/vtkDataReader.h
+++ b/IO/Legacy/vtkDataReader.h
@@ -23,8 +23,8 @@
 // vtkPolyDataReader vtkStructuredPointsReader vtkStructuredGridReader
 // vtkUnstructuredGridReader vtkRectilinearGridReader
 
-#ifndef __vtkDataReader_h
-#define __vtkDataReader_h
+#ifndef vtkDataReader_h
+#define vtkDataReader_h
 
 #include "vtkIOLegacyModule.h" // For export macro
 #include "vtkAlgorithm.h"
diff --git a/IO/Legacy/vtkDataSetReader.h b/IO/Legacy/vtkDataSetReader.h
index d7451404fe616e6fa71b80addc2fcf3a0d519db8..af4b35ab325c5792e902e3f375761b5dceeac8fc 100644
--- a/IO/Legacy/vtkDataSetReader.h
+++ b/IO/Legacy/vtkDataSetReader.h
@@ -28,8 +28,8 @@
 // vtkDataReader vtkPolyDataReader vtkRectilinearGridReader
 // vtkStructuredPointsReader vtkStructuredGridReader vtkUnstructuredGridReader
 
-#ifndef __vtkDataSetReader_h
-#define __vtkDataSetReader_h
+#ifndef vtkDataSetReader_h
+#define vtkDataSetReader_h
 
 #include "vtkIOLegacyModule.h" // For export macro
 #include "vtkDataReader.h"
diff --git a/IO/Legacy/vtkDataSetWriter.h b/IO/Legacy/vtkDataSetWriter.h
index 4bff3aeb36044dc9afcfbe400688b54516cbfd9c..4ad9c91296ab06f7b261dc75321e7080d068548f 100644
--- a/IO/Legacy/vtkDataSetWriter.h
+++ b/IO/Legacy/vtkDataSetWriter.h
@@ -18,8 +18,8 @@
 // data to disk (or into a communications port). The input to this object is
 // a dataset of any type.
 
-#ifndef __vtkDataSetWriter_h
-#define __vtkDataSetWriter_h
+#ifndef vtkDataSetWriter_h
+#define vtkDataSetWriter_h
 
 #include "vtkIOLegacyModule.h" // For export macro
 #include "vtkDataWriter.h"
diff --git a/IO/Legacy/vtkDataWriter.h b/IO/Legacy/vtkDataWriter.h
index 33aa39611ab87f8be2426d1fad389f05863448eb..3126e7a202d693be75c64c9f3c9db412012fb6d7 100644
--- a/IO/Legacy/vtkDataWriter.h
+++ b/IO/Legacy/vtkDataWriter.h
@@ -23,8 +23,8 @@
 // vtkStructuredPointsWriter vtkUnstructuredGridWriter
 // vtkFieldDataWriter vtkRectilinearGridWriter
 
-#ifndef __vtkDataWriter_h
-#define __vtkDataWriter_h
+#ifndef vtkDataWriter_h
+#define vtkDataWriter_h
 
 #include "vtkIOLegacyModule.h" // For export macro
 #include "vtkWriter.h"
diff --git a/IO/Legacy/vtkGenericDataObjectReader.h b/IO/Legacy/vtkGenericDataObjectReader.h
index 9199d5320e751e3d496d9f4443c07993e9b9e7c3..91adbd3fbcb109b167c8a3a7f9b030db8c4c1146 100644
--- a/IO/Legacy/vtkGenericDataObjectReader.h
+++ b/IO/Legacy/vtkGenericDataObjectReader.h
@@ -29,8 +29,8 @@
 // vtkStructuredPointsReader vtkStructuredGridReader vtkTableReader
 // vtkTreeReader vtkUnstructuredGridReader
 
-#ifndef __vtkGenericDataObjectReader_h
-#define __vtkGenericDataObjectReader_h
+#ifndef vtkGenericDataObjectReader_h
+#define vtkGenericDataObjectReader_h
 
 #include "vtkIOLegacyModule.h" // For export macro
 #include "vtkDataReader.h"
diff --git a/IO/Legacy/vtkGenericDataObjectWriter.h b/IO/Legacy/vtkGenericDataObjectWriter.h
index 5a2138d6b303ec9492c570f52c4e795bf3b9b33a..fda4ca100701de03ae8aa784fd704d54d0887dd1 100644
--- a/IO/Legacy/vtkGenericDataObjectWriter.h
+++ b/IO/Legacy/vtkGenericDataObjectWriter.h
@@ -17,8 +17,8 @@
 // vtkGenericDataObjectWriter is a concrete class that writes data objects
 // to disk. The input to this object is any subclass of vtkDataObject.
 
-#ifndef __vtkGenericDataObjectWriter_h
-#define __vtkGenericDataObjectWriter_h
+#ifndef vtkGenericDataObjectWriter_h
+#define vtkGenericDataObjectWriter_h
 
 #include "vtkIOLegacyModule.h" // For export macro
 #include "vtkDataWriter.h"
diff --git a/IO/Legacy/vtkGraphReader.h b/IO/Legacy/vtkGraphReader.h
index 9b83e82290bf44bd85a149972038aeec8e5c9167..dd11c675b02c9400ebc4b9fe88ac019bda3e86ef 100644
--- a/IO/Legacy/vtkGraphReader.h
+++ b/IO/Legacy/vtkGraphReader.h
@@ -25,8 +25,8 @@
 // .SECTION See Also
 // vtkGraph vtkDataReader vtkGraphWriter
 
-#ifndef __vtkGraphReader_h
-#define __vtkGraphReader_h
+#ifndef vtkGraphReader_h
+#define vtkGraphReader_h
 
 #include "vtkIOLegacyModule.h" // For export macro
 #include "vtkDataReader.h"
diff --git a/IO/Legacy/vtkGraphWriter.h b/IO/Legacy/vtkGraphWriter.h
index 2bc8017d39e29467ff4042cde6e405d888f05653..5769dc7673be661100dd84104ae2e460508f696d 100644
--- a/IO/Legacy/vtkGraphWriter.h
+++ b/IO/Legacy/vtkGraphWriter.h
@@ -19,8 +19,8 @@
 // .SECTION Caveats
 // Binary files written on one system may not be readable on other systems.
 
-#ifndef __vtkGraphWriter_h
-#define __vtkGraphWriter_h
+#ifndef vtkGraphWriter_h
+#define vtkGraphWriter_h
 
 #include "vtkIOLegacyModule.h" // For export macro
 #include "vtkDataWriter.h"
diff --git a/IO/Legacy/vtkPixelExtentIO.h b/IO/Legacy/vtkPixelExtentIO.h
index 17b81456f2083fc0cf92ff61ba5cb36e5180ad23..c0d2e1f89746db19f20b6afe96c8c106699cd830 100644
--- a/IO/Legacy/vtkPixelExtentIO.h
+++ b/IO/Legacy/vtkPixelExtentIO.h
@@ -17,8 +17,8 @@
 // A small collection of I/O routines that can write vtkPixelExtent's
 // or collections of them to disk for visualization as unstructured
 // grids.
-#ifndef __vtkPixelExtentIO_h
-#define __vtkPixelExtentIO_h
+#ifndef vtkPixelExtentIO_h
+#define vtkPixelExtentIO_h
 
 #include "vtkIOLegacyModule.h" // for export
 #include "vtkPixelExtent.h" // for pixel extent
diff --git a/IO/Legacy/vtkPolyDataReader.h b/IO/Legacy/vtkPolyDataReader.h
index 0be0b2f1336a574ad23a3f3c9f6e964f09851b99..b3d96e9d66f3b2d7650a9684b0b48625856a4eee 100644
--- a/IO/Legacy/vtkPolyDataReader.h
+++ b/IO/Legacy/vtkPolyDataReader.h
@@ -25,8 +25,8 @@
 // .SECTION See Also
 // vtkPolyData vtkDataReader
 
-#ifndef __vtkPolyDataReader_h
-#define __vtkPolyDataReader_h
+#ifndef vtkPolyDataReader_h
+#define vtkPolyDataReader_h
 
 #include "vtkIOLegacyModule.h" // For export macro
 #include "vtkDataReader.h"
diff --git a/IO/Legacy/vtkPolyDataWriter.h b/IO/Legacy/vtkPolyDataWriter.h
index 7030690980cddabc73213b78df83e7d0136a9cb5..568533b07cb045cb48dacd73db2ebe87acfb081c 100644
--- a/IO/Legacy/vtkPolyDataWriter.h
+++ b/IO/Legacy/vtkPolyDataWriter.h
@@ -19,8 +19,8 @@
 // .SECTION Caveats
 // Binary files written on one system may not be readable on other systems.
 
-#ifndef __vtkPolyDataWriter_h
-#define __vtkPolyDataWriter_h
+#ifndef vtkPolyDataWriter_h
+#define vtkPolyDataWriter_h
 
 #include "vtkIOLegacyModule.h" // For export macro
 #include "vtkDataWriter.h"
diff --git a/IO/Legacy/vtkRectilinearGridReader.h b/IO/Legacy/vtkRectilinearGridReader.h
index 60fe612ef37de71f400578db59b85a9faffd8927..39f64c07ee8b00095a65165af9fdd8ff0c195c0d 100644
--- a/IO/Legacy/vtkRectilinearGridReader.h
+++ b/IO/Legacy/vtkRectilinearGridReader.h
@@ -25,8 +25,8 @@
 // .SECTION See Also
 // vtkRectilinearGrid vtkDataReader
 
-#ifndef __vtkRectilinearGridReader_h
-#define __vtkRectilinearGridReader_h
+#ifndef vtkRectilinearGridReader_h
+#define vtkRectilinearGridReader_h
 
 #include "vtkIOLegacyModule.h" // For export macro
 #include "vtkDataReader.h"
diff --git a/IO/Legacy/vtkRectilinearGridWriter.h b/IO/Legacy/vtkRectilinearGridWriter.h
index 79b6e20750ac9bebc69dcf7f591df421c5bd3be8..4bf4bc28ac213cce152497e3b3767c8910eb72e2 100644
--- a/IO/Legacy/vtkRectilinearGridWriter.h
+++ b/IO/Legacy/vtkRectilinearGridWriter.h
@@ -20,8 +20,8 @@
 // .SECTION Caveats
 // Binary files written on one system may not be readable on other systems.
 
-#ifndef __vtkRectilinearGridWriter_h
-#define __vtkRectilinearGridWriter_h
+#ifndef vtkRectilinearGridWriter_h
+#define vtkRectilinearGridWriter_h
 
 #include "vtkIOLegacyModule.h" // For export macro
 #include "vtkDataWriter.h"
diff --git a/IO/Legacy/vtkSimplePointsReader.h b/IO/Legacy/vtkSimplePointsReader.h
index b827269c8d287f094e01ec52be991cf2b87ed000..31ef9149a1dd113e014674c229669d3763ad511b 100644
--- a/IO/Legacy/vtkSimplePointsReader.h
+++ b/IO/Legacy/vtkSimplePointsReader.h
@@ -21,8 +21,8 @@
 // output.  This reader is meant as an example of how to write a
 // reader in VTK.
 
-#ifndef __vtkSimplePointsReader_h
-#define __vtkSimplePointsReader_h
+#ifndef vtkSimplePointsReader_h
+#define vtkSimplePointsReader_h
 
 #include "vtkIOLegacyModule.h" // For export macro
 #include "vtkPolyDataAlgorithm.h"
diff --git a/IO/Legacy/vtkSimplePointsWriter.h b/IO/Legacy/vtkSimplePointsWriter.h
index 697af6fdfde62472a2814bc3696d96e484e6ad75..1d780a466aaedfa6206f33acd513416b80bba870 100644
--- a/IO/Legacy/vtkSimplePointsWriter.h
+++ b/IO/Legacy/vtkSimplePointsWriter.h
@@ -19,8 +19,8 @@
 // .SECTION See Also
 // vtkSimplePointsReader
 
-#ifndef __vtkSimplePointsWriter_h
-#define __vtkSimplePointsWriter_h
+#ifndef vtkSimplePointsWriter_h
+#define vtkSimplePointsWriter_h
 
 #include "vtkIOLegacyModule.h" // For export macro
 #include "vtkDataSetWriter.h"
diff --git a/IO/Legacy/vtkStructuredGridReader.h b/IO/Legacy/vtkStructuredGridReader.h
index 8747be8641c13d9d07faac537e2c65412f354f65..7de2aa3c4399c7feda25e2d7f0c70830062a0134 100644
--- a/IO/Legacy/vtkStructuredGridReader.h
+++ b/IO/Legacy/vtkStructuredGridReader.h
@@ -25,8 +25,8 @@
 // .SECTION See Also
 // vtkStructuredGrid vtkDataReader
 
-#ifndef __vtkStructuredGridReader_h
-#define __vtkStructuredGridReader_h
+#ifndef vtkStructuredGridReader_h
+#define vtkStructuredGridReader_h
 
 #include "vtkIOLegacyModule.h" // For export macro
 #include "vtkDataReader.h"
diff --git a/IO/Legacy/vtkStructuredGridWriter.h b/IO/Legacy/vtkStructuredGridWriter.h
index 0e383f742ceb5ca373e15644f5b8efaf455f2aaa..b0ea8059721ddbaf69571819c7aef6b8eb249184 100644
--- a/IO/Legacy/vtkStructuredGridWriter.h
+++ b/IO/Legacy/vtkStructuredGridWriter.h
@@ -20,8 +20,8 @@
 // .SECTION Caveats
 // Binary files written on one system may not be readable on other systems.
 
-#ifndef __vtkStructuredGridWriter_h
-#define __vtkStructuredGridWriter_h
+#ifndef vtkStructuredGridWriter_h
+#define vtkStructuredGridWriter_h
 
 #include "vtkIOLegacyModule.h" // For export macro
 #include "vtkDataWriter.h"
diff --git a/IO/Legacy/vtkStructuredPointsReader.h b/IO/Legacy/vtkStructuredPointsReader.h
index f20279205379911fadc6db689e065fca6f0af688..92e63f50a0f3c522490c8e9b9e0df855f5fe02ba 100644
--- a/IO/Legacy/vtkStructuredPointsReader.h
+++ b/IO/Legacy/vtkStructuredPointsReader.h
@@ -25,8 +25,8 @@
 // .SECTION See Also
 // vtkStructuredPoints vtkDataReader
 
-#ifndef __vtkStructuredPointsReader_h
-#define __vtkStructuredPointsReader_h
+#ifndef vtkStructuredPointsReader_h
+#define vtkStructuredPointsReader_h
 
 #include "vtkIOLegacyModule.h" // For export macro
 #include "vtkDataReader.h"
diff --git a/IO/Legacy/vtkStructuredPointsWriter.h b/IO/Legacy/vtkStructuredPointsWriter.h
index 5ab0d34b0f4358ceb6b680cdd82ebdc3cfebe82b..744515e3afd488df2153ed99bf58c2356f6ea95f 100644
--- a/IO/Legacy/vtkStructuredPointsWriter.h
+++ b/IO/Legacy/vtkStructuredPointsWriter.h
@@ -19,8 +19,8 @@
 // .SECTION Caveats
 // Binary files written on one system may not be readable on other systems.
 
-#ifndef __vtkStructuredPointsWriter_h
-#define __vtkStructuredPointsWriter_h
+#ifndef vtkStructuredPointsWriter_h
+#define vtkStructuredPointsWriter_h
 
 #include "vtkIOLegacyModule.h" // For export macro
 #include "vtkDataWriter.h"
diff --git a/IO/Legacy/vtkTableReader.h b/IO/Legacy/vtkTableReader.h
index 060b047dea18fc0f20e60735bd297e714803e0f8..ab005ac1857befdf06a23dfac3c6994be5fe9d76 100644
--- a/IO/Legacy/vtkTableReader.h
+++ b/IO/Legacy/vtkTableReader.h
@@ -25,8 +25,8 @@
 // .SECTION See Also
 // vtkTable vtkDataReader vtkTableWriter
 
-#ifndef __vtkTableReader_h
-#define __vtkTableReader_h
+#ifndef vtkTableReader_h
+#define vtkTableReader_h
 
 #include "vtkIOLegacyModule.h" // For export macro
 #include "vtkDataReader.h"
diff --git a/IO/Legacy/vtkTableWriter.h b/IO/Legacy/vtkTableWriter.h
index 44e017530a41a4b4848980b9b55865751bdac5c3..53fd8192f83a28d7e9b0c0f616eb5f723b77726f 100644
--- a/IO/Legacy/vtkTableWriter.h
+++ b/IO/Legacy/vtkTableWriter.h
@@ -19,8 +19,8 @@
 // .SECTION Caveats
 // Binary files written on one system may not be readable on other systems.
 
-#ifndef __vtkTableWriter_h
-#define __vtkTableWriter_h
+#ifndef vtkTableWriter_h
+#define vtkTableWriter_h
 
 #include "vtkIOLegacyModule.h" // For export macro
 #include "vtkDataWriter.h"
diff --git a/IO/Legacy/vtkTreeReader.h b/IO/Legacy/vtkTreeReader.h
index bd2d367593a1205af977048d68c0e6c68ca0c848..06535eb5cfedff1135e29b19ac66d78edc8e6cb5 100644
--- a/IO/Legacy/vtkTreeReader.h
+++ b/IO/Legacy/vtkTreeReader.h
@@ -25,8 +25,8 @@
 // .SECTION See Also
 // vtkTree vtkDataReader vtkTreeWriter
 
-#ifndef __vtkTreeReader_h
-#define __vtkTreeReader_h
+#ifndef vtkTreeReader_h
+#define vtkTreeReader_h
 
 #include "vtkIOLegacyModule.h" // For export macro
 #include "vtkDataReader.h"
diff --git a/IO/Legacy/vtkTreeWriter.h b/IO/Legacy/vtkTreeWriter.h
index d5a1088d3db665b8b04acd871544d9bdeef7107d..ab3c2bd4f7155cf13ff525f36a15f6202df3c647 100644
--- a/IO/Legacy/vtkTreeWriter.h
+++ b/IO/Legacy/vtkTreeWriter.h
@@ -19,8 +19,8 @@
 // .SECTION Caveats
 // Binary files written on one system may not be readable on other systems.
 
-#ifndef __vtkTreeWriter_h
-#define __vtkTreeWriter_h
+#ifndef vtkTreeWriter_h
+#define vtkTreeWriter_h
 
 #include "vtkIOLegacyModule.h" // For export macro
 #include "vtkDataWriter.h"
diff --git a/IO/Legacy/vtkUnstructuredGridReader.h b/IO/Legacy/vtkUnstructuredGridReader.h
index c5337ca77dbc926553661ddb470580557530a0d3..a666776eaf5b8e4e064c796f872906437ebb0cfa 100644
--- a/IO/Legacy/vtkUnstructuredGridReader.h
+++ b/IO/Legacy/vtkUnstructuredGridReader.h
@@ -25,8 +25,8 @@
 // .SECTION See Also
 // vtkUnstructuredGrid vtkDataReader
 
-#ifndef __vtkUnstructuredGridReader_h
-#define __vtkUnstructuredGridReader_h
+#ifndef vtkUnstructuredGridReader_h
+#define vtkUnstructuredGridReader_h
 
 #include "vtkIOLegacyModule.h" // For export macro
 #include "vtkDataReader.h"
diff --git a/IO/Legacy/vtkUnstructuredGridWriter.h b/IO/Legacy/vtkUnstructuredGridWriter.h
index ea2ccbb22089af627a0b27b62701a91f45c9ab7d..35659ea34144f05ad1897cca3ba4f9cb7812d629 100644
--- a/IO/Legacy/vtkUnstructuredGridWriter.h
+++ b/IO/Legacy/vtkUnstructuredGridWriter.h
@@ -19,8 +19,8 @@
 // .SECTION Caveats
 // Binary files written on one system may not be readable on other systems.
 
-#ifndef __vtkUnstructuredGridWriter_h
-#define __vtkUnstructuredGridWriter_h
+#ifndef vtkUnstructuredGridWriter_h
+#define vtkUnstructuredGridWriter_h
 
 #include "vtkIOLegacyModule.h" // For export macro
 #include "vtkDataWriter.h"
diff --git a/IO/MINC/vtkMINCImageAttributes.h b/IO/MINC/vtkMINCImageAttributes.h
index 0f1f94ea8a4d4b7cf76fc114404289a0b05ee7f5..95b608d10c5f80437c486b48972f82cedb5b7f05 100644
--- a/IO/MINC/vtkMINCImageAttributes.h
+++ b/IO/MINC/vtkMINCImageAttributes.h
@@ -62,8 +62,8 @@ POSSIBILITY OF SUCH DAMAGES.
 // Thanks to David Gobbi for writing this class and Atamai Inc. for
 // contributing it to VTK.
 
-#ifndef __vtkMINCImageAttributes_h
-#define __vtkMINCImageAttributes_h
+#ifndef vtkMINCImageAttributes_h
+#define vtkMINCImageAttributes_h
 
 #include "vtkIOMINCModule.h" // For export macro
 #include "vtkObject.h"
@@ -299,4 +299,4 @@ private:
 
 };
 
-#endif /* __vtkMINCImageAttributes_h */
+#endif /* vtkMINCImageAttributes_h */
diff --git a/IO/MINC/vtkMINCImageReader.h b/IO/MINC/vtkMINCImageReader.h
index 3af0eb8f6bcb2eb6ec9b5587db042d42a555d553..eadc0888a779c775264c8296d6d804a7b0bb7ef9 100644
--- a/IO/MINC/vtkMINCImageReader.h
+++ b/IO/MINC/vtkMINCImageReader.h
@@ -65,8 +65,8 @@ POSSIBILITY OF SUCH DAMAGES.
 // Thanks to David Gobbi for writing this class and Atamai Inc. for
 // contributing it to VTK.
 
-#ifndef __vtkMINCImageReader_h
-#define __vtkMINCImageReader_h
+#ifndef vtkMINCImageReader_h
+#define vtkMINCImageReader_h
 
 #include "vtkIOMINCModule.h" // For export macro
 #include "vtkImageReader2.h"
diff --git a/IO/MINC/vtkMINCImageWriter.h b/IO/MINC/vtkMINCImageWriter.h
index 48e840fd61b4b6dc1436dfe1bd8c3c52e3eb1428..d4ecd08eb7d2ab593832895621d7d4e6c26fe5ee 100644
--- a/IO/MINC/vtkMINCImageWriter.h
+++ b/IO/MINC/vtkMINCImageWriter.h
@@ -62,8 +62,8 @@ POSSIBILITY OF SUCH DAMAGES.
 // Thanks to David Gobbi for writing this class and Atamai Inc. for
 // contributing it to VTK.
 
-#ifndef __vtkMINCImageWriter_h
-#define __vtkMINCImageWriter_h
+#ifndef vtkMINCImageWriter_h
+#define vtkMINCImageWriter_h
 
 #include "vtkIOMINCModule.h" // For export macro
 #include "vtkImageWriter.h"
diff --git a/IO/MINC/vtkMNIObjectReader.h b/IO/MINC/vtkMNIObjectReader.h
index 721e5ea0e71e638d337f69a9c127845ee7bc6bf4..1ca609e6c0e94cee3d20bc877dabbb24b7e5d6b1 100644
--- a/IO/MINC/vtkMNIObjectReader.h
+++ b/IO/MINC/vtkMNIObjectReader.h
@@ -59,8 +59,8 @@ POSSIBILITY OF SUCH DAMAGES.
 // Thanks to David Gobbi for writing this class and Atamai Inc. for
 // contributing it to VTK.
 
-#ifndef __vtkMNIObjectReader_h
-#define __vtkMNIObjectReader_h
+#ifndef vtkMNIObjectReader_h
+#define vtkMNIObjectReader_h
 
 #include "vtkIOMINCModule.h" // For export macro
 #include "vtkPolyDataAlgorithm.h"
diff --git a/IO/MINC/vtkMNIObjectWriter.h b/IO/MINC/vtkMNIObjectWriter.h
index 5592d02b5addad2dca77658a6692436457c9672f..112883f355dfa5df2b6dc0fc2c7e39e5e23b4dea 100644
--- a/IO/MINC/vtkMNIObjectWriter.h
+++ b/IO/MINC/vtkMNIObjectWriter.h
@@ -59,8 +59,8 @@ POSSIBILITY OF SUCH DAMAGES.
 // Thanks to David Gobbi for writing this class and Atamai Inc. for
 // contributing it to VTK.
 
-#ifndef __vtkMNIObjectWriter_h
-#define __vtkMNIObjectWriter_h
+#ifndef vtkMNIObjectWriter_h
+#define vtkMNIObjectWriter_h
 
 #include "vtkIOMINCModule.h" // For export macro
 #include "vtkWriter.h"
diff --git a/IO/MINC/vtkMNITagPointReader.h b/IO/MINC/vtkMNITagPointReader.h
index 20b83bdd6e8a9ba7561d2e1de15cbf516b9852a4..2a8d9bb9a446d0656a3ea5156ef6b0b328c880fb 100644
--- a/IO/MINC/vtkMNITagPointReader.h
+++ b/IO/MINC/vtkMNITagPointReader.h
@@ -59,8 +59,8 @@ POSSIBILITY OF SUCH DAMAGES.
 // .SECTION Thanks
 // Thanks to David Gobbi for contributing this class.
 
-#ifndef __vtkMNITagPointReader_h
-#define __vtkMNITagPointReader_h
+#ifndef vtkMNITagPointReader_h
+#define vtkMNITagPointReader_h
 
 #include "vtkIOMINCModule.h" // For export macro
 #include "vtkPolyDataAlgorithm.h"
diff --git a/IO/MINC/vtkMNITagPointWriter.h b/IO/MINC/vtkMNITagPointWriter.h
index 2f51b475b5bcdff7281dc29933655131b4e1d36d..8443b0dc1c3e2c9687c20789ae247b7a16f9632d 100644
--- a/IO/MINC/vtkMNITagPointWriter.h
+++ b/IO/MINC/vtkMNITagPointWriter.h
@@ -59,8 +59,8 @@ POSSIBILITY OF SUCH DAMAGES.
 // .SECTION Thanks
 // Thanks to David Gobbi for contributing this class to VTK.
 
-#ifndef __vtkMNITagPointWriter_h
-#define __vtkMNITagPointWriter_h
+#ifndef vtkMNITagPointWriter_h
+#define vtkMNITagPointWriter_h
 
 #include "vtkIOMINCModule.h" // For export macro
 #include "vtkWriter.h"
diff --git a/IO/MINC/vtkMNITransformReader.h b/IO/MINC/vtkMNITransformReader.h
index c1a6b4ab27f04b81f396f33127aaffeace3543ad..3e391abb62660b3c28c3b805d16f6438452b75c5 100644
--- a/IO/MINC/vtkMNITransformReader.h
+++ b/IO/MINC/vtkMNITransformReader.h
@@ -58,8 +58,8 @@ POSSIBILITY OF SUCH DAMAGES.
 // Thanks to David Gobbi for writing this class and Atamai Inc. for
 // contributing it to VTK.
 
-#ifndef __vtkMNITransformReader_h
-#define __vtkMNITransformReader_h
+#ifndef vtkMNITransformReader_h
+#define vtkMNITransformReader_h
 
 #include "vtkIOMINCModule.h" // For export macro
 #include "vtkAlgorithm.h"
diff --git a/IO/MINC/vtkMNITransformWriter.h b/IO/MINC/vtkMNITransformWriter.h
index 55f4c3b08114d618a95cbde10a9d4c2cbfb9f1ea..554bca4b51a13559a06817da19dcca0e61face10 100644
--- a/IO/MINC/vtkMNITransformWriter.h
+++ b/IO/MINC/vtkMNITransformWriter.h
@@ -58,8 +58,8 @@ POSSIBILITY OF SUCH DAMAGES.
 // Thanks to David Gobbi for writing this class and Atamai Inc. for
 // contributing it to VTK.
 
-#ifndef __vtkMNITransformWriter_h
-#define __vtkMNITransformWriter_h
+#ifndef vtkMNITransformWriter_h
+#define vtkMNITransformWriter_h
 
 #include "vtkIOMINCModule.h" // For export macro
 #include "vtkAlgorithm.h"
diff --git a/IO/MPIImage/vtkMPIImageReader.h b/IO/MPIImage/vtkMPIImageReader.h
index d11999b8268ef24ebb060df7aad879a7a8c7fcb8..fd40ba92bb733022f06e724cc261c99a0e3cbe4f 100644
--- a/IO/MPIImage/vtkMPIImageReader.h
+++ b/IO/MPIImage/vtkMPIImageReader.h
@@ -43,8 +43,8 @@
 // vtkMultiProcessController, vtkImageReader, vtkImageReader2
 //
 
-#ifndef __vtkMPIImageReader_h
-#define __vtkMPIImageReader_h
+#ifndef vtkMPIImageReader_h
+#define vtkMPIImageReader_h
 
 #include "vtkIOMPIImageModule.h" // For export macro
 #include "vtkImageReader.h"
@@ -119,4 +119,4 @@ private:
   void operator=(const vtkMPIImageReader &);    // Not implemented
 };
 
-#endif //__vtkMPIImageReader_h
+#endif //vtkMPIImageReader_h
diff --git a/IO/MPIImage/vtkPNrrdReader.h b/IO/MPIImage/vtkPNrrdReader.h
index 35eaf2d6ca0c1dc36b8cb914c5e654ae49dc542d..3c866b110a90686741a398b5234b5874fa14f77b 100644
--- a/IO/MPIImage/vtkPNrrdReader.h
+++ b/IO/MPIImage/vtkPNrrdReader.h
@@ -34,8 +34,8 @@
 // supports reading one file that is detached.
 //
 
-#ifndef __vtkPNrrdReader_h
-#define __vtkPNrrdReader_h
+#ifndef vtkPNrrdReader_h
+#define vtkPNrrdReader_h
 
 #include "vtkIOMPIImageModule.h" // For export macro
 #include "vtkNrrdReader.h"
@@ -114,4 +114,4 @@ private:
   void operator=(const vtkPNrrdReader &);        // Not implemented.
 };
 
-#endif //__vtkPNrrdReader_h
+#endif //vtkPNrrdReader_h
diff --git a/IO/MPIParallel/vtkPWindBladeReader.h b/IO/MPIParallel/vtkPWindBladeReader.h
index 9697d756b8b0cec18a2f848e311742cce32ac24b..7d5d56a9ac76a1ed9c2eccc5cec26f1545631a21 100644
--- a/IO/MPIParallel/vtkPWindBladeReader.h
+++ b/IO/MPIParallel/vtkPWindBladeReader.h
@@ -26,8 +26,8 @@
 // Parallel version of vtkWindBladeReader.h
 
 
-#ifndef __vtkPWindBladeReader_h
-#define __vtkPWindBladeReader_h
+#ifndef vtkPWindBladeReader_h
+#define vtkPWindBladeReader_h
 
 #include "vtkIOMPIParallelModule.h" // For export macro
 #include "vtkWindBladeReader.h"
diff --git a/IO/Movie/vtkAVIWriter.h b/IO/Movie/vtkAVIWriter.h
index 31edd4197ab389acbdbcac3f63033787d9822b90..b4f9c0da5b3dcdcb6e7be2c7a3f274c035b85018 100644
--- a/IO/Movie/vtkAVIWriter.h
+++ b/IO/Movie/vtkAVIWriter.h
@@ -20,8 +20,8 @@
 // .SECTION See Also
 // vtkGenericMovieWriter vtkMPEG2Writer
 
-#ifndef __vtkAVIWriter_h
-#define __vtkAVIWriter_h
+#ifndef vtkAVIWriter_h
+#define vtkAVIWriter_h
 
 #include "vtkIOMovieModule.h" // For export macro
 #include "vtkGenericMovieWriter.h"
diff --git a/IO/Movie/vtkGenericMovieWriter.h b/IO/Movie/vtkGenericMovieWriter.h
index 56499e50c1a97bcba7a21ee37393c6eef4fe2568..4f4148c86e3d1b9bdffd1f17f4dc0987dcbd626f 100644
--- a/IO/Movie/vtkGenericMovieWriter.h
+++ b/IO/Movie/vtkGenericMovieWriter.h
@@ -22,8 +22,8 @@
 // .SECTION See Also
 // vtkAVIWriter vtkMPEG2Writer
 
-#ifndef __vtkGenericMovieWriter_h
-#define __vtkGenericMovieWriter_h
+#ifndef vtkGenericMovieWriter_h
+#define vtkGenericMovieWriter_h
 
 #include "vtkIOMovieModule.h" // For export macro
 #include "vtkImageAlgorithm.h"
diff --git a/IO/Movie/vtkMPEG2Writer.h b/IO/Movie/vtkMPEG2Writer.h
index d19b829d1ac79a0a0bd7207c1f189bd4854c0a67..836263295e5cc12eb5773cf273f3f1ddade8b25d 100644
--- a/IO/Movie/vtkMPEG2Writer.h
+++ b/IO/Movie/vtkMPEG2Writer.h
@@ -38,8 +38,8 @@
 // .SECTION See Also
 // vtkGenericMovieWriter vtkAVIWriter vtkFFMPEGWriter
 
-#ifndef __vtkMPEG2Writer_h
-#define __vtkMPEG2Writer_h
+#ifndef vtkMPEG2Writer_h
+#define vtkMPEG2Writer_h
 
 #include "vtkIOMovieModule.h" // For export macro
 #include "vtkGenericMovieWriter.h"
diff --git a/IO/Movie/vtkOggTheoraWriter.h b/IO/Movie/vtkOggTheoraWriter.h
index a93722833abba8b223b4237deafb9c308f48ec7d..e6c6accb5a73726c2c0d9a5153a3870829ffc4eb 100644
--- a/IO/Movie/vtkOggTheoraWriter.h
+++ b/IO/Movie/vtkOggTheoraWriter.h
@@ -24,8 +24,8 @@
 //
 // .SECTION See Also vtkGenericMovieWriter vtkAVIWriter vtkMPEG2Writer vtkFFMPEGWriter
 
-#ifndef __vtkOggTheoraWriter_h
-#define __vtkOggTheoraWriter_h
+#ifndef vtkOggTheoraWriter_h
+#define vtkOggTheoraWriter_h
 
 #include "vtkIOMovieModule.h" // For export macro
 #include "vtkGenericMovieWriter.h"
diff --git a/IO/MySQL/vtkMySQLDatabase.h b/IO/MySQL/vtkMySQLDatabase.h
index 79be8e7091e6f89e2146668463082ab59888ac69..f533b614ffb40016c487cabf7783ab05b23017aa 100644
--- a/IO/MySQL/vtkMySQLDatabase.h
+++ b/IO/MySQL/vtkMySQLDatabase.h
@@ -30,8 +30,8 @@
 // .SECTION See Also
 // vtkMySQLQuery
 
-#ifndef __vtkMySQLDatabase_h
-#define __vtkMySQLDatabase_h
+#ifndef vtkMySQLDatabase_h
+#define vtkMySQLDatabase_h
 
 #include "vtkIOMySQLModule.h" // For export macro
 #include "vtkSQLDatabase.h"
@@ -209,5 +209,5 @@ private:
   void operator=(const vtkMySQLDatabase &); // Not implemented.
 };
 
-#endif // __vtkMySQLDatabase_h
+#endif // vtkMySQLDatabase_h
 
diff --git a/IO/MySQL/vtkMySQLDatabasePrivate.h b/IO/MySQL/vtkMySQLDatabasePrivate.h
index 5ee4e0ce0bce69b16dc1b93c0ec840dca1b6aaef..4deb7479de7ad9ce3fae209852a3cf476d483c1a 100644
--- a/IO/MySQL/vtkMySQLDatabasePrivate.h
+++ b/IO/MySQL/vtkMySQLDatabasePrivate.h
@@ -1,5 +1,5 @@
-#ifndef __vtkMySQLDatabasePrivate_h
-#define __vtkMySQLDatabasePrivate_h
+#ifndef vtkMySQLDatabasePrivate_h
+#define vtkMySQLDatabasePrivate_h
 
 #ifdef _WIN32
 # include <winsock.h> // mysql.h relies on the typedefs from here
@@ -21,5 +21,5 @@ public:
   MYSQL *Connection;
 };
 
-#endif // __vtkMySQLDatabasePrivate_h
+#endif // vtkMySQLDatabasePrivate_h
 // VTK-HeaderTest-Exclude: vtkMySQLDatabasePrivate.h
diff --git a/IO/MySQL/vtkMySQLQuery.h b/IO/MySQL/vtkMySQLQuery.h
index a1b8b0d15e2ec884407c05d32c5a716d5fb721c4..e522e379828a1c8695c93f4515aa5d62e7b01580 100644
--- a/IO/MySQL/vtkMySQLQuery.h
+++ b/IO/MySQL/vtkMySQLQuery.h
@@ -30,8 +30,8 @@
 // .SECTION See Also
 // vtkSQLDatabase vtkSQLQuery vtkMySQLDatabase
 
-#ifndef __vtkMySQLQuery_h
-#define __vtkMySQLQuery_h
+#ifndef vtkMySQLQuery_h
+#define vtkMySQLQuery_h
 
 #include "vtkIOMySQLModule.h" // For export macro
 #include "vtkSQLQuery.h"
@@ -157,5 +157,5 @@ private:
   char *LastErrorText;
 };
 
-#endif // __vtkMySQLQuery_h
+#endif // vtkMySQLQuery_h
 
diff --git a/IO/MySQL/vtkMySQLToTableReader.h b/IO/MySQL/vtkMySQLToTableReader.h
index 935dfc09620a553b396476ea5a4646b42bac7f8a..7149518223a12c9c6a08cc766e6b91cd452a6fc9 100644
--- a/IO/MySQL/vtkMySQLToTableReader.h
+++ b/IO/MySQL/vtkMySQLToTableReader.h
@@ -17,8 +17,8 @@
 // vtkMySQLToTableReader reads a table from a MySQL database and
 // outputs it as a vtkTable.
 
-#ifndef __vtkMySQLToTableReader_h
-#define __vtkMySQLToTableReader_h
+#ifndef vtkMySQLToTableReader_h
+#define vtkMySQLToTableReader_h
 
 #include "vtkIOMySQLModule.h" // For export macro
 #include "vtkDatabaseToTableReader.h"
diff --git a/IO/MySQL/vtkTableToMySQLWriter.h b/IO/MySQL/vtkTableToMySQLWriter.h
index e3a8519d45f6f5962ccf0f22c715a13da5c18061..56a953d679d7ac59c04675a1cfb721e538f31513 100644
--- a/IO/MySQL/vtkTableToMySQLWriter.h
+++ b/IO/MySQL/vtkTableToMySQLWriter.h
@@ -17,8 +17,8 @@
 // vtkTableToMySQLWriter reads a vtkTable and inserts it into a MySQL
 // database.
 
-#ifndef __vtkTableToMySQLWriter_h
-#define __vtkTableToMySQLWriter_h
+#ifndef vtkTableToMySQLWriter_h
+#define vtkTableToMySQLWriter_h
 
 #include "vtkIOMySQLModule.h" // For export macro
 #include "vtkTableToDatabaseWriter.h"
diff --git a/IO/NetCDF/vtkMPASReader.h b/IO/NetCDF/vtkMPASReader.h
index 7a572e3af8a53db9968cf92caa7940426b15d828..be8c51e2dc507dcf4a534adb9aa1f9521ad35f73 100644
--- a/IO/NetCDF/vtkMPASReader.h
+++ b/IO/NetCDF/vtkMPASReader.h
@@ -72,8 +72,8 @@ version available from Los Alamos National Laboratory.
 // Christine Ahrens (cahrens@lanl.gov)
 // Version 1.3
 
-#ifndef __vtkMPASReader_h
-#define __vtkMPASReader_h
+#ifndef vtkMPASReader_h
+#define vtkMPASReader_h
 
 #define MAX_VARS 100
 #define MAX_VAR_NAME 100
diff --git a/IO/NetCDF/vtkNetCDFCAMReader.h b/IO/NetCDF/vtkNetCDFCAMReader.h
index 3820c74ac5f7a00bffbce2f085ce82f07ae32c90..6100dfc0c015208fa91203902f357b6020fc5208 100644
--- a/IO/NetCDF/vtkNetCDFCAMReader.h
+++ b/IO/NetCDF/vtkNetCDFCAMReader.h
@@ -23,8 +23,8 @@
 // Currently this reader ignores time that may exist in the points
 // file.
 
-#ifndef __vtkNetCDFCAMReader_h
-#define __vtkNetCDFCAMReader_h
+#ifndef vtkNetCDFCAMReader_h
+#define vtkNetCDFCAMReader_h
 
 #include "vtkIONetCDFModule.h" // For export macro
 #include "vtkUnstructuredGridAlgorithm.h"
diff --git a/IO/NetCDF/vtkNetCDFCFReader.h b/IO/NetCDF/vtkNetCDFCFReader.h
index a15c20cb06c21c8d066c280f8e3bff499b716ff8..e93c16436bbad86e487a4a983cc8fb53fd22e0ea 100644
--- a/IO/NetCDF/vtkNetCDFCFReader.h
+++ b/IO/NetCDF/vtkNetCDFCFReader.h
@@ -28,8 +28,8 @@
 // can be found at <http://cf-pcmdi.llnl.gov/>.
 //
 
-#ifndef __vtkNetCDFCFReader_h
-#define __vtkNetCDFCFReader_h
+#ifndef vtkNetCDFCFReader_h
+#define vtkNetCDFCFReader_h
 
 #include "vtkIONetCDFModule.h" // For export macro
 #include "vtkNetCDFReader.h"
@@ -294,5 +294,5 @@ private:
   void operator=(const vtkNetCDFCFReader &);    // Not implemented
 };
 
-#endif //__vtkNetCDFCFReader_h
+#endif //vtkNetCDFCFReader_h
 
diff --git a/IO/NetCDF/vtkNetCDFPOPReader.h b/IO/NetCDF/vtkNetCDFPOPReader.h
index c272a3de040f2036d32d3dd6792f4110ce561aac..fd44cccfb54de397a61d1e2067bc51eb18a5249b 100644
--- a/IO/NetCDF/vtkNetCDFPOPReader.h
+++ b/IO/NetCDF/vtkNetCDFPOPReader.h
@@ -25,8 +25,8 @@
 // first slice/plane has the highest z-value and the last slice/plane
 // has the lowest z-value.
 
-#ifndef __vtkNetCDFPOPReader_h
-#define __vtkNetCDFPOPReader_h
+#ifndef vtkNetCDFPOPReader_h
+#define vtkNetCDFPOPReader_h
 
 #include "vtkIONetCDFModule.h" // For export macro
 #include "vtkRectilinearGridAlgorithm.h"
diff --git a/IO/NetCDF/vtkNetCDFReader.h b/IO/NetCDF/vtkNetCDFReader.h
index 6ec2ec6a3faf2c388b91c3ae96f8776023314985..0b9fe2ab527f244e989c875c97e303093fe0f6ca 100644
--- a/IO/NetCDF/vtkNetCDFReader.h
+++ b/IO/NetCDF/vtkNetCDFReader.h
@@ -29,8 +29,8 @@
 // vtkImageData at each block.  A block is created for each variable except that
 // variables with matching dimensions will be placed in the same block.
 
-#ifndef __vtkNetCDFReader_h
-#define __vtkNetCDFReader_h
+#ifndef vtkNetCDFReader_h
+#define vtkNetCDFReader_h
 
 #include "vtkIONetCDFModule.h" // For export macro
 #include "vtkDataObjectAlgorithm.h"
@@ -235,4 +235,4 @@ private:
   vtkNetCDFReaderPrivate *Private;
 };
 
-#endif //__vtkNetCDFReader_h
+#endif //vtkNetCDFReader_h
diff --git a/IO/NetCDF/vtkSLACParticleReader.h b/IO/NetCDF/vtkSLACParticleReader.h
index 572d627078acacdecc719a5186da734856c17f78..08097992705c9509d0d3025e45efed1263e46bfc 100644
--- a/IO/NetCDF/vtkSLACParticleReader.h
+++ b/IO/NetCDF/vtkSLACParticleReader.h
@@ -33,8 +33,8 @@
 // piece 0.  All other pieces are empty.
 //
 
-#ifndef __vtkSLACParticleReader_h
-#define __vtkSLACParticleReader_h
+#ifndef vtkSLACParticleReader_h
+#define vtkSLACParticleReader_h
 
 #include "vtkIONetCDFModule.h" // For export macro
 #include "vtkPolyDataAlgorithm.h"
@@ -86,4 +86,4 @@ private:
   void operator=(const vtkSLACParticleReader &);        // Not implemented
 };
 
-#endif //__vtkSLACParticleReader_h
+#endif //vtkSLACParticleReader_h
diff --git a/IO/NetCDF/vtkSLACReader.h b/IO/NetCDF/vtkSLACReader.h
index 4f227a16d7895ec9019e0adba7c32ad8b8292fd0..860032b454a1ad2c84ace6f70640e59360be020d 100644
--- a/IO/NetCDF/vtkSLACReader.h
+++ b/IO/NetCDF/vtkSLACReader.h
@@ -30,8 +30,8 @@
 // to form an unstructured grid of elements.
 //
 
-#ifndef __vtkSLACReader_h
-#define __vtkSLACReader_h
+#ifndef vtkSLACReader_h
+#define vtkSLACReader_h
 
 #include "vtkIONetCDFModule.h" // For export macro
 #include "vtkMultiBlockDataSetAlgorithm.h"
@@ -385,4 +385,4 @@ private:
   void operator=(const vtkSLACReader &);        // Not implemented
 };
 
-#endif //__vtkSLACReader_h
+#endif //vtkSLACReader_h
diff --git a/IO/ODBC/vtkODBCDatabase.h b/IO/ODBC/vtkODBCDatabase.h
index 5638215d65f37c75d7a446d38460dd9328371b39..d56091356463a3e48e4a8f812889fc8a21cbc591 100644
--- a/IO/ODBC/vtkODBCDatabase.h
+++ b/IO/ODBC/vtkODBCDatabase.h
@@ -63,8 +63,8 @@
 // vtkODBCQuery
 
 
-#ifndef __vtkODBCDatabase_h
-#define __vtkODBCDatabase_h
+#ifndef vtkODBCDatabase_h
+#define vtkODBCDatabase_h
 
 #include "vtkIOODBCModule.h" // For export macro
 #include "vtkSQLDatabase.h"
@@ -206,5 +206,5 @@ private:
   void operator=(const vtkODBCDatabase &); // Not implemented.
 };
 
-#endif // __vtkODBCDatabase_h
+#endif // vtkODBCDatabase_h
 
diff --git a/IO/ODBC/vtkODBCInternals.h b/IO/ODBC/vtkODBCInternals.h
index a15246f3da3270ec11c17deadb240051c6733b88..bc29a273a206ae40310937041ef4ac8c8cf58750 100644
--- a/IO/ODBC/vtkODBCInternals.h
+++ b/IO/ODBC/vtkODBCInternals.h
@@ -25,8 +25,8 @@
 // vtkODBCDatabase vtkODBCQuery
 //
 
-#ifndef __vtkODBCInternals_h
-#define __vtkODBCInternals_h
+#ifndef vtkODBCInternals_h
+#define vtkODBCInternals_h
 
 #include <sql.h>
 
diff --git a/IO/ODBC/vtkODBCQuery.h b/IO/ODBC/vtkODBCQuery.h
index 65522353614717dadff22b3c8abe88e318d36449..4014d3f3c5fca15af2c567a597e99bcbd3e1d340 100644
--- a/IO/ODBC/vtkODBCQuery.h
+++ b/IO/ODBC/vtkODBCQuery.h
@@ -30,8 +30,8 @@
 // .SECTION See Also
 // vtkSQLDatabase vtkSQLQuery vtkODBCDatabase
 
-#ifndef __vtkODBCQuery_h
-#define __vtkODBCQuery_h
+#ifndef vtkODBCQuery_h
+#define vtkODBCQuery_h
 
 #include "vtkIOODBCModule.h" // For export macro
 #include "vtkSQLQuery.h"
@@ -173,5 +173,5 @@ private:
   char *LastErrorText;
 };
 
-#endif // __vtkODBCQuery_h
+#endif // vtkODBCQuery_h
 
diff --git a/IO/PLY/vtkPLY.h b/IO/PLY/vtkPLY.h
index 9352023166876b2a09e9a02a5fcf6e9c428a1eb7..040edaf8bae35209d1f16ba54c96cd715ca11a67 100644
--- a/IO/PLY/vtkPLY.h
+++ b/IO/PLY/vtkPLY.h
@@ -59,8 +59,8 @@ WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
 // .SECTION See Also
 // vtkPLYWriter vtkPLYReader
 
-#ifndef __vtkPLY_h
-#define __vtkPLY_h
+#ifndef vtkPLY_h
+#define vtkPLY_h
 
 #include "vtkIOPLYModule.h" // For export macro
 #include "vtkObject.h"
diff --git a/IO/PLY/vtkPLYReader.h b/IO/PLY/vtkPLYReader.h
index 8d9e8d5fb3e56cb23fee564f9f5d30c5430dbd07..fb9976e00e443f1c6497e4f371537aa355ddf092 100644
--- a/IO/PLY/vtkPLYReader.h
+++ b/IO/PLY/vtkPLYReader.h
@@ -27,8 +27,8 @@
 // .SECTION See Also
 // vtkPLYWriter
 
-#ifndef __vtkPLYReader_h
-#define __vtkPLYReader_h
+#ifndef vtkPLYReader_h
+#define vtkPLYReader_h
 
 #include "vtkIOPLYModule.h" // For export macro
 #include "vtkPolyDataAlgorithm.h"
diff --git a/IO/PLY/vtkPLYWriter.h b/IO/PLY/vtkPLYWriter.h
index 131cbb5ab809c92c87ad5dba11f95efae21d68e6..664919a2739072c8eb4afe3b7d120fda56c9e6fa 100644
--- a/IO/PLY/vtkPLYWriter.h
+++ b/IO/PLY/vtkPLYWriter.h
@@ -29,8 +29,8 @@
 // .SECTION See Also
 // vtkPLYReader
 
-#ifndef __vtkPLYWriter_h
-#define __vtkPLYWriter_h
+#ifndef vtkPLYWriter_h
+#define vtkPLYWriter_h
 
 #include "vtkIOPLYModule.h" // For export macro
 #include "vtkWriter.h"
diff --git a/IO/Parallel/vtkEnSightWriter.h b/IO/Parallel/vtkEnSightWriter.h
index a75d41f4c222318a60018c781aa65bac03366e20..f826c5ee5251a93c78d26cbb3e606d7aefd7713f 100644
--- a/IO/Parallel/vtkEnSightWriter.h
+++ b/IO/Parallel/vtkEnSightWriter.h
@@ -27,8 +27,8 @@
 // Binary files written on one system may not be readable on other systems.
 // Be sure to specify the endian-ness of the file when reading it into EnSight
 
-#ifndef __vtkEnSightWriter_h
-#define __vtkEnSightWriter_h
+#ifndef vtkEnSightWriter_h
+#define vtkEnSightWriter_h
 
 #include "vtkIOParallelModule.h" // For export macro
 #include "vtkWriter.h"
diff --git a/IO/Parallel/vtkPChacoReader.h b/IO/Parallel/vtkPChacoReader.h
index 95340367e1bf3b58030a61989b3eca6ca448a000..637cc82db4e5b49734ca7099d26c59fd34c45ce7 100644
--- a/IO/Parallel/vtkPChacoReader.h
+++ b/IO/Parallel/vtkPChacoReader.h
@@ -24,8 +24,8 @@
 // a vtkUnstructuredGrid.  The vtkDistributedDataFilter is invoked
 // to divide the grid among the processes.
 
-#ifndef __vtkPChacoReader_h
-#define __vtkPChacoReader_h
+#ifndef vtkPChacoReader_h
+#define vtkPChacoReader_h
 
 #include "vtkIOParallelModule.h" // For export macro
 #include "vtkChacoReader.h"
diff --git a/IO/Parallel/vtkPDataSetReader.h b/IO/Parallel/vtkPDataSetReader.h
index 903846d463456e13902c8937582c932616336d68..6297a06e695e96b832ea244d70642e8d0725c742 100644
--- a/IO/Parallel/vtkPDataSetReader.h
+++ b/IO/Parallel/vtkPDataSetReader.h
@@ -18,8 +18,8 @@
 // a metadata file that lists all of the files in a data set.
 
 
-#ifndef __vtkPDataSetReader_h
-#define __vtkPDataSetReader_h
+#ifndef vtkPDataSetReader_h
+#define vtkPDataSetReader_h
 
 #include "vtkIOParallelModule.h" // For export macro
 #include "vtkDataSetAlgorithm.h"
diff --git a/IO/Parallel/vtkPDataSetWriter.h b/IO/Parallel/vtkPDataSetWriter.h
index ce317a285bf3df1794cc449554362ceafe389c63..446be6d64d2ad3315fa5935eede8120ed7a2171b 100644
--- a/IO/Parallel/vtkPDataSetWriter.h
+++ b/IO/Parallel/vtkPDataSetWriter.h
@@ -18,8 +18,8 @@
 // a metadata file that lists all of the files in a data set.
 
 
-#ifndef __vtkPDataSetWriter_h
-#define __vtkPDataSetWriter_h
+#ifndef vtkPDataSetWriter_h
+#define vtkPDataSetWriter_h
 
 #include "vtkIOParallelModule.h" // For export macro
 #include "vtkDataSetWriter.h"
diff --git a/IO/Parallel/vtkPImageWriter.h b/IO/Parallel/vtkPImageWriter.h
index 9d88ccb86a35e96acd15c0bcba5abf79f88d7e80..a7ced24e92c1eb739e8d39b650d86eb2cc544bf6 100644
--- a/IO/Parallel/vtkPImageWriter.h
+++ b/IO/Parallel/vtkPImageWriter.h
@@ -20,8 +20,8 @@
 // This class is used as the superclass of most image writing classes
 // such as vtkBMPWriter etc. It supports streaming.
 
-#ifndef __vtkPImageWriter_h
-#define __vtkPImageWriter_h
+#ifndef vtkPImageWriter_h
+#define vtkPImageWriter_h
 
 #include "vtkIOParallelModule.h" // For export macro
 #include "vtkImageWriter.h"
diff --git a/IO/Parallel/vtkPOpenFOAMReader.h b/IO/Parallel/vtkPOpenFOAMReader.h
index c7b701ccf7d4ff0ce60fa57b94c68a84eb46e916..1d801eef10ce38830cad0c08aef7fb1015f6e30c 100644
--- a/IO/Parallel/vtkPOpenFOAMReader.h
+++ b/IO/Parallel/vtkPOpenFOAMReader.h
@@ -24,8 +24,8 @@
 // This class was developed by Takuya Oshima at Niigata University,
 // Japan (oshima@eng.niigata-u.ac.jp).
 
-#ifndef __vtkPOpenFOAMReader_h
-#define __vtkPOpenFOAMReader_h
+#ifndef vtkPOpenFOAMReader_h
+#define vtkPOpenFOAMReader_h
 
 #include "vtkIOParallelModule.h" // For export macro
 #include "vtkOpenFOAMReader.h"
diff --git a/IO/Parallel/vtkPSLACReader.h b/IO/Parallel/vtkPSLACReader.h
index 8effec4146a33ea08a12227fea3710471bdfc114..9c5d65d608971b1bcaf8f0372c83197044e6f564 100644
--- a/IO/Parallel/vtkPSLACReader.h
+++ b/IO/Parallel/vtkPSLACReader.h
@@ -30,8 +30,8 @@
 // corresponding to the local process id.
 //
 
-#ifndef __vtkPSLACReader_h
-#define __vtkPSLACReader_h
+#ifndef vtkPSLACReader_h
+#define vtkPSLACReader_h
 
 #include "vtkIOParallelModule.h" // For export macro
 #include "vtkSLACReader.h"
@@ -135,4 +135,4 @@ private:
   void operator=(const vtkPSLACReader &);       // Not implemented
 };
 
-#endif //__vtkPSLACReader_h
+#endif //vtkPSLACReader_h
diff --git a/IO/ParallelExodus/vtkPExodusIIReader.h b/IO/ParallelExodus/vtkPExodusIIReader.h
index e149582b2b3123027eb46758e362f48a49997b4e..3f448ca17e36d2433a29f9b3b5cbeae2c3d7b620 100644
--- a/IO/ParallelExodus/vtkPExodusIIReader.h
+++ b/IO/ParallelExodus/vtkPExodusIIReader.h
@@ -34,8 +34,8 @@
 // possible blocks. Unused points are filtered out internally.
 
 
-#ifndef __vtkPExodusIIReader_h
-#define __vtkPExodusIIReader_h
+#ifndef vtkPExodusIIReader_h
+#define vtkPExodusIIReader_h
 
 #include "vtkIOParallelExodusModule.h" // For export macro
 #include "vtkExodusIIReader.h"
diff --git a/IO/ParallelExodus/vtkPExodusIIWriter.h b/IO/ParallelExodus/vtkPExodusIIWriter.h
index c7031df6f6215f5fef420ee03f535dde725b8b1a..3b58e41b700b737f98b1ee36d18c92f8e748d316 100644
--- a/IO/ParallelExodus/vtkPExodusIIWriter.h
+++ b/IO/ParallelExodus/vtkPExodusIIWriter.h
@@ -61,8 +61,8 @@
 //     We use the terms "point" and "node" interchangeably.
 //     Also, we use the terms "element" and "cell" interchangeably.
 
-#ifndef __vtkPExodusIIWriter_h
-#define __vtkPExodusIIWriter_h
+#ifndef vtkPExodusIIWriter_h
+#define vtkPExodusIIWriter_h
 
 #include "vtkIOParallelExodusModule.h" // For export macro
 #include "vtkSmartPointer.h" // For vtkSmartPointer
diff --git a/IO/ParallelLSDyna/vtkPLSDynaReader.h b/IO/ParallelLSDyna/vtkPLSDynaReader.h
index c1b81a7ac2aa36453bd08838d468bfddc243f411..5709ed5101a6c6314e0e1c124c513a929fc6ec76 100644
--- a/IO/ParallelLSDyna/vtkPLSDynaReader.h
+++ b/IO/ParallelLSDyna/vtkPLSDynaReader.h
@@ -114,8 +114,8 @@
 // Perhaps a filter could be applied to "fancify" the geometry.
 //
 
-#ifndef __vtkPLSDynaReader_h
-#define __vtkPLSDynaReader_h
+#ifndef vtkPLSDynaReader_h
+#define vtkPLSDynaReader_h
 
 #include "vtkIOParallelLSDynaModule.h" // For export macro
 #include "vtkLSDynaReader.h"
@@ -159,4 +159,4 @@ private:
   vtkPLSDynaReaderInternal *Internal;
 };
 
-#endif // __vtkPLSDynaReader_h
+#endif // vtkPLSDynaReader_h
diff --git a/IO/ParallelNetCDF/vtkPNetCDFPOPReader.h b/IO/ParallelNetCDF/vtkPNetCDFPOPReader.h
index 77cc78157a46e76538a3f5d54f49e9d15f24fa68..e02ec516543c13dcb2de2434547ff6fa91cbbcae 100644
--- a/IO/ParallelNetCDF/vtkPNetCDFPOPReader.h
+++ b/IO/ParallelNetCDF/vtkPNetCDFPOPReader.h
@@ -25,8 +25,8 @@
 // first slice/plane has the highest z-value and the last slice/plane
 // has the lowest z-value.
 
-#ifndef __vtkPNetCDFPOPReader_h
-#define __vtkPNetCDFPOPReader_h
+#ifndef vtkPNetCDFPOPReader_h
+#define vtkPNetCDFPOPReader_h
 
 #include "vtkIOParallelNetCDFModule.h" // For export macro
 #include "vtkRectilinearGridAlgorithm.h"
diff --git a/IO/ParallelXML/vtkXMLPDataSetWriter.h b/IO/ParallelXML/vtkXMLPDataSetWriter.h
index a39748348d2f652beea7040e94163da3fc0152ac..6b8d92e3a5391d19eddbaa12f9abc1748e302b8c 100644
--- a/IO/ParallelXML/vtkXMLPDataSetWriter.h
+++ b/IO/ParallelXML/vtkXMLPDataSetWriter.h
@@ -23,8 +23,8 @@
 // vtkXMLPRectilinearGridWriter vtkXMLPPolyDataWriter
 // vtkXMLPUnstructuredGridWriter
 
-#ifndef __vtkXMLPDataSetWriter_h
-#define __vtkXMLPDataSetWriter_h
+#ifndef vtkXMLPDataSetWriter_h
+#define vtkXMLPDataSetWriter_h
 
 #include "vtkIOParallelXMLModule.h" // For export macro
 #include "vtkXMLPDataWriter.h"
diff --git a/IO/ParallelXML/vtkXMLPDataWriter.h b/IO/ParallelXML/vtkXMLPDataWriter.h
index 6fd2d555a9d58782ee1574b8ad6f646b3d0e40ce..257e7b36e6294c355f1ecba1c34c1e51028cd585 100644
--- a/IO/ParallelXML/vtkXMLPDataWriter.h
+++ b/IO/ParallelXML/vtkXMLPDataWriter.h
@@ -19,8 +19,8 @@
 // formats, such as the selection of which writer writes the summary
 // file and what range of pieces are assigned to each serial writer.
 
-#ifndef __vtkXMLPDataWriter_h
-#define __vtkXMLPDataWriter_h
+#ifndef vtkXMLPDataWriter_h
+#define vtkXMLPDataWriter_h
 
 #include "vtkIOParallelXMLModule.h" // For export macro
 #include "vtkXMLWriter.h"
diff --git a/IO/ParallelXML/vtkXMLPHierarchicalBoxDataWriter.h b/IO/ParallelXML/vtkXMLPHierarchicalBoxDataWriter.h
index 475abd332529c6340e8b713b0b4c32e4637c1d18..a776aba22a064ca667348737a8bd84751708d840 100644
--- a/IO/ParallelXML/vtkXMLPHierarchicalBoxDataWriter.h
+++ b/IO/ParallelXML/vtkXMLPHierarchicalBoxDataWriter.h
@@ -18,8 +18,8 @@
 // vtkXMLPHierarchicalBoxDataWriter is an empty subclass of
 // vtkXMLPUniformGridAMRWriter for backwards compatibility.
 
-#ifndef __vtkXMLPHierarchicalBoxDataWriter_h
-#define __vtkXMLPHierarchicalBoxDataWriter_h
+#ifndef vtkXMLPHierarchicalBoxDataWriter_h
+#define vtkXMLPHierarchicalBoxDataWriter_h
 
 #include "vtkXMLPUniformGridAMRWriter.h"
 #include "vtkIOParallelXMLModule.h" // For export macro
diff --git a/IO/ParallelXML/vtkXMLPImageDataWriter.h b/IO/ParallelXML/vtkXMLPImageDataWriter.h
index 1100109514f3154bde87dc82d3660b5d1744f1f2..7b2c51b115c943842dce87d3c6d688152f7b37ab 100644
--- a/IO/ParallelXML/vtkXMLPImageDataWriter.h
+++ b/IO/ParallelXML/vtkXMLPImageDataWriter.h
@@ -23,8 +23,8 @@
 // .SECTION See Also
 // vtkXMLImageDataWriter
 
-#ifndef __vtkXMLPImageDataWriter_h
-#define __vtkXMLPImageDataWriter_h
+#ifndef vtkXMLPImageDataWriter_h
+#define vtkXMLPImageDataWriter_h
 
 #include "vtkIOParallelXMLModule.h" // For export macro
 #include "vtkXMLPStructuredDataWriter.h"
diff --git a/IO/ParallelXML/vtkXMLPMultiBlockDataWriter.h b/IO/ParallelXML/vtkXMLPMultiBlockDataWriter.h
index ac1e954eefde5050cec3b9a53055806c4508eedd..50617be689553831a42dfd429a5ecdb3f67d91fb 100644
--- a/IO/ParallelXML/vtkXMLPMultiBlockDataWriter.h
+++ b/IO/ParallelXML/vtkXMLPMultiBlockDataWriter.h
@@ -20,8 +20,8 @@
 // multi-group data files are meta-files that point to a list of serial VTK
 // XML files.
 
-#ifndef __vtkXMLPMultiBlockDataWriter_h
-#define __vtkXMLPMultiBlockDataWriter_h
+#ifndef vtkXMLPMultiBlockDataWriter_h
+#define vtkXMLPMultiBlockDataWriter_h
 
 #include "vtkIOParallelXMLModule.h" // For export macro
 #include "vtkXMLMultiBlockDataWriter.h"
diff --git a/IO/ParallelXML/vtkXMLPPolyDataWriter.h b/IO/ParallelXML/vtkXMLPPolyDataWriter.h
index 62f83db0b69209e8ccca8f1a9f857ca2671cac31..070e4fd86ebd97b599e8d7f7721b6f360d9c3a22 100644
--- a/IO/ParallelXML/vtkXMLPPolyDataWriter.h
+++ b/IO/ParallelXML/vtkXMLPPolyDataWriter.h
@@ -23,8 +23,8 @@
 // .SECTION See Also
 // vtkXMLPolyDataWriter
 
-#ifndef __vtkXMLPPolyDataWriter_h
-#define __vtkXMLPPolyDataWriter_h
+#ifndef vtkXMLPPolyDataWriter_h
+#define vtkXMLPPolyDataWriter_h
 
 #include "vtkIOParallelXMLModule.h" // For export macro
 #include "vtkXMLPUnstructuredDataWriter.h"
diff --git a/IO/ParallelXML/vtkXMLPRectilinearGridWriter.h b/IO/ParallelXML/vtkXMLPRectilinearGridWriter.h
index 83937cabddfc62d68fcea4b4d66b4cb2b2011ea6..0adf700baa38c56afa8997b082e1e57a775c2690 100644
--- a/IO/ParallelXML/vtkXMLPRectilinearGridWriter.h
+++ b/IO/ParallelXML/vtkXMLPRectilinearGridWriter.h
@@ -24,8 +24,8 @@
 // .SECTION See Also
 // vtkXMLRectilinearGridWriter
 
-#ifndef __vtkXMLPRectilinearGridWriter_h
-#define __vtkXMLPRectilinearGridWriter_h
+#ifndef vtkXMLPRectilinearGridWriter_h
+#define vtkXMLPRectilinearGridWriter_h
 
 #include "vtkIOParallelXMLModule.h" // For export macro
 #include "vtkXMLPStructuredDataWriter.h"
diff --git a/IO/ParallelXML/vtkXMLPStructuredDataWriter.h b/IO/ParallelXML/vtkXMLPStructuredDataWriter.h
index 96d75532dfd5e0daa4cf42e32c691074af39ef95..3f622e50147ed66f94a28d7fdd62738ab8dc59c6 100644
--- a/IO/ParallelXML/vtkXMLPStructuredDataWriter.h
+++ b/IO/ParallelXML/vtkXMLPStructuredDataWriter.h
@@ -17,8 +17,8 @@
 // vtkXMLPStructuredDataWriter provides PVTK XML writing functionality
 // that is common among all the parallel structured data formats.
 
-#ifndef __vtkXMLPStructuredDataWriter_h
-#define __vtkXMLPStructuredDataWriter_h
+#ifndef vtkXMLPStructuredDataWriter_h
+#define vtkXMLPStructuredDataWriter_h
 
 #include "vtkIOParallelXMLModule.h" // For export macro
 #include "vtkXMLPDataWriter.h"
diff --git a/IO/ParallelXML/vtkXMLPStructuredGridWriter.h b/IO/ParallelXML/vtkXMLPStructuredGridWriter.h
index cee648e0e8b08c466a0606062df322e5ff57d310..7484d8dd23d3e3c539fc15a1d8ba9a8483669af9 100644
--- a/IO/ParallelXML/vtkXMLPStructuredGridWriter.h
+++ b/IO/ParallelXML/vtkXMLPStructuredGridWriter.h
@@ -24,8 +24,8 @@
 // .SECTION See Also
 // vtkXMLStructuredGridWriter
 
-#ifndef __vtkXMLPStructuredGridWriter_h
-#define __vtkXMLPStructuredGridWriter_h
+#ifndef vtkXMLPStructuredGridWriter_h
+#define vtkXMLPStructuredGridWriter_h
 
 #include "vtkIOParallelXMLModule.h" // For export macro
 #include "vtkXMLPStructuredDataWriter.h"
diff --git a/IO/ParallelXML/vtkXMLPUniformGridAMRWriter.h b/IO/ParallelXML/vtkXMLPUniformGridAMRWriter.h
index be2090aab1eabc1f5e66a2b3b4b173a970e370ac..eb72aeeaeed4eb1acaead94064e6fda02666ebb4 100644
--- a/IO/ParallelXML/vtkXMLPUniformGridAMRWriter.h
+++ b/IO/ParallelXML/vtkXMLPUniformGridAMRWriter.h
@@ -23,8 +23,8 @@
 // to the root node so that the root node can write the XML file describing the
 // structure correctly.
 
-#ifndef __vtkXMLPUniformGridAMRWriter_h
-#define __vtkXMLPUniformGridAMRWriter_h
+#ifndef vtkXMLPUniformGridAMRWriter_h
+#define vtkXMLPUniformGridAMRWriter_h
 
 #include "vtkIOParallelXMLModule.h" // For export macro
 #include "vtkXMLUniformGridAMRWriter.h"
diff --git a/IO/ParallelXML/vtkXMLPUnstructuredDataWriter.h b/IO/ParallelXML/vtkXMLPUnstructuredDataWriter.h
index acf4d4ef394adfd2a8af7ff68d3303b5f3a99b22..8c49d2663777c19a6b54f0afc5fe846804f959f2 100644
--- a/IO/ParallelXML/vtkXMLPUnstructuredDataWriter.h
+++ b/IO/ParallelXML/vtkXMLPUnstructuredDataWriter.h
@@ -18,8 +18,8 @@
 // functionality that is common among all the parallel unstructured
 // data formats.
 
-#ifndef __vtkXMLPUnstructuredDataWriter_h
-#define __vtkXMLPUnstructuredDataWriter_h
+#ifndef vtkXMLPUnstructuredDataWriter_h
+#define vtkXMLPUnstructuredDataWriter_h
 
 #include "vtkIOParallelXMLModule.h" // For export macro
 #include "vtkXMLPDataWriter.h"
diff --git a/IO/ParallelXML/vtkXMLPUnstructuredGridWriter.h b/IO/ParallelXML/vtkXMLPUnstructuredGridWriter.h
index 784daff36faedc00747dd44e168e6cc8585f7bdc..3b361b1563b7fcae053fdc882d2d9ead3bf4e1ad 100644
--- a/IO/ParallelXML/vtkXMLPUnstructuredGridWriter.h
+++ b/IO/ParallelXML/vtkXMLPUnstructuredGridWriter.h
@@ -24,8 +24,8 @@
 // .SECTION See Also
 // vtkXMLUnstructuredGridWriter
 
-#ifndef __vtkXMLPUnstructuredGridWriter_h
-#define __vtkXMLPUnstructuredGridWriter_h
+#ifndef vtkXMLPUnstructuredGridWriter_h
+#define vtkXMLPUnstructuredGridWriter_h
 
 #include "vtkIOParallelXMLModule.h" // For export macro
 #include "vtkXMLPUnstructuredDataWriter.h"
diff --git a/IO/PostgreSQL/vtkPostgreSQLDatabase.h b/IO/PostgreSQL/vtkPostgreSQLDatabase.h
index 7f575a723a9b7d7e9ff8d45732b8c4eaf5bdef2d..d94b33e78e8c3c2335ed36ea16b39644ec57d47b 100644
--- a/IO/PostgreSQL/vtkPostgreSQLDatabase.h
+++ b/IO/PostgreSQL/vtkPostgreSQLDatabase.h
@@ -40,8 +40,8 @@
 // .SECTION See Also
 // vtkPostgreSQLQuery
 
-#ifndef __vtkPostgreSQLDatabase_h
-#define __vtkPostgreSQLDatabase_h
+#ifndef vtkPostgreSQLDatabase_h
+#define vtkPostgreSQLDatabase_h
 
 #include "vtkIOPostgreSQLModule.h" // For export macro
 #include "vtkSQLDatabase.h"
@@ -264,4 +264,4 @@ inline void vtkPostgreSQLDatabase::SetServerPort( int _arg )
     }
 }
 
-#endif // __vtkPostgreSQLDatabase_h
+#endif // vtkPostgreSQLDatabase_h
diff --git a/IO/PostgreSQL/vtkPostgreSQLDatabasePrivate.h b/IO/PostgreSQL/vtkPostgreSQLDatabasePrivate.h
index ba600285c3242273891d367dfe07666541e4e1cf..b9c4bdcea42fb2a3756a3bfa9bcda76615da5e37 100644
--- a/IO/PostgreSQL/vtkPostgreSQLDatabasePrivate.h
+++ b/IO/PostgreSQL/vtkPostgreSQLDatabasePrivate.h
@@ -31,8 +31,8 @@
 // You should never have to deal with this class outside of
 // vtkPostgreSQLDatabase and vtkPostgreSQLQuery.
 
-#ifndef __vtkPostgreSQLDatabasePrivate_h
-#define __vtkPostgreSQLDatabasePrivate_h
+#ifndef vtkPostgreSQLDatabasePrivate_h
+#define vtkPostgreSQLDatabasePrivate_h
 
 #include "vtkStdString.h"
 #include "vtkType.h"
@@ -81,5 +81,5 @@ class vtkPostgreSQLDatabasePrivate
   vtksys_stl::map<Oid,int> DataTypeMap;
 };
 
-#endif // __vtkPostgreSQLDatabasePrivate_h
+#endif // vtkPostgreSQLDatabasePrivate_h
 // VTK-HeaderTest-Exclude: vtkPostgreSQLDatabasePrivate.h
diff --git a/IO/PostgreSQL/vtkPostgreSQLQuery.h b/IO/PostgreSQL/vtkPostgreSQLQuery.h
index 4d4ecc63204f7e9e22615fa0b39920d9818328d9..c19806aafa132df394a1d61060aa28415b65f318 100644
--- a/IO/PostgreSQL/vtkPostgreSQLQuery.h
+++ b/IO/PostgreSQL/vtkPostgreSQLQuery.h
@@ -33,8 +33,8 @@
 // .SECTION See Also
 // vtkSQLDatabase vtkSQLQuery vtkPostgreSQLDatabase
 
-#ifndef __vtkPostgreSQLQuery_h
-#define __vtkPostgreSQLQuery_h
+#ifndef vtkPostgreSQLQuery_h
+#define vtkPostgreSQLQuery_h
 
 #include "vtkIOPostgreSQLModule.h" // For export macro
 #include "vtkSQLQuery.h"
@@ -126,5 +126,5 @@ private:
   void operator = ( const vtkPostgreSQLQuery& ); // Not implemented.
 };
 
-#endif // __vtkPostgreSQLQuery_h
+#endif // vtkPostgreSQLQuery_h
 
diff --git a/IO/PostgreSQL/vtkPostgreSQLToTableReader.h b/IO/PostgreSQL/vtkPostgreSQLToTableReader.h
index 59574c612602bfa52a5de36ffc55bb5f0082f6f7..8fa9100f9eb7f415fa3977816590313f196ce0a8 100644
--- a/IO/PostgreSQL/vtkPostgreSQLToTableReader.h
+++ b/IO/PostgreSQL/vtkPostgreSQLToTableReader.h
@@ -17,8 +17,8 @@
 // vtkPostgreSQLToTableReader reads a table from a PostgreSQL database and
 // outputs it as a vtkTable.
 
-#ifndef __vtkPostgreSQLToTableReader_h
-#define __vtkPostgreSQLToTableReader_h
+#ifndef vtkPostgreSQLToTableReader_h
+#define vtkPostgreSQLToTableReader_h
 
 #include "vtkIOPostgreSQLModule.h" // For export macro
 #include "vtkDatabaseToTableReader.h"
diff --git a/IO/PostgreSQL/vtkTableToPostgreSQLWriter.h b/IO/PostgreSQL/vtkTableToPostgreSQLWriter.h
index a4472ebaa0bd5cd5e4af942a6cb0f7fd655bd482..af362de07c562abb2a19303d9adb0bc9931d90e3 100644
--- a/IO/PostgreSQL/vtkTableToPostgreSQLWriter.h
+++ b/IO/PostgreSQL/vtkTableToPostgreSQLWriter.h
@@ -17,8 +17,8 @@
 // vtkTableToPostgreSQLWriter reads a vtkTable and inserts it into a PostgreSQL
 // database.
 
-#ifndef __vtkTableToPostgreSQLWriter_h
-#define __vtkTableToPostgreSQLWriter_h
+#ifndef vtkTableToPostgreSQLWriter_h
+#define vtkTableToPostgreSQLWriter_h
 
 #include "vtkIOPostgreSQLModule.h" // For export macro
 #include "vtkTableToDatabaseWriter.h"
diff --git a/IO/SQL/vtkDatabaseToTableReader.h b/IO/SQL/vtkDatabaseToTableReader.h
index f3012db896ffdf28e7febcb5388a4d87f9d3b119..73ba98633b8a32f127a10fc41362ffd7d68c2cb8 100644
--- a/IO/SQL/vtkDatabaseToTableReader.h
+++ b/IO/SQL/vtkDatabaseToTableReader.h
@@ -17,8 +17,8 @@
 // vtkDatabaseToTableReader reads a table from an SQL database, outputting
 // it as a vtkTable.
 
-#ifndef __vtkDatabaseToTableReader_h
-#define __vtkDatabaseToTableReader_h
+#ifndef vtkDatabaseToTableReader_h
+#define vtkDatabaseToTableReader_h
 
 #include "vtkIOSQLModule.h" // For export macro
 #include <string> // STL Header
diff --git a/IO/SQL/vtkRowQuery.h b/IO/SQL/vtkRowQuery.h
index c840c71304b362a844a13cd53efb5fdb87d83816..a39cfbb586927f2f840914c1187b35a5f535b70e 100644
--- a/IO/SQL/vtkRowQuery.h
+++ b/IO/SQL/vtkRowQuery.h
@@ -47,8 +47,8 @@
 // .SECTION See Also
 // vtkRowQueryToTable
 
-#ifndef __vtkRowQuery_h
-#define __vtkRowQuery_h
+#ifndef vtkRowQuery_h
+#define vtkRowQuery_h
 
 #include "vtkIOSQLModule.h" // For export macro
 #include "vtkObject.h"
@@ -133,5 +133,5 @@ private:
   void operator=(const vtkRowQuery &); // Not implemented.
 };
 
-#endif // __vtkRowQuery_h
+#endif // vtkRowQuery_h
 
diff --git a/IO/SQL/vtkRowQueryToTable.h b/IO/SQL/vtkRowQueryToTable.h
index af53ccf324192910f4f541e4dbdac42a1e682c63..c748e6bd113f966febbb38ebcbf41e9a5899eb4b 100644
--- a/IO/SQL/vtkRowQueryToTable.h
+++ b/IO/SQL/vtkRowQueryToTable.h
@@ -32,8 +32,8 @@
 // .SECTION See Also
 // vtkSQLDatabase vtkRowQuery
 
-#ifndef __vtkRowQueryToTable_h
-#define __vtkRowQueryToTable_h
+#ifndef vtkRowQueryToTable_h
+#define vtkRowQueryToTable_h
 
 #include "vtkIOSQLModule.h" // For export macro
 #include "vtkTableAlgorithm.h"
diff --git a/IO/SQL/vtkSQLDatabase.h b/IO/SQL/vtkSQLDatabase.h
index 679aed9b83faed629df896080aee0d992f870209..ad516555bbcd0bd555f5b035141a459aa6e22838 100644
--- a/IO/SQL/vtkSQLDatabase.h
+++ b/IO/SQL/vtkSQLDatabase.h
@@ -47,8 +47,8 @@ PURPOSE.  See the above copyright notice for more information.
 // vtkSQLQuery
 // vtkSQLDatabaseSchema
 
-#ifndef __vtkSQLDatabase_h
-#define __vtkSQLDatabase_h
+#ifndef vtkSQLDatabase_h
+#define vtkSQLDatabase_h
 
 #include "vtkIOSQLModule.h" // For export macro
 #include "vtkObject.h"
@@ -238,4 +238,4 @@ private:
 //ETX
 };
 
-#endif // __vtkSQLDatabase_h
+#endif // vtkSQLDatabase_h
diff --git a/IO/SQL/vtkSQLDatabaseGraphSource.h b/IO/SQL/vtkSQLDatabaseGraphSource.h
index a97d3b4c20a682028e5961208a6dc632453e9145..2484c7bebe2493bf7c015252270a27f6e884790c 100644
--- a/IO/SQL/vtkSQLDatabaseGraphSource.h
+++ b/IO/SQL/vtkSQLDatabaseGraphSource.h
@@ -24,8 +24,8 @@
 // provide a convenience class for generating graphs from databases.
 // Also this class can be easily wrapped and used within ParaView / OverView.
 
-#ifndef __vtkSQLDatabaseGraphSource_h
-#define __vtkSQLDatabaseGraphSource_h
+#ifndef vtkSQLDatabaseGraphSource_h
+#define vtkSQLDatabaseGraphSource_h
 
 #include "vtkIOSQLModule.h" // For export macro
 #include "vtkStdString.h"
diff --git a/IO/SQL/vtkSQLDatabaseSchema.h b/IO/SQL/vtkSQLDatabaseSchema.h
index fa3679c528fc40f2cedad46a9a9969e09badfd32..91adfa9ea96114da6ad54890c19411e71fc28943 100644
--- a/IO/SQL/vtkSQLDatabaseSchema.h
+++ b/IO/SQL/vtkSQLDatabaseSchema.h
@@ -37,8 +37,8 @@ PURPOSE.  See the above copyright notice for more information.
 // .SECTION See Also
 // vtkSQLDatabase
 
-#ifndef __vtkSQLDatabaseSchema_h
-#define __vtkSQLDatabaseSchema_h
+#ifndef vtkSQLDatabaseSchema_h
+#define vtkSQLDatabaseSchema_h
 
 #include "vtkIOSQLModule.h" // For export macro
 #include "vtkObject.h"
@@ -390,4 +390,4 @@ class VTKIOSQL_EXPORT vtkSQLDatabaseSchema : public vtkObject
   void operator=(const vtkSQLDatabaseSchema &); // Not implemented.
 };
 
-#endif // __vtkSQLDatabaseSchema_h
+#endif // vtkSQLDatabaseSchema_h
diff --git a/IO/SQL/vtkSQLDatabaseTableSource.h b/IO/SQL/vtkSQLDatabaseTableSource.h
index 98e7fab666859ea5bb0e0433614e66c8b25d71f6..c07b1b7bd8478b8838d87d93cb87f4288d6c040c 100644
--- a/IO/SQL/vtkSQLDatabaseTableSource.h
+++ b/IO/SQL/vtkSQLDatabaseTableSource.h
@@ -24,8 +24,8 @@
 // provide a convenience class for generating tables from databases.
 // Also this class can be easily wrapped and used within ParaView / OverView.
 
-#ifndef __vtkSQLDatabaseTableSource_h
-#define __vtkSQLDatabaseTableSource_h
+#ifndef vtkSQLDatabaseTableSource_h
+#define vtkSQLDatabaseTableSource_h
 
 #include "vtkIOSQLModule.h" // For export macro
 #include "vtkStdString.h"
diff --git a/IO/SQL/vtkSQLGraphReader.h b/IO/SQL/vtkSQLGraphReader.h
index 0bbf796002f1d1f1bd6a9c82d67ad601bc3a7c40..a422fb3e33f1082fa854d7a24a196cea00a5e517 100644
--- a/IO/SQL/vtkSQLGraphReader.h
+++ b/IO/SQL/vtkSQLGraphReader.h
@@ -50,8 +50,8 @@
 // These arrays must be data arrays.  The z-coordinate array is optional,
 // and if not given the z-coordinates are set to zero.
 
-#ifndef __vtkSQLGraphReader_h
-#define __vtkSQLGraphReader_h
+#ifndef vtkSQLGraphReader_h
+#define vtkSQLGraphReader_h
 
 #include "vtkIOSQLModule.h" // For export macro
 #include "vtkGraphAlgorithm.h"
diff --git a/IO/SQL/vtkSQLQuery.h b/IO/SQL/vtkSQLQuery.h
index 4d7bc56678d1567a97d2b7cc166bcc7117aaac7e..223002ba4d51b38a4fbc5678af77c36bbd8bacad 100644
--- a/IO/SQL/vtkSQLQuery.h
+++ b/IO/SQL/vtkSQLQuery.h
@@ -51,8 +51,8 @@
 // .SECTION See Also
 // vtkSQLDatabase
 
-#ifndef __vtkSQLQuery_h
-#define __vtkSQLQuery_h
+#ifndef vtkSQLQuery_h
+#define vtkSQLQuery_h
 
 #include "vtkIOSQLModule.h" // For export macro
 #include "vtkRowQuery.h"
@@ -208,5 +208,5 @@ private:
   void operator=(const vtkSQLQuery &); // Not implemented.
 };
 
-#endif // __vtkSQLQuery_h
+#endif // vtkSQLQuery_h
 
diff --git a/IO/SQL/vtkSQLiteDatabase.h b/IO/SQL/vtkSQLiteDatabase.h
index 1deb13acf054faf7fa7f0fa87f752e3002beae6c..640355ad49d515021755dce65e28186705f22834 100644
--- a/IO/SQL/vtkSQLiteDatabase.h
+++ b/IO/SQL/vtkSQLiteDatabase.h
@@ -40,8 +40,8 @@
 // .SECTION See Also
 // vtkSQLiteQuery
 
-#ifndef __vtkSQLiteDatabase_h
-#define __vtkSQLiteDatabase_h
+#ifndef vtkSQLiteDatabase_h
+#define vtkSQLiteDatabase_h
 
 #include "vtkIOSQLModule.h" // For export macro
 #include "vtkSQLDatabase.h"
@@ -164,5 +164,5 @@ private:
   void operator=(const vtkSQLiteDatabase &); // Not implemented.
 };
 
-#endif // __vtkSQLiteDatabase_h
+#endif // vtkSQLiteDatabase_h
 
diff --git a/IO/SQL/vtkSQLiteQuery.h b/IO/SQL/vtkSQLiteQuery.h
index 1605d735e37db6d489c4541d8607d4d07c1607a4..bfab39a3ca955a7fafc4c1d12e435f01b67d1e76 100644
--- a/IO/SQL/vtkSQLiteQuery.h
+++ b/IO/SQL/vtkSQLiteQuery.h
@@ -38,8 +38,8 @@
 // .SECTION See Also
 // vtkSQLDatabase vtkSQLQuery vtkSQLiteDatabase
 
-#ifndef __vtkSQLiteQuery_h
-#define __vtkSQLiteQuery_h
+#ifndef vtkSQLiteQuery_h
+#define vtkSQLiteQuery_h
 
 #include "vtkIOSQLModule.h" // For export macro
 #include "vtkSQLQuery.h"
@@ -172,5 +172,5 @@ private:
 
 };
 
-#endif // __vtkSQLiteQuery_h
+#endif // vtkSQLiteQuery_h
 
diff --git a/IO/SQL/vtkSQLiteToTableReader.h b/IO/SQL/vtkSQLiteToTableReader.h
index a528ab0980216ed4455a16db2e60646cc09e99ed..1f77b7a78b6598de18434e5319e6543d407decc1 100644
--- a/IO/SQL/vtkSQLiteToTableReader.h
+++ b/IO/SQL/vtkSQLiteToTableReader.h
@@ -17,8 +17,8 @@
 // vtkSQLiteToTableReader reads a table from an SQLite database and
 // outputs it as a vtkTable.
 
-#ifndef __vtkSQLiteToTableReader_h
-#define __vtkSQLiteToTableReader_h
+#ifndef vtkSQLiteToTableReader_h
+#define vtkSQLiteToTableReader_h
 
 #include "vtkIOSQLModule.h" // For export macro
 #include "vtkDatabaseToTableReader.h"
diff --git a/IO/SQL/vtkTableToDatabaseWriter.h b/IO/SQL/vtkTableToDatabaseWriter.h
index b3ce8fa811c8597a47a443b8582f67f0d3889af3..6d441fa734d9ce8e3adfb458c308b1dfa23d50d9 100644
--- a/IO/SQL/vtkTableToDatabaseWriter.h
+++ b/IO/SQL/vtkTableToDatabaseWriter.h
@@ -18,8 +18,8 @@
 // vtkTableToDatabaseWriter abstract parent class that reads a vtkTable and
 // inserts it into an SQL database.
 
-#ifndef __vtkTableToDatabaseWriter_h
-#define __vtkTableToDatabaseWriter_h
+#ifndef vtkTableToDatabaseWriter_h
+#define vtkTableToDatabaseWriter_h
 
 #include "vtkIOSQLModule.h" // For export macro
 #include <string> // STL Header
diff --git a/IO/SQL/vtkTableToSQLiteWriter.h b/IO/SQL/vtkTableToSQLiteWriter.h
index 137bf4638c6a57df6af1d4dde973a12161d1f928..5b00fc893b9c3c2c1e5adf4b5eeef37a3640b831 100644
--- a/IO/SQL/vtkTableToSQLiteWriter.h
+++ b/IO/SQL/vtkTableToSQLiteWriter.h
@@ -17,8 +17,8 @@
 // vtkTableToSQLiteWriter reads a vtkTable and inserts it into an SQLite
 // database.
 
-#ifndef __vtkTableToSQLiteWriter_h
-#define __vtkTableToSQLiteWriter_h
+#ifndef vtkTableToSQLiteWriter_h
+#define vtkTableToSQLiteWriter_h
 
 #include "vtkIOSQLModule.h" // For export macro
 #include "vtkTableToDatabaseWriter.h"
diff --git a/IO/VPIC/vtkVPICReader.h b/IO/VPIC/vtkVPICReader.h
index 72d15488e9764bd53e1e04878e4ee95f60797513..d11576217ae2080ec2ebd51d33a1666809ea3415 100644
--- a/IO/VPIC/vtkVPICReader.h
+++ b/IO/VPIC/vtkVPICReader.h
@@ -23,8 +23,8 @@
 // vtkPolyDataReader vtkStructuredPointsReader vtkStructuredGridReader
 // vtkUnstructuredGridReader vtkRectilinearGridReader
 
-#ifndef __vtkVPICReader_h
-#define __vtkVPICReader_h
+#ifndef vtkVPICReader_h
+#define vtkVPICReader_h
 
 #include "vtkIOVPICModule.h" // For export macro
 #include "vtkImageAlgorithm.h"
diff --git a/IO/Video/vtkMILVideoSource.h b/IO/Video/vtkMILVideoSource.h
index 24f6a22a25a6b2fc168f7cfd346597cbe3212a39..0dc19d86b08d718b24b31906e8ea3ce8fcbd00df 100644
--- a/IO/Video/vtkMILVideoSource.h
+++ b/IO/Video/vtkMILVideoSource.h
@@ -26,8 +26,8 @@
 // .SECTION See Also
 // vtkWin32VideoSource vtkVideoSource
 
-#ifndef __vtkMILVideoSource_h
-#define __vtkMILVideoSource_h
+#ifndef vtkMILVideoSource_h
+#define vtkMILVideoSource_h
 
 #include "vtkIOVideoModule.h" // For export macro
 #include "vtkVideoSource.h"
diff --git a/IO/Video/vtkVideoSource.h b/IO/Video/vtkVideoSource.h
index 9af43eae6fff882f982dfdb613338d49c626a9c5..fd52a5cedeca49c817c66a5948a4f0841adb5c27 100644
--- a/IO/Video/vtkVideoSource.h
+++ b/IO/Video/vtkVideoSource.h
@@ -26,8 +26,8 @@
 // .SECTION See Also
 // vtkWin32VideoSource vtkMILVideoSource
 
-#ifndef __vtkVideoSource_h
-#define __vtkVideoSource_h
+#ifndef vtkVideoSource_h
+#define vtkVideoSource_h
 
 #include "vtkIOVideoModule.h" // For export macro
 #include "vtkImageAlgorithm.h"
diff --git a/IO/Video/vtkWin32VideoSource.h b/IO/Video/vtkWin32VideoSource.h
index 359a9992e1017af073f95e58dfdb5084a1d52992..34b50c256a4bb254cd58c4f79088604aafe8d976 100644
--- a/IO/Video/vtkWin32VideoSource.h
+++ b/IO/Video/vtkWin32VideoSource.h
@@ -25,8 +25,8 @@
 // .SECTION See Also
 // vtkVideoSource vtkMILVideoSource
 
-#ifndef __vtkWin32VideoSource_h
-#define __vtkWin32VideoSource_h
+#ifndef vtkWin32VideoSource_h
+#define vtkWin32VideoSource_h
 
 #include "vtkIOVideoModule.h" // For export macro
 #include "vtkVideoSource.h"
diff --git a/IO/XML/vtkRTXMLPolyDataReader.h b/IO/XML/vtkRTXMLPolyDataReader.h
index b46871541569f4aca569a76538e61166c49f5ca3..89323b16d17bcab9daa572641f5a818c0f880f72 100644
--- a/IO/XML/vtkRTXMLPolyDataReader.h
+++ b/IO/XML/vtkRTXMLPolyDataReader.h
@@ -18,8 +18,8 @@
 
 // .SECTION See Also
 
-#ifndef __vtkRTXMLPolyDataReader_h
-#define __vtkRTXMLPolyDataReader_h
+#ifndef vtkRTXMLPolyDataReader_h
+#define vtkRTXMLPolyDataReader_h
 
 #include "vtkIOXMLModule.h" // For export macro
 #include "vtkXMLPolyDataReader.h"
diff --git a/IO/XML/vtkXMLCompositeDataReader.h b/IO/XML/vtkXMLCompositeDataReader.h
index 22adf51cdf0ec32a9b025646371dcaf38456d1ef..f6e6f9b8533097e360a23eb696d35dc305a83d6d 100644
--- a/IO/XML/vtkXMLCompositeDataReader.h
+++ b/IO/XML/vtkXMLCompositeDataReader.h
@@ -23,8 +23,8 @@
 // number of processors, each processor will possibly have more than
 // 1 sub-block.
 
-#ifndef __vtkXMLCompositeDataReader_h
-#define __vtkXMLCompositeDataReader_h
+#ifndef vtkXMLCompositeDataReader_h
+#define vtkXMLCompositeDataReader_h
 
 #include "vtkIOXMLModule.h" // For export macro
 #include "vtkXMLReader.h"
diff --git a/IO/XML/vtkXMLCompositeDataWriter.h b/IO/XML/vtkXMLCompositeDataWriter.h
index e6245581bc5b74df620c13973fd70433ec48b747..0b3e22b33ba14078475b7195e4f7d8ebba719f3c 100644
--- a/IO/XML/vtkXMLCompositeDataWriter.h
+++ b/IO/XML/vtkXMLCompositeDataWriter.h
@@ -20,8 +20,8 @@
 // .SECTION See Also
 // vtkXMLPCompositeDataWriter
 
-#ifndef __vtkXMLCompositeDataWriter_h
-#define __vtkXMLCompositeDataWriter_h
+#ifndef vtkXMLCompositeDataWriter_h
+#define vtkXMLCompositeDataWriter_h
 
 #include "vtkIOXMLModule.h" // For export macro
 #include "vtkXMLWriter.h"
diff --git a/IO/XML/vtkXMLDataReader.h b/IO/XML/vtkXMLDataReader.h
index ed992f08257f29df53de55ab3cd39446651040cd..0b1420259cb90cea2accebf00280e93c3135481d 100644
--- a/IO/XML/vtkXMLDataReader.h
+++ b/IO/XML/vtkXMLDataReader.h
@@ -21,8 +21,8 @@
 // .SECTION See Also
 // vtkXMLPDataReader
 
-#ifndef __vtkXMLDataReader_h
-#define __vtkXMLDataReader_h
+#ifndef vtkXMLDataReader_h
+#define vtkXMLDataReader_h
 
 #include "vtkIOXMLModule.h" // For export macro
 #include "vtkXMLReader.h"
diff --git a/IO/XML/vtkXMLDataSetWriter.h b/IO/XML/vtkXMLDataSetWriter.h
index 873b965c9bdaca7c87cca3e75b2976950e62e308..e700ef2be8b43eebad6e0ce2c8eccdb20358aa20 100644
--- a/IO/XML/vtkXMLDataSetWriter.h
+++ b/IO/XML/vtkXMLDataSetWriter.h
@@ -23,8 +23,8 @@
 // vtkXMLRectilinearGridWriter vtkXMLPolyDataWriter
 // vtkXMLUnstructuredGridWriter
 
-#ifndef __vtkXMLDataSetWriter_h
-#define __vtkXMLDataSetWriter_h
+#ifndef vtkXMLDataSetWriter_h
+#define vtkXMLDataSetWriter_h
 
 #include "vtkIOXMLModule.h" // For export macro
 #include "vtkXMLWriter.h"
diff --git a/IO/XML/vtkXMLFileReadTester.h b/IO/XML/vtkXMLFileReadTester.h
index c87f71a5c2d72e2243f75edea89694a54f31513e..add7737a0f29b88700636a40d7fd8aab4904cefe 100644
--- a/IO/XML/vtkXMLFileReadTester.h
+++ b/IO/XML/vtkXMLFileReadTester.h
@@ -18,8 +18,8 @@
 // determine whether it is a VTK XML file.  If so, it extracts the
 // file type and version number.
 
-#ifndef __vtkXMLFileReadTester_h
-#define __vtkXMLFileReadTester_h
+#ifndef vtkXMLFileReadTester_h
+#define vtkXMLFileReadTester_h
 
 #include "vtkIOXMLModule.h" // For export macro
 #include "vtkXMLParser.h"
diff --git a/IO/XML/vtkXMLGenericDataObjectReader.h b/IO/XML/vtkXMLGenericDataObjectReader.h
index b633054a7a10fa6a0d1a8b66f2fbab70d333f14c..0a9bbc61f72de5d2a65cb4398502e344b3ff0ec3 100644
--- a/IO/XML/vtkXMLGenericDataObjectReader.h
+++ b/IO/XML/vtkXMLGenericDataObjectReader.h
@@ -20,8 +20,8 @@
 // .SECTION See Also
 // vtkGenericDataObjectReader
 
-#ifndef __vtkXMLGenericDataObjectReader_h
-#define __vtkXMLGenericDataObjectReader_h
+#ifndef vtkXMLGenericDataObjectReader_h
+#define vtkXMLGenericDataObjectReader_h
 
 #include "vtkIOXMLModule.h" // For export macro
 #include "vtkXMLDataReader.h"
diff --git a/IO/XML/vtkXMLHierarchicalBoxDataFileConverter.h b/IO/XML/vtkXMLHierarchicalBoxDataFileConverter.h
index 71e02add97600dc3823fc5aa17790f06935225a1..c6affe92bd4126f121c77be610654e1c842893f9 100644
--- a/IO/XML/vtkXMLHierarchicalBoxDataFileConverter.h
+++ b/IO/XML/vtkXMLHierarchicalBoxDataFileConverter.h
@@ -19,8 +19,8 @@
 // v1.0 of the VTK XML hierarchical file format to the v1.1. Users can then use
 // vtkXMLUniformGridAMRReader to read the dataset into VTK.
 
-#ifndef __vtkXMLHierarchicalBoxDataFileConverter_h
-#define __vtkXMLHierarchicalBoxDataFileConverter_h
+#ifndef vtkXMLHierarchicalBoxDataFileConverter_h
+#define vtkXMLHierarchicalBoxDataFileConverter_h
 
 #include "vtkObject.h"
 #include "vtkIOXMLModule.h" // needed for export macro.
diff --git a/IO/XML/vtkXMLHierarchicalBoxDataReader.h b/IO/XML/vtkXMLHierarchicalBoxDataReader.h
index 3ce0a9be4687e2edee1501529eb962038e221a14..f7852faf1ce9069049a5db9f31c0d327e8bca9ea 100644
--- a/IO/XML/vtkXMLHierarchicalBoxDataReader.h
+++ b/IO/XML/vtkXMLHierarchicalBoxDataReader.h
@@ -24,8 +24,8 @@
 // The reader supports reading v1.1 and above. For older versions, use
 // vtkXMLHierarchicalBoxDataFileConverter.
 
-#ifndef __vtkXMLHierarchicalBoxDataReader_h
-#define __vtkXMLHierarchicalBoxDataReader_h
+#ifndef vtkXMLHierarchicalBoxDataReader_h
+#define vtkXMLHierarchicalBoxDataReader_h
 
 #include "vtkXMLUniformGridAMRReader.h"
 
diff --git a/IO/XML/vtkXMLHierarchicalBoxDataWriter.h b/IO/XML/vtkXMLHierarchicalBoxDataWriter.h
index f4b001f03159da1609cae8eadc1ce53f56bbc2fa..80afaa91a7ddaf5e3aa96d61e783621bc77b13f7 100644
--- a/IO/XML/vtkXMLHierarchicalBoxDataWriter.h
+++ b/IO/XML/vtkXMLHierarchicalBoxDataWriter.h
@@ -19,8 +19,8 @@
 // vtkXMLUniformGridAMRWriter for writing vtkUniformGridAMR datasets in
 // VTK-XML format.
 
-#ifndef __vtkXMLHierarchicalBoxDataWriter_h
-#define __vtkXMLHierarchicalBoxDataWriter_h
+#ifndef vtkXMLHierarchicalBoxDataWriter_h
+#define vtkXMLHierarchicalBoxDataWriter_h
 
 #include "vtkXMLUniformGridAMRWriter.h"
 
diff --git a/IO/XML/vtkXMLHierarchicalDataReader.h b/IO/XML/vtkXMLHierarchicalDataReader.h
index ed93e42d7205867d32cdfa8546eb864ac68311de..0a4e2bc0fb68cf386099bb094f6972d28fca393a 100644
--- a/IO/XML/vtkXMLHierarchicalDataReader.h
+++ b/IO/XML/vtkXMLHierarchicalDataReader.h
@@ -23,8 +23,8 @@
 // number of processors, each processor will possibly have more than
 // 1 sub-block.
 
-#ifndef __vtkXMLHierarchicalDataReader_h
-#define __vtkXMLHierarchicalDataReader_h
+#ifndef vtkXMLHierarchicalDataReader_h
+#define vtkXMLHierarchicalDataReader_h
 
 #include "vtkIOXMLModule.h" // For export macro
 #include "vtkXMLMultiGroupDataReader.h"
diff --git a/IO/XML/vtkXMLHyperOctreeReader.h b/IO/XML/vtkXMLHyperOctreeReader.h
index 0428e6172f98f6e89d8ac7ca73cecb2da7b21552..8030b83eda1658b154c7d35fedda6273faff7a07 100644
--- a/IO/XML/vtkXMLHyperOctreeReader.h
+++ b/IO/XML/vtkXMLHyperOctreeReader.h
@@ -23,8 +23,8 @@
 // .SECTION See Also
 // vtkXMLPHyperOctreeReader
 
-#ifndef __vtkXMLHyperOctreeReader_h
-#define __vtkXMLHyperOctreeReader_h
+#ifndef vtkXMLHyperOctreeReader_h
+#define vtkXMLHyperOctreeReader_h
 
 #include "vtkIOXMLModule.h" // For export macro
 #include "vtkXMLDataReader.h"
diff --git a/IO/XML/vtkXMLHyperOctreeWriter.h b/IO/XML/vtkXMLHyperOctreeWriter.h
index 2e9059f7619c85bf557309263d56157d9e1f3835..74667e68b45871add009be1417f085dd2f61f51c 100644
--- a/IO/XML/vtkXMLHyperOctreeWriter.h
+++ b/IO/XML/vtkXMLHyperOctreeWriter.h
@@ -23,8 +23,8 @@
 // .SECTION See Also
 // vtkXMLPHyperOctreeWriter
 
-#ifndef __vtkXMLHyperOctreeWriter_h
-#define __vtkXMLHyperOctreeWriter_h
+#ifndef vtkXMLHyperOctreeWriter_h
+#define vtkXMLHyperOctreeWriter_h
 
 #include "vtkIOXMLModule.h" // For export macro
 #include "vtkXMLWriter.h"
diff --git a/IO/XML/vtkXMLImageDataReader.h b/IO/XML/vtkXMLImageDataReader.h
index aa7cd7aa9d64993edaf06ee10d21aec5489e53ad..e28b3bc104767623acdbd94a0ed8ca147b168592 100644
--- a/IO/XML/vtkXMLImageDataReader.h
+++ b/IO/XML/vtkXMLImageDataReader.h
@@ -23,8 +23,8 @@
 // .SECTION See Also
 // vtkXMLPImageDataReader
 
-#ifndef __vtkXMLImageDataReader_h
-#define __vtkXMLImageDataReader_h
+#ifndef vtkXMLImageDataReader_h
+#define vtkXMLImageDataReader_h
 
 #include "vtkIOXMLModule.h" // For export macro
 #include "vtkXMLStructuredDataReader.h"
diff --git a/IO/XML/vtkXMLImageDataWriter.h b/IO/XML/vtkXMLImageDataWriter.h
index dc14e5a709726306b424dec47faa9aa3ef170ec1..3f5429c20dcba0412287b3c1dd19b2af498e0b76 100644
--- a/IO/XML/vtkXMLImageDataWriter.h
+++ b/IO/XML/vtkXMLImageDataWriter.h
@@ -23,8 +23,8 @@
 // .SECTION See Also
 // vtkXMLPImageDataWriter
 
-#ifndef __vtkXMLImageDataWriter_h
-#define __vtkXMLImageDataWriter_h
+#ifndef vtkXMLImageDataWriter_h
+#define vtkXMLImageDataWriter_h
 
 #include "vtkIOXMLModule.h" // For export macro
 #include "vtkXMLStructuredDataWriter.h"
diff --git a/IO/XML/vtkXMLMultiBlockDataReader.h b/IO/XML/vtkXMLMultiBlockDataReader.h
index e4c8f41bbb5549f50805771fa5f69927631f960e..40d954ab9bccc8dc18631edf4dc45cb465f5f0eb 100644
--- a/IO/XML/vtkXMLMultiBlockDataReader.h
+++ b/IO/XML/vtkXMLMultiBlockDataReader.h
@@ -23,8 +23,8 @@
 // number of processors, each processor will possibly have more than
 // 1 sub-block.
 
-#ifndef __vtkXMLMultiBlockDataReader_h
-#define __vtkXMLMultiBlockDataReader_h
+#ifndef vtkXMLMultiBlockDataReader_h
+#define vtkXMLMultiBlockDataReader_h
 
 #include "vtkIOXMLModule.h" // For export macro
 #include "vtkXMLCompositeDataReader.h"
diff --git a/IO/XML/vtkXMLMultiBlockDataWriter.h b/IO/XML/vtkXMLMultiBlockDataWriter.h
index ab98766fed3b6e00b93b1a7a47fc2162d2352ed9..f6bcfa5e5bc265d67283fd26ecde004528d5beb7 100644
--- a/IO/XML/vtkXMLMultiBlockDataWriter.h
+++ b/IO/XML/vtkXMLMultiBlockDataWriter.h
@@ -16,8 +16,8 @@
 // .SECTION Description
 // vtkXMLMultiBlockDataWriter is a vtkXMLCompositeDataWriter subclass to handle
 // vtkMultiBlockDataSet.
-#ifndef __vtkXMLMultiBlockDataWriter_h
-#define __vtkXMLMultiBlockDataWriter_h
+#ifndef vtkXMLMultiBlockDataWriter_h
+#define vtkXMLMultiBlockDataWriter_h
 
 #include "vtkIOXMLModule.h" // For export macro
 #include "vtkXMLCompositeDataWriter.h"
diff --git a/IO/XML/vtkXMLMultiGroupDataReader.h b/IO/XML/vtkXMLMultiGroupDataReader.h
index 450b1f223d3475a6259d2cdcaf4804452bfc42f6..acdca6139a81f5f626a15e097eb864f306e0fd68 100644
--- a/IO/XML/vtkXMLMultiGroupDataReader.h
+++ b/IO/XML/vtkXMLMultiGroupDataReader.h
@@ -17,8 +17,8 @@
 // vtkXMLMultiGroupDataReader is a legacy reader that reads multi group files
 // into multiblock datasets.
 
-#ifndef __vtkXMLMultiGroupDataReader_h
-#define __vtkXMLMultiGroupDataReader_h
+#ifndef vtkXMLMultiGroupDataReader_h
+#define vtkXMLMultiGroupDataReader_h
 
 #include "vtkIOXMLModule.h" // For export macro
 #include "vtkXMLMultiBlockDataReader.h"
diff --git a/IO/XML/vtkXMLOffsetsManager.h b/IO/XML/vtkXMLOffsetsManager.h
index 8836d232df91ae70a1c4678de4986aab2e245aac..793e51e3e2a5ae1d69f43da2d2a114ce5636eed1 100644
--- a/IO/XML/vtkXMLOffsetsManager.h
+++ b/IO/XML/vtkXMLOffsetsManager.h
@@ -40,8 +40,8 @@
 #error "do not include unless you know what you are doing"
 #endif
 
-#ifndef __vtkXMLOffsetsManager_h
-#define __vtkXMLOffsetsManager_h
+#ifndef vtkXMLOffsetsManager_h
+#define vtkXMLOffsetsManager_h
 
 #include "vtkSystemIncludes.h"
 #include <vector>
diff --git a/IO/XML/vtkXMLPDataReader.h b/IO/XML/vtkXMLPDataReader.h
index 41fd1e9ba31b3e47672e768756079b93f4bcecae..8c15221ddb7337206b7d08f476e93d66eb6a4b75 100644
--- a/IO/XML/vtkXMLPDataReader.h
+++ b/IO/XML/vtkXMLPDataReader.h
@@ -21,8 +21,8 @@
 // .SECTION See Also
 // vtkXMLDataReader
 
-#ifndef __vtkXMLPDataReader_h
-#define __vtkXMLPDataReader_h
+#ifndef vtkXMLPDataReader_h
+#define vtkXMLPDataReader_h
 
 #include "vtkIOXMLModule.h" // For export macro
 #include "vtkXMLReader.h"
diff --git a/IO/XML/vtkXMLPImageDataReader.h b/IO/XML/vtkXMLPImageDataReader.h
index f9cddafbd290d57319a403abae1b5f7ce3c1c91c..ac27c3637a7f47d618daa8c22b1b0dec0018c7ca 100644
--- a/IO/XML/vtkXMLPImageDataReader.h
+++ b/IO/XML/vtkXMLPImageDataReader.h
@@ -23,8 +23,8 @@
 // .SECTION See Also
 // vtkXMLImageDataReader
 
-#ifndef __vtkXMLPImageDataReader_h
-#define __vtkXMLPImageDataReader_h
+#ifndef vtkXMLPImageDataReader_h
+#define vtkXMLPImageDataReader_h
 
 #include "vtkIOXMLModule.h" // For export macro
 #include "vtkXMLPStructuredDataReader.h"
diff --git a/IO/XML/vtkXMLPPolyDataReader.h b/IO/XML/vtkXMLPPolyDataReader.h
index a1a1b9d03d3d05e4e7b59ce99fe0c21bdcb4e12f..2143c981fc2e7e84f067ef3572bf600b05ec98c3 100644
--- a/IO/XML/vtkXMLPPolyDataReader.h
+++ b/IO/XML/vtkXMLPPolyDataReader.h
@@ -23,8 +23,8 @@
 // .SECTION See Also
 // vtkXMLPolyDataReader
 
-#ifndef __vtkXMLPPolyDataReader_h
-#define __vtkXMLPPolyDataReader_h
+#ifndef vtkXMLPPolyDataReader_h
+#define vtkXMLPPolyDataReader_h
 
 #include "vtkIOXMLModule.h" // For export macro
 #include "vtkXMLPUnstructuredDataReader.h"
diff --git a/IO/XML/vtkXMLPRectilinearGridReader.h b/IO/XML/vtkXMLPRectilinearGridReader.h
index eff9b4f38c8ad0cfd8df7dabbb4fd38794a24edf..51bdb50ec82af2fc746997ada8e9303086d903c0 100644
--- a/IO/XML/vtkXMLPRectilinearGridReader.h
+++ b/IO/XML/vtkXMLPRectilinearGridReader.h
@@ -23,8 +23,8 @@
 // .SECTION See Also
 // vtkXMLRectilinearGridReader
 
-#ifndef __vtkXMLPRectilinearGridReader_h
-#define __vtkXMLPRectilinearGridReader_h
+#ifndef vtkXMLPRectilinearGridReader_h
+#define vtkXMLPRectilinearGridReader_h
 
 #include "vtkIOXMLModule.h" // For export macro
 #include "vtkXMLPStructuredDataReader.h"
diff --git a/IO/XML/vtkXMLPStructuredDataReader.h b/IO/XML/vtkXMLPStructuredDataReader.h
index 9dbfca2eee89863049195fa3b6f00eb666f94aa5..3112c595c92160b14bfaf402ce7467d1355b36c4 100644
--- a/IO/XML/vtkXMLPStructuredDataReader.h
+++ b/IO/XML/vtkXMLPStructuredDataReader.h
@@ -21,8 +21,8 @@
 // vtkXMLPImageDataReader vtkXMLPStructuredGridReader
 // vtkXMLPRectilinearGridReader
 
-#ifndef __vtkXMLPStructuredDataReader_h
-#define __vtkXMLPStructuredDataReader_h
+#ifndef vtkXMLPStructuredDataReader_h
+#define vtkXMLPStructuredDataReader_h
 
 #include "vtkIOXMLModule.h" // For export macro
 #include "vtkXMLPDataReader.h"
diff --git a/IO/XML/vtkXMLPStructuredGridReader.h b/IO/XML/vtkXMLPStructuredGridReader.h
index c22ebfc78ed58a850579fb00bd194c8d8cd65cc9..050d627c39bf80fdbf93040a917316062fd4d433 100644
--- a/IO/XML/vtkXMLPStructuredGridReader.h
+++ b/IO/XML/vtkXMLPStructuredGridReader.h
@@ -23,8 +23,8 @@
 // .SECTION See Also
 // vtkXMLStructuredGridReader
 
-#ifndef __vtkXMLPStructuredGridReader_h
-#define __vtkXMLPStructuredGridReader_h
+#ifndef vtkXMLPStructuredGridReader_h
+#define vtkXMLPStructuredGridReader_h
 
 #include "vtkIOXMLModule.h" // For export macro
 #include "vtkXMLPStructuredDataReader.h"
diff --git a/IO/XML/vtkXMLPUnstructuredDataReader.h b/IO/XML/vtkXMLPUnstructuredDataReader.h
index 0153901983b893e956ed5563c59363b9463ee967..69db0560b9a9a3347450cbc8f0129e2c619edb4c 100644
--- a/IO/XML/vtkXMLPUnstructuredDataReader.h
+++ b/IO/XML/vtkXMLPUnstructuredDataReader.h
@@ -20,8 +20,8 @@
 // .SECTION See Also
 // vtkXMLPPolyDataReader vtkXMLPUnstructuredGridReader
 
-#ifndef __vtkXMLPUnstructuredDataReader_h
-#define __vtkXMLPUnstructuredDataReader_h
+#ifndef vtkXMLPUnstructuredDataReader_h
+#define vtkXMLPUnstructuredDataReader_h
 
 #include "vtkIOXMLModule.h" // For export macro
 #include "vtkXMLPDataReader.h"
diff --git a/IO/XML/vtkXMLPUnstructuredGridReader.h b/IO/XML/vtkXMLPUnstructuredGridReader.h
index 299a231a9b121f20d4e417190053237b81cc6e5e..4db9344fad7dcd829362c21c371b8aca49eb97ae 100644
--- a/IO/XML/vtkXMLPUnstructuredGridReader.h
+++ b/IO/XML/vtkXMLPUnstructuredGridReader.h
@@ -23,8 +23,8 @@
 // .SECTION See Also
 // vtkXMLUnstructuredGridReader
 
-#ifndef __vtkXMLPUnstructuredGridReader_h
-#define __vtkXMLPUnstructuredGridReader_h
+#ifndef vtkXMLPUnstructuredGridReader_h
+#define vtkXMLPUnstructuredGridReader_h
 
 #include "vtkIOXMLModule.h" // For export macro
 #include "vtkXMLPUnstructuredDataReader.h"
diff --git a/IO/XML/vtkXMLPolyDataReader.h b/IO/XML/vtkXMLPolyDataReader.h
index 5aa23b406ba5aedc729623dced4bf30df81f1f06..f5e8d09feeed8ae474de79862f311eff00182440 100644
--- a/IO/XML/vtkXMLPolyDataReader.h
+++ b/IO/XML/vtkXMLPolyDataReader.h
@@ -23,8 +23,8 @@
 // .SECTION See Also
 // vtkXMLPPolyDataReader
 
-#ifndef __vtkXMLPolyDataReader_h
-#define __vtkXMLPolyDataReader_h
+#ifndef vtkXMLPolyDataReader_h
+#define vtkXMLPolyDataReader_h
 
 #include "vtkIOXMLModule.h" // For export macro
 #include "vtkXMLUnstructuredDataReader.h"
diff --git a/IO/XML/vtkXMLPolyDataWriter.h b/IO/XML/vtkXMLPolyDataWriter.h
index 647ee007cc37ebb120b0da54789a87a35186176b..8584c355504265a864292379014a9aebda4afe27 100644
--- a/IO/XML/vtkXMLPolyDataWriter.h
+++ b/IO/XML/vtkXMLPolyDataWriter.h
@@ -24,8 +24,8 @@
 // .SECTION See Also
 // vtkXMLPPolyDataWriter
 
-#ifndef __vtkXMLPolyDataWriter_h
-#define __vtkXMLPolyDataWriter_h
+#ifndef vtkXMLPolyDataWriter_h
+#define vtkXMLPolyDataWriter_h
 
 #include "vtkIOXMLModule.h" // For export macro
 #include "vtkXMLUnstructuredDataWriter.h"
diff --git a/IO/XML/vtkXMLReader.h b/IO/XML/vtkXMLReader.h
index 9728efba48a59aba5dd95817d174b73cf12cb445..f8539802ea0429faaa6935d02cb050f1fb5e997b 100644
--- a/IO/XML/vtkXMLReader.h
+++ b/IO/XML/vtkXMLReader.h
@@ -18,8 +18,8 @@
 // Concrete subclasses then traverse the parsed file structure and
 // extract data.
 
-#ifndef __vtkXMLReader_h
-#define __vtkXMLReader_h
+#ifndef vtkXMLReader_h
+#define vtkXMLReader_h
 
 #include "vtkIOXMLModule.h" // For export macro
 #include "vtkAlgorithm.h"
diff --git a/IO/XML/vtkXMLRectilinearGridReader.h b/IO/XML/vtkXMLRectilinearGridReader.h
index 84e1c1748ad718ea50cc57e99142db3da5603398..5d2d5d5086f026392150da6f44fedaef7471c4bc 100644
--- a/IO/XML/vtkXMLRectilinearGridReader.h
+++ b/IO/XML/vtkXMLRectilinearGridReader.h
@@ -23,8 +23,8 @@
 // .SECTION See Also
 // vtkXMLPRectilinearGridReader
 
-#ifndef __vtkXMLRectilinearGridReader_h
-#define __vtkXMLRectilinearGridReader_h
+#ifndef vtkXMLRectilinearGridReader_h
+#define vtkXMLRectilinearGridReader_h
 
 #include "vtkIOXMLModule.h" // For export macro
 #include "vtkXMLStructuredDataReader.h"
diff --git a/IO/XML/vtkXMLRectilinearGridWriter.h b/IO/XML/vtkXMLRectilinearGridWriter.h
index 920264d0eaa526e8ffeebae99a202f66c0abea85..ca59688558f28849006407dd7f59da9c40e54b06 100644
--- a/IO/XML/vtkXMLRectilinearGridWriter.h
+++ b/IO/XML/vtkXMLRectilinearGridWriter.h
@@ -23,8 +23,8 @@
 // .SECTION See Also
 // vtkXMLPRectilinearGridWriter
 
-#ifndef __vtkXMLRectilinearGridWriter_h
-#define __vtkXMLRectilinearGridWriter_h
+#ifndef vtkXMLRectilinearGridWriter_h
+#define vtkXMLRectilinearGridWriter_h
 
 #include "vtkIOXMLModule.h" // For export macro
 #include "vtkXMLStructuredDataWriter.h"
diff --git a/IO/XML/vtkXMLStructuredDataReader.h b/IO/XML/vtkXMLStructuredDataReader.h
index bf08fff73bd61302dc23e3d378344500cd01f9f5..b023055557c3879ab81735721dd71de725852e77 100644
--- a/IO/XML/vtkXMLStructuredDataReader.h
+++ b/IO/XML/vtkXMLStructuredDataReader.h
@@ -21,8 +21,8 @@
 // vtkXMLImageDataReader vtkXMLStructuredGridReader
 // vtkXMLRectilinearGridReader
 
-#ifndef __vtkXMLStructuredDataReader_h
-#define __vtkXMLStructuredDataReader_h
+#ifndef vtkXMLStructuredDataReader_h
+#define vtkXMLStructuredDataReader_h
 
 #include "vtkIOXMLModule.h" // For export macro
 #include "vtkXMLDataReader.h"
diff --git a/IO/XML/vtkXMLStructuredDataWriter.h b/IO/XML/vtkXMLStructuredDataWriter.h
index 9c9f8816fbad25ad6555b428c854b35ee643895e..0e70db78b1677d982f3465884e2fa2e71d93358d 100644
--- a/IO/XML/vtkXMLStructuredDataWriter.h
+++ b/IO/XML/vtkXMLStructuredDataWriter.h
@@ -17,8 +17,8 @@
 // vtkXMLStructuredDataWriter provides VTK XML writing functionality that
 // is common among all the structured data formats.
 
-#ifndef __vtkXMLStructuredDataWriter_h
-#define __vtkXMLStructuredDataWriter_h
+#ifndef vtkXMLStructuredDataWriter_h
+#define vtkXMLStructuredDataWriter_h
 
 #include "vtkIOXMLModule.h" // For export macro
 #include "vtkXMLWriter.h"
diff --git a/IO/XML/vtkXMLStructuredGridReader.h b/IO/XML/vtkXMLStructuredGridReader.h
index a32565a759601a00a5bc77b2943d5e0731de6e3e..daade9ba3390c17b3fa91f370b5ee09353c7bbf0 100644
--- a/IO/XML/vtkXMLStructuredGridReader.h
+++ b/IO/XML/vtkXMLStructuredGridReader.h
@@ -23,8 +23,8 @@
 // .SECTION See Also
 // vtkXMLPStructuredGridReader
 
-#ifndef __vtkXMLStructuredGridReader_h
-#define __vtkXMLStructuredGridReader_h
+#ifndef vtkXMLStructuredGridReader_h
+#define vtkXMLStructuredGridReader_h
 
 #include "vtkIOXMLModule.h" // For export macro
 #include "vtkXMLStructuredDataReader.h"
diff --git a/IO/XML/vtkXMLStructuredGridWriter.h b/IO/XML/vtkXMLStructuredGridWriter.h
index 5cbc661b8954068dbaa2e99b31941f73bbb98413..043f8c034638c60acb4cbd4059a4d34ccebc781b 100644
--- a/IO/XML/vtkXMLStructuredGridWriter.h
+++ b/IO/XML/vtkXMLStructuredGridWriter.h
@@ -23,8 +23,8 @@
 // .SECTION See Also
 // vtkXMLPStructuredGridWriter
 
-#ifndef __vtkXMLStructuredGridWriter_h
-#define __vtkXMLStructuredGridWriter_h
+#ifndef vtkXMLStructuredGridWriter_h
+#define vtkXMLStructuredGridWriter_h
 
 #include "vtkIOXMLModule.h" // For export macro
 #include "vtkXMLStructuredDataWriter.h"
diff --git a/IO/XML/vtkXMLUniformGridAMRReader.h b/IO/XML/vtkXMLUniformGridAMRReader.h
index b756c709f4393cd9a8fbea9a1e49d64b66f9a655..dd0f856507aaabb57cdf9f7f88a98207fae41b9d 100644
--- a/IO/XML/vtkXMLUniformGridAMRReader.h
+++ b/IO/XML/vtkXMLUniformGridAMRReader.h
@@ -25,8 +25,8 @@
 // Older versions can be converted to the newer versions using
 // vtkXMLHierarchicalBoxDataFileConverter.
 
-#ifndef __vtkXMLUniformGridAMRReader_h
-#define __vtkXMLUniformGridAMRReader_h
+#ifndef vtkXMLUniformGridAMRReader_h
+#define vtkXMLUniformGridAMRReader_h
 
 #include "vtkIOXMLModule.h" // For export macro
 #include "vtkXMLCompositeDataReader.h"
diff --git a/IO/XML/vtkXMLUniformGridAMRWriter.h b/IO/XML/vtkXMLUniformGridAMRWriter.h
index 310e82b14ed47126cbd847feaae44b06b16601ea..a7d1cffe67b9332700b96f51a05e3930b6be3bf2 100644
--- a/IO/XML/vtkXMLUniformGridAMRWriter.h
+++ b/IO/XML/vtkXMLUniformGridAMRWriter.h
@@ -18,8 +18,8 @@
 // handle vtkUniformGridAMR datasets (including vtkNonOverlappingAMR and
 // vtkOverlappingAMR).
 
-#ifndef __vtkXMLUniformGridAMRWriter_h
-#define __vtkXMLUniformGridAMRWriter_h
+#ifndef vtkXMLUniformGridAMRWriter_h
+#define vtkXMLUniformGridAMRWriter_h
 
 #include "vtkIOXMLModule.h" // For export macro
 #include "vtkXMLCompositeDataWriter.h"
diff --git a/IO/XML/vtkXMLUnstructuredDataReader.h b/IO/XML/vtkXMLUnstructuredDataReader.h
index 1859359916ae72a5f5c8ab1f75fbc52cc48a3006..7997a81a5460e42f21025c4c16bdc57cf5a54669 100644
--- a/IO/XML/vtkXMLUnstructuredDataReader.h
+++ b/IO/XML/vtkXMLUnstructuredDataReader.h
@@ -20,8 +20,8 @@
 // .SECTION See Also
 // vtkXMLPolyDataReader vtkXMLUnstructuredGridReader
 
-#ifndef __vtkXMLUnstructuredDataReader_h
-#define __vtkXMLUnstructuredDataReader_h
+#ifndef vtkXMLUnstructuredDataReader_h
+#define vtkXMLUnstructuredDataReader_h
 
 #include "vtkIOXMLModule.h" // For export macro
 #include "vtkXMLDataReader.h"
diff --git a/IO/XML/vtkXMLUnstructuredDataWriter.h b/IO/XML/vtkXMLUnstructuredDataWriter.h
index 361066b9fdaa8ff43f1f61c7f21af947f88fe419..39b6c19e61643cc8cc7786e75e4fcfcee01fc037 100644
--- a/IO/XML/vtkXMLUnstructuredDataWriter.h
+++ b/IO/XML/vtkXMLUnstructuredDataWriter.h
@@ -17,8 +17,8 @@
 // vtkXMLUnstructuredDataWriter provides VTK XML writing functionality
 // that is common among all the unstructured data formats.
 
-#ifndef __vtkXMLUnstructuredDataWriter_h
-#define __vtkXMLUnstructuredDataWriter_h
+#ifndef vtkXMLUnstructuredDataWriter_h
+#define vtkXMLUnstructuredDataWriter_h
 
 #include "vtkIOXMLModule.h" // For export macro
 #include "vtkXMLWriter.h"
diff --git a/IO/XML/vtkXMLUnstructuredGridReader.h b/IO/XML/vtkXMLUnstructuredGridReader.h
index 299eb8242c57bf9f049d2b7bc9cd8ca5d2bc830f..eebeabcbe54564e3cc3b2534c9d1cbb527603326 100644
--- a/IO/XML/vtkXMLUnstructuredGridReader.h
+++ b/IO/XML/vtkXMLUnstructuredGridReader.h
@@ -23,8 +23,8 @@
 // .SECTION See Also
 // vtkXMLPUnstructuredGridReader
 
-#ifndef __vtkXMLUnstructuredGridReader_h
-#define __vtkXMLUnstructuredGridReader_h
+#ifndef vtkXMLUnstructuredGridReader_h
+#define vtkXMLUnstructuredGridReader_h
 
 #include "vtkIOXMLModule.h" // For export macro
 #include "vtkXMLUnstructuredDataReader.h"
diff --git a/IO/XML/vtkXMLUnstructuredGridWriter.h b/IO/XML/vtkXMLUnstructuredGridWriter.h
index c78c367273a76c7f12f1e86cd73d8d2057337334..2c7f00efbe3415c50623bb2aa7a2c7912bbacf48 100644
--- a/IO/XML/vtkXMLUnstructuredGridWriter.h
+++ b/IO/XML/vtkXMLUnstructuredGridWriter.h
@@ -24,8 +24,8 @@
 // .SECTION See Also
 // vtkXMLPUnstructuredGridWriter
 
-#ifndef __vtkXMLUnstructuredGridWriter_h
-#define __vtkXMLUnstructuredGridWriter_h
+#ifndef vtkXMLUnstructuredGridWriter_h
+#define vtkXMLUnstructuredGridWriter_h
 
 #include "vtkIOXMLModule.h" // For export macro
 #include "vtkXMLUnstructuredDataWriter.h"
diff --git a/IO/XML/vtkXMLWriter.h b/IO/XML/vtkXMLWriter.h
index d9b7ecf9be9b81531c2ab255fd924c9f978f1bab..83fa04fce4ef20073d1212a8f6aba28e68ad2e79 100644
--- a/IO/XML/vtkXMLWriter.h
+++ b/IO/XML/vtkXMLWriter.h
@@ -19,8 +19,8 @@
 // subclasses provide actual writer implementations calling upon this
 // functionality.
 
-#ifndef __vtkXMLWriter_h
-#define __vtkXMLWriter_h
+#ifndef vtkXMLWriter_h
+#define vtkXMLWriter_h
 
 #include "vtkIOXMLModule.h" // For export macro
 #include "vtkAlgorithm.h"
diff --git a/IO/XML/vtkXMLWriterC.h b/IO/XML/vtkXMLWriterC.h
index 76c491aff8b57e75bfa80537a13df0aca9b94fd2..13337c70ccdd3a5a4e013297324ae8dd441b40fe 100644
--- a/IO/XML/vtkXMLWriterC.h
+++ b/IO/XML/vtkXMLWriterC.h
@@ -12,8 +12,8 @@
      PURPOSE.  See the above copyright notice for more information.
 
 =========================================================================*/
-#ifndef __vtkXMLWriterC_h
-#define __vtkXMLWriterC_h
+#ifndef vtkXMLWriterC_h
+#define vtkXMLWriterC_h
 
 #include "vtkIOXMLModule.h" // For export macro
 #include "vtkType.h" /* For scalar and vtkDataObject type enumerations.  */
diff --git a/IO/XMLParser/vtkXMLDataHeaderPrivate.h b/IO/XMLParser/vtkXMLDataHeaderPrivate.h
index f2a346ec10a2baec670fd38228d450215dc50c6c..96726144644586a115e99fa09aa57a537426fa3e 100644
--- a/IO/XMLParser/vtkXMLDataHeaderPrivate.h
+++ b/IO/XMLParser/vtkXMLDataHeaderPrivate.h
@@ -17,8 +17,8 @@
 # error "do not include unless you know what you are doing"
 #endif
 
-#ifndef __vtkXMLDataHeaderPrivate_h
-#define __vtkXMLDataHeaderPrivate_h
+#ifndef vtkXMLDataHeaderPrivate_h
+#define vtkXMLDataHeaderPrivate_h
 
 #include "vtkType.h"
 #include <vector>
diff --git a/IO/XMLParser/vtkXMLDataParser.h b/IO/XMLParser/vtkXMLDataParser.h
index fcbd670ae0b194054d4938eedb9c48aa78bfaa7c..9e0258195d0f5863e714dbb2aaaa0a0c602e5da4 100644
--- a/IO/XMLParser/vtkXMLDataParser.h
+++ b/IO/XMLParser/vtkXMLDataParser.h
@@ -23,8 +23,8 @@
 // .SECTION See Also
 // vtkXMLDataElement
 
-#ifndef __vtkXMLDataParser_h
-#define __vtkXMLDataParser_h
+#ifndef vtkXMLDataParser_h
+#define vtkXMLDataParser_h
 
 #include "vtkIOXMLParserModule.h" // For export macro
 #include "vtkXMLParser.h"
diff --git a/IO/XMLParser/vtkXMLParser.h b/IO/XMLParser/vtkXMLParser.h
index 240f83b8a79afe16e4b04970379931f9c23bb681..27c30dc881f16cff8049c730c238cf1a538ecff6 100644
--- a/IO/XMLParser/vtkXMLParser.h
+++ b/IO/XMLParser/vtkXMLParser.h
@@ -21,8 +21,8 @@
 // use the tags.
 // .SECTION ToDo: Add commands for parsing in Tcl.
 
-#ifndef __vtkXMLParser_h
-#define __vtkXMLParser_h
+#ifndef vtkXMLParser_h
+#define vtkXMLParser_h
 
 #include "vtkIOXMLParserModule.h" // For export macro
 #include "vtkObject.h"
diff --git a/IO/XMLParser/vtkXMLUtilities.h b/IO/XMLParser/vtkXMLUtilities.h
index 030f8e2399f6f3c23bc82944e9d0bebc4d8f18bb..401053f6aeac0cd74f3699c62dd334d609e6e35d 100644
--- a/IO/XMLParser/vtkXMLUtilities.h
+++ b/IO/XMLParser/vtkXMLUtilities.h
@@ -18,8 +18,8 @@
 // .SECTION See Also
 // vtkXMLDataElement
 
-#ifndef __vtkXMLUtilities_h
-#define __vtkXMLUtilities_h
+#ifndef vtkXMLUtilities_h
+#define vtkXMLUtilities_h
 
 #include "vtkIOXMLParserModule.h" // For export macro
 #include "vtkObject.h"
diff --git a/IO/Xdmf2/vtkSILBuilder.h b/IO/Xdmf2/vtkSILBuilder.h
index e8bf681e10cf9a5029f211c4b3e24074e608a3a4..b83efe399c99dcf2b9d75de2a08a6a2d2bdafc68 100644
--- a/IO/Xdmf2/vtkSILBuilder.h
+++ b/IO/Xdmf2/vtkSILBuilder.h
@@ -21,8 +21,8 @@
 // the blocks.
 // Refer to http://www.paraview.org/Wiki/Block_Hierarchy_Meta_Data for details.
 
-#ifndef __vtkSILBuilder_h
-#define __vtkSILBuilder_h
+#ifndef vtkSILBuilder_h
+#define vtkSILBuilder_h
 
 #include "vtkIOXdmf2Module.h" // For export macro
 #include "vtkObject.h"
diff --git a/IO/Xdmf2/vtkXdmfHeavyData.h b/IO/Xdmf2/vtkXdmfHeavyData.h
index 638a3602989ac6061d517a83d5e6bef03339c73d..5c1ddb24c98d80fd0c629acbf99631517873546b 100644
--- a/IO/Xdmf2/vtkXdmfHeavyData.h
+++ b/IO/Xdmf2/vtkXdmfHeavyData.h
@@ -14,8 +14,8 @@
 =========================================================================*/
 // VTK-HeaderTest-Exclude: vtkXdmfHeavyData.h
 
-#ifndef __vtkXdmfHeavyData_h
-#define __vtkXdmfHeavyData_h
+#ifndef vtkXdmfHeavyData_h
+#define vtkXdmfHeavyData_h
 
 #include "XdmfDataItem.h"
 #include "XdmfGrid.h" //won't compile without it
diff --git a/IO/Xdmf2/vtkXdmfReader.h b/IO/Xdmf2/vtkXdmfReader.h
index 439d000ea367df8730f299964530974f91e82288..c932de97843ddac8293adc23067d2eb0a9eff8b7 100644
--- a/IO/Xdmf2/vtkXdmfReader.h
+++ b/IO/Xdmf2/vtkXdmfReader.h
@@ -30,8 +30,8 @@
 // .SECTION See Also
 // vtkDataReader
 
-#ifndef __vtkXdmfReader_h
-#define __vtkXdmfReader_h
+#ifndef vtkXdmfReader_h
+#define vtkXdmfReader_h
 
 #include "vtkIOXdmf2Module.h" // For export macro
 #include "vtkDataReader.h"
diff --git a/IO/Xdmf2/vtkXdmfReaderInternal.h b/IO/Xdmf2/vtkXdmfReaderInternal.h
index 2829161686cd83aa45f96fc0f0f20086dc40c3c5..36e7ac9e9073eb51a1bf2d34736ea6b34e632310 100644
--- a/IO/Xdmf2/vtkXdmfReaderInternal.h
+++ b/IO/Xdmf2/vtkXdmfReaderInternal.h
@@ -17,8 +17,8 @@
 
 // VTK-HeaderTest-Exclude: vtkXdmfReaderInternal.h
 
-#ifndef __vtkXdmfReaderInternal_h
-#define __vtkXdmfReaderInternal_h
+#ifndef vtkXdmfReaderInternal_h
+#define vtkXdmfReaderInternal_h
 
 // NAMING CONVENTION *********************************************************
 // * all member variables of the type XdmfXml* begin with XML eg. XMLNode
diff --git a/IO/Xdmf3/vtkXdmf3ArrayKeeper.h b/IO/Xdmf3/vtkXdmf3ArrayKeeper.h
index 665caee71e1f0ad4c52b0d548173ef12f39c856b..434224c96ef9cb12e2b29328fe6537619a28aed9 100644
--- a/IO/Xdmf3/vtkXdmf3ArrayKeeper.h
+++ b/IO/Xdmf3/vtkXdmf3ArrayKeeper.h
@@ -26,8 +26,8 @@
 // part of VTK public API
 // VTK-HeaderTest-Exclude: vtkXdmf3ArrayKeeper.h
 
-#ifndef __vtkXdmf3ArrayKeeper_h
-#define __vtkXdmf3ArrayKeeper_h
+#ifndef vtkXdmf3ArrayKeeper_h
+#define vtkXdmf3ArrayKeeper_h
 
 #include "vtkIOXdmf3Module.h" // For export macro
 #include <map>
@@ -63,4 +63,4 @@ private:
   unsigned int generation;
 };
 
-#endif //__vtkXdmf3ArrayKeeper_h
+#endif //vtkXdmf3ArrayKeeper_h
diff --git a/IO/Xdmf3/vtkXdmf3ArraySelection.h b/IO/Xdmf3/vtkXdmf3ArraySelection.h
index 9e42075fbca10afb3bfe12aaee82b165ff0164ab..5dbd5c6b44a60c37628cfd38dbfd09a22af25e72 100644
--- a/IO/Xdmf3/vtkXdmf3ArraySelection.h
+++ b/IO/Xdmf3/vtkXdmf3ArraySelection.h
@@ -25,8 +25,8 @@
 // part of VTK public API
 // VTK-HeaderTest-Exclude: vtkXdmf3ArraySelection.h
 
-#ifndef __vtkXdmf3ArraySelection_h
-#define __vtkXdmf3ArraySelection_h
+#ifndef vtkXdmf3ArraySelection_h
+#define vtkXdmf3ArraySelection_h
 
 #include "vtkIOXdmf3Module.h" // For export macro
 
@@ -67,4 +67,4 @@ public:
   int GetNumberOfArrays();
 };
 
-#endif //# __vtkXdmf3ArraySelection_h
+#endif //# vtkXdmf3ArraySelection_h
diff --git a/IO/Xdmf3/vtkXdmf3DataSet.h b/IO/Xdmf3/vtkXdmf3DataSet.h
index 35462ae5b0a267208263176ff89297af1d48604f..3dc8bf9ef8e0da48f52cc35d178a80d5ad103ff6 100644
--- a/IO/Xdmf3/vtkXdmf3DataSet.h
+++ b/IO/Xdmf3/vtkXdmf3DataSet.h
@@ -24,8 +24,8 @@
 // not intended to be part of VTK public API
 // VTK-HeaderTest-Exclude: vtkXdmf3DataSet.h
 
-#ifndef __vtkXdmf3DataSet_h
-#define __vtkXdmf3DataSet_h
+#ifndef vtkXdmf3DataSet_h
+#define vtkXdmf3DataSet_h
 
 #include "vtkIOXdmf3Module.h" // For export macro
 #include "XdmfSharedPtr.hpp"
diff --git a/IO/Xdmf3/vtkXdmf3HeavyDataHandler.h b/IO/Xdmf3/vtkXdmf3HeavyDataHandler.h
index 3ef2c6c6acc07866030e8b4da6fef47ea27b3440..11e74a505fffddd7a8a7d95a7b887dea98ef6027 100644
--- a/IO/Xdmf3/vtkXdmf3HeavyDataHandler.h
+++ b/IO/Xdmf3/vtkXdmf3HeavyDataHandler.h
@@ -24,8 +24,8 @@
 // part of VTK public API
 // VTK-HeaderTest-Exclude: vtkXdmf3HeavyDataHandler.h
 
-#ifndef __vtkXdmf3HeavyDataHandler_h
-#define __vtkXdmf3HeavyDataHandler_h
+#ifndef vtkXdmf3HeavyDataHandler_h
+#define vtkXdmf3HeavyDataHandler_h
 
 #include "vtkIOXdmf3Module.h" // For export macro
 
@@ -129,4 +129,4 @@ protected:
   bool AsTime;
 };
 
-#endif //__vtkXdmf3HeavyDataHandler_h
+#endif //vtkXdmf3HeavyDataHandler_h
diff --git a/IO/Xdmf3/vtkXdmf3LightDataHandler.h b/IO/Xdmf3/vtkXdmf3LightDataHandler.h
index b170d4032d09e8380eaab6a591fa2fe0d4a65769..ccbd0d0362067d5566f64367cde30c144af2f9a8 100644
--- a/IO/Xdmf3/vtkXdmf3LightDataHandler.h
+++ b/IO/Xdmf3/vtkXdmf3LightDataHandler.h
@@ -25,8 +25,8 @@
 // part of VTK public API
 // VTK-HeaderTest-Exclude: vtkXdmf3LightDataHandler.h
 
-#ifndef __vtkXdmf3LightDataHandler_h
-#define __vtkXdmf3LightDataHandler_h
+#ifndef vtkXdmf3LightDataHandler_h
+#define vtkXdmf3LightDataHandler_h
 
 #include "vtkIOXdmf3Module.h" // For export macro
 #include <set>
@@ -124,4 +124,4 @@ private:
   std::set<double> times; //relying on implicit sort from set<double>
 };
 
-#endif //__vtkXdmf3LightDataHandler_h
+#endif //vtkXdmf3LightDataHandler_h
diff --git a/IO/Xdmf3/vtkXdmf3Reader.h b/IO/Xdmf3/vtkXdmf3Reader.h
index b542f5b3f3f0c09c377ef1e7eaffcb05417c2d1a..fb0b8117c545e3d6593713e5b0549113e6ca0cab 100644
--- a/IO/Xdmf3/vtkXdmf3Reader.h
+++ b/IO/Xdmf3/vtkXdmf3Reader.h
@@ -26,8 +26,8 @@
 // .SECTION Caveats
 // Uses the XDMF API (http://www.xdmf.org)
 
-#ifndef __vtkXdmf3Reader_h
-#define __vtkXdmf3Reader_h
+#ifndef vtkXdmf3Reader_h
+#define vtkXdmf3Reader_h
 
 #include "vtkIOXdmf3Module.h" // For export macro
 #include "vtkDataReader.h"
diff --git a/IO/Xdmf3/vtkXdmf3SILBuilder.h b/IO/Xdmf3/vtkXdmf3SILBuilder.h
index 1c04cac2c06ffff2f86dd75903bed32831b03ef5..dffe5f2a852b6d376f40ddcae753cf53a52cd7ee 100644
--- a/IO/Xdmf3/vtkXdmf3SILBuilder.h
+++ b/IO/Xdmf3/vtkXdmf3SILBuilder.h
@@ -26,8 +26,8 @@
 // not intended to be part of VTK public API
 // VTK-HeaderTest-Exclude: vtkXdmf3SILBuilder.h
 
-#ifndef __vtkXdmf3SILBuilder_h
-#define __vtkXdmf3SILBuilder_h
+#ifndef vtkXdmf3SILBuilder_h
+#define vtkXdmf3SILBuilder_h
 
 #include "vtkIOXdmf3Module.h" // For export macro
 #include "vtkType.h"
@@ -69,4 +69,4 @@ public:
   ~vtkXdmf3SILBuilder();
 };
 
-#endif //__vtkXdmf3SILBuilder_h
+#endif //vtkXdmf3SILBuilder_h
diff --git a/Imaging/Color/vtkImageHSIToRGB.h b/Imaging/Color/vtkImageHSIToRGB.h
index 8209cd046802378790ccead773b076b85650aacc..5fc61452c5a172ca7cda43393912389a9ee5ea3a 100644
--- a/Imaging/Color/vtkImageHSIToRGB.h
+++ b/Imaging/Color/vtkImageHSIToRGB.h
@@ -21,8 +21,8 @@
 // .SECTION See Also
 // vtkImageRGBToHSI
 
-#ifndef __vtkImageHSIToRGB_h
-#define __vtkImageHSIToRGB_h
+#ifndef vtkImageHSIToRGB_h
+#define vtkImageHSIToRGB_h
 
 #include "vtkImagingColorModule.h" // For export macro
 #include "vtkThreadedImageAlgorithm.h"
diff --git a/Imaging/Color/vtkImageHSVToRGB.h b/Imaging/Color/vtkImageHSVToRGB.h
index 92b68950010be953407c5dc28ded752d0276d42c..542d6cbfa2e522a63d02a3eba9674b0afe76fe9f 100644
--- a/Imaging/Color/vtkImageHSVToRGB.h
+++ b/Imaging/Color/vtkImageHSVToRGB.h
@@ -21,8 +21,8 @@
 // .SECTION See Also
 // vtkImageRGBToHSV
 
-#ifndef __vtkImageHSVToRGB_h
-#define __vtkImageHSVToRGB_h
+#ifndef vtkImageHSVToRGB_h
+#define vtkImageHSVToRGB_h
 
 
 #include "vtkImagingColorModule.h" // For export macro
diff --git a/Imaging/Color/vtkImageLuminance.h b/Imaging/Color/vtkImageLuminance.h
index 7ffba6f287cbc8097a41ffa2ce67ddb4661ae1fd..c407846276ae5adfe1872c6c53c7d512c1010804 100644
--- a/Imaging/Color/vtkImageLuminance.h
+++ b/Imaging/Color/vtkImageLuminance.h
@@ -16,8 +16,8 @@
 // .SECTION Description
 // vtkImageLuminance calculates luminance from an rgb input.
 
-#ifndef __vtkImageLuminance_h
-#define __vtkImageLuminance_h
+#ifndef vtkImageLuminance_h
+#define vtkImageLuminance_h
 
 
 #include "vtkImagingColorModule.h" // For export macro
diff --git a/Imaging/Color/vtkImageMapToRGBA.h b/Imaging/Color/vtkImageMapToRGBA.h
index c1244375d36497e73cd59cdad4ae9fff536539de..6b3618435187f742535a475c7029154c07072ee4 100644
--- a/Imaging/Color/vtkImageMapToRGBA.h
+++ b/Imaging/Color/vtkImageMapToRGBA.h
@@ -20,8 +20,8 @@
 // .SECTION See Also
 // vtkLookupTable
 
-#ifndef __vtkImageMapToRGBA_h
-#define __vtkImageMapToRGBA_h
+#ifndef vtkImageMapToRGBA_h
+#define vtkImageMapToRGBA_h
 
 
 #include "vtkImagingColorModule.h" // For export macro
diff --git a/Imaging/Color/vtkImageMapToWindowLevelColors.h b/Imaging/Color/vtkImageMapToWindowLevelColors.h
index ac4ce2508a69bf3e305944b1cbd5b71d5babcbfb..3103b0b0d57c8b6952e2c15c07984ecd99af06fa 100644
--- a/Imaging/Color/vtkImageMapToWindowLevelColors.h
+++ b/Imaging/Color/vtkImageMapToWindowLevelColors.h
@@ -25,8 +25,8 @@
 // .SECTION See Also
 // vtkLookupTable vtkScalarsToColors
 
-#ifndef __vtkImageMapToWindowLevelColors_h
-#define __vtkImageMapToWindowLevelColors_h
+#ifndef vtkImageMapToWindowLevelColors_h
+#define vtkImageMapToWindowLevelColors_h
 
 
 #include "vtkImagingColorModule.h" // For export macro
diff --git a/Imaging/Color/vtkImageQuantizeRGBToIndex.h b/Imaging/Color/vtkImageQuantizeRGBToIndex.h
index 6917cfb2e2981e7b938b57e71f638c8708198281..6732af8fde9acbc9d9dcda8852ece95f626661cb 100644
--- a/Imaging/Color/vtkImageQuantizeRGBToIndex.h
+++ b/Imaging/Color/vtkImageQuantizeRGBToIndex.h
@@ -25,8 +25,8 @@
 // (between 2 and 65536), execute it, and then retrieve the lookup table.
 // The colors can then be using the lookup table and the image index.
 
-#ifndef __vtkImageQuantizeRGBToIndex_h
-#define __vtkImageQuantizeRGBToIndex_h
+#ifndef vtkImageQuantizeRGBToIndex_h
+#define vtkImageQuantizeRGBToIndex_h
 
 #include "vtkImagingColorModule.h" // For export macro
 #include "vtkImageAlgorithm.h"
diff --git a/Imaging/Color/vtkImageRGBToHSI.h b/Imaging/Color/vtkImageRGBToHSI.h
index 4187fd160c0235f7eb1ff99a412cf93de56dd85a..7de5b1e14a2acaa84a78681cc6a0ceaa21062598 100644
--- a/Imaging/Color/vtkImageRGBToHSI.h
+++ b/Imaging/Color/vtkImageRGBToHSI.h
@@ -18,8 +18,8 @@
 // filter output the color coded as hue, saturation and intensity.
 // Output type must be the same as input type.
 
-#ifndef __vtkImageRGBToHSI_h
-#define __vtkImageRGBToHSI_h
+#ifndef vtkImageRGBToHSI_h
+#define vtkImageRGBToHSI_h
 
 #include "vtkImagingColorModule.h" // For export macro
 #include "vtkThreadedImageAlgorithm.h"
diff --git a/Imaging/Color/vtkImageRGBToHSV.h b/Imaging/Color/vtkImageRGBToHSV.h
index 569f3bde1181f756d17bcf90bfc4f874fd480aed..f0dfef605180e98ffde300350ca5875b6387b0ef 100644
--- a/Imaging/Color/vtkImageRGBToHSV.h
+++ b/Imaging/Color/vtkImageRGBToHSV.h
@@ -19,8 +19,8 @@
 // Output type must be the same as input type.
 
 
-#ifndef __vtkImageRGBToHSV_h
-#define __vtkImageRGBToHSV_h
+#ifndef vtkImageRGBToHSV_h
+#define vtkImageRGBToHSV_h
 
 
 #include "vtkImagingColorModule.h" // For export macro
diff --git a/Imaging/Core/vtkAbstractImageInterpolator.h b/Imaging/Core/vtkAbstractImageInterpolator.h
index e2a7bb6517e3bce9e7e229934028c916256865ab..c286e9ff528b00aa6dcbc173afa9c786bc7be019 100644
--- a/Imaging/Core/vtkAbstractImageInterpolator.h
+++ b/Imaging/Core/vtkAbstractImageInterpolator.h
@@ -25,8 +25,8 @@
 // vtkImageReslice vtkImageInterpolator vtkImageSincInterpolator
 
 
-#ifndef __vtkAbstractImageInterpolator_h
-#define __vtkAbstractImageInterpolator_h
+#ifndef vtkAbstractImageInterpolator_h
+#define vtkAbstractImageInterpolator_h
 
 #include "vtkImagingCoreModule.h" // For export macro
 #include "vtkObject.h"
diff --git a/Imaging/Core/vtkExtractVOI.h b/Imaging/Core/vtkExtractVOI.h
index 5f9d26dcdf5c5aeeca483be125f7d07217040a9a..aa1a2da70faa118d1383809ee136c5d89d520b57 100644
--- a/Imaging/Core/vtkExtractVOI.h
+++ b/Imaging/Core/vtkExtractVOI.h
@@ -33,8 +33,8 @@
 // .SECTION See Also
 // vtkGeometryFilter vtkExtractGeometry vtkExtractGrid
 
-#ifndef __vtkExtractVOI_h
-#define __vtkExtractVOI_h
+#ifndef vtkExtractVOI_h
+#define vtkExtractVOI_h
 
 #include "vtkImagingCoreModule.h" // For export macro
 #include "vtkImageAlgorithm.h"
diff --git a/Imaging/Core/vtkImageAppendComponents.h b/Imaging/Core/vtkImageAppendComponents.h
index c2d25c8168ace7fced4f7e9f5c88d2d2d9085bb4..9f9c662651a47d9781cc7cce68cd7a29906c324d 100644
--- a/Imaging/Core/vtkImageAppendComponents.h
+++ b/Imaging/Core/vtkImageAppendComponents.h
@@ -21,8 +21,8 @@
 // components coming first.
 
 
-#ifndef __vtkImageAppendComponents_h
-#define __vtkImageAppendComponents_h
+#ifndef vtkImageAppendComponents_h
+#define vtkImageAppendComponents_h
 
 
 #include "vtkImagingCoreModule.h" // For export macro
diff --git a/Imaging/Core/vtkImageBSplineCoefficients.h b/Imaging/Core/vtkImageBSplineCoefficients.h
index 2980278efe5e0545b7ac1b881eb63db56309e66b..c715b18556805cfb916095436bcb875a3fa007b4 100644
--- a/Imaging/Core/vtkImageBSplineCoefficients.h
+++ b/Imaging/Core/vtkImageBSplineCoefficients.h
@@ -39,8 +39,8 @@
 // VTK Journal, 2011,
 // http://hdl.handle.net/10380/3252
 
-#ifndef __vtkImageBSplineCoefficients_h
-#define __vtkImageBSplineCoefficients_h
+#ifndef vtkImageBSplineCoefficients_h
+#define vtkImageBSplineCoefficients_h
 
 
 #include "vtkImagingCoreModule.h" // For export macro
diff --git a/Imaging/Core/vtkImageBSplineInternals.h b/Imaging/Core/vtkImageBSplineInternals.h
index 6248dcd57d5757566a6e6e7f0aa0f11d30ef3534..174b58449b076a506df564433aa2a09b674b06a6 100644
--- a/Imaging/Core/vtkImageBSplineInternals.h
+++ b/Imaging/Core/vtkImageBSplineInternals.h
@@ -30,8 +30,8 @@
 //     "GPU Prefilter for Accurate Cubic B-spline Interpolation,"
 //     The Computer Journal, doi: 10.1093/comjnl/bxq086, 2010.
 
-#ifndef __vtkImageBSplineInternals_h
-#define __vtkImageBSplineInternals_h
+#ifndef vtkImageBSplineInternals_h
+#define vtkImageBSplineInternals_h
 
 #include "vtkImagingCoreModule.h" // For export macro
 #include "vtkSystemIncludes.h"
diff --git a/Imaging/Core/vtkImageBSplineInterpolator.h b/Imaging/Core/vtkImageBSplineInterpolator.h
index c6f0280d547a79ae679ed65fe14b28f4ebd283fb..b5e90666751ad96a020a1b34127552c7a998c61c 100644
--- a/Imaging/Core/vtkImageBSplineInterpolator.h
+++ b/Imaging/Core/vtkImageBSplineInterpolator.h
@@ -31,8 +31,8 @@
 // VTK Journal, 2011,
 // http://hdl.handle.net/10380/3252
 
-#ifndef __vtkImageBSplineInterpolator_h
-#define __vtkImageBSplineInterpolator_h
+#ifndef vtkImageBSplineInterpolator_h
+#define vtkImageBSplineInterpolator_h
 
 #include "vtkImagingCoreModule.h" // For export macro
 #include "vtkAbstractImageInterpolator.h"
diff --git a/Imaging/Core/vtkImageBlend.h b/Imaging/Core/vtkImageBlend.h
index a312b2baddee6ca3790ad9087aed10aa8765522a..864ac5af3b6cc34e9d9046d7e83c6ed82950afcf 100644
--- a/Imaging/Core/vtkImageBlend.h
+++ b/Imaging/Core/vtkImageBlend.h
@@ -68,8 +68,8 @@
 // }
 // \endcode
 
-#ifndef __vtkImageBlend_h
-#define __vtkImageBlend_h
+#ifndef vtkImageBlend_h
+#define vtkImageBlend_h
 
 
 #include "vtkImagingCoreModule.h" // For export macro
diff --git a/Imaging/Core/vtkImageCacheFilter.h b/Imaging/Core/vtkImageCacheFilter.h
index 3d7b4f54f26ceb3a97edc083af7462263b506917..f7cd15bf3cfb358e4034810b6714f6fa92093951 100644
--- a/Imaging/Core/vtkImageCacheFilter.h
+++ b/Imaging/Core/vtkImageCacheFilter.h
@@ -20,8 +20,8 @@
 // does not change the data at all.  It just makes the pipeline more
 // efficient at the expense of using extra memory.
 
-#ifndef __vtkImageCacheFilter_h
-#define __vtkImageCacheFilter_h
+#ifndef vtkImageCacheFilter_h
+#define vtkImageCacheFilter_h
 
 #include "vtkImagingCoreModule.h" // For export macro
 #include "vtkImageAlgorithm.h"
diff --git a/Imaging/Core/vtkImageCast.h b/Imaging/Core/vtkImageCast.h
index 5a2ea10a445e614e36fdc997378f1686794cc8cc..0c62dbb80e11af8f9dc2e1673ee628ddeddb7d8e 100644
--- a/Imaging/Core/vtkImageCast.h
+++ b/Imaging/Core/vtkImageCast.h
@@ -27,8 +27,8 @@
 // .SECTION See Also
 // vtkImageThreshold vtkImageShiftScale
 
-#ifndef __vtkImageCast_h
-#define __vtkImageCast_h
+#ifndef vtkImageCast_h
+#define vtkImageCast_h
 
 
 #include "vtkImagingCoreModule.h" // For export macro
diff --git a/Imaging/Core/vtkImageChangeInformation.h b/Imaging/Core/vtkImageChangeInformation.h
index 8477945254134e639d148da4c988130b2527dfb2..b98a511bf1b59a87c100b9ea572364d8095a288c 100644
--- a/Imaging/Core/vtkImageChangeInformation.h
+++ b/Imaging/Core/vtkImageChangeInformation.h
@@ -18,8 +18,8 @@
 // the data without changing the data itself.  The data is not resampled
 // by this filter, only the information accompanying the data is modified.
 
-#ifndef __vtkImageChangeInformation_h
-#define __vtkImageChangeInformation_h
+#ifndef vtkImageChangeInformation_h
+#define vtkImageChangeInformation_h
 
 #include "vtkImagingCoreModule.h" // For export macro
 #include "vtkImageAlgorithm.h"
diff --git a/Imaging/Core/vtkImageClip.h b/Imaging/Core/vtkImageClip.h
index 43b8a8f6f448f54102578d70cae6af24cab1802d..2ee6a677b77f5208fe2b800a54e40b59c2379b36 100644
--- a/Imaging/Core/vtkImageClip.h
+++ b/Imaging/Core/vtkImageClip.h
@@ -21,8 +21,8 @@
 // Only the whole extent is modified.
 // 2: If ClipDataOn is set, then you will get no more that the clipped
 // extent.
-#ifndef __vtkImageClip_h
-#define __vtkImageClip_h
+#ifndef vtkImageClip_h
+#define vtkImageClip_h
 
 // I did not make this a subclass of in place filter because
 // the references on the data do not matter. I make no modifications
diff --git a/Imaging/Core/vtkImageConstantPad.h b/Imaging/Core/vtkImageConstantPad.h
index 709c893fcfd4d2382f5750dbc05748d7e16c0200..0abbaf3c2e4b8603f2cd5a10f58e242ffb40430d 100644
--- a/Imaging/Core/vtkImageConstantPad.h
+++ b/Imaging/Core/vtkImageConstantPad.h
@@ -21,8 +21,8 @@
 // .SECTION See Also
 // vtkImageWrapPad vtkImageMirrorPad
 
-#ifndef __vtkImageConstantPad_h
-#define __vtkImageConstantPad_h
+#ifndef vtkImageConstantPad_h
+#define vtkImageConstantPad_h
 
 
 #include "vtkImagingCoreModule.h" // For export macro
diff --git a/Imaging/Core/vtkImageDataStreamer.h b/Imaging/Core/vtkImageDataStreamer.h
index 816133399064c638d9cb8dc2176fb21a1de6353b..2fb99c8302d3cf429f55f2bd5ce7fa45c434a59f 100644
--- a/Imaging/Core/vtkImageDataStreamer.h
+++ b/Imaging/Core/vtkImageDataStreamer.h
@@ -18,8 +18,8 @@
 // many times with smaller update extents.  All processing up stream
 // streams smaller pieces.
 
-#ifndef __vtkImageDataStreamer_h
-#define __vtkImageDataStreamer_h
+#ifndef vtkImageDataStreamer_h
+#define vtkImageDataStreamer_h
 
 #include "vtkImagingCoreModule.h" // For export macro
 #include "vtkImageAlgorithm.h"
diff --git a/Imaging/Core/vtkImageDecomposeFilter.h b/Imaging/Core/vtkImageDecomposeFilter.h
index c26adee8ce95e293eac98304159c38eab632ce5c..9136bb451d6af5ff5e7610d7354662e84313641b 100644
--- a/Imaging/Core/vtkImageDecomposeFilter.h
+++ b/Imaging/Core/vtkImageDecomposeFilter.h
@@ -20,8 +20,8 @@
 // The filter also provides convenience methods for permuting information
 // retrieved from input, output and vtkImageData.
 
-#ifndef __vtkImageDecomposeFilter_h
-#define __vtkImageDecomposeFilter_h
+#ifndef vtkImageDecomposeFilter_h
+#define vtkImageDecomposeFilter_h
 
 
 #include "vtkImagingCoreModule.h" // For export macro
diff --git a/Imaging/Core/vtkImageDifference.h b/Imaging/Core/vtkImageDifference.h
index 312f9a3c5c3d038ccd1ae3e62a17317a9f4a1c66..84aeda064a8f075b520790f6d4527b8cde66133c 100644
--- a/Imaging/Core/vtkImageDifference.h
+++ b/Imaging/Core/vtkImageDifference.h
@@ -31,8 +31,8 @@
 // black pixels and even though the input image has a white pixel, its
 // neighbors are not white.
 
-#ifndef __vtkImageDifference_h
-#define __vtkImageDifference_h
+#ifndef vtkImageDifference_h
+#define vtkImageDifference_h
 
 #include "vtkImagingCoreModule.h" // For export macro
 #include "vtkThreadedImageAlgorithm.h"
diff --git a/Imaging/Core/vtkImageExtractComponents.h b/Imaging/Core/vtkImageExtractComponents.h
index eb66ae017d625beb79a690243013b6d979bd60a7..09d4f0cd610472287689e6406a44c08081b08671 100644
--- a/Imaging/Core/vtkImageExtractComponents.h
+++ b/Imaging/Core/vtkImageExtractComponents.h
@@ -20,8 +20,8 @@
 // .SECTION See Also
 // vtkImageAppendComponents
 
-#ifndef __vtkImageExtractComponents_h
-#define __vtkImageExtractComponents_h
+#ifndef vtkImageExtractComponents_h
+#define vtkImageExtractComponents_h
 
 
 #include "vtkImagingCoreModule.h" // For export macro
diff --git a/Imaging/Core/vtkImageFlip.h b/Imaging/Core/vtkImageFlip.h
index e16fa53321a876fc1296304e7c0ba30290f732e8..189b6803b968ab22114adff1c802db49e57efb09 100644
--- a/Imaging/Core/vtkImageFlip.h
+++ b/Imaging/Core/vtkImageFlip.h
@@ -17,8 +17,8 @@
 // vtkImageFlip will reflect the data along the filtered axis.  This filter is
 // actually a thin wrapper around vtkImageReslice.
 
-#ifndef __vtkImageFlip_h
-#define __vtkImageFlip_h
+#ifndef vtkImageFlip_h
+#define vtkImageFlip_h
 
 
 #include "vtkImagingCoreModule.h" // For export macro
diff --git a/Imaging/Core/vtkImageInterpolator.h b/Imaging/Core/vtkImageInterpolator.h
index 8f66e9a852b35adbeebc9fda75e1434114c9165e..364ab7f1735c7db7bb189f94402317af1133624b 100644
--- a/Imaging/Core/vtkImageInterpolator.h
+++ b/Imaging/Core/vtkImageInterpolator.h
@@ -23,8 +23,8 @@
 // vtkImageReslice
 
 
-#ifndef __vtkImageInterpolator_h
-#define __vtkImageInterpolator_h
+#ifndef vtkImageInterpolator_h
+#define vtkImageInterpolator_h
 
 #include "vtkImagingCoreModule.h" // For export macro
 #include "vtkAbstractImageInterpolator.h"
diff --git a/Imaging/Core/vtkImageInterpolatorInternals.h b/Imaging/Core/vtkImageInterpolatorInternals.h
index a3d3cd8e2cc00c4a9d7db019844e93073d5570ad..69b0d17fe006b907b2ba12fd22ea58ca766d41ae 100644
--- a/Imaging/Core/vtkImageInterpolatorInternals.h
+++ b/Imaging/Core/vtkImageInterpolatorInternals.h
@@ -14,8 +14,8 @@
 =========================================================================*/
 // .NAME vtkInterpolatorInternals - internals for vtkImageInterpolator
 
-#ifndef __vtkInterpolatorInternals_h
-#define __vtkInterpolatorInternals_h
+#ifndef vtkInterpolatorInternals_h
+#define vtkInterpolatorInternals_h
 
 #include "vtkMath.h"
 
diff --git a/Imaging/Core/vtkImageIterateFilter.h b/Imaging/Core/vtkImageIterateFilter.h
index 5ef924aa2f2f4034414799b807c934cf18a838d0..55faa6796598f0c0697698ec57bbb253387f1388 100644
--- a/Imaging/Core/vtkImageIterateFilter.h
+++ b/Imaging/Core/vtkImageIterateFilter.h
@@ -21,8 +21,8 @@
 // subclasses methods as arguments.  Now the data is passes.  Can the caches
 // be passed, and data retrieved from the cache?
 
-#ifndef __vtkImageIterateFilter_h
-#define __vtkImageIterateFilter_h
+#ifndef vtkImageIterateFilter_h
+#define vtkImageIterateFilter_h
 
 #include "vtkImagingCoreModule.h" // For export macro
 #include "vtkThreadedImageAlgorithm.h"
diff --git a/Imaging/Core/vtkImageMagnify.h b/Imaging/Core/vtkImageMagnify.h
index 02dc8d6a0bc765a54393c919f26f3b3b70c8bf12..93195b47c17983f10e19eb2ae394071563f2db78 100644
--- a/Imaging/Core/vtkImageMagnify.h
+++ b/Imaging/Core/vtkImageMagnify.h
@@ -20,8 +20,8 @@
 // by bilinear interpolation. Initially, interpolation is off and magnification
 // factors are set to 1 in all directions.
 
-#ifndef __vtkImageMagnify_h
-#define __vtkImageMagnify_h
+#ifndef vtkImageMagnify_h
+#define vtkImageMagnify_h
 
 #include "vtkImagingCoreModule.h" // For export macro
 #include "vtkThreadedImageAlgorithm.h"
diff --git a/Imaging/Core/vtkImageMapToColors.h b/Imaging/Core/vtkImageMapToColors.h
index 67505e8d7694ba403c6a50216883ecafe5ed4807..36433a0ad6140895dcc3635df124f71b0ec2310d 100644
--- a/Imaging/Core/vtkImageMapToColors.h
+++ b/Imaging/Core/vtkImageMapToColors.h
@@ -23,8 +23,8 @@
 // .SECTION See Also
 // vtkLookupTable vtkScalarsToColors
 
-#ifndef __vtkImageMapToColors_h
-#define __vtkImageMapToColors_h
+#ifndef vtkImageMapToColors_h
+#define vtkImageMapToColors_h
 
 
 #include "vtkImagingCoreModule.h" // For export macro
diff --git a/Imaging/Core/vtkImageMask.h b/Imaging/Core/vtkImageMask.h
index cbed12131647c27f94c56e1ba5893bed7251d7a7..dec5ad3202feaaf09881c24d2013512f32edf90f 100644
--- a/Imaging/Core/vtkImageMask.h
+++ b/Imaging/Core/vtkImageMask.h
@@ -25,8 +25,8 @@
 // is the same as the output scalar type.
 
 
-#ifndef __vtkImageMask_h
-#define __vtkImageMask_h
+#ifndef vtkImageMask_h
+#define vtkImageMask_h
 
 
 #include "vtkImagingCoreModule.h" // For export macro
diff --git a/Imaging/Core/vtkImageMirrorPad.h b/Imaging/Core/vtkImageMirrorPad.h
index a19e4afdb5c2aff6283ef2627477d17a175bd455..944179c609dc39d0fda124ac98c51a1467e3d644 100644
--- a/Imaging/Core/vtkImageMirrorPad.h
+++ b/Imaging/Core/vtkImageMirrorPad.h
@@ -18,8 +18,8 @@
 // a mirror image of the original image (mirror at image boundaries).
 
 
-#ifndef __vtkImageMirrorPad_h
-#define __vtkImageMirrorPad_h
+#ifndef vtkImageMirrorPad_h
+#define vtkImageMirrorPad_h
 
 
 #include "vtkImagingCoreModule.h" // For export macro
diff --git a/Imaging/Core/vtkImagePadFilter.h b/Imaging/Core/vtkImagePadFilter.h
index abe5599f6be35bf167f9bf44fb4fece648cc3b3b..2db9403c7b5ad5d04759257213a55c41acfc1ba5 100644
--- a/Imaging/Core/vtkImagePadFilter.h
+++ b/Imaging/Core/vtkImagePadFilter.h
@@ -20,8 +20,8 @@
 // The image extent of the output has to be specified.
 
 
-#ifndef __vtkImagePadFilter_h
-#define __vtkImagePadFilter_h
+#ifndef vtkImagePadFilter_h
+#define vtkImagePadFilter_h
 
 #include "vtkImagingCoreModule.h" // For export macro
 #include "vtkThreadedImageAlgorithm.h"
diff --git a/Imaging/Core/vtkImagePermute.h b/Imaging/Core/vtkImagePermute.h
index 8bb5faf6bd8450a88409629b384524ff5f5be73e..24ac316a7a5a5ecfa6ac3c3e9d72eca9614703d9 100644
--- a/Imaging/Core/vtkImagePermute.h
+++ b/Imaging/Core/vtkImagePermute.h
@@ -20,8 +20,8 @@
 // data when it executes. This filter is actually a very thin wrapper
 // around vtkImageReslice.
 
-#ifndef __vtkImagePermute_h
-#define __vtkImagePermute_h
+#ifndef vtkImagePermute_h
+#define vtkImagePermute_h
 
 
 #include "vtkImagingCoreModule.h" // For export macro
diff --git a/Imaging/Core/vtkImageResample.h b/Imaging/Core/vtkImageResample.h
index 700fbd34be8e76e4db021b112a887fd7ffcb7a42..838ee40adc88495536b16a86e24348bf466fbe64 100644
--- a/Imaging/Core/vtkImageResample.h
+++ b/Imaging/Core/vtkImageResample.h
@@ -20,8 +20,8 @@
 // with the SetAxisMagnificationFactor method.
 
 
-#ifndef __vtkImageResample_h
-#define __vtkImageResample_h
+#ifndef vtkImageResample_h
+#define vtkImageResample_h
 
 
 #include "vtkImagingCoreModule.h" // For export macro
diff --git a/Imaging/Core/vtkImageResize.h b/Imaging/Core/vtkImageResize.h
index cc7fbe2fa742636e380c8c03f9dead6fb684b1bb..19e8c5ec29698f9c28f5ba4c0f2da0cd9c96778c 100644
--- a/Imaging/Core/vtkImageResize.h
+++ b/Imaging/Core/vtkImageResize.h
@@ -25,8 +25,8 @@
 // .SECTION Thanks
 // Thanks to David Gobbi for contributing this class to VTK.
 
-#ifndef __vtkImageResize_h
-#define __vtkImageResize_h
+#ifndef vtkImageResize_h
+#define vtkImageResize_h
 
 #include "vtkImagingCoreModule.h" // For export macro
 #include "vtkThreadedImageAlgorithm.h"
diff --git a/Imaging/Core/vtkImageReslice.h b/Imaging/Core/vtkImageReslice.h
index 16ef4b61ce548a774ebaac009089d938656a8feb..1e8d0b3cedc028c97731d1290867f6078ba950af 100644
--- a/Imaging/Core/vtkImageReslice.h
+++ b/Imaging/Core/vtkImageReslice.h
@@ -47,8 +47,8 @@
 // vtkAbstractTransform vtkMatrix4x4
 
 
-#ifndef __vtkImageReslice_h
-#define __vtkImageReslice_h
+#ifndef vtkImageReslice_h
+#define vtkImageReslice_h
 
 
 #include "vtkImagingCoreModule.h" // For export macro
diff --git a/Imaging/Core/vtkImageResliceToColors.h b/Imaging/Core/vtkImageResliceToColors.h
index 5c3c644f5850527115ef10a7680aea3718fc1909..9ed806a0bd64c239cfb0a4ecbc39e904bf635d08 100644
--- a/Imaging/Core/vtkImageResliceToColors.h
+++ b/Imaging/Core/vtkImageResliceToColors.h
@@ -26,8 +26,8 @@
 // vtkImageMapToColors
 
 
-#ifndef __vtkImageResliceToColors_h
-#define __vtkImageResliceToColors_h
+#ifndef vtkImageResliceToColors_h
+#define vtkImageResliceToColors_h
 
 
 #include "vtkImagingCoreModule.h" // For export macro
diff --git a/Imaging/Core/vtkImageShiftScale.h b/Imaging/Core/vtkImageShiftScale.h
index 2e454a0a2d74ab4b337992c63ac1d9c03f9688ab..011b171db8add8b8114b7d9c387afca5190b3f33 100644
--- a/Imaging/Core/vtkImageShiftScale.h
+++ b/Imaging/Core/vtkImageShiftScale.h
@@ -20,8 +20,8 @@
 // This is because shift scale operations frequently convert data types.
 
 
-#ifndef __vtkImageShiftScale_h
-#define __vtkImageShiftScale_h
+#ifndef vtkImageShiftScale_h
+#define vtkImageShiftScale_h
 
 
 #include "vtkImagingCoreModule.h" // For export macro
diff --git a/Imaging/Core/vtkImageShrink3D.h b/Imaging/Core/vtkImageShrink3D.h
index 82076245e68a5cd6320a44d37020eead9da3f543..378dcb41ca3823f27c2f2d9be3e43289b47261fa 100644
--- a/Imaging/Core/vtkImageShrink3D.h
+++ b/Imaging/Core/vtkImageShrink3D.h
@@ -17,8 +17,8 @@
 // vtkImageShrink3D shrinks an image by sub sampling on a
 // uniform grid (integer multiples).
 
-#ifndef __vtkImageShrink3D_h
-#define __vtkImageShrink3D_h
+#ifndef vtkImageShrink3D_h
+#define vtkImageShrink3D_h
 
 
 #include "vtkImagingCoreModule.h" // For export macro
diff --git a/Imaging/Core/vtkImageSincInterpolator.h b/Imaging/Core/vtkImageSincInterpolator.h
index ac5e637401887ac375a0d33badb28916607a1895..e44552adf9d4f6aad159c1684a1850639130385f 100644
--- a/Imaging/Core/vtkImageSincInterpolator.h
+++ b/Imaging/Core/vtkImageSincInterpolator.h
@@ -26,8 +26,8 @@
 // vtkImageReslice
 
 
-#ifndef __vtkImageSincInterpolator_h
-#define __vtkImageSincInterpolator_h
+#ifndef vtkImageSincInterpolator_h
+#define vtkImageSincInterpolator_h
 
 #include "vtkImagingCoreModule.h" // For export macro
 #include "vtkAbstractImageInterpolator.h"
diff --git a/Imaging/Core/vtkImageStencilAlgorithm.h b/Imaging/Core/vtkImageStencilAlgorithm.h
index c66088ce72ce75f89afb126c6265ba4837f29a63..48b7b925ef5ae4ebf1af5cdfc0fa4b6730ba79f7 100644
--- a/Imaging/Core/vtkImageStencilAlgorithm.h
+++ b/Imaging/Core/vtkImageStencilAlgorithm.h
@@ -21,8 +21,8 @@
 // .SECTION see also
 // vtkImageStencilData vtkImageStencilSource
 
-#ifndef __vtkImageStencilAlgorithm_h
-#define __vtkImageStencilAlgorithm_h
+#ifndef vtkImageStencilAlgorithm_h
+#define vtkImageStencilAlgorithm_h
 
 
 #include "vtkImagingCoreModule.h" // For export macro
diff --git a/Imaging/Core/vtkImageStencilData.h b/Imaging/Core/vtkImageStencilData.h
index 58441677db15e0340c68a8cd882aea026da5d933..3f14f3177bb9f32c90cd609529ff95a5f1363caf 100644
--- a/Imaging/Core/vtkImageStencilData.h
+++ b/Imaging/Core/vtkImageStencilData.h
@@ -21,8 +21,8 @@
 // .SECTION see also
 // vtkImageStencilSource vtkImageStencil
 
-#ifndef __vtkImageStencilData_h
-#define __vtkImageStencilData_h
+#ifndef vtkImageStencilData_h
+#define vtkImageStencilData_h
 
 
 #include "vtkImagingCoreModule.h" // For export macro
diff --git a/Imaging/Core/vtkImageStencilIterator.h b/Imaging/Core/vtkImageStencilIterator.h
index 72bd038763fc0b3b9c01014b44066bcbcb53ae73..1bee87f8cda9fdf5590224060835368fbdff1a32 100644
--- a/Imaging/Core/vtkImageStencilIterator.h
+++ b/Imaging/Core/vtkImageStencilIterator.h
@@ -20,8 +20,8 @@
 // .SECTION See also
 // vtkImageData vtkImageStencilData vtkImageProgressIterator
 
-#ifndef __vtkImageStencilIterator_h
-#define __vtkImageStencilIterator_h
+#ifndef vtkImageStencilIterator_h
+#define vtkImageStencilIterator_h
 
 #include "vtkSystemIncludes.h"
 #include "vtkImagingCoreModule.h"
diff --git a/Imaging/Core/vtkImageStencilSource.h b/Imaging/Core/vtkImageStencilSource.h
index f08b96f20f20627e229fcb314711c2cb55f93800..52f69897e05bc41c39bf542d13179805617c8f1b 100644
--- a/Imaging/Core/vtkImageStencilSource.h
+++ b/Imaging/Core/vtkImageStencilSource.h
@@ -26,8 +26,8 @@
 // .SECTION see also
 // vtkImplicitFunction vtkImageStencil vtkPolyDataToImageStencil
 
-#ifndef __vtkImageStencilSource_h
-#define __vtkImageStencilSource_h
+#ifndef vtkImageStencilSource_h
+#define vtkImageStencilSource_h
 
 
 #include "vtkImagingCoreModule.h" // For export macro
diff --git a/Imaging/Core/vtkImageThreshold.h b/Imaging/Core/vtkImageThreshold.h
index e46e8ffbea2c6ddf33c8eb405349c2f89411c5fb..ca89fe65e92840f31023e72eede3bf6b15ecaf9e 100644
--- a/Imaging/Core/vtkImageThreshold.h
+++ b/Imaging/Core/vtkImageThreshold.h
@@ -19,8 +19,8 @@
 // output, but defaults to the same type.
 
 
-#ifndef __vtkImageThreshold_h
-#define __vtkImageThreshold_h
+#ifndef vtkImageThreshold_h
+#define vtkImageThreshold_h
 
 
 #include "vtkImagingCoreModule.h" // For export macro
diff --git a/Imaging/Core/vtkImageTranslateExtent.h b/Imaging/Core/vtkImageTranslateExtent.h
index e23591e64d5202971f1ad83773a41257ff32d716..74966ee26ae8139bfa204138a90b432031b657ae 100644
--- a/Imaging/Core/vtkImageTranslateExtent.h
+++ b/Imaging/Core/vtkImageTranslateExtent.h
@@ -17,8 +17,8 @@
 // vtkImageTranslateExtent  shift the whole extent, but does not
 // change the data.
 
-#ifndef __vtkImageTranslateExtent_h
-#define __vtkImageTranslateExtent_h
+#ifndef vtkImageTranslateExtent_h
+#define vtkImageTranslateExtent_h
 
 #include "vtkImagingCoreModule.h" // For export macro
 #include "vtkImageAlgorithm.h"
diff --git a/Imaging/Core/vtkImageWrapPad.h b/Imaging/Core/vtkImageWrapPad.h
index c6623ef5f3d109b34ca476195ea80718ea8f1fec..c9a151b2c5d974a8a6a0ee70e90a748bcd9a0f15 100644
--- a/Imaging/Core/vtkImageWrapPad.h
+++ b/Imaging/Core/vtkImageWrapPad.h
@@ -20,8 +20,8 @@
 // output.
 
 
-#ifndef __vtkImageWrapPad_h
-#define __vtkImageWrapPad_h
+#ifndef vtkImageWrapPad_h
+#define vtkImageWrapPad_h
 
 
 #include "vtkImagingCoreModule.h" // For export macro
diff --git a/Imaging/Core/vtkRTAnalyticSource.h b/Imaging/Core/vtkRTAnalyticSource.h
index 75a15fc89ab4e518752ce2e64d0777290f6cf750..afe01d9354b8c9a71f54261f8984a9b302ca6b93 100644
--- a/Imaging/Core/vtkRTAnalyticSource.h
+++ b/Imaging/Core/vtkRTAnalyticSource.h
@@ -18,8 +18,8 @@
 // by a Maximum*Gaussian*XMag*sin(XFreq*x)*sin(YFreq*y)*cos(ZFreq*z)
 // Values are float scalars on point data with name "RTData".
 
-#ifndef __vtkRTAnalyticSource_h
-#define __vtkRTAnalyticSource_h
+#ifndef vtkRTAnalyticSource_h
+#define vtkRTAnalyticSource_h
 
 #include "vtkImagingCoreModule.h" // For export macro
 #include "vtkImageAlgorithm.h"
diff --git a/Imaging/Fourier/vtkImageButterworthHighPass.h b/Imaging/Fourier/vtkImageButterworthHighPass.h
index a4711e15f15af876404eca10fb85190cf0b32b69..5d5abccba473710f7da46a16c606eed60e46b181 100644
--- a/Imaging/Fourier/vtkImageButterworthHighPass.h
+++ b/Imaging/Fourier/vtkImageButterworthHighPass.h
@@ -25,8 +25,8 @@
 // .SECTION See Also
 // vtkImageButterworthLowPass
 
-#ifndef __vtkImageButterworthHighPass_h
-#define __vtkImageButterworthHighPass_h
+#ifndef vtkImageButterworthHighPass_h
+#define vtkImageButterworthHighPass_h
 
 
 #include "vtkImagingFourierModule.h" // For export macro
diff --git a/Imaging/Fourier/vtkImageButterworthLowPass.h b/Imaging/Fourier/vtkImageButterworthLowPass.h
index 7cb4ba82905ec3f252aca9d0ec8eb3c5bea6ad3c..50a49f909a3461c3c345b66b6653f5642c03516c 100644
--- a/Imaging/Fourier/vtkImageButterworthLowPass.h
+++ b/Imaging/Fourier/vtkImageButterworthLowPass.h
@@ -25,8 +25,8 @@
 // .SECTION See Also
 // vtkImageButterworthHighPass vtkImageFFT vtkImageRFFT
 
-#ifndef __vtkImageButterworthLowPass_h
-#define __vtkImageButterworthLowPass_h
+#ifndef vtkImageButterworthLowPass_h
+#define vtkImageButterworthLowPass_h
 
 
 #include "vtkImagingFourierModule.h" // For export macro
diff --git a/Imaging/Fourier/vtkImageFFT.h b/Imaging/Fourier/vtkImageFFT.h
index e22f84a1eaa00367035482ade7b8d12774c70142..bb2ac07d47fda6b5b8096bf21a430cfc845b9937 100644
--- a/Imaging/Fourier/vtkImageFFT.h
+++ b/Imaging/Fourier/vtkImageFFT.h
@@ -24,8 +24,8 @@
 // FFT's are decomposed so that each axis executes serially.
 
 
-#ifndef __vtkImageFFT_h
-#define __vtkImageFFT_h
+#ifndef vtkImageFFT_h
+#define vtkImageFFT_h
 
 
 #include "vtkImagingFourierModule.h" // For export macro
diff --git a/Imaging/Fourier/vtkImageFourierCenter.h b/Imaging/Fourier/vtkImageFourierCenter.h
index 128d0bc3796a0885039bb90a7c8b5770cc094e0e..ea231a790918f6fe37cab85747a8e033efc3fe23 100644
--- a/Imaging/Fourier/vtkImageFourierCenter.h
+++ b/Imaging/Fourier/vtkImageFourierCenter.h
@@ -20,8 +20,8 @@
 // This filter shifts the zero frequency to the center of the image.
 // Input and output are assumed to be doubles.
 
-#ifndef __vtkImageFourierCenter_h
-#define __vtkImageFourierCenter_h
+#ifndef vtkImageFourierCenter_h
+#define vtkImageFourierCenter_h
 
 
 #include "vtkImagingFourierModule.h" // For export macro
diff --git a/Imaging/Fourier/vtkImageFourierFilter.h b/Imaging/Fourier/vtkImageFourierFilter.h
index ca8b403f8e0071894893c6abc98141935b7b8a7a..0c6bcb6819d39f63b468d9c764e24d300646401c 100644
--- a/Imaging/Fourier/vtkImageFourierFilter.h
+++ b/Imaging/Fourier/vtkImageFourierFilter.h
@@ -18,8 +18,8 @@
 // this superclass is a container for methods that manipulate these structure
 // including fast Fourier transforms.  Complex numbers may become a class.
 // This should really be a helper class.
-#ifndef __vtkImageFourierFilter_h
-#define __vtkImageFourierFilter_h
+#ifndef vtkImageFourierFilter_h
+#define vtkImageFourierFilter_h
 
 
 #include "vtkImagingFourierModule.h" // For export macro
diff --git a/Imaging/Fourier/vtkImageIdealHighPass.h b/Imaging/Fourier/vtkImageIdealHighPass.h
index d6d196db6b9bc4f3af6caed56c3fa2570574eafb..e9e6d4455fc13534a8827d0aefcaa6a3db1471e6 100644
--- a/Imaging/Fourier/vtkImageIdealHighPass.h
+++ b/Imaging/Fourier/vtkImageIdealHighPass.h
@@ -26,8 +26,8 @@
 // vtkImageButterworthHighPass vtkImageIdealLowPass vtkImageFFT vtkImageRFFT
 
 
-#ifndef __vtkImageIdealHighPass_h
-#define __vtkImageIdealHighPass_h
+#ifndef vtkImageIdealHighPass_h
+#define vtkImageIdealHighPass_h
 
 
 #include "vtkImagingFourierModule.h" // For export macro
diff --git a/Imaging/Fourier/vtkImageIdealLowPass.h b/Imaging/Fourier/vtkImageIdealLowPass.h
index e298be19475cb8851f0e8d4d19e8eaeed97cc350..bc1db5ece70acf2701a36fb2089e4bfbcfa29e9e 100644
--- a/Imaging/Fourier/vtkImageIdealLowPass.h
+++ b/Imaging/Fourier/vtkImageIdealLowPass.h
@@ -27,8 +27,8 @@
 
 
 
-#ifndef __vtkImageIdealLowPass_h
-#define __vtkImageIdealLowPass_h
+#ifndef vtkImageIdealLowPass_h
+#define vtkImageIdealLowPass_h
 
 
 #include "vtkImagingFourierModule.h" // For export macro
diff --git a/Imaging/Fourier/vtkImageRFFT.h b/Imaging/Fourier/vtkImageRFFT.h
index d50c72c9dfa8253999b17591346807f6da51e378..d347367c0274fd14f7af2a67ec0a4a542c5fd86e 100644
--- a/Imaging/Fourier/vtkImageRFFT.h
+++ b/Imaging/Fourier/vtkImageRFFT.h
@@ -31,8 +31,8 @@
 
 
 
-#ifndef __vtkImageRFFT_h
-#define __vtkImageRFFT_h
+#ifndef vtkImageRFFT_h
+#define vtkImageRFFT_h
 
 
 #include "vtkImagingFourierModule.h" // For export macro
diff --git a/Imaging/Fourier/vtkTableFFT.h b/Imaging/Fourier/vtkTableFFT.h
index 3df6cd766677e656ae3b2fbced023fdc152e1fd7..7fdfd03ca2f4b835f2aa20d4cc684f2018e85d27 100644
--- a/Imaging/Fourier/vtkTableFFT.h
+++ b/Imaging/Fourier/vtkTableFFT.h
@@ -33,8 +33,8 @@
 // vtkImageFFT
 //
 
-#ifndef __vtkTableFFT_h
-#define __vtkTableFFT_h
+#ifndef vtkTableFFT_h
+#define vtkTableFFT_h
 
 #include "vtkTableAlgorithm.h"
 #include "vtkImagingFourierModule.h" // For export macro
@@ -67,4 +67,4 @@ private:
 };
 
 
-#endif //__vtkTableFFT_h
+#endif //vtkTableFFT_h
diff --git a/Imaging/General/vtkImageAnisotropicDiffusion2D.h b/Imaging/General/vtkImageAnisotropicDiffusion2D.h
index b51978aed572e581527d7361183612916d4502cf..93f1e450b6c701dacef83225f145c17995cc8ddf 100644
--- a/Imaging/General/vtkImageAnisotropicDiffusion2D.h
+++ b/Imaging/General/vtkImageAnisotropicDiffusion2D.h
@@ -34,8 +34,8 @@
 // .SECTION See Also
 // vtkImageAnisotropicDiffusion3D
 
-#ifndef __vtkImageAnisotropicDiffusion2D_h
-#define __vtkImageAnisotropicDiffusion2D_h
+#ifndef vtkImageAnisotropicDiffusion2D_h
+#define vtkImageAnisotropicDiffusion2D_h
 
 
 #include "vtkImagingGeneralModule.h" // For export macro
diff --git a/Imaging/General/vtkImageAnisotropicDiffusion3D.h b/Imaging/General/vtkImageAnisotropicDiffusion3D.h
index b2a0fbd21a042bed989fb878f77a118249eb559f..36fea0d17765ddade9c5ec6e324b817f6c017b6d 100644
--- a/Imaging/General/vtkImageAnisotropicDiffusion3D.h
+++ b/Imaging/General/vtkImageAnisotropicDiffusion3D.h
@@ -35,8 +35,8 @@
 // .SECTION See Also
 // vtkImageAnisotropicDiffusion2D
 
-#ifndef __vtkImageAnisotropicDiffusion3D_h
-#define __vtkImageAnisotropicDiffusion3D_h
+#ifndef vtkImageAnisotropicDiffusion3D_h
+#define vtkImageAnisotropicDiffusion3D_h
 
 
 #include "vtkImagingGeneralModule.h" // For export macro
diff --git a/Imaging/General/vtkImageCheckerboard.h b/Imaging/General/vtkImageCheckerboard.h
index dd9c0385773c83cf56928926e64ce1cd36c3dcfd..dcbc28def0c18cef7755254fab5e795f01c25f3f 100644
--- a/Imaging/General/vtkImageCheckerboard.h
+++ b/Imaging/General/vtkImageCheckerboard.h
@@ -20,8 +20,8 @@
 //  ivar. This controls the number of checkerboard divisions in the whole
 //  extent of the image.
 
-#ifndef __vtkImageCheckerboard_h
-#define __vtkImageCheckerboard_h
+#ifndef vtkImageCheckerboard_h
+#define vtkImageCheckerboard_h
 
 #include "vtkImagingGeneralModule.h" // For export macro
 #include "vtkThreadedImageAlgorithm.h"
diff --git a/Imaging/General/vtkImageCityBlockDistance.h b/Imaging/General/vtkImageCityBlockDistance.h
index 2528551de7cbc3059934e2dfa76632f5354e0f03..7feeac34c0b658329949712d9956b2345571dea2 100644
--- a/Imaging/General/vtkImageCityBlockDistance.h
+++ b/Imaging/General/vtkImageCityBlockDistance.h
@@ -26,8 +26,8 @@
 // Distances maps can have inside (negative regions)
 // and outsides (positive regions).
 
-#ifndef __vtkImageCityBlockDistance_h
-#define __vtkImageCityBlockDistance_h
+#ifndef vtkImageCityBlockDistance_h
+#define vtkImageCityBlockDistance_h
 
 
 #include "vtkImagingGeneralModule.h" // For export macro
diff --git a/Imaging/General/vtkImageConvolve.h b/Imaging/General/vtkImageConvolve.h
index 2e3f2af1acb8bebcb9606c459036d7419413161b..c5c76ef9b1adae9f5788197cd09d2ff994e7f93f 100644
--- a/Imaging/General/vtkImageConvolve.h
+++ b/Imaging/General/vtkImageConvolve.h
@@ -18,8 +18,8 @@
 // 2D NxN kernal.  The output image is cropped to the same size as
 // the input.
 
-#ifndef __vtkImageConvolve_h
-#define __vtkImageConvolve_h
+#ifndef vtkImageConvolve_h
+#define vtkImageConvolve_h
 
 #include "vtkImagingGeneralModule.h" // For export macro
 #include "vtkThreadedImageAlgorithm.h"
diff --git a/Imaging/General/vtkImageCorrelation.h b/Imaging/General/vtkImageCorrelation.h
index cfb767f21dbef7cb9b314fe5401dd07ee9ff641a..88a72a83fd1c6c6090c047a7df0c570f556c9f46 100644
--- a/Imaging/General/vtkImageCorrelation.h
+++ b/Imaging/General/vtkImageCorrelation.h
@@ -21,8 +21,8 @@
 // The output size will match the size of the first input.
 // The second input is considered the correlation kernel.
 
-#ifndef __vtkImageCorrelation_h
-#define __vtkImageCorrelation_h
+#ifndef vtkImageCorrelation_h
+#define vtkImageCorrelation_h
 
 
 
diff --git a/Imaging/General/vtkImageEuclideanDistance.h b/Imaging/General/vtkImageEuclideanDistance.h
index e2fefa8195b1dc433f4a13f6b93c8da57d660a7e..e742eda8908a397c1203fb1eaf119b2521aa5cee 100644
--- a/Imaging/General/vtkImageEuclideanDistance.h
+++ b/Imaging/General/vtkImageEuclideanDistance.h
@@ -40,8 +40,8 @@
 // October 1999. http://ltswww.epfl.ch/~cuisenai/papers/oc_thesis.pdf
 
 
-#ifndef __vtkImageEuclideanDistance_h
-#define __vtkImageEuclideanDistance_h
+#ifndef vtkImageEuclideanDistance_h
+#define vtkImageEuclideanDistance_h
 
 #include "vtkImagingGeneralModule.h" // For export macro
 #include "vtkImageDecomposeFilter.h"
diff --git a/Imaging/General/vtkImageEuclideanToPolar.h b/Imaging/General/vtkImageEuclideanToPolar.h
index 9eb5830fb31ee76f489250e5a0541be0cae6022c..b96fb94e5b7399088f9fddc2224c68a4fac0faa8 100644
--- a/Imaging/General/vtkImageEuclideanToPolar.h
+++ b/Imaging/General/vtkImageEuclideanToPolar.h
@@ -17,8 +17,8 @@
 // For each pixel with vector components x,y, this filter outputs
 // theta in component0, and radius in component1.
 
-#ifndef __vtkImageEuclideanToPolar_h
-#define __vtkImageEuclideanToPolar_h
+#ifndef vtkImageEuclideanToPolar_h
+#define vtkImageEuclideanToPolar_h
 
 
 #include "vtkImagingGeneralModule.h" // For export macro
diff --git a/Imaging/General/vtkImageGaussianSmooth.h b/Imaging/General/vtkImageGaussianSmooth.h
index b29906a250bf756b6b0d5565bf9855da32f24336..30bc58f99c5f3fc3691feba890de39e02e6dd032 100644
--- a/Imaging/General/vtkImageGaussianSmooth.h
+++ b/Imaging/General/vtkImageGaussianSmooth.h
@@ -17,8 +17,8 @@
 // vtkImageGaussianSmooth implements a convolution of the input image
 // with a gaussian. Supports from one to three dimensional convolutions.
 
-#ifndef __vtkImageGaussianSmooth_h
-#define __vtkImageGaussianSmooth_h
+#ifndef vtkImageGaussianSmooth_h
+#define vtkImageGaussianSmooth_h
 
 
 #include "vtkImagingGeneralModule.h" // For export macro
diff --git a/Imaging/General/vtkImageGradient.h b/Imaging/General/vtkImageGradient.h
index b6465b830112b607079e113e42111b9b6d420040..406d655dc63eef7ff0e151373d38304e3b636c58 100644
--- a/Imaging/General/vtkImageGradient.h
+++ b/Imaging/General/vtkImageGradient.h
@@ -20,8 +20,8 @@
 // two dimensional XY gradient.  OutputScalarType is always
 // double. Gradient is computed using central differences.
 
-#ifndef __vtkImageGradient_h
-#define __vtkImageGradient_h
+#ifndef vtkImageGradient_h
+#define vtkImageGradient_h
 
 #include "vtkImagingGeneralModule.h" // For export macro
 #include "vtkThreadedImageAlgorithm.h"
diff --git a/Imaging/General/vtkImageGradientMagnitude.h b/Imaging/General/vtkImageGradientMagnitude.h
index 422dbe29b4cc3fe12c6dd2e69ea295e66e7a917f..b9053ad62bbb3ed211351c2a9b0e705d2c7f0e44 100644
--- a/Imaging/General/vtkImageGradientMagnitude.h
+++ b/Imaging/General/vtkImageGradientMagnitude.h
@@ -22,8 +22,8 @@
 // .SECTION See Also
 // vtkImageGradient vtkImageMagnitude
 
-#ifndef __vtkImageGradientMagnitude_h
-#define __vtkImageGradientMagnitude_h
+#ifndef vtkImageGradientMagnitude_h
+#define vtkImageGradientMagnitude_h
 
 
 #include "vtkImagingGeneralModule.h" // For export macro
diff --git a/Imaging/General/vtkImageHybridMedian2D.h b/Imaging/General/vtkImageHybridMedian2D.h
index 027686ac432eb8e55a31f1d284a83a63233ca84c..ef731a65d72172904769ba835cae647b6c76b2df 100644
--- a/Imaging/General/vtkImageHybridMedian2D.h
+++ b/Imaging/General/vtkImageHybridMedian2D.h
@@ -23,8 +23,8 @@
 
 
 
-#ifndef __vtkImageHybridMedian2D_h
-#define __vtkImageHybridMedian2D_h
+#ifndef vtkImageHybridMedian2D_h
+#define vtkImageHybridMedian2D_h
 
 
 #include "vtkImagingGeneralModule.h" // For export macro
diff --git a/Imaging/General/vtkImageLaplacian.h b/Imaging/General/vtkImageLaplacian.h
index 87520ddb488e2be9060cced231f7f244a09487be..f2f0af3c5bf6bb1a874fd9bf5a0ee1f1895d8924 100644
--- a/Imaging/General/vtkImageLaplacian.h
+++ b/Imaging/General/vtkImageLaplacian.h
@@ -23,8 +23,8 @@
 
 
 
-#ifndef __vtkImageLaplacian_h
-#define __vtkImageLaplacian_h
+#ifndef vtkImageLaplacian_h
+#define vtkImageLaplacian_h
 
 
 #include "vtkImagingGeneralModule.h" // For export macro
diff --git a/Imaging/General/vtkImageMedian3D.h b/Imaging/General/vtkImageMedian3D.h
index 8b435109ae427bc6306e7d2c29bf35c352c12fca..78e57b1287c5ba00a5b458736c0746134ad0f266 100644
--- a/Imaging/General/vtkImageMedian3D.h
+++ b/Imaging/General/vtkImageMedian3D.h
@@ -21,8 +21,8 @@
 // into a 2D median.
 
 
-#ifndef __vtkImageMedian3D_h
-#define __vtkImageMedian3D_h
+#ifndef vtkImageMedian3D_h
+#define vtkImageMedian3D_h
 
 
 #include "vtkImagingGeneralModule.h" // For export macro
diff --git a/Imaging/General/vtkImageNormalize.h b/Imaging/General/vtkImageNormalize.h
index c1ca38de55bde7be13102485d40d426e21af2402..5088fd5371342dd2cd1300a3992d08f259cfe98c 100644
--- a/Imaging/General/vtkImageNormalize.h
+++ b/Imaging/General/vtkImageNormalize.h
@@ -19,8 +19,8 @@
 // vector is zero also.
 
 
-#ifndef __vtkImageNormalize_h
-#define __vtkImageNormalize_h
+#ifndef vtkImageNormalize_h
+#define vtkImageNormalize_h
 
 
 #include "vtkImagingGeneralModule.h" // For export macro
diff --git a/Imaging/General/vtkImageRange3D.h b/Imaging/General/vtkImageRange3D.h
index 98ac4009c3b1ea9b4da18570b52510545074dd57..8a90ef2f9b3b0f8ff87467cf080b68c099e34ef7 100644
--- a/Imaging/General/vtkImageRange3D.h
+++ b/Imaging/General/vtkImageRange3D.h
@@ -19,8 +19,8 @@
 // is done on that axis.
 
 
-#ifndef __vtkImageRange3D_h
-#define __vtkImageRange3D_h
+#ifndef vtkImageRange3D_h
+#define vtkImageRange3D_h
 
 
 #include "vtkImagingGeneralModule.h" // For export macro
diff --git a/Imaging/General/vtkImageSeparableConvolution.h b/Imaging/General/vtkImageSeparableConvolution.h
index a5b43a39a761f2a8b9b352d9f6aaf24fceee03a1..d60aca1404ab2ad6773fba81503922163e216852 100644
--- a/Imaging/General/vtkImageSeparableConvolution.h
+++ b/Imaging/General/vtkImageSeparableConvolution.h
@@ -23,8 +23,8 @@
 // convolutions.  It also handles arbitrarly large kernel sizes, and
 // uses edge replication to handle boundaries.
 
-#ifndef __vtkImageSeparableConvolution_h
-#define __vtkImageSeparableConvolution_h
+#ifndef vtkImageSeparableConvolution_h
+#define vtkImageSeparableConvolution_h
 
 
 #include "vtkImagingGeneralModule.h" // For export macro
diff --git a/Imaging/General/vtkImageSlab.h b/Imaging/General/vtkImageSlab.h
index e236d765d622521e24c74db359ab05ed55d5c3c5..364d843b1b32c52d6b5b28d1dd44ecfc22e3a3f3 100644
--- a/Imaging/General/vtkImageSlab.h
+++ b/Imaging/General/vtkImageSlab.h
@@ -22,8 +22,8 @@
 // .SECTION Thanks
 // Thanks to David Gobbi for contributing this class to VTK.
 
-#ifndef __vtkImageSlab_h
-#define __vtkImageSlab_h
+#ifndef vtkImageSlab_h
+#define vtkImageSlab_h
 
 #include "vtkImagingGeneralModule.h" // For export macro
 #include "vtkThreadedImageAlgorithm.h"
diff --git a/Imaging/General/vtkImageSlabReslice.h b/Imaging/General/vtkImageSlabReslice.h
index 1e60b2faa6142841ccc3e77db846c03827f76c5c..3a7eb8ea6aa3508b960a70c0504f8b5fc98fdf85 100644
--- a/Imaging/General/vtkImageSlabReslice.h
+++ b/Imaging/General/vtkImageSlabReslice.h
@@ -39,8 +39,8 @@
 // vtkImageReslice
 
 
-#ifndef __vtkImageSlabReslice_h
-#define __vtkImageSlabReslice_h
+#ifndef vtkImageSlabReslice_h
+#define vtkImageSlabReslice_h
 
 #include "vtkImagingGeneralModule.h" // For export macro
 #include "vtkImageReslice.h"
diff --git a/Imaging/General/vtkImageSobel2D.h b/Imaging/General/vtkImageSobel2D.h
index d739ebda84f922f7f96dda607fab7201b376ba24..0df131910f7e1c882a0c585d8438a6d76d49cdf8 100644
--- a/Imaging/General/vtkImageSobel2D.h
+++ b/Imaging/General/vtkImageSobel2D.h
@@ -19,8 +19,8 @@
 // the input is an image.  Output is always doubles.
 
 
-#ifndef __vtkImageSobel2D_h
-#define __vtkImageSobel2D_h
+#ifndef vtkImageSobel2D_h
+#define vtkImageSobel2D_h
 
 
 #include "vtkImagingGeneralModule.h" // For export macro
diff --git a/Imaging/General/vtkImageSobel3D.h b/Imaging/General/vtkImageSobel3D.h
index 37f0e67151179c28cdd1516d4de252abea0afb3e..825b854754895cb089ad4b51dcef0f95a742cb3e 100644
--- a/Imaging/General/vtkImageSobel3D.h
+++ b/Imaging/General/vtkImageSobel3D.h
@@ -22,8 +22,8 @@
 
 
 
-#ifndef __vtkImageSobel3D_h
-#define __vtkImageSobel3D_h
+#ifndef vtkImageSobel3D_h
+#define vtkImageSobel3D_h
 
 
 #include "vtkImagingGeneralModule.h" // For export macro
diff --git a/Imaging/General/vtkImageSpatialAlgorithm.h b/Imaging/General/vtkImageSpatialAlgorithm.h
index 7866e1ac4daeae5efe6169bcc7821e71f60b4845..1ad5bc35b05b6a90599cd9f4c0e940d555dab301 100644
--- a/Imaging/General/vtkImageSpatialAlgorithm.h
+++ b/Imaging/General/vtkImageSpatialAlgorithm.h
@@ -22,8 +22,8 @@
 // execute methods.
 
 
-#ifndef __vtkImageSpatialAlgorithm_h
-#define __vtkImageSpatialAlgorithm_h
+#ifndef vtkImageSpatialAlgorithm_h
+#define vtkImageSpatialAlgorithm_h
 
 
 #include "vtkImagingGeneralModule.h" // For export macro
diff --git a/Imaging/General/vtkImageVariance3D.h b/Imaging/General/vtkImageVariance3D.h
index ba6c0e5c3f0664852ec7e29cbf6a9b0dd24494ec..bb8590a5cdb353f44602ee2de3375372cc5dda13 100644
--- a/Imaging/General/vtkImageVariance3D.h
+++ b/Imaging/General/vtkImageVariance3D.h
@@ -22,8 +22,8 @@
 // the total number of neighbors to produce the output value.
 
 
-#ifndef __vtkImageVariance3D_h
-#define __vtkImageVariance3D_h
+#ifndef vtkImageVariance3D_h
+#define vtkImageVariance3D_h
 
 
 #include "vtkImagingGeneralModule.h" // For export macro
diff --git a/Imaging/General/vtkSimpleImageFilterExample.h b/Imaging/General/vtkSimpleImageFilterExample.h
index bd38149f79c5b590dcc6f2c28539b10423987455..1407f67356ab48803a63e91ced0931a40f9f4115 100644
--- a/Imaging/General/vtkSimpleImageFilterExample.h
+++ b/Imaging/General/vtkSimpleImageFilterExample.h
@@ -20,8 +20,8 @@
 // .SECTION See also
 // vtkSimpleImageToImageFilter
 
-#ifndef __vtkSimpleImageFilterExample_h
-#define __vtkSimpleImageFilterExample_h
+#ifndef vtkSimpleImageFilterExample_h
+#define vtkSimpleImageFilterExample_h
 
 #include "vtkImagingGeneralModule.h" // For export macro
 #include "vtkSimpleImageToImageFilter.h"
diff --git a/Imaging/Hybrid/vtkBooleanTexture.h b/Imaging/Hybrid/vtkBooleanTexture.h
index b1b42fc0c1609b4cfb0045aee018c04149a4f5bf..3c223f10dec095cf7a4e889bc66a34b7a844ddea 100644
--- a/Imaging/Hybrid/vtkBooleanTexture.h
+++ b/Imaging/Hybrid/vtkBooleanTexture.h
@@ -38,8 +38,8 @@
 // .SECTION See Also
 // vtkImplicitTextureCoords vtkThresholdTextureCoords
 
-#ifndef __vtkBooleanTexture_h
-#define __vtkBooleanTexture_h
+#ifndef vtkBooleanTexture_h
+#define vtkBooleanTexture_h
 
 #include "vtkImagingHybridModule.h" // For export macro
 #include "vtkImageAlgorithm.h"
diff --git a/Imaging/Hybrid/vtkFastSplatter.h b/Imaging/Hybrid/vtkFastSplatter.h
index 9e0ace1b5c0e6c9f97008fd491bda75fd0848a00..7180659579ffaa2c0a7507a47f66760f0e066db8 100644
--- a/Imaging/Hybrid/vtkFastSplatter.h
+++ b/Imaging/Hybrid/vtkFastSplatter.h
@@ -39,8 +39,8 @@
 // the extents.
 //
 
-#ifndef __vtkFastSplatter_h
-#define __vtkFastSplatter_h
+#ifndef vtkFastSplatter_h
+#define vtkFastSplatter_h
 
 #include "vtkImagingHybridModule.h" // For export macro
 #include "vtkImageAlgorithm.h"
@@ -261,4 +261,4 @@ void vtkFastSplatterFrozenScale(T *array,
 
 //ETX
 
-#endif //__vtkFastSplatter_h
+#endif //vtkFastSplatter_h
diff --git a/Imaging/Hybrid/vtkGaussianSplatter.h b/Imaging/Hybrid/vtkGaussianSplatter.h
index 380d41d7ccb8e2ac18122f327ed22bdc619a988c..cbb11712b762dec4927e0488bbc7c4cd5371e842 100644
--- a/Imaging/Hybrid/vtkGaussianSplatter.h
+++ b/Imaging/Hybrid/vtkGaussianSplatter.h
@@ -61,8 +61,8 @@
 // .SECTION See Also
 // vtkShepardMethod
 
-#ifndef __vtkGaussianSplatter_h
-#define __vtkGaussianSplatter_h
+#ifndef vtkGaussianSplatter_h
+#define vtkGaussianSplatter_h
 
 #include "vtkImagingHybridModule.h" // For export macro
 #include "vtkImageAlgorithm.h"
diff --git a/Imaging/Hybrid/vtkImageCursor3D.h b/Imaging/Hybrid/vtkImageCursor3D.h
index 7e191aaa0a49e53d48b43fc68228a86103cc97c1..ee727627ddc3a36cb0107988eb9dd0bc757065f0 100644
--- a/Imaging/Hybrid/vtkImageCursor3D.h
+++ b/Imaging/Hybrid/vtkImageCursor3D.h
@@ -16,8 +16,8 @@
 // .SECTION Description
 // vtkImageCursor3D will draw a cursor on a 2d image or 3d volume.
 
-#ifndef __vtkImageCursor3D_h
-#define __vtkImageCursor3D_h
+#ifndef vtkImageCursor3D_h
+#define vtkImageCursor3D_h
 
 #include "vtkImagingHybridModule.h" // For export macro
 #include "vtkImageInPlaceFilter.h"
diff --git a/Imaging/Hybrid/vtkImageRectilinearWipe.h b/Imaging/Hybrid/vtkImageRectilinearWipe.h
index e0c550b7bae60a69f9f5372a2c810a56120451e0..ac9ebff4c7fe28b368c2dafb8da158b900b82508 100644
--- a/Imaging/Hybrid/vtkImageRectilinearWipe.h
+++ b/Imaging/Hybrid/vtkImageRectilinearWipe.h
@@ -41,8 +41,8 @@
 // .SECTION See Also
 // vtkImageCheckerboard
 
-#ifndef __vtkImageRectilinearWipe_h
-#define __vtkImageRectilinearWipe_h
+#ifndef vtkImageRectilinearWipe_h
+#define vtkImageRectilinearWipe_h
 
 #include "vtkImagingHybridModule.h" // For export macro
 #include "vtkThreadedImageAlgorithm.h"
diff --git a/Imaging/Hybrid/vtkPointLoad.h b/Imaging/Hybrid/vtkPointLoad.h
index 68b2dcd051ab4bc7502bce58a880423f644ee421..4731d881390c4ff3c6b1bfc830dad7ee812cd78b 100644
--- a/Imaging/Hybrid/vtkPointLoad.h
+++ b/Imaging/Hybrid/vtkPointLoad.h
@@ -24,8 +24,8 @@
 // .SECTION See Also
 // vtkTensorGlyph, vtkHyperStreamline
 
-#ifndef __vtkPointLoad_h
-#define __vtkPointLoad_h
+#ifndef vtkPointLoad_h
+#define vtkPointLoad_h
 
 #include "vtkImagingHybridModule.h" // For export macro
 #include "vtkImageAlgorithm.h"
diff --git a/Imaging/Hybrid/vtkSampleFunction.h b/Imaging/Hybrid/vtkSampleFunction.h
index ae834556a5a3dd69c7cee270f31e9fa1958523a5..4fc057307078221f35168a0358e7d98367d298b1 100644
--- a/Imaging/Hybrid/vtkSampleFunction.h
+++ b/Imaging/Hybrid/vtkSampleFunction.h
@@ -24,8 +24,8 @@
 // .SECTION See Also
 // vtkImplicitModeller
 
-#ifndef __vtkSampleFunction_h
-#define __vtkSampleFunction_h
+#ifndef vtkSampleFunction_h
+#define vtkSampleFunction_h
 
 #include "vtkImagingHybridModule.h" // For export macro
 #include "vtkImageAlgorithm.h"
diff --git a/Imaging/Hybrid/vtkShepardMethod.h b/Imaging/Hybrid/vtkShepardMethod.h
index 2eab3a178165d5a96f9d0d3cf1f10e54d1c8081f..757d5e58453b19d02c475872d2df54b9a10de085 100644
--- a/Imaging/Hybrid/vtkShepardMethod.h
+++ b/Imaging/Hybrid/vtkShepardMethod.h
@@ -32,8 +32,8 @@
 // never receive a contribution. The final value of these points can be
 // specified with the "NullValue" instance variable.
 
-#ifndef __vtkShepardMethod_h
-#define __vtkShepardMethod_h
+#ifndef vtkShepardMethod_h
+#define vtkShepardMethod_h
 
 #include "vtkImagingHybridModule.h" // For export macro
 #include "vtkImageAlgorithm.h"
diff --git a/Imaging/Hybrid/vtkSliceCubes.h b/Imaging/Hybrid/vtkSliceCubes.h
index bd3498cd5c4e61de8d084344f2700e34f1798e93..056e2e301428c0631836edb2ad95ba3cec7b352e 100644
--- a/Imaging/Hybrid/vtkSliceCubes.h
+++ b/Imaging/Hybrid/vtkSliceCubes.h
@@ -41,8 +41,8 @@
 // .SECTION See Also
 // vtkMarchingCubes vtkContourFilter vtkMCubesReader vtkDividingCubes vtkVolumeReader
 
-#ifndef __vtkSliceCubes_h
-#define __vtkSliceCubes_h
+#ifndef vtkSliceCubes_h
+#define vtkSliceCubes_h
 
 #include "vtkImagingHybridModule.h" // For export macro
 #include "vtkObject.h"
diff --git a/Imaging/Hybrid/vtkSurfaceReconstructionFilter.h b/Imaging/Hybrid/vtkSurfaceReconstructionFilter.h
index 72090c3a55e0161d855073eb3614612ad65f8037..e1c65319fcd668a7d572193d5f34f439dd62529d 100644
--- a/Imaging/Hybrid/vtkSurfaceReconstructionFilter.h
+++ b/Imaging/Hybrid/vtkSurfaceReconstructionFilter.h
@@ -22,8 +22,8 @@
 // most uses but can be set if desired. This procedure is based on the PhD
 // work of Hugues Hoppe: http://www.research.microsoft.com/~hoppe
 
-#ifndef __vtkSurfaceReconstructionFilter_h
-#define __vtkSurfaceReconstructionFilter_h
+#ifndef vtkSurfaceReconstructionFilter_h
+#define vtkSurfaceReconstructionFilter_h
 
 #include "vtkImagingHybridModule.h" // For export macro
 #include "vtkImageAlgorithm.h"
diff --git a/Imaging/Hybrid/vtkTriangularTexture.h b/Imaging/Hybrid/vtkTriangularTexture.h
index e09a226933df593859ac19935e66023d36fb1ec2..1060b2003a7bec20fe79dce25e613bf28006bf78 100644
--- a/Imaging/Hybrid/vtkTriangularTexture.h
+++ b/Imaging/Hybrid/vtkTriangularTexture.h
@@ -25,8 +25,8 @@
 // .SECTION See Also
 // vtkTriangularTCoords
 
-#ifndef __vtkTriangularTexture_h
-#define __vtkTriangularTexture_h
+#ifndef vtkTriangularTexture_h
+#define vtkTriangularTexture_h
 
 #include "vtkImagingHybridModule.h" // For export macro
 #include "vtkImageAlgorithm.h"
diff --git a/Imaging/Hybrid/vtkVoxelModeller.h b/Imaging/Hybrid/vtkVoxelModeller.h
index 0aa3200abab2df220cc915c698d7350d73a22a92..610a101139ab994ac4fd0e16b89dcd1e19d7aa03 100644
--- a/Imaging/Hybrid/vtkVoxelModeller.h
+++ b/Imaging/Hybrid/vtkVoxelModeller.h
@@ -25,8 +25,8 @@
 // .SECTION see also
 // vtkImplicitModeller
 
-#ifndef __vtkVoxelModeller_h
-#define __vtkVoxelModeller_h
+#ifndef vtkVoxelModeller_h
+#define vtkVoxelModeller_h
 
 #include "vtkImagingHybridModule.h" // For export macro
 #include "vtkImageAlgorithm.h"
diff --git a/Imaging/Math/vtkImageDivergence.h b/Imaging/Math/vtkImageDivergence.h
index cba48f7e53fc7cfb3d98103067d31a819806d4bd..8d8c9f84489e1a682d0018cfcde5dd3fd197ef04 100644
--- a/Imaging/Math/vtkImageDivergence.h
+++ b/Imaging/Math/vtkImageDivergence.h
@@ -21,8 +21,8 @@
 // Given V = P(x,y,z), Q(x,y,z), R(x,y,z),
 // Divergence = dP/dx + dQ/dy + dR/dz.
 
-#ifndef __vtkImageDivergence_h
-#define __vtkImageDivergence_h
+#ifndef vtkImageDivergence_h
+#define vtkImageDivergence_h
 
 #include "vtkImagingMathModule.h" // For export macro
 #include "vtkThreadedImageAlgorithm.h"
diff --git a/Imaging/Math/vtkImageDotProduct.h b/Imaging/Math/vtkImageDotProduct.h
index 9fb787acbf1db1ea7bf28fbc8b52da3ae82c4cff..39d3288e6a005fd706c198b15428b1854210be62 100644
--- a/Imaging/Math/vtkImageDotProduct.h
+++ b/Imaging/Math/vtkImageDotProduct.h
@@ -17,8 +17,8 @@
 // vtkImageDotProduct interprets the scalar components of two images
 // as vectors and takes the dot product vector by vector (pixel by pixel).
 
-#ifndef __vtkImageDotProduct_h
-#define __vtkImageDotProduct_h
+#ifndef vtkImageDotProduct_h
+#define vtkImageDotProduct_h
 
 
 
diff --git a/Imaging/Math/vtkImageLogarithmicScale.h b/Imaging/Math/vtkImageLogarithmicScale.h
index 368133b5d6a72939ef82c7c7f46ef6cdb6e65dc1..92136952417e505e068d47fe82617b4c8f051edf 100644
--- a/Imaging/Math/vtkImageLogarithmicScale.h
+++ b/Imaging/Math/vtkImageLogarithmicScale.h
@@ -20,8 +20,8 @@
 
 
 
-#ifndef __vtkImageLogarithmicScale_h
-#define __vtkImageLogarithmicScale_h
+#ifndef vtkImageLogarithmicScale_h
+#define vtkImageLogarithmicScale_h
 
 
 #include "vtkImagingMathModule.h" // For export macro
diff --git a/Imaging/Math/vtkImageLogic.h b/Imaging/Math/vtkImageLogic.h
index 003f8f3b9fc88000437297ee84f0b60c6149e510..dfb719681927e7fe7f21ee6789795cb4d60c91b2 100644
--- a/Imaging/Math/vtkImageLogic.h
+++ b/Imaging/Math/vtkImageLogic.h
@@ -19,8 +19,8 @@
 // The filter can take two or one input. Inputs must have the same type.
 
 
-#ifndef __vtkImageLogic_h
-#define __vtkImageLogic_h
+#ifndef vtkImageLogic_h
+#define vtkImageLogic_h
 
 
 // Operation options.
diff --git a/Imaging/Math/vtkImageMagnitude.h b/Imaging/Math/vtkImageMagnitude.h
index d2d9f994dfba631a04549bdc2815055d85a60ab0..e0f24184423bd1f976c000dd2f1bfd608d67ea0f 100644
--- a/Imaging/Math/vtkImageMagnitude.h
+++ b/Imaging/Math/vtkImageMagnitude.h
@@ -17,8 +17,8 @@
 // vtkImageMagnitude takes the magnitude of the components.
 
 
-#ifndef __vtkImageMagnitude_h
-#define __vtkImageMagnitude_h
+#ifndef vtkImageMagnitude_h
+#define vtkImageMagnitude_h
 
 
 #include "vtkImagingMathModule.h" // For export macro
diff --git a/Imaging/Math/vtkImageMaskBits.h b/Imaging/Math/vtkImageMaskBits.h
index ee14ffea38e2e0774adfea640ee6f4bf98d59466..7d2e6cde5948ef1b8b7a9a6cb02f5605e3ea8f74 100644
--- a/Imaging/Math/vtkImageMaskBits.h
+++ b/Imaging/Math/vtkImageMaskBits.h
@@ -19,8 +19,8 @@
 // bit-mask can be applied using a variety of boolean bitwise operators.
 
 
-#ifndef __vtkImageMaskBits_h
-#define __vtkImageMaskBits_h
+#ifndef vtkImageMaskBits_h
+#define vtkImageMaskBits_h
 
 #include "vtkImagingMathModule.h" // For export macro
 #include "vtkImageLogic.h"  //For VTK_AND, VTK_OR ...
diff --git a/Imaging/Math/vtkImageMathematics.h b/Imaging/Math/vtkImageMathematics.h
index 9ef099e5b71f10018e9c314a17051d259f1955d5..68a4d4313e6a16c7409953927a45d7583908843d 100644
--- a/Imaging/Math/vtkImageMathematics.h
+++ b/Imaging/Math/vtkImageMathematics.h
@@ -20,8 +20,8 @@
 // input.
 
 
-#ifndef __vtkImageMathematics_h
-#define __vtkImageMathematics_h
+#ifndef vtkImageMathematics_h
+#define vtkImageMathematics_h
 
 
 // Operation options.
diff --git a/Imaging/Math/vtkImageWeightedSum.h b/Imaging/Math/vtkImageWeightedSum.h
index 9dbe2acf30c8b52e77c9149cff81972a42c78c01..f7a9103a87f79fa2cbbf34de0cdf1800e253e33c 100644
--- a/Imaging/Math/vtkImageWeightedSum.h
+++ b/Imaging/Math/vtkImageWeightedSum.h
@@ -23,8 +23,8 @@
 // The original author of this class is Lauren O'Donnell (MIT) for Slicer
 
 
-#ifndef __vtkImageWeightedSum_h
-#define __vtkImageWeightedSum_h
+#ifndef vtkImageWeightedSum_h
+#define vtkImageWeightedSum_h
 
 #include "vtkImagingMathModule.h" // For export macro
 #include "vtkThreadedImageAlgorithm.h"
diff --git a/Imaging/Morphological/vtkImageConnector.h b/Imaging/Morphological/vtkImageConnector.h
index c35f242eddd78668532d42d346f0baf9bd63c66c..7dcef47f68f0ab22361ca44da73342785b964102 100644
--- a/Imaging/Morphological/vtkImageConnector.h
+++ b/Imaging/Morphological/vtkImageConnector.h
@@ -24,8 +24,8 @@
 // neighbors.
 
 
-#ifndef __vtkImageConnector_h
-#define __vtkImageConnector_h
+#ifndef vtkImageConnector_h
+#define vtkImageConnector_h
 
 #include "vtkImagingMorphologicalModule.h" // For export macro
 #include "vtkObject.h"
diff --git a/Imaging/Morphological/vtkImageContinuousDilate3D.h b/Imaging/Morphological/vtkImageContinuousDilate3D.h
index ebe6b153ac13560f3ec6defa147bafc3d2690c49..e6d13be7c855113c59a9a85e5d9210fc285d4184 100644
--- a/Imaging/Morphological/vtkImageContinuousDilate3D.h
+++ b/Imaging/Morphological/vtkImageContinuousDilate3D.h
@@ -19,8 +19,8 @@
 // is done on that axis.
 
 
-#ifndef __vtkImageContinuousDilate3D_h
-#define __vtkImageContinuousDilate3D_h
+#ifndef vtkImageContinuousDilate3D_h
+#define vtkImageContinuousDilate3D_h
 
 
 #include "vtkImagingMorphologicalModule.h" // For export macro
diff --git a/Imaging/Morphological/vtkImageContinuousErode3D.h b/Imaging/Morphological/vtkImageContinuousErode3D.h
index 5a7dbf9b47464c8249bc5f2cbd503f571abd29ad..ad84b4a1677467c2c64b318e821a7b1f03d19e71 100644
--- a/Imaging/Morphological/vtkImageContinuousErode3D.h
+++ b/Imaging/Morphological/vtkImageContinuousErode3D.h
@@ -19,8 +19,8 @@
 // is done on that axis.
 
 
-#ifndef __vtkImageContinuousErode3D_h
-#define __vtkImageContinuousErode3D_h
+#ifndef vtkImageContinuousErode3D_h
+#define vtkImageContinuousErode3D_h
 
 
 #include "vtkImagingMorphologicalModule.h" // For export macro
diff --git a/Imaging/Morphological/vtkImageDilateErode3D.h b/Imaging/Morphological/vtkImageDilateErode3D.h
index 1d3d90359b8443ad3339046d5637347cad681bed..e6b062f6e5772d0983062a4e012b87b806fc5a62 100644
--- a/Imaging/Morphological/vtkImageDilateErode3D.h
+++ b/Imaging/Morphological/vtkImageDilateErode3D.h
@@ -21,8 +21,8 @@
 // filter by setting the kernel size to 1 for a specific axis.
 
 
-#ifndef __vtkImageDilateErode3D_h
-#define __vtkImageDilateErode3D_h
+#ifndef vtkImageDilateErode3D_h
+#define vtkImageDilateErode3D_h
 
 
 #include "vtkImagingMorphologicalModule.h" // For export macro
diff --git a/Imaging/Morphological/vtkImageIslandRemoval2D.h b/Imaging/Morphological/vtkImageIslandRemoval2D.h
index 7868410afa9b29779b3d80e0e21aac86070c11ea..323cca4c6cf65383b06e6e7f8aea960b21608f58 100644
--- a/Imaging/Morphological/vtkImageIslandRemoval2D.h
+++ b/Imaging/Morphological/vtkImageIslandRemoval2D.h
@@ -20,8 +20,8 @@
 // the whole 2D output image for any output request.
 
 
-#ifndef __vtkImageIslandRemoval2D_h
-#define __vtkImageIslandRemoval2D_h
+#ifndef vtkImageIslandRemoval2D_h
+#define vtkImageIslandRemoval2D_h
 
 
 #include "vtkImagingMorphologicalModule.h" // For export macro
diff --git a/Imaging/Morphological/vtkImageNonMaximumSuppression.h b/Imaging/Morphological/vtkImageNonMaximumSuppression.h
index 9491935672a8489756de974e5118aaa16179e44f..a1c9f46d46f9067670a38a1138e021fc2a721b78 100644
--- a/Imaging/Morphological/vtkImageNonMaximumSuppression.h
+++ b/Imaging/Morphological/vtkImageNonMaximumSuppression.h
@@ -22,8 +22,8 @@
 // vtkImageGradientMagnitude as inputs.
 
 
-#ifndef __vtkImageNonMaximumSuppression_h
-#define __vtkImageNonMaximumSuppression_h
+#ifndef vtkImageNonMaximumSuppression_h
+#define vtkImageNonMaximumSuppression_h
 
 #define VTK_IMAGE_NON_MAXIMUM_SUPPRESSION_MAGNITUDE_INPUT 0
 #define VTK_IMAGE_NON_MAXIMUM_SUPPRESSION_VECTOR_INPUT 1
diff --git a/Imaging/Morphological/vtkImageOpenClose3D.h b/Imaging/Morphological/vtkImageOpenClose3D.h
index 229c5af45f5a118cc2052bb4860fa80ef6cd02d8..a5fe94bb9600c9f638ff6fb81c1307fcce72fc68 100644
--- a/Imaging/Morphological/vtkImageOpenClose3D.h
+++ b/Imaging/Morphological/vtkImageOpenClose3D.h
@@ -28,8 +28,8 @@
 // two tags.
 
 
-#ifndef __vtkImageOpenClose3D_h
-#define __vtkImageOpenClose3D_h
+#ifndef vtkImageOpenClose3D_h
+#define vtkImageOpenClose3D_h
 
 
 #include "vtkImagingMorphologicalModule.h" // For export macro
diff --git a/Imaging/Morphological/vtkImageSeedConnectivity.h b/Imaging/Morphological/vtkImageSeedConnectivity.h
index 9e0c5bc9aef78622191433fb4505b2e3b94a8b98..98819eb49d0ced640cd3f4890cbfb1b6d1fbeb7d 100644
--- a/Imaging/Morphological/vtkImageSeedConnectivity.h
+++ b/Imaging/Morphological/vtkImageSeedConnectivity.h
@@ -25,8 +25,8 @@
 // connected to seeds.  The same seeds are used for all images in the image
 // set.
 
-#ifndef __vtkImageSeedConnectivity_h
-#define __vtkImageSeedConnectivity_h
+#ifndef vtkImageSeedConnectivity_h
+#define vtkImageSeedConnectivity_h
 
 #include "vtkImagingMorphologicalModule.h" // For export macro
 #include "vtkImageAlgorithm.h"
diff --git a/Imaging/Morphological/vtkImageSkeleton2D.h b/Imaging/Morphological/vtkImageSkeleton2D.h
index 984ab88e41fd9903e0d0ae916329c45622fd2d9f..556504bc8a341b00d21ab998bdca2b2aba744ab0 100644
--- a/Imaging/Morphological/vtkImageSkeleton2D.h
+++ b/Imaging/Morphological/vtkImageSkeleton2D.h
@@ -26,8 +26,8 @@
 
 
 
-#ifndef __vtkImageSkeleton2D_h
-#define __vtkImageSkeleton2D_h
+#ifndef vtkImageSkeleton2D_h
+#define vtkImageSkeleton2D_h
 
 #include "vtkImagingMorphologicalModule.h" // For export macro
 #include "vtkImageIterateFilter.h"
diff --git a/Imaging/Morphological/vtkImageThresholdConnectivity.h b/Imaging/Morphological/vtkImageThresholdConnectivity.h
index 5c97235ad6d952dd8e22197796bf8a6f1d35e895..f50f8f5b85514af6b0e266143e119f443fef1206 100644
--- a/Imaging/Morphological/vtkImageThresholdConnectivity.h
+++ b/Imaging/Morphological/vtkImageThresholdConnectivity.h
@@ -27,8 +27,8 @@
 // .SECTION Thanks
 // Thanks to David Gobbi for contributing this class to VTK.
 
-#ifndef __vtkImageThresholdConnectivity_h
-#define __vtkImageThresholdConnectivity_h
+#ifndef vtkImageThresholdConnectivity_h
+#define vtkImageThresholdConnectivity_h
 
 #include "vtkImagingMorphologicalModule.h" // For export macro
 #include "vtkImageAlgorithm.h"
diff --git a/Imaging/Sources/vtkImageCanvasSource2D.h b/Imaging/Sources/vtkImageCanvasSource2D.h
index a5fb6a96e69435e5293f26d7219974d21eea0e73..ce31c16342a49dfeffda8c172b6ecbf20867f2a4 100644
--- a/Imaging/Sources/vtkImageCanvasSource2D.h
+++ b/Imaging/Sources/vtkImageCanvasSource2D.h
@@ -19,8 +19,8 @@
 // It can paint multi-spectral images.
 
 
-#ifndef __vtkImageCanvasSource2D_h
-#define __vtkImageCanvasSource2D_h
+#ifndef vtkImageCanvasSource2D_h
+#define vtkImageCanvasSource2D_h
 
 #include "vtkImagingSourcesModule.h" // For export macro
 #include "vtkImageAlgorithm.h"
diff --git a/Imaging/Sources/vtkImageEllipsoidSource.h b/Imaging/Sources/vtkImageEllipsoidSource.h
index 92fd326f0602b88703b0c880afe8ce16a31d8171..857845d4a98c3f955b0ee094f70fc82024ba7b7f 100644
--- a/Imaging/Sources/vtkImageEllipsoidSource.h
+++ b/Imaging/Sources/vtkImageEllipsoidSource.h
@@ -20,8 +20,8 @@
 
 
 
-#ifndef __vtkImageEllipsoidSource_h
-#define __vtkImageEllipsoidSource_h
+#ifndef vtkImageEllipsoidSource_h
+#define vtkImageEllipsoidSource_h
 
 #include "vtkImagingSourcesModule.h" // For export macro
 #include "vtkImageAlgorithm.h"
diff --git a/Imaging/Sources/vtkImageGaussianSource.h b/Imaging/Sources/vtkImageGaussianSource.h
index ba8b98ca7e611790fe62b703da6c63967805ffd2..05aea81a5b890f48ea99d35250af6e8c7ac61b5e 100644
--- a/Imaging/Sources/vtkImageGaussianSource.h
+++ b/Imaging/Sources/vtkImageGaussianSource.h
@@ -18,8 +18,8 @@
 // by a Gaussian.
 
 
-#ifndef __vtkImageGaussianSource_h
-#define __vtkImageGaussianSource_h
+#ifndef vtkImageGaussianSource_h
+#define vtkImageGaussianSource_h
 
 #include "vtkImagingSourcesModule.h" // For export macro
 #include "vtkImageAlgorithm.h"
diff --git a/Imaging/Sources/vtkImageGridSource.h b/Imaging/Sources/vtkImageGridSource.h
index 0dd69072f0da2a5c9c734816a669e7837389dff8..c5272d48beaa7793ac091fb9a40b8ca406efa8b4 100644
--- a/Imaging/Sources/vtkImageGridSource.h
+++ b/Imaging/Sources/vtkImageGridSource.h
@@ -17,8 +17,8 @@
 // vtkImageGridSource produces an image of a grid.  The
 // default output type is double.
 
-#ifndef __vtkImageGridSource_h
-#define __vtkImageGridSource_h
+#ifndef vtkImageGridSource_h
+#define vtkImageGridSource_h
 
 #include "vtkImagingSourcesModule.h" // For export macro
 #include "vtkImageAlgorithm.h"
diff --git a/Imaging/Sources/vtkImageMandelbrotSource.h b/Imaging/Sources/vtkImageMandelbrotSource.h
index 52d49b35f35353f77fadec2421de4cf7462d191c..6b04c8a9f1f498da9f4b0387eb211b1fbdd9adcb 100644
--- a/Imaging/Sources/vtkImageMandelbrotSource.h
+++ b/Imaging/Sources/vtkImageMandelbrotSource.h
@@ -24,8 +24,8 @@
 // possible parameters to vary, but there are no more 4d images :(
 // The third dimension (z axis) is the imaginary value of the initial value.
 
-#ifndef __vtkImageMandelbrotSource_h
-#define __vtkImageMandelbrotSource_h
+#ifndef vtkImageMandelbrotSource_h
+#define vtkImageMandelbrotSource_h
 
 #include "vtkImagingSourcesModule.h" // For export macro
 #include "vtkImageAlgorithm.h"
diff --git a/Imaging/Sources/vtkImageNoiseSource.h b/Imaging/Sources/vtkImageNoiseSource.h
index 62e9c6f0f3db385b17dca87abb6fa0c4956bba09..49c34a29c9384af027a44202668e309c4d3ed154 100644
--- a/Imaging/Sources/vtkImageNoiseSource.h
+++ b/Imaging/Sources/vtkImageNoiseSource.h
@@ -22,8 +22,8 @@
 // on different updates.
 
 
-#ifndef __vtkImageNoiseSource_h
-#define __vtkImageNoiseSource_h
+#ifndef vtkImageNoiseSource_h
+#define vtkImageNoiseSource_h
 
 
 #include "vtkImagingSourcesModule.h" // For export macro
diff --git a/Imaging/Sources/vtkImageSinusoidSource.h b/Imaging/Sources/vtkImageSinusoidSource.h
index ae0323378ee8164a53e473fbe68e26a0deaa53e2..e367cdfd1a9c4f6f1ce35bfa995410fa6a02f7e8 100644
--- a/Imaging/Sources/vtkImageSinusoidSource.h
+++ b/Imaging/Sources/vtkImageSinusoidSource.h
@@ -18,8 +18,8 @@
 // by a sinusoid.
 
 
-#ifndef __vtkImageSinusoidSource_h
-#define __vtkImageSinusoidSource_h
+#ifndef vtkImageSinusoidSource_h
+#define vtkImageSinusoidSource_h
 
 #include "vtkImagingSourcesModule.h" // For export macro
 #include "vtkImageAlgorithm.h"
diff --git a/Imaging/Statistics/vtkImageAccumulate.h b/Imaging/Statistics/vtkImageAccumulate.h
index 4090c2da8e6a48ab4f44bd997e5af3b564d821df..d6967fe7cabc2a4b0b2ccd2d1fb0fd586d07d123 100644
--- a/Imaging/Statistics/vtkImageAccumulate.h
+++ b/Imaging/Statistics/vtkImageAccumulate.h
@@ -32,8 +32,8 @@
 //
 // .SECTION see also vtkImageMask
 
-#ifndef __vtkImageAccumulate_h
-#define __vtkImageAccumulate_h
+#ifndef vtkImageAccumulate_h
+#define vtkImageAccumulate_h
 
 #include "vtkImagingStatisticsModule.h" // For export macro
 #include "vtkImageAlgorithm.h"
diff --git a/Imaging/Statistics/vtkImageHistogram.h b/Imaging/Statistics/vtkImageHistogram.h
index 1d166b56c4550660dac7a2957e90c92c4ff54267..6675e40068f470a243395338388be80bf181d798 100644
--- a/Imaging/Statistics/vtkImageHistogram.h
+++ b/Imaging/Statistics/vtkImageHistogram.h
@@ -25,8 +25,8 @@
 // Thanks to David Gobbi at the Seaman Family MR Centre and Dept. of Clinical
 // Neurosciences, Foothills Medical Centre, Calgary, for providing this class.
 
-#ifndef __vtkImageHistogram_h
-#define __vtkImageHistogram_h
+#ifndef vtkImageHistogram_h
+#define vtkImageHistogram_h
 
 #include "vtkImagingStatisticsModule.h" // For export macro
 #include "vtkThreadedImageAlgorithm.h"
diff --git a/Imaging/Statistics/vtkImageHistogramStatistics.h b/Imaging/Statistics/vtkImageHistogramStatistics.h
index 61652d4a77c4310f16a1fdbc005151fd8342da40..ed2a9d2537c2575407e67425109a3c3d600f88e4 100644
--- a/Imaging/Statistics/vtkImageHistogramStatistics.h
+++ b/Imaging/Statistics/vtkImageHistogramStatistics.h
@@ -26,8 +26,8 @@
 // Thanks to David Gobbi at the Seaman Family MR Centre and Dept. of Clinical
 // Neurosciences, Foothills Medical Centre, Calgary, for providing this class.
 
-#ifndef __vtkImageHistogramStatistics_h
-#define __vtkImageHistogramStatistics_h
+#ifndef vtkImageHistogramStatistics_h
+#define vtkImageHistogramStatistics_h
 
 #include "vtkImagingStatisticsModule.h" // For export macro
 #include "vtkImageHistogram.h"
diff --git a/Imaging/Stencil/vtkImageStencil.h b/Imaging/Stencil/vtkImageStencil.h
index bb0a62753189df245f6c21e3c78bd3a8fb3525af..41edb0338c411c33e885f59807e3b57098ae1bd7 100644
--- a/Imaging/Stencil/vtkImageStencil.h
+++ b/Imaging/Stencil/vtkImageStencil.h
@@ -18,8 +18,8 @@
 // The stencil should be provided in the form of a vtkImageStencilData,
 
 
-#ifndef __vtkImageStencil_h
-#define __vtkImageStencil_h
+#ifndef vtkImageStencil_h
+#define vtkImageStencil_h
 
 #include "vtkImagingStencilModule.h" // For export macro
 #include "vtkThreadedImageAlgorithm.h"
diff --git a/Imaging/Stencil/vtkImageStencilToImage.h b/Imaging/Stencil/vtkImageStencilToImage.h
index 8aaead8ed1e938ef014e39e350fb5b60a980c20b..7d44830ebfe05c5001a8f6642fa9598de5b09918 100644
--- a/Imaging/Stencil/vtkImageStencilToImage.h
+++ b/Imaging/Stencil/vtkImageStencilToImage.h
@@ -22,8 +22,8 @@
 // .SECTION See Also
 // vtkImplicitModeller
 
-#ifndef __vtkImageStencilToImage_h
-#define __vtkImageStencilToImage_h
+#ifndef vtkImageStencilToImage_h
+#define vtkImageStencilToImage_h
 
 #include "vtkImagingStencilModule.h" // For export macro
 #include "vtkImageAlgorithm.h"
diff --git a/Imaging/Stencil/vtkImageToImageStencil.h b/Imaging/Stencil/vtkImageToImageStencil.h
index a2636b17bb41d432328369648aaf3602d1ca9f02..e6585a288d188c0959629fb08e5f816b4f62f46a 100644
--- a/Imaging/Stencil/vtkImageToImageStencil.h
+++ b/Imaging/Stencil/vtkImageToImageStencil.h
@@ -20,8 +20,8 @@
 // .SECTION see also
 // vtkImageStencil vtkImplicitFunctionToImageStencil vtkPolyDataToImageStencil
 
-#ifndef __vtkImageToImageStencil_h
-#define __vtkImageToImageStencil_h
+#ifndef vtkImageToImageStencil_h
+#define vtkImageToImageStencil_h
 
 
 #include "vtkImagingStencilModule.h" // For export macro
diff --git a/Imaging/Stencil/vtkImplicitFunctionToImageStencil.h b/Imaging/Stencil/vtkImplicitFunctionToImageStencil.h
index 78a88ffe31b98c68328505d131366eb4731f9661..31585f29e90be091bd9e04db575a23fc5742a224 100644
--- a/Imaging/Stencil/vtkImplicitFunctionToImageStencil.h
+++ b/Imaging/Stencil/vtkImplicitFunctionToImageStencil.h
@@ -20,8 +20,8 @@
 // .SECTION see also
 // vtkImplicitFunction vtkImageStencil vtkPolyDataToImageStencil
 
-#ifndef __vtkImplicitFunctionToImageStencil_h
-#define __vtkImplicitFunctionToImageStencil_h
+#ifndef vtkImplicitFunctionToImageStencil_h
+#define vtkImplicitFunctionToImageStencil_h
 
 
 #include "vtkImagingStencilModule.h" // For export macro
diff --git a/Imaging/Stencil/vtkLassoStencilSource.h b/Imaging/Stencil/vtkLassoStencilSource.h
index de13ee7bc2a31d3b184a8191f571d911115fade2..72f7c4cb3a10d9435b1b9a046890cc2ffeb53e9d 100644
--- a/Imaging/Stencil/vtkLassoStencilSource.h
+++ b/Imaging/Stencil/vtkLassoStencilSource.h
@@ -23,8 +23,8 @@
 // .SECTION Thanks
 // Thanks to David Gobbi for contributing this class to VTK.
 
-#ifndef __vtkLassoStencilSource_h
-#define __vtkLassoStencilSource_h
+#ifndef vtkLassoStencilSource_h
+#define vtkLassoStencilSource_h
 
 
 #include "vtkImagingStencilModule.h" // For export macro
diff --git a/Imaging/Stencil/vtkPolyDataToImageStencil.h b/Imaging/Stencil/vtkPolyDataToImageStencil.h
index 5a5504c14ee967f5455156a584ba17c98b64931e..a3fb354ba4332536d888aeccb64c61e4987171f0 100644
--- a/Imaging/Stencil/vtkPolyDataToImageStencil.h
+++ b/Imaging/Stencil/vtkPolyDataToImageStencil.h
@@ -56,8 +56,8 @@ POSSIBILITY OF SUCH DAMAGES.
 // .SECTION See Also
 // vtkImageStencil vtkImageAccumulate vtkImageBlend vtkImageReslice
 
-#ifndef __vtkPolyDataToImageStencil_h
-#define __vtkPolyDataToImageStencil_h
+#ifndef vtkPolyDataToImageStencil_h
+#define vtkPolyDataToImageStencil_h
 
 #include "vtkImagingStencilModule.h" // For export macro
 #include "vtkImageStencilSource.h"
diff --git a/Imaging/Stencil/vtkROIStencilSource.h b/Imaging/Stencil/vtkROIStencilSource.h
index dd4706ee8b43f88add357864b84bfc67d517fc6c..715fe5357a69ef73c366406d36fcc0f5975d5533 100644
--- a/Imaging/Stencil/vtkROIStencilSource.h
+++ b/Imaging/Stencil/vtkROIStencilSource.h
@@ -23,8 +23,8 @@
 // .SECTION Thanks
 // Thanks to David Gobbi for contributing this class to VTK.
 
-#ifndef __vtkROIStencilSource_h
-#define __vtkROIStencilSource_h
+#ifndef vtkROIStencilSource_h
+#define vtkROIStencilSource_h
 
 
 #include "vtkImagingStencilModule.h" // For export macro
diff --git a/Infovis/Boost/vtkVariantBoostSerialization.h b/Infovis/Boost/vtkVariantBoostSerialization.h
index 4aa7883ed37e0033636383be65bd33648a728543..ab50f6595f33bcf9d53a364f330746018fe567ed 100644
--- a/Infovis/Boost/vtkVariantBoostSerialization.h
+++ b/Infovis/Boost/vtkVariantBoostSerialization.h
@@ -27,8 +27,8 @@
 // library. Just including the header suffices to get serialization
 // support; no other action is needed.
 
-#ifndef __vtkVariantBoostSerialization_h
-#define __vtkVariantBoostSerialization_h
+#ifndef vtkVariantBoostSerialization_h
+#define vtkVariantBoostSerialization_h
 
 #include "vtkSetGet.h"
 #include "vtkType.h"
diff --git a/Infovis/BoostGraphAlgorithms/vtkBoostBetweennessClustering.h b/Infovis/BoostGraphAlgorithms/vtkBoostBetweennessClustering.h
index cf4568aa680523e79e392a4ee6af0e4e40f255e7..cdd1fd2f4f55efee051d2269792786e4b3ff4aca 100644
--- a/Infovis/BoostGraphAlgorithms/vtkBoostBetweennessClustering.h
+++ b/Infovis/BoostGraphAlgorithms/vtkBoostBetweennessClustering.h
@@ -25,8 +25,8 @@
 // .SECTION See Also
 // vtkGraph vtkBoostGraphAdapter
 
-#ifndef __vtkBoostBetweennessClustering_h
-#define __vtkBoostBetweennessClustering_h
+#ifndef vtkBoostBetweennessClustering_h
+#define vtkBoostBetweennessClustering_h
 
 #include "vtkInfovisBoostGraphAlgorithmsModule.h" // For export macro
 #include "vtkGraphAlgorithm.h"
@@ -89,4 +89,4 @@ private:
   void operator=(const vtkBoostBetweennessClustering&); // Not implemented.
 };
 
-#endif // __vtkBoostBetweennessClustering_h
+#endif // vtkBoostBetweennessClustering_h
diff --git a/Infovis/BoostGraphAlgorithms/vtkBoostBiconnectedComponents.h b/Infovis/BoostGraphAlgorithms/vtkBoostBiconnectedComponents.h
index e8c86e8b8a3656aeeba2f5f684e78704bf7a708c..5b2d0f034dabec20a42eb765dfe336b223e6b814 100644
--- a/Infovis/BoostGraphAlgorithms/vtkBoostBiconnectedComponents.h
+++ b/Infovis/BoostGraphAlgorithms/vtkBoostBiconnectedComponents.h
@@ -39,8 +39,8 @@
 // The boost graph bindings currently only support boost version 1.33.1.
 // There are apparently backwards-compatibility issues with later versions.
 
-#ifndef __vtkBoostBiconnectedComponents_h
-#define __vtkBoostBiconnectedComponents_h
+#ifndef vtkBoostBiconnectedComponents_h
+#define vtkBoostBiconnectedComponents_h
 
 #include "vtkInfovisBoostGraphAlgorithmsModule.h" // For export macro
 #include "vtkUndirectedGraphAlgorithm.h"
diff --git a/Infovis/BoostGraphAlgorithms/vtkBoostBrandesCentrality.h b/Infovis/BoostGraphAlgorithms/vtkBoostBrandesCentrality.h
index e2799ec692b7258e4b5c019ec3eb9c45b1cdff3a..d520a6bfb2d3fe867e780856986d24af059bd9ef 100644
--- a/Infovis/BoostGraphAlgorithms/vtkBoostBrandesCentrality.h
+++ b/Infovis/BoostGraphAlgorithms/vtkBoostBrandesCentrality.h
@@ -29,8 +29,8 @@
 // .SECTION See Also
 // vtkGraph vtkBoostGraphAdapter
 
-#ifndef __vtkBoostBrandesCentrality_h
-#define __vtkBoostBrandesCentrality_h
+#ifndef vtkBoostBrandesCentrality_h
+#define vtkBoostBrandesCentrality_h
 
 #include "vtkInfovisBoostGraphAlgorithmsModule.h" // For export macro
 #include "vtkVariant.h" // For variant type
diff --git a/Infovis/BoostGraphAlgorithms/vtkBoostBreadthFirstSearch.h b/Infovis/BoostGraphAlgorithms/vtkBoostBreadthFirstSearch.h
index 360705fb337bb4bef348ca7a80b1732a9eb19002..ef5135bc51f62d4f2043882983c3ce0c22d238fa 100644
--- a/Infovis/BoostGraphAlgorithms/vtkBoostBreadthFirstSearch.h
+++ b/Infovis/BoostGraphAlgorithms/vtkBoostBreadthFirstSearch.h
@@ -28,8 +28,8 @@
 // .SECTION See Also
 // vtkGraph vtkBoostGraphAdapter
 
-#ifndef __vtkBoostBreadthFirstSearch_h
-#define __vtkBoostBreadthFirstSearch_h
+#ifndef vtkBoostBreadthFirstSearch_h
+#define vtkBoostBreadthFirstSearch_h
 
 #include "vtkInfovisBoostGraphAlgorithmsModule.h" // For export macro
 #include "vtkStdString.h" // For string type
diff --git a/Infovis/BoostGraphAlgorithms/vtkBoostBreadthFirstSearchTree.h b/Infovis/BoostGraphAlgorithms/vtkBoostBreadthFirstSearchTree.h
index 3e705c7254ac9076b4ae8ef06a1a6f03c8f2fe88..59d350746a7c9e75e00fb6fde97098c8a8bfd639 100644
--- a/Infovis/BoostGraphAlgorithms/vtkBoostBreadthFirstSearchTree.h
+++ b/Infovis/BoostGraphAlgorithms/vtkBoostBreadthFirstSearchTree.h
@@ -30,8 +30,8 @@
 // .SECTION See Also
 // vtkGraph vtkBoostGraphAdapter
 
-#ifndef __vtkBoostBreadthFirstSearchTree_h
-#define __vtkBoostBreadthFirstSearchTree_h
+#ifndef vtkBoostBreadthFirstSearchTree_h
+#define vtkBoostBreadthFirstSearchTree_h
 
 #include "vtkInfovisBoostGraphAlgorithmsModule.h" // For export macro
 #include "vtkStdString.h" // For string type
diff --git a/Infovis/BoostGraphAlgorithms/vtkBoostConnectedComponents.h b/Infovis/BoostGraphAlgorithms/vtkBoostConnectedComponents.h
index af71d46addf329c24087416af2820353124155ad..a94fa50571df9c8a23b8f47815dcf10476ac55ec 100644
--- a/Infovis/BoostGraphAlgorithms/vtkBoostConnectedComponents.h
+++ b/Infovis/BoostGraphAlgorithms/vtkBoostConnectedComponents.h
@@ -28,8 +28,8 @@
 // vertices where there is a directed path between any pair of vertices
 // within each set).
 
-#ifndef __vtkBoostConnectedComponents_h
-#define __vtkBoostConnectedComponents_h
+#ifndef vtkBoostConnectedComponents_h
+#define vtkBoostConnectedComponents_h
 
 #include "vtkInfovisBoostGraphAlgorithmsModule.h" // For export macro
 #include "vtkGraphAlgorithm.h"
diff --git a/Infovis/BoostGraphAlgorithms/vtkBoostDividedEdgeBundling.h b/Infovis/BoostGraphAlgorithms/vtkBoostDividedEdgeBundling.h
index 8a6347cece0fb97134e991121335ebcd9d636b50..cc4849a7876804c5b7495ab4b53a60621ea398f4 100644
--- a/Infovis/BoostGraphAlgorithms/vtkBoostDividedEdgeBundling.h
+++ b/Infovis/BoostGraphAlgorithms/vtkBoostDividedEdgeBundling.h
@@ -36,8 +36,8 @@
 //   David Selassie, Brandon Heller, Jeffrey Heer. Divided Edge Bundling for Directional
 //   Network Data. Proceedings of IEEE InfoVis 2011.
 
-#ifndef __vtkBoostDividedEdgeBundling_h
-#define __vtkBoostDividedEdgeBundling_h
+#ifndef vtkBoostDividedEdgeBundling_h
+#define vtkBoostDividedEdgeBundling_h
 
 #include "vtkInfovisBoostGraphAlgorithmsModule.h" // For export macro
 #include "vtkDirectedGraphAlgorithm.h"
diff --git a/Infovis/BoostGraphAlgorithms/vtkBoostExtractLargestComponent.h b/Infovis/BoostGraphAlgorithms/vtkBoostExtractLargestComponent.h
index b45210687e4aafe7e762923eee0c47a88152594a..a7bc448eeffd61e4b0e7bce7afc1d1f990edcc61 100644
--- a/Infovis/BoostGraphAlgorithms/vtkBoostExtractLargestComponent.h
+++ b/Infovis/BoostGraphAlgorithms/vtkBoostExtractLargestComponent.h
@@ -20,8 +20,8 @@
 // vtkGraph. For directed graphs, this returns the largest biconnected component.
 // See vtkBoostConnectedComponents for details.
 
-#ifndef __vtkBoostExtractLargestComponent_h
-#define __vtkBoostExtractLargestComponent_h
+#ifndef vtkBoostExtractLargestComponent_h
+#define vtkBoostExtractLargestComponent_h
 
 #include "vtkInfovisBoostGraphAlgorithmsModule.h" // For export macro
 #include "vtkGraphAlgorithm.h"
diff --git a/Infovis/BoostGraphAlgorithms/vtkBoostGraphAdapter.h b/Infovis/BoostGraphAlgorithms/vtkBoostGraphAdapter.h
index 39757e70f56d619b148d5089f9d576628e4f299c..3aedb8441d16d74e57293db8124392a41488c4c3 100644
--- a/Infovis/BoostGraphAlgorithms/vtkBoostGraphAdapter.h
+++ b/Infovis/BoostGraphAlgorithms/vtkBoostGraphAdapter.h
@@ -25,8 +25,8 @@
 // vtkUndirectedGraph* depending on whether your graph is directed or undirected.
 // You may then use these objects directly in boost graph algorithms.
 
-#ifndef __vtkBoostGraphAdapter_h
-#define __vtkBoostGraphAdapter_h
+#ifndef vtkBoostGraphAdapter_h
+#define vtkBoostGraphAdapter_h
 
 #include "vtkAbstractArray.h"
 #include "vtkDirectedGraph.h"
@@ -1144,5 +1144,5 @@ namespace boost {
 #endif
 
 
-#endif // __vtkBoostGraphAdapter_h
+#endif // vtkBoostGraphAdapter_h
 // VTK-HeaderTest-Exclude: vtkBoostGraphAdapter.h
diff --git a/Infovis/BoostGraphAlgorithms/vtkBoostKruskalMinimumSpanningTree.h b/Infovis/BoostGraphAlgorithms/vtkBoostKruskalMinimumSpanningTree.h
index c5a75690ed1c95f9df3e766d3771e15092848c23..30524add5d9bae10c9f6d4187e579416a2e7971c 100644
--- a/Infovis/BoostGraphAlgorithms/vtkBoostKruskalMinimumSpanningTree.h
+++ b/Infovis/BoostGraphAlgorithms/vtkBoostKruskalMinimumSpanningTree.h
@@ -29,8 +29,8 @@ PURPOSE.  See the above copyright notice for more information.
 // .SECTION See Also
 // vtkGraph vtkBoostGraphAdapter
 
-#ifndef __vtkBoostKruskalMinimumSpanningTree_h
-#define __vtkBoostKruskalMinimumSpanningTree_h
+#ifndef vtkBoostKruskalMinimumSpanningTree_h
+#define vtkBoostKruskalMinimumSpanningTree_h
 
 #include "vtkInfovisBoostGraphAlgorithmsModule.h" // For export macro
 #include "vtkStdString.h" // For string type
diff --git a/Infovis/BoostGraphAlgorithms/vtkBoostLogWeighting.h b/Infovis/BoostGraphAlgorithms/vtkBoostLogWeighting.h
index e10b7a8a802024fa1907f3d196afd909715cb18e..6f6943b278aecc5ffc290abd93c789c388657458 100644
--- a/Infovis/BoostGraphAlgorithms/vtkBoostLogWeighting.h
+++ b/Infovis/BoostGraphAlgorithms/vtkBoostLogWeighting.h
@@ -28,8 +28,8 @@
 // .SECTION Thanks
 // Developed by Timothy M. Shead (tshead@sandia.gov) at Sandia National Laboratories.
 
-#ifndef __vtkBoostLogWeighting_h
-#define __vtkBoostLogWeighting_h
+#ifndef vtkBoostLogWeighting_h
+#define vtkBoostLogWeighting_h
 
 #include "vtkInfovisBoostGraphAlgorithmsModule.h" // For export macro
 #include "vtkArrayDataAlgorithm.h"
diff --git a/Infovis/BoostGraphAlgorithms/vtkBoostPrimMinimumSpanningTree.h b/Infovis/BoostGraphAlgorithms/vtkBoostPrimMinimumSpanningTree.h
index ee20844c8d4e790240468d6e09d60f0435dbe12f..74c39e746d64fb2ff09a4edffc2cc27763a681d1 100644
--- a/Infovis/BoostGraphAlgorithms/vtkBoostPrimMinimumSpanningTree.h
+++ b/Infovis/BoostGraphAlgorithms/vtkBoostPrimMinimumSpanningTree.h
@@ -40,8 +40,8 @@ PURPOSE.  See the above copyright notice for more information.
 // .SECTION See Also
 // vtkGraph vtkBoostGraphAdapter
 
-#ifndef __vtkBoostPrimMinimumSpanningTree_h
-#define __vtkBoostPrimMinimumSpanningTree_h
+#ifndef vtkBoostPrimMinimumSpanningTree_h
+#define vtkBoostPrimMinimumSpanningTree_h
 
 #include "vtkInfovisBoostGraphAlgorithmsModule.h" // For export macro
 #include "vtkStdString.h" // For string type
diff --git a/Infovis/BoostGraphAlgorithms/vtkBoostRandomSparseArraySource.h b/Infovis/BoostGraphAlgorithms/vtkBoostRandomSparseArraySource.h
index ee8bd624f452c9f5af8e456c3999e19fb5d3a473..1ca7721710cebfaccb3576249bc0deaa0647a4d4 100644
--- a/Infovis/BoostGraphAlgorithms/vtkBoostRandomSparseArraySource.h
+++ b/Infovis/BoostGraphAlgorithms/vtkBoostRandomSparseArraySource.h
@@ -24,8 +24,8 @@
 // .SECTION Thanks
 // Developed by Timothy M. Shead (tshead@sandia.gov) at Sandia National Laboratories.
 
-#ifndef __vtkBoostRandomSparseArraySource_h
-#define __vtkBoostRandomSparseArraySource_h
+#ifndef vtkBoostRandomSparseArraySource_h
+#define vtkBoostRandomSparseArraySource_h
 
 #include "vtkInfovisBoostGraphAlgorithmsModule.h" // For export macro
 #include "vtkArrayDataAlgorithm.h"
diff --git a/Infovis/BoostGraphAlgorithms/vtkBoostSplitTableField.h b/Infovis/BoostGraphAlgorithms/vtkBoostSplitTableField.h
index 1dc9e78cdf74598061a5dfbb33f005d7226a5f2d..73da1b0fd9bc02701404f26f124f0090e833170c 100644
--- a/Infovis/BoostGraphAlgorithms/vtkBoostSplitTableField.h
+++ b/Infovis/BoostGraphAlgorithms/vtkBoostSplitTableField.h
@@ -48,8 +48,8 @@
 // If no fields are specified, no splitting is performed.
 // If the delimiter for a field is an empty string, no splitting is performed on that field.
 
-#ifndef __vtkBoostSplitTableField_h
-#define __vtkBoostSplitTableField_h
+#ifndef vtkBoostSplitTableField_h
+#define vtkBoostSplitTableField_h
 
 #include "vtkInfovisBoostGraphAlgorithmsModule.h" // For export macro
 #include "vtkTableAlgorithm.h"
diff --git a/Infovis/Core/vtkAddMembershipArray.h b/Infovis/Core/vtkAddMembershipArray.h
index 9227e2dd5d1c79a623894295492491c19f804838..b7b508a420249e4860fab75d133e96f53a1e7dc8 100644
--- a/Infovis/Core/vtkAddMembershipArray.h
+++ b/Infovis/Core/vtkAddMembershipArray.h
@@ -25,8 +25,8 @@
 // information, and data object and adds a bit array to the output
 // vtkDataSetAttributes indicating whether each index was selected or not.
 
-#ifndef __vtkAddMembershipArray_h
-#define __vtkAddMembershipArray_h
+#ifndef vtkAddMembershipArray_h
+#define vtkAddMembershipArray_h
 
 #include "vtkInfovisCoreModule.h" // For export macro
 #include "vtkPassInputTypeAlgorithm.h"
diff --git a/Infovis/Core/vtkAdjacencyMatrixToEdgeTable.h b/Infovis/Core/vtkAdjacencyMatrixToEdgeTable.h
index 57013844640cf782e6a7d0f1bbf701d691ff15e3..3fbd40eaf9c324b5500c2aa998281388edc384f4 100644
--- a/Infovis/Core/vtkAdjacencyMatrixToEdgeTable.h
+++ b/Infovis/Core/vtkAdjacencyMatrixToEdgeTable.h
@@ -28,8 +28,8 @@
 // .SECTION Thanks
 // Developed by Timothy M. Shead (tshead@sandia.gov) at Sandia National Laboratories.
 
-#ifndef __vtkAdjacencyMatrixToEdgeTable_h
-#define __vtkAdjacencyMatrixToEdgeTable_h
+#ifndef vtkAdjacencyMatrixToEdgeTable_h
+#define vtkAdjacencyMatrixToEdgeTable_h
 
 #include "vtkInfovisCoreModule.h" // For export macro
 #include "vtkTableAlgorithm.h"
diff --git a/Infovis/Core/vtkArrayNorm.h b/Infovis/Core/vtkArrayNorm.h
index 7202ea9612c59e345fc204bd763ceb919c24f382..1e834782a133fcc6bf9999c0db759099429aab8a 100644
--- a/Infovis/Core/vtkArrayNorm.h
+++ b/Infovis/Core/vtkArrayNorm.h
@@ -31,8 +31,8 @@
 // .SECTION Thanks
 // Developed by Timothy M. Shead (tshead@sandia.gov) at Sandia National Laboratories.
 
-#ifndef __vtkArrayNorm_h
-#define __vtkArrayNorm_h
+#ifndef vtkArrayNorm_h
+#define vtkArrayNorm_h
 
 #include "vtkInfovisCoreModule.h" // For export macro
 #include "vtkArrayDataAlgorithm.h"
diff --git a/Infovis/Core/vtkArrayToTable.h b/Infovis/Core/vtkArrayToTable.h
index 1c3a598553b17eb7df2bde981e9e2c87c9e65288..fb53a017e7fb8a9736677646b4f0dbd8366e5a60 100644
--- a/Infovis/Core/vtkArrayToTable.h
+++ b/Infovis/Core/vtkArrayToTable.h
@@ -25,8 +25,8 @@
 // .SECTION Thanks
 // Developed by Timothy M. Shead (tshead@sandia.gov) at Sandia National Laboratories.
 
-#ifndef __vtkArrayToTable_h
-#define __vtkArrayToTable_h
+#ifndef vtkArrayToTable_h
+#define vtkArrayToTable_h
 
 #include "vtkInfovisCoreModule.h" // For export macro
 #include "vtkTableAlgorithm.h"
diff --git a/Infovis/Core/vtkCollapseGraph.h b/Infovis/Core/vtkCollapseGraph.h
index 69822985f065726ecc8c4531ba17562fa6b4c5d2..90d2d1c25564c766e15b798984a584b313b38304 100644
--- a/Infovis/Core/vtkCollapseGraph.h
+++ b/Infovis/Core/vtkCollapseGraph.h
@@ -37,8 +37,8 @@
 // Input port 0: graph
 // Input port 1: selection
 
-#ifndef __vtkCollapseGraph_h
-#define __vtkCollapseGraph_h
+#ifndef vtkCollapseGraph_h
+#define vtkCollapseGraph_h
 
 #include "vtkInfovisCoreModule.h" // For export macro
 #include "vtkGraphAlgorithm.h"
diff --git a/Infovis/Core/vtkCollapseVerticesByArray.h b/Infovis/Core/vtkCollapseVerticesByArray.h
index fc7a7330da0d41405b8f13987252385722428ec6..04c173a22b3adcd747359193d2e21b90a8ea1026 100644
--- a/Infovis/Core/vtkCollapseVerticesByArray.h
+++ b/Infovis/Core/vtkCollapseVerticesByArray.h
@@ -25,8 +25,8 @@
 // .SECTION Thanks
 //
 
-#ifndef __vtkCollapseVerticesByArray_h__
-#define __vtkCollapseVerticesByArray_h__
+#ifndef vtkCollapseVerticesByArray_h__
+#define vtkCollapseVerticesByArray_h__
 
 #include "vtkInfovisCoreModule.h" // For export macro
 #include "vtkGraphAlgorithm.h"
@@ -132,4 +132,4 @@ protected:
   vtkCollapseVerticesByArrayInternal* Internal;
 };
 
-#endif // __vtkCollapseVerticesByArray_h__
+#endif // vtkCollapseVerticesByArray_h__
diff --git a/Infovis/Core/vtkDataObjectToTable.h b/Infovis/Core/vtkDataObjectToTable.h
index 711bfb4e685e94a5ec822627f1e5030497f28347..66c1841be53f14f7c9b5dd3e527c6c6b7a5231c0 100644
--- a/Infovis/Core/vtkDataObjectToTable.h
+++ b/Infovis/Core/vtkDataObjectToTable.h
@@ -23,8 +23,8 @@
 // This filter is used to extract either the field, cell or point data of
 // any data object as a table.
 
-#ifndef __vtkDataObjectToTable_h
-#define __vtkDataObjectToTable_h
+#ifndef vtkDataObjectToTable_h
+#define vtkDataObjectToTable_h
 
 #include "vtkInfovisCoreModule.h" // For export macro
 #include "vtkTableAlgorithm.h"
diff --git a/Infovis/Core/vtkDotProductSimilarity.h b/Infovis/Core/vtkDotProductSimilarity.h
index aee3975dc376b9f2f57183b023ee46e0c9fa2042..0365eb33ddfbaa7ecc1be6a10f31b70e77f9ce87 100644
--- a/Infovis/Core/vtkDotProductSimilarity.h
+++ b/Infovis/Core/vtkDotProductSimilarity.h
@@ -52,8 +52,8 @@
 // .SECTION Thanks
 // Developed by Timothy M. Shead (tshead@sandia.gov) at Sandia National Laboratories.
 
-#ifndef __vtkDotProductSimilarity_h
-#define __vtkDotProductSimilarity_h
+#ifndef vtkDotProductSimilarity_h
+#define vtkDotProductSimilarity_h
 
 #include "vtkInfovisCoreModule.h" // For export macro
 #include "vtkTableAlgorithm.h"
diff --git a/Infovis/Core/vtkEdgeCenters.h b/Infovis/Core/vtkEdgeCenters.h
index 43abd737be3168368e2fbf075b6746ba62e3877a..99fbb338b74079afdf8fd607ec4aeec4ab3e72a7 100644
--- a/Infovis/Core/vtkEdgeCenters.h
+++ b/Infovis/Core/vtkEdgeCenters.h
@@ -29,8 +29,8 @@
 // .SECTION See Also
 // vtkGlyph3D vtkLabeledDataMapper
 
-#ifndef __vtkEdgeCenters_h
-#define __vtkEdgeCenters_h
+#ifndef vtkEdgeCenters_h
+#define vtkEdgeCenters_h
 
 #include "vtkInfovisCoreModule.h" // For export macro
 #include "vtkPolyDataAlgorithm.h"
diff --git a/Infovis/Core/vtkExpandSelectedGraph.h b/Infovis/Core/vtkExpandSelectedGraph.h
index f278d130fff57bd9cce25ba908fe1682e380efb9..a0fa11b432856188de00ade4ad5dadee682e6b46 100644
--- a/Infovis/Core/vtkExpandSelectedGraph.h
+++ b/Infovis/Core/vtkExpandSelectedGraph.h
@@ -32,8 +32,8 @@
 // Note: IncludeShortestPaths is currently non-functional
 
 
-#ifndef __vtkExpandSelectedGraph_h
-#define __vtkExpandSelectedGraph_h
+#ifndef vtkExpandSelectedGraph_h
+#define vtkExpandSelectedGraph_h
 
 #include "vtkInfovisCoreModule.h" // For export macro
 #include "vtkSelectionAlgorithm.h"
diff --git a/Infovis/Core/vtkExtractSelectedGraph.h b/Infovis/Core/vtkExtractSelectedGraph.h
index ce1ea9ebfb2e352602bc71456376d93d2350f1a0..1088b2baa2fd62fc61ab57bd191d82e9f25873ce 100644
--- a/Infovis/Core/vtkExtractSelectedGraph.h
+++ b/Infovis/Core/vtkExtractSelectedGraph.h
@@ -31,8 +31,8 @@
 // indicate that an edge selection should maintain the full set of vertices,
 // by turning RemoveIsolatedVertices off.
 
-#ifndef __vtkExtractSelectedGraph_h
-#define __vtkExtractSelectedGraph_h
+#ifndef vtkExtractSelectedGraph_h
+#define vtkExtractSelectedGraph_h
 
 #include "vtkInfovisCoreModule.h" // For export macro
 #include "vtkGraphAlgorithm.h"
diff --git a/Infovis/Core/vtkExtractSelectedTree.h b/Infovis/Core/vtkExtractSelectedTree.h
index 22600b764b53e8ab39dcbc0ca96524919d578b21..94c3ed8898a6ea724a7efc7991546675c9017634 100644
--- a/Infovis/Core/vtkExtractSelectedTree.h
+++ b/Infovis/Core/vtkExtractSelectedTree.h
@@ -22,8 +22,8 @@
 // An edge selection perserves the vertices that are adjacent to at least one
 // selected edges.
 
-#ifndef __vtkExtractSelectedTree_h
-#define __vtkExtractSelectedTree_h
+#ifndef vtkExtractSelectedTree_h
+#define vtkExtractSelectedTree_h
 
 #include "vtkInfovisCoreModule.h" // For export macro
 #include "vtkTreeAlgorithm.h"
diff --git a/Infovis/Core/vtkGenerateIndexArray.h b/Infovis/Core/vtkGenerateIndexArray.h
index 1444e1393e472008bc4333de4d418cb12f57668a..0697f42612ba4144be2d04bd8a846f9c46d127bb 100644
--- a/Infovis/Core/vtkGenerateIndexArray.h
+++ b/Infovis/Core/vtkGenerateIndexArray.h
@@ -40,8 +40,8 @@
 // from an array with arbitrary contents to an index that can
 // be used as tensor coordinates.
 
-#ifndef __vtkGenerateIndexArray_h
-#define __vtkGenerateIndexArray_h
+#ifndef vtkGenerateIndexArray_h
+#define vtkGenerateIndexArray_h
 
 #include "vtkInfovisCoreModule.h" // For export macro
 #include "vtkDataObjectAlgorithm.h"
diff --git a/Infovis/Core/vtkGraphHierarchicalBundleEdges.h b/Infovis/Core/vtkGraphHierarchicalBundleEdges.h
index a5686d5d1a04556539912d5b7255c5c5cf3214c6..80e9d895f288b9d85420535135ab508ebc6d686d 100644
--- a/Infovis/Core/vtkGraphHierarchicalBundleEdges.h
+++ b/Infovis/Core/vtkGraphHierarchicalBundleEdges.h
@@ -49,8 +49,8 @@
 // Relations in Hierarchical Data. IEEE Transactions on Visualization and
 // Computer Graphics, Vol. 12, No. 5, 2006. pp. 741-748.
 
-#ifndef __vtkGraphHierarchicalBundleEdges_h
-#define __vtkGraphHierarchicalBundleEdges_h
+#ifndef vtkGraphHierarchicalBundleEdges_h
+#define vtkGraphHierarchicalBundleEdges_h
 
 #include "vtkInfovisCoreModule.h" // For export macro
 #include "vtkGraphAlgorithm.h"
diff --git a/Infovis/Core/vtkGroupLeafVertices.h b/Infovis/Core/vtkGroupLeafVertices.h
index adbc7e4057cc0fc37c2c8a76f4e1f3b38b1a2942..ddf97dcba979920c1a4bf1c15df04cca8752ae69 100644
--- a/Infovis/Core/vtkGroupLeafVertices.h
+++ b/Infovis/Core/vtkGroupLeafVertices.h
@@ -23,8 +23,8 @@
 // Use SetInputArrayToProcess(0, ...) to set the array to group on.
 // Currently this array must be a vtkStringArray.
 
-#ifndef __vtkGroupLeafVertices_h
-#define __vtkGroupLeafVertices_h
+#ifndef vtkGroupLeafVertices_h
+#define vtkGroupLeafVertices_h
 
 #include "vtkInfovisCoreModule.h" // For export macro
 #include "vtkTreeAlgorithm.h"
diff --git a/Infovis/Core/vtkKCoreDecomposition.h b/Infovis/Core/vtkKCoreDecomposition.h
index 75f0f9a19af59849bd25449bfc8c205351ee0f78..339bbb662bbac6d34dc890e3b59db04cba07f5a8 100644
--- a/Infovis/Core/vtkKCoreDecomposition.h
+++ b/Infovis/Core/vtkKCoreDecomposition.h
@@ -35,8 +35,8 @@
 // Thanks to Thomas Otahal from Sandia National Laboratories for providing this
 // implementation.
 
-#ifndef __vtkKCoreDecomposition_h
-#define __vtkKCoreDecomposition_h
+#ifndef vtkKCoreDecomposition_h
+#define vtkKCoreDecomposition_h
 
 #include "vtkInfovisCoreModule.h" // For export macro
 #include "vtkGraphAlgorithm.h"
diff --git a/Infovis/Core/vtkMergeColumns.h b/Infovis/Core/vtkMergeColumns.h
index e86276ee3c15cac10b6849677139f02d4a8bb5fc..a88862cec8541077f29a3b908cb76a7367e72f99 100644
--- a/Infovis/Core/vtkMergeColumns.h
+++ b/Infovis/Core/vtkMergeColumns.h
@@ -36,8 +36,8 @@
 // If the arrays are strings, the values are concatenated.  The strings are
 // separated by a space if they are both nonempty.
 
-#ifndef __vtkMergeColumns_h
-#define __vtkMergeColumns_h
+#ifndef vtkMergeColumns_h
+#define vtkMergeColumns_h
 
 #include "vtkInfovisCoreModule.h" // For export macro
 #include "vtkTableAlgorithm.h"
diff --git a/Infovis/Core/vtkMergeGraphs.h b/Infovis/Core/vtkMergeGraphs.h
index 678ef97ed9e1ada8def4ed4f405fc10ca8e947d3..d1483aeee51de2ca9bda6a7489bbc1ba682308b6 100644
--- a/Infovis/Core/vtkMergeGraphs.h
+++ b/Infovis/Core/vtkMergeGraphs.h
@@ -41,8 +41,8 @@
 // This filter is not "domain-aware". Pedigree ids are assumed to be globally
 // unique, regardless of their domain.
 
-#ifndef __vtkMergeGraphs_h
-#define __vtkMergeGraphs_h
+#ifndef vtkMergeGraphs_h
+#define vtkMergeGraphs_h
 
 #include "vtkInfovisCoreModule.h" // For export macro
 #include "vtkGraphAlgorithm.h"
diff --git a/Infovis/Core/vtkMergeTables.h b/Infovis/Core/vtkMergeTables.h
index 939f8f9c701d81a468f8ffc823098e9deb634249..fecb5630598cb6b5476cf3a5a4131b38624272b7 100644
--- a/Infovis/Core/vtkMergeTables.h
+++ b/Infovis/Core/vtkMergeTables.h
@@ -33,8 +33,8 @@
 // the columns named are modified.  One of these prefixes may be the empty
 // string, but they must be different.
 
-#ifndef __vtkMergeTables_h
-#define __vtkMergeTables_h
+#ifndef vtkMergeTables_h
+#define vtkMergeTables_h
 
 #include "vtkInfovisCoreModule.h" // For export macro
 #include "vtkTableAlgorithm.h"
diff --git a/Infovis/Core/vtkMutableGraphHelper.h b/Infovis/Core/vtkMutableGraphHelper.h
index 418890d1abf37568f85431b565e27727aedf0ac7..7aa71b906df0a043f110917659d6e8ede37b604a 100644
--- a/Infovis/Core/vtkMutableGraphHelper.h
+++ b/Infovis/Core/vtkMutableGraphHelper.h
@@ -28,8 +28,8 @@
 // .SECTION See Also
 // vtkGraph vtkMutableDirectedGraph vtkMutableUndirectedGraph
 
-#ifndef __vtkMutableGraphHelper_h
-#define __vtkMutableGraphHelper_h
+#ifndef vtkMutableGraphHelper_h
+#define vtkMutableGraphHelper_h
 
 #include "vtkInfovisCoreModule.h" // For export macro
 #include "vtkObject.h"
diff --git a/Infovis/Core/vtkNetworkHierarchy.h b/Infovis/Core/vtkNetworkHierarchy.h
index de2a2c54a22737722d9bd3d10a286a5ebee1de87..8781db1e75b745ff867855d4ab3f5fccb81e56e7 100644
--- a/Infovis/Core/vtkNetworkHierarchy.h
+++ b/Infovis/Core/vtkNetworkHierarchy.h
@@ -25,8 +25,8 @@
 // the network ip addresses.
 // Currently this array must be a vtkStringArray.
 
-#ifndef __vtkNetworkHierarchy_h
-#define __vtkNetworkHierarchy_h
+#ifndef vtkNetworkHierarchy_h
+#define vtkNetworkHierarchy_h
 
 #include "vtkInfovisCoreModule.h" // For export macro
 #include "vtkTreeAlgorithm.h"
diff --git a/Infovis/Core/vtkPipelineGraphSource.h b/Infovis/Core/vtkPipelineGraphSource.h
index df575432f6ba1447644200fba91c582806742eca..ae67fa33cfa04ca687e42f38d9b07a1e74b7775f 100644
--- a/Infovis/Core/vtkPipelineGraphSource.h
+++ b/Infovis/Core/vtkPipelineGraphSource.h
@@ -16,8 +16,8 @@
 //
 // .SECTION Description
 
-#ifndef __vtkPipelineGraphSource_h
-#define __vtkPipelineGraphSource_h
+#ifndef vtkPipelineGraphSource_h
+#define vtkPipelineGraphSource_h
 
 #include "vtkInfovisCoreModule.h" // For export macro
 #include "vtkDirectedGraphAlgorithm.h"
diff --git a/Infovis/Core/vtkPruneTreeFilter.h b/Infovis/Core/vtkPruneTreeFilter.h
index 387e6f5b151bd830a97fbe35879e8c8ee83433b5..1cac99f489d9dacfb84e7ed65f8189d9cc10c128 100644
--- a/Infovis/Core/vtkPruneTreeFilter.h
+++ b/Infovis/Core/vtkPruneTreeFilter.h
@@ -23,8 +23,8 @@
 // Removes a subtree rooted at a particular vertex in a vtkTree.
 //
 
-#ifndef __vtkPruneTreeFilter_h
-#define __vtkPruneTreeFilter_h
+#ifndef vtkPruneTreeFilter_h
+#define vtkPruneTreeFilter_h
 
 #include "vtkInfovisCoreModule.h" // For export macro
 #include "vtkTreeAlgorithm.h"
diff --git a/Infovis/Core/vtkRandomGraphSource.h b/Infovis/Core/vtkRandomGraphSource.h
index d75859a415825b6320f4641f09aa9b3bdabed200..ba7f3d689a423eaabb33ceea52d55ea1ed8032a4 100644
--- a/Infovis/Core/vtkRandomGraphSource.h
+++ b/Infovis/Core/vtkRandomGraphSource.h
@@ -26,8 +26,8 @@
 // tree (which enforces graph connectivity).
 //
 
-#ifndef __vtkRandomGraphSource_h
-#define __vtkRandomGraphSource_h
+#ifndef vtkRandomGraphSource_h
+#define vtkRandomGraphSource_h
 
 #include "vtkInfovisCoreModule.h" // For export macro
 #include "vtkGraphAlgorithm.h"
diff --git a/Infovis/Core/vtkReduceTable.h b/Infovis/Core/vtkReduceTable.h
index 5a77fa8d66fea9182986228092ce570fb2d216ed..f1156cee61f844925d4b76a4f1820de803de69e4 100644
--- a/Infovis/Core/vtkReduceTable.h
+++ b/Infovis/Core/vtkReduceTable.h
@@ -30,8 +30,8 @@
 // You can also specify the reduction method to use for a particular
 // column by calling SetReductionMethodForColumn().
 
-#ifndef __vtkReduceTable_h
-#define __vtkReduceTable_h
+#ifndef vtkReduceTable_h
+#define vtkReduceTable_h
 
 #include "vtkInfovisCoreModule.h" // For export macro
 #include "vtkTableAlgorithm.h"
diff --git a/Infovis/Core/vtkRemoveHiddenData.h b/Infovis/Core/vtkRemoveHiddenData.h
index 99cbc14abe1872d13f5bf48823559a2c8b0d63e0..1d3f73054f1593d50b4165d11d0e3d73ff753372 100644
--- a/Infovis/Core/vtkRemoveHiddenData.h
+++ b/Infovis/Core/vtkRemoveHiddenData.h
@@ -29,8 +29,8 @@
 //    Port 1 - vtkAnnotationLayers (optional)
 //
 
-#ifndef __vtkRemoveHiddenData_h
-#define __vtkRemoveHiddenData_h
+#ifndef vtkRemoveHiddenData_h
+#define vtkRemoveHiddenData_h
 
 #include "vtkInfovisCoreModule.h" // For export macro
 #include "vtkPassInputTypeAlgorithm.h"
diff --git a/Infovis/Core/vtkRemoveIsolatedVertices.h b/Infovis/Core/vtkRemoveIsolatedVertices.h
index 8f5a823392845696b0f3e5848824ac715b1e599d..998dd171b64de8a52a914298a64576961502f2ee 100644
--- a/Infovis/Core/vtkRemoveIsolatedVertices.h
+++ b/Infovis/Core/vtkRemoveIsolatedVertices.h
@@ -22,8 +22,8 @@
 //
 // .SECTION Description
 
-#ifndef __vtkRemoveIsolatedVertices_h
-#define __vtkRemoveIsolatedVertices_h
+#ifndef vtkRemoveIsolatedVertices_h
+#define vtkRemoveIsolatedVertices_h
 
 #include "vtkInfovisCoreModule.h" // For export macro
 #include "vtkGraphAlgorithm.h"
diff --git a/Infovis/Core/vtkSparseArrayToTable.h b/Infovis/Core/vtkSparseArrayToTable.h
index 35a79cd6a7ebbef66d6b4e490c84f992b25da782..89e3d27478ebe80c98720deac71f8805b1250fab 100644
--- a/Infovis/Core/vtkSparseArrayToTable.h
+++ b/Infovis/Core/vtkSparseArrayToTable.h
@@ -35,8 +35,8 @@
 // .SECTION Thanks
 // Developed by Timothy M. Shead (tshead@sandia.gov) at Sandia National Laboratories.
 
-#ifndef __vtkSparseArrayToTable_h
-#define __vtkSparseArrayToTable_h
+#ifndef vtkSparseArrayToTable_h
+#define vtkSparseArrayToTable_h
 
 #include "vtkInfovisCoreModule.h" // For export macro
 #include "vtkTableAlgorithm.h"
diff --git a/Infovis/Core/vtkStreamGraph.h b/Infovis/Core/vtkStreamGraph.h
index 09016f6faf2e57e052d4ee9d58b73facab7e610e..845b93ad302ca1b8f3663c2a307c7f69d46efa16 100644
--- a/Infovis/Core/vtkStreamGraph.h
+++ b/Infovis/Core/vtkStreamGraph.h
@@ -30,8 +30,8 @@
 // If you can use an edge window array to filter out old edges based on a
 // moving threshold.
 
-#ifndef __vtkStreamGraph_h
-#define __vtkStreamGraph_h
+#ifndef vtkStreamGraph_h
+#define vtkStreamGraph_h
 
 #include "vtkInfovisCoreModule.h" // For export macro
 #include "vtkGraphAlgorithm.h"
diff --git a/Infovis/Core/vtkStringToCategory.h b/Infovis/Core/vtkStringToCategory.h
index e479daf4b8c536c828a0787e4152f2192e0c41a9..58f9c70aa4c6a0a2ad7c9fd07144ab31d48ba3f2 100644
--- a/Infovis/Core/vtkStringToCategory.h
+++ b/Infovis/Core/vtkStringToCategory.h
@@ -33,8 +33,8 @@
 // retrieved from output port 1. They are in a vtkTable, stored in the "Strings"
 // column as a vtkStringArray.
 
-#ifndef __vtkStringToCategory_h
-#define __vtkStringToCategory_h
+#ifndef vtkStringToCategory_h
+#define vtkStringToCategory_h
 
 #include "vtkInfovisCoreModule.h" // For export macro
 #include "vtkDataObjectAlgorithm.h"
diff --git a/Infovis/Core/vtkStringToNumeric.h b/Infovis/Core/vtkStringToNumeric.h
index 1c8fa89045d23bda1e88f3e6606c22082bc2758d..ea1a028486ec4be5a017cafdd0c6b340a53ff788 100644
--- a/Infovis/Core/vtkStringToNumeric.h
+++ b/Infovis/Core/vtkStringToNumeric.h
@@ -23,8 +23,8 @@
 // vtkStringToNumeric is a filter for converting a string array
 // into a numeric arrays.
 
-#ifndef __vtkStringToNumeric_h
-#define __vtkStringToNumeric_h
+#ifndef vtkStringToNumeric_h
+#define vtkStringToNumeric_h
 
 #include "vtkInfovisCoreModule.h" // For export macro
 #include "vtkDataObjectAlgorithm.h"
diff --git a/Infovis/Core/vtkTableToArray.h b/Infovis/Core/vtkTableToArray.h
index e5b43a99572aa3204fd93cb70eaf4455d48508ff..fa52b2ed625eead86070249566fd020e419af615 100644
--- a/Infovis/Core/vtkTableToArray.h
+++ b/Infovis/Core/vtkTableToArray.h
@@ -35,8 +35,8 @@
 // .SECTION Thanks
 // Developed by Timothy M. Shead (tshead@sandia.gov) at Sandia National Laboratories.
 
-#ifndef __vtkTableToArray_h
-#define __vtkTableToArray_h
+#ifndef vtkTableToArray_h
+#define vtkTableToArray_h
 
 #include "vtkInfovisCoreModule.h" // For export macro
 #include "vtkArrayDataAlgorithm.h"
diff --git a/Infovis/Core/vtkTableToGraph.h b/Infovis/Core/vtkTableToGraph.h
index 276d854b99e15546f45cc0c8f5e48442804929b7..e86bb54374d9de8a2401b2c8b02a28c2293deebb 100644
--- a/Infovis/Core/vtkTableToGraph.h
+++ b/Infovis/Core/vtkTableToGraph.h
@@ -60,8 +60,8 @@
 // of being converted to a string. The "ids" column is set as the vertex pedigree
 // ID attribute.
 
-#ifndef __vtkTableToGraph_h
-#define __vtkTableToGraph_h
+#ifndef vtkTableToGraph_h
+#define vtkTableToGraph_h
 
 #include "vtkInfovisCoreModule.h" // For export macro
 #include "vtkGraphAlgorithm.h"
diff --git a/Infovis/Core/vtkTableToSparseArray.h b/Infovis/Core/vtkTableToSparseArray.h
index 8b4ac05a03d9708e5ae84e6dd48d4973923ef66d..dff0040b71f5c4144ff71d193dd1dcfeedb0221b 100644
--- a/Infovis/Core/vtkTableToSparseArray.h
+++ b/Infovis/Core/vtkTableToSparseArray.h
@@ -43,8 +43,8 @@
 // .SECTION Thanks
 // Developed by Timothy M. Shead (tshead@sandia.gov) at Sandia National Laboratories.
 
-#ifndef __vtkTableToSparseArray_h
-#define __vtkTableToSparseArray_h
+#ifndef vtkTableToSparseArray_h
+#define vtkTableToSparseArray_h
 
 #include "vtkInfovisCoreModule.h" // For export macro
 #include "vtkArrayDataAlgorithm.h"
diff --git a/Infovis/Core/vtkTableToTreeFilter.h b/Infovis/Core/vtkTableToTreeFilter.h
index 8b232ee5f768c6903bf24bdcd3b788ab22449a5a..03ac959d11319ba79638916e68ffe16e026a6a4b 100644
--- a/Infovis/Core/vtkTableToTreeFilter.h
+++ b/Infovis/Core/vtkTableToTreeFilter.h
@@ -26,8 +26,8 @@
 // a star, with each row of the table as a child of a new root node.
 // The columns of the table are passed as node fields of the tree.
 
-#ifndef __vtkTableToTreeFilter_h
-#define __vtkTableToTreeFilter_h
+#ifndef vtkTableToTreeFilter_h
+#define vtkTableToTreeFilter_h
 
 #include "vtkInfovisCoreModule.h" // For export macro
 #include "vtkTreeAlgorithm.h"
diff --git a/Infovis/Core/vtkThresholdGraph.h b/Infovis/Core/vtkThresholdGraph.h
index 96d5c31ec7b760357428643a32639c5e661eeb8f..63bb2f99c6bfe0dbeaf1ed846b6b8a9dea853bb9 100644
--- a/Infovis/Core/vtkThresholdGraph.h
+++ b/Infovis/Core/vtkThresholdGraph.h
@@ -18,8 +18,8 @@
 // Requires input array, lower and upper threshold. This filter than
 // extracts the subgraph based on these three parameters.
 
-#ifndef __vtkThresholdGraph_h
-#define __vtkThresholdGraph_h
+#ifndef vtkThresholdGraph_h
+#define vtkThresholdGraph_h
 
 #include "vtkInfovisCoreModule.h" // For export macro
 #include "vtkGraphAlgorithm.h"
@@ -67,4 +67,4 @@ private:
 //ETX
 };
 
-#endif // __vtkThresholdGraph_h
+#endif // vtkThresholdGraph_h
diff --git a/Infovis/Core/vtkThresholdTable.h b/Infovis/Core/vtkThresholdTable.h
index 81cea842f8c4babeae45a6dceb6f37143c534115..215f73611c2856a81345d65f06b0cd93194d1b4a 100644
--- a/Infovis/Core/vtkThresholdTable.h
+++ b/Infovis/Core/vtkThresholdTable.h
@@ -24,8 +24,8 @@
 // table rows based on the values in a particular column.
 // The column to threshold is specified using SetInputArrayToProcess(0, ...).
 
-#ifndef __vtkThresholdTable_h
-#define __vtkThresholdTable_h
+#ifndef vtkThresholdTable_h
+#define vtkThresholdTable_h
 
 #include "vtkInfovisCoreModule.h" // For export macro
 #include "vtkTableAlgorithm.h"
diff --git a/Infovis/Core/vtkTransferAttributes.h b/Infovis/Core/vtkTransferAttributes.h
index 5e9a2622469b1fddd7b9e29c15ee1e614abf50de..cbd928861bdb6bb246f77d7796d14a9ffd3c22ae 100644
--- a/Infovis/Core/vtkTransferAttributes.h
+++ b/Infovis/Core/vtkTransferAttributes.h
@@ -33,8 +33,8 @@ PURPOSE.  See the above copyright notice for more information.
 //
 // .SECTION Thanks
 
-#ifndef __vtkTransferAttributes_h
-#define __vtkTransferAttributes_h
+#ifndef vtkTransferAttributes_h
+#define vtkTransferAttributes_h
 
 #include "vtkInfovisCoreModule.h" // For export macro
 #include "vtkPassInputTypeAlgorithm.h"
diff --git a/Infovis/Core/vtkTransposeMatrix.h b/Infovis/Core/vtkTransposeMatrix.h
index 37f138d2e96699fd5dbd9cc426e003e6cd6c72aa..78aaa6f8cef653cf1d5a813c26db4201690f8e65 100644
--- a/Infovis/Core/vtkTransposeMatrix.h
+++ b/Infovis/Core/vtkTransposeMatrix.h
@@ -24,8 +24,8 @@
 // .SECTION Thanks
 // Developed by Timothy M. Shead (tshead@sandia.gov) at Sandia National Laboratories.
 
-#ifndef __vtkTransposeMatrix_h
-#define __vtkTransposeMatrix_h
+#ifndef vtkTransposeMatrix_h
+#define vtkTransposeMatrix_h
 
 #include "vtkInfovisCoreModule.h" // For export macro
 #include "vtkArrayDataAlgorithm.h"
diff --git a/Infovis/Core/vtkTreeDifferenceFilter.h b/Infovis/Core/vtkTreeDifferenceFilter.h
index c52f21a246f83fa181790b2721b33959f018ccb7..b7966763ec448933fca5e14d764f61a576173704 100644
--- a/Infovis/Core/vtkTreeDifferenceFilter.h
+++ b/Infovis/Core/vtkTreeDifferenceFilter.h
@@ -23,8 +23,8 @@
 // EdgeData or VertexData.
 //
 
-#ifndef __vtkTreeDifferenceFilter_h
-#define __vtkTreeDifferenceFilter_h
+#ifndef vtkTreeDifferenceFilter_h
+#define vtkTreeDifferenceFilter_h
 
 #include "vtkInfovisCoreModule.h" // For export macro
 #include "vtkGraphAlgorithm.h"
diff --git a/Infovis/Core/vtkTreeFieldAggregator.h b/Infovis/Core/vtkTreeFieldAggregator.h
index dcddc9e17a418c29fd3bdd22c3e5a98262df4cfa..a1a08250ae51a36051bb5c06ec4291860ea233cf 100644
--- a/Infovis/Core/vtkTreeFieldAggregator.h
+++ b/Infovis/Core/vtkTreeFieldAggregator.h
@@ -29,8 +29,8 @@
 // of each leaf vertex is 1.  You may optionally set a flag to first take the
 // log of all leaf values before aggregating.
 
-#ifndef __vtkTreeFieldAggregator_h
-#define __vtkTreeFieldAggregator_h
+#ifndef vtkTreeFieldAggregator_h
+#define vtkTreeFieldAggregator_h
 
 class vtkPoints;
 class vtkTree;
diff --git a/Infovis/Core/vtkTreeLevelsFilter.h b/Infovis/Core/vtkTreeLevelsFilter.h
index efa26f8e66c4f4446b83effc0a4b2c7259e7a1cd..b0eb16e343c2d8223abd4fd64a3b71204f024842 100644
--- a/Infovis/Core/vtkTreeLevelsFilter.h
+++ b/Infovis/Core/vtkTreeLevelsFilter.h
@@ -29,8 +29,8 @@
 // Thanks to Brian Wylie from Sandia National Laboratories for creating this
 // class.
 
-#ifndef __vtkTreeLevelsFilter_h
-#define __vtkTreeLevelsFilter_h
+#ifndef vtkTreeLevelsFilter_h
+#define vtkTreeLevelsFilter_h
 
 #include "vtkInfovisCoreModule.h" // For export macro
 #include "vtkTreeAlgorithm.h"
diff --git a/Infovis/Core/vtkVertexDegree.h b/Infovis/Core/vtkVertexDegree.h
index d82a9a39b45c4f3c001050b60910e8a4e528795b..c4ba05b1922dbc40e6677b8b57d1dca0d653cf6c 100644
--- a/Infovis/Core/vtkVertexDegree.h
+++ b/Infovis/Core/vtkVertexDegree.h
@@ -24,8 +24,8 @@
 // of the array will be "VertexDegree", but that can be changed by calling
 // SetOutputArrayName("foo");
 
-#ifndef __vtkVertexDegree_h
-#define __vtkVertexDegree_h
+#ifndef vtkVertexDegree_h
+#define vtkVertexDegree_h
 
 #include "vtkInfovisCoreModule.h" // For export macro
 #include "vtkGraphAlgorithm.h"
diff --git a/Infovis/Layout/vtkArcParallelEdgeStrategy.h b/Infovis/Layout/vtkArcParallelEdgeStrategy.h
index e671eb9cc6a9252a6a383a6c0009ee4fe2e69826..93351fd1499ae6ad75e72e9c2bd04ac974d89f81 100644
--- a/Infovis/Layout/vtkArcParallelEdgeStrategy.h
+++ b/Infovis/Layout/vtkArcParallelEdgeStrategy.h
@@ -22,8 +22,8 @@
 // Parallel edges are drawn as arcs, and self-loops are drawn as ovals.
 // When only one edge connects two vertices it is drawn as a straight line.
 
-#ifndef __vtkArcParallelEdgeStrategy_h
-#define __vtkArcParallelEdgeStrategy_h
+#ifndef vtkArcParallelEdgeStrategy_h
+#define vtkArcParallelEdgeStrategy_h
 
 #include "vtkInfovisLayoutModule.h" // For export macro
 #include "vtkEdgeLayoutStrategy.h"
diff --git a/Infovis/Layout/vtkAreaLayout.h b/Infovis/Layout/vtkAreaLayout.h
index 5e4a922f023131f90f25c94bc405c0a70f6693a7..b529ae989533bc37d942a2d613be93a07da25ffd 100644
--- a/Infovis/Layout/vtkAreaLayout.h
+++ b/Infovis/Layout/vtkAreaLayout.h
@@ -32,8 +32,8 @@
 // Thanks to Jason Shepherd from Sandia National Laboratories
 // for help developing this class.
 
-#ifndef __vtkAreaLayout_h
-#define __vtkAreaLayout_h
+#ifndef vtkAreaLayout_h
+#define vtkAreaLayout_h
 
 #include "vtkInfovisLayoutModule.h" // For export macro
 #include "vtkTreeAlgorithm.h"
diff --git a/Infovis/Layout/vtkAreaLayoutStrategy.h b/Infovis/Layout/vtkAreaLayoutStrategy.h
index f9e286976a7c3ffbf4d685db416cf375f52b8e54..4c42ad3f04a713b0a0559ed01155e5292296ec10 100644
--- a/Infovis/Layout/vtkAreaLayoutStrategy.h
+++ b/Infovis/Layout/vtkAreaLayoutStrategy.h
@@ -32,8 +32,8 @@
 // Thanks to Jason Shepherd from Sandia National Laboratories
 // for help developing this class.
 
-#ifndef __vtkAreaLayoutStrategy_h
-#define __vtkAreaLayoutStrategy_h
+#ifndef vtkAreaLayoutStrategy_h
+#define vtkAreaLayoutStrategy_h
 
 
 #include "vtkInfovisLayoutModule.h" // For export macro
diff --git a/Infovis/Layout/vtkAssignCoordinates.h b/Infovis/Layout/vtkAssignCoordinates.h
index 20e63d3283d7f4a6646963b505de8a4abfb51b54..19d919be24d59413b499afba842230074fc6c64c 100644
--- a/Infovis/Layout/vtkAssignCoordinates.h
+++ b/Infovis/Layout/vtkAssignCoordinates.h
@@ -25,8 +25,8 @@
 // them to the coordinates of the vertices. Yes you could do this with the array
 // calculator, but your mom wears army boots so we're not going to.
 
-#ifndef __vtkAssignCoordinates_h
-#define __vtkAssignCoordinates_h
+#ifndef vtkAssignCoordinates_h
+#define vtkAssignCoordinates_h
 
 #include "vtkInfovisLayoutModule.h" // For export macro
 #include "vtkPassInputTypeAlgorithm.h"
diff --git a/Infovis/Layout/vtkAssignCoordinatesLayoutStrategy.h b/Infovis/Layout/vtkAssignCoordinatesLayoutStrategy.h
index 4d94a9d958b9a1c954a4f64d46c8474eca358530..6c0d5f2a566c6677ce49afaddfec9d80366f5456 100644
--- a/Infovis/Layout/vtkAssignCoordinatesLayoutStrategy.h
+++ b/Infovis/Layout/vtkAssignCoordinatesLayoutStrategy.h
@@ -22,8 +22,8 @@
 // .SECTION Description
 // Uses vtkAssignCoordinates to use values from arrays as the x, y, and z coordinates.
 
-#ifndef __vtkAssignCoordinatesLayoutStrategy_h
-#define __vtkAssignCoordinatesLayoutStrategy_h
+#ifndef vtkAssignCoordinatesLayoutStrategy_h
+#define vtkAssignCoordinatesLayoutStrategy_h
 
 #include "vtkInfovisLayoutModule.h" // For export macro
 #include "vtkGraphLayoutStrategy.h"
diff --git a/Infovis/Layout/vtkAttributeClustering2DLayoutStrategy.h b/Infovis/Layout/vtkAttributeClustering2DLayoutStrategy.h
index a0a515ff6ffd3865cd3065727476a4d35595546f..b60554ddb464c39ee355d40011ccbad8bafca74c 100644
--- a/Infovis/Layout/vtkAttributeClustering2DLayoutStrategy.h
+++ b/Infovis/Layout/vtkAttributeClustering2DLayoutStrategy.h
@@ -27,8 +27,8 @@
 // Thanks to Godzilla for not eating my computer so that this class
 // could be written.
 
-#ifndef __vtkAttributeClustering2DLayoutStrategy_h
-#define __vtkAttributeClustering2DLayoutStrategy_h
+#ifndef vtkAttributeClustering2DLayoutStrategy_h
+#define vtkAttributeClustering2DLayoutStrategy_h
 
 #include "vtkInfovisLayoutModule.h" // For export macro
 #include "vtkGraphLayoutStrategy.h"
diff --git a/Infovis/Layout/vtkBoxLayoutStrategy.h b/Infovis/Layout/vtkBoxLayoutStrategy.h
index 3efb014f4b523f05c1cf87678e52df9033259971..93773f55bf4b8138621f0fda81cd851adafb6cf8 100644
--- a/Infovis/Layout/vtkBoxLayoutStrategy.h
+++ b/Infovis/Layout/vtkBoxLayoutStrategy.h
@@ -26,8 +26,8 @@
 // .SECTION Thanks
 // Thanks to Brian Wylie from Sandia National Laboratories for creating this class.
 
-#ifndef __vtkBoxLayoutStrategy_h
-#define __vtkBoxLayoutStrategy_h
+#ifndef vtkBoxLayoutStrategy_h
+#define vtkBoxLayoutStrategy_h
 
 #include "vtkInfovisLayoutModule.h" // For export macro
 #include "vtkTreeMapLayoutStrategy.h"
diff --git a/Infovis/Layout/vtkCirclePackFrontChainLayoutStrategy.h b/Infovis/Layout/vtkCirclePackFrontChainLayoutStrategy.h
index f51ce5b27efff8bdaf4f7a6ba06d32dc5ead01b6..a3247d06f8b235a4e1a90dd546d065e1e47b4600 100644
--- a/Infovis/Layout/vtkCirclePackFrontChainLayoutStrategy.h
+++ b/Infovis/Layout/vtkCirclePackFrontChainLayoutStrategy.h
@@ -39,8 +39,8 @@
 // Year: 2006
 //
 
-#ifndef __vtkCirclePackFrontChainLayoutStrategy_h
-#define __vtkCirclePackFrontChainLayoutStrategy_h
+#ifndef vtkCirclePackFrontChainLayoutStrategy_h
+#define vtkCirclePackFrontChainLayoutStrategy_h
 
 #include "vtkInfovisLayoutModule.h" // For export macro
 #include "vtkCirclePackLayoutStrategy.h"
diff --git a/Infovis/Layout/vtkCirclePackLayout.h b/Infovis/Layout/vtkCirclePackLayout.h
index 5c20c4b47fc5ee2749ee567d9b98dfdf77043f46..b5f72e043406b27d037e4b4ac564fa0522b138ad 100644
--- a/Infovis/Layout/vtkCirclePackLayout.h
+++ b/Infovis/Layout/vtkCirclePackLayout.h
@@ -39,8 +39,8 @@
 // for help developing this class.
 //
 
-#ifndef __vtkCirclePackLayout_h
-#define __vtkCirclePackLayout_h
+#ifndef vtkCirclePackLayout_h
+#define vtkCirclePackLayout_h
 
 #include "vtkInfovisLayoutModule.h" // For export macro
 #include "vtkTreeAlgorithm.h"
diff --git a/Infovis/Layout/vtkCirclePackLayoutStrategy.h b/Infovis/Layout/vtkCirclePackLayoutStrategy.h
index 7cde104548de7db735f3374fdcb26214c096737a..45c677226acdc887f51fe2af00abe3d334e9bde4 100644
--- a/Infovis/Layout/vtkCirclePackLayoutStrategy.h
+++ b/Infovis/Layout/vtkCirclePackLayoutStrategy.h
@@ -33,8 +33,8 @@
 // Thanks to Thomas Otahal from Sandia National Laboratories
 // for help developing this class.
 
-#ifndef __vtkCirclePackLayoutStrategy_h
-#define __vtkCirclePackLayoutStrategy_h
+#ifndef vtkCirclePackLayoutStrategy_h
+#define vtkCirclePackLayoutStrategy_h
 
 
 #include "vtkInfovisLayoutModule.h" // For export macro
diff --git a/Infovis/Layout/vtkCirclePackToPolyData.h b/Infovis/Layout/vtkCirclePackToPolyData.h
index a849b9868735831c6a8e9c025c0569f4e3692971..2bf198c3e20e62995e3b355bcaf2134a2e61a3d9 100644
--- a/Infovis/Layout/vtkCirclePackToPolyData.h
+++ b/Infovis/Layout/vtkCirclePackToPolyData.h
@@ -25,8 +25,8 @@
 // been applied to the data in order to create the triple array
 // (Xcenter, Ycenter, Radius) of circle bounds or each vertex of the tree.
 
-#ifndef __vtkCirclePackToPolyData_h
-#define __vtkCirclePackToPolyData_h
+#ifndef vtkCirclePackToPolyData_h
+#define vtkCirclePackToPolyData_h
 
 #include "vtkInfovisLayoutModule.h" // For export macro
 #include "vtkPolyDataAlgorithm.h"
diff --git a/Infovis/Layout/vtkCircularLayoutStrategy.h b/Infovis/Layout/vtkCircularLayoutStrategy.h
index ebf94c131e705c01386b7aab394d40ca6b6c8b69..c8f08ee2f0dd1aa9fa2a4888c391c6ae18ca6eef 100644
--- a/Infovis/Layout/vtkCircularLayoutStrategy.h
+++ b/Infovis/Layout/vtkCircularLayoutStrategy.h
@@ -22,8 +22,8 @@
 // .SECTION Description
 // Assigns points to the vertices around a circle with unit radius.
 
-#ifndef __vtkCircularLayoutStrategy_h
-#define __vtkCircularLayoutStrategy_h
+#ifndef vtkCircularLayoutStrategy_h
+#define vtkCircularLayoutStrategy_h
 
 #include "vtkInfovisLayoutModule.h" // For export macro
 #include "vtkGraphLayoutStrategy.h"
diff --git a/Infovis/Layout/vtkClustering2DLayoutStrategy.h b/Infovis/Layout/vtkClustering2DLayoutStrategy.h
index 888f8d5959a67e96e88786ba5f7c35ba96fe8c2b..025d5b2bcff6cbe4f7ee34dacaa5a7554f731524 100644
--- a/Infovis/Layout/vtkClustering2DLayoutStrategy.h
+++ b/Infovis/Layout/vtkClustering2DLayoutStrategy.h
@@ -27,8 +27,8 @@
 // Thanks to Godzilla for not eating my computer so that this class
 // could be written.
 
-#ifndef __vtkClustering2DLayoutStrategy_h
-#define __vtkClustering2DLayoutStrategy_h
+#ifndef vtkClustering2DLayoutStrategy_h
+#define vtkClustering2DLayoutStrategy_h
 
 #include "vtkInfovisLayoutModule.h" // For export macro
 #include "vtkGraphLayoutStrategy.h"
diff --git a/Infovis/Layout/vtkCommunity2DLayoutStrategy.h b/Infovis/Layout/vtkCommunity2DLayoutStrategy.h
index 9fcece2f20bf65928adc1a300e039438fc500e9d..243705b745681ccb3622ad427a16d548426aff8d 100644
--- a/Infovis/Layout/vtkCommunity2DLayoutStrategy.h
+++ b/Infovis/Layout/vtkCommunity2DLayoutStrategy.h
@@ -29,8 +29,8 @@
 // Thanks to Godzilla for not eating my computer so that this class
 // could be written.
 
-#ifndef __vtkCommunity2DLayoutStrategy_h
-#define __vtkCommunity2DLayoutStrategy_h
+#ifndef vtkCommunity2DLayoutStrategy_h
+#define vtkCommunity2DLayoutStrategy_h
 
 #include "vtkInfovisLayoutModule.h" // For export macro
 #include "vtkGraphLayoutStrategy.h"
diff --git a/Infovis/Layout/vtkConeLayoutStrategy.h b/Infovis/Layout/vtkConeLayoutStrategy.h
index e522f721fd09453628abb6913f3ed6846bf408bb..2db7a0beb29dedbf5debfeea11b68f4c16a27fcb 100644
--- a/Infovis/Layout/vtkConeLayoutStrategy.h
+++ b/Infovis/Layout/vtkConeLayoutStrategy.h
@@ -41,8 +41,8 @@
 // implementation.
 
 
-#ifndef __vtkConeLayoutStrategy_h
-#define __vtkConeLayoutStrategy_h
+#ifndef vtkConeLayoutStrategy_h
+#define vtkConeLayoutStrategy_h
 
 #include "vtkInfovisLayoutModule.h" // For export macro
 #include "vtkGraphLayoutStrategy.h"
diff --git a/Infovis/Layout/vtkConstrained2DLayoutStrategy.h b/Infovis/Layout/vtkConstrained2DLayoutStrategy.h
index 44f7bdb21dbf861e85c5880338bf0b0da1593bc8..8bf16f9c813386baf719bebbdd985154205de199 100644
--- a/Infovis/Layout/vtkConstrained2DLayoutStrategy.h
+++ b/Infovis/Layout/vtkConstrained2DLayoutStrategy.h
@@ -33,8 +33,8 @@
 // We would like to thank Mothra for distracting Godzilla while we
 // wrote this class.
 
-#ifndef __vtkConstrained2DLayoutStrategy_h
-#define __vtkConstrained2DLayoutStrategy_h
+#ifndef vtkConstrained2DLayoutStrategy_h
+#define vtkConstrained2DLayoutStrategy_h
 
 #include "vtkInfovisLayoutModule.h" // For export macro
 #include "vtkGraphLayoutStrategy.h"
diff --git a/Infovis/Layout/vtkCosmicTreeLayoutStrategy.h b/Infovis/Layout/vtkCosmicTreeLayoutStrategy.h
index 47ff1e59e3d1b87829edde6f747c35df15333364..76ba3e269d48de8ffc8e87379aa2fb731c56eda4 100644
--- a/Infovis/Layout/vtkCosmicTreeLayoutStrategy.h
+++ b/Infovis/Layout/vtkCosmicTreeLayoutStrategy.h
@@ -24,8 +24,8 @@
 // Thanks to the galaxy and David Thompson hierarchically nested inside it
 // for inspiring this layout strategy.
 
-#ifndef __vtkCosmicTreeLayoutStrategy_h
-#define __vtkCosmicTreeLayoutStrategy_h
+#ifndef vtkCosmicTreeLayoutStrategy_h
+#define vtkCosmicTreeLayoutStrategy_h
 
 #include "vtkInfovisLayoutModule.h" // For export macro
 #include "vtkGraphLayoutStrategy.h"
@@ -144,4 +144,4 @@ private:
   void operator = ( const vtkCosmicTreeLayoutStrategy& ); // Not implemented.
 };
 
-#endif // __vtkCosmicTreeLayoutStrategy_h
+#endif // vtkCosmicTreeLayoutStrategy_h
diff --git a/Infovis/Layout/vtkEdgeLayout.h b/Infovis/Layout/vtkEdgeLayout.h
index 87f6f9d4c8590eadf7e744ea8835cccad4450b77..2927b83b57cecc87786bdc609b112e79fb787e9a 100644
--- a/Infovis/Layout/vtkEdgeLayout.h
+++ b/Infovis/Layout/vtkEdgeLayout.h
@@ -23,8 +23,8 @@
 // using the SetLayoutStrategy() function.  The layout strategies do the
 // actual work.
 
-#ifndef __vtkEdgeLayout_h
-#define __vtkEdgeLayout_h
+#ifndef vtkEdgeLayout_h
+#define vtkEdgeLayout_h
 
 #include "vtkInfovisLayoutModule.h" // For export macro
 #include "vtkGraphAlgorithm.h"
diff --git a/Infovis/Layout/vtkEdgeLayoutStrategy.h b/Infovis/Layout/vtkEdgeLayoutStrategy.h
index 50f9537170e2f726c6a64e90a8c9e14467b1101a..35b7c09eaa5a7f8252bacbbe77a2ed14da9bfc2e 100644
--- a/Infovis/Layout/vtkEdgeLayoutStrategy.h
+++ b/Infovis/Layout/vtkEdgeLayoutStrategy.h
@@ -22,8 +22,8 @@
 // All edge layouts should subclass from this class.  vtkEdgeLayoutStrategy
 // works as a plug-in to the vtkEdgeLayout algorithm.
 
-#ifndef __vtkEdgeLayoutStrategy_h
-#define __vtkEdgeLayoutStrategy_h
+#ifndef vtkEdgeLayoutStrategy_h
+#define vtkEdgeLayoutStrategy_h
 
 #include "vtkInfovisLayoutModule.h" // For export macro
 #include "vtkObject.h"
diff --git a/Infovis/Layout/vtkFast2DLayoutStrategy.h b/Infovis/Layout/vtkFast2DLayoutStrategy.h
index 7f7a992ef6d33927818516303ed7a68dc631c82b..26ef5ddec7cc39895292ede68c5f44c9f3145cef 100644
--- a/Infovis/Layout/vtkFast2DLayoutStrategy.h
+++ b/Infovis/Layout/vtkFast2DLayoutStrategy.h
@@ -27,8 +27,8 @@
 // Thanks to Godzilla for not eating my computer so that this class
 // could be written.
 
-#ifndef __vtkFast2DLayoutStrategy_h
-#define __vtkFast2DLayoutStrategy_h
+#ifndef vtkFast2DLayoutStrategy_h
+#define vtkFast2DLayoutStrategy_h
 
 #include "vtkInfovisLayoutModule.h" // For export macro
 #include "vtkGraphLayoutStrategy.h"
diff --git a/Infovis/Layout/vtkForceDirectedLayoutStrategy.h b/Infovis/Layout/vtkForceDirectedLayoutStrategy.h
index b831b6274da0a1faa33048b916c38d652f7eb4a1..ad86f4d4c0df9091478400d47fccd6018286e29a 100644
--- a/Infovis/Layout/vtkForceDirectedLayoutStrategy.h
+++ b/Infovis/Layout/vtkForceDirectedLayoutStrategy.h
@@ -29,8 +29,8 @@
 // to be incremental.
 
 
-#ifndef __vtkForceDirectedLayoutStrategy_h
-#define __vtkForceDirectedLayoutStrategy_h
+#ifndef vtkForceDirectedLayoutStrategy_h
+#define vtkForceDirectedLayoutStrategy_h
 
 #include "vtkInfovisLayoutModule.h" // For export macro
 #include "vtkGraphLayoutStrategy.h"
diff --git a/Infovis/Layout/vtkGeoEdgeStrategy.h b/Infovis/Layout/vtkGeoEdgeStrategy.h
index 22acaaedab75a0791d69b299858642bd665c493e..2337a1e36d74e90eead9c5c3d93b8e636039a9fe 100644
--- a/Infovis/Layout/vtkGeoEdgeStrategy.h
+++ b/Infovis/Layout/vtkGeoEdgeStrategy.h
@@ -24,8 +24,8 @@
 // This is useful for viewing lines on a sphere (e.g. the earth).
 // The arcs may "jump" above the sphere's surface using ExplodeFactor.
 
-#ifndef __vtkGeoEdgeStrategy_h
-#define __vtkGeoEdgeStrategy_h
+#ifndef vtkGeoEdgeStrategy_h
+#define vtkGeoEdgeStrategy_h
 
 #include "vtkInfovisLayoutModule.h" // For export macro
 #include "vtkEdgeLayoutStrategy.h"
diff --git a/Infovis/Layout/vtkGeoMath.h b/Infovis/Layout/vtkGeoMath.h
index 01916f3c373a5028266e71a5b0c1282e4cd84a50..59cd8e7e400cc6ba68e4edf008d627bc3726353a 100644
--- a/Infovis/Layout/vtkGeoMath.h
+++ b/Infovis/Layout/vtkGeoMath.h
@@ -22,8 +22,8 @@
 // .SECTION Description
 // vtkGeoMath provides some useful geographic calculations.
 
-#ifndef __vtkGeoMath_h
-#define __vtkGeoMath_h
+#ifndef vtkGeoMath_h
+#define vtkGeoMath_h
 
 #include "vtkInfovisLayoutModule.h" // For export macro
 #include "vtkObject.h"
diff --git a/Infovis/Layout/vtkGraphLayout.h b/Infovis/Layout/vtkGraphLayout.h
index 525db68e2b86bf1acae432a21fea5ac4685304e4..a204985ca7310e3e71d665942a8a5ae4e1ff8471 100644
--- a/Infovis/Layout/vtkGraphLayout.h
+++ b/Infovis/Layout/vtkGraphLayout.h
@@ -28,8 +28,8 @@
 // Thanks to Brian Wylie from Sandia National Laboratories for adding incremental
 // layout capabilities.
 
-#ifndef __vtkGraphLayout_h
-#define __vtkGraphLayout_h
+#ifndef vtkGraphLayout_h
+#define vtkGraphLayout_h
 
 #include "vtkInfovisLayoutModule.h" // For export macro
 #include "vtkGraphAlgorithm.h"
diff --git a/Infovis/Layout/vtkGraphLayoutStrategy.h b/Infovis/Layout/vtkGraphLayoutStrategy.h
index 6eb18e58fec24cb07449300b94e789cb32b1348e..d5520459d19bad6d25e8b27867dc3c332511284b 100644
--- a/Infovis/Layout/vtkGraphLayoutStrategy.h
+++ b/Infovis/Layout/vtkGraphLayoutStrategy.h
@@ -31,8 +31,8 @@
 // Thanks to Brian Wylie from Sandia National Laboratories for adding incremental
 // layout capabilities.
 
-#ifndef __vtkGraphLayoutStrategy_h
-#define __vtkGraphLayoutStrategy_h
+#ifndef vtkGraphLayoutStrategy_h
+#define vtkGraphLayoutStrategy_h
 
 #include "vtkInfovisLayoutModule.h" // For export macro
 #include "vtkObject.h"
diff --git a/Infovis/Layout/vtkIncrementalForceLayout.h b/Infovis/Layout/vtkIncrementalForceLayout.h
index e604cee11455c9e3ade3757c9bcc1ff8e63a9c99..cd5167d4e16f155aa4392de6384a8422947a1c4a 100644
--- a/Infovis/Layout/vtkIncrementalForceLayout.h
+++ b/Infovis/Layout/vtkIncrementalForceLayout.h
@@ -23,8 +23,8 @@
 // This layout is modeled after D3's force layout described at
 // https://github.com/mbostock/d3/wiki/Force-Layout
 
-#ifndef __vtkIncrementalForceLayout_h
-#define __vtkIncrementalForceLayout_h
+#ifndef vtkIncrementalForceLayout_h
+#define vtkIncrementalForceLayout_h
 
 #include "vtkInfovisLayoutModule.h" // For export macro
 #include "vtkObject.h"
diff --git a/Infovis/Layout/vtkKCoreLayout.h b/Infovis/Layout/vtkKCoreLayout.h
index 7ad4dbfdbd734937031db89049f4a421b13d0af5..6fe3236084a535ef9ffff57183856a858bd6345d 100644
--- a/Infovis/Layout/vtkKCoreLayout.h
+++ b/Infovis/Layout/vtkKCoreLayout.h
@@ -48,8 +48,8 @@
 // implementation.
 
 
-#ifndef __vtkKCoreLayout_h
-#define __vtkKCoreLayout_h
+#ifndef vtkKCoreLayout_h
+#define vtkKCoreLayout_h
 
 #include "vtkInfovisLayoutModule.h" // For export macro
 #include "vtkGraphAlgorithm.h"
diff --git a/Infovis/Layout/vtkPassThroughEdgeStrategy.h b/Infovis/Layout/vtkPassThroughEdgeStrategy.h
index 440fed361c195c5c5ee4e96032060b2146521703..d14ca751063ef9b408e9b59ebdaad1bc0f79af35 100644
--- a/Infovis/Layout/vtkPassThroughEdgeStrategy.h
+++ b/Infovis/Layout/vtkPassThroughEdgeStrategy.h
@@ -22,8 +22,8 @@
 // Simply passes existing edge layout information from the input to the
 // output without making changes.
 
-#ifndef __vtkPassThroughEdgeStrategy_h
-#define __vtkPassThroughEdgeStrategy_h
+#ifndef vtkPassThroughEdgeStrategy_h
+#define vtkPassThroughEdgeStrategy_h
 
 #include "vtkInfovisLayoutModule.h" // For export macro
 #include "vtkEdgeLayoutStrategy.h"
diff --git a/Infovis/Layout/vtkPassThroughLayoutStrategy.h b/Infovis/Layout/vtkPassThroughLayoutStrategy.h
index 4e750636d1af1b49d8cb04f3008b2a64a4a9cde3..9203d77bd668f92f94bfa83bd298ca738fd27d07 100644
--- a/Infovis/Layout/vtkPassThroughLayoutStrategy.h
+++ b/Infovis/Layout/vtkPassThroughLayoutStrategy.h
@@ -24,8 +24,8 @@
 // so in affect passes through the graph untouched. This strategy
 // is useful in the cases where the graph is already laid out.
 
-#ifndef __vtkPassThroughLayoutStrategy_h
-#define __vtkPassThroughLayoutStrategy_h
+#ifndef vtkPassThroughLayoutStrategy_h
+#define vtkPassThroughLayoutStrategy_h
 
 #include "vtkInfovisLayoutModule.h" // For export macro
 #include "vtkGraphLayoutStrategy.h"
diff --git a/Infovis/Layout/vtkPerturbCoincidentVertices.h b/Infovis/Layout/vtkPerturbCoincidentVertices.h
index d7ce62b1b559a50d62756b5cbe68f3fcbaba0798..702558c3be2b1a432ab441f53e253d185a8b5028 100644
--- a/Infovis/Layout/vtkPerturbCoincidentVertices.h
+++ b/Infovis/Layout/vtkPerturbCoincidentVertices.h
@@ -25,8 +25,8 @@
 // so we need a nice scheme to perturb the vertices so that when the user
 // zooms in the vertices can be distiquished.
 
-#ifndef __vtkPerturbCoincidentVertices_h
-#define __vtkPerturbCoincidentVertices_h
+#ifndef vtkPerturbCoincidentVertices_h
+#define vtkPerturbCoincidentVertices_h
 
 #include "vtkInfovisLayoutModule.h" // For export macro
 #include "vtkGraphAlgorithm.h"
diff --git a/Infovis/Layout/vtkRandomLayoutStrategy.h b/Infovis/Layout/vtkRandomLayoutStrategy.h
index ab33e6096b99739c95fac41cd222de1d457e0a51..7187b8584209f327fd135009abcf57068b7f8b25 100644
--- a/Infovis/Layout/vtkRandomLayoutStrategy.h
+++ b/Infovis/Layout/vtkRandomLayoutStrategy.h
@@ -26,8 +26,8 @@
 // Thanks to Brian Wylie from Sandia National Laboratories for adding incremental
 // layout capabilities.
 
-#ifndef __vtkRandomLayoutStrategy_h
-#define __vtkRandomLayoutStrategy_h
+#ifndef vtkRandomLayoutStrategy_h
+#define vtkRandomLayoutStrategy_h
 
 #include "vtkInfovisLayoutModule.h" // For export macro
 #include "vtkGraphLayoutStrategy.h"
diff --git a/Infovis/Layout/vtkSimple2DLayoutStrategy.h b/Infovis/Layout/vtkSimple2DLayoutStrategy.h
index 149b89a5dd239aceb0687465442b36bc5a9e2843..b8b9428c7f042336bfb22bd5dc01fcc772c9c201 100644
--- a/Infovis/Layout/vtkSimple2DLayoutStrategy.h
+++ b/Infovis/Layout/vtkSimple2DLayoutStrategy.h
@@ -29,8 +29,8 @@
 // Thanks to Brian Wylie from Sandia National Laboratories for creating this
 // class.
 
-#ifndef __vtkSimple2DLayoutStrategy_h
-#define __vtkSimple2DLayoutStrategy_h
+#ifndef vtkSimple2DLayoutStrategy_h
+#define vtkSimple2DLayoutStrategy_h
 
 #include "vtkInfovisLayoutModule.h" // For export macro
 #include "vtkGraphLayoutStrategy.h"
diff --git a/Infovis/Layout/vtkSliceAndDiceLayoutStrategy.h b/Infovis/Layout/vtkSliceAndDiceLayoutStrategy.h
index f041b230dd5f38ca2a3085f8c10efc1debf97bc7..0e389987ffbe08199088f8dee701dca5f43b14f4 100644
--- a/Infovis/Layout/vtkSliceAndDiceLayoutStrategy.h
+++ b/Infovis/Layout/vtkSliceAndDiceLayoutStrategy.h
@@ -28,8 +28,8 @@
 // Shneiderman, B. 1992. Tree visualization with tree-maps: 2-d space-filling approach.
 // ACM Trans. Graph. 11, 1 (Jan. 1992), 92-99.
 
-#ifndef __vtkSliceAndDiceLayoutStrategy_h
-#define __vtkSliceAndDiceLayoutStrategy_h
+#ifndef vtkSliceAndDiceLayoutStrategy_h
+#define vtkSliceAndDiceLayoutStrategy_h
 
 #include "vtkInfovisLayoutModule.h" // For export macro
 #include "vtkTreeMapLayoutStrategy.h"
diff --git a/Infovis/Layout/vtkSpanTreeLayoutStrategy.h b/Infovis/Layout/vtkSpanTreeLayoutStrategy.h
index 37c5c34772b9218b98ae644116e9242fd6c3dbad..3e3a35129c5f58c2a7e5652ad61849b65b6b8ca7 100644
--- a/Infovis/Layout/vtkSpanTreeLayoutStrategy.h
+++ b/Infovis/Layout/vtkSpanTreeLayoutStrategy.h
@@ -58,8 +58,8 @@
 // implementation.
 
 
-#ifndef __vtkSpanTreeLayoutStrategy_h
-#define __vtkSpanTreeLayoutStrategy_h
+#ifndef vtkSpanTreeLayoutStrategy_h
+#define vtkSpanTreeLayoutStrategy_h
 
 #include "vtkInfovisLayoutModule.h" // For export macro
 #include "vtkGraphLayoutStrategy.h"
diff --git a/Infovis/Layout/vtkSplineGraphEdges.h b/Infovis/Layout/vtkSplineGraphEdges.h
index f2d1dd83cd30b45da1cd019519c356ccdb063798..ea466811cbe7886596ebb9b2746d5a625d9f8a4b 100644
--- a/Infovis/Layout/vtkSplineGraphEdges.h
+++ b/Infovis/Layout/vtkSplineGraphEdges.h
@@ -24,8 +24,8 @@
 // splines. By default, the filter will use an optimized b-spline.
 // Otherwise, it will use a custom vtkSpline instance set by the user.
 
-#ifndef __vtkSplineGraphEdges_h
-#define __vtkSplineGraphEdges_h
+#ifndef vtkSplineGraphEdges_h
+#define vtkSplineGraphEdges_h
 
 #include "vtkInfovisLayoutModule.h" // For export macro
 #include "vtkGraphAlgorithm.h"
diff --git a/Infovis/Layout/vtkSquarifyLayoutStrategy.h b/Infovis/Layout/vtkSquarifyLayoutStrategy.h
index e73f864825cba7a5cfdf3e026348e6f2b287495e..09d0e1038810fa7ffeb79d8bf1a15e01dba6cc67 100644
--- a/Infovis/Layout/vtkSquarifyLayoutStrategy.h
+++ b/Infovis/Layout/vtkSquarifyLayoutStrategy.h
@@ -31,8 +31,8 @@
 // Proceedings of the joint Eurographics and IEEE TCVG Symposium on Visualization,
 // 2000, Springer, Vienna, p. 33-42.
 
-#ifndef __vtkSquarifyLayoutStrategy_h
-#define __vtkSquarifyLayoutStrategy_h
+#ifndef vtkSquarifyLayoutStrategy_h
+#define vtkSquarifyLayoutStrategy_h
 
 #include "vtkInfovisLayoutModule.h" // For export macro
 #include "vtkTreeMapLayoutStrategy.h"
diff --git a/Infovis/Layout/vtkStackedTreeLayoutStrategy.h b/Infovis/Layout/vtkStackedTreeLayoutStrategy.h
index d97b79bef2da662eb320329a0adcfd678cdc5c14..66e85ac40ca825e274d0f0158fcb2bd8715c3f70 100644
--- a/Infovis/Layout/vtkStackedTreeLayoutStrategy.h
+++ b/Infovis/Layout/vtkStackedTreeLayoutStrategy.h
@@ -31,8 +31,8 @@
 // Thanks to Jason Shepherd from Sandia National Laboratories
 // for help developing this class.
 
-#ifndef __vtkStackedTreeLayoutStrategy_h
-#define __vtkStackedTreeLayoutStrategy_h
+#ifndef vtkStackedTreeLayoutStrategy_h
+#define vtkStackedTreeLayoutStrategy_h
 
 #include "vtkInfovisLayoutModule.h" // For export macro
 #include "vtkAreaLayoutStrategy.h"
diff --git a/Infovis/Layout/vtkTreeLayoutStrategy.h b/Infovis/Layout/vtkTreeLayoutStrategy.h
index 20d2cd7500868ff39e2d67b711189e26ef4aa793..57bc27947bd4bb4589ce99526efcc17bf55143bf 100644
--- a/Infovis/Layout/vtkTreeLayoutStrategy.h
+++ b/Infovis/Layout/vtkTreeLayoutStrategy.h
@@ -37,8 +37,8 @@
 // If the input is not a tree but a general graph, this strategy first extracts
 // a tree from the graph using a breadth-first search starting at vertex ID 0.
 
-#ifndef __vtkTreeLayoutStrategy_h
-#define __vtkTreeLayoutStrategy_h
+#ifndef vtkTreeLayoutStrategy_h
+#define vtkTreeLayoutStrategy_h
 
 #include "vtkInfovisLayoutModule.h" // For export macro
 #include "vtkGraphLayoutStrategy.h"
diff --git a/Infovis/Layout/vtkTreeMapLayout.h b/Infovis/Layout/vtkTreeMapLayout.h
index 1d2d0df0f02960c1fadefd1694657344e06ff737..60adaa9a711a560c28090d1606f4bff0fd79452c 100644
--- a/Infovis/Layout/vtkTreeMapLayout.h
+++ b/Infovis/Layout/vtkTreeMapLayout.h
@@ -36,8 +36,8 @@
 // Shneiderman, B. 1992. Tree visualization with tree-maps: 2-d space-filling approach.
 // ACM Trans. Graph. 11, 1 (Jan. 1992), 92-99.
 
-#ifndef __vtkTreeMapLayout_h
-#define __vtkTreeMapLayout_h
+#ifndef vtkTreeMapLayout_h
+#define vtkTreeMapLayout_h
 
 #include "vtkInfovisLayoutModule.h" // For export macro
 #include "vtkTreeAlgorithm.h"
diff --git a/Infovis/Layout/vtkTreeMapLayoutStrategy.h b/Infovis/Layout/vtkTreeMapLayoutStrategy.h
index 5b606e1e97e4ed710481d09367cc16dd85576daa..63f5598fdc5b2e74e9835d5395f25dd98d8060aa 100644
--- a/Infovis/Layout/vtkTreeMapLayoutStrategy.h
+++ b/Infovis/Layout/vtkTreeMapLayoutStrategy.h
@@ -32,8 +32,8 @@
 // Thanks to Brian Wylie and Ken Moreland from Sandia National Laboratories
 // for help developing this class.
 
-#ifndef __vtkTreeMapLayoutStrategy_h
-#define __vtkTreeMapLayoutStrategy_h
+#ifndef vtkTreeMapLayoutStrategy_h
+#define vtkTreeMapLayoutStrategy_h
 
 
 #include "vtkInfovisLayoutModule.h" // For export macro
diff --git a/Infovis/Layout/vtkTreeMapToPolyData.h b/Infovis/Layout/vtkTreeMapToPolyData.h
index eb81a385ae8134e9c8140143ff937a262ae1cd62..6b5f31eff7713fa5dc0907dc5add4ae9d33d2b81 100644
--- a/Infovis/Layout/vtkTreeMapToPolyData.h
+++ b/Infovis/Layout/vtkTreeMapToPolyData.h
@@ -24,8 +24,8 @@
 // data in order to create the quadruple array (min x, max x, min y, max y) of
 // bounds for each vertex of the tree.
 
-#ifndef __vtkTreeMapToPolyData_h
-#define __vtkTreeMapToPolyData_h
+#ifndef vtkTreeMapToPolyData_h
+#define vtkTreeMapToPolyData_h
 
 #include "vtkInfovisLayoutModule.h" // For export macro
 #include "vtkPolyDataAlgorithm.h"
diff --git a/Infovis/Layout/vtkTreeOrbitLayoutStrategy.h b/Infovis/Layout/vtkTreeOrbitLayoutStrategy.h
index 1983973d2ca1f08e2764954492fe3e68e618d8d4..c88019648c01cac3760ff6408e84e40a7fb785cd 100644
--- a/Infovis/Layout/vtkTreeOrbitLayoutStrategy.h
+++ b/Infovis/Layout/vtkTreeOrbitLayoutStrategy.h
@@ -17,8 +17,8 @@
 // .SECTION Thanks
 // Thanks to the galaxy for inspiring this layout strategy.
 
-#ifndef __vtkTreeOrbitLayoutStrategy_h
-#define __vtkTreeOrbitLayoutStrategy_h
+#ifndef vtkTreeOrbitLayoutStrategy_h
+#define vtkTreeOrbitLayoutStrategy_h
 
 #include "vtkInfovisLayoutModule.h" // For export macro
 #include "vtkGraphLayoutStrategy.h"
diff --git a/Infovis/Layout/vtkTreeRingToPolyData.h b/Infovis/Layout/vtkTreeRingToPolyData.h
index 31461e0c7a0f97af3fb7a0dd99f68ad9b47e93a0..a38684e1d40d4e180d3f63f059c38125a445d245 100644
--- a/Infovis/Layout/vtkTreeRingToPolyData.h
+++ b/Infovis/Layout/vtkTreeRingToPolyData.h
@@ -26,8 +26,8 @@
 // (start angle, end angle, inner radius, outer radius) of bounds
 // for each vertex of the tree.
 
-#ifndef __vtkTreeRingToPolyData_h
-#define __vtkTreeRingToPolyData_h
+#ifndef vtkTreeRingToPolyData_h
+#define vtkTreeRingToPolyData_h
 
 #include "vtkInfovisLayoutModule.h" // For export macro
 #include "vtkPolyDataAlgorithm.h"
diff --git a/Infovis/Parallel/vtkPBGLBreadthFirstSearch.h b/Infovis/Parallel/vtkPBGLBreadthFirstSearch.h
index 5760d1f95877eb5d43847e1c5e35a750eba65827..ba93e8157f6ff3fb6000dce19e29ae4392160e4a 100644
--- a/Infovis/Parallel/vtkPBGLBreadthFirstSearch.h
+++ b/Infovis/Parallel/vtkPBGLBreadthFirstSearch.h
@@ -30,8 +30,8 @@
 // .SECTION See Also
 // vtkGraph vtkBoostBreadthFirstSearch vtkBoostGraphAdapter
 
-#ifndef __vtkPBGLBreadthFirstSearch_h
-#define __vtkPBGLBreadthFirstSearch_h
+#ifndef vtkPBGLBreadthFirstSearch_h
+#define vtkPBGLBreadthFirstSearch_h
 
 #include "vtkInfovisParallelModule.h" // For export macro
 #include "vtkStdString.h" // For string type
diff --git a/Infovis/Parallel/vtkPBGLCollapseGraph.h b/Infovis/Parallel/vtkPBGLCollapseGraph.h
index 75f5efbea2fa905067e1c101ad20bfe5136b871a..9227eb9573f47e1a052b7610548dd03a0c8eb37f 100644
--- a/Infovis/Parallel/vtkPBGLCollapseGraph.h
+++ b/Infovis/Parallel/vtkPBGLCollapseGraph.h
@@ -24,8 +24,8 @@
 // to collapse groups of vertices with the same value into a single vertex.
 // @deprecated Not maintained as of VTK 6.2 and will be removed eventually.
 
-#ifndef __vtkPBGLCollapseGraph_h
-#define __vtkPBGLCollapseGraph_h
+#ifndef vtkPBGLCollapseGraph_h
+#define vtkPBGLCollapseGraph_h
 
 #include "vtkInfovisParallelModule.h" // For export macro
 #include "vtkGraphAlgorithm.h"
diff --git a/Infovis/Parallel/vtkPBGLCollapseParallelEdges.h b/Infovis/Parallel/vtkPBGLCollapseParallelEdges.h
index 8e789ce05c1fc6637e43b5ca97a1d4034d450da2..01540923967f39578eb88eb8f57dff720fbb2cf6 100644
--- a/Infovis/Parallel/vtkPBGLCollapseParallelEdges.h
+++ b/Infovis/Parallel/vtkPBGLCollapseParallelEdges.h
@@ -23,8 +23,8 @@
 // Uses single input array specified with SetInputArrayToProcess(0,...)
 // to collapse groups of vertices with the same value into a single vertex.
 
-#ifndef __vtkPBGLCollapseParallelEdges_h
-#define __vtkPBGLCollapseParallelEdges_h
+#ifndef vtkPBGLCollapseParallelEdges_h
+#define vtkPBGLCollapseParallelEdges_h
 
 #include "vtkInfovisParallelModule.h" // For export macro
 #include "vtkGraphAlgorithm.h"
diff --git a/Infovis/Parallel/vtkPBGLCollectGraph.h b/Infovis/Parallel/vtkPBGLCollectGraph.h
index 02ccf9e02deddd1eeb7bee8c6ea16239cfeca53d..215f2f321d9a398a7d0617ace50d224ca9fd335e 100644
--- a/Infovis/Parallel/vtkPBGLCollectGraph.h
+++ b/Infovis/Parallel/vtkPBGLCollectGraph.h
@@ -41,8 +41,8 @@
 // .SECTION See Also
 // vtkGraph
 
-#ifndef __vtkPBGLCollectGraph_h
-#define __vtkPBGLCollectGraph_h
+#ifndef vtkPBGLCollectGraph_h
+#define vtkPBGLCollectGraph_h
 
 #include "vtkInfovisParallelModule.h" // For export macro
 #include "vtkStdString.h" // For string type
diff --git a/Infovis/Parallel/vtkPBGLConnectedComponents.h b/Infovis/Parallel/vtkPBGLConnectedComponents.h
index fe944269b792dfcb3faac8718702a355f13075af..d78efec183ccdb3526f8db639e943432a745328c 100644
--- a/Infovis/Parallel/vtkPBGLConnectedComponents.h
+++ b/Infovis/Parallel/vtkPBGLConnectedComponents.h
@@ -28,8 +28,8 @@
 //
 // @deprecated Not maintained as of VTK 6.2 and will be removed eventually.
 
-#ifndef __vtkPBGLConnectedComponents_h
-#define __vtkPBGLConnectedComponents_h
+#ifndef vtkPBGLConnectedComponents_h
+#define vtkPBGLConnectedComponents_h
 
 #include "vtkInfovisParallelModule.h" // For export macro
 #include "vtkStdString.h" // For string type
diff --git a/Infovis/Parallel/vtkPBGLDistributedGraphHelper.h b/Infovis/Parallel/vtkPBGLDistributedGraphHelper.h
index e33fbbef0915086eed0815cfaaeed4eefed37800..ad67a809e55e9cab50de3e82ebb16555f0bcc209 100644
--- a/Infovis/Parallel/vtkPBGLDistributedGraphHelper.h
+++ b/Infovis/Parallel/vtkPBGLDistributedGraphHelper.h
@@ -33,8 +33,8 @@
 // .SEEALSO
 // vtkGraph vtkDistributedGraphHelper
 
-#ifndef __vtkPBGLDistributedGraphHelper_h
-#define __vtkPBGLDistributedGraphHelper_h
+#ifndef vtkPBGLDistributedGraphHelper_h
+#define vtkPBGLDistributedGraphHelper_h
 
 #include "vtkInfovisParallelModule.h" // For export macro
 #include "vtkDistributedGraphHelper.h"
@@ -220,4 +220,4 @@ class VTKINFOVISPARALLEL_EXPORT vtkPBGLDistributedGraphHelper : public vtkDistri
 };
 
 #endif //VTK_LEGACY_REMOVE
-#endif // __vtkPBGLDistributedGraphHelper_h
+#endif // vtkPBGLDistributedGraphHelper_h
diff --git a/Infovis/Parallel/vtkPBGLGraphAdapter.h b/Infovis/Parallel/vtkPBGLGraphAdapter.h
index a948448f45534dbf8ff1abe1619b06cee26f0acb..475fdee72aaceb98db574369a58ade7246bb3eea 100644
--- a/Infovis/Parallel/vtkPBGLGraphAdapter.h
+++ b/Infovis/Parallel/vtkPBGLGraphAdapter.h
@@ -23,8 +23,8 @@
 // Including this header allows you to use a vtk*Graph in Parallel BGL algorithms.
 // @deprecated Not maintained as of VTK 6.2 and will be removed eventually.
 
-#ifndef __vtkPBGLGraphAdapter_h
-#define __vtkPBGLGraphAdapter_h
+#ifndef vtkPBGLGraphAdapter_h
+#define vtkPBGLGraphAdapter_h
 
 #include "vtkBoostGraphAdapter.h" // for the sequential BGL adapters
 
@@ -472,5 +472,5 @@ MakeDistributedEdgePropertyMap(vtkGraph* graph, DataArray* array)
                  array);
 }
 
-#endif // __vtkPBGLGraphAdapter_h
+#endif // vtkPBGLGraphAdapter_h
 // VTK-HeaderTest-Exclude: vtkPBGLGraphAdapter.h
diff --git a/Infovis/Parallel/vtkPBGLGraphSQLReader.h b/Infovis/Parallel/vtkPBGLGraphSQLReader.h
index 76172a113c9e01feaa6efb8a67beefa372923964..fea427a9df97ffe3cfbd865b7437ee1719b279e3 100644
--- a/Infovis/Parallel/vtkPBGLGraphSQLReader.h
+++ b/Infovis/Parallel/vtkPBGLGraphSQLReader.h
@@ -35,8 +35,8 @@
 //
 // @deprecated Not maintained as of VTK 6.2 and will be removed eventually.
 
-#ifndef __vtkPBGLGraphSQLReader_h
-#define __vtkPBGLGraphSQLReader_h
+#ifndef vtkPBGLGraphSQLReader_h
+#define vtkPBGLGraphSQLReader_h
 
 #include "vtkInfovisParallelModule.h" // For export macro
 #include "vtkGraphAlgorithm.h"
diff --git a/Infovis/Parallel/vtkPBGLMinimumSpanningTree.h b/Infovis/Parallel/vtkPBGLMinimumSpanningTree.h
index 0b9c8ec26390c901e8d3851754424fb63807c71e..cd0e563f34dccdb8b2b703501beaf88de9df5d20 100644
--- a/Infovis/Parallel/vtkPBGLMinimumSpanningTree.h
+++ b/Infovis/Parallel/vtkPBGLMinimumSpanningTree.h
@@ -30,8 +30,8 @@
 //
 // @deprecated Not maintained as of VTK 6.2 and will be removed eventually.
 
-#ifndef __vtkPBGLMinimumSpanningTree_h
-#define __vtkPBGLMinimumSpanningTree_h
+#ifndef vtkPBGLMinimumSpanningTree_h
+#define vtkPBGLMinimumSpanningTree_h
 
 #include "vtkInfovisParallelModule.h" // For export macro
 #include "vtkStdString.h" // For string type
diff --git a/Infovis/Parallel/vtkPBGLRMATGraphSource.h b/Infovis/Parallel/vtkPBGLRMATGraphSource.h
index ab9a7f4ff2ac65fb76b9e32c9b77b1a74e510bcc..ba0ddc45a7a3fc27c0a87dd20efe30518824f684 100644
--- a/Infovis/Parallel/vtkPBGLRMATGraphSource.h
+++ b/Infovis/Parallel/vtkPBGLRMATGraphSource.h
@@ -60,8 +60,8 @@
 // many real-world graphs based on social networks.
 //
 // @deprecated Not maintained as of VTK 6.2 and will be removed eventually.
-#ifndef __vtkPBGLRMATGraphSource_h
-#define __vtkPBGLRMATGraphSource_h
+#ifndef vtkPBGLRMATGraphSource_h
+#define vtkPBGLRMATGraphSource_h
 
 #include "vtkInfovisParallelModule.h" // For export macro
 #include "vtkGraphAlgorithm.h"
diff --git a/Infovis/Parallel/vtkPBGLRandomGraphSource.h b/Infovis/Parallel/vtkPBGLRandomGraphSource.h
index 18c5c56c54e17b20ca765f5c097c69d4f033ae8e..2d5c9fbcd134aaf5b4779063f908f4ddcf66f87c 100644
--- a/Infovis/Parallel/vtkPBGLRandomGraphSource.h
+++ b/Infovis/Parallel/vtkPBGLRandomGraphSource.h
@@ -30,8 +30,8 @@
 //
 // @deprecated Not maintained as of VTK 6.2 and will be removed eventually.
 
-#ifndef __vtkPBGLRandomGraphSource_h
-#define __vtkPBGLRandomGraphSource_h
+#ifndef vtkPBGLRandomGraphSource_h
+#define vtkPBGLRandomGraphSource_h
 
 #include "vtkInfovisParallelModule.h" // For export macro
 #include "vtkGraphAlgorithm.h"
diff --git a/Infovis/Parallel/vtkPBGLShortestPaths.h b/Infovis/Parallel/vtkPBGLShortestPaths.h
index c72135f360a1ee958295ed7d6451d39f2f1f609e..8e2153d6d6bec1b52761d990e1f4a2e808e79aef 100644
--- a/Infovis/Parallel/vtkPBGLShortestPaths.h
+++ b/Infovis/Parallel/vtkPBGLShortestPaths.h
@@ -31,8 +31,8 @@
 //
 // @deprecated Not maintained as of VTK 6.2 and will be removed eventually.
 
-#ifndef __vtkPBGLShortestPaths_h
-#define __vtkPBGLShortestPaths_h
+#ifndef vtkPBGLShortestPaths_h
+#define vtkPBGLShortestPaths_h
 
 #include "vtkInfovisParallelModule.h" // For export macro
 #include "vtkStdString.h" // For string type
diff --git a/Infovis/Parallel/vtkPBGLVertexColoring.h b/Infovis/Parallel/vtkPBGLVertexColoring.h
index b36f175ff9bd48df3276aa2700dbcaeb0af54fda..31c70a5b99fc4ca8b50f460e822a8391cc8130fd 100644
--- a/Infovis/Parallel/vtkPBGLVertexColoring.h
+++ b/Infovis/Parallel/vtkPBGLVertexColoring.h
@@ -27,8 +27,8 @@
 //
 // @deprecated Not maintained as of VTK 6.2 and will be removed eventually.
 
-#ifndef __vtkPBGLVertexColoring_h
-#define __vtkPBGLVertexColoring_h
+#ifndef vtkPBGLVertexColoring_h
+#define vtkPBGLVertexColoring_h
 
 #include "vtkInfovisParallelModule.h" // For export macro
 #include "vtkStdString.h" // For string type
diff --git a/Interaction/Image/vtkImageViewer.h b/Interaction/Image/vtkImageViewer.h
index 82388b8590e4883ec13c992622dbbf18ff24c32f..e9430aa50552106e6e02956a1dcc1a0eb309af44 100644
--- a/Interaction/Image/vtkImageViewer.h
+++ b/Interaction/Image/vtkImageViewer.h
@@ -23,8 +23,8 @@
 // .SECTION See Also
 // vtkRenderWindow vtkRenderer vtkImageMapper vtkActor2D
 
-#ifndef __vtkImageViewer_h
-#define __vtkImageViewer_h
+#ifndef vtkImageViewer_h
+#define vtkImageViewer_h
 
 #include "vtkInteractionImageModule.h" // For export macro
 #include "vtkObject.h"
diff --git a/Interaction/Image/vtkImageViewer2.h b/Interaction/Image/vtkImageViewer2.h
index 4bda0b0d84f2589e9b6946b491137b628557834f..e1ce506b63866e678c0879eb28d54140843e94f3 100644
--- a/Interaction/Image/vtkImageViewer2.h
+++ b/Interaction/Image/vtkImageViewer2.h
@@ -52,8 +52,8 @@
 // .SECTION See Also
 // vtkRenderWindow vtkRenderer vtkImageActor vtkImageMapToWindowLevelColors
 
-#ifndef __vtkImageViewer2_h
-#define __vtkImageViewer2_h
+#ifndef vtkImageViewer2_h
+#define vtkImageViewer2_h
 
 #include "vtkInteractionImageModule.h" // For export macro
 #include "vtkObject.h"
diff --git a/Interaction/Image/vtkResliceImageViewer.h b/Interaction/Image/vtkResliceImageViewer.h
index 990faf8f4096ec63df547fd5e968a893c0288668..586040b74d924cda05b7c36ea9d8d84288935535 100644
--- a/Interaction/Image/vtkResliceImageViewer.h
+++ b/Interaction/Image/vtkResliceImageViewer.h
@@ -24,8 +24,8 @@
 // .SECTION see also
 // vtkResliceCursor vtkResliceCursorWidget vtkResliceCursorRepresentation
 
-#ifndef __vtkResliceImageViewer_h
-#define __vtkResliceImageViewer_h
+#ifndef vtkResliceImageViewer_h
+#define vtkResliceImageViewer_h
 
 #include "vtkInteractionImageModule.h" // For export macro
 #include "vtkImageViewer2.h"
diff --git a/Interaction/Image/vtkResliceImageViewerMeasurements.h b/Interaction/Image/vtkResliceImageViewerMeasurements.h
index 399e82f61c6246bf7489b8eb72d2ce1fad5722d1..4b7f188fc487b8c78cdb730293edb19202919631 100644
--- a/Interaction/Image/vtkResliceImageViewerMeasurements.h
+++ b/Interaction/Image/vtkResliceImageViewerMeasurements.h
@@ -20,8 +20,8 @@
 // .SECTION see also
 // vtkResliceCursor vtkResliceCursorWidget vtkResliceCursorRepresentation
 
-#ifndef __vtkResliceImageViewerMeasurements_h
-#define __vtkResliceImageViewerMeasurements_h
+#ifndef vtkResliceImageViewerMeasurements_h
+#define vtkResliceImageViewerMeasurements_h
 
 #include "vtkInteractionImageModule.h" // For export macro
 #include "vtkObject.h"
diff --git a/Interaction/Style/vtkInteractorStyleDrawPolygon.h b/Interaction/Style/vtkInteractorStyleDrawPolygon.h
index fa325938fd8ec570e1c0e5742c662f02fd24ff20..0f6ca1e48eb0e0f36a4a6bd970575d593d700c74 100644
--- a/Interaction/Style/vtkInteractorStyleDrawPolygon.h
+++ b/Interaction/Style/vtkInteractorStyleDrawPolygon.h
@@ -18,8 +18,8 @@
 // window using the left mouse button while mouse is moving.
 // When the mouse button is released, a SelectionChangedEvent will be fired.
 
-#ifndef __vtkInteractorStyleDrawPolygon_h
-#define __vtkInteractorStyleDrawPolygon_h
+#ifndef vtkInteractorStyleDrawPolygon_h
+#define vtkInteractorStyleDrawPolygon_h
 
 #include "vtkInteractionStyleModule.h" // For export macro
 #include "vtkInteractorStyle.h"
diff --git a/Interaction/Style/vtkInteractorStyleFlight.h b/Interaction/Style/vtkInteractorStyleFlight.h
index 6e021734c5cc04416c8f6adaa142ed9e5419dbda..01b686c6ed7a4e22eea5e41ff8ac7e07228181cd 100644
--- a/Interaction/Style/vtkInteractorStyleFlight.h
+++ b/Interaction/Style/vtkInteractorStyleFlight.h
@@ -30,8 +30,8 @@
 // of bounding box of visible actors, '+' and '-' keys allow user to
 // increase or decrease step size.
 
-#ifndef __vtkInteractorStyleFlight_h
-#define __vtkInteractorStyleFlight_h
+#ifndef vtkInteractorStyleFlight_h
+#define vtkInteractorStyleFlight_h
 
 #include "vtkInteractionStyleModule.h" // For export macro
 #include "vtkInteractorStyle.h"
diff --git a/Interaction/Style/vtkInteractorStyleImage.h b/Interaction/Style/vtkInteractorStyleImage.h
index 55bc5580f3f544c172d5caf26557fca23cd18d26..9429cbec0dfa503864bba48f29d36a82d57b64b0 100644
--- a/Interaction/Style/vtkInteractorStyleImage.h
+++ b/Interaction/Style/vtkInteractorStyleImage.h
@@ -53,8 +53,8 @@
 // vtkInteractorStyle vtkInteractorStyleTrackballActor
 // vtkInteractorStyleJoystickCamera vtkInteractorStyleJoystickActor
 
-#ifndef __vtkInteractorStyleImage_h
-#define __vtkInteractorStyleImage_h
+#ifndef vtkInteractorStyleImage_h
+#define vtkInteractorStyleImage_h
 
 #include "vtkInteractionStyleModule.h" // For export macro
 #include "vtkInteractorStyleTrackballCamera.h"
diff --git a/Interaction/Style/vtkInteractorStyleJoystickActor.h b/Interaction/Style/vtkInteractorStyleJoystickActor.h
index 99a114d95114b238367fe209bf11362041e5bbd8..d09d0b611f21d3cdf2cbc56f9e24191dd84f5186 100644
--- a/Interaction/Style/vtkInteractorStyleJoystickActor.h
+++ b/Interaction/Style/vtkInteractorStyleJoystickActor.h
@@ -28,8 +28,8 @@
 // vtkInteractorStyleJoystickCamera vtkInteractorStyleTrackballActor
 // vtkInteractorStyleTrackballCamera
 
-#ifndef __vtkInteractorStyleJoystickActor_h
-#define __vtkInteractorStyleJoystickActor_h
+#ifndef vtkInteractorStyleJoystickActor_h
+#define vtkInteractorStyleJoystickActor_h
 
 #include "vtkInteractionStyleModule.h" // For export macro
 #include "vtkInteractorStyle.h"
diff --git a/Interaction/Style/vtkInteractorStyleJoystickCamera.h b/Interaction/Style/vtkInteractorStyleJoystickCamera.h
index 278bd61cfe44bcddf07060e2ce38b05de430f84d..0f080c12b81a7313fbf6a050939189da6b4a7f8c 100644
--- a/Interaction/Style/vtkInteractorStyleJoystickCamera.h
+++ b/Interaction/Style/vtkInteractorStyleJoystickCamera.h
@@ -30,8 +30,8 @@
 // vtkInteractorStyleJoystickActor vtkInteractorStyleTrackballCamera
 // vtkInteractorStyleTrackballActor
 
-#ifndef __vtkInteractorStyleJoystickCamera_h
-#define __vtkInteractorStyleJoystickCamera_h
+#ifndef vtkInteractorStyleJoystickCamera_h
+#define vtkInteractorStyleJoystickCamera_h
 
 #include "vtkInteractionStyleModule.h" // For export macro
 #include "vtkInteractorStyle.h"
diff --git a/Interaction/Style/vtkInteractorStyleMultiTouchCamera.h b/Interaction/Style/vtkInteractorStyleMultiTouchCamera.h
index 3ac047274301e4d6084b7025b7f890f3de66cf5a..1bdb4fc1a0a049c861ebc40ba4c20473b96652de 100644
--- a/Interaction/Style/vtkInteractorStyleMultiTouchCamera.h
+++ b/Interaction/Style/vtkInteractorStyleMultiTouchCamera.h
@@ -25,8 +25,8 @@
 // vtkInteractorStyleTrackballActor vtkInteractorStyleJoystickCamera
 // vtkInteractorStyleJoystickActor
 
-#ifndef __vtkInteractorStyleMultiTouchCamera_h
-#define __vtkInteractorStyleMultiTouchCamera_h
+#ifndef vtkInteractorStyleMultiTouchCamera_h
+#define vtkInteractorStyleMultiTouchCamera_h
 
 #include "vtkInteractionStyleModule.h" // For export macro
 #include "vtkRenderWindowInteractor.h" // for max pointers
diff --git a/Interaction/Style/vtkInteractorStyleRubberBand2D.h b/Interaction/Style/vtkInteractorStyleRubberBand2D.h
index 1098c9b64c5e2ce7ca24d03c362b4d72868089b1..188c4d0a582fc3535bb09fc58d3bb44315a2121f 100644
--- a/Interaction/Style/vtkInteractorStyleRubberBand2D.h
+++ b/Interaction/Style/vtkInteractorStyleRubberBand2D.h
@@ -34,8 +34,8 @@
 // Middle mouse - Pan.
 // Scroll wheel - Zoom.
 
-#ifndef __vtkInteractorStyleRubberBand2D_h
-#define __vtkInteractorStyleRubberBand2D_h
+#ifndef vtkInteractorStyleRubberBand2D_h
+#define vtkInteractorStyleRubberBand2D_h
 
 #include "vtkInteractionStyleModule.h" // For export macro
 #include "vtkInteractorStyle.h"
diff --git a/Interaction/Style/vtkInteractorStyleRubberBand3D.h b/Interaction/Style/vtkInteractorStyleRubberBand3D.h
index 963a996cd7bb55255a482bcd91163374e29fccbb..74830b0618f3caf7f1d5704dea932b8ebeb8c673 100644
--- a/Interaction/Style/vtkInteractorStyleRubberBand3D.h
+++ b/Interaction/Style/vtkInteractorStyleRubberBand3D.h
@@ -32,8 +32,8 @@
 // Middle mouse - Pan.
 // Scroll wheel - Zoom.
 
-#ifndef __vtkInteractorStyleRubberBand3D_h
-#define __vtkInteractorStyleRubberBand3D_h
+#ifndef vtkInteractorStyleRubberBand3D_h
+#define vtkInteractorStyleRubberBand3D_h
 
 #include "vtkInteractionStyleModule.h" // For export macro
 #include "vtkInteractorStyleTrackballCamera.h"
diff --git a/Interaction/Style/vtkInteractorStyleRubberBandPick.h b/Interaction/Style/vtkInteractorStyleRubberBandPick.h
index b13bdda657684ff5f05334eb4e940431ce2b0143..00844c87ae1a3b14fd853329425e4c9932a24818 100644
--- a/Interaction/Style/vtkInteractorStyleRubberBandPick.h
+++ b/Interaction/Style/vtkInteractorStyleRubberBandPick.h
@@ -26,8 +26,8 @@
 // .SECTION See Also
 // vtkAreaPicker
 
-#ifndef __vtkInteractorStyleRubberBandPick_h
-#define __vtkInteractorStyleRubberBandPick_h
+#ifndef vtkInteractorStyleRubberBandPick_h
+#define vtkInteractorStyleRubberBandPick_h
 
 #include "vtkInteractionStyleModule.h" // For export macro
 #include "vtkInteractorStyleTrackballCamera.h"
diff --git a/Interaction/Style/vtkInteractorStyleRubberBandZoom.h b/Interaction/Style/vtkInteractorStyleRubberBandZoom.h
index cfe8cbb8c3f792548c740b7a4396cae192fc7394..dd589a4ef3bc6efe5a8b7e3848c922844b0b3964 100644
--- a/Interaction/Style/vtkInteractorStyleRubberBandZoom.h
+++ b/Interaction/Style/vtkInteractorStyleRubberBandZoom.h
@@ -19,8 +19,8 @@
 // the current camera zooms by an amount determined from the shorter side of
 // the drawn rectangle.
 
-#ifndef __vtkInteractorStyleRubberBandZoom_h
-#define __vtkInteractorStyleRubberBandZoom_h
+#ifndef vtkInteractorStyleRubberBandZoom_h
+#define vtkInteractorStyleRubberBandZoom_h
 
 #include "vtkInteractionStyleModule.h" // For export macro
 #include "vtkInteractorStyle.h"
diff --git a/Interaction/Style/vtkInteractorStyleSwitch.h b/Interaction/Style/vtkInteractorStyleSwitch.h
index 3d1d7388b1547c19359aae99484af505f7c444d9..2e107dc70ae87d9efdbba5d3c7c195687f46dac4 100644
--- a/Interaction/Style/vtkInteractorStyleSwitch.h
+++ b/Interaction/Style/vtkInteractorStyleSwitch.h
@@ -23,8 +23,8 @@
 // vtkInteractorStyleJoystickActor vtkInteractorStyleJoystickCamera
 // vtkInteractorStyleTrackballActor vtkInteractorStyleTrackballCamera
 
-#ifndef __vtkInteractorStyleSwitch_h
-#define __vtkInteractorStyleSwitch_h
+#ifndef vtkInteractorStyleSwitch_h
+#define vtkInteractorStyleSwitch_h
 
 #include "vtkInteractionStyleModule.h" // For export macro
 #include "vtkInteractorStyleSwitchBase.h"
diff --git a/Interaction/Style/vtkInteractorStyleTerrain.h b/Interaction/Style/vtkInteractorStyleTerrain.h
index 8ad8bebf6fdcbc18ded0b393a9a96a45f528b3f7..0b845c3e24417fea050326bc8fbf683e05b9d47e 100644
--- a/Interaction/Style/vtkInteractorStyleTerrain.h
+++ b/Interaction/Style/vtkInteractorStyleTerrain.h
@@ -43,8 +43,8 @@
 // .SECTION See Also
 // vtkInteractorObserver vtkInteractorStyle vtk3DWidget
 
-#ifndef __vtkInteractorStyleTerrain_h
-#define __vtkInteractorStyleTerrain_h
+#ifndef vtkInteractorStyleTerrain_h
+#define vtkInteractorStyleTerrain_h
 
 #include "vtkInteractionStyleModule.h" // For export macro
 #include "vtkInteractorStyle.h"
diff --git a/Interaction/Style/vtkInteractorStyleTrackball.h b/Interaction/Style/vtkInteractorStyleTrackball.h
index 7bd87ab647db32c3988ec29e9474427845875153..466fbdde97b61a64a15ed43a24a6fb764c0290a6 100644
--- a/Interaction/Style/vtkInteractorStyleTrackball.h
+++ b/Interaction/Style/vtkInteractorStyleTrackball.h
@@ -22,8 +22,8 @@
 // .SECTION See Also
 // vtkInteractorStyleSwitch vtkInteractorStyleTrackballActor vtkInteractorStyleJoystickCamera
 
-#ifndef __vtkInteractorStyleTrackball_h
-#define __vtkInteractorStyleTrackball_h
+#ifndef vtkInteractorStyleTrackball_h
+#define vtkInteractorStyleTrackball_h
 
 #include "vtkInteractionStyleModule.h" // For export macro
 #include "vtkInteractorStyleSwitch.h"
diff --git a/Interaction/Style/vtkInteractorStyleTrackballActor.h b/Interaction/Style/vtkInteractorStyleTrackballActor.h
index ad61df40776a410cc74eeb2aff5d8f9557bc5006..91a027d1da080538e300e32902aec6cd3d525a8a 100644
--- a/Interaction/Style/vtkInteractorStyleTrackballActor.h
+++ b/Interaction/Style/vtkInteractorStyleTrackballActor.h
@@ -31,8 +31,8 @@
 // vtkInteractorStyleTrackballCamera vtkInteractorStyleJoystickActor
 // vtkInteractorStyleJoystickCamera
 
-#ifndef __vtkInteractorStyleTrackballActor_h
-#define __vtkInteractorStyleTrackballActor_h
+#ifndef vtkInteractorStyleTrackballActor_h
+#define vtkInteractorStyleTrackballActor_h
 
 #include "vtkInteractionStyleModule.h" // For export macro
 #include "vtkInteractorStyle.h"
diff --git a/Interaction/Style/vtkInteractorStyleTrackballCamera.h b/Interaction/Style/vtkInteractorStyleTrackballCamera.h
index 882e9bf3c166e6aaebaa6daf0ff187730b52c8ff..9dd7f4d40cdb755efeeacbfb2bf46f1c655dbbba 100644
--- a/Interaction/Style/vtkInteractorStyleTrackballCamera.h
+++ b/Interaction/Style/vtkInteractorStyleTrackballCamera.h
@@ -29,8 +29,8 @@
 // vtkInteractorStyleTrackballActor vtkInteractorStyleJoystickCamera
 // vtkInteractorStyleJoystickActor
 
-#ifndef __vtkInteractorStyleTrackballCamera_h
-#define __vtkInteractorStyleTrackballCamera_h
+#ifndef vtkInteractorStyleTrackballCamera_h
+#define vtkInteractorStyleTrackballCamera_h
 
 #include "vtkInteractionStyleModule.h" // For export macro
 #include "vtkInteractorStyle.h"
diff --git a/Interaction/Style/vtkInteractorStyleUnicam.h b/Interaction/Style/vtkInteractorStyleUnicam.h
index c25ca21db886907b07ea38287c2d15dc49a23277..7fc20fa6d3b25ab999894d3bc00c6c6b27f85682 100644
--- a/Interaction/Style/vtkInteractorStyleUnicam.h
+++ b/Interaction/Style/vtkInteractorStyleUnicam.h
@@ -75,8 +75,8 @@
 // projection.)
 
 
-#ifndef __vtkInteractorStyleUnicam_h
-#define __vtkInteractorStyleUnicam_h
+#ifndef vtkInteractorStyleUnicam_h
+#define vtkInteractorStyleUnicam_h
 
 #include "vtkInteractionStyleModule.h" // For export macro
 #include "vtkInteractorStyle.h"
@@ -179,7 +179,7 @@ private:
   void operator=(const vtkInteractorStyleUnicam&);  // Not implemented.
 };
 
-#endif  // __vtkInteractorStyleUnicam_h
+#endif  // vtkInteractorStyleUnicam_h
 
 
 
diff --git a/Interaction/Style/vtkInteractorStyleUser.h b/Interaction/Style/vtkInteractorStyleUser.h
index 2470aaab36b779ffd90ada0ec8127dc50b835ca5..81b527e7390b2dd5e55e95021673f4577f41636a 100644
--- a/Interaction/Style/vtkInteractorStyleUser.h
+++ b/Interaction/Style/vtkInteractorStyleUser.h
@@ -27,8 +27,8 @@
 // must use e.g. SetMiddleButtonPressMethod() instead of the more
 // general SetButtonPressMethod().
 
-#ifndef __vtkInteractorStyleUser_h
-#define __vtkInteractorStyleUser_h
+#ifndef vtkInteractorStyleUser_h
+#define vtkInteractorStyleUser_h
 
 #include "vtkInteractionStyleModule.h" // For export macro
 #include "vtkInteractorStyle.h"
diff --git a/Interaction/Style/vtkParallelCoordinatesInteractorStyle.h b/Interaction/Style/vtkParallelCoordinatesInteractorStyle.h
index 3ff88facf65288f49b0a5b8b52be58c133f19ee8..6602589d4ff79fb554b2dd1d736acd84a5aa0883 100644
--- a/Interaction/Style/vtkParallelCoordinatesInteractorStyle.h
+++ b/Interaction/Style/vtkParallelCoordinatesInteractorStyle.h
@@ -40,8 +40,8 @@
 // vtkInteractorStyle vtkInteractorStyleTrackballActor
 // vtkInteractorStyleJoystickCamera vtkInteractorStyleJoystickActor
 
-#ifndef __vtkParallelCoordinatesInteractorStyle_h
-#define __vtkParallelCoordinatesInteractorStyle_h
+#ifndef vtkParallelCoordinatesInteractorStyle_h
+#define vtkParallelCoordinatesInteractorStyle_h
 
 #include "vtkInteractionStyleModule.h" // For export macro
 #include "vtkInteractorStyleTrackballCamera.h"
diff --git a/Interaction/Widgets/vtk3DWidget.h b/Interaction/Widgets/vtk3DWidget.h
index edaa46a8a8a83e231ff6c6e9d114bf1aa59d1706..42792aba554b5a2c67b8208b0d4eb01124c109d9 100644
--- a/Interaction/Widgets/vtk3DWidget.h
+++ b/Interaction/Widgets/vtk3DWidget.h
@@ -50,8 +50,8 @@
 // vtkBoxWidget vtkPlaneWidget vtkLineWidget vtkPointWidget
 // vtkSphereWidget vtkImplicitPlaneWidget
 
-#ifndef __vtk3DWidget_h
-#define __vtk3DWidget_h
+#ifndef vtk3DWidget_h
+#define vtk3DWidget_h
 
 #include "vtkInteractionWidgetsModule.h" // For export macro
 #include "vtkInteractorObserver.h"
diff --git a/Interaction/Widgets/vtkAbstractPolygonalHandleRepresentation3D.h b/Interaction/Widgets/vtkAbstractPolygonalHandleRepresentation3D.h
index b163d3e87fd536185a62813dabf437c63603a223..09411ec2aff1e34874e279cd3ee79ab3b6bef423 100644
--- a/Interaction/Widgets/vtkAbstractPolygonalHandleRepresentation3D.h
+++ b/Interaction/Widgets/vtkAbstractPolygonalHandleRepresentation3D.h
@@ -26,8 +26,8 @@
 // vtkPolygonalHandleRepresentation3D vtkHandleRepresentation vtkHandleWidget
 
 
-#ifndef __vtkAbstractPolygonalHandleRepresentation3D_h
-#define __vtkAbstractPolygonalHandleRepresentation3D_h
+#ifndef vtkAbstractPolygonalHandleRepresentation3D_h
+#define vtkAbstractPolygonalHandleRepresentation3D_h
 
 #include "vtkInteractionWidgetsModule.h" // For export macro
 #include "vtkHandleRepresentation.h"
diff --git a/Interaction/Widgets/vtkAbstractWidget.h b/Interaction/Widgets/vtkAbstractWidget.h
index c8c6da4b34368c50d8ce8c55c67d7b12b8a5dfa2..9caf62de18542d9e546a3c9e8255465ac8d012e9 100644
--- a/Interaction/Widgets/vtkAbstractWidget.h
+++ b/Interaction/Widgets/vtkAbstractWidget.h
@@ -47,8 +47,8 @@
 // vtkWidgetRepresentation vtkWidgetEventTranslator vtkWidgetCallbackMapper
 
 
-#ifndef __vtkAbstractWidget_h
-#define __vtkAbstractWidget_h
+#ifndef vtkAbstractWidget_h
+#define vtkAbstractWidget_h
 
 #include "vtkInteractionWidgetsModule.h" // For export macro
 #include "vtkInteractorObserver.h"
diff --git a/Interaction/Widgets/vtkAffineRepresentation.h b/Interaction/Widgets/vtkAffineRepresentation.h
index f801f1111fadabe50801ba7a345c1b77dc2b8c89..e8de8c9da06635b32d3653eec70e4a4557e475af 100644
--- a/Interaction/Widgets/vtkAffineRepresentation.h
+++ b/Interaction/Widgets/vtkAffineRepresentation.h
@@ -34,8 +34,8 @@
 // vtkAffineWidget vtkWidgetRepresentation vtkAbstractWidget
 
 
-#ifndef __vtkAffineRepresentation_h
-#define __vtkAffineRepresentation_h
+#ifndef vtkAffineRepresentation_h
+#define vtkAffineRepresentation_h
 
 #include "vtkInteractionWidgetsModule.h" // For export macro
 #include "vtkWidgetRepresentation.h"
diff --git a/Interaction/Widgets/vtkAffineRepresentation2D.h b/Interaction/Widgets/vtkAffineRepresentation2D.h
index 51c1aac67b69a28bcafc1d2cba618144bc94a03a..66a027eaf3233cb3c22a2708f34bd19a31d31f66 100644
--- a/Interaction/Widgets/vtkAffineRepresentation2D.h
+++ b/Interaction/Widgets/vtkAffineRepresentation2D.h
@@ -36,8 +36,8 @@
 // vtkAffineRepresentation vtkAffineWidget
 
 
-#ifndef __vtkAffineRepresentation2D_h
-#define __vtkAffineRepresentation2D_h
+#ifndef vtkAffineRepresentation2D_h
+#define vtkAffineRepresentation2D_h
 
 #include "vtkInteractionWidgetsModule.h" // For export macro
 #include "vtkAffineRepresentation.h"
diff --git a/Interaction/Widgets/vtkAffineWidget.h b/Interaction/Widgets/vtkAffineWidget.h
index 986e560da5fc510f6989d2554a1b67d24473d86d..d273f0f5daf5ba434819e4fe36ad15cb15006a53 100644
--- a/Interaction/Widgets/vtkAffineWidget.h
+++ b/Interaction/Widgets/vtkAffineWidget.h
@@ -50,8 +50,8 @@
 // </pre>
 //
 
-#ifndef __vtkAffineWidget_h
-#define __vtkAffineWidget_h
+#ifndef vtkAffineWidget_h
+#define vtkAffineWidget_h
 
 #include "vtkInteractionWidgetsModule.h" // For export macro
 #include "vtkAbstractWidget.h"
diff --git a/Interaction/Widgets/vtkAngleRepresentation.h b/Interaction/Widgets/vtkAngleRepresentation.h
index d8b041547f2d2643949db53ef5cea9727b0ca898..170952dc9e77508d445bd643ed5fa401d9c016a5 100644
--- a/Interaction/Widgets/vtkAngleRepresentation.h
+++ b/Interaction/Widgets/vtkAngleRepresentation.h
@@ -25,8 +25,8 @@
 // vtkAngleWidget vtkHandleRepresentation vtkAngleRepresentation2D
 
 
-#ifndef __vtkAngleRepresentation_h
-#define __vtkAngleRepresentation_h
+#ifndef vtkAngleRepresentation_h
+#define vtkAngleRepresentation_h
 
 #include "vtkInteractionWidgetsModule.h" // For export macro
 #include "vtkWidgetRepresentation.h"
diff --git a/Interaction/Widgets/vtkAngleRepresentation2D.h b/Interaction/Widgets/vtkAngleRepresentation2D.h
index 2d8d9861f4f0261c108898dcb5877bc48e1fa78a..f79ab61d3cbeac73e458195b46f5b5b5ddc21279 100644
--- a/Interaction/Widgets/vtkAngleRepresentation2D.h
+++ b/Interaction/Widgets/vtkAngleRepresentation2D.h
@@ -26,8 +26,8 @@
 // vtkAngleWidget vtkHandleRepresentation
 
 
-#ifndef __vtkAngleRepresentation2D_h
-#define __vtkAngleRepresentation2D_h
+#ifndef vtkAngleRepresentation2D_h
+#define vtkAngleRepresentation2D_h
 
 #include "vtkInteractionWidgetsModule.h" // For export macro
 #include "vtkAngleRepresentation.h"
diff --git a/Interaction/Widgets/vtkAngleRepresentation3D.h b/Interaction/Widgets/vtkAngleRepresentation3D.h
index bffecb210a324f693f251363beb0f92e324b1f07..f7e7d4fed235f1e9aa1e94cb4cc366e748b04bc2 100644
--- a/Interaction/Widgets/vtkAngleRepresentation3D.h
+++ b/Interaction/Widgets/vtkAngleRepresentation3D.h
@@ -26,8 +26,8 @@
 // vtkAngleWidget vtkHandleRepresentation
 
 
-#ifndef __vtkAngleRepresentation3D_h
-#define __vtkAngleRepresentation3D_h
+#ifndef vtkAngleRepresentation3D_h
+#define vtkAngleRepresentation3D_h
 
 #include "vtkInteractionWidgetsModule.h" // For export macro
 #include "vtkAngleRepresentation.h"
diff --git a/Interaction/Widgets/vtkAngleWidget.h b/Interaction/Widgets/vtkAngleWidget.h
index 9be11435a0752542e95cdd566068075de54609a6..edc349d1fd9b7b82d4e116af9c801fdf30c8b3ba 100644
--- a/Interaction/Widgets/vtkAngleWidget.h
+++ b/Interaction/Widgets/vtkAngleWidget.h
@@ -64,8 +64,8 @@
 // vtkHandleWidget vtkDistanceWidget
 
 
-#ifndef __vtkAngleWidget_h
-#define __vtkAngleWidget_h
+#ifndef vtkAngleWidget_h
+#define vtkAngleWidget_h
 
 #include "vtkInteractionWidgetsModule.h" // For export macro
 #include "vtkAbstractWidget.h"
diff --git a/Interaction/Widgets/vtkAxesTransformRepresentation.h b/Interaction/Widgets/vtkAxesTransformRepresentation.h
index 8e353db1fc84090d2b269bf25cbd43509863e26b..6b0c30555cecebcf1589e1faad8693d0312c77bc 100644
--- a/Interaction/Widgets/vtkAxesTransformRepresentation.h
+++ b/Interaction/Widgets/vtkAxesTransformRepresentation.h
@@ -24,8 +24,8 @@
 // vtkDistanceWidget vtkDistanceRepresentation vtkDistanceRepresentation2D
 
 
-#ifndef __vtkAxesTransformRepresentation_h
-#define __vtkAxesTransformRepresentation_h
+#ifndef vtkAxesTransformRepresentation_h
+#define vtkAxesTransformRepresentation_h
 
 #include "vtkInteractionWidgetsModule.h" // For export macro
 #include "vtkWidgetRepresentation.h"
diff --git a/Interaction/Widgets/vtkAxesTransformWidget.h b/Interaction/Widgets/vtkAxesTransformWidget.h
index 11430e8360b48e633973e4bb40a23260c22f4db4..2eacb7ea74b83711a1dc4bb07886228d359d6686 100644
--- a/Interaction/Widgets/vtkAxesTransformWidget.h
+++ b/Interaction/Widgets/vtkAxesTransformWidget.h
@@ -72,8 +72,8 @@
 // .SECTION See Also
 // vtkAxesTransformRepresentation vtkAffineWidget vtkBoxWidget2
 
-#ifndef __vtkAxesTransformWidget_h
-#define __vtkAxesTransformWidget_h
+#ifndef vtkAxesTransformWidget_h
+#define vtkAxesTransformWidget_h
 
 #include "vtkInteractionWidgetsModule.h" // For export macro
 #include "vtkAbstractWidget.h"
diff --git a/Interaction/Widgets/vtkBalloonRepresentation.h b/Interaction/Widgets/vtkBalloonRepresentation.h
index 9041467926a017cbdee60daae25da71f3cb4abbe..641c582ff34711002f0e20583346f6bc5837c77f 100644
--- a/Interaction/Widgets/vtkBalloonRepresentation.h
+++ b/Interaction/Widgets/vtkBalloonRepresentation.h
@@ -49,8 +49,8 @@
 // vtkBalloonWidget
 
 
-#ifndef __vtkBalloonRepresentation_h
-#define __vtkBalloonRepresentation_h
+#ifndef vtkBalloonRepresentation_h
+#define vtkBalloonRepresentation_h
 
 #include "vtkInteractionWidgetsModule.h" // For export macro
 #include "vtkWidgetRepresentation.h"
diff --git a/Interaction/Widgets/vtkBalloonWidget.h b/Interaction/Widgets/vtkBalloonWidget.h
index cfc074ab0d6ba76cac3b2a690340550daaec4b46..c57f59e00248acd0390150d7677289636ab6ce4c 100644
--- a/Interaction/Widgets/vtkBalloonWidget.h
+++ b/Interaction/Widgets/vtkBalloonWidget.h
@@ -64,8 +64,8 @@
 // vtkAbstractWidget
 
 
-#ifndef __vtkBalloonWidget_h
-#define __vtkBalloonWidget_h
+#ifndef vtkBalloonWidget_h
+#define vtkBalloonWidget_h
 
 #include "vtkInteractionWidgetsModule.h" // For export macro
 #include "vtkHoverWidget.h"
diff --git a/Interaction/Widgets/vtkBezierContourLineInterpolator.h b/Interaction/Widgets/vtkBezierContourLineInterpolator.h
index a4de0e466993a711ec86f2319e13bc370b2435c3..3745189fee18bb85688e3c1a192ccc6829f86772 100644
--- a/Interaction/Widgets/vtkBezierContourLineInterpolator.h
+++ b/Interaction/Widgets/vtkBezierContourLineInterpolator.h
@@ -21,8 +21,8 @@
 // .SECTION See Also
 // vtkContourLineInterpolator
 
-#ifndef __vtkBezierContourLineInterpolator_h
-#define __vtkBezierContourLineInterpolator_h
+#ifndef vtkBezierContourLineInterpolator_h
+#define vtkBezierContourLineInterpolator_h
 
 #include "vtkInteractionWidgetsModule.h" // For export macro
 #include "vtkContourLineInterpolator.h"
diff --git a/Interaction/Widgets/vtkBiDimensionalRepresentation.h b/Interaction/Widgets/vtkBiDimensionalRepresentation.h
index bc46a14be1106f1c399ba319a99497318f29b863..a1b81a0089cbd450bbb62cfcb87642a064900515 100644
--- a/Interaction/Widgets/vtkBiDimensionalRepresentation.h
+++ b/Interaction/Widgets/vtkBiDimensionalRepresentation.h
@@ -38,8 +38,8 @@
 // vtkAngleWidget vtkHandleRepresentation vtkBiDimensionalRepresentation2D
 
 
-#ifndef __vtkBiDimensionalRepresentation_h
-#define __vtkBiDimensionalRepresentation_h
+#ifndef vtkBiDimensionalRepresentation_h
+#define vtkBiDimensionalRepresentation_h
 
 #include "vtkInteractionWidgetsModule.h" // For export macro
 #include "vtkWidgetRepresentation.h"
diff --git a/Interaction/Widgets/vtkBiDimensionalRepresentation2D.h b/Interaction/Widgets/vtkBiDimensionalRepresentation2D.h
index 7e6b2d2162df6e6d4267cb0a650bac07ee3b5e5b..71ec5917cc6241980ecf961c557d1f5ef61ba3db 100644
--- a/Interaction/Widgets/vtkBiDimensionalRepresentation2D.h
+++ b/Interaction/Widgets/vtkBiDimensionalRepresentation2D.h
@@ -36,8 +36,8 @@
 // vtkAngleWidget vtkHandleRepresentation vtkBiDimensionalRepresentation
 
 
-#ifndef __vtkBiDimensionalRepresentation2D_h
-#define __vtkBiDimensionalRepresentation2D_h
+#ifndef vtkBiDimensionalRepresentation2D_h
+#define vtkBiDimensionalRepresentation2D_h
 
 #include "vtkInteractionWidgetsModule.h" // For export macro
 #include "vtkBiDimensionalRepresentation.h"
diff --git a/Interaction/Widgets/vtkBiDimensionalWidget.h b/Interaction/Widgets/vtkBiDimensionalWidget.h
index 29930cac46b9f6d240b4e2f94d72e0b3889239a6..7bc66db00e359de087464efaa3bc8b3516e27319 100644
--- a/Interaction/Widgets/vtkBiDimensionalWidget.h
+++ b/Interaction/Widgets/vtkBiDimensionalWidget.h
@@ -87,8 +87,8 @@
 // vtkHandleWidget vtkDistanceWidget
 
 
-#ifndef __vtkBiDimensionalWidget_h
-#define __vtkBiDimensionalWidget_h
+#ifndef vtkBiDimensionalWidget_h
+#define vtkBiDimensionalWidget_h
 
 #include "vtkInteractionWidgetsModule.h" // For export macro
 #include "vtkAbstractWidget.h"
diff --git a/Interaction/Widgets/vtkBorderRepresentation.h b/Interaction/Widgets/vtkBorderRepresentation.h
index 58c43469b6b6c0e0c42ba0b42375d268648cffa3..226e1bd466a0377201c7893ac917130160c626c1 100644
--- a/Interaction/Widgets/vtkBorderRepresentation.h
+++ b/Interaction/Widgets/vtkBorderRepresentation.h
@@ -34,8 +34,8 @@
 // vtkBorderWidget vtkTextWidget
 
 
-#ifndef __vtkBorderRepresentation_h
-#define __vtkBorderRepresentation_h
+#ifndef vtkBorderRepresentation_h
+#define vtkBorderRepresentation_h
 
 #include "vtkInteractionWidgetsModule.h" // For export macro
 #include "vtkWidgetRepresentation.h"
diff --git a/Interaction/Widgets/vtkBorderWidget.h b/Interaction/Widgets/vtkBorderWidget.h
index 0b11390ad506b73e84c27ab9e082303513d47353..c0f94cfdd9998597b669ab4de21ce7a77588903d 100644
--- a/Interaction/Widgets/vtkBorderWidget.h
+++ b/Interaction/Widgets/vtkBorderWidget.h
@@ -66,8 +66,8 @@
 // vtkInteractorObserver vtkCameraInterpolator
 
 
-#ifndef __vtkBorderWidget_h
-#define __vtkBorderWidget_h
+#ifndef vtkBorderWidget_h
+#define vtkBorderWidget_h
 
 #include "vtkInteractionWidgetsModule.h" // For export macro
 #include "vtkAbstractWidget.h"
diff --git a/Interaction/Widgets/vtkBoundedPlanePointPlacer.h b/Interaction/Widgets/vtkBoundedPlanePointPlacer.h
index 407b81e7189252c81e104ee6b3a0ab5b952ccb1b..9b4b65325e83cd555bba83f09b68860ce23edde9 100644
--- a/Interaction/Widgets/vtkBoundedPlanePointPlacer.h
+++ b/Interaction/Widgets/vtkBoundedPlanePointPlacer.h
@@ -20,8 +20,8 @@
 // .SECTION See Also
 // vtkPointPlacer vtkHandleWidget vtkHandleRepresentation
 
-#ifndef __vtkBoundedPlanePointPlacer_h
-#define __vtkBoundedPlanePointPlacer_h
+#ifndef vtkBoundedPlanePointPlacer_h
+#define vtkBoundedPlanePointPlacer_h
 
 #include "vtkInteractionWidgetsModule.h" // For export macro
 #include "vtkPointPlacer.h"
diff --git a/Interaction/Widgets/vtkBoxRepresentation.h b/Interaction/Widgets/vtkBoxRepresentation.h
index 64a1194abd127af26df6ce7051c1a2bb72175727..c2777931358f6195a7190d60babd3b58911b238c 100644
--- a/Interaction/Widgets/vtkBoxRepresentation.h
+++ b/Interaction/Widgets/vtkBoxRepresentation.h
@@ -31,8 +31,8 @@
 // vtkBoxWidget2 vtkBoxWidget
 
 
-#ifndef __vtkBoxRepresentation_h
-#define __vtkBoxRepresentation_h
+#ifndef vtkBoxRepresentation_h
+#define vtkBoxRepresentation_h
 
 #include "vtkInteractionWidgetsModule.h" // For export macro
 #include "vtkWidgetRepresentation.h"
diff --git a/Interaction/Widgets/vtkBoxWidget.h b/Interaction/Widgets/vtkBoxWidget.h
index 892c6004508bd13db5b315a7015afffa0f307fad..62363e11db7fa0fe3de4805aecd4d83bf3719929 100644
--- a/Interaction/Widgets/vtkBoxWidget.h
+++ b/Interaction/Widgets/vtkBoxWidget.h
@@ -69,8 +69,8 @@
 // vtk3DWidget vtkPointWidget vtkLineWidget vtkPlaneWidget
 // vtkImplicitPlaneWidget vtkImagePlaneWidget
 
-#ifndef __vtkBoxWidget_h
-#define __vtkBoxWidget_h
+#ifndef vtkBoxWidget_h
+#define vtkBoxWidget_h
 
 #include "vtkInteractionWidgetsModule.h" // For export macro
 #include "vtk3DWidget.h"
diff --git a/Interaction/Widgets/vtkBoxWidget2.h b/Interaction/Widgets/vtkBoxWidget2.h
index 8091a92865cf93424b8ed921c86caa56240ba4c4..04b363376b8c5c177e2ec25438efce7c86a6765c 100644
--- a/Interaction/Widgets/vtkBoxWidget2.h
+++ b/Interaction/Widgets/vtkBoxWidget2.h
@@ -84,8 +84,8 @@
 // .SECTION See Also
 // vtkBoxRepresentation vtkBoxWidget
 
-#ifndef __vtkBoxWidget2_h
-#define __vtkBoxWidget2_h
+#ifndef vtkBoxWidget2_h
+#define vtkBoxWidget2_h
 
 #include "vtkInteractionWidgetsModule.h" // For export macro
 #include "vtkAbstractWidget.h"
diff --git a/Interaction/Widgets/vtkBrokenLineWidget.h b/Interaction/Widgets/vtkBrokenLineWidget.h
index a693812861259120983987cc4da0038fc27b75ce..817602230680c60fa00cb94b817d557911da2df0 100644
--- a/Interaction/Widgets/vtkBrokenLineWidget.h
+++ b/Interaction/Widgets/vtkBrokenLineWidget.h
@@ -77,8 +77,8 @@
 // vtkImagePlaneWidget vtkImplicitPlaneWidget vtkPlaneWidget
 
 
-#ifndef __vtkBrokenLineWidget_h
-#define __vtkBrokenLineWidget_h
+#ifndef vtkBrokenLineWidget_h
+#define vtkBrokenLineWidget_h
 
 #include "vtkInteractionWidgetsModule.h" // For export macro
 #include "vtk3DWidget.h"
diff --git a/Interaction/Widgets/vtkButtonRepresentation.h b/Interaction/Widgets/vtkButtonRepresentation.h
index 26f3f84525a72df4787706017f84af1c0e9dd8b8..7a0f698582ca84bba35fca1a197a6c2b1b676a57 100644
--- a/Interaction/Widgets/vtkButtonRepresentation.h
+++ b/Interaction/Widgets/vtkButtonRepresentation.h
@@ -33,8 +33,8 @@
 // vtkButtonWidget
 
 
-#ifndef __vtkButtonRepresentation_h
-#define __vtkButtonRepresentation_h
+#ifndef vtkButtonRepresentation_h
+#define vtkButtonRepresentation_h
 
 #include "vtkInteractionWidgetsModule.h" // For export macro
 #include "vtkWidgetRepresentation.h"
diff --git a/Interaction/Widgets/vtkButtonWidget.h b/Interaction/Widgets/vtkButtonWidget.h
index 7fd39f58f05a2b858beb9360a3b0e09c47364fb4..074d03b8220166f9e091b7b099ff367c9c3136cb 100644
--- a/Interaction/Widgets/vtkButtonWidget.h
+++ b/Interaction/Widgets/vtkButtonWidget.h
@@ -47,8 +47,8 @@
 // </pre>
 //
 
-#ifndef __vtkButtonWidget_h
-#define __vtkButtonWidget_h
+#ifndef vtkButtonWidget_h
+#define vtkButtonWidget_h
 
 #include "vtkInteractionWidgetsModule.h" // For export macro
 #include "vtkAbstractWidget.h"
diff --git a/Interaction/Widgets/vtkCameraRepresentation.h b/Interaction/Widgets/vtkCameraRepresentation.h
index c1f12c97d6ffbe04bf7c3cb5474932d1185f0c8d..69e74d29f7b9956be7eeb61c255fba03275ecafc 100644
--- a/Interaction/Widgets/vtkCameraRepresentation.h
+++ b/Interaction/Widgets/vtkCameraRepresentation.h
@@ -25,8 +25,8 @@
 // vtkCameraWidget vtkCameraInterpolator
 
 
-#ifndef __vtkCameraRepresentation_h
-#define __vtkCameraRepresentation_h
+#ifndef vtkCameraRepresentation_h
+#define vtkCameraRepresentation_h
 
 #include "vtkInteractionWidgetsModule.h" // For export macro
 #include "vtkBorderRepresentation.h"
diff --git a/Interaction/Widgets/vtkCameraWidget.h b/Interaction/Widgets/vtkCameraWidget.h
index 85fe5276b46fafad73b3ef295663423891ebcea2..7dc5478c4434c91f579c15796911d6f8a64e365a 100644
--- a/Interaction/Widgets/vtkCameraWidget.h
+++ b/Interaction/Widgets/vtkCameraWidget.h
@@ -27,8 +27,8 @@
 // vtkBorderWidget vtkCameraInterpolator
 
 
-#ifndef __vtkCameraWidget_h
-#define __vtkCameraWidget_h
+#ifndef vtkCameraWidget_h
+#define vtkCameraWidget_h
 
 #include "vtkInteractionWidgetsModule.h" // For export macro
 #include "vtkBorderWidget.h"
diff --git a/Interaction/Widgets/vtkCaptionRepresentation.h b/Interaction/Widgets/vtkCaptionRepresentation.h
index 099064a0a2029ebc4536dfbcca34f52e8ad11ec3..16aa144d430d877ca1122fe340002d7773c75402 100644
--- a/Interaction/Widgets/vtkCaptionRepresentation.h
+++ b/Interaction/Widgets/vtkCaptionRepresentation.h
@@ -31,8 +31,8 @@
 // vtkCaptionWidget vtkBorderWidget vtkBorderRepresentation vtkCaptionActor
 
 
-#ifndef __vtkCaptionRepresentation_h
-#define __vtkCaptionRepresentation_h
+#ifndef vtkCaptionRepresentation_h
+#define vtkCaptionRepresentation_h
 
 #include "vtkInteractionWidgetsModule.h" // For export macro
 #include "vtkBorderRepresentation.h"
diff --git a/Interaction/Widgets/vtkCaptionWidget.h b/Interaction/Widgets/vtkCaptionWidget.h
index 3934e0d8e4e86fdcbca03a9d579efa5fd052f6de..d9c99fb6e2e6bbe21fbf61ea5dc28b3038ab8dd7 100644
--- a/Interaction/Widgets/vtkCaptionWidget.h
+++ b/Interaction/Widgets/vtkCaptionWidget.h
@@ -33,8 +33,8 @@
 // vtkBorderWidget vtkTextWidget
 
 
-#ifndef __vtkCaptionWidget_h
-#define __vtkCaptionWidget_h
+#ifndef vtkCaptionWidget_h
+#define vtkCaptionWidget_h
 
 #include "vtkInteractionWidgetsModule.h" // For export macro
 #include "vtkBorderWidget.h"
diff --git a/Interaction/Widgets/vtkCellCentersPointPlacer.h b/Interaction/Widgets/vtkCellCentersPointPlacer.h
index ad48a0dc817295579b37c4185a704e7bec38b8c0..6e27de45134ad9bfc3c3dc34aa28b4c20746d70e 100644
--- a/Interaction/Widgets/vtkCellCentersPointPlacer.h
+++ b/Interaction/Widgets/vtkCellCentersPointPlacer.h
@@ -32,8 +32,8 @@
 // .SECTION See Also
 // vtkPointPlacer
 
-#ifndef __vtkCellCentersPointPlacer_h
-#define __vtkCellCentersPointPlacer_h
+#ifndef vtkCellCentersPointPlacer_h
+#define vtkCellCentersPointPlacer_h
 
 #include "vtkInteractionWidgetsModule.h" // For export macro
 #include "vtkPointPlacer.h"
diff --git a/Interaction/Widgets/vtkCenteredSliderRepresentation.h b/Interaction/Widgets/vtkCenteredSliderRepresentation.h
index b64ebe82a10ac46e9c870f1676a77b6c8cc17e52..b69b3621a56cf1d84f8c9dc951f53f432f168fce 100644
--- a/Interaction/Widgets/vtkCenteredSliderRepresentation.h
+++ b/Interaction/Widgets/vtkCenteredSliderRepresentation.h
@@ -31,8 +31,8 @@
 // vtkSliderWidget
 
 
-#ifndef __vtkCenteredSliderRepresentation_h
-#define __vtkCenteredSliderRepresentation_h
+#ifndef vtkCenteredSliderRepresentation_h
+#define vtkCenteredSliderRepresentation_h
 
 #include "vtkInteractionWidgetsModule.h" // For export macro
 #include "vtkSliderRepresentation.h"
diff --git a/Interaction/Widgets/vtkCenteredSliderWidget.h b/Interaction/Widgets/vtkCenteredSliderWidget.h
index 82048816eb93ed6e46fd7bdfcad40e825d67bf04..71b03c698f01c79e47d9956cd146c688f5c998d6 100644
--- a/Interaction/Widgets/vtkCenteredSliderWidget.h
+++ b/Interaction/Widgets/vtkCenteredSliderWidget.h
@@ -63,8 +63,8 @@
 // </pre>
 //
 
-#ifndef __vtkCenteredSliderWidget_h
-#define __vtkCenteredSliderWidget_h
+#ifndef vtkCenteredSliderWidget_h
+#define vtkCenteredSliderWidget_h
 
 #include "vtkInteractionWidgetsModule.h" // For export macro
 #include "vtkAbstractWidget.h"
diff --git a/Interaction/Widgets/vtkCheckerboardRepresentation.h b/Interaction/Widgets/vtkCheckerboardRepresentation.h
index 20729d1e138d18e10fcccb680b7e76709ae85f22..33ca4ce20305a2412803cd36a02fc5fe0b4423ab 100644
--- a/Interaction/Widgets/vtkCheckerboardRepresentation.h
+++ b/Interaction/Widgets/vtkCheckerboardRepresentation.h
@@ -27,8 +27,8 @@
 // vtkRectilinearWipeWidget
 
 
-#ifndef __vtkCheckerboardRepresentation_h
-#define __vtkCheckerboardRepresentation_h
+#ifndef vtkCheckerboardRepresentation_h
+#define vtkCheckerboardRepresentation_h
 
 #include "vtkInteractionWidgetsModule.h" // For export macro
 #include "vtkWidgetRepresentation.h"
diff --git a/Interaction/Widgets/vtkCheckerboardWidget.h b/Interaction/Widgets/vtkCheckerboardWidget.h
index 1974653e75a4cedd0b0ea9f6cf29fdb5c318d162..9aa0c3e47b003b93ef2708b4732e32317b95f022 100644
--- a/Interaction/Widgets/vtkCheckerboardWidget.h
+++ b/Interaction/Widgets/vtkCheckerboardWidget.h
@@ -41,8 +41,8 @@
 // vtkImageCheckerboard vtkImageActor vtkSliderWidget vtkRectilinearWipeWidget
 
 
-#ifndef __vtkCheckerboardWidget_h
-#define __vtkCheckerboardWidget_h
+#ifndef vtkCheckerboardWidget_h
+#define vtkCheckerboardWidget_h
 
 #include "vtkInteractionWidgetsModule.h" // For export macro
 #include "vtkAbstractWidget.h"
diff --git a/Interaction/Widgets/vtkClosedSurfacePointPlacer.h b/Interaction/Widgets/vtkClosedSurfacePointPlacer.h
index 0155fd0ef39352110bd44ebae12b4b77054660f1..a5b197d7c199bee04f367bfce19f30dbf872f99c 100644
--- a/Interaction/Widgets/vtkClosedSurfacePointPlacer.h
+++ b/Interaction/Widgets/vtkClosedSurfacePointPlacer.h
@@ -22,8 +22,8 @@
 // .SECTION See Also
 // vtkParallelopipedRepresentation
 
-#ifndef __vtkClosedSurfacePointPlacer_h
-#define __vtkClosedSurfacePointPlacer_h
+#ifndef vtkClosedSurfacePointPlacer_h
+#define vtkClosedSurfacePointPlacer_h
 
 #include "vtkInteractionWidgetsModule.h" // For export macro
 #include "vtkPointPlacer.h"
diff --git a/Interaction/Widgets/vtkConstrainedPointHandleRepresentation.h b/Interaction/Widgets/vtkConstrainedPointHandleRepresentation.h
index 57fdd2be0980e443c89ff5e296a57e9d0d7e0a75..70c59f36311d8bad5f2cfd35286daf1c2c22ced7 100644
--- a/Interaction/Widgets/vtkConstrainedPointHandleRepresentation.h
+++ b/Interaction/Widgets/vtkConstrainedPointHandleRepresentation.h
@@ -32,8 +32,8 @@
 // vtkHandleRepresentation vtkHandleWidget
 
 
-#ifndef __vtkConstrainedPointHandleRepresentation_h
-#define __vtkConstrainedPointHandleRepresentation_h
+#ifndef vtkConstrainedPointHandleRepresentation_h
+#define vtkConstrainedPointHandleRepresentation_h
 
 #include "vtkInteractionWidgetsModule.h" // For export macro
 #include "vtkHandleRepresentation.h"
diff --git a/Interaction/Widgets/vtkContinuousValueWidget.h b/Interaction/Widgets/vtkContinuousValueWidget.h
index 6d97271c5a3598607525105cff501cc0dfc077ba..7f42e680e084e4b92ede8ffa32e814f4f46d17fe 100644
--- a/Interaction/Widgets/vtkContinuousValueWidget.h
+++ b/Interaction/Widgets/vtkContinuousValueWidget.h
@@ -56,8 +56,8 @@
 // </pre>
 //
 
-#ifndef __vtkContinuousValueWidget_h
-#define __vtkContinuousValueWidget_h
+#ifndef vtkContinuousValueWidget_h
+#define vtkContinuousValueWidget_h
 
 #include "vtkInteractionWidgetsModule.h" // For export macro
 #include "vtkAbstractWidget.h"
diff --git a/Interaction/Widgets/vtkContinuousValueWidgetRepresentation.h b/Interaction/Widgets/vtkContinuousValueWidgetRepresentation.h
index a2920c1a3b97ae66ef90897c45074381595ddfea..b448a981d9e11824f1cda187c02ed090e3bbb457 100644
--- a/Interaction/Widgets/vtkContinuousValueWidgetRepresentation.h
+++ b/Interaction/Widgets/vtkContinuousValueWidgetRepresentation.h
@@ -25,8 +25,8 @@
 //
 
 
-#ifndef __vtkContinuousValueWidgetRepresentation_h
-#define __vtkContinuousValueWidgetRepresentation_h
+#ifndef vtkContinuousValueWidgetRepresentation_h
+#define vtkContinuousValueWidgetRepresentation_h
 
 #include "vtkInteractionWidgetsModule.h" // For export macro
 #include "vtkWidgetRepresentation.h"
diff --git a/Interaction/Widgets/vtkContourLineInterpolator.h b/Interaction/Widgets/vtkContourLineInterpolator.h
index 9eb5e63365e65964728bfe01b71f561a6b8f9cff..e1b5e6bcd4ce8a88eaa49cb65cda2a64c218fbbf 100644
--- a/Interaction/Widgets/vtkContourLineInterpolator.h
+++ b/Interaction/Widgets/vtkContourLineInterpolator.h
@@ -28,8 +28,8 @@
 //
 // .SECTION See Also
 
-#ifndef __vtkContourLineInterpolator_h
-#define __vtkContourLineInterpolator_h
+#ifndef vtkContourLineInterpolator_h
+#define vtkContourLineInterpolator_h
 
 #include "vtkInteractionWidgetsModule.h" // For export macro
 #include "vtkObject.h"
diff --git a/Interaction/Widgets/vtkContourRepresentation.h b/Interaction/Widgets/vtkContourRepresentation.h
index 358124ead6192643035eadb7d08730aceb7c1604..54283dd8fb17a88caf93db60bba0cf144d72ed6b 100644
--- a/Interaction/Widgets/vtkContourRepresentation.h
+++ b/Interaction/Widgets/vtkContourRepresentation.h
@@ -50,8 +50,8 @@
 // vtkContourWidget
 
 
-#ifndef __vtkContourRepresentation_h
-#define __vtkContourRepresentation_h
+#ifndef vtkContourRepresentation_h
+#define vtkContourRepresentation_h
 
 #include "vtkInteractionWidgetsModule.h" // For export macro
 #include "vtkWidgetRepresentation.h"
diff --git a/Interaction/Widgets/vtkContourWidget.h b/Interaction/Widgets/vtkContourWidget.h
index af2d255b8ff1bef4d6ce743308bf46b755ea81c5..76ce2e9ac2c64f76d056d874abb30fd509975331 100644
--- a/Interaction/Widgets/vtkContourWidget.h
+++ b/Interaction/Widgets/vtkContourWidget.h
@@ -111,8 +111,8 @@
 // vtkHandleWidget
 
 
-#ifndef __vtkContourWidget_h
-#define __vtkContourWidget_h
+#ifndef vtkContourWidget_h
+#define vtkContourWidget_h
 
 #include "vtkInteractionWidgetsModule.h" // For export macro
 #include "vtkAbstractWidget.h"
diff --git a/Interaction/Widgets/vtkDijkstraImageContourLineInterpolator.h b/Interaction/Widgets/vtkDijkstraImageContourLineInterpolator.h
index 0be52ed89032aa35db402b123dcc92a1937a0b0f..b76de305881890fa7900ed60a0f1706436020a9e 100644
--- a/Interaction/Widgets/vtkDijkstraImageContourLineInterpolator.h
+++ b/Interaction/Widgets/vtkDijkstraImageContourLineInterpolator.h
@@ -33,8 +33,8 @@
 // vtkContourWidget vtkContourLineInterpolator vtkDijkstraImageGeodesicPath
 
 
-#ifndef __vtkDijkstraImageContourLineInterpolator_h
-#define __vtkDijkstraImageContourLineInterpolator_h
+#ifndef vtkDijkstraImageContourLineInterpolator_h
+#define vtkDijkstraImageContourLineInterpolator_h
 
 #include "vtkInteractionWidgetsModule.h" // For export macro
 #include "vtkContourLineInterpolator.h"
diff --git a/Interaction/Widgets/vtkDistanceRepresentation.h b/Interaction/Widgets/vtkDistanceRepresentation.h
index ad9901bcffca5c6ca00e8c88491fa3d716728aad..8ef25bbf9f380d0446d60168fc6f4c2a5102aef9 100644
--- a/Interaction/Widgets/vtkDistanceRepresentation.h
+++ b/Interaction/Widgets/vtkDistanceRepresentation.h
@@ -22,8 +22,8 @@
 // vtkDistanceWidget vtkHandleRepresentation vtkDistanceRepresentation2D vtkDistanceRepresentation
 
 
-#ifndef __vtkDistanceRepresentation_h
-#define __vtkDistanceRepresentation_h
+#ifndef vtkDistanceRepresentation_h
+#define vtkDistanceRepresentation_h
 
 #include "vtkInteractionWidgetsModule.h" // For export macro
 #include "vtkWidgetRepresentation.h"
diff --git a/Interaction/Widgets/vtkDistanceRepresentation2D.h b/Interaction/Widgets/vtkDistanceRepresentation2D.h
index d6353268cab68bd964e827a30d66e6ea97c73284..3acb4a68ba837b1de43d6fa39359b1c9bf9f9ef6 100644
--- a/Interaction/Widgets/vtkDistanceRepresentation2D.h
+++ b/Interaction/Widgets/vtkDistanceRepresentation2D.h
@@ -26,8 +26,8 @@
 // vtkDistanceWidget vtkDistanceRepresentation vtkDistanceRepresentation3D
 
 
-#ifndef __vtkDistanceRepresentation2D_h
-#define __vtkDistanceRepresentation2D_h
+#ifndef vtkDistanceRepresentation2D_h
+#define vtkDistanceRepresentation2D_h
 
 #include "vtkInteractionWidgetsModule.h" // For export macro
 #include "vtkDistanceRepresentation.h"
diff --git a/Interaction/Widgets/vtkDistanceRepresentation3D.h b/Interaction/Widgets/vtkDistanceRepresentation3D.h
index 2c4384c541b83071e14b2ca9e50d041ad84f3535..90d5987af86f58481490fbdde8833b4991fb8247 100644
--- a/Interaction/Widgets/vtkDistanceRepresentation3D.h
+++ b/Interaction/Widgets/vtkDistanceRepresentation3D.h
@@ -24,8 +24,8 @@
 // vtkDistanceWidget vtkDistanceRepresentation vtkDistanceRepresentation2D
 
 
-#ifndef __vtkDistanceRepresentation3D_h
-#define __vtkDistanceRepresentation3D_h
+#ifndef vtkDistanceRepresentation3D_h
+#define vtkDistanceRepresentation3D_h
 
 #include "vtkInteractionWidgetsModule.h" // For export macro
 #include "vtkDistanceRepresentation.h"
diff --git a/Interaction/Widgets/vtkDistanceWidget.h b/Interaction/Widgets/vtkDistanceWidget.h
index 2eb067ce6574deb702a365eea79d7e2a0ade04a8..c7e325988b55d7ce1a7507d39150f8cb4e16591c 100644
--- a/Interaction/Widgets/vtkDistanceWidget.h
+++ b/Interaction/Widgets/vtkDistanceWidget.h
@@ -62,8 +62,8 @@
 // vtkHandleWidget
 
 
-#ifndef __vtkDistanceWidget_h
-#define __vtkDistanceWidget_h
+#ifndef vtkDistanceWidget_h
+#define vtkDistanceWidget_h
 
 #include "vtkInteractionWidgetsModule.h" // For export macro
 #include "vtkAbstractWidget.h"
diff --git a/Interaction/Widgets/vtkEllipsoidTensorProbeRepresentation.h b/Interaction/Widgets/vtkEllipsoidTensorProbeRepresentation.h
index e25336ff17cbd3590ce787c48fd0b83639f915cd..41119ca35595f55a86a3b0b48cc5590c3f54f50b 100644
--- a/Interaction/Widgets/vtkEllipsoidTensorProbeRepresentation.h
+++ b/Interaction/Widgets/vtkEllipsoidTensorProbeRepresentation.h
@@ -22,8 +22,8 @@
 // .SECTION See Also
 // vtkTensorProbeWidget
 
-#ifndef __vtkEllipsoidTensorProbeRepresentation_h
-#define __vtkEllipsoidTensorProbeRepresentation_h
+#ifndef vtkEllipsoidTensorProbeRepresentation_h
+#define vtkEllipsoidTensorProbeRepresentation_h
 
 #include "vtkInteractionWidgetsModule.h" // For export macro
 #include "vtkTensorProbeRepresentation.h"
diff --git a/Interaction/Widgets/vtkEvent.h b/Interaction/Widgets/vtkEvent.h
index c43df02ce005b145e7fdbd9a92e8c762ad4d2150..67b3d7130e02523ef3a8bfa52cce21785eb52ee4 100644
--- a/Interaction/Widgets/vtkEvent.h
+++ b/Interaction/Widgets/vtkEvent.h
@@ -18,8 +18,8 @@
 // widgets to help specify the mapping between VTK events and widget events.
 
 
-#ifndef __vtkEvent_h
-#define __vtkEvent_h
+#ifndef vtkEvent_h
+#define vtkEvent_h
 
 #include "vtkInteractionWidgetsModule.h" // For export macro
 #include "vtkObject.h"
diff --git a/Interaction/Widgets/vtkFixedSizeHandleRepresentation3D.h b/Interaction/Widgets/vtkFixedSizeHandleRepresentation3D.h
index c9035fceede8316b5ac788b6d7fa731d249cbd22..b000572f8e4bdbe5ad006e50ac241da2d8fce945 100644
--- a/Interaction/Widgets/vtkFixedSizeHandleRepresentation3D.h
+++ b/Interaction/Widgets/vtkFixedSizeHandleRepresentation3D.h
@@ -30,8 +30,8 @@
 // .SECTION See Also
 // vtkHandleRepresentation vtkHandleWidget
 
-#ifndef __vtkFixedSizeHandleRepresentation3D_h
-#define __vtkFixedSizeHandleRepresentation3D_h
+#ifndef vtkFixedSizeHandleRepresentation3D_h
+#define vtkFixedSizeHandleRepresentation3D_h
 
 #include "vtkInteractionWidgetsModule.h" // For export macro
 #include "vtkPolygonalHandleRepresentation3D.h"
diff --git a/Interaction/Widgets/vtkFocalPlaneContourRepresentation.h b/Interaction/Widgets/vtkFocalPlaneContourRepresentation.h
index 5b81fa1b8c6cb0724265e9fee1f01606edebbd35..3bddb0e1b2517f367f8643f6908acef0630c962a 100644
--- a/Interaction/Widgets/vtkFocalPlaneContourRepresentation.h
+++ b/Interaction/Widgets/vtkFocalPlaneContourRepresentation.h
@@ -27,8 +27,8 @@
 // .SECTION See Also
 // vtkContourWidget vtkHandleRepresentation vtkContourRepresentation
 
-#ifndef __vtkFocalPlaneContourRepresentation_h
-#define __vtkFocalPlaneContourRepresentation_h
+#ifndef vtkFocalPlaneContourRepresentation_h
+#define vtkFocalPlaneContourRepresentation_h
 
 #include "vtkInteractionWidgetsModule.h" // For export macro
 #include "vtkContourRepresentation.h"
diff --git a/Interaction/Widgets/vtkFocalPlanePointPlacer.h b/Interaction/Widgets/vtkFocalPlanePointPlacer.h
index 33a5bd5eca7ec40065d608c8d3cf9ea938ca83ae..70f127e936bbde371e48ac7431b25c8689867b82 100644
--- a/Interaction/Widgets/vtkFocalPlanePointPlacer.h
+++ b/Interaction/Widgets/vtkFocalPlanePointPlacer.h
@@ -18,8 +18,8 @@
 //
 // .SECTION See Also
 
-#ifndef __vtkFocalPlanePointPlacer_h
-#define __vtkFocalPlanePointPlacer_h
+#ifndef vtkFocalPlanePointPlacer_h
+#define vtkFocalPlanePointPlacer_h
 
 #include "vtkInteractionWidgetsModule.h" // For export macro
 #include "vtkPointPlacer.h"
diff --git a/Interaction/Widgets/vtkHandleRepresentation.h b/Interaction/Widgets/vtkHandleRepresentation.h
index d377317bf19b0d775d5a2fcfff4234426f5c1a36..4ac702afd345ad0dc0e00f8c5c1b49d6bd3ce818 100644
--- a/Interaction/Widgets/vtkHandleRepresentation.h
+++ b/Interaction/Widgets/vtkHandleRepresentation.h
@@ -40,8 +40,8 @@
 // vtkRectilinearWipeWidget vtkWidgetRepresentation vtkAbstractWidget
 
 
-#ifndef __vtkHandleRepresentation_h
-#define __vtkHandleRepresentation_h
+#ifndef vtkHandleRepresentation_h
+#define vtkHandleRepresentation_h
 
 #include "vtkInteractionWidgetsModule.h" // For export macro
 #include "vtkWidgetRepresentation.h"
diff --git a/Interaction/Widgets/vtkHandleWidget.h b/Interaction/Widgets/vtkHandleWidget.h
index 6735a8cc919ec2834fbb73ffcd86e19b94fd8e0c..0c50d2acbd9b84da8e6d2993481127d4cd557159 100644
--- a/Interaction/Widgets/vtkHandleWidget.h
+++ b/Interaction/Widgets/vtkHandleWidget.h
@@ -56,8 +56,8 @@
 // </pre>
 //
 
-#ifndef __vtkHandleWidget_h
-#define __vtkHandleWidget_h
+#ifndef vtkHandleWidget_h
+#define vtkHandleWidget_h
 
 #include "vtkInteractionWidgetsModule.h" // For export macro
 #include "vtkAbstractWidget.h"
diff --git a/Interaction/Widgets/vtkHoverWidget.h b/Interaction/Widgets/vtkHoverWidget.h
index 1312c628aa2b752b294b47e644ee7d568cd7b424..c667f76c4a51b757dc90d4ad694fae92e080f78c 100644
--- a/Interaction/Widgets/vtkHoverWidget.h
+++ b/Interaction/Widgets/vtkHoverWidget.h
@@ -63,8 +63,8 @@
 // vtkAbstractWidget
 
 
-#ifndef __vtkHoverWidget_h
-#define __vtkHoverWidget_h
+#ifndef vtkHoverWidget_h
+#define vtkHoverWidget_h
 
 #include "vtkInteractionWidgetsModule.h" // For export macro
 #include "vtkAbstractWidget.h"
diff --git a/Interaction/Widgets/vtkImageActorPointPlacer.h b/Interaction/Widgets/vtkImageActorPointPlacer.h
index fb2b60bc1a7df22d08b3aeef413c7e0eeffc8113..4a02fba937565f27c20b4a1c6f4cc202390accae 100644
--- a/Interaction/Widgets/vtkImageActorPointPlacer.h
+++ b/Interaction/Widgets/vtkImageActorPointPlacer.h
@@ -21,8 +21,8 @@
 // If no bounds are specified, they may lie anywhere on the supplied ImageActor.
 // .SECTION See Also
 
-#ifndef __vtkImageActorPointPlacer_h
-#define __vtkImageActorPointPlacer_h
+#ifndef vtkImageActorPointPlacer_h
+#define vtkImageActorPointPlacer_h
 
 #include "vtkInteractionWidgetsModule.h" // For export macro
 #include "vtkPointPlacer.h"
diff --git a/Interaction/Widgets/vtkImageCroppingRegionsWidget.h b/Interaction/Widgets/vtkImageCroppingRegionsWidget.h
index bccde27bf689adba68779266bcdca20e8e7f1efa..8052ad69bebd085bcb0ecce5829d68ecf1f15d50 100644
--- a/Interaction/Widgets/vtkImageCroppingRegionsWidget.h
+++ b/Interaction/Widgets/vtkImageCroppingRegionsWidget.h
@@ -24,8 +24,8 @@
 // cropping planes is changed. The widget also invokes an InteractionEvent
 // in response to user interaction.
 
-#ifndef __vtkImageCroppingRegionsWidget_h
-#define __vtkImageCroppingRegionsWidget_h
+#ifndef vtkImageCroppingRegionsWidget_h
+#define vtkImageCroppingRegionsWidget_h
 
 #include "vtkInteractionWidgetsModule.h" // For export macro
 #include "vtk3DWidget.h"
diff --git a/Interaction/Widgets/vtkImageOrthoPlanes.h b/Interaction/Widgets/vtkImageOrthoPlanes.h
index 07f659bc22f05e852579746ef4d640e2568c26e4..f558cf27d9c86eabf82a75c0640c7a7f0d371205 100644
--- a/Interaction/Widgets/vtkImageOrthoPlanes.h
+++ b/Interaction/Widgets/vtkImageOrthoPlanes.h
@@ -22,8 +22,8 @@
 // .SECTION Thanks
 // Thanks to Atamai Inc. for developing and contributing this class.
 
-#ifndef __vtkImageOrthoPlanes_h
-#define __vtkImageOrthoPlanes_h
+#ifndef vtkImageOrthoPlanes_h
+#define vtkImageOrthoPlanes_h
 
 #include "vtkInteractionWidgetsModule.h" // For export macro
 #include "vtkObject.h"
diff --git a/Interaction/Widgets/vtkImagePlaneWidget.h b/Interaction/Widgets/vtkImagePlaneWidget.h
index cda20fdef9b652894840a4102b295a8f09db7bc1..2a20a137d55c7dd6c77ae11cb705bfb3357ae012 100644
--- a/Interaction/Widgets/vtkImagePlaneWidget.h
+++ b/Interaction/Widgets/vtkImagePlaneWidget.h
@@ -95,8 +95,8 @@
 // vtkPolyDataSourceWidget vtkSphereWidget vtkImplicitPlaneWidget
 
 
-#ifndef __vtkImagePlaneWidget_h
-#define __vtkImagePlaneWidget_h
+#ifndef vtkImagePlaneWidget_h
+#define vtkImagePlaneWidget_h
 
 #include "vtkInteractionWidgetsModule.h" // For export macro
 #include "vtkPolyDataSourceWidget.h"
diff --git a/Interaction/Widgets/vtkImageTracerWidget.h b/Interaction/Widgets/vtkImageTracerWidget.h
index 10d32554af9f9eea0d5f01e069749bd0bae0a1ae..2ed251227ee56975f55e5d58006f38846577b9bd 100644
--- a/Interaction/Widgets/vtkImageTracerWidget.h
+++ b/Interaction/Widgets/vtkImageTracerWidget.h
@@ -48,8 +48,8 @@
 // vtk3DWidget vtkBoxWidget vtkLineWidget vtkPointWidget vtkSphereWidget
 // vtkImagePlaneWidget vtkImplicitPlaneWidget vtkPlaneWidget
 
-#ifndef __vtkImageTracerWidget_h
-#define __vtkImageTracerWidget_h
+#ifndef vtkImageTracerWidget_h
+#define vtkImageTracerWidget_h
 
 #include "vtkInteractionWidgetsModule.h" // For export macro
 #include "vtk3DWidget.h"
diff --git a/Interaction/Widgets/vtkImplicitPlaneRepresentation.h b/Interaction/Widgets/vtkImplicitPlaneRepresentation.h
index d08dff2583576150c37b3164f5dca7876f6e3292..0e6be63f20671082ea856753c012f79228b15eaa 100644
--- a/Interaction/Widgets/vtkImplicitPlaneRepresentation.h
+++ b/Interaction/Widgets/vtkImplicitPlaneRepresentation.h
@@ -33,8 +33,8 @@
 // vtkImplicitPlaneWidget2 vtkImplicitPlaneWidget
 
 
-#ifndef __vtkImplicitPlaneRepresentation_h
-#define __vtkImplicitPlaneRepresentation_h
+#ifndef vtkImplicitPlaneRepresentation_h
+#define vtkImplicitPlaneRepresentation_h
 
 #include "vtkInteractionWidgetsModule.h" // For export macro
 #include "vtkWidgetRepresentation.h"
diff --git a/Interaction/Widgets/vtkImplicitPlaneWidget.h b/Interaction/Widgets/vtkImplicitPlaneWidget.h
index c5415ab2242a81840cd81d79e40d91b0f40e4a59..77720cd6108d58dbb3c022c44e215519be5b1df2 100644
--- a/Interaction/Widgets/vtkImplicitPlaneWidget.h
+++ b/Interaction/Widgets/vtkImplicitPlaneWidget.h
@@ -58,8 +58,8 @@
 // vtk3DWidget vtkBoxWidget vtkPlaneWidget vtkLineWidget vtkPointWidget
 // vtkSphereWidget vtkImagePlaneWidget
 
-#ifndef __vtkImplicitPlaneWidget_h
-#define __vtkImplicitPlaneWidget_h
+#ifndef vtkImplicitPlaneWidget_h
+#define vtkImplicitPlaneWidget_h
 
 #include "vtkInteractionWidgetsModule.h" // For export macro
 #include "vtkPolyDataSourceWidget.h"
diff --git a/Interaction/Widgets/vtkImplicitPlaneWidget2.h b/Interaction/Widgets/vtkImplicitPlaneWidget2.h
index abe5d5d3efca2746002f51d610869ef0edfc7fe8..5a6c70ebc5518ee67bd57c86a655796f3e77a86d 100644
--- a/Interaction/Widgets/vtkImplicitPlaneWidget2.h
+++ b/Interaction/Widgets/vtkImplicitPlaneWidget2.h
@@ -83,8 +83,8 @@
 // vtk3DWidget vtkBoxWidget vtkPlaneWidget vtkLineWidget vtkPointWidget
 // vtkSphereWidget vtkImagePlaneWidget
 
-#ifndef __vtkImplicitPlaneWidget2_h
-#define __vtkImplicitPlaneWidget2_h
+#ifndef vtkImplicitPlaneWidget2_h
+#define vtkImplicitPlaneWidget2_h
 
 #include "vtkInteractionWidgetsModule.h" // For export macro
 #include "vtkAbstractWidget.h"
diff --git a/Interaction/Widgets/vtkLineRepresentation.h b/Interaction/Widgets/vtkLineRepresentation.h
index 627ce77712e539c235a6d44df99643cbec955dd6..53ce18cc79a8268c84936a28f589553a7938bc69 100644
--- a/Interaction/Widgets/vtkLineRepresentation.h
+++ b/Interaction/Widgets/vtkLineRepresentation.h
@@ -33,8 +33,8 @@
 // vtkLineWidget2 vtkLineWidget
 
 
-#ifndef __vtkLineRepresentation_h
-#define __vtkLineRepresentation_h
+#ifndef vtkLineRepresentation_h
+#define vtkLineRepresentation_h
 
 #include "vtkInteractionWidgetsModule.h" // For export macro
 #include "vtkWidgetRepresentation.h"
diff --git a/Interaction/Widgets/vtkLineWidget.h b/Interaction/Widgets/vtkLineWidget.h
index 8560c367f146402462fdc252f8a10ed485a8808f..c0c3cd33ad1bd8d91c9e2ede1d1e17212585c557 100644
--- a/Interaction/Widgets/vtkLineWidget.h
+++ b/Interaction/Widgets/vtkLineWidget.h
@@ -62,8 +62,8 @@
 // vtk3DWidget vtkBoxWidget vtkPlaneWidget
 
 
-#ifndef __vtkLineWidget_h
-#define __vtkLineWidget_h
+#ifndef vtkLineWidget_h
+#define vtkLineWidget_h
 
 #include "vtkInteractionWidgetsModule.h" // For export macro
 #include "vtk3DWidget.h"
diff --git a/Interaction/Widgets/vtkLineWidget2.h b/Interaction/Widgets/vtkLineWidget2.h
index 28b1d0cd69cbdebec776fed1e09ad47b337410c9..957f0586b269156294af7d273618fe6deea1926e 100644
--- a/Interaction/Widgets/vtkLineWidget2.h
+++ b/Interaction/Widgets/vtkLineWidget2.h
@@ -73,8 +73,8 @@
 // vtkLineRepresentation vtkLineWidget vtk3DWidget vtkImplicitPlaneWidget
 // vtkImplicitPlaneWidget2
 
-#ifndef __vtkLineWidget2_h
-#define __vtkLineWidget2_h
+#ifndef vtkLineWidget2_h
+#define vtkLineWidget2_h
 
 #include "vtkInteractionWidgetsModule.h" // For export macro
 #include "vtkAbstractWidget.h"
diff --git a/Interaction/Widgets/vtkLinearContourLineInterpolator.h b/Interaction/Widgets/vtkLinearContourLineInterpolator.h
index 9d20e72f4611959fbac6d8af76762ad91ec3661a..23f244da7d18b4d4f1c8679c1efe7762e56866b5 100644
--- a/Interaction/Widgets/vtkLinearContourLineInterpolator.h
+++ b/Interaction/Widgets/vtkLinearContourLineInterpolator.h
@@ -21,8 +21,8 @@
 // .SECTION See Also
 // vtkContourLineInterpolator
 
-#ifndef __vtkLinearContourLineInterpolator_h
-#define __vtkLinearContourLineInterpolator_h
+#ifndef vtkLinearContourLineInterpolator_h
+#define vtkLinearContourLineInterpolator_h
 
 #include "vtkInteractionWidgetsModule.h" // For export macro
 #include "vtkContourLineInterpolator.h"
diff --git a/Interaction/Widgets/vtkLogoRepresentation.h b/Interaction/Widgets/vtkLogoRepresentation.h
index b144cb1e49073ee38d9b064a0f5a84c4b6460716..6c8e298faebd4073c4b6eabe74c9fde550147c91 100644
--- a/Interaction/Widgets/vtkLogoRepresentation.h
+++ b/Interaction/Widgets/vtkLogoRepresentation.h
@@ -24,8 +24,8 @@
 // vtkLogoWidget
 
 
-#ifndef __vtkLogoRepresentation_h
-#define __vtkLogoRepresentation_h
+#ifndef vtkLogoRepresentation_h
+#define vtkLogoRepresentation_h
 
 #include "vtkInteractionWidgetsModule.h" // For export macro
 #include "vtkBorderRepresentation.h"
diff --git a/Interaction/Widgets/vtkLogoWidget.h b/Interaction/Widgets/vtkLogoWidget.h
index 105816285fc9f67d368456ac5bee36cd6ab28c3f..c6a9f19c7fb783e43845d7efd1f39b6b5e7f39bf 100644
--- a/Interaction/Widgets/vtkLogoWidget.h
+++ b/Interaction/Widgets/vtkLogoWidget.h
@@ -24,8 +24,8 @@
 // vtkBorderWidget
 
 
-#ifndef __vtkLogoWidget_h
-#define __vtkLogoWidget_h
+#ifndef vtkLogoWidget_h
+#define vtkLogoWidget_h
 
 #include "vtkInteractionWidgetsModule.h" // For export macro
 #include "vtkBorderWidget.h"
diff --git a/Interaction/Widgets/vtkOrientationMarkerWidget.h b/Interaction/Widgets/vtkOrientationMarkerWidget.h
index c71700ee4c6e59f97bc18cf0d7e800ab1854fb10..9152910f12af4d6e1654c0a733da6e637426c006 100644
--- a/Interaction/Widgets/vtkOrientationMarkerWidget.h
+++ b/Interaction/Widgets/vtkOrientationMarkerWidget.h
@@ -63,8 +63,8 @@
 // vtkInteractorObserver vtkXYPlotWidget vtkScalarBarWidget vtkAxesActor
 // vtkAnnotatedCubeActor
 
-#ifndef __vtkOrientationMarkerWidget_h
-#define __vtkOrientationMarkerWidget_h
+#ifndef vtkOrientationMarkerWidget_h
+#define vtkOrientationMarkerWidget_h
 
 #include "vtkInteractionWidgetsModule.h" // For export macro
 #include "vtkInteractorObserver.h"
diff --git a/Interaction/Widgets/vtkOrientedGlyphContourRepresentation.h b/Interaction/Widgets/vtkOrientedGlyphContourRepresentation.h
index c6fe08b1895ac0cf82ee29988aef063513bdccf2..133c7820539dbe313e2182b572d9fa9b99bacd16 100644
--- a/Interaction/Widgets/vtkOrientedGlyphContourRepresentation.h
+++ b/Interaction/Widgets/vtkOrientedGlyphContourRepresentation.h
@@ -22,8 +22,8 @@
 // vtkContourRepresentation vtkContourWidget vtkPointPlacer
 // vtkContourLineInterpolator
 
-#ifndef __vtkOrientedGlyphContourRepresentation_h
-#define __vtkOrientedGlyphContourRepresentation_h
+#ifndef vtkOrientedGlyphContourRepresentation_h
+#define vtkOrientedGlyphContourRepresentation_h
 
 #include "vtkInteractionWidgetsModule.h" // For export macro
 #include "vtkContourRepresentation.h"
diff --git a/Interaction/Widgets/vtkOrientedGlyphFocalPlaneContourRepresentation.h b/Interaction/Widgets/vtkOrientedGlyphFocalPlaneContourRepresentation.h
index 12273a16c3605fda793b23c7f3d9af9524462643..c827efcbd5c80c009e9ca018f7042030a169e2fb 100644
--- a/Interaction/Widgets/vtkOrientedGlyphFocalPlaneContourRepresentation.h
+++ b/Interaction/Widgets/vtkOrientedGlyphFocalPlaneContourRepresentation.h
@@ -25,8 +25,8 @@
 // .SECTION See Also
 // vtkOrientedGlyphContourRepresentation
 
-#ifndef __vtkOrientedGlyphFocalPlaneContourRepresentation_h
-#define __vtkOrientedGlyphFocalPlaneContourRepresentation_h
+#ifndef vtkOrientedGlyphFocalPlaneContourRepresentation_h
+#define vtkOrientedGlyphFocalPlaneContourRepresentation_h
 
 #include "vtkInteractionWidgetsModule.h" // For export macro
 #include "vtkFocalPlaneContourRepresentation.h"
diff --git a/Interaction/Widgets/vtkOrientedPolygonalHandleRepresentation3D.h b/Interaction/Widgets/vtkOrientedPolygonalHandleRepresentation3D.h
index 52bbc6f17841d9916cfc0968400cb89446fc927a..cacbd6b5fb1cbfb516447fc4b6093e330b3ecc37 100644
--- a/Interaction/Widgets/vtkOrientedPolygonalHandleRepresentation3D.h
+++ b/Interaction/Widgets/vtkOrientedPolygonalHandleRepresentation3D.h
@@ -26,8 +26,8 @@
 // vtkPolygonalHandleRepresentation3D vtkHandleRepresentation vtkHandleWidget
 
 
-#ifndef __vtkOrientedPolygonalHandleRepresentation3D_h
-#define __vtkOrientedPolygonalHandleRepresentation3D_h
+#ifndef vtkOrientedPolygonalHandleRepresentation3D_h
+#define vtkOrientedPolygonalHandleRepresentation3D_h
 
 #include "vtkInteractionWidgetsModule.h" // For export macro
 #include "vtkAbstractPolygonalHandleRepresentation3D.h"
diff --git a/Interaction/Widgets/vtkParallelopipedRepresentation.h b/Interaction/Widgets/vtkParallelopipedRepresentation.h
index 1ae71a1670d6ad4b9e0b910d14d7da1c40c742af..fbd3e993ddf30fbb5f0a190e3d1edb26e5f84549 100644
--- a/Interaction/Widgets/vtkParallelopipedRepresentation.h
+++ b/Interaction/Widgets/vtkParallelopipedRepresentation.h
@@ -25,8 +25,8 @@
 // .SECTION See Also
 // vtkParallelopipedWidget
 
-#ifndef __vtkParallelopipedRepresentation_h
-#define __vtkParallelopipedRepresentation_h
+#ifndef vtkParallelopipedRepresentation_h
+#define vtkParallelopipedRepresentation_h
 
 #include "vtkInteractionWidgetsModule.h" // For export macro
 #include "vtkWidgetRepresentation.h"
diff --git a/Interaction/Widgets/vtkParallelopipedWidget.h b/Interaction/Widgets/vtkParallelopipedWidget.h
index 81d35a31107f5eba0f76c56fce1732e9e27e0e76..b3cf100216b2d1b9e58486283e61fce4cbfb5745 100644
--- a/Interaction/Widgets/vtkParallelopipedWidget.h
+++ b/Interaction/Widgets/vtkParallelopipedWidget.h
@@ -37,8 +37,8 @@
 // .SECTION Caveats
 // .SECTION See Also vtkParallelopipedRepresentation
 
-#ifndef __vtkParallelopipedWidget_h
-#define __vtkParallelopipedWidget_h
+#ifndef vtkParallelopipedWidget_h
+#define vtkParallelopipedWidget_h
 
 #include "vtkInteractionWidgetsModule.h" // For export macro
 #include "vtkAbstractWidget.h"
diff --git a/Interaction/Widgets/vtkPlaneWidget.h b/Interaction/Widgets/vtkPlaneWidget.h
index f2674e473586a03b5bf95b9cf3fbf88edde80abd..79006a2504754a6336c70dec5b7bc388e8372db9 100644
--- a/Interaction/Widgets/vtkPlaneWidget.h
+++ b/Interaction/Widgets/vtkPlaneWidget.h
@@ -69,8 +69,8 @@
 // vtk3DWidget vtkBoxWidget vtkLineWidget vtkSphereWidget
 // vtkImplicitPlaneWidget
 
-#ifndef __vtkPlaneWidget_h
-#define __vtkPlaneWidget_h
+#ifndef vtkPlaneWidget_h
+#define vtkPlaneWidget_h
 
 #include "vtkInteractionWidgetsModule.h" // For export macro
 #include "vtkPolyDataSourceWidget.h"
diff --git a/Interaction/Widgets/vtkPlaybackRepresentation.h b/Interaction/Widgets/vtkPlaybackRepresentation.h
index af9ca5272ed66daf21afd85db98943ae152be7f1..3b96e82f25f1a7efcfe06c8b8cfaab74fef20224 100644
--- a/Interaction/Widgets/vtkPlaybackRepresentation.h
+++ b/Interaction/Widgets/vtkPlaybackRepresentation.h
@@ -22,8 +22,8 @@
 // vtkPlaybackWidget
 
 
-#ifndef __vtkPlaybackRepresentation_h
-#define __vtkPlaybackRepresentation_h
+#ifndef vtkPlaybackRepresentation_h
+#define vtkPlaybackRepresentation_h
 
 #include "vtkInteractionWidgetsModule.h" // For export macro
 #include "vtkBorderRepresentation.h"
diff --git a/Interaction/Widgets/vtkPlaybackWidget.h b/Interaction/Widgets/vtkPlaybackWidget.h
index 9a6a1ca882236908a61bcdbdefea30d060ec733e..25dc64970e96c72476efc0f2ab6fbd88f42bc2bd 100644
--- a/Interaction/Widgets/vtkPlaybackWidget.h
+++ b/Interaction/Widgets/vtkPlaybackWidget.h
@@ -23,8 +23,8 @@
 // vtkBorderWidget
 
 
-#ifndef __vtkPlaybackWidget_h
-#define __vtkPlaybackWidget_h
+#ifndef vtkPlaybackWidget_h
+#define vtkPlaybackWidget_h
 
 #include "vtkInteractionWidgetsModule.h" // For export macro
 #include "vtkBorderWidget.h"
diff --git a/Interaction/Widgets/vtkPointHandleRepresentation2D.h b/Interaction/Widgets/vtkPointHandleRepresentation2D.h
index b80283f8d491adb1c72a31b0f19ea37e3cbf934c..6f57b6ed1c12a919cb051407197add20a34525a9 100644
--- a/Interaction/Widgets/vtkPointHandleRepresentation2D.h
+++ b/Interaction/Widgets/vtkPointHandleRepresentation2D.h
@@ -22,8 +22,8 @@
 // vtkHandleRepresentation vtkHandleWidget
 
 
-#ifndef __vtkPointHandleRepresentation2D_h
-#define __vtkPointHandleRepresentation2D_h
+#ifndef vtkPointHandleRepresentation2D_h
+#define vtkPointHandleRepresentation2D_h
 
 #include "vtkInteractionWidgetsModule.h" // For export macro
 #include "vtkHandleRepresentation.h"
diff --git a/Interaction/Widgets/vtkPointHandleRepresentation3D.h b/Interaction/Widgets/vtkPointHandleRepresentation3D.h
index 93210b89d8d8a52abda852b4b2c37a2b4c6daa4a..fe095dc9bb674181ed8468f06158d569ca830420 100644
--- a/Interaction/Widgets/vtkPointHandleRepresentation3D.h
+++ b/Interaction/Widgets/vtkPointHandleRepresentation3D.h
@@ -22,8 +22,8 @@
 // vtkHandleRepresentation vtkHandleWidget vtkCursor3D
 
 
-#ifndef __vtkPointHandleRepresentation3D_h
-#define __vtkPointHandleRepresentation3D_h
+#ifndef vtkPointHandleRepresentation3D_h
+#define vtkPointHandleRepresentation3D_h
 
 #include "vtkInteractionWidgetsModule.h" // For export macro
 #include "vtkHandleRepresentation.h"
diff --git a/Interaction/Widgets/vtkPointPlacer.h b/Interaction/Widgets/vtkPointPlacer.h
index 5063c1695e880928a0c2fc9a8ef8b44ae1e9cff2..a91597523af1e09315a77353a52f031756a3a3e5 100644
--- a/Interaction/Widgets/vtkPointPlacer.h
+++ b/Interaction/Widgets/vtkPointPlacer.h
@@ -35,8 +35,8 @@
 // HandleWidget and the ContourWidget to allow various constraints to be
 // enforced on the placement of their handles.
 
-#ifndef __vtkPointPlacer_h
-#define __vtkPointPlacer_h
+#ifndef vtkPointPlacer_h
+#define vtkPointPlacer_h
 
 #include "vtkInteractionWidgetsModule.h" // For export macro
 #include "vtkObject.h"
diff --git a/Interaction/Widgets/vtkPointWidget.h b/Interaction/Widgets/vtkPointWidget.h
index fb532bb79d10bca05193cfaf1d7e7e589f75ba57..cac3994ecb8b46ac5339bf760e65587ebe6cea94 100644
--- a/Interaction/Widgets/vtkPointWidget.h
+++ b/Interaction/Widgets/vtkPointWidget.h
@@ -58,8 +58,8 @@
 // .SECTION See Also
 // vtk3DWidget vtkLineWidget vtkBoxWidget vtkPlaneWidget
 
-#ifndef __vtkPointWidget_h
-#define __vtkPointWidget_h
+#ifndef vtkPointWidget_h
+#define vtkPointWidget_h
 
 #include "vtkInteractionWidgetsModule.h" // For export macro
 #include "vtk3DWidget.h"
diff --git a/Interaction/Widgets/vtkPolyDataContourLineInterpolator.h b/Interaction/Widgets/vtkPolyDataContourLineInterpolator.h
index 3734be289a57329d01cf02ffab555b79146115bf..d186f5ab7a736db6814bd162e37b91fa57333850 100644
--- a/Interaction/Widgets/vtkPolyDataContourLineInterpolator.h
+++ b/Interaction/Widgets/vtkPolyDataContourLineInterpolator.h
@@ -20,8 +20,8 @@
 //
 // .SECTION See Also
 
-#ifndef __vtkPolyDataContourLineInterpolator_h
-#define __vtkPolyDataContourLineInterpolator_h
+#ifndef vtkPolyDataContourLineInterpolator_h
+#define vtkPolyDataContourLineInterpolator_h
 
 #include "vtkInteractionWidgetsModule.h" // For export macro
 #include "vtkContourLineInterpolator.h"
diff --git a/Interaction/Widgets/vtkPolyDataPointPlacer.h b/Interaction/Widgets/vtkPolyDataPointPlacer.h
index b9f42f71a098b543b42b959f59f597c4e9127cd1..46037f29fbfb4bb592242b5071eb3719b6a8dab6 100644
--- a/Interaction/Widgets/vtkPolyDataPointPlacer.h
+++ b/Interaction/Widgets/vtkPolyDataPointPlacer.h
@@ -28,8 +28,8 @@
 // .SECTION See Also
 // vtkPolygonalSurfacePointPlacer
 
-#ifndef __vtkPolyDataPointPlacer_h
-#define __vtkPolyDataPointPlacer_h
+#ifndef vtkPolyDataPointPlacer_h
+#define vtkPolyDataPointPlacer_h
 
 #include "vtkInteractionWidgetsModule.h" // For export macro
 #include "vtkPointPlacer.h"
diff --git a/Interaction/Widgets/vtkPolyDataSourceWidget.h b/Interaction/Widgets/vtkPolyDataSourceWidget.h
index 3985f6c075437e590d3f54e7d8e13664fc51b2b4..8f4a59e334e48df821b278c50cc1859f65cabf33 100644
--- a/Interaction/Widgets/vtkPolyDataSourceWidget.h
+++ b/Interaction/Widgets/vtkPolyDataSourceWidget.h
@@ -31,8 +31,8 @@
 // .SECTION See Also
 // vtk3DWidget vtkLineWidget vtkPlaneWidget vtkSphereWidget
 
-#ifndef __vtkPolyDataSourceWidget_h
-#define __vtkPolyDataSourceWidget_h
+#ifndef vtkPolyDataSourceWidget_h
+#define vtkPolyDataSourceWidget_h
 
 #include "vtkInteractionWidgetsModule.h" // For export macro
 #include "vtk3DWidget.h"
diff --git a/Interaction/Widgets/vtkPolygonalHandleRepresentation3D.h b/Interaction/Widgets/vtkPolygonalHandleRepresentation3D.h
index 7556d06f33297b975066892b4f03647670cae19b..95df23d6b6947b11bf2a1fea5dc38644311caf4e 100644
--- a/Interaction/Widgets/vtkPolygonalHandleRepresentation3D.h
+++ b/Interaction/Widgets/vtkPolygonalHandleRepresentation3D.h
@@ -23,8 +23,8 @@
 // vtkPointHandleRepresentation3D vtkHandleRepresentation vtkHandleWidget
 
 
-#ifndef __vtkPolygonalHandleRepresentation3D_h
-#define __vtkPolygonalHandleRepresentation3D_h
+#ifndef vtkPolygonalHandleRepresentation3D_h
+#define vtkPolygonalHandleRepresentation3D_h
 
 #include "vtkInteractionWidgetsModule.h" // For export macro
 #include "vtkAbstractPolygonalHandleRepresentation3D.h"
diff --git a/Interaction/Widgets/vtkPolygonalSurfaceContourLineInterpolator.h b/Interaction/Widgets/vtkPolygonalSurfaceContourLineInterpolator.h
index 44f1a09a3be8e520ed4f60c5f26927ec7df69d72..1374391d6992f0145843a5ad6c593c3f1cdefde4 100644
--- a/Interaction/Widgets/vtkPolygonalSurfaceContourLineInterpolator.h
+++ b/Interaction/Widgets/vtkPolygonalSurfaceContourLineInterpolator.h
@@ -34,8 +34,8 @@
 // .SECTION See Also
 // vtkDijkstraGraphGeodesicPath, vtkPolyDataNormals
 
-#ifndef __vtkPolygonalSurfaceContourLineInterpolator_h
-#define __vtkPolygonalSurfaceContourLineInterpolator_h
+#ifndef vtkPolygonalSurfaceContourLineInterpolator_h
+#define vtkPolygonalSurfaceContourLineInterpolator_h
 
 #include "vtkInteractionWidgetsModule.h" // For export macro
 #include "vtkPolyDataContourLineInterpolator.h"
diff --git a/Interaction/Widgets/vtkPolygonalSurfacePointPlacer.h b/Interaction/Widgets/vtkPolygonalSurfacePointPlacer.h
index 831f368a430b9c4327edc34eadaddd9c9e4e6e52..d9434df58b65676b60ac6545a9e95defd1ff7d19 100644
--- a/Interaction/Widgets/vtkPolygonalSurfacePointPlacer.h
+++ b/Interaction/Widgets/vtkPolygonalSurfacePointPlacer.h
@@ -28,8 +28,8 @@
 // .SECTION See Also
 // vtkPointPlacer vtkPolyDataNormals
 
-#ifndef __vtkPolygonalSurfacePointPlacer_h
-#define __vtkPolygonalSurfacePointPlacer_h
+#ifndef vtkPolygonalSurfacePointPlacer_h
+#define vtkPolygonalSurfacePointPlacer_h
 
 #include "vtkInteractionWidgetsModule.h" // For export macro
 #include "vtkPolyDataPointPlacer.h"
diff --git a/Interaction/Widgets/vtkProp3DButtonRepresentation.h b/Interaction/Widgets/vtkProp3DButtonRepresentation.h
index 471d354cdd17444aadcf11d6ff46b0f17c7f4e07..972713e1c3cbf2c844b8522a736b710080b08bf3 100644
--- a/Interaction/Widgets/vtkProp3DButtonRepresentation.h
+++ b/Interaction/Widgets/vtkProp3DButtonRepresentation.h
@@ -35,8 +35,8 @@
 // vtkRectangularButtonSource
 
 
-#ifndef __vtkProp3DButtonRepresentation_h
-#define __vtkProp3DButtonRepresentation_h
+#ifndef vtkProp3DButtonRepresentation_h
+#define vtkProp3DButtonRepresentation_h
 
 #include "vtkInteractionWidgetsModule.h" // For export macro
 #include "vtkButtonRepresentation.h"
diff --git a/Interaction/Widgets/vtkRectilinearWipeRepresentation.h b/Interaction/Widgets/vtkRectilinearWipeRepresentation.h
index 2775e5cbc52a6251dcc14de1747d63a4e28fe441..f45df2b285b4e18704ea8af5210571e39410ac61 100644
--- a/Interaction/Widgets/vtkRectilinearWipeRepresentation.h
+++ b/Interaction/Widgets/vtkRectilinearWipeRepresentation.h
@@ -34,8 +34,8 @@
 // vtkRectilinearWipeWidget vtkWidgetRepresentation vtkAbstractWidget
 
 
-#ifndef __vtkRectilinearWipeRepresentation_h
-#define __vtkRectilinearWipeRepresentation_h
+#ifndef vtkRectilinearWipeRepresentation_h
+#define vtkRectilinearWipeRepresentation_h
 
 #include "vtkInteractionWidgetsModule.h" // For export macro
 #include "vtkWidgetRepresentation.h"
diff --git a/Interaction/Widgets/vtkRectilinearWipeWidget.h b/Interaction/Widgets/vtkRectilinearWipeWidget.h
index dc30f43f7a3f70976b923862fb1af713d10af68e..efdd20c24763bb7a878d28bc75caeaab9b951075 100644
--- a/Interaction/Widgets/vtkRectilinearWipeWidget.h
+++ b/Interaction/Widgets/vtkRectilinearWipeWidget.h
@@ -72,8 +72,8 @@
 // vtkCheckerboardWidget
 
 
-#ifndef __vtkRectilinearWipeWidget_h
-#define __vtkRectilinearWipeWidget_h
+#ifndef vtkRectilinearWipeWidget_h
+#define vtkRectilinearWipeWidget_h
 
 #include "vtkInteractionWidgetsModule.h" // For export macro
 #include "vtkAbstractWidget.h"
diff --git a/Interaction/Widgets/vtkResliceCursor.h b/Interaction/Widgets/vtkResliceCursor.h
index 069a389d16f89cc833368f11c47c14dc623b479f..2d8d1cb3aeb6b56a0158d6d79e05db90479fc2e7 100644
--- a/Interaction/Widgets/vtkResliceCursor.h
+++ b/Interaction/Widgets/vtkResliceCursor.h
@@ -26,8 +26,8 @@
 // vtkResliceCursorRepresentation vtkResliceCursorThickLineRepresentation
 // vtkResliceCursorActor vtkImagePlaneWidget
 
-#ifndef __vtkResliceCursor_h
-#define __vtkResliceCursor_h
+#ifndef vtkResliceCursor_h
+#define vtkResliceCursor_h
 
 #include "vtkInteractionWidgetsModule.h" // For export macro
 #include "vtkObject.h"
diff --git a/Interaction/Widgets/vtkResliceCursorActor.h b/Interaction/Widgets/vtkResliceCursorActor.h
index 8200d9f8763bc7085afc99360280b85f531cc0b6..73ea235386a34b4ea23800987f7e85a055c9bb38 100644
--- a/Interaction/Widgets/vtkResliceCursorActor.h
+++ b/Interaction/Widgets/vtkResliceCursorActor.h
@@ -21,8 +21,8 @@
 // vtkResliceCursor vtkResliceCursorPolyDataAlgorithm vtkResliceCursorWidget
 // vtkResliceCursorRepresentation vtkResliceCursorLineRepresentation
 
-#ifndef __vtkResliceCursorActor_h
-#define __vtkResliceCursorActor_h
+#ifndef vtkResliceCursorActor_h
+#define vtkResliceCursorActor_h
 
 #include "vtkInteractionWidgetsModule.h" // For export macro
 #include "vtkProp3D.h"
diff --git a/Interaction/Widgets/vtkResliceCursorLineRepresentation.h b/Interaction/Widgets/vtkResliceCursorLineRepresentation.h
index 0f7c25b5f1dbdb6f5bbbbd7d625a981dc721f819..dccf5f1f6e200f2e9bdc1486a1df0ad7a68c05cd 100644
--- a/Interaction/Widgets/vtkResliceCursorLineRepresentation.h
+++ b/Interaction/Widgets/vtkResliceCursorLineRepresentation.h
@@ -27,8 +27,8 @@
 // vtkResliceCursorActor vtkImagePlaneWidget
 
 
-#ifndef __vtkResliceCursorLineRepresentation_h
-#define __vtkResliceCursorLineRepresentation_h
+#ifndef vtkResliceCursorLineRepresentation_h
+#define vtkResliceCursorLineRepresentation_h
 
 #include "vtkInteractionWidgetsModule.h" // For export macro
 #include "vtkResliceCursorRepresentation.h"
diff --git a/Interaction/Widgets/vtkResliceCursorPicker.h b/Interaction/Widgets/vtkResliceCursorPicker.h
index b8d2de37a93c4a2211e97fed3953339e80e01a1e..ced0f31505980413837446edaa8462202092e418 100644
--- a/Interaction/Widgets/vtkResliceCursorPicker.h
+++ b/Interaction/Widgets/vtkResliceCursorPicker.h
@@ -24,8 +24,8 @@
 // .SECTION see also
 // vtkResliceCursor vtkResliceCursorWidget
 
-#ifndef __vtkResliceCursorPicker_h
-#define __vtkResliceCursorPicker_h
+#ifndef vtkResliceCursorPicker_h
+#define vtkResliceCursorPicker_h
 
 #include "vtkInteractionWidgetsModule.h" // For export macro
 #include "vtkPicker.h"
diff --git a/Interaction/Widgets/vtkResliceCursorPolyDataAlgorithm.h b/Interaction/Widgets/vtkResliceCursorPolyDataAlgorithm.h
index 77899d25e3174bf7ac947e07a55a842846e4f693..2fadf576e9224948d3bf59de587d7d345bac23b9 100644
--- a/Interaction/Widgets/vtkResliceCursorPolyDataAlgorithm.h
+++ b/Interaction/Widgets/vtkResliceCursorPolyDataAlgorithm.h
@@ -26,8 +26,8 @@
 // .SECTION see also
 // vtkResliceCursorActor vtkResliceCursor vtkResliceCursorWidget
 
-#ifndef __vtkResliceCursorPolyDataAlgorithm_h
-#define __vtkResliceCursorPolyDataAlgorithm_h
+#ifndef vtkResliceCursorPolyDataAlgorithm_h
+#define vtkResliceCursorPolyDataAlgorithm_h
 
 #include "vtkInteractionWidgetsModule.h" // For export macro
 #include "vtkPolyDataAlgorithm.h"
diff --git a/Interaction/Widgets/vtkResliceCursorRepresentation.h b/Interaction/Widgets/vtkResliceCursorRepresentation.h
index 08fcf65da7726c74cb5a0ba5411bc08807662495..a77ed4800af17b6ad607acd783d6999cb98df423 100644
--- a/Interaction/Widgets/vtkResliceCursorRepresentation.h
+++ b/Interaction/Widgets/vtkResliceCursorRepresentation.h
@@ -21,8 +21,8 @@
 // vtkResliceCursorLineRepresentation vtkResliceCursorThickLineRepresentation
 // vtkResliceCursorWidget vtkResliceCursor
 
-#ifndef __vtkResliceCursorRepresentation_h
-#define __vtkResliceCursorRepresentation_h
+#ifndef vtkResliceCursorRepresentation_h
+#define vtkResliceCursorRepresentation_h
 
 #include "vtkInteractionWidgetsModule.h" // For export macro
 #include "vtkWidgetRepresentation.h"
diff --git a/Interaction/Widgets/vtkResliceCursorThickLineRepresentation.h b/Interaction/Widgets/vtkResliceCursorThickLineRepresentation.h
index 4d09a931de96f88e2dd2ad7c5b6a5a85a3783087..f7ddbd1c7c985055c3cd86cb662def8f1545aa08 100644
--- a/Interaction/Widgets/vtkResliceCursorThickLineRepresentation.h
+++ b/Interaction/Widgets/vtkResliceCursorThickLineRepresentation.h
@@ -23,8 +23,8 @@
 // .SECTION See Also
 // vtkImageSlabReslice vtkResliceCursorLineRepresentation vtkResliceCursorWidget
 
-#ifndef __vtkResliceCursorThickLineRepresentation_h
-#define __vtkResliceCursorThickLineRepresentation_h
+#ifndef vtkResliceCursorThickLineRepresentation_h
+#define vtkResliceCursorThickLineRepresentation_h
 
 #include "vtkInteractionWidgetsModule.h" // For export macro
 #include "vtkResliceCursorLineRepresentation.h"
diff --git a/Interaction/Widgets/vtkResliceCursorWidget.h b/Interaction/Widgets/vtkResliceCursorWidget.h
index 789cfdb10b05f59c4e164207ddb7ac93308b3915..a7eb76d0e923e923488cc2c91cd77d51e0b35d85 100644
--- a/Interaction/Widgets/vtkResliceCursorWidget.h
+++ b/Interaction/Widgets/vtkResliceCursorWidget.h
@@ -30,8 +30,8 @@
 // vtkImageSlabReslice vtkResliceCursorLineRepresentation
 // vtkResliceCursor
 
-#ifndef __vtkResliceCursorWidget_h
-#define __vtkResliceCursorWidget_h
+#ifndef vtkResliceCursorWidget_h
+#define vtkResliceCursorWidget_h
 
 #include "vtkInteractionWidgetsModule.h" // For export macro
 #include "vtkAbstractWidget.h"
diff --git a/Interaction/Widgets/vtkScalarBarRepresentation.h b/Interaction/Widgets/vtkScalarBarRepresentation.h
index 29efb8e5364918c58d697734760d79ff05642833..6c8c1afd07814d93b62cad33331abc189c7bccbc 100644
--- a/Interaction/Widgets/vtkScalarBarRepresentation.h
+++ b/Interaction/Widgets/vtkScalarBarRepresentation.h
@@ -37,8 +37,8 @@
 // vtkScalarBarWidget vtkWidgetRepresentation vtkScalarBarActor
 //
 
-#ifndef __vtkScalarBarRepresentation_h
-#define __vtkScalarBarRepresentation_h
+#ifndef vtkScalarBarRepresentation_h
+#define vtkScalarBarRepresentation_h
 
 #include "vtkInteractionWidgetsModule.h" // For export macro
 #include "vtkBorderRepresentation.h"
@@ -91,4 +91,4 @@ private:
   void operator=(const vtkScalarBarRepresentation &);   // Not implemented
 };
 
-#endif //__vtkScalarBarRepresentation_h
+#endif //vtkScalarBarRepresentation_h
diff --git a/Interaction/Widgets/vtkScalarBarWidget.h b/Interaction/Widgets/vtkScalarBarWidget.h
index c05fdc7a200b9b6a4fc2486cbc23b1c21461cf16..78078d400eb9673aaf32388406eb06df45b3ec0d 100644
--- a/Interaction/Widgets/vtkScalarBarWidget.h
+++ b/Interaction/Widgets/vtkScalarBarWidget.h
@@ -30,8 +30,8 @@
 // vtkInteractorObserver
 
 
-#ifndef __vtkScalarBarWidget_h
-#define __vtkScalarBarWidget_h
+#ifndef vtkScalarBarWidget_h
+#define vtkScalarBarWidget_h
 
 #include "vtkInteractionWidgetsModule.h" // For export macro
 #include "vtkBorderWidget.h"
diff --git a/Interaction/Widgets/vtkSeedRepresentation.h b/Interaction/Widgets/vtkSeedRepresentation.h
index a43aa34aca99de9e9f6604ffe286a2dd92f87fae..a7d73a62b6d3cca688c765edff36ef0b126b6443 100644
--- a/Interaction/Widgets/vtkSeedRepresentation.h
+++ b/Interaction/Widgets/vtkSeedRepresentation.h
@@ -23,8 +23,8 @@
 // vtkSeedWidget vtkHandleRepresentation vtkSeedRepresentation
 
 
-#ifndef __vtkSeedRepresentation_h
-#define __vtkSeedRepresentation_h
+#ifndef vtkSeedRepresentation_h
+#define vtkSeedRepresentation_h
 
 #include "vtkInteractionWidgetsModule.h" // For export macro
 #include "vtkWidgetRepresentation.h"
diff --git a/Interaction/Widgets/vtkSeedWidget.h b/Interaction/Widgets/vtkSeedWidget.h
index 5d5c8034d31c9b9e904835497f36e4bc87a452e5..deec99aa395ba71fe5f32b41723f1109f0b3ba95 100644
--- a/Interaction/Widgets/vtkSeedWidget.h
+++ b/Interaction/Widgets/vtkSeedWidget.h
@@ -61,8 +61,8 @@
 // vtkHandleWidget vtkSeedReoresentation
 
 
-#ifndef __vtkSeedWidget_h
-#define __vtkSeedWidget_h
+#ifndef vtkSeedWidget_h
+#define vtkSeedWidget_h
 
 #include "vtkInteractionWidgetsModule.h" // For export macro
 #include "vtkAbstractWidget.h"
diff --git a/Interaction/Widgets/vtkSliderRepresentation.h b/Interaction/Widgets/vtkSliderRepresentation.h
index f9ae7af8081e773c0f2a18e2db83e306125b05e6..88a6b93171678d0e4c3922ec6e60e468cceb3e52 100644
--- a/Interaction/Widgets/vtkSliderRepresentation.h
+++ b/Interaction/Widgets/vtkSliderRepresentation.h
@@ -24,8 +24,8 @@
 // vtkSliderWidget
 
 
-#ifndef __vtkSliderRepresentation_h
-#define __vtkSliderRepresentation_h
+#ifndef vtkSliderRepresentation_h
+#define vtkSliderRepresentation_h
 
 #include "vtkInteractionWidgetsModule.h" // For export macro
 #include "vtkWidgetRepresentation.h"
diff --git a/Interaction/Widgets/vtkSliderRepresentation2D.h b/Interaction/Widgets/vtkSliderRepresentation2D.h
index 09b4612453d7af6c2a74330783d16d51a50e2fd0..b0bcb2eb1b0e2e1ff89942e922ad8f7a6e92a9fc 100644
--- a/Interaction/Widgets/vtkSliderRepresentation2D.h
+++ b/Interaction/Widgets/vtkSliderRepresentation2D.h
@@ -24,8 +24,8 @@
 // vtkSliderWidget
 
 
-#ifndef __vtkSliderRepresentation2D_h
-#define __vtkSliderRepresentation2D_h
+#ifndef vtkSliderRepresentation2D_h
+#define vtkSliderRepresentation2D_h
 
 #include "vtkInteractionWidgetsModule.h" // For export macro
 #include "vtkSliderRepresentation.h"
diff --git a/Interaction/Widgets/vtkSliderRepresentation3D.h b/Interaction/Widgets/vtkSliderRepresentation3D.h
index 759720469a3647fcf850b905671ae3d56db2f3cd..066c4c2423b6ea23aa15c10688673a945c763699 100644
--- a/Interaction/Widgets/vtkSliderRepresentation3D.h
+++ b/Interaction/Widgets/vtkSliderRepresentation3D.h
@@ -24,8 +24,8 @@
 // vtkSliderWidget
 
 
-#ifndef __vtkSliderRepresentation3D_h
-#define __vtkSliderRepresentation3D_h
+#ifndef vtkSliderRepresentation3D_h
+#define vtkSliderRepresentation3D_h
 
 #include "vtkInteractionWidgetsModule.h" // For export macro
 #include "vtkSliderRepresentation.h"
diff --git a/Interaction/Widgets/vtkSliderWidget.h b/Interaction/Widgets/vtkSliderWidget.h
index fc2a9f5ed8cb419a82fbc192dc0d6285d620fd2e..6bf14f5017f07726b4923cbed9ef6d1b57635368 100644
--- a/Interaction/Widgets/vtkSliderWidget.h
+++ b/Interaction/Widgets/vtkSliderWidget.h
@@ -58,8 +58,8 @@
 // </pre>
 //
 
-#ifndef __vtkSliderWidget_h
-#define __vtkSliderWidget_h
+#ifndef vtkSliderWidget_h
+#define vtkSliderWidget_h
 
 #include "vtkInteractionWidgetsModule.h" // For export macro
 #include "vtkAbstractWidget.h"
diff --git a/Interaction/Widgets/vtkSphereHandleRepresentation.h b/Interaction/Widgets/vtkSphereHandleRepresentation.h
index 18f2f6b893ad5471d30b3ddecf5f1da4db44c719..e5d2badaa18682d20a524da61859f95c411e3cc6 100644
--- a/Interaction/Widgets/vtkSphereHandleRepresentation.h
+++ b/Interaction/Widgets/vtkSphereHandleRepresentation.h
@@ -22,8 +22,8 @@
 // vtkHandleRepresentation vtkHandleWidget vtkSphereSource
 
 
-#ifndef __vtkSphereHandleRepresentation_h
-#define __vtkSphereHandleRepresentation_h
+#ifndef vtkSphereHandleRepresentation_h
+#define vtkSphereHandleRepresentation_h
 
 #include "vtkInteractionWidgetsModule.h" // For export macro
 #include "vtkHandleRepresentation.h"
diff --git a/Interaction/Widgets/vtkSphereRepresentation.h b/Interaction/Widgets/vtkSphereRepresentation.h
index 1d54d729eeb002a81fec7fbd3f36463da82904cb..d7844578e301af9528963e0f4bf9d70839d574ed 100644
--- a/Interaction/Widgets/vtkSphereRepresentation.h
+++ b/Interaction/Widgets/vtkSphereRepresentation.h
@@ -40,8 +40,8 @@
 // vtkSphereWidget2 vtkSphereWidget
 
 
-#ifndef __vtkSphereRepresentation_h
-#define __vtkSphereRepresentation_h
+#ifndef vtkSphereRepresentation_h
+#define vtkSphereRepresentation_h
 
 #include "vtkInteractionWidgetsModule.h" // For export macro
 #include "vtkWidgetRepresentation.h"
diff --git a/Interaction/Widgets/vtkSphereWidget.h b/Interaction/Widgets/vtkSphereWidget.h
index 5bdfbf23aff16c6af5866dc47978bc7f44f3a74a..930c55aa14ca713683aaff1f6c700eb43564f6f9 100644
--- a/Interaction/Widgets/vtkSphereWidget.h
+++ b/Interaction/Widgets/vtkSphereWidget.h
@@ -48,8 +48,8 @@
 // vtk3DWidget vtkLineWidget vtkBoxWidget vtkPlaneWidget
 
 
-#ifndef __vtkSphereWidget_h
-#define __vtkSphereWidget_h
+#ifndef vtkSphereWidget_h
+#define vtkSphereWidget_h
 
 #include "vtkInteractionWidgetsModule.h" // For export macro
 #include "vtk3DWidget.h"
diff --git a/Interaction/Widgets/vtkSphereWidget2.h b/Interaction/Widgets/vtkSphereWidget2.h
index 8d804894ede7a64683faca391abe2254dc4866f6..99d2205e56fea3434e0e80f1888e9d7cc8dd2fee 100644
--- a/Interaction/Widgets/vtkSphereWidget2.h
+++ b/Interaction/Widgets/vtkSphereWidget2.h
@@ -78,8 +78,8 @@
 // .SECTION See Also
 // vtkSphereRepresentation vtkSphereWidget
 
-#ifndef __vtkSphereWidget2_h
-#define __vtkSphereWidget2_h
+#ifndef vtkSphereWidget2_h
+#define vtkSphereWidget2_h
 
 #include "vtkInteractionWidgetsModule.h" // For export macro
 #include "vtkAbstractWidget.h"
diff --git a/Interaction/Widgets/vtkSplineRepresentation.h b/Interaction/Widgets/vtkSplineRepresentation.h
index 25c7caf05c33eb7d4ca95c0ae2fd8df8994c9094..bfb12e76c53ac6a4f7d3a2880cc23636582ca015 100644
--- a/Interaction/Widgets/vtkSplineRepresentation.h
+++ b/Interaction/Widgets/vtkSplineRepresentation.h
@@ -22,8 +22,8 @@
 // .SECTION See Also
 // vtkSplineWidget, vtkSplineWidget2
 
-#ifndef __vtkSplineRepresentation_h
-#define __vtkSplineRepresentation_h
+#ifndef vtkSplineRepresentation_h
+#define vtkSplineRepresentation_h
 
 #include "vtkInteractionWidgetsModule.h" // For export macro
 #include "vtkWidgetRepresentation.h"
diff --git a/Interaction/Widgets/vtkSplineWidget.h b/Interaction/Widgets/vtkSplineWidget.h
index 5b722ddd214132dae09c84a0cd37762612624790..8e158b8da6da320115b5338e6f2c61dedd8d401a 100644
--- a/Interaction/Widgets/vtkSplineWidget.h
+++ b/Interaction/Widgets/vtkSplineWidget.h
@@ -76,8 +76,8 @@
 // vtkImagePlaneWidget vtkImplicitPlaneWidget vtkPlaneWidget
 
 
-#ifndef __vtkSplineWidget_h
-#define __vtkSplineWidget_h
+#ifndef vtkSplineWidget_h
+#define vtkSplineWidget_h
 
 #include "vtkInteractionWidgetsModule.h" // For export macro
 #include "vtk3DWidget.h"
diff --git a/Interaction/Widgets/vtkSplineWidget2.h b/Interaction/Widgets/vtkSplineWidget2.h
index d3bc9d9a0b241dabda121f667267b1e9f00e0688..2dc7623ab1d849ae118f4d82e2890a2c189fbe75 100644
--- a/Interaction/Widgets/vtkSplineWidget2.h
+++ b/Interaction/Widgets/vtkSplineWidget2.h
@@ -20,8 +20,8 @@
 // .SECTION See Also
 // vtkSplineRepresentation, vtkSplineWidget2
 
-#ifndef __vtkSplineWidget2_h
-#define __vtkSplineWidget2_h
+#ifndef vtkSplineWidget2_h
+#define vtkSplineWidget2_h
 
 #include "vtkInteractionWidgetsModule.h" // For export macro
 #include "vtkAbstractWidget.h"
diff --git a/Interaction/Widgets/vtkTensorProbeRepresentation.h b/Interaction/Widgets/vtkTensorProbeRepresentation.h
index 07f2a51e8423dbb622ed7d369b4e4032dd86a8d7..d1f593c6e4af879364fa93f4b01b367677236c13 100644
--- a/Interaction/Widgets/vtkTensorProbeRepresentation.h
+++ b/Interaction/Widgets/vtkTensorProbeRepresentation.h
@@ -22,8 +22,8 @@
 // .SECTION See Also
 // vtkTensorProbeWidget
 
-#ifndef __vtkTensorProbeRepresentation_h
-#define __vtkTensorProbeRepresentation_h
+#ifndef vtkTensorProbeRepresentation_h
+#define vtkTensorProbeRepresentation_h
 
 #include "vtkInteractionWidgetsModule.h" // For export macro
 #include "vtkWidgetRepresentation.h"
diff --git a/Interaction/Widgets/vtkTensorProbeWidget.h b/Interaction/Widgets/vtkTensorProbeWidget.h
index cc435ed0796826c38d3fdac2ac5c0214b7de65c9..7fbd61e3e62ab074dccb98fc9d863d794856fd5d 100644
--- a/Interaction/Widgets/vtkTensorProbeWidget.h
+++ b/Interaction/Widgets/vtkTensorProbeWidget.h
@@ -25,8 +25,8 @@
 // vtkEllipsoidTensorProbeRepresentation will manifest itself with the
 // ellipsoid shape changing as needed along the trajectory.
 
-#ifndef __vtkTensorProbeWidget_h
-#define __vtkTensorProbeWidget_h
+#ifndef vtkTensorProbeWidget_h
+#define vtkTensorProbeWidget_h
 
 #include "vtkInteractionWidgetsModule.h" // For export macro
 #include "vtkAbstractWidget.h"
diff --git a/Interaction/Widgets/vtkTerrainContourLineInterpolator.h b/Interaction/Widgets/vtkTerrainContourLineInterpolator.h
index 16bd98b67b6b1af7e2400d4fb86f713d65dfe1fd..4f33b7d6555969f97fff4324d682a2e00fad71d5 100644
--- a/Interaction/Widgets/vtkTerrainContourLineInterpolator.h
+++ b/Interaction/Widgets/vtkTerrainContourLineInterpolator.h
@@ -35,8 +35,8 @@
 // .SECTION See Also
 // vtkTerrainDataPointPlacer vtkProjectedTerrainPath
 
-#ifndef __vtkTerrainContourLineInterpolator_h
-#define __vtkTerrainContourLineInterpolator_h
+#ifndef vtkTerrainContourLineInterpolator_h
+#define vtkTerrainContourLineInterpolator_h
 
 #include "vtkInteractionWidgetsModule.h" // For export macro
 #include "vtkContourLineInterpolator.h"
diff --git a/Interaction/Widgets/vtkTerrainDataPointPlacer.h b/Interaction/Widgets/vtkTerrainDataPointPlacer.h
index e9f6e29f6c5f1f7be35c4cf0a1a9ba4876a15291..319e7367f53ce1661671cb5b866a9a7d8ab6bf6a 100644
--- a/Interaction/Widgets/vtkTerrainDataPointPlacer.h
+++ b/Interaction/Widgets/vtkTerrainDataPointPlacer.h
@@ -31,8 +31,8 @@
 // .SECTION See Also
 // vtkPointPlacer vtkTerrainContourLineInterpolator
 
-#ifndef __vtkTerrainDataPointPlacer_h
-#define __vtkTerrainDataPointPlacer_h
+#ifndef vtkTerrainDataPointPlacer_h
+#define vtkTerrainDataPointPlacer_h
 
 #include "vtkInteractionWidgetsModule.h" // For export macro
 #include "vtkPointPlacer.h"
diff --git a/Interaction/Widgets/vtkTextRepresentation.h b/Interaction/Widgets/vtkTextRepresentation.h
index 8142e0385d10869edcfa33980c9c7d0a9ef369ba..fb33cc6dd7058e95ce1e5b5eee37985afb12fdc6 100644
--- a/Interaction/Widgets/vtkTextRepresentation.h
+++ b/Interaction/Widgets/vtkTextRepresentation.h
@@ -22,8 +22,8 @@
 // vtkTextRepresentation vtkBorderWidget vtkAbstractWidget vtkWidgetRepresentation
 
 
-#ifndef __vtkTextRepresentation_h
-#define __vtkTextRepresentation_h
+#ifndef vtkTextRepresentation_h
+#define vtkTextRepresentation_h
 
 #include "vtkInteractionWidgetsModule.h" // For export macro
 #include "vtkBorderRepresentation.h"
diff --git a/Interaction/Widgets/vtkTextWidget.h b/Interaction/Widgets/vtkTextWidget.h
index 156ef94d1e787f039aeccdc45c4ee1d82fea2644..b883b282664ccdd9111fc09feb0cafe49577d2b4 100644
--- a/Interaction/Widgets/vtkTextWidget.h
+++ b/Interaction/Widgets/vtkTextWidget.h
@@ -26,8 +26,8 @@
 // vtkBorderWidget vtkCaptionWidget
 
 
-#ifndef __vtkTextWidget_h
-#define __vtkTextWidget_h
+#ifndef vtkTextWidget_h
+#define vtkTextWidget_h
 
 class vtkTextRepresentation;
 class vtkTextActor;
diff --git a/Interaction/Widgets/vtkTexturedButtonRepresentation.h b/Interaction/Widgets/vtkTexturedButtonRepresentation.h
index b754bc63845cddebf6aa66698e518cf753e09e5b..52a07ab81c7e225a6867d1822a6b4fafd197f8ea 100644
--- a/Interaction/Widgets/vtkTexturedButtonRepresentation.h
+++ b/Interaction/Widgets/vtkTexturedButtonRepresentation.h
@@ -42,8 +42,8 @@
 // vtkRectangularButtonSource
 
 
-#ifndef __vtkTexturedButtonRepresentation_h
-#define __vtkTexturedButtonRepresentation_h
+#ifndef vtkTexturedButtonRepresentation_h
+#define vtkTexturedButtonRepresentation_h
 
 #include "vtkInteractionWidgetsModule.h" // For export macro
 #include "vtkButtonRepresentation.h"
diff --git a/Interaction/Widgets/vtkTexturedButtonRepresentation2D.h b/Interaction/Widgets/vtkTexturedButtonRepresentation2D.h
index cd0823cc025836d4782ecee2d7f2c1f3b046cc2b..ce777cc2d5b5d83090eada8f15dd6a060551a4ca 100644
--- a/Interaction/Widgets/vtkTexturedButtonRepresentation2D.h
+++ b/Interaction/Widgets/vtkTexturedButtonRepresentation2D.h
@@ -39,8 +39,8 @@
 // vtkProp3DButtonRepresentation
 
 
-#ifndef __vtkTexturedButtonRepresentation2D_h
-#define __vtkTexturedButtonRepresentation2D_h
+#ifndef vtkTexturedButtonRepresentation2D_h
+#define vtkTexturedButtonRepresentation2D_h
 
 #include "vtkInteractionWidgetsModule.h" // For export macro
 #include "vtkButtonRepresentation.h"
diff --git a/Interaction/Widgets/vtkWidgetCallbackMapper.h b/Interaction/Widgets/vtkWidgetCallbackMapper.h
index 497ff5a0226f64ffb849f32ca0e156361bbfa4b0..a737edfe0b6ff2cb80c28cb6dd34f67856454a23 100644
--- a/Interaction/Widgets/vtkWidgetCallbackMapper.h
+++ b/Interaction/Widgets/vtkWidgetCallbackMapper.h
@@ -23,8 +23,8 @@
 // .SECTION See Also
 // vtkWidgetEvent vtkWidgetEventTranslator
 
-#ifndef __vtkWidgetCallbackMapper_h
-#define __vtkWidgetCallbackMapper_h
+#ifndef vtkWidgetCallbackMapper_h
+#define vtkWidgetCallbackMapper_h
 
 #include "vtkInteractionWidgetsModule.h" // For export macro
 #include "vtkObject.h"
@@ -106,5 +106,5 @@ private:
 };
 
 
-#endif /* __vtkWidgetCallbackMapper_h */
+#endif /* vtkWidgetCallbackMapper_h */
 
diff --git a/Interaction/Widgets/vtkWidgetEvent.h b/Interaction/Widgets/vtkWidgetEvent.h
index 01886d66f6c950ee5b091098e26c6a61a9133d0a..5689764cb4759f4bf3db8f6d33b228b310aa3bd7 100644
--- a/Interaction/Widgets/vtkWidgetEvent.h
+++ b/Interaction/Widgets/vtkWidgetEvent.h
@@ -17,8 +17,8 @@
 // vtkWidgetEvent defines widget events. These events are processed by
 // subclasses of vtkInteractorObserver.
 
-#ifndef __vtkWidgetEvent_h
-#define __vtkWidgetEvent_h
+#ifndef vtkWidgetEvent_h
+#define vtkWidgetEvent_h
 
 #include "vtkInteractionWidgetsModule.h" // For export macro
 #include "vtkObject.h"
diff --git a/Interaction/Widgets/vtkWidgetEventTranslator.h b/Interaction/Widgets/vtkWidgetEventTranslator.h
index 8f8f6d8942c999d9351524219cc1738608fd77c4..e2c80ad18acfc3605624b5f44bfbe91f8795c234 100644
--- a/Interaction/Widgets/vtkWidgetEventTranslator.h
+++ b/Interaction/Widgets/vtkWidgetEventTranslator.h
@@ -27,8 +27,8 @@
 // .SECTION See Also
 // vtkWidgetEvent vtkCommand vtkInteractorObserver
 
-#ifndef __vtkWidgetEventTranslator_h
-#define __vtkWidgetEventTranslator_h
+#ifndef vtkWidgetEventTranslator_h
+#define vtkWidgetEventTranslator_h
 
 #include "vtkInteractionWidgetsModule.h" // For export macro
 #include "vtkObject.h"
@@ -113,5 +113,5 @@ private:
 
 };
 
-#endif /* __vtkWidgetEventTranslator_h */
+#endif /* vtkWidgetEventTranslator_h */
 
diff --git a/Interaction/Widgets/vtkWidgetRepresentation.h b/Interaction/Widgets/vtkWidgetRepresentation.h
index a9c7871bdd25898de17af6b23b28b5fb2b027d83..14391a90c38844484e1ff553fa3c1f74f651986a 100644
--- a/Interaction/Widgets/vtkWidgetRepresentation.h
+++ b/Interaction/Widgets/vtkWidgetRepresentation.h
@@ -37,8 +37,8 @@
 // client (and do not handle events).
 
 
-#ifndef __vtkWidgetRepresentation_h
-#define __vtkWidgetRepresentation_h
+#ifndef vtkWidgetRepresentation_h
+#define vtkWidgetRepresentation_h
 
 #include "vtkInteractionWidgetsModule.h" // For export macro
 #include "vtkProp.h"
diff --git a/Interaction/Widgets/vtkWidgetSet.h b/Interaction/Widgets/vtkWidgetSet.h
index 0e1fa22a8544b9142ac51a59102760fa4b428985..9dd48b7257e1a72af1f700fd7f7f028abf883098 100644
--- a/Interaction/Widgets/vtkWidgetSet.h
+++ b/Interaction/Widgets/vtkWidgetSet.h
@@ -87,8 +87,8 @@
 // Actions are always dispatched first to the activeWidget, the one calling
 // the set, and then to the other widgets in the set.
 //
-#ifndef __vtkWidgetSet_h
-#define __vtkWidgetSet_h
+#ifndef vtkWidgetSet_h
+#define vtkWidgetSet_h
 
 #include "vtkInteractionWidgetsModule.h" // For export macro
 #include "vtkObject.h"
diff --git a/Interaction/Widgets/vtkXYPlotRepresentation.h b/Interaction/Widgets/vtkXYPlotRepresentation.h
index 1cc234f5290c4874dc316d3daeb77fca7a155875..b8964d4335ed7533b2b734665719e60f5881c7ff 100644
--- a/Interaction/Widgets/vtkXYPlotRepresentation.h
+++ b/Interaction/Widgets/vtkXYPlotRepresentation.h
@@ -27,8 +27,8 @@
 // .SECTION Thanks
 // This class was written by Philippe Pebay, Kitware SAS 2012
 
-#ifndef __vtkXYPlotRepresentation_h
-#define __vtkXYPlotRepresentation_h
+#ifndef vtkXYPlotRepresentation_h
+#define vtkXYPlotRepresentation_h
 
 #include "vtkInteractionWidgetsModule.h" // For export macro
 #include "vtkBorderRepresentation.h"
@@ -150,4 +150,4 @@ private:
   void operator=(const vtkXYPlotRepresentation &);   // Not implemented
 };
 
-#endif //__vtkXYPlotRepresentation_h
+#endif //vtkXYPlotRepresentation_h
diff --git a/Interaction/Widgets/vtkXYPlotWidget.h b/Interaction/Widgets/vtkXYPlotWidget.h
index 500a839aa8677e11ae7c718223e9d2e530e2e826..071a42be54b5c15cd813bc1571e9379ace75433b 100644
--- a/Interaction/Widgets/vtkXYPlotWidget.h
+++ b/Interaction/Widgets/vtkXYPlotWidget.h
@@ -28,8 +28,8 @@
 // vtkInteractorObserver
 
 
-#ifndef __vtkXYPlotWidget_h
-#define __vtkXYPlotWidget_h
+#ifndef vtkXYPlotWidget_h
+#define vtkXYPlotWidget_h
 
 #include "vtkInteractionWidgetsModule.h" // For export macro
 #include "vtkInteractorObserver.h"
diff --git a/Parallel/Core/vtkCommunicator.h b/Parallel/Core/vtkCommunicator.h
index a7385a8cccba51873b6fc00897a8c6dc1e8f0640..b0ed11ec9fd4a77bc83b501f2bab54dd33da1035 100644
--- a/Parallel/Core/vtkCommunicator.h
+++ b/Parallel/Core/vtkCommunicator.h
@@ -26,8 +26,8 @@
 // .SECTION see also
 // vtkMPICommunicator
 
-#ifndef __vtkCommunicator_h
-#define __vtkCommunicator_h
+#ifndef vtkCommunicator_h
+#define vtkCommunicator_h
 
 #include "vtkParallelCoreModule.h" // For export macro
 #include "vtkObject.h"
@@ -866,6 +866,6 @@ private:
   void operator=(const vtkCommunicator&);  // Not implemented.
 };
 
-#endif // __vtkCommunicator_h
+#endif // vtkCommunicator_h
 
 
diff --git a/Parallel/Core/vtkDummyCommunicator.h b/Parallel/Core/vtkDummyCommunicator.h
index de10f616bcbd4faf264d82d8c5fd75f2df453a6d..18e9198350f29ccf8d0af26f8c06146c24e6d91f 100644
--- a/Parallel/Core/vtkDummyCommunicator.h
+++ b/Parallel/Core/vtkDummyCommunicator.h
@@ -22,8 +22,8 @@
 // Because there is always only one process, no real communication takes place.
 //
 
-#ifndef __vtkDummyCommunicator_h
-#define __vtkDummyCommunicator_h
+#ifndef vtkDummyCommunicator_h
+#define vtkDummyCommunicator_h
 
 #include "vtkParallelCoreModule.h" // For export macro
 #include "vtkCommunicator.h"
@@ -56,4 +56,4 @@ private:
   void operator=(const vtkDummyCommunicator &);         // Not implemented
 };
 
-#endif //__vtkDummyCommunicator_h
+#endif //vtkDummyCommunicator_h
diff --git a/Parallel/Core/vtkDummyController.h b/Parallel/Core/vtkDummyController.h
index 55b5ed7ec6f6e3a362edfe968e8830bbdb176cf2..7f9b42c60457956fcc30a59c8e7c5bf78e7bb7c1 100644
--- a/Parallel/Core/vtkDummyController.h
+++ b/Parallel/Core/vtkDummyController.h
@@ -20,8 +20,8 @@
 // .SECTION see also
 // vtkMultiProcessController
 
-#ifndef __vtkDummyController_h
-#define __vtkDummyController_h
+#ifndef vtkDummyController_h
+#define vtkDummyController_h
 
 #include "vtkParallelCoreModule.h" // For export macro
 #include "vtkMultiProcessController.h"
diff --git a/Parallel/Core/vtkMultiProcessController.h b/Parallel/Core/vtkMultiProcessController.h
index 878c4f251b3784f0c0301c8a331bb15a21fb5fd7..842ebc1b5783eb14f517d8c5518061e23d081f07 100644
--- a/Parallel/Core/vtkMultiProcessController.h
+++ b/Parallel/Core/vtkMultiProcessController.h
@@ -43,8 +43,8 @@
 // vtkMPIController
 // vtkCommunicator vtkMPICommunicator
 
-#ifndef __vtkMultiProcessController_h
-#define __vtkMultiProcessController_h
+#ifndef vtkMultiProcessController_h
+#define vtkMultiProcessController_h
 
 #include "vtkParallelCoreModule.h" // For export macro
 #include "vtkObject.h"
diff --git a/Parallel/Core/vtkMultiProcessStream.h b/Parallel/Core/vtkMultiProcessStream.h
index 0abafa46f5744981edc62f123cf0e21409b4f99b..5a4d026494b78dd894e062ea00803c2a9823596f 100644
--- a/Parallel/Core/vtkMultiProcessStream.h
+++ b/Parallel/Core/vtkMultiProcessStream.h
@@ -23,8 +23,8 @@
 // Note, stream operators cannot be combined with the Push/Pop array operators.
 // For example, if you push an array to the stream,
 
-#ifndef __vtkMultiProcessStream_h
-#define __vtkMultiProcessStream_h
+#ifndef vtkMultiProcessStream_h
+#define vtkMultiProcessStream_h
 
 #include "vtkParallelCoreModule.h" // For export macro
 #include "vtkObject.h"
diff --git a/Parallel/Core/vtkProcess.h b/Parallel/Core/vtkProcess.h
index f523b75aa01c835d0e76b7006552d919db183973..61af2aaa9c65b1d5441ddd0ce8716e8415bd8659 100644
--- a/Parallel/Core/vtkProcess.h
+++ b/Parallel/Core/vtkProcess.h
@@ -32,8 +32,8 @@
 // .SECTION see also
 // vtkMultiProcessController
 
-#ifndef __vtkProcess_h
-#define __vtkProcess_h
+#ifndef vtkProcess_h
+#define vtkProcess_h
 
 #include "vtkParallelCoreModule.h" // For export macro
 #include "vtkObject.h"
diff --git a/Parallel/Core/vtkProcessGroup.h b/Parallel/Core/vtkProcessGroup.h
index eedfa1566c55732cec448d388105fc1dd5b6c7ee..99e33c65504970be4b3ffb55f461d45ff14c119e 100644
--- a/Parallel/Core/vtkProcessGroup.h
+++ b/Parallel/Core/vtkProcessGroup.h
@@ -39,8 +39,8 @@
 // from Sandia National Laboratories.
 //
 
-#ifndef __vtkProcessGroup_h
-#define __vtkProcessGroup_h
+#ifndef vtkProcessGroup_h
+#define vtkProcessGroup_h
 
 #include "vtkParallelCoreModule.h" // For export macro
 #include "vtkObject.h"
@@ -131,4 +131,4 @@ private:
   void operator=(const vtkProcessGroup &);      // Not implemented
 };
 
-#endif //__vtkProcessGroup_h
+#endif //vtkProcessGroup_h
diff --git a/Parallel/Core/vtkSocketCommunicator.h b/Parallel/Core/vtkSocketCommunicator.h
index 4ffdc794ed5d2a08732190e9ae0b2708085be57a..2a87eec321d5e9bc32e32a311ec31e5d29570323 100644
--- a/Parallel/Core/vtkSocketCommunicator.h
+++ b/Parallel/Core/vtkSocketCommunicator.h
@@ -28,8 +28,8 @@
 // .SECTION see also
 // vtkCommunicator vtkSocketController
 
-#ifndef __vtkSocketCommunicator_h
-#define __vtkSocketCommunicator_h
+#ifndef vtkSocketCommunicator_h
+#define vtkSocketCommunicator_h
 
 #include "vtkParallelCoreModule.h" // For export macro
 #include "vtkCommunicator.h"
diff --git a/Parallel/Core/vtkSocketController.h b/Parallel/Core/vtkSocketController.h
index 42209db48acd0fa66cbf502d6faa5d86813a71bc..085cb87a06146856086ae49642b282f5d9ab0942 100644
--- a/Parallel/Core/vtkSocketController.h
+++ b/Parallel/Core/vtkSocketController.h
@@ -35,8 +35,8 @@
 // .SECTION see also
 // vtkMultiProcessController vtkSocketCommunicator vtkInputPort vtkOutputPort
 
-#ifndef __vtkSocketController_h
-#define __vtkSocketController_h
+#ifndef vtkSocketController_h
+#define vtkSocketController_h
 
 #include "vtkParallelCoreModule.h" // For export macro
 #include "vtkMultiProcessController.h"
@@ -131,4 +131,4 @@ private:
 };
 
 
-#endif // __vtkSocketController_h
+#endif // vtkSocketController_h
diff --git a/Parallel/Core/vtkSubCommunicator.h b/Parallel/Core/vtkSubCommunicator.h
index 5dd6b46b3931ee8a5225a91246d1ea4ebee7f700..6265ee5ffb240dbd69fb29fbaf35e93f22c3728c 100644
--- a/Parallel/Core/vtkSubCommunicator.h
+++ b/Parallel/Core/vtkSubCommunicator.h
@@ -40,8 +40,8 @@
 // from Sandia National Laboratories.
 //
 
-#ifndef __vtkSubCommunicator_h
-#define __vtkSubCommunicator_h
+#ifndef vtkSubCommunicator_h
+#define vtkSubCommunicator_h
 
 #include "vtkParallelCoreModule.h" // For export macro
 #include "vtkCommunicator.h"
@@ -78,4 +78,4 @@ private:
   void operator=(const vtkSubCommunicator &);           // Not implemented
 };
 
-#endif //__vtkSubCommunicator_h
+#endif //vtkSubCommunicator_h
diff --git a/Parallel/Core/vtkSubGroup.h b/Parallel/Core/vtkSubGroup.h
index 710d270754641f02523b8f43000124f96ad5da7a..8220683255591aac3699fd3fba7ef5ea98707824 100644
--- a/Parallel/Core/vtkSubGroup.h
+++ b/Parallel/Core/vtkSubGroup.h
@@ -36,8 +36,8 @@
 // .SECTION See Also
 //      vtkPKdTree vtkDistributedDataFilter
 
-#ifndef __vtkSubGroup_h
-#define __vtkSubGroup_h
+#ifndef vtkSubGroup_h
+#define vtkSubGroup_h
 
 #include "vtkParallelCoreModule.h" // For export macro
 #include "vtkObject.h"
diff --git a/Parallel/MPI/vtkMPI.h b/Parallel/MPI/vtkMPI.h
index cfbf307364b24f62ef1e29f3370df390484ea743..7b38747bdcf4d3bea51303eabe57e4f12db1a225 100644
--- a/Parallel/MPI/vtkMPI.h
+++ b/Parallel/MPI/vtkMPI.h
@@ -13,8 +13,8 @@
 
 =========================================================================*/
 
-#ifndef __vtkMPI_h
-#define __vtkMPI_h
+#ifndef vtkMPI_h
+#define vtkMPI_h
 
 #ifndef USE_STDARG
  #define USE_STDARG
@@ -68,5 +68,5 @@ public:
 };
 
 
-#endif // __vtkMPI_h
+#endif // vtkMPI_h
 // VTK-HeaderTest-Exclude: vtkMPI.h
diff --git a/Parallel/MPI/vtkMPICommunicator.h b/Parallel/MPI/vtkMPICommunicator.h
index 197ccd92401977ab08b09766681f0ab54f5a6818..22b7a8655918a38df0f286752f91379f5f26fc74 100644
--- a/Parallel/MPI/vtkMPICommunicator.h
+++ b/Parallel/MPI/vtkMPICommunicator.h
@@ -30,8 +30,8 @@
 // .SECTION See Also
 // vtkMPIController vtkProcessGroup
 
-#ifndef __vtkMPICommunicator_h
-#define __vtkMPICommunicator_h
+#ifndef vtkMPICommunicator_h
+#define vtkMPICommunicator_h
 
 #include "vtkParallelMPIModule.h" // For export macro
 #include "vtkCommunicator.h"
diff --git a/Parallel/MPI/vtkMPIController.h b/Parallel/MPI/vtkMPIController.h
index 7cbc90eabedcb92a6f2cf18c6083721f91c1a36a..f8750328b7e63e87a25d955ff2e98235e4d00331 100644
--- a/Parallel/MPI/vtkMPIController.h
+++ b/Parallel/MPI/vtkMPIController.h
@@ -37,8 +37,8 @@
 // vtkOutputPort vtkInputPort  vtkMultiProcessController
 // vtkMPICommunicator vtkProcessGroup
 
-#ifndef __vtkMPIController_h
-#define __vtkMPIController_h
+#ifndef vtkMPIController_h
+#define vtkMPIController_h
 
 #include "vtkParallelMPIModule.h" // For export macro
 #include "vtkMultiProcessController.h"
diff --git a/Parallel/MPI/vtkMPIEventLog.h b/Parallel/MPI/vtkMPIEventLog.h
index 26c3c4fc2059418cf3167530e85f3ea2723ba9be..3d841d55b7288f98ce29bbc659955436c6ddc4dd 100644
--- a/Parallel/MPI/vtkMPIEventLog.h
+++ b/Parallel/MPI/vtkMPIEventLog.h
@@ -27,8 +27,8 @@
 // .SECTION See Also
 // vtkTimerLog vtkMPIController vtkMPICommunicator
 
-#ifndef __vtkMPIEventLog_h
-#define __vtkMPIEventLog_h
+#ifndef vtkMPIEventLog_h
+#define vtkMPIEventLog_h
 
 #include "vtkParallelMPIModule.h" // For export macro
 #include "vtkObject.h"
diff --git a/Parallel/MPI/vtkMPIUtilities.h b/Parallel/MPI/vtkMPIUtilities.h
index 0c6229ef58ad259b5913f27ea99f70572071f96d..6f0e1fcd2f4393ace3b04dfdf55bc5a5d788b285 100644
--- a/Parallel/MPI/vtkMPIUtilities.h
+++ b/Parallel/MPI/vtkMPIUtilities.h
@@ -12,8 +12,8 @@
      PURPOSE.  See the above copyright notice for more information.
 
 =========================================================================*/
-#ifndef __vtkMPIUtilities_h
-#define __vtkMPIUtilities_h
+#ifndef vtkMPIUtilities_h
+#define vtkMPIUtilities_h
 
 #include "vtkParallelMPIModule.h" // For export macro
 
@@ -42,5 +42,5 @@ void SynchronizedPrintf(vtkMPIController* comm, const char* format, ...);
 
 } // END namespace vtkMPIUtilities
 
-#endif // __vtkMPIUtilities_h
+#endif // vtkMPIUtilities_h
 // VTK-HeaderTest-Exclude: vtkMPIUtilities.h
diff --git a/Parallel/MPI4Py/vtkMPI4PyCommunicator.h b/Parallel/MPI4Py/vtkMPI4PyCommunicator.h
index 7447f3d44c039203558f4f73ab6d4c20198eb8f8..b073ec0d73ee04908aac643af1f974b406e64098 100644
--- a/Parallel/MPI4Py/vtkMPI4PyCommunicator.h
+++ b/Parallel/MPI4Py/vtkMPI4PyCommunicator.h
@@ -20,8 +20,8 @@
 // .SECTION See Also
 // vtkMPICommunicator
 
-#ifndef __vtkMPI4PyCommunicator_h
-#define __vtkMPI4PyCommunicator_h
+#ifndef vtkMPI4PyCommunicator_h
+#define vtkMPI4PyCommunicator_h
 
 #include "vtkPython.h" // For PyObject*; must be first
 
diff --git a/Rendering/Annotation/vtkAnnotatedCubeActor.h b/Rendering/Annotation/vtkAnnotatedCubeActor.h
index eef512d7b52be67b6ebf46861ca93469f04b1fa1..f87d4e8fb0f93571011e38fe6c9dd74cf65b3990 100644
--- a/Rendering/Annotation/vtkAnnotatedCubeActor.h
+++ b/Rendering/Annotation/vtkAnnotatedCubeActor.h
@@ -33,8 +33,8 @@
 // .SECTION See Also
 // vtkAxesActor vtkOrientationMarkerWidget vtkVectorText
 
-#ifndef __vtkAnnotatedCubeActor_h
-#define __vtkAnnotatedCubeActor_h
+#ifndef vtkAnnotatedCubeActor_h
+#define vtkAnnotatedCubeActor_h
 
 #include "vtkRenderingAnnotationModule.h" // For export macro
 #include "vtkProp3D.h"
diff --git a/Rendering/Annotation/vtkArcPlotter.h b/Rendering/Annotation/vtkArcPlotter.h
index b8fcd9a7083702d700eb8d1474b391ef2dcda481..ffed9f37a36622c1b1a7fc8cc7db4f167a089712 100644
--- a/Rendering/Annotation/vtkArcPlotter.h
+++ b/Rendering/Annotation/vtkArcPlotter.h
@@ -35,8 +35,8 @@
 // .SECTION See Also
 // vtkXYPlotActor
 
-#ifndef __vtkArcPlotter_h
-#define __vtkArcPlotter_h
+#ifndef vtkArcPlotter_h
+#define vtkArcPlotter_h
 
 #include "vtkRenderingAnnotationModule.h" // For export macro
 #include "vtkPolyDataAlgorithm.h"
diff --git a/Rendering/Annotation/vtkAxesActor.h b/Rendering/Annotation/vtkAxesActor.h
index a82fff392eb35528848e3aa5cf3270fc0e53d359..eaf70ea1da72ef8c4e61453b267e5b8863b5d5ea 100644
--- a/Rendering/Annotation/vtkAxesActor.h
+++ b/Rendering/Annotation/vtkAxesActor.h
@@ -42,8 +42,8 @@
 // vtkAnnotatedCubeActor vtkOrientationMarkerWidget vtkCaptionActor2D
 // vtkTextProperty
 
-#ifndef __vtkAxesActor_h
-#define __vtkAxesActor_h
+#ifndef vtkAxesActor_h
+#define vtkAxesActor_h
 
 #include "vtkRenderingAnnotationModule.h" // For export macro
 #include "vtkProp3D.h"
diff --git a/Rendering/Annotation/vtkAxisActor.h b/Rendering/Annotation/vtkAxisActor.h
index 613ecaedce713d380308d772bedbb11ceafa9b3b..295eebe983c32ee5b477cb1512a6372bd5501f69 100644
--- a/Rendering/Annotation/vtkAxisActor.h
+++ b/Rendering/Annotation/vtkAxisActor.h
@@ -48,8 +48,8 @@ PURPOSE.  See the above copyright notice for more information.
 // .SECTION See Also
 // vtkActor vtkVectorText vtkPolyDataMapper vtkAxisActor2D vtkCoordinate
 
-#ifndef __vtkAxisActor_h
-#define __vtkAxisActor_h
+#ifndef vtkAxisActor_h
+#define vtkAxisActor_h
 
 #include "vtkRenderingAnnotationModule.h" // For export macro
 #include "vtkActor.h"
diff --git a/Rendering/Annotation/vtkAxisActor2D.h b/Rendering/Annotation/vtkAxisActor2D.h
index 0e9117b8b2746c866ead3605b93aec48a1db8910..aaa757e6c0098f4e3815d415860af896df4ff044 100644
--- a/Rendering/Annotation/vtkAxisActor2D.h
+++ b/Rendering/Annotation/vtkAxisActor2D.h
@@ -51,8 +51,8 @@
 // vtkActor2D vtkTextMapper vtkPolyDataMapper2D vtkScalarBarActor
 // vtkCoordinate vtkTextProperty
 
-#ifndef __vtkAxisActor2D_h
-#define __vtkAxisActor2D_h
+#ifndef vtkAxisActor2D_h
+#define vtkAxisActor2D_h
 
 #include "vtkRenderingAnnotationModule.h" // For export macro
 #include "vtkActor2D.h"
diff --git a/Rendering/Annotation/vtkAxisFollower.h b/Rendering/Annotation/vtkAxisFollower.h
index 15f9d58b434a6ced7e745a3986bc8a470bb1f145..b4330f4dc0e903e39db8bc4c2dfcc145e1d6c9f5 100644
--- a/Rendering/Annotation/vtkAxisFollower.h
+++ b/Rendering/Annotation/vtkAxisFollower.h
@@ -24,8 +24,8 @@
 // vtkActor vtkFollower vtkCamera vtkAxisActor vtkCubeAxesActor
 
 
-#ifndef __vtkAxisFollower_h
-#define __vtkAxisFollower_h
+#ifndef vtkAxisFollower_h
+#define vtkAxisFollower_h
 
 #include "vtkRenderingAnnotationModule.h" // For export macro
 #include "vtkFollower.h"
@@ -167,4 +167,4 @@ private:
 
 };
 
-#endif // __vtkAxisFollower_h
+#endif // vtkAxisFollower_h
diff --git a/Rendering/Annotation/vtkBarChartActor.h b/Rendering/Annotation/vtkBarChartActor.h
index b101e23c7bcc38fef5e9c24182eac68b0a9621ca..678607e10a190636228df80f401ebffe2ae9d394 100644
--- a/Rendering/Annotation/vtkBarChartActor.h
+++ b/Rendering/Annotation/vtkBarChartActor.h
@@ -28,8 +28,8 @@
 // vtkParallelCoordinatesActor vtkXYPlotActor vtkSpiderPlotActor
 // vtkPieChartActor
 
-#ifndef __vtkBarChartActor_h
-#define __vtkBarChartActor_h
+#ifndef vtkBarChartActor_h
+#define vtkBarChartActor_h
 
 #include "vtkRenderingAnnotationModule.h" // For export macro
 #include "vtkActor2D.h"
diff --git a/Rendering/Annotation/vtkCaptionActor2D.h b/Rendering/Annotation/vtkCaptionActor2D.h
index 558317915ea4ee25f131412968033c500e27f05b..3e9884cac75f07713eff4dba9faa741666fd59b6 100644
--- a/Rendering/Annotation/vtkCaptionActor2D.h
+++ b/Rendering/Annotation/vtkCaptionActor2D.h
@@ -49,8 +49,8 @@
 // vtkLegendBoxActor vtkTextMapper vtkTextActor vtkTextProperty
 // vtkCoordinate
 
-#ifndef __vtkCaptionActor2D_h
-#define __vtkCaptionActor2D_h
+#ifndef vtkCaptionActor2D_h
+#define vtkCaptionActor2D_h
 
 #include "vtkRenderingAnnotationModule.h" // For export macro
 #include "vtkActor2D.h"
diff --git a/Rendering/Annotation/vtkConvexHull2D.h b/Rendering/Annotation/vtkConvexHull2D.h
index 63ca8ecc6008ce8ab599d34278ab9c15d6598e5b..b34e51a40a093d87f3221d7f9fac85946cc3f6ca 100644
--- a/Rendering/Annotation/vtkConvexHull2D.h
+++ b/Rendering/Annotation/vtkConvexHull2D.h
@@ -42,8 +42,8 @@
 // .SECTION Thanks
 // Thanks to Colin Myers, University of Leeds for providing this implementation.
 
-#ifndef __vtkConvexHull2D_h
-#define __vtkConvexHull2D_h
+#ifndef vtkConvexHull2D_h
+#define vtkConvexHull2D_h
 
 #include "vtkRenderingAnnotationModule.h" // For export macro
 #include "vtkPolyDataAlgorithm.h"
@@ -144,4 +144,4 @@ private:
   vtkSmartPointer<vtkPolygon> HullSource;
 };
 
-#endif // __vtkConvexHull2D_h
+#endif // vtkConvexHull2D_h
diff --git a/Rendering/Annotation/vtkCornerAnnotation.h b/Rendering/Annotation/vtkCornerAnnotation.h
index 18281739e6f71eb975273b75ec1c5b7b87da3471..593f72120aa7ba44453fb551ebfe8c76e52bc1c8 100644
--- a/Rendering/Annotation/vtkCornerAnnotation.h
+++ b/Rendering/Annotation/vtkCornerAnnotation.h
@@ -30,8 +30,8 @@
 // .SECTION See Also
 // vtkActor2D vtkTextMapper
 
-#ifndef __vtkCornerAnnotation_h
-#define __vtkCornerAnnotation_h
+#ifndef vtkCornerAnnotation_h
+#define vtkCornerAnnotation_h
 
 #include "vtkRenderingAnnotationModule.h" // For export macro
 #include "vtkActor2D.h"
diff --git a/Rendering/Annotation/vtkCubeAxesActor.h b/Rendering/Annotation/vtkCubeAxesActor.h
index 24f30c29149fb38b9cd6ceb028683fd7ff9e7934..3bf61a59c195ced54e08c478fa77b51cb19d1197 100644
--- a/Rendering/Annotation/vtkCubeAxesActor.h
+++ b/Rendering/Annotation/vtkCubeAxesActor.h
@@ -53,8 +53,8 @@ All rights reserve
 // .section See Also
 // vtkActor vtkAxisActor vtkCubeAxesActor2D
 
-#ifndef __vtkCubeAxesActor_h
-#define __vtkCubeAxesActor_h
+#ifndef vtkCubeAxesActor_h
+#define vtkCubeAxesActor_h
 
 #define VTK_FLY_OUTER_EDGES     0
 #define VTK_FLY_CLOSEST_TRIAD   1
diff --git a/Rendering/Annotation/vtkCubeAxesActor2D.h b/Rendering/Annotation/vtkCubeAxesActor2D.h
index a65ee12c2bf6941c4e42d4194c997585847753d6..3a084c535b1257448b6804ba26843483be5f2995 100644
--- a/Rendering/Annotation/vtkCubeAxesActor2D.h
+++ b/Rendering/Annotation/vtkCubeAxesActor2D.h
@@ -40,8 +40,8 @@
 // .SECTION See Also
 // vtkActor2D vtkAxisActor2D vtkXYPlotActor vtkTextProperty
 
-#ifndef __vtkCubeAxesActor2D_h
-#define __vtkCubeAxesActor2D_h
+#ifndef vtkCubeAxesActor2D_h
+#define vtkCubeAxesActor2D_h
 
 #include "vtkRenderingAnnotationModule.h" // For export macro
 #include "vtkActor2D.h"
diff --git a/Rendering/Annotation/vtkGraphAnnotationLayersFilter.h b/Rendering/Annotation/vtkGraphAnnotationLayersFilter.h
index 81bad089d83e3f92149ade6841985ecc9a0a6607..09529c13dc440aa45cd9c16e77570223b4b28911 100644
--- a/Rendering/Annotation/vtkGraphAnnotationLayersFilter.h
+++ b/Rendering/Annotation/vtkGraphAnnotationLayersFilter.h
@@ -43,8 +43,8 @@
 // .SECTION Thanks
 // Thanks to Colin Myers, University of Leeds for providing this implementation.
 
-#ifndef __vtkGraphAnnotationLayersFilter_h
-#define __vtkGraphAnnotationLayersFilter_h
+#ifndef vtkGraphAnnotationLayersFilter_h
+#define vtkGraphAnnotationLayersFilter_h
 
 #include "vtkRenderingAnnotationModule.h" // For export macro
 #include "vtkPolyDataAlgorithm.h"
@@ -120,4 +120,4 @@ private:
   vtkSmartPointer<vtkConvexHull2D> ConvexHullFilter;
 };
 
-#endif // __vtkGraphAnnotationLayersFilter_h
+#endif // vtkGraphAnnotationLayersFilter_h
diff --git a/Rendering/Annotation/vtkLeaderActor2D.h b/Rendering/Annotation/vtkLeaderActor2D.h
index 7c2aaa5c3d101aa5e04ed9c3e982587b2641ca00..022bffe9e3d1b270014f6aefe55550723428d592 100644
--- a/Rendering/Annotation/vtkLeaderActor2D.h
+++ b/Rendering/Annotation/vtkLeaderActor2D.h
@@ -37,8 +37,8 @@
 // .SECTION See Also
 // vtkAxisActor2D vtkActor2D vtkCoordinate vtkTextProperty
 
-#ifndef __vtkLeaderActor2D_h
-#define __vtkLeaderActor2D_h
+#ifndef vtkLeaderActor2D_h
+#define vtkLeaderActor2D_h
 
 #include "vtkRenderingAnnotationModule.h" // For export macro
 #include "vtkActor2D.h"
diff --git a/Rendering/Annotation/vtkLegendBoxActor.h b/Rendering/Annotation/vtkLegendBoxActor.h
index 72c8ee894662e78266461fad4ac24f39fdc46fcc..611a26892d048c24c6c894a67e3b089df3fc249c 100644
--- a/Rendering/Annotation/vtkLegendBoxActor.h
+++ b/Rendering/Annotation/vtkLegendBoxActor.h
@@ -32,8 +32,8 @@
 // .SECTION See Also
 // vtkXYPlotActor vtkActor2D vtkGlyphSource2D
 
-#ifndef __vtkLegendBoxActor_h
-#define __vtkLegendBoxActor_h
+#ifndef vtkLegendBoxActor_h
+#define vtkLegendBoxActor_h
 
 #include "vtkRenderingAnnotationModule.h" // For export macro
 #include "vtkActor2D.h"
diff --git a/Rendering/Annotation/vtkLegendScaleActor.h b/Rendering/Annotation/vtkLegendScaleActor.h
index ccc3e7aee775236dcdde1153c2ad9ae31eb5fbef..9224a063eeb3ca1afd2b23274e667391f1888244 100644
--- a/Rendering/Annotation/vtkLegendScaleActor.h
+++ b/Rendering/Annotation/vtkLegendScaleActor.h
@@ -31,8 +31,8 @@
 // computed distances may provide users the wrong sense of scale. These
 // effects are not present when parallel projection is enabled.
 
-#ifndef __vtkLegendScaleActor_h
-#define __vtkLegendScaleActor_h
+#ifndef vtkLegendScaleActor_h
+#define vtkLegendScaleActor_h
 
 #include "vtkRenderingAnnotationModule.h" // For export macro
 #include "vtkProp.h"
diff --git a/Rendering/Annotation/vtkParallelCoordinatesActor.h b/Rendering/Annotation/vtkParallelCoordinatesActor.h
index cd9bbc55ba41bacd889d0cb3f524f3e83688da52..95419f545ec08a77ec135aa8e52b5c26ce627139 100644
--- a/Rendering/Annotation/vtkParallelCoordinatesActor.h
+++ b/Rendering/Annotation/vtkParallelCoordinatesActor.h
@@ -52,8 +52,8 @@
 // vtkActor2D vtkTextMapper vtkPolyDataMapper2D vtkScalarBarActor
 // vtkCoordinate vtkTextProperty
 
-#ifndef __vtkParallelCoordinatesActor_h
-#define __vtkParallelCoordinatesActor_h
+#ifndef vtkParallelCoordinatesActor_h
+#define vtkParallelCoordinatesActor_h
 
 #include "vtkRenderingAnnotationModule.h" // For export macro
 #include "vtkActor2D.h"
diff --git a/Rendering/Annotation/vtkPieChartActor.h b/Rendering/Annotation/vtkPieChartActor.h
index 8ab1e64eba96463ad3a7592839289244e7e43a30..baca873e906af50ec7d5a85a48c1126bf1343d6e 100644
--- a/Rendering/Annotation/vtkPieChartActor.h
+++ b/Rendering/Annotation/vtkPieChartActor.h
@@ -28,8 +28,8 @@
 // .SECTION See Also
 // vtkParallelCoordinatesActor vtkXYPlotActor2D vtkSpiderPlotActor
 
-#ifndef __vtkPieChartActor_h
-#define __vtkPieChartActor_h
+#ifndef vtkPieChartActor_h
+#define vtkPieChartActor_h
 
 #include "vtkRenderingAnnotationModule.h" // For export macro
 #include "vtkActor2D.h"
diff --git a/Rendering/Annotation/vtkPolarAxesActor.h b/Rendering/Annotation/vtkPolarAxesActor.h
index 084fd4c18b87839cd11f7b3a473e1e8dbf26ddfd..3523cf6ba2c3a7a15acbdd29d456ad7b440ef8ec 100644
--- a/Rendering/Annotation/vtkPolarAxesActor.h
+++ b/Rendering/Annotation/vtkPolarAxesActor.h
@@ -30,8 +30,8 @@ All rights reserve
 // .section See Also
 // vtkActor vtkAxisActor vtkPolarAxesActor
 
-#ifndef __vtkPolarAxesActor_h
-#define __vtkPolarAxesActor_h
+#ifndef vtkPolarAxesActor_h
+#define vtkPolarAxesActor_h
 
 #define VTK_MAXIMUM_NUMBER_OF_RADIAL_AXES 50
 #define VTK_DEFAULT_NUMBER_OF_RADIAL_AXES 5
diff --git a/Rendering/Annotation/vtkProp3DAxisFollower.h b/Rendering/Annotation/vtkProp3DAxisFollower.h
index 8e57bc7eaac676cc1f4fc5a42cf6b3df2707025d..517f870b42eaded95cec8a2660d45ce657673881 100644
--- a/Rendering/Annotation/vtkProp3DAxisFollower.h
+++ b/Rendering/Annotation/vtkProp3DAxisFollower.h
@@ -23,8 +23,8 @@
 // .SECTION see also
 // vtkFollower vtkAxisFollower vtkProp3DFollower
 
-#ifndef __vtkProp3DAxisFollower_h
-#define __vtkProp3DAxisFollower_h
+#ifndef vtkProp3DAxisFollower_h
+#define vtkProp3DAxisFollower_h
 
 #include "vtkRenderingAnnotationModule.h" // For export macro
 #include "vtkProp3DFollower.h"
diff --git a/Rendering/Annotation/vtkScalarBarActor.h b/Rendering/Annotation/vtkScalarBarActor.h
index 39428fddcc92357e922f637c46b2985e01a633e7..885e7ef1f0a87603248c7b1df3b2eb94156ef01f 100644
--- a/Rendering/Annotation/vtkScalarBarActor.h
+++ b/Rendering/Annotation/vtkScalarBarActor.h
@@ -50,8 +50,8 @@
 // .SECTION See Also
 // vtkActor2D vtkTextProperty vtkTextMapper vtkPolyDataMapper2D
 
-#ifndef __vtkScalarBarActor_h
-#define __vtkScalarBarActor_h
+#ifndef vtkScalarBarActor_h
+#define vtkScalarBarActor_h
 
 #include "vtkRenderingAnnotationModule.h" // For export macro
 #include "vtkActor2D.h"
diff --git a/Rendering/Annotation/vtkScalarBarActorInternal.h b/Rendering/Annotation/vtkScalarBarActorInternal.h
index 40b56b13dd0b3a82c977210485c45c8751f8cd94..4d79e1e3b053b79154d364c939ee888181f6af03 100644
--- a/Rendering/Annotation/vtkScalarBarActorInternal.h
+++ b/Rendering/Annotation/vtkScalarBarActorInternal.h
@@ -1,5 +1,5 @@
-#ifndef __vtkScalarBarActorInternal_h
-#define __vtkScalarBarActorInternal_h
+#ifndef vtkScalarBarActorInternal_h
+#define vtkScalarBarActorInternal_h
 // VTK-HeaderTest-Exclude: vtkScalarBarActorInternal.h
 
 #include "vtkColor.h" // for AnnotationColors, LabelColorMap, and tuples
@@ -158,4 +158,4 @@ public:
   //@}
 };
 
-#endif // __vtkScalarBarActorInternal_h
+#endif // vtkScalarBarActorInternal_h
diff --git a/Rendering/Annotation/vtkSpiderPlotActor.h b/Rendering/Annotation/vtkSpiderPlotActor.h
index 551203daa55801f5b9099617378e5d102976d93a..e7f09decddb05ebb2b3065cc8946331d11e8f8d8 100644
--- a/Rendering/Annotation/vtkSpiderPlotActor.h
+++ b/Rendering/Annotation/vtkSpiderPlotActor.h
@@ -42,8 +42,8 @@
 // .SECTION See Also
 // vtkParallelCoordinatesActor vtkXYPlotActor2D
 
-#ifndef __vtkSpiderPlotActor_h
-#define __vtkSpiderPlotActor_h
+#ifndef vtkSpiderPlotActor_h
+#define vtkSpiderPlotActor_h
 
 #include "vtkRenderingAnnotationModule.h" // For export macro
 #include "vtkActor2D.h"
diff --git a/Rendering/Annotation/vtkXYPlotActor.h b/Rendering/Annotation/vtkXYPlotActor.h
index 7377f68e7f6b336cd9e1314d12188cdb196efacf..740e31b107e43a3152caf3c930a19ce0d65efd51 100644
--- a/Rendering/Annotation/vtkXYPlotActor.h
+++ b/Rendering/Annotation/vtkXYPlotActor.h
@@ -82,8 +82,8 @@
 // vtkAttributeDataToFieldDataFilter vtkFieldDataToAttributeDataFilter
 // vtkTextProperty
 
-#ifndef __vtkXYPlotActor_h
-#define __vtkXYPlotActor_h
+#ifndef vtkXYPlotActor_h
+#define vtkXYPlotActor_h
 
 #define VTK_XYPLOT_INDEX                 0
 #define VTK_XYPLOT_ARC_LENGTH            1
diff --git a/Rendering/Context2D/vtkAbstractContextBufferId.h b/Rendering/Context2D/vtkAbstractContextBufferId.h
index 877d9d19256f7066b93fe1fd1952fd43911bbbed..ecb1cf3e38515066723165da85af9bf25af451f8 100644
--- a/Rendering/Context2D/vtkAbstractContextBufferId.h
+++ b/Rendering/Context2D/vtkAbstractContextBufferId.h
@@ -32,8 +32,8 @@
 // .SECTION See Also
 // vtkContextBufferId, vtkOpenGLContextBufferId
 
-#ifndef __vtkAbstractContextBufferId_h
-#define __vtkAbstractContextBufferId_h
+#ifndef vtkAbstractContextBufferId_h
+#define vtkAbstractContextBufferId_h
 
 #include "vtkRenderingContext2DModule.h" // For export macro
 #include "vtkObject.h"
@@ -117,4 +117,4 @@ private:
   void operator=(const vtkAbstractContextBufferId &);   // Not implemented.
 };
 
-#endif // #ifndef __vtkAbstractContextBufferId_h
+#endif // #ifndef vtkAbstractContextBufferId_h
diff --git a/Rendering/Context2D/vtkAbstractContextItem.h b/Rendering/Context2D/vtkAbstractContextItem.h
index 251f29d1a22dd47728de93ea37a3897e93e44613..cddbafc7cfd0c96012caa4b1560a47b7b0ae2138 100644
--- a/Rendering/Context2D/vtkAbstractContextItem.h
+++ b/Rendering/Context2D/vtkAbstractContextItem.h
@@ -21,8 +21,8 @@
 // generally derive from vtkContextItem, rather than this class, as it provides
 // most of the commonly used API.
 
-#ifndef __vtkAbstractContextItem_h
-#define __vtkAbstractContextItem_h
+#ifndef vtkAbstractContextItem_h
+#define vtkAbstractContextItem_h
 
 #include "vtkRenderingContext2DModule.h" // For export macro
 #include "vtkObject.h"
@@ -241,4 +241,4 @@ private:
 //ETX
 };
 
-#endif //__vtkContextItem_h
+#endif //vtkContextItem_h
diff --git a/Rendering/Context2D/vtkBlockItem.h b/Rendering/Context2D/vtkBlockItem.h
index 73ff9fb62845018885522bea54334628d8c8d80d..0cde10d5670b3d59b8288e0b8eab99333d33e60a 100644
--- a/Rendering/Context2D/vtkBlockItem.h
+++ b/Rendering/Context2D/vtkBlockItem.h
@@ -19,8 +19,8 @@
 // This is a vtkContextItem that can be placed into a vtkContextScene. It draws
 // a block of the given dimensions, and reacts to mouse events.
 
-#ifndef __vtkBlockItem_h
-#define __vtkBlockItem_h
+#ifndef vtkBlockItem_h
+#define vtkBlockItem_h
 
 #include "vtkRenderingContext2DModule.h" // For export macro
 #include "vtkContextItem.h"
@@ -112,4 +112,4 @@ private:
 //ETX
 };
 
-#endif //__vtkBlockItem_h
+#endif //vtkBlockItem_h
diff --git a/Rendering/Context2D/vtkBrush.h b/Rendering/Context2D/vtkBrush.h
index 4ff75fb85298a72c61860c208f8f95dd3cc16710..7a4b0c5e5aa779a2856cee2da66350a4cd19ee09 100644
--- a/Rendering/Context2D/vtkBrush.h
+++ b/Rendering/Context2D/vtkBrush.h
@@ -22,8 +22,8 @@
 // components. Ideally we would use a lightweight color class to store and pass
 // around colors.
 
-#ifndef __vtkBrush_h
-#define __vtkBrush_h
+#ifndef vtkBrush_h
+#define vtkBrush_h
 
 #include "vtkRenderingContext2DModule.h" // For export macro
 #include "vtkObject.h"
@@ -158,4 +158,4 @@ private:
 //ETX
 };
 
-#endif //__vtkBrush_h
+#endif //vtkBrush_h
diff --git a/Rendering/Context2D/vtkContext2D.h b/Rendering/Context2D/vtkContext2D.h
index cbb3db8eac55bbfe5d41c9008fbc672c3b71d493..a637541510e355bfdef021c07b5bc5a07bb5c87f 100644
--- a/Rendering/Context2D/vtkContext2D.h
+++ b/Rendering/Context2D/vtkContext2D.h
@@ -21,8 +21,8 @@
 // to facilitate the low level calls to the context. Currently only an OpenGL
 // based device is provided, but this could be extended in the future.
 
-#ifndef __vtkContext2D_h
-#define __vtkContext2D_h
+#ifndef vtkContext2D_h
+#define vtkContext2D_h
 
 #include "vtkRenderingContext2DModule.h" // For export macro
 #include "vtkObject.h"
@@ -455,4 +455,4 @@ inline int vtkContext2D::FloatToInt(float x)
   return static_cast<int>(x + tol);
 }
 
-#endif //__vtkContext2D_h
+#endif //vtkContext2D_h
diff --git a/Rendering/Context2D/vtkContext3D.h b/Rendering/Context2D/vtkContext3D.h
index 4ce5345ee69c1390e5be90f2976021560526657c..57832cf46deb6f2c62336870a6f01d4a80a681f5 100644
--- a/Rendering/Context2D/vtkContext3D.h
+++ b/Rendering/Context2D/vtkContext3D.h
@@ -21,8 +21,8 @@
 // to facilitate the low level calls to the context. Currently only an OpenGL
 // based device is provided.
 
-#ifndef __vtkContext3D_h
-#define __vtkContext3D_h
+#ifndef vtkContext3D_h
+#define vtkContext3D_h
 
 #include "vtkRenderingContext2DModule.h" // For export macro
 #include "vtkObject.h"
diff --git a/Rendering/Context2D/vtkContextActor.h b/Rendering/Context2D/vtkContextActor.h
index 22f65638b65cb19f1f97484f22b120cbb6d0f851..a7e78a46bdb98897efb84f53926545444cecff82 100644
--- a/Rendering/Context2D/vtkContextActor.h
+++ b/Rendering/Context2D/vtkContextActor.h
@@ -18,8 +18,8 @@
 // in a vtkRenderer. Uses the RenderOverlay pass to render the 2D
 // vtkContextScene.
 
-#ifndef __vtkContextActor_h
-#define __vtkContextActor_h
+#ifndef vtkContextActor_h
+#define vtkContextActor_h
 
 #include "vtkRenderingContext2DModule.h" // For export macro
 #include "vtkProp.h"
diff --git a/Rendering/Context2D/vtkContextClip.h b/Rendering/Context2D/vtkContextClip.h
index 5a94e1d7253826e295ee953a2fd8a63757f3474a..5cdaebe5070fc81d1ab086813ce2ba43ca5434c4 100644
--- a/Rendering/Context2D/vtkContextClip.h
+++ b/Rendering/Context2D/vtkContextClip.h
@@ -20,8 +20,8 @@
 // This class can be used to clip the rendering of an item inside a rectangular
 // area.
 
-#ifndef __vtkContextClip_h
-#define __vtkContextClip_h
+#ifndef vtkContextClip_h
+#define vtkContextClip_h
 
 #include "vtkRenderingContext2DModule.h" // For export macro
 #include "vtkAbstractContextItem.h"
@@ -65,4 +65,4 @@ private:
 //ETX
 };
 
-#endif //__vtkContextClip_h
+#endif //vtkContextClip_h
diff --git a/Rendering/Context2D/vtkContextDevice2D.h b/Rendering/Context2D/vtkContextDevice2D.h
index 74d190f034642ff1c944a01dc7307b7b1b4706c6..926e9941a35f0fb3fd4f0554ac47435f526c6e71 100644
--- a/Rendering/Context2D/vtkContextDevice2D.h
+++ b/Rendering/Context2D/vtkContextDevice2D.h
@@ -20,8 +20,8 @@
 // ContextDevice is a class used to paint 2D primitives onto a device, such as
 // an OpenGL context or a QGraphicsView.
 
-#ifndef __vtkContextDevice2D_h
-#define __vtkContextDevice2D_h
+#ifndef vtkContextDevice2D_h
+#define vtkContextDevice2D_h
 
 #include "vtkRenderingContext2DModule.h" // For export macro
 #include "vtkObject.h"
@@ -337,4 +337,4 @@ private:
 //ETX
 };
 
-#endif //__vtkContextDevice2D_h
+#endif //vtkContextDevice2D_h
diff --git a/Rendering/Context2D/vtkContextDevice3D.h b/Rendering/Context2D/vtkContextDevice3D.h
index 12bd0bff6c6fb2f1e550aeab8142fb0a1f7803b3..66de5cf53fdcfa761a61723a65ac5f7d35283c66 100644
--- a/Rendering/Context2D/vtkContextDevice3D.h
+++ b/Rendering/Context2D/vtkContextDevice3D.h
@@ -22,8 +22,8 @@
 //
 // This is private API, and should not be used outside of the vtkContext3D.
 
-#ifndef __vtkContextDevice3D_h
-#define __vtkContextDevice3D_h
+#ifndef vtkContextDevice3D_h
+#define vtkContextDevice3D_h
 
 #include "vtkRenderingContext2DModule.h" // For export macro
 #include "vtkObject.h"
diff --git a/Rendering/Context2D/vtkContextItem.h b/Rendering/Context2D/vtkContextItem.h
index d6afe0bedda61afd079cbb392eb892d0b95fd1d2..712759c40ac2f4daf5c351d225b7108d1777e6ce 100644
--- a/Rendering/Context2D/vtkContextItem.h
+++ b/Rendering/Context2D/vtkContextItem.h
@@ -19,8 +19,8 @@
 // Derive from this class to create custom items that can be added to a
 // vtkContextScene.
 
-#ifndef __vtkContextItem_h
-#define __vtkContextItem_h
+#ifndef vtkContextItem_h
+#define vtkContextItem_h
 
 #include "vtkRenderingContext2DModule.h" // For export macro
 #include "vtkAbstractContextItem.h"
@@ -53,4 +53,4 @@ private:
 //ETX
 };
 
-#endif //__vtkContextItem_h
+#endif //vtkContextItem_h
diff --git a/Rendering/Context2D/vtkContextKeyEvent.h b/Rendering/Context2D/vtkContextKeyEvent.h
index f66695f0f4ff3b30076ca213fd0ff589f00076d4..0dc1471f7e0f3622e0defb71ce6a8b9ffd77d352 100644
--- a/Rendering/Context2D/vtkContextKeyEvent.h
+++ b/Rendering/Context2D/vtkContextKeyEvent.h
@@ -19,8 +19,8 @@
 // Provides a convenient data structure to represent key events in the
 // vtkContextScene. Passed to vtkAbstractContextItem objects.
 
-#ifndef __vtkContextKeyEvent_h
-#define __vtkContextKeyEvent_h
+#ifndef vtkContextKeyEvent_h
+#define vtkContextKeyEvent_h
 
 #include "vtkRenderingContext2DModule.h" // For export macro
 #include "vtkWeakPointer.h" // For vtkWeakPointer
@@ -58,5 +58,5 @@ protected:
   vtkVector2i Position;
 };
 
-#endif // __vtkContextKeyEvent_h
+#endif // vtkContextKeyEvent_h
 // VTK-HeaderTest-Exclude: vtkContextKeyEvent.h
diff --git a/Rendering/Context2D/vtkContextMapper2D.h b/Rendering/Context2D/vtkContextMapper2D.h
index 1e57e4126a64c19c2a4ef04a7895dc44b4cb81f2..564d999deaa634df484c58b54ac47e270c58a577 100644
--- a/Rendering/Context2D/vtkContextMapper2D.h
+++ b/Rendering/Context2D/vtkContextMapper2D.h
@@ -20,8 +20,8 @@
 // This class provides an abstract base for 2D context mappers. They currently
 // only accept vtkTable objects as input.
 
-#ifndef __vtkContextMapper2D_h
-#define __vtkContextMapper2D_h
+#ifndef vtkContextMapper2D_h
+#define vtkContextMapper2D_h
 
 #include "vtkRenderingContext2DModule.h" // For export macro
 #include "vtkAlgorithm.h"
@@ -72,4 +72,4 @@ private:
 //ETX
 };
 
-#endif //__vtkContextMapper2D_h
+#endif //vtkContextMapper2D_h
diff --git a/Rendering/Context2D/vtkContextMouseEvent.h b/Rendering/Context2D/vtkContextMouseEvent.h
index 7454475e07b9808d3860c0009734cff7af39565f..b64fd0e5c8e00fbf312b4634b8d1eb9e0b677e67 100644
--- a/Rendering/Context2D/vtkContextMouseEvent.h
+++ b/Rendering/Context2D/vtkContextMouseEvent.h
@@ -19,8 +19,8 @@
 // Provides a convenient data structure to represent mouse events in the
 // vtkContextScene. Passed to vtkAbstractContextItem objects.
 
-#ifndef __vtkContextMouseEvent_h
-#define __vtkContextMouseEvent_h
+#ifndef vtkContextMouseEvent_h
+#define vtkContextMouseEvent_h
 
 #include "vtkRenderingContext2DModule.h" // For export macro
 #include "vtkWin32Header.h" // For export macros.
@@ -146,5 +146,5 @@ protected:
   vtkRenderWindowInteractor *Interactor;
 };
 
-#endif // __vtkContextMouseEvent_h
+#endif // vtkContextMouseEvent_h
 // VTK-HeaderTest-Exclude: vtkContextMouseEvent.h
diff --git a/Rendering/Context2D/vtkContextScene.h b/Rendering/Context2D/vtkContextScene.h
index 403b7c6bfa92b8469e2f358172706572d4ade670..f32e445bbe508c548c80b087d782f3c09316c775 100644
--- a/Rendering/Context2D/vtkContextScene.h
+++ b/Rendering/Context2D/vtkContextScene.h
@@ -20,8 +20,8 @@
 // items, ensures that they are rendered at the right times and passes on mouse
 // events.
 
-#ifndef __vtkContextScene_h
-#define __vtkContextScene_h
+#ifndef vtkContextScene_h
+#define vtkContextScene_h
 
 #include "vtkRenderingContext2DModule.h" // For export macro
 #include "vtkObject.h"
@@ -294,4 +294,4 @@ private:
 //ETX
 };
 
-#endif //__vtkContextScene_h
+#endif //vtkContextScene_h
diff --git a/Rendering/Context2D/vtkContextScenePrivate.h b/Rendering/Context2D/vtkContextScenePrivate.h
index d1ab0b77edfd52a0ebe6b1cb5c1a25fa206047d6..6093f1c2f4992d2b4b6ed0d52b0347091d7d00d2 100644
--- a/Rendering/Context2D/vtkContextScenePrivate.h
+++ b/Rendering/Context2D/vtkContextScenePrivate.h
@@ -22,8 +22,8 @@
 //
 // \internal
 
-#ifndef __vtkContextScenePrivate_h
-#define __vtkContextScenePrivate_h
+#ifndef vtkContextScenePrivate_h
+#define vtkContextScenePrivate_h
 
 #include "vtkAbstractContextItem.h"
 #include "vtkContextScene.h"
@@ -161,5 +161,5 @@ public:
   vtkAbstractContextItem* Item;
 };
 
-#endif //__vtkContextScenePrivate_h
+#endif //vtkContextScenePrivate_h
 // VTK-HeaderTest-Exclude: vtkContextScenePrivate.h
diff --git a/Rendering/Context2D/vtkContextTransform.h b/Rendering/Context2D/vtkContextTransform.h
index 333fa8dddb35f5f28929f58575941302235a8bc8..5c442b13d2af5fd1a3e27d9b079f94913cbf364e 100644
--- a/Rendering/Context2D/vtkContextTransform.h
+++ b/Rendering/Context2D/vtkContextTransform.h
@@ -20,8 +20,8 @@
 // This class can be used to transform all child items of this class. The
 // default transform is the identity.
 
-#ifndef __vtkContextTransform_h
-#define __vtkContextTransform_h
+#ifndef vtkContextTransform_h
+#define vtkContextTransform_h
 
 #include "vtkRenderingContext2DModule.h" // For export macro
 #include "vtkAbstractContextItem.h"
@@ -181,4 +181,4 @@ private:
 //ETX
 };
 
-#endif //__vtkContextTransform_h
+#endif //vtkContextTransform_h
diff --git a/Rendering/Context2D/vtkImageItem.h b/Rendering/Context2D/vtkImageItem.h
index 2edbe7d9380d24d4b0f4892fd22e19a09355f999..369de9ac7a823f63b91e6a2aa184d08af430e21a 100644
--- a/Rendering/Context2D/vtkImageItem.h
+++ b/Rendering/Context2D/vtkImageItem.h
@@ -19,8 +19,8 @@
 // .SECTION Description
 // This vtkContextItem draws the supplied image in the scene.
 
-#ifndef __vtkImageItem_h
-#define __vtkImageItem_h
+#ifndef vtkImageItem_h
+#define vtkImageItem_h
 
 #include "vtkRenderingContext2DModule.h" // For export macro
 #include "vtkContextItem.h"
@@ -71,4 +71,4 @@ private:
 //ETX
 };
 
-#endif //__vtkImageItem_h
+#endif //vtkImageItem_h
diff --git a/Rendering/Context2D/vtkMarkerUtilities.h b/Rendering/Context2D/vtkMarkerUtilities.h
index 94c03bac3ac3f46f4bb03e4e235b9fc5b083fa05..4d7a7f610c2dee2e0e67403ad84a3050fb5887b1 100644
--- a/Rendering/Context2D/vtkMarkerUtilities.h
+++ b/Rendering/Context2D/vtkMarkerUtilities.h
@@ -22,8 +22,8 @@
 // .SECTION See Also
 // vtkPlotLine, vtkPlotPoints
 
-#ifndef __vtkMarkerUtilities_h
-#define __vtkMarkerUtilities_h
+#ifndef vtkMarkerUtilities_h
+#define vtkMarkerUtilities_h
 
 #include "vtkRenderingContext2DModule.h" // For export macro
 
@@ -65,4 +65,4 @@ private:
 //ETX
 };
 
-#endif //__vtkMarkerUtilities_h
+#endif //vtkMarkerUtilities_h
diff --git a/Rendering/Context2D/vtkPen.h b/Rendering/Context2D/vtkPen.h
index 612f143ce49193782003d64dd0989b36ee2701cf..4e833923216fb5d8a6b7096192bdfaec24a7c003 100644
--- a/Rendering/Context2D/vtkPen.h
+++ b/Rendering/Context2D/vtkPen.h
@@ -23,8 +23,8 @@
 // components. Ideally we would use a lightweight color class to store and pass
 // around colors.
 
-#ifndef __vtkPen_h
-#define __vtkPen_h
+#ifndef vtkPen_h
+#define vtkPen_h
 
 #include "vtkRenderingContext2DModule.h" // For export macro
 #include "vtkObject.h"
@@ -154,4 +154,4 @@ private:
 //ETX
 };
 
-#endif //__vtkPen_h
+#endif //vtkPen_h
diff --git a/Rendering/Context2D/vtkTooltipItem.h b/Rendering/Context2D/vtkTooltipItem.h
index 539afe1acee8a6bd2bf5825660c16a86463fa021..0ef634a4b2a1dbb127bee5755ccb57aecccf103f 100644
--- a/Rendering/Context2D/vtkTooltipItem.h
+++ b/Rendering/Context2D/vtkTooltipItem.h
@@ -21,8 +21,8 @@
 // scene, such as in vtkChartXY. It takes care of ensuring that it draws itself
 // within the bounds of the screen.
 
-#ifndef __vtkTooltipItem_h
-#define __vtkTooltipItem_h
+#ifndef vtkTooltipItem_h
+#define vtkTooltipItem_h
 
 #include "vtkRenderingContext2DModule.h" // For export macro
 #include "vtkContextItem.h"
@@ -97,4 +97,4 @@ private:
 //ETX
 };
 
-#endif //__vtkTooltipItem_h
+#endif //vtkTooltipItem_h
diff --git a/Rendering/ContextOpenGL/vtkOpenGL2ContextDevice2D.h b/Rendering/ContextOpenGL/vtkOpenGL2ContextDevice2D.h
index 1b57bd9b7c444a6d4df957b91378615ba7569583..823faf21ce930792fbbe540c34ded937b31e8579 100644
--- a/Rendering/ContextOpenGL/vtkOpenGL2ContextDevice2D.h
+++ b/Rendering/ContextOpenGL/vtkOpenGL2ContextDevice2D.h
@@ -28,8 +28,8 @@
 // .SECTION See Also
 // vtkOpenGLContextDevice2D
 
-#ifndef __vtkOpenGL2ContextDevice2D_h
-#define __vtkOpenGL2ContextDevice2D_h
+#ifndef vtkOpenGL2ContextDevice2D_h
+#define vtkOpenGL2ContextDevice2D_h
 
 #include "vtkOpenGLContextDevice2D.h"
 
@@ -86,4 +86,4 @@ private:
   void operator=(const vtkOpenGL2ContextDevice2D &);   // Not implemented.
 };
 
-#endif //__vtkOpenGL2ContextDevice2D_h
+#endif //vtkOpenGL2ContextDevice2D_h
diff --git a/Rendering/ContextOpenGL/vtkOpenGLContextActor.h b/Rendering/ContextOpenGL/vtkOpenGLContextActor.h
index 8e7cfbc9a697c2de98c41e516652743792ea9584..c7ea1356b0fa4afe02938df7f7b78dc82db6ff06 100644
--- a/Rendering/ContextOpenGL/vtkOpenGLContextActor.h
+++ b/Rendering/ContextOpenGL/vtkOpenGLContextActor.h
@@ -18,8 +18,8 @@
 // in a vtkRenderer. Uses the RenderOverlay pass to render the 2D
 // vtkContextScene.
 
-#ifndef __vtkOpenGLContextActor_h
-#define __vtkOpenGLContextActor_h
+#ifndef vtkOpenGLContextActor_h
+#define vtkOpenGLContextActor_h
 
 #include "vtkRenderingContextOpenGLModule.h" // For export macro
 #include "vtkContextActor.h"
diff --git a/Rendering/ContextOpenGL/vtkOpenGLContextBufferId.h b/Rendering/ContextOpenGL/vtkOpenGLContextBufferId.h
index 437fd9712bb200dc60b443b1469991c954edc595..5f1dcf03b975f20108b6731dd770b6847237696b 100644
--- a/Rendering/ContextOpenGL/vtkOpenGLContextBufferId.h
+++ b/Rendering/ContextOpenGL/vtkOpenGLContextBufferId.h
@@ -19,8 +19,8 @@
 // An 2D array where each element is the id of an entity drawn at the given
 // pixel.
 
-#ifndef __vtkOpenGLContextBufferId_h
-#define __vtkOpenGLContextBufferId_h
+#ifndef vtkOpenGLContextBufferId_h
+#define vtkOpenGLContextBufferId_h
 
 #include "vtkRenderingContextOpenGLModule.h" // For export macro
 #include "vtkAbstractContextBufferId.h"
@@ -91,4 +91,4 @@ private:
   void operator=(const vtkOpenGLContextBufferId &);   // Not implemented.
 };
 
-#endif // #ifndef __vtkOpenGLContextBufferId_h
+#endif // #ifndef vtkOpenGLContextBufferId_h
diff --git a/Rendering/ContextOpenGL/vtkOpenGLContextDevice2D.h b/Rendering/ContextOpenGL/vtkOpenGLContextDevice2D.h
index 81bd8c451f7cc10829262a167233a0c72849c6a1..9124a5bd1d90e7a6cc20edac886840cdeabf0ed7 100644
--- a/Rendering/ContextOpenGL/vtkOpenGLContextDevice2D.h
+++ b/Rendering/ContextOpenGL/vtkOpenGLContextDevice2D.h
@@ -24,8 +24,8 @@
 // .SECTION See Also
 // vtkOpenGL2ContextDevice2D
 
-#ifndef __vtkOpenGLContextDevice2D_h
-#define __vtkOpenGLContextDevice2D_h
+#ifndef vtkOpenGLContextDevice2D_h
+#define vtkOpenGLContextDevice2D_h
 
 #include "vtkRenderingContextOpenGLModule.h" // For export macro
 #include "vtkContextDevice2D.h"
@@ -352,4 +352,4 @@ private:
 //ETX
 };
 
-#endif //__vtkOpenGLContextDevice2D_h
+#endif //vtkOpenGLContextDevice2D_h
diff --git a/Rendering/ContextOpenGL/vtkOpenGLContextDevice2DPrivate.h b/Rendering/ContextOpenGL/vtkOpenGLContextDevice2DPrivate.h
index 438b1cb98d88a0f06f10d8e6dec7e7e2c8ddb585..65026cd3393ea77fbf27ec0a7f6c6dd606ab2631 100644
--- a/Rendering/ContextOpenGL/vtkOpenGLContextDevice2DPrivate.h
+++ b/Rendering/ContextOpenGL/vtkOpenGLContextDevice2DPrivate.h
@@ -27,8 +27,8 @@
 // .Section See Also
 // vtkOpenGLContextDevice2D vtkOpenGL2ContextDevice2D
 
-#ifndef __vtkOpenGLContextDevice2DPrivate_h
-#define __vtkOpenGLContextDevice2DPrivate_h
+#ifndef vtkOpenGLContextDevice2DPrivate_h
+#define vtkOpenGLContextDevice2DPrivate_h
 
 #include "vtkOpenGLContextDevice2D.h"
 
diff --git a/Rendering/ContextOpenGL/vtkOpenGLContextDevice3D.h b/Rendering/ContextOpenGL/vtkOpenGLContextDevice3D.h
index 4c0609304095c8e8d333b2607d2ef8fa6073c1f3..e2a2143e0c15c68a183ed280ee066d9fa6410af1 100644
--- a/Rendering/ContextOpenGL/vtkOpenGLContextDevice3D.h
+++ b/Rendering/ContextOpenGL/vtkOpenGLContextDevice3D.h
@@ -19,8 +19,8 @@
 // This defines the implementation of a 3D context device for drawing simple
 // primitives.
 
-#ifndef __vtkOpenGLContextDevice3D_h
-#define __vtkOpenGLContextDevice3D_h
+#ifndef vtkOpenGLContextDevice3D_h
+#define vtkOpenGLContextDevice3D_h
 
 #include "vtkRenderingContextOpenGLModule.h" // For export macro
 #include "vtkContextDevice3D.h"
diff --git a/Rendering/ContextOpenGL2/vtkOpenGL2ContextDevice2D.h b/Rendering/ContextOpenGL2/vtkOpenGL2ContextDevice2D.h
index 357f4d7e05c916fb05ccd7fad5c273e4b25c80b6..4b80ee63df3705a27cc838dca421df09408dd361 100644
--- a/Rendering/ContextOpenGL2/vtkOpenGL2ContextDevice2D.h
+++ b/Rendering/ContextOpenGL2/vtkOpenGL2ContextDevice2D.h
@@ -28,8 +28,8 @@
 // .SECTION See Also
 // vtkOpenGLContextDevice2D
 
-#ifndef __vtkOpenGL2ContextDevice2D_h
-#define __vtkOpenGL2ContextDevice2D_h
+#ifndef vtkOpenGL2ContextDevice2D_h
+#define vtkOpenGL2ContextDevice2D_h
 
 #include "vtkOpenGLContextDevice2D.h"
 
@@ -82,4 +82,4 @@ private:
   void operator=(const vtkOpenGL2ContextDevice2D &);   // Not implemented.
 };
 
-#endif //__vtkOpenGL2ContextDevice2D_h
+#endif //vtkOpenGL2ContextDevice2D_h
diff --git a/Rendering/ContextOpenGL2/vtkOpenGLContextActor.h b/Rendering/ContextOpenGL2/vtkOpenGLContextActor.h
index 79e27c31c43a7ff4c5136650278c0fda82f1466d..b2391195b25e6169215f5530f4d10fb3e1437fe1 100644
--- a/Rendering/ContextOpenGL2/vtkOpenGLContextActor.h
+++ b/Rendering/ContextOpenGL2/vtkOpenGLContextActor.h
@@ -18,8 +18,8 @@
 // in a vtkRenderer. Uses the RenderOverlay pass to render the 2D
 // vtkContextScene.
 
-#ifndef __vtkOpenGLContextActor_h
-#define __vtkOpenGLContextActor_h
+#ifndef vtkOpenGLContextActor_h
+#define vtkOpenGLContextActor_h
 
 #include "vtkRenderingContextOpenGL2Module.h" // For export macro
 #include "vtkContextActor.h"
diff --git a/Rendering/ContextOpenGL2/vtkOpenGLContextBufferId.h b/Rendering/ContextOpenGL2/vtkOpenGLContextBufferId.h
index 110167cd44b588e44e4609b5209efc7a58566fca..7fd9e9a6aa1a51b7cef46e8cd77a1e84ae0ad135 100644
--- a/Rendering/ContextOpenGL2/vtkOpenGLContextBufferId.h
+++ b/Rendering/ContextOpenGL2/vtkOpenGLContextBufferId.h
@@ -19,8 +19,8 @@
 // An 2D array where each element is the id of an entity drawn at the given
 // pixel.
 
-#ifndef __vtkOpenGLContextBufferId_h
-#define __vtkOpenGLContextBufferId_h
+#ifndef vtkOpenGLContextBufferId_h
+#define vtkOpenGLContextBufferId_h
 
 #include "vtkRenderingContextOpenGL2Module.h" // For export macro
 #include "vtkAbstractContextBufferId.h"
@@ -91,4 +91,4 @@ private:
   void operator=(const vtkOpenGLContextBufferId &);   // Not implemented.
 };
 
-#endif // #ifndef __vtkOpenGLContextBufferId_h
+#endif // #ifndef vtkOpenGLContextBufferId_h
diff --git a/Rendering/ContextOpenGL2/vtkOpenGLContextDevice2D.h b/Rendering/ContextOpenGL2/vtkOpenGLContextDevice2D.h
index 160932a6b7bb431f9b5dce4914319df16532e3d7..8638d10336f26ba6e93a7f40bbe41150a7f90975 100644
--- a/Rendering/ContextOpenGL2/vtkOpenGLContextDevice2D.h
+++ b/Rendering/ContextOpenGL2/vtkOpenGLContextDevice2D.h
@@ -24,8 +24,8 @@
 // .SECTION See Also
 // vtkOpenGL2ContextDevice2D
 
-#ifndef __vtkOpenGLContextDevice2D_h
-#define __vtkOpenGLContextDevice2D_h
+#ifndef vtkOpenGLContextDevice2D_h
+#define vtkOpenGLContextDevice2D_h
 
 #include "vtkRenderingContextOpenGL2Module.h" // For export macro
 #include "vtkContextDevice2D.h"
@@ -348,4 +348,4 @@ private:
 //ETX
 };
 
-#endif //__vtkOpenGLContextDevice2D_h
+#endif //vtkOpenGLContextDevice2D_h
diff --git a/Rendering/ContextOpenGL2/vtkOpenGLContextDevice2DPrivate.h b/Rendering/ContextOpenGL2/vtkOpenGLContextDevice2DPrivate.h
index 5b8852fe78e54fe3b24f65470e244fd7ba9322a2..b43dc401c3e2de7f392f99c332868a151ff2db32 100644
--- a/Rendering/ContextOpenGL2/vtkOpenGLContextDevice2DPrivate.h
+++ b/Rendering/ContextOpenGL2/vtkOpenGLContextDevice2DPrivate.h
@@ -27,8 +27,8 @@
 // .Section See Also
 // vtkOpenGLContextDevice2D vtkOpenGL2ContextDevice2D
 
-#ifndef __vtkOpenGLContextDevice2DPrivate_h
-#define __vtkOpenGLContextDevice2DPrivate_h
+#ifndef vtkOpenGLContextDevice2DPrivate_h
+#define vtkOpenGLContextDevice2DPrivate_h
 
 #include "vtkOpenGLContextDevice2D.h"
 
diff --git a/Rendering/ContextOpenGL2/vtkOpenGLContextDevice3D.h b/Rendering/ContextOpenGL2/vtkOpenGLContextDevice3D.h
index 009432d8c06b1bed5c081c96bf09f9a2543a9b53..372aac3e5675486cc4cc26da90231c32c8acd095 100644
--- a/Rendering/ContextOpenGL2/vtkOpenGLContextDevice3D.h
+++ b/Rendering/ContextOpenGL2/vtkOpenGLContextDevice3D.h
@@ -19,8 +19,8 @@
 // This defines the implementation of a 3D context device for drawing simple
 // primitives.
 
-#ifndef __vtkOpenGLContextDevice3D_h
-#define __vtkOpenGLContextDevice3D_h
+#ifndef vtkOpenGLContextDevice3D_h
+#define vtkOpenGLContextDevice3D_h
 
 #include "vtkRenderingContextOpenGL2Module.h" // For export macro
 #include "vtkContextDevice3D.h"
diff --git a/Rendering/Core/vtkAbstractInteractionDevice.h b/Rendering/Core/vtkAbstractInteractionDevice.h
index cced3bdd649dc5f34834feb5d5aac9df0505bf0b..5621595a37f14e23403b5b85717a2267557fc783 100644
--- a/Rendering/Core/vtkAbstractInteractionDevice.h
+++ b/Rendering/Core/vtkAbstractInteractionDevice.h
@@ -11,8 +11,8 @@
      PURPOSE.  See the above copyright notice for more information.
 
 =========================================================================*/
-#ifndef __vtkAbstractInteractionDevice_h
-#define __vtkAbstractInteractionDevice_h
+#ifndef vtkAbstractInteractionDevice_h
+#define vtkAbstractInteractionDevice_h
 
 #include "vtkObject.h"
 #include "vtkRenderingCoreModule.h" // For export macro
diff --git a/Rendering/Core/vtkAbstractMapper.h b/Rendering/Core/vtkAbstractMapper.h
index d770525b06fab4903b61290b4a192b3546f46d44..1c5c047cdfa3597042d17d3397590197c69c4f5a 100644
--- a/Rendering/Core/vtkAbstractMapper.h
+++ b/Rendering/Core/vtkAbstractMapper.h
@@ -22,8 +22,8 @@
 // .SECTION See Also
 // vtkAbstractMapper3D vtkMapper vtkPolyDataMapper vtkVolumeMapper
 
-#ifndef __vtkAbstractMapper_h
-#define __vtkAbstractMapper_h
+#ifndef vtkAbstractMapper_h
+#define vtkAbstractMapper_h
 
 #include "vtkRenderingCoreModule.h" // For export macro
 #include "vtkAlgorithm.h"
diff --git a/Rendering/Core/vtkAbstractMapper3D.h b/Rendering/Core/vtkAbstractMapper3D.h
index 1e6c07b14b6abb885f0968a5dcbba5b8ffe2f6d7..6945e6bcf8b90d03fe966efdcd660784c1de458c 100644
--- a/Rendering/Core/vtkAbstractMapper3D.h
+++ b/Rendering/Core/vtkAbstractMapper3D.h
@@ -26,8 +26,8 @@
 // .SECTION See Also
 // vtkAbstractMapper vtkMapper vtkPolyDataMapper vtkVolumeMapper
 
-#ifndef __vtkAbstractMapper3D_h
-#define __vtkAbstractMapper3D_h
+#ifndef vtkAbstractMapper3D_h
+#define vtkAbstractMapper3D_h
 
 #include "vtkRenderingCoreModule.h" // For export macro
 #include "vtkAbstractMapper.h"
diff --git a/Rendering/Core/vtkAbstractPicker.h b/Rendering/Core/vtkAbstractPicker.h
index 535e57b6f6799ba3f063d602f1a9d4ca7bfa6c39..02a14cfab83c22707f79c5ea8448ca8a03a8de62 100644
--- a/Rendering/Core/vtkAbstractPicker.h
+++ b/Rendering/Core/vtkAbstractPicker.h
@@ -51,8 +51,8 @@
 // an x-y-z coordinate value using the hardware z-buffer. vtkPicker can be
 // used to pick the bounding box of 3D props.
 
-#ifndef __vtkAbstractPicker_h
-#define __vtkAbstractPicker_h
+#ifndef vtkAbstractPicker_h
+#define vtkAbstractPicker_h
 
 #include "vtkRenderingCoreModule.h" // For export macro
 #include "vtkObject.h"
diff --git a/Rendering/Core/vtkAbstractPropPicker.h b/Rendering/Core/vtkAbstractPropPicker.h
index 99895e7fbc67a3216f60b9b3f1252dfdf988b272..a73614600333ec879f6112de3e301cfc3deb975d 100644
--- a/Rendering/Core/vtkAbstractPropPicker.h
+++ b/Rendering/Core/vtkAbstractPropPicker.h
@@ -56,8 +56,8 @@
 // vtkAssemblyPath vtkAssemblyNode vtkAssemblyPaths vtkAbstractPicker
 // vtkRenderer
 
-#ifndef __vtkAbstractPropPicker_h
-#define __vtkAbstractPropPicker_h
+#ifndef vtkAbstractPropPicker_h
+#define vtkAbstractPropPicker_h
 
 #include "vtkRenderingCoreModule.h" // For export macro
 #include "vtkAbstractPicker.h"
diff --git a/Rendering/Core/vtkAbstractRenderDevice.h b/Rendering/Core/vtkAbstractRenderDevice.h
index 56f099534d1f1c7cbabc87df59e20c2c856c2ec4..d9b3bb12cfc132602ab3a2a2622457772ae2298b 100644
--- a/Rendering/Core/vtkAbstractRenderDevice.h
+++ b/Rendering/Core/vtkAbstractRenderDevice.h
@@ -11,8 +11,8 @@
      PURPOSE.  See the above copyright notice for more information.
 
 =========================================================================*/
-#ifndef __vtkAbstractRenderDevice_h
-#define __vtkAbstractRenderDevice_h
+#ifndef vtkAbstractRenderDevice_h
+#define vtkAbstractRenderDevice_h
 
 #include "vtkRenderingCoreModule.h" // For export macro
 #include "vtkObject.h"
diff --git a/Rendering/Core/vtkAbstractVolumeMapper.h b/Rendering/Core/vtkAbstractVolumeMapper.h
index 2a0b65034de36ecb6b993ebb3a9b2e5f0ec7504c..900ad95c4eaf5c5c75be8093bef9046dad6eae91 100644
--- a/Rendering/Core/vtkAbstractVolumeMapper.h
+++ b/Rendering/Core/vtkAbstractVolumeMapper.h
@@ -21,8 +21,8 @@
 // .SECTION see also
 // vtkVolumeMapper vtkUnstructuredGridVolumeMapper
 
-#ifndef __vtkAbstractVolumeMapper_h
-#define __vtkAbstractVolumeMapper_h
+#ifndef vtkAbstractVolumeMapper_h
+#define vtkAbstractVolumeMapper_h
 
 #include "vtkRenderingCoreModule.h" // For export macro
 #include "vtkAbstractMapper3D.h"
diff --git a/Rendering/Core/vtkActor.h b/Rendering/Core/vtkActor.h
index bcec5cd6042db66b95de7e3c70fe6ad84784b0a4..825c56cc2b7b99738e26d10d621132e7e52ce03f 100644
--- a/Rendering/Core/vtkActor.h
+++ b/Rendering/Core/vtkActor.h
@@ -26,8 +26,8 @@
 // .SECTION See Also
 // vtkProperty vtkTexture vtkMapper vtkAssembly vtkFollower vtkLODActor
 
-#ifndef __vtkActor_h
-#define __vtkActor_h
+#ifndef vtkActor_h
+#define vtkActor_h
 
 #include "vtkRenderingCoreModule.h" // For export macro
 #include "vtkProp3D.h"
diff --git a/Rendering/Core/vtkActor2D.h b/Rendering/Core/vtkActor2D.h
index 248bbcc52d34a68b8b9f8bc13976bc3fbf777e59..63c748fdb206ebbc5219b710d4acd54f4f43e4c7 100644
--- a/Rendering/Core/vtkActor2D.h
+++ b/Rendering/Core/vtkActor2D.h
@@ -23,8 +23,8 @@
 // .SECTION See Also
 // vtkProp  vtkMapper2D vtkProperty2D
 
-#ifndef __vtkActor2D_h
-#define __vtkActor2D_h
+#ifndef vtkActor2D_h
+#define vtkActor2D_h
 
 #include "vtkRenderingCoreModule.h" // For export macro
 #include "vtkProp.h"
diff --git a/Rendering/Core/vtkActor2DCollection.h b/Rendering/Core/vtkActor2DCollection.h
index 683d6ec05686fb8a50f24678e6bd3eda333f3bc6..1835f862d4050e5fd1de462df9cbfe2aa02aea86 100644
--- a/Rendering/Core/vtkActor2DCollection.h
+++ b/Rendering/Core/vtkActor2DCollection.h
@@ -22,8 +22,8 @@
 // .SECTION See Also
 // vtkActor2D vtkCollection
 
-#ifndef __vtkActor2DCollection_h
-#define __vtkActor2DCollection_h
+#ifndef vtkActor2DCollection_h
+#define vtkActor2DCollection_h
 
 #include "vtkRenderingCoreModule.h" // For export macro
 #include "vtkPropCollection.h"
diff --git a/Rendering/Core/vtkActorCollection.h b/Rendering/Core/vtkActorCollection.h
index 89e870a04f1333452de5173cb6c5ac6493f2a828..1677e187e61ffb469d4a12b1ee7c088ac1faf2fa 100644
--- a/Rendering/Core/vtkActorCollection.h
+++ b/Rendering/Core/vtkActorCollection.h
@@ -21,8 +21,8 @@
 // .SECTION see also
 // vtkActor vtkCollection
 
-#ifndef __vtkActorCollection_h
-#define __vtkActorCollection_h
+#ifndef vtkActorCollection_h
+#define vtkActorCollection_h
 
 #include "vtkRenderingCoreModule.h" // For export macro
 #include "vtkPropCollection.h"
diff --git a/Rendering/Core/vtkAreaPicker.h b/Rendering/Core/vtkAreaPicker.h
index c5e955b54008e75049cc0899866c5f870c52c454..2aff9229f78c91dd4eb2c20395fb4ac258439e31 100644
--- a/Rendering/Core/vtkAreaPicker.h
+++ b/Rendering/Core/vtkAreaPicker.h
@@ -38,8 +38,8 @@
 // .SECTION See Also
 // vtkInteractorStyleRubberBandPick, vtkExtractSelectedFrustum.
 
-#ifndef __vtkAreaPicker_h
-#define __vtkAreaPicker_h
+#ifndef vtkAreaPicker_h
+#define vtkAreaPicker_h
 
 #include "vtkRenderingCoreModule.h" // For export macro
 #include "vtkAbstractPropPicker.h"
diff --git a/Rendering/Core/vtkAssembly.h b/Rendering/Core/vtkAssembly.h
index e36505abbefdd2bab619f2fcfe5ddad4a6558537..076c54ee611168e695226a3b883399bad4686603 100644
--- a/Rendering/Core/vtkAssembly.h
+++ b/Rendering/Core/vtkAssembly.h
@@ -49,8 +49,8 @@
 // .SECTION See Also
 // vtkActor vtkTransform vtkMapper vtkPolyDataMapper vtkPropAssembly
 
-#ifndef __vtkAssembly_h
-#define __vtkAssembly_h
+#ifndef vtkAssembly_h
+#define vtkAssembly_h
 
 #include "vtkRenderingCoreModule.h" // For export macro
 #include "vtkProp3D.h"
diff --git a/Rendering/Core/vtkAssemblyNode.h b/Rendering/Core/vtkAssemblyNode.h
index 30564a6a5e3fb46be7fa88fb6e595f6d930f3d71..db07dad4f09e5ab46273512ae9317ba5d908c2f5 100644
--- a/Rendering/Core/vtkAssemblyNode.h
+++ b/Rendering/Core/vtkAssemblyNode.h
@@ -39,8 +39,8 @@
 // .SECTION see also
 // vtkAssemblyPath vtkProp vtkPicker vtkMatrix4x4
 
-#ifndef __vtkAssemblyNode_h
-#define __vtkAssemblyNode_h
+#ifndef vtkAssemblyNode_h
+#define vtkAssemblyNode_h
 
 #include "vtkRenderingCoreModule.h" // For export macro
 #include "vtkObject.h"
diff --git a/Rendering/Core/vtkAssemblyPath.h b/Rendering/Core/vtkAssemblyPath.h
index f23a3975ea660d75b88a72ed23576b331803cc65..4004dba19ab4fb503210ae61147985141e70b85d 100644
--- a/Rendering/Core/vtkAssemblyPath.h
+++ b/Rendering/Core/vtkAssemblyPath.h
@@ -24,8 +24,8 @@
 // .SECTION See Also
 // vtkAssemblyNode vtkAssembly vtkActor vtkMatrix4x4 vtkProp vtkAbstractPicker
 
-#ifndef __vtkAssemblyPath_h
-#define __vtkAssemblyPath_h
+#ifndef vtkAssemblyPath_h
+#define vtkAssemblyPath_h
 
 #include "vtkRenderingCoreModule.h" // For export macro
 #include "vtkCollection.h"
diff --git a/Rendering/Core/vtkAssemblyPaths.h b/Rendering/Core/vtkAssemblyPaths.h
index 04eab93febf1e90a6927d52fb75deddcf07d59ad..15b81fc7fffc523080f29bdde2ffc763653315f8 100644
--- a/Rendering/Core/vtkAssemblyPaths.h
+++ b/Rendering/Core/vtkAssemblyPaths.h
@@ -21,8 +21,8 @@
 // .SECTION see also
 // vtkAssemblyPath vtkAssemblyNode vtkPicker vtkAssembly vtkProp
 
-#ifndef __vtkAssemblyPaths_h
-#define __vtkAssemblyPaths_h
+#ifndef vtkAssemblyPaths_h
+#define vtkAssemblyPaths_h
 
 #include "vtkRenderingCoreModule.h" // For export macro
 #include "vtkCollection.h"
diff --git a/Rendering/Core/vtkCamera.h b/Rendering/Core/vtkCamera.h
index bb2b12380622d0ed38f5c671e311a318f1f3f1e2..10e7bbf525b8a1acc1ae110b31ccfcc7c6400684 100644
--- a/Rendering/Core/vtkCamera.h
+++ b/Rendering/Core/vtkCamera.h
@@ -23,8 +23,8 @@
 // .SECTION See Also
 // vtkPerspectiveTransform
 
-#ifndef __vtkCamera_h
-#define __vtkCamera_h
+#ifndef vtkCamera_h
+#define vtkCamera_h
 
 #include "vtkRenderingCoreModule.h" // For export macro
 #include "vtkObject.h"
diff --git a/Rendering/Core/vtkCameraActor.h b/Rendering/Core/vtkCameraActor.h
index e885ecc09834a6314b3cae21a35eb4dfc5a784ff..dc6430e477afc2a9f9f752b74e1b3daba8db0fca 100644
--- a/Rendering/Core/vtkCameraActor.h
+++ b/Rendering/Core/vtkCameraActor.h
@@ -20,8 +20,8 @@
 // .SECTION See Also
 // vtkLight vtkConeSource vtkFrustumSource vtkCameraActor
 
-#ifndef __vtkCameraActor_h
-#define __vtkCameraActor_h
+#ifndef vtkCameraActor_h
+#define vtkCameraActor_h
 
 #include "vtkRenderingCoreModule.h" // For export macro
 #include "vtkProp3D.h"
diff --git a/Rendering/Core/vtkCameraInterpolator.h b/Rendering/Core/vtkCameraInterpolator.h
index 741efb4fbb7559cfc1c62d6206cfc3fb467dd439..35043f97636e52fa3dfafec7464844a0c627fe13 100644
--- a/Rendering/Core/vtkCameraInterpolator.h
+++ b/Rendering/Core/vtkCameraInterpolator.h
@@ -43,8 +43,8 @@
 // future as an alternative interpolation method for camera orientation.
 
 
-#ifndef __vtkCameraInterpolator_h
-#define __vtkCameraInterpolator_h
+#ifndef vtkCameraInterpolator_h
+#define vtkCameraInterpolator_h
 
 #include "vtkRenderingCoreModule.h" // For export macro
 #include "vtkObject.h"
diff --git a/Rendering/Core/vtkCellCenterDepthSort.h b/Rendering/Core/vtkCellCenterDepthSort.h
index 73186a28b617f491c23af61530f688455297704d..1341e7ccd72d76a56e0f1a3b80b8733fe6abc7d6 100644
--- a/Rendering/Core/vtkCellCenterDepthSort.h
+++ b/Rendering/Core/vtkCellCenterDepthSort.h
@@ -33,8 +33,8 @@
 // on the result.
 //
 
-#ifndef __vtkCellCenterDepthSort_h
-#define __vtkCellCenterDepthSort_h
+#ifndef vtkCellCenterDepthSort_h
+#define vtkCellCenterDepthSort_h
 
 #include "vtkRenderingCoreModule.h" // For export macro
 #include "vtkVisibilitySort.h"
diff --git a/Rendering/Core/vtkCellPicker.h b/Rendering/Core/vtkCellPicker.h
index 3181313a6eb20619eae0af7965aa44750e3b711f..2bfbb1bc21aebf6b5191addce211a1a39629a6c7 100644
--- a/Rendering/Core/vtkCellPicker.h
+++ b/Rendering/Core/vtkCellPicker.h
@@ -35,8 +35,8 @@
 // This class was contributed to VTK by David Gobbi on behalf of Atamai Inc.,
 // as an enhancement to the original vtkCellPicker.
 
-#ifndef __vtkCellPicker_h
-#define __vtkCellPicker_h
+#ifndef vtkCellPicker_h
+#define vtkCellPicker_h
 
 #include "vtkRenderingCoreModule.h" // For export macro
 #include "vtkPicker.h"
diff --git a/Rendering/Core/vtkColorTransferFunction.h b/Rendering/Core/vtkColorTransferFunction.h
index 7462366d0bb850fce5227344156f3e694f53a30d..61f2e3187b0f7342b11805a2366a6d136109d3fc 100644
--- a/Rendering/Core/vtkColorTransferFunction.h
+++ b/Rendering/Core/vtkColorTransferFunction.h
@@ -30,8 +30,8 @@
 // .SECTION see also
 // vtkPiecewiseFunction
 
-#ifndef __vtkColorTransferFunction_h
-#define __vtkColorTransferFunction_h
+#ifndef vtkColorTransferFunction_h
+#define vtkColorTransferFunction_h
 
 #include "vtkRenderingCoreModule.h" // For export macro
 #include "vtkScalarsToColors.h"
diff --git a/Rendering/Core/vtkCompositeDataDisplayAttributes.h b/Rendering/Core/vtkCompositeDataDisplayAttributes.h
index 1376861024761301c7baf775067768b2e382cf01..1270fea0ae9bc9734d34b1cfd6aafe4bad3b55bf 100644
--- a/Rendering/Core/vtkCompositeDataDisplayAttributes.h
+++ b/Rendering/Core/vtkCompositeDataDisplayAttributes.h
@@ -18,8 +18,8 @@
 // The vtkCompositeDataDisplayAttributes class stores display attributes
 // for individual blocks in a multi-block dataset.
 
-#ifndef __vtkCompositeDataDisplayAttributes_h
-#define __vtkCompositeDataDisplayAttributes_h
+#ifndef vtkCompositeDataDisplayAttributes_h
+#define vtkCompositeDataDisplayAttributes_h
 
 #include "vtkRenderingCoreModule.h" // for export macro
 #include "vtkObject.h"
@@ -114,4 +114,4 @@ private:
   std::map<unsigned int, double> BlockOpacities;
 };
 
-#endif // __vtkCompositeDataDisplayAttributes_h
+#endif // vtkCompositeDataDisplayAttributes_h
diff --git a/Rendering/Core/vtkCompositePolyDataMapper.h b/Rendering/Core/vtkCompositePolyDataMapper.h
index 3d537964f6ab79693a2c1cce6cd15ae9c6a00dda..221ca6abdc963852dfbd45d200eb0a4ae4125256 100644
--- a/Rendering/Core/vtkCompositePolyDataMapper.h
+++ b/Rendering/Core/vtkCompositePolyDataMapper.h
@@ -22,8 +22,8 @@
 // .SECTION see also
 // vtkPolyDataMapper
 
-#ifndef __vtkCompositePolyDataMapper_h
-#define __vtkCompositePolyDataMapper_h
+#ifndef vtkCompositePolyDataMapper_h
+#define vtkCompositePolyDataMapper_h
 
 #include "vtkRenderingCoreModule.h" // For export macro
 #include "vtkMapper.h"
diff --git a/Rendering/Core/vtkCoordinate.h b/Rendering/Core/vtkCoordinate.h
index d673200f5faf7edb9720dbf76a6e6c800305867b..b756152babfd811e7bbe6f37ccf82b6f1dcadc22 100644
--- a/Rendering/Core/vtkCoordinate.h
+++ b/Rendering/Core/vtkCoordinate.h
@@ -43,8 +43,8 @@
 // .SECTION See Also
 // vtkActor2D vtkScalarBarActor
 
-#ifndef __vtkCoordinate_h
-#define __vtkCoordinate_h
+#ifndef vtkCoordinate_h
+#define vtkCoordinate_h
 
 #include "vtkRenderingCoreModule.h" // For export macro
 #include "vtkObject.h"
diff --git a/Rendering/Core/vtkCuller.h b/Rendering/Core/vtkCuller.h
index 95deb76aefba059d35abc7734bf8330751b1db9c..29b14e5a7075f8461016d699f537ec6226d51bff 100644
--- a/Rendering/Core/vtkCuller.h
+++ b/Rendering/Core/vtkCuller.h
@@ -22,8 +22,8 @@
 // .SECTION see also
 // vtkFrustumCoverageCuller
 
-#ifndef __vtkCuller_h
-#define __vtkCuller_h
+#ifndef vtkCuller_h
+#define vtkCuller_h
 
 #include "vtkRenderingCoreModule.h" // For export macro
 #include "vtkObject.h"
diff --git a/Rendering/Core/vtkCullerCollection.h b/Rendering/Core/vtkCullerCollection.h
index ac39973167df5672d42ee1f90c3a863f02c3b3a6..52a9a7848c17861ff8394519891d6f5f059c53c1 100644
--- a/Rendering/Core/vtkCullerCollection.h
+++ b/Rendering/Core/vtkCullerCollection.h
@@ -21,8 +21,8 @@
 // .SECTION see also
 // vtkCuller vtkCollection
 
-#ifndef __vtkCullerCollection_h
-#define __vtkCullerCollection_h
+#ifndef vtkCullerCollection_h
+#define vtkCullerCollection_h
 
 #include "vtkRenderingCoreModule.h" // For export macro
 #include "vtkCollection.h"
diff --git a/Rendering/Core/vtkDataSetMapper.h b/Rendering/Core/vtkDataSetMapper.h
index b7afcb4477fd98488be2f8aae24363445fb78d8f..7bf5367a0b018e60ea52cb2560e8af074efb5f3e 100644
--- a/Rendering/Core/vtkDataSetMapper.h
+++ b/Rendering/Core/vtkDataSetMapper.h
@@ -21,8 +21,8 @@
 // system. The 2D faces of 3D cells are mapped only if they are used by
 // only one cell, i.e., on the boundary of the data set.
 
-#ifndef __vtkDataSetMapper_h
-#define __vtkDataSetMapper_h
+#ifndef vtkDataSetMapper_h
+#define vtkDataSetMapper_h
 
 #include "vtkRenderingCoreModule.h" // For export macro
 #include "vtkMapper.h"
diff --git a/Rendering/Core/vtkDiscretizableColorTransferFunction.h b/Rendering/Core/vtkDiscretizableColorTransferFunction.h
index 6fdca9c5ad631be0f80fd7a59be564c3f62eddcb..b0cd207d4bb2cb44e4868dfe587fac8317fa0100 100644
--- a/Rendering/Core/vtkDiscretizableColorTransferFunction.h
+++ b/Rendering/Core/vtkDiscretizableColorTransferFunction.h
@@ -37,8 +37,8 @@
 // versions match up.
 
 
-#ifndef __vtkDiscretizableColorTransferFunction_h
-#define __vtkDiscretizableColorTransferFunction_h
+#ifndef vtkDiscretizableColorTransferFunction_h
+#define vtkDiscretizableColorTransferFunction_h
 
 #include "vtkRenderingCoreModule.h" // For export macro
 #include "vtkColorTransferFunction.h"
diff --git a/Rendering/Core/vtkDistanceToCamera.h b/Rendering/Core/vtkDistanceToCamera.h
index a58575d87b226784fb992d3de4069dacea6d7dd6..3aee857d56b539690a696c85547c64a0263109e8 100644
--- a/Rendering/Core/vtkDistanceToCamera.h
+++ b/Rendering/Core/vtkDistanceToCamera.h
@@ -26,8 +26,8 @@
 // sets the size in screen pixels that you would want a rendered rectangle
 // at that point to be, if it was scaled by the output array.
 
-#ifndef __vtkDistanceToCamera_h
-#define __vtkDistanceToCamera_h
+#ifndef vtkDistanceToCamera_h
+#define vtkDistanceToCamera_h
 
 #include "vtkRenderingCoreModule.h" // For export macro
 #include "vtkPolyDataAlgorithm.h"
diff --git a/Rendering/Core/vtkFollower.h b/Rendering/Core/vtkFollower.h
index bf8254f1b431ae895bb98a892566ef4024902a10..b717f9082fda4f5d318cc994e6e2a12d7c5c5332 100644
--- a/Rendering/Core/vtkFollower.h
+++ b/Rendering/Core/vtkFollower.h
@@ -26,8 +26,8 @@
 // .SECTION see also
 // vtkActor vtkCamera vtkAxisFollower vtkProp3DFollower
 
-#ifndef __vtkFollower_h
-#define __vtkFollower_h
+#ifndef vtkFollower_h
+#define vtkFollower_h
 
 #include "vtkRenderingCoreModule.h" // For export macro
 #include "vtkActor.h"
diff --git a/Rendering/Core/vtkFrustumCoverageCuller.h b/Rendering/Core/vtkFrustumCoverageCuller.h
index 649c2066560cc44de84765a43da96963af464269..043c31b95f09d224e96031c1d831dae6817f55ce 100644
--- a/Rendering/Core/vtkFrustumCoverageCuller.h
+++ b/Rendering/Core/vtkFrustumCoverageCuller.h
@@ -30,8 +30,8 @@
 // .SECTION see also
 // vtkCuller
 
-#ifndef __vtkFrustumCoverageCuller_h
-#define __vtkFrustumCoverageCuller_h
+#ifndef vtkFrustumCoverageCuller_h
+#define vtkFrustumCoverageCuller_h
 
 #include "vtkRenderingCoreModule.h" // For export macro
 #include "vtkCuller.h"
diff --git a/Rendering/Core/vtkGPUInfo.h b/Rendering/Core/vtkGPUInfo.h
index 393ea1bc01f672cd4e61a78af67334e01b689d53..c43dcd5a3cb6d06e9d10316db7e72dcb91161c03 100644
--- a/Rendering/Core/vtkGPUInfo.h
+++ b/Rendering/Core/vtkGPUInfo.h
@@ -20,8 +20,8 @@
 // .SECTION See Also
 // vtkGPUInfoList vtkDirectXGPUInfoList vtkCoreGraphicsGPUInfoList
 
-#ifndef __vtkGPUInfo_h
-#define __vtkGPUInfo_h
+#ifndef vtkGPUInfo_h
+#define vtkGPUInfo_h
 
 #include "vtkRenderingCoreModule.h" // For export macro
 #include "vtkObject.h"
diff --git a/Rendering/Core/vtkGPUInfoList.h b/Rendering/Core/vtkGPUInfoList.h
index 299cf9cd2555a860f41a659f261f7748132850d4..d554296c2f1bc64810b71c91d9efbedb69a0f789 100644
--- a/Rendering/Core/vtkGPUInfoList.h
+++ b/Rendering/Core/vtkGPUInfoList.h
@@ -21,8 +21,8 @@
 // .SECTION See Also
 // vtkGPUInfo vtkDirectXGPUInfoList vtkCoreGraphicsGPUInfoList
 
-#ifndef __vtkGPUInfoList_h
-#define __vtkGPUInfoList_h
+#ifndef vtkGPUInfoList_h
+#define vtkGPUInfoList_h
 
 #include "vtkRenderingCoreModule.h" // For export macro
 #include "vtkObject.h"
diff --git a/Rendering/Core/vtkGPUInfoListArray.h b/Rendering/Core/vtkGPUInfoListArray.h
index 89b1d73c7ffa4984f7ad99cc68380ce73c3768a2..316ab55b81111fa030ced21f162635120a6b3c34 100644
--- a/Rendering/Core/vtkGPUInfoListArray.h
+++ b/Rendering/Core/vtkGPUInfoListArray.h
@@ -16,8 +16,8 @@
 // .SECTION Description
 // vtkGPUInfoListArray is just a PIMPL mechanism for vtkGPUInfoList.
 
-#ifndef __vtkGPUInfoListArray_h
-#define __vtkGPUInfoListArray_h
+#ifndef vtkGPUInfoListArray_h
+#define vtkGPUInfoListArray_h
 
 #include "vtkGPUInfo.h"
 #include <vector> // STL Header
diff --git a/Rendering/Core/vtkGenericRenderWindowInteractor.h b/Rendering/Core/vtkGenericRenderWindowInteractor.h
index 8408d06e11fb1909b0565fa0289c0b38a29252a2..8577c3fad6ce82e8e2fbd1fc438ffb86a10654fe 100644
--- a/Rendering/Core/vtkGenericRenderWindowInteractor.h
+++ b/Rendering/Core/vtkGenericRenderWindowInteractor.h
@@ -22,8 +22,8 @@
 
 
 
-#ifndef __vtkGenericRenderWindowInteractor_h
-#define __vtkGenericRenderWindowInteractor_h
+#ifndef vtkGenericRenderWindowInteractor_h
+#define vtkGenericRenderWindowInteractor_h
 
 #include "vtkRenderingCoreModule.h" // For export macro
 #include "vtkRenderWindowInteractor.h"
diff --git a/Rendering/Core/vtkGenericVertexAttributeMapping.h b/Rendering/Core/vtkGenericVertexAttributeMapping.h
index d964681522e9185f481c9a3cb797c9d564a21b1d..73d8263c973346ca0b60d198cee9e979f2dff0c7 100644
--- a/Rendering/Core/vtkGenericVertexAttributeMapping.h
+++ b/Rendering/Core/vtkGenericVertexAttributeMapping.h
@@ -22,8 +22,8 @@
 // Support for generic vertex attributes in VTK was contributed in
 // collaboration with Stephane Ploix at EDF.
 
-#ifndef __vtkGenericVertexAttributeMapping_h
-#define __vtkGenericVertexAttributeMapping_h
+#ifndef vtkGenericVertexAttributeMapping_h
+#define vtkGenericVertexAttributeMapping_h
 
 #include "vtkRenderingCoreModule.h" // For export macro
 #include "vtkObject.h"
diff --git a/Rendering/Core/vtkGlyph3DMapper.h b/Rendering/Core/vtkGlyph3DMapper.h
index fe6fc3520099fe43eeb6bbd959d020e9444762d6..632a007b65a7f512321ea8634d06d3c5977f5c7f 100644
--- a/Rendering/Core/vtkGlyph3DMapper.h
+++ b/Rendering/Core/vtkGlyph3DMapper.h
@@ -23,8 +23,8 @@
 // .SECTION See Also
 // vtkGlyph3D
 
-#ifndef __vtkGlyph3DMapper_h
-#define __vtkGlyph3DMapper_h
+#ifndef vtkGlyph3DMapper_h
+#define vtkGlyph3DMapper_h
 
 #include "vtkRenderingCoreModule.h" // For export macro
 #include "vtkMapper.h"
diff --git a/Rendering/Core/vtkGraphMapper.h b/Rendering/Core/vtkGraphMapper.h
index c76520b4f8cad15432be29315782e31ee228bea1..bdefbd47a9c9f705f051b919739ee77a2afd8523 100644
--- a/Rendering/Core/vtkGraphMapper.h
+++ b/Rendering/Core/vtkGraphMapper.h
@@ -24,8 +24,8 @@
 // vtkGraphMapper is a mapper to map vtkGraph
 // (and all derived classes) to graphics primitives.
 
-#ifndef __vtkGraphMapper_h
-#define __vtkGraphMapper_h
+#ifndef vtkGraphMapper_h
+#define vtkGraphMapper_h
 
 #include "vtkRenderingCoreModule.h" // For export macro
 #include "vtkMapper.h"
diff --git a/Rendering/Core/vtkGraphToGlyphs.h b/Rendering/Core/vtkGraphToGlyphs.h
index 24a945b12c3712b3e84e8828b2e95db31284e8ae..62a1aef1633114a1b85e7405d4896a636da6944f 100644
--- a/Rendering/Core/vtkGraphToGlyphs.h
+++ b/Rendering/Core/vtkGraphToGlyphs.h
@@ -27,8 +27,8 @@
 // coordinates. To do this the filter requires a pointer to the renderer
 // into which the glyphs will be rendered.
 
-#ifndef __vtkGraphToGlyphs_h
-#define __vtkGraphToGlyphs_h
+#ifndef vtkGraphToGlyphs_h
+#define vtkGraphToGlyphs_h
 
 #include "vtkRenderingCoreModule.h" // For export macro
 #include "vtkPolyDataAlgorithm.h"
diff --git a/Rendering/Core/vtkGraphicsFactory.h b/Rendering/Core/vtkGraphicsFactory.h
index 940e506e15aa310c6e9ae561c7860ee933d2bdc1..e36b6d9d1e4e8fae1027b38d5a798361e17e268d 100644
--- a/Rendering/Core/vtkGraphicsFactory.h
+++ b/Rendering/Core/vtkGraphicsFactory.h
@@ -15,8 +15,8 @@
 // .NAME vtkGraphicsFactory -
 // .SECTION Description
 
-#ifndef __vtkGraphicsFactory_h
-#define __vtkGraphicsFactory_h
+#ifndef vtkGraphicsFactory_h
+#define vtkGraphicsFactory_h
 
 #include "vtkRenderingCoreModule.h" // For export macro
 #include "vtkObject.h"
diff --git a/Rendering/Core/vtkHardwareSelector.h b/Rendering/Core/vtkHardwareSelector.h
index e18ac1ecc9b7bc29007a10484a66d22496ed02bd..20d70ae4ef4e79ed10708eaf8dad94b646c4a379 100644
--- a/Rendering/Core/vtkHardwareSelector.h
+++ b/Rendering/Core/vtkHardwareSelector.h
@@ -55,8 +55,8 @@
 // .SECTION See Also
 // vtkIdentColoredPainter
 
-#ifndef __vtkHardwareSelector_h
-#define __vtkHardwareSelector_h
+#ifndef vtkHardwareSelector_h
+#define vtkHardwareSelector_h
 
 #include "vtkRenderingCoreModule.h" // For export macro
 #include "vtkObject.h"
diff --git a/Rendering/Core/vtkHierarchicalPolyDataMapper.h b/Rendering/Core/vtkHierarchicalPolyDataMapper.h
index fcbad87465286fb05d5a09b09545faccb8a2c395..f25f9ae47a4738ca3e37637b29e4d57fa9bcfa30 100644
--- a/Rendering/Core/vtkHierarchicalPolyDataMapper.h
+++ b/Rendering/Core/vtkHierarchicalPolyDataMapper.h
@@ -19,8 +19,8 @@
 // .SECTION see also
 // vtkPolyDataMapper
 
-#ifndef __vtkHierarchicalPolyDataMapper_h
-#define __vtkHierarchicalPolyDataMapper_h
+#ifndef vtkHierarchicalPolyDataMapper_h
+#define vtkHierarchicalPolyDataMapper_h
 
 #include "vtkRenderingCoreModule.h" // For export macro
 #include "vtkCompositePolyDataMapper.h"
diff --git a/Rendering/Core/vtkImageActor.h b/Rendering/Core/vtkImageActor.h
index a43035cb801204864af6218228a9a38557de6df2..b121740b4b7496deba5eea67549ed758fa6ab936 100644
--- a/Rendering/Core/vtkImageActor.h
+++ b/Rendering/Core/vtkImageActor.h
@@ -25,8 +25,8 @@
 // .SECTION See Also
 // vtkImageData vtkImageSliceMapper vtkImageProperty
 
-#ifndef __vtkImageActor_h
-#define __vtkImageActor_h
+#ifndef vtkImageActor_h
+#define vtkImageActor_h
 
 #include "vtkRenderingCoreModule.h" // For export macro
 #include "vtkImageSlice.h"
diff --git a/Rendering/Core/vtkImageMapper.h b/Rendering/Core/vtkImageMapper.h
index 5cdcf135d2386b1531be7e07eae7d4ffc0599579..b818192ed80263db960f92918291229e092aefef 100644
--- a/Rendering/Core/vtkImageMapper.h
+++ b/Rendering/Core/vtkImageMapper.h
@@ -24,8 +24,8 @@
 // .SECTION See Also
 // vtkMapper2D vtkActor2D
 
-#ifndef __vtkImageMapper_h
-#define __vtkImageMapper_h
+#ifndef vtkImageMapper_h
+#define vtkImageMapper_h
 
 #include "vtkRenderingCoreModule.h" // For export macro
 #include "vtkMapper2D.h"
diff --git a/Rendering/Core/vtkImageMapper3D.h b/Rendering/Core/vtkImageMapper3D.h
index a8b804fa0570a07ed5eef5fb3a153e492d469339..515170381c0e1bb6dc03202fac2fa1c566cdb82b 100644
--- a/Rendering/Core/vtkImageMapper3D.h
+++ b/Rendering/Core/vtkImageMapper3D.h
@@ -24,8 +24,8 @@
 // vtkImage vtkImageProperty vtkImageResliceMapper vtkImageSliceMapper
 
 
-#ifndef __vtkImageMapper3D_h
-#define __vtkImageMapper3D_h
+#ifndef vtkImageMapper3D_h
+#define vtkImageMapper3D_h
 
 #include "vtkRenderingCoreModule.h" // For export macro
 #include "vtkAbstractMapper3D.h"
diff --git a/Rendering/Core/vtkImageProperty.h b/Rendering/Core/vtkImageProperty.h
index 224570391c4af1293775623622dbec99d9edd367..3d49942649079f63ead6d65d164a706d09b45d09 100644
--- a/Rendering/Core/vtkImageProperty.h
+++ b/Rendering/Core/vtkImageProperty.h
@@ -22,8 +22,8 @@
 // .SECTION See also
 // vtkImage vtkImageMapper3D vtkImageSliceMapper vtkImageResliceMapper
 
-#ifndef __vtkImageProperty_h
-#define __vtkImageProperty_h
+#ifndef vtkImageProperty_h
+#define vtkImageProperty_h
 
 #include "vtkRenderingCoreModule.h" // For export macro
 #include "vtkObject.h"
diff --git a/Rendering/Core/vtkImageSlice.h b/Rendering/Core/vtkImageSlice.h
index 19bd539ab582700618bd811caecabd23a9ee3c10..398700370823d9bb301c1a20aebc8e168d199902 100644
--- a/Rendering/Core/vtkImageSlice.h
+++ b/Rendering/Core/vtkImageSlice.h
@@ -29,8 +29,8 @@
 // .SECTION See also
 // vtkImageMapper3D vtkImageProperty vtkProp3D
 
-#ifndef __vtkImageSlice_h
-#define __vtkImageSlice_h
+#ifndef vtkImageSlice_h
+#define vtkImageSlice_h
 
 #include "vtkRenderingCoreModule.h" // For export macro
 #include "vtkProp3D.h"
diff --git a/Rendering/Core/vtkImageSliceMapper.h b/Rendering/Core/vtkImageSliceMapper.h
index 3bb08779df940b66fd98282f50ca4ecf06525024..f8147f941c747afedbd7114dfbb23a7064544be7 100644
--- a/Rendering/Core/vtkImageSliceMapper.h
+++ b/Rendering/Core/vtkImageSliceMapper.h
@@ -24,8 +24,8 @@
 // .SECTION See also
 // vtkImageSlice vtkImageProperty vtkImageResliceMapper
 
-#ifndef __vtkImageSliceMapper_h
-#define __vtkImageSliceMapper_h
+#ifndef vtkImageSliceMapper_h
+#define vtkImageSliceMapper_h
 
 #include "vtkRenderingCoreModule.h" // For export macro
 #include "vtkImageMapper3D.h"
diff --git a/Rendering/Core/vtkInteractorEventRecorder.h b/Rendering/Core/vtkInteractorEventRecorder.h
index b92f8380473924b5d5a73f7ff108e0a370f49aff..63b9c294547c715ba898e1c2d7481a9c743b0ebc 100644
--- a/Rendering/Core/vtkInteractorEventRecorder.h
+++ b/Rendering/Core/vtkInteractorEventRecorder.h
@@ -28,8 +28,8 @@
 // .SECTION See Also
 // vtkInteractorObserver vtkCallback
 
-#ifndef __vtkInteractorEventRecorder_h
-#define __vtkInteractorEventRecorder_h
+#ifndef vtkInteractorEventRecorder_h
+#define vtkInteractorEventRecorder_h
 
 #include "vtkRenderingCoreModule.h" // For export macro
 #include "vtkInteractorObserver.h"
@@ -126,5 +126,5 @@ private:
 
 };
 
-#endif /* __vtkInteractorEventRecorder_h */
+#endif /* vtkInteractorEventRecorder_h */
 
diff --git a/Rendering/Core/vtkInteractorObserver.h b/Rendering/Core/vtkInteractorObserver.h
index d524782fc4eeacec33b545f66f7d8b58f889cecc..0163f515289c64018943d767651aff6dc5c2ca68 100644
--- a/Rendering/Core/vtkInteractorObserver.h
+++ b/Rendering/Core/vtkInteractorObserver.h
@@ -39,8 +39,8 @@
 // .SECTION See Also
 // vtk3DWidget vtkBoxWidget vtkLineWidget
 
-#ifndef __vtkInteractorObserver_h
-#define __vtkInteractorObserver_h
+#ifndef vtkInteractorObserver_h
+#define vtkInteractorObserver_h
 
 #include "vtkRenderingCoreModule.h" // For export macro
 #include "vtkObject.h"
diff --git a/Rendering/Core/vtkInteractorStyle.h b/Rendering/Core/vtkInteractorStyle.h
index 01274fe7cef88f7b7ae0abbf6b2c15e18908c2b5..a43ee0ee28936d6f7daa78c4c9db5b059c300de1 100644
--- a/Rendering/Core/vtkInteractorStyle.h
+++ b/Rendering/Core/vtkInteractorStyle.h
@@ -87,8 +87,8 @@
 // .SECTION See Also
 // vtkInteractorStyleTrackball
 
-#ifndef __vtkInteractorStyle_h
-#define __vtkInteractorStyle_h
+#ifndef vtkInteractorStyle_h
+#define vtkInteractorStyle_h
 
 #include "vtkRenderingCoreModule.h" // For export macro
 #include "vtkInteractorObserver.h"
diff --git a/Rendering/Core/vtkInteractorStyleSwitchBase.h b/Rendering/Core/vtkInteractorStyleSwitchBase.h
index 46db5d75e97db0b1e0f723b5caa83b297cdcab1d..2457472e5b896b920febf41c4e0ab6a12921880b 100644
--- a/Rendering/Core/vtkInteractorStyleSwitchBase.h
+++ b/Rendering/Core/vtkInteractorStyleSwitchBase.h
@@ -22,8 +22,8 @@
 // .SECTION See Also
 // vtkInteractorStyleSwitchBase vtkRenderWindowInteractor
 
-#ifndef __vtkInteractorStyleSwitchBase_h
-#define __vtkInteractorStyleSwitchBase_h
+#ifndef vtkInteractorStyleSwitchBase_h
+#define vtkInteractorStyleSwitchBase_h
 
 #include "vtkRenderingCoreModule.h" // For export macro
 #include "vtkInteractorStyle.h"
diff --git a/Rendering/Core/vtkLODProp3D.h b/Rendering/Core/vtkLODProp3D.h
index 566c3bca7efc5150f4f65296d9a5d7963ff2fa53..ac7a75ba5020f7292ac6763193a24c3770262ef2 100644
--- a/Rendering/Core/vtkLODProp3D.h
+++ b/Rendering/Core/vtkLODProp3D.h
@@ -24,8 +24,8 @@
 // .SECTION See Also
 // vtkProp3D vtkActor vtkVolume vtkLODActor
 
-#ifndef __vtkLODProp3D_h
-#define __vtkLODProp3D_h
+#ifndef vtkLODProp3D_h
+#define vtkLODProp3D_h
 
 #include "vtkRenderingCoreModule.h" // For export macro
 #include "vtkProp3D.h"
diff --git a/Rendering/Core/vtkLight.h b/Rendering/Core/vtkLight.h
index 84f494ac03433be6be735d0cfd58b9adf99cbc5a..1390781bcc82076c38ff7c9871af3a30c753c29c 100644
--- a/Rendering/Core/vtkLight.h
+++ b/Rendering/Core/vtkLight.h
@@ -35,8 +35,8 @@
 // are defined by their local position and focal point, transformed by
 // their transformation matrix (if it exists).
 
-#ifndef __vtkLight_h
-#define __vtkLight_h
+#ifndef vtkLight_h
+#define vtkLight_h
 
 #include "vtkRenderingCoreModule.h" // For export macro
 #include "vtkObject.h"
diff --git a/Rendering/Core/vtkLightActor.h b/Rendering/Core/vtkLightActor.h
index c827f746b89312afe3da9cbca7c712a812330464..69293dbec8b067dcd9d44b1159ec2347987a42c2 100644
--- a/Rendering/Core/vtkLightActor.h
+++ b/Rendering/Core/vtkLightActor.h
@@ -31,8 +31,8 @@
 // .SECTION See Also
 // vtkLight vtkConeSource vtkFrustumSource vtkCameraActor
 
-#ifndef __vtkLightActor_h
-#define __vtkLightActor_h
+#ifndef vtkLightActor_h
+#define vtkLightActor_h
 
 #include "vtkRenderingCoreModule.h" // For export macro
 #include "vtkProp3D.h"
diff --git a/Rendering/Core/vtkLightCollection.h b/Rendering/Core/vtkLightCollection.h
index 3855c0a055a93fe424d57c16f52a96599b249abb..634ec388a9c205fea55da5e6ec49b0a92e59ae51 100644
--- a/Rendering/Core/vtkLightCollection.h
+++ b/Rendering/Core/vtkLightCollection.h
@@ -21,8 +21,8 @@
 // .SECTION see also
 // vtkCollection vtkLight
 
-#ifndef __vtkLightCollection_h
-#define __vtkLightCollection_h
+#ifndef vtkLightCollection_h
+#define vtkLightCollection_h
 
 #include "vtkRenderingCoreModule.h" // For export macro
 #include "vtkCollection.h"
diff --git a/Rendering/Core/vtkLightKit.h b/Rendering/Core/vtkLightKit.h
index 1e0a2b9f7cd4b071846052b19fe9fe4866cade21..62c996dc9ec464e170afdb79654a81c83d0bced4 100644
--- a/Rendering/Core/vtkLightKit.h
+++ b/Rendering/Core/vtkLightKit.h
@@ -86,8 +86,8 @@
 // Michael Halle (mhalle@bwh.harvard.edu) at the Surgical Planning
 // Lab, Brigham and Women's Hospital.
 
-#ifndef __vtkLightKit_h
-#define __vtkLightKit_h
+#ifndef vtkLightKit_h
+#define vtkLightKit_h
 
 #include "vtkRenderingCoreModule.h" // For export macro
 #include "vtkObject.h"
diff --git a/Rendering/Core/vtkLogLookupTable.h b/Rendering/Core/vtkLogLookupTable.h
index d05c61ebf1b04c813ca75fa1f1d5b6e2d51ebeb9..fdd879769f648f669c07345395284f04934949f4 100644
--- a/Rendering/Core/vtkLogLookupTable.h
+++ b/Rendering/Core/vtkLogLookupTable.h
@@ -20,8 +20,8 @@
 // .SECTION See Also
 // vtkLookupTable
 
-#ifndef __vtkLogLookupTable_h
-#define __vtkLogLookupTable_h
+#ifndef vtkLogLookupTable_h
+#define vtkLogLookupTable_h
 
 #include "vtkRenderingCoreModule.h" // For export macro
 #include "vtkLookupTable.h"
diff --git a/Rendering/Core/vtkLookupTableWithEnabling.h b/Rendering/Core/vtkLookupTableWithEnabling.h
index c99f6a1d7609de1a5e67484c2dfdb7f79c615382..9662e831648003b26648f4c73cf29e9292b74cd5 100644
--- a/Rendering/Core/vtkLookupTableWithEnabling.h
+++ b/Rendering/Core/vtkLookupTableWithEnabling.h
@@ -27,8 +27,8 @@
 // to MapScalars().
 //
 
-#ifndef __vtkLookupTableWithEnabling_h
-#define __vtkLookupTableWithEnabling_h
+#ifndef vtkLookupTableWithEnabling_h
+#define vtkLookupTableWithEnabling_h
 
 #include "vtkRenderingCoreModule.h" // For export macro
 #include "vtkLookupTable.h"
diff --git a/Rendering/Core/vtkMapArrayValues.h b/Rendering/Core/vtkMapArrayValues.h
index ca141ceb6effc450c42baa8462822c43a9f58ab0..131702496544394c2f0e619f9b011e6913054137 100644
--- a/Rendering/Core/vtkMapArrayValues.h
+++ b/Rendering/Core/vtkMapArrayValues.h
@@ -33,8 +33,8 @@
 // For example, using vtkMapArrayValues you could associate the vertex values
 // "Foo, John", "Foo, John.", and "John Foo" with a single entity.
 
-#ifndef __vtkMapArrayValues_h
-#define __vtkMapArrayValues_h
+#ifndef vtkMapArrayValues_h
+#define vtkMapArrayValues_h
 
 #include "vtkRenderingCoreModule.h" // For export macro
 #include "vtkPassInputTypeAlgorithm.h"
diff --git a/Rendering/Core/vtkMapper.h b/Rendering/Core/vtkMapper.h
index 1276ab0712f0c57c280b26790660ed2b81a56f16..72090988d4e2bf230415ec637c64b1d3067829c8 100644
--- a/Rendering/Core/vtkMapper.h
+++ b/Rendering/Core/vtkMapper.h
@@ -49,8 +49,8 @@
 // .SECTION See Also
 // vtkDataSetMapper vtkPolyDataMapper
 
-#ifndef __vtkMapper_h
-#define __vtkMapper_h
+#ifndef vtkMapper_h
+#define vtkMapper_h
 
 #include "vtkRenderingCoreModule.h" // For export macro
 #include "vtkAbstractMapper3D.h"
diff --git a/Rendering/Core/vtkMapper2D.h b/Rendering/Core/vtkMapper2D.h
index 1da63496246a57ad6d4baf0d35f35163f0faf897..f546e5ab02b181d1bd9a894a90c58ce4c4c3b6ba 100644
--- a/Rendering/Core/vtkMapper2D.h
+++ b/Rendering/Core/vtkMapper2D.h
@@ -20,8 +20,8 @@
 // .SECTION See Also
 // vtkActor2D
 
-#ifndef __vtkMapper2D_h
-#define __vtkMapper2D_h
+#ifndef vtkMapper2D_h
+#define vtkMapper2D_h
 
 #include "vtkRenderingCoreModule.h" // For export macro
 #include "vtkAbstractMapper.h"
diff --git a/Rendering/Core/vtkMapperCollection.h b/Rendering/Core/vtkMapperCollection.h
index 4aa1395ea0b433866f948ff21a361a0fba180cb5..4f8aebdef2925341247aa0d76b84fa89d049989c 100644
--- a/Rendering/Core/vtkMapperCollection.h
+++ b/Rendering/Core/vtkMapperCollection.h
@@ -21,8 +21,8 @@
 // .SECTION see also
 // vtkMapper vtkCollection
 
-#ifndef __vtkMapperCollection_h
-#define __vtkMapperCollection_h
+#ifndef vtkMapperCollection_h
+#define vtkMapperCollection_h
 
 #include "vtkRenderingCoreModule.h" // For export macro
 #include "vtkCollection.h"
diff --git a/Rendering/Core/vtkObserverMediator.h b/Rendering/Core/vtkObserverMediator.h
index 77795d6b2cbc2f3c39bd8a89260890827eeb1658..16c35ee62f89577aa232b6c91dd9f48828fecb21 100644
--- a/Rendering/Core/vtkObserverMediator.h
+++ b/Rendering/Core/vtkObserverMediator.h
@@ -26,8 +26,8 @@
 // vtkAbstractWidget vtkWidgetRepresentation
 
 
-#ifndef __vtkObserverMediator_h
-#define __vtkObserverMediator_h
+#ifndef vtkObserverMediator_h
+#define vtkObserverMediator_h
 
 #include "vtkRenderingCoreModule.h" // For export macro
 #include "vtkObject.h"
diff --git a/Rendering/Core/vtkPainterDeviceAdapter.h b/Rendering/Core/vtkPainterDeviceAdapter.h
index 74d82aeadb1d71d86fc17b625e464d4c4d07b759..4d7f284ec8c2feb5e7369651bed3feca6ec32cfd 100644
--- a/Rendering/Core/vtkPainterDeviceAdapter.h
+++ b/Rendering/Core/vtkPainterDeviceAdapter.h
@@ -41,8 +41,8 @@
 // vtkPainter
 //
 
-#ifndef __vtkPainterDeviceAdapter_h
-#define __vtkPainterDeviceAdapter_h
+#ifndef vtkPainterDeviceAdapter_h
+#define vtkPainterDeviceAdapter_h
 
 #include "vtkRenderingCoreModule.h" // For export macro
 #include "vtkObject.h"
diff --git a/Rendering/Core/vtkPicker.h b/Rendering/Core/vtkPicker.h
index 600673549813b95a2ca639bdd48c755fc3a86e37..f013dc5f22d44d9968b47c3f8c1bd111d2b6c553 100644
--- a/Rendering/Core/vtkPicker.h
+++ b/Rendering/Core/vtkPicker.h
@@ -35,8 +35,8 @@
 // subclasses vtkPointPicker or vtkCellPicker.  For hardware-accelerated
 // picking of any type of vtkProp, use vtkPropPicker or vtkWorldPointPicker.
 
-#ifndef __vtkPicker_h
-#define __vtkPicker_h
+#ifndef vtkPicker_h
+#define vtkPicker_h
 
 #include "vtkRenderingCoreModule.h" // For export macro
 #include "vtkAbstractPropPicker.h"
diff --git a/Rendering/Core/vtkPickingManager.h b/Rendering/Core/vtkPickingManager.h
index f4d2bf4d469b2ad9d97047c7683c85da42041f8a..dea034f9e5e316339e9f7c17b5069e3a71b78249 100644
--- a/Rendering/Core/vtkPickingManager.h
+++ b/Rendering/Core/vtkPickingManager.h
@@ -65,8 +65,8 @@
 // This has been done to allow adding multiple times the same picker to the manager
 // by not passing the referenced object to not force the supression of all pickers
 
-#ifndef __vtkPickingManager_h
-#define __vtkPickingManager_h
+#ifndef vtkPickingManager_h
+#define vtkPickingManager_h
 
 #include "vtkObject.h"
 #include "vtkRenderingCoreModule.h" // For export macro
diff --git a/Rendering/Core/vtkPointPicker.h b/Rendering/Core/vtkPointPicker.h
index b054f54a8ee2737906fd936af0a21d2274b15809..f9abcc0849250e638df6d008f0b3630f26573125 100644
--- a/Rendering/Core/vtkPointPicker.h
+++ b/Rendering/Core/vtkPointPicker.h
@@ -27,8 +27,8 @@
 // .SECTION See Also
 // vtkPicker vtkCellPicker.
 
-#ifndef __vtkPointPicker_h
-#define __vtkPointPicker_h
+#ifndef vtkPointPicker_h
+#define vtkPointPicker_h
 
 #include "vtkRenderingCoreModule.h" // For export macro
 #include "vtkPicker.h"
diff --git a/Rendering/Core/vtkPolyDataMapper.h b/Rendering/Core/vtkPolyDataMapper.h
index 9160be17c3fb26224220a9ec5d66a7e6f0277f5b..8bbd4a0922966b0a512d43a48ba17a8bbd796f8d 100644
--- a/Rendering/Core/vtkPolyDataMapper.h
+++ b/Rendering/Core/vtkPolyDataMapper.h
@@ -19,8 +19,8 @@
 // device-specific poly data mappers, that actually do the mapping to the
 // rendering/graphics hardware/software.
 
-#ifndef __vtkPolyDataMapper_h
-#define __vtkPolyDataMapper_h
+#ifndef vtkPolyDataMapper_h
+#define vtkPolyDataMapper_h
 
 #include "vtkRenderingCoreModule.h" // For export macro
 #include "vtkMapper.h"
diff --git a/Rendering/Core/vtkPolyDataMapper2D.h b/Rendering/Core/vtkPolyDataMapper2D.h
index 787b7a326e895ae2d1ae56303c03c4766ae44f4a..7736533ca6250d010c57d175fa42ff4c5270ed72 100644
--- a/Rendering/Core/vtkPolyDataMapper2D.h
+++ b/Rendering/Core/vtkPolyDataMapper2D.h
@@ -27,8 +27,8 @@
 // .SECTION See Also
 // vtkMapper2D vtkActor2D
 
-#ifndef __vtkPolyDataMapper2D_h
-#define __vtkPolyDataMapper2D_h
+#ifndef vtkPolyDataMapper2D_h
+#define vtkPolyDataMapper2D_h
 
 
 #include "vtkRenderingCoreModule.h" // For export macro
diff --git a/Rendering/Core/vtkProp.h b/Rendering/Core/vtkProp.h
index 47fdb988f29acd33a3efe50399a8bfce31f5f807..249f37cc9a987d1685c1c61f353cb1198cbd1712 100644
--- a/Rendering/Core/vtkProp.h
+++ b/Rendering/Core/vtkProp.h
@@ -22,8 +22,8 @@
 // .SECTION See Also
 // vtkActor2D vtkActor vtkVolume vtkProp3D
 
-#ifndef __vtkProp_h
-#define __vtkProp_h
+#ifndef vtkProp_h
+#define vtkProp_h
 
 #include "vtkRenderingCoreModule.h" // For export macro
 #include "vtkObject.h"
diff --git a/Rendering/Core/vtkProp3D.h b/Rendering/Core/vtkProp3D.h
index 1b5caf0ff70b1bc1afb48935bd844c3ca85bcc10..df0fec4dfb6f156bb0f0c32bf761b03606453593 100644
--- a/Rendering/Core/vtkProp3D.h
+++ b/Rendering/Core/vtkProp3D.h
@@ -27,8 +27,8 @@
 // .SECTION See Also
 // vtkProp vtkActor vtkAssembly vtkVolume
 
-#ifndef __vtkProp3D_h
-#define __vtkProp3D_h
+#ifndef vtkProp3D_h
+#define vtkProp3D_h
 
 #include "vtkRenderingCoreModule.h" // For export macro
 #include "vtkProp.h"
diff --git a/Rendering/Core/vtkProp3DCollection.h b/Rendering/Core/vtkProp3DCollection.h
index ff0dbf86f6927236ac339ddfeb82e5d37e14e1cf..9c0fff42a6f305c362a64eabad3e2314bb811e76 100644
--- a/Rendering/Core/vtkProp3DCollection.h
+++ b/Rendering/Core/vtkProp3DCollection.h
@@ -21,8 +21,8 @@
 // .SECTION see also
 // vtkProp3D vtkCollection
 
-#ifndef __vtkProp3DCollection_h
-#define __vtkProp3DCollection_h
+#ifndef vtkProp3DCollection_h
+#define vtkProp3DCollection_h
 
 #include "vtkRenderingCoreModule.h" // For export macro
 #include "vtkPropCollection.h"
diff --git a/Rendering/Core/vtkProp3DFollower.h b/Rendering/Core/vtkProp3DFollower.h
index bdddc8361b7a8fa9096f78dc59bd627bc17ad525..3bb95e25a83e7b91c67553109d6e2cff8a77cde7 100644
--- a/Rendering/Core/vtkProp3DFollower.h
+++ b/Rendering/Core/vtkProp3DFollower.h
@@ -28,8 +28,8 @@
 // .SECTION see also
 // vtkFollower vtkProp3D vtkCamera vtkProp3DAxisFollower
 
-#ifndef __vtkProp3DFollower_h
-#define __vtkProp3DFollower_h
+#ifndef vtkProp3DFollower_h
+#define vtkProp3DFollower_h
 
 #include "vtkRenderingCoreModule.h" // For export macro
 #include "vtkProp3D.h"
diff --git a/Rendering/Core/vtkPropAssembly.h b/Rendering/Core/vtkPropAssembly.h
index 18073375fac430900c5098d9144718070eefab03..ee75cbde6ed0690facf8ffc8dadd7fa78562af04 100644
--- a/Rendering/Core/vtkPropAssembly.h
+++ b/Rendering/Core/vtkPropAssembly.h
@@ -38,8 +38,8 @@
 // .SECTION See Also
 // vtkProp3D vtkActor vtkAssembly vtkActor2D vtkVolume
 
-#ifndef __vtkPropAssembly_h
-#define __vtkPropAssembly_h
+#ifndef vtkPropAssembly_h
+#define vtkPropAssembly_h
 
 #include "vtkRenderingCoreModule.h" // For export macro
 #include "vtkProp.h"
diff --git a/Rendering/Core/vtkPropCollection.h b/Rendering/Core/vtkPropCollection.h
index 6af3ab74d5572ea7806b85e2f7504275024a2675..877b47272d4799bf3869ce06a99300950d417dd2 100644
--- a/Rendering/Core/vtkPropCollection.h
+++ b/Rendering/Core/vtkPropCollection.h
@@ -21,8 +21,8 @@
 // .SECTION see also
 // vtkProp vtkCollection
 
-#ifndef __vtkPropCollection_h
-#define __vtkPropCollection_h
+#ifndef vtkPropCollection_h
+#define vtkPropCollection_h
 
 #include "vtkRenderingCoreModule.h" // For export macro
 #include "vtkCollection.h"
diff --git a/Rendering/Core/vtkPropPicker.h b/Rendering/Core/vtkPropPicker.h
index 08d112f97eaeb61a8ca608cbbd8922c1547b960f..6cf5dbcc6412d4ca01689699fbe7b2cea6978ba4 100644
--- a/Rendering/Core/vtkPropPicker.h
+++ b/Rendering/Core/vtkPropPicker.h
@@ -24,8 +24,8 @@
 // .SECTION See Also
 // vtkPicker vtkWorldPointPicker vtkCellPicker vtkPointPicker
 
-#ifndef __vtkPropPicker_h
-#define __vtkPropPicker_h
+#ifndef vtkPropPicker_h
+#define vtkPropPicker_h
 
 #include "vtkRenderingCoreModule.h" // For export macro
 #include "vtkAbstractPropPicker.h"
diff --git a/Rendering/Core/vtkProperty.h b/Rendering/Core/vtkProperty.h
index 68e45ed6eb0d399ff2b1b51cec5118c0bcf15c31..afae38cb078303662674d344a733bceaf95bfb0f 100644
--- a/Rendering/Core/vtkProperty.h
+++ b/Rendering/Core/vtkProperty.h
@@ -25,8 +25,8 @@
 // .SECTION See Also
 // vtkActor vtkPropertyDevice
 
-#ifndef __vtkProperty_h
-#define __vtkProperty_h
+#ifndef vtkProperty_h
+#define vtkProperty_h
 
 #include "vtkRenderingCoreModule.h" // For export macro
 #include "vtkObject.h"
diff --git a/Rendering/Core/vtkProperty2D.h b/Rendering/Core/vtkProperty2D.h
index ba0dced8b3f7d85332bc62bc53b812982a4deff9..e64159294e0165d08d62138076cd4975407fbd8a 100644
--- a/Rendering/Core/vtkProperty2D.h
+++ b/Rendering/Core/vtkProperty2D.h
@@ -20,8 +20,8 @@
 // .SECTION See Also
 // vtkActor2D
 
-#ifndef __vtkProperty2D_h
-#define __vtkProperty2D_h
+#ifndef vtkProperty2D_h
+#define vtkProperty2D_h
 
 #include "vtkRenderingCoreModule.h" // For export macro
 #include "vtkObject.h"
diff --git a/Rendering/Core/vtkRayCastStructures.h b/Rendering/Core/vtkRayCastStructures.h
index 7b2c6afc8b4cde224d091cb4dbe3cce2dbe644ec..8b7fdd0afa5527569302a814eab141acc56cc089 100644
--- a/Rendering/Core/vtkRayCastStructures.h
+++ b/Rendering/Core/vtkRayCastStructures.h
@@ -21,8 +21,8 @@
 // .SECTION See Also
 // vtkRayCaster
 
-#ifndef __vtkRayCastStructures_h
-#define __vtkRayCastStructures_h
+#ifndef vtkRayCastStructures_h
+#define vtkRayCastStructures_h
 
 typedef struct
 {
diff --git a/Rendering/Core/vtkRenderWidget.h b/Rendering/Core/vtkRenderWidget.h
index 413c5287208646d1dc9b43063a5c2b703d732a4e..2370f8ddc828292adc9b854c8c3e4ef6cae693db 100644
--- a/Rendering/Core/vtkRenderWidget.h
+++ b/Rendering/Core/vtkRenderWidget.h
@@ -11,8 +11,8 @@
      PURPOSE.  See the above copyright notice for more information.
 
 =========================================================================*/
-#ifndef __vtkRenderWidget_h
-#define __vtkRenderWidget_h
+#ifndef vtkRenderWidget_h
+#define vtkRenderWidget_h
 
 #include "vtkRenderingCoreModule.h" // For export macro
 #include "vtkObject.h"
diff --git a/Rendering/Core/vtkRenderWindow.h b/Rendering/Core/vtkRenderWindow.h
index 1aa92bd6d22ae2582e12cf98108041eacf113ad2..f674c468ac0143af145055b9c4c9ffb2496aa820 100644
--- a/Rendering/Core/vtkRenderWindow.h
+++ b/Rendering/Core/vtkRenderWindow.h
@@ -35,8 +35,8 @@
 // .SECTION see also
 // vtkRenderer vtkRenderWindowInteractor vtkWindowToImageFilter
 
-#ifndef __vtkRenderWindow_h
-#define __vtkRenderWindow_h
+#ifndef vtkRenderWindow_h
+#define vtkRenderWindow_h
 
 #include "vtkRenderingCoreModule.h" // For export macro
 #include "vtkWindow.h"
diff --git a/Rendering/Core/vtkRenderWindowCollection.h b/Rendering/Core/vtkRenderWindowCollection.h
index 69cf245dbb2e4ca81ecaf84aaedbff160eb6b47a..813f90f8fd139d651ec4c56664dc3a95bc683709 100644
--- a/Rendering/Core/vtkRenderWindowCollection.h
+++ b/Rendering/Core/vtkRenderWindowCollection.h
@@ -21,8 +21,8 @@
 // .SECTION see also
 // vtkRenderWindow vtkCollection
 
-#ifndef __vtkRenderWindowCollection_h
-#define __vtkRenderWindowCollection_h
+#ifndef vtkRenderWindowCollection_h
+#define vtkRenderWindowCollection_h
 
 #include "vtkRenderingCoreModule.h" // For export macro
 #include "vtkCollection.h"
diff --git a/Rendering/Core/vtkRenderWindowInteractor.h b/Rendering/Core/vtkRenderWindowInteractor.h
index e7622cc173516a57ce774d1406c9453a0053689e..cbd8f81967647a7c8435ccb955153ccefe62e912 100644
--- a/Rendering/Core/vtkRenderWindowInteractor.h
+++ b/Rendering/Core/vtkRenderWindowInteractor.h
@@ -39,8 +39,8 @@
 // .SECTION See Also
 // vtkInteractorObserver
 
-#ifndef __vtkRenderWindowInteractor_h
-#define __vtkRenderWindowInteractor_h
+#ifndef vtkRenderWindowInteractor_h
+#define vtkRenderWindowInteractor_h
 
 #include "vtkRenderingCoreModule.h" // For export macro
 #include "vtkObject.h"
diff --git a/Rendering/Core/vtkRenderedAreaPicker.h b/Rendering/Core/vtkRenderedAreaPicker.h
index db71ef761b4cbf155516c978d4d61d4cc06b8b74..31dcd800ad627421dc0c44d1fbffc206e22aa0fb 100644
--- a/Rendering/Core/vtkRenderedAreaPicker.h
+++ b/Rendering/Core/vtkRenderedAreaPicker.h
@@ -25,8 +25,8 @@
 // some objects that pass the bounding box test of vtkAreaPicker. This
 // will happen, for instance, when picking through a corner of the bounding
 // box when the data set does not have any visible geometry in that corner.
-#ifndef __vtkRenderedAreaPicker_h
-#define __vtkRenderedAreaPicker_h
+#ifndef vtkRenderedAreaPicker_h
+#define vtkRenderedAreaPicker_h
 
 #include "vtkRenderingCoreModule.h" // For export macro
 #include "vtkAreaPicker.h"
diff --git a/Rendering/Core/vtkRenderer.h b/Rendering/Core/vtkRenderer.h
index d96b9727701921fd526cbf565e3077ff68c7fe84..a49f13955b3cd9cb78b47e931a863b5464ac9387 100644
--- a/Rendering/Core/vtkRenderer.h
+++ b/Rendering/Core/vtkRenderer.h
@@ -26,8 +26,8 @@
 // .SECTION See Also
 // vtkRenderWindow vtkActor vtkCamera vtkLight vtkVolume
 
-#ifndef __vtkRenderer_h
-#define __vtkRenderer_h
+#ifndef vtkRenderer_h
+#define vtkRenderer_h
 
 #include "vtkRenderingCoreModule.h" // For export macro
 #include "vtkViewport.h"
diff --git a/Rendering/Core/vtkRendererCollection.h b/Rendering/Core/vtkRendererCollection.h
index 4b5b738eb4becd47b9afbe9db042c668ab3c5d52..ba4e138470552d51e72490c9df08876913089599 100644
--- a/Rendering/Core/vtkRendererCollection.h
+++ b/Rendering/Core/vtkRendererCollection.h
@@ -21,8 +21,8 @@
 // .SECTION see also
 // vtkRenderer vtkCollection
 
-#ifndef __vtkRendererCollection_h
-#define __vtkRendererCollection_h
+#ifndef vtkRendererCollection_h
+#define vtkRendererCollection_h
 
 #include "vtkRenderingCoreModule.h" // For export macro
 #include "vtkCollection.h"
diff --git a/Rendering/Core/vtkRendererDelegate.h b/Rendering/Core/vtkRendererDelegate.h
index 52d8b1acf1fb2f768c7c924b1cd7d33a0bc25ab9..5662cdfdcf1ad22725ba0f16ee3e83685d17c0a5 100644
--- a/Rendering/Core/vtkRendererDelegate.h
+++ b/Rendering/Core/vtkRendererDelegate.h
@@ -23,8 +23,8 @@
 // .SECTION See Also
 // vtkRenderer
 
-#ifndef __vtkRendererDelegate_h
-#define __vtkRendererDelegate_h
+#ifndef vtkRendererDelegate_h
+#define vtkRendererDelegate_h
 
 #include "vtkRenderingCoreModule.h" // For export macro
 #include "vtkObject.h"
diff --git a/Rendering/Core/vtkRendererSource.h b/Rendering/Core/vtkRendererSource.h
index be3f66db1b40490c25db2284acca08f75e40dd08..f2190100569b2bdfc3923475cba7638fd86d770c 100644
--- a/Rendering/Core/vtkRendererSource.h
+++ b/Rendering/Core/vtkRendererSource.h
@@ -28,8 +28,8 @@
 // .SECTION see also
 // vtkWindowToImageFilter vtkRenderer vtkStructuredPoints
 
-#ifndef __vtkRendererSource_h
-#define __vtkRendererSource_h
+#ifndef vtkRendererSource_h
+#define vtkRendererSource_h
 
 #include "vtkRenderingCoreModule.h" // For export macro
 #include "vtkAlgorithm.h"
diff --git a/Rendering/Core/vtkRenderingCoreEnums.h b/Rendering/Core/vtkRenderingCoreEnums.h
index 1c6aa521f37a02623f6ee9c27730426528edbc3f..aa1e2ee91becd71cde80a52e96ee50a08537dff1 100644
--- a/Rendering/Core/vtkRenderingCoreEnums.h
+++ b/Rendering/Core/vtkRenderingCoreEnums.h
@@ -13,8 +13,8 @@
 
 =========================================================================*/
 
-#ifndef __vtkRenderingCoreEnums_h
-#define __vtkRenderingCoreEnums_h
+#ifndef vtkRenderingCoreEnums_h
+#define vtkRenderingCoreEnums_h
 
 // Marker shapes for plotting
 enum
@@ -29,5 +29,5 @@ enum
   VTK_MARKER_UNKNOWN  // Must be last.
 };
 
-#endif // __vtkRenderingCoreEnums_h
+#endif // vtkRenderingCoreEnums_h
 // VTK-HeaderTest-Exclude: vtkRenderingCoreEnums.h
diff --git a/Rendering/Core/vtkScenePicker.h b/Rendering/Core/vtkScenePicker.h
index 882d57582b235d0684f019ea2b2510ab04f069f0..18ccf6642e0fe4f0056744d6a44c344894c01267 100644
--- a/Rendering/Core/vtkScenePicker.h
+++ b/Rendering/Core/vtkScenePicker.h
@@ -37,8 +37,8 @@
 // .SECTION See Also
 // vtkHoverWidget vtkHardwareSelector
 
-#ifndef __vtkScenePicker_h
-#define __vtkScenePicker_h
+#ifndef vtkScenePicker_h
+#define vtkScenePicker_h
 
 #include "vtkRenderingCoreModule.h" // For export macro
 #include "vtkObject.h"
diff --git a/Rendering/Core/vtkSelectVisiblePoints.h b/Rendering/Core/vtkSelectVisiblePoints.h
index e4807b5e43504b79861924d4d7fdee35ba547d3f..a7cf1c849d076b8ed19b3c30d794f289590b1f28 100644
--- a/Rendering/Core/vtkSelectVisiblePoints.h
+++ b/Rendering/Core/vtkSelectVisiblePoints.h
@@ -39,8 +39,8 @@
 // are using this filter in conjunction with vtkLabeledDataMapper,
 // things work out because 2D rendering occurs after the 3D rendering.
 
-#ifndef __vtkSelectVisiblePoints_h
-#define __vtkSelectVisiblePoints_h
+#ifndef vtkSelectVisiblePoints_h
+#define vtkSelectVisiblePoints_h
 
 #include "vtkRenderingCoreModule.h" // For export macro
 #include "vtkPolyDataAlgorithm.h"
diff --git a/Rendering/Core/vtkShaderDeviceAdapter2.h b/Rendering/Core/vtkShaderDeviceAdapter2.h
index 4fbb7df10e12a8dce97c290cb873431e6f84b1d0..198c69ff57fa279b29b50a6a897a102f9bff6337 100644
--- a/Rendering/Core/vtkShaderDeviceAdapter2.h
+++ b/Rendering/Core/vtkShaderDeviceAdapter2.h
@@ -20,8 +20,8 @@
 // this class merely defines the API and subclasses provide implementations for
 // Cg and GL.
 
-#ifndef __vtkShaderDeviceAdapter2_h
-#define __vtkShaderDeviceAdapter2_h
+#ifndef vtkShaderDeviceAdapter2_h
+#define vtkShaderDeviceAdapter2_h
 
 #include "vtkRenderingCoreModule.h" // For export macro
 #include "vtkObject.h"
diff --git a/Rendering/Core/vtkStringToImage.h b/Rendering/Core/vtkStringToImage.h
index 7d244b3120ee697522ec52e2447ad13fd91fe6ed..33636f489562101fdfa7ff4666b738a55c7475b8 100644
--- a/Rendering/Core/vtkStringToImage.h
+++ b/Rendering/Core/vtkStringToImage.h
@@ -18,8 +18,8 @@
 // .SECTION Description
 //
 
-#ifndef __vtkStringToImage_h
-#define __vtkStringToImage_h
+#ifndef vtkStringToImage_h
+#define vtkStringToImage_h
 
 #include "vtkRenderingCoreModule.h" // For export macro
 #include "vtkObject.h"
@@ -86,4 +86,4 @@ private:
   void operator=(const vtkStringToImage &);   // Not implemented.
 };
 
-#endif //__vtkStringToImage_h
+#endif //vtkStringToImage_h
diff --git a/Rendering/Core/vtkTDxInteractorStyle.h b/Rendering/Core/vtkTDxInteractorStyle.h
index 8c0b4a87588540de2242c87226bf7424fe963d41..4aceabf0237deba5a8a7277b6dd378e3fdd7a208 100644
--- a/Rendering/Core/vtkTDxInteractorStyle.h
+++ b/Rendering/Core/vtkTDxInteractorStyle.h
@@ -26,8 +26,8 @@
 // vtkInteractorStyle vtkRenderWindowInteractor
 // vtkTDxInteractorStyleCamera
 
-#ifndef __vtkTDxInteractorStyle_h
-#define __vtkTDxInteractorStyle_h
+#ifndef vtkTDxInteractorStyle_h
+#define vtkTDxInteractorStyle_h
 
 #include "vtkRenderingCoreModule.h" // For export macro
 #include "vtkObject.h"
diff --git a/Rendering/Core/vtkTDxInteractorStyleCamera.h b/Rendering/Core/vtkTDxInteractorStyleCamera.h
index f61a8a8ffb46455aa83bc40b8478c8270bfd6b27..0255ed8d83cc1e9b0778b165466ed9f351e565ef 100644
--- a/Rendering/Core/vtkTDxInteractorStyleCamera.h
+++ b/Rendering/Core/vtkTDxInteractorStyleCamera.h
@@ -22,8 +22,8 @@
 // vtkInteractorStyle vtkRenderWindowInteractor
 // vtkTDxInteractorStyle
 
-#ifndef __vtkTDxInteractorStyleCamera_h
-#define __vtkTDxInteractorStyleCamera_h
+#ifndef vtkTDxInteractorStyleCamera_h
+#define vtkTDxInteractorStyleCamera_h
 
 #include "vtkRenderingCoreModule.h" // For export macro
 #include "vtkTDxInteractorStyle.h"
diff --git a/Rendering/Core/vtkTDxInteractorStyleSettings.h b/Rendering/Core/vtkTDxInteractorStyleSettings.h
index 82ad801f459693b2fb646437837e1c4c33aa5f04..1bf9c018a9db4def55c88d7d8cd8f85f55308cd1 100644
--- a/Rendering/Core/vtkTDxInteractorStyleSettings.h
+++ b/Rendering/Core/vtkTDxInteractorStyleSettings.h
@@ -22,8 +22,8 @@
 // vtkInteractorStyle vtkRenderWindowInteractor
 // vtkTDxInteractorStyle
 
-#ifndef __vtkTDxInteractorStyleSettings_h
-#define __vtkTDxInteractorStyleSettings_h
+#ifndef vtkTDxInteractorStyleSettings_h
+#define vtkTDxInteractorStyleSettings_h
 
 #include "vtkRenderingCoreModule.h" // For export macro
 #include "vtkObject.h"
diff --git a/Rendering/Core/vtkTDxMotionEventInfo.h b/Rendering/Core/vtkTDxMotionEventInfo.h
index fb06bf8a157a5467dfc844c7d43735594b7c81a6..37a94cbef4b5ed60b054f6486d01308aa03882b1 100644
--- a/Rendering/Core/vtkTDxMotionEventInfo.h
+++ b/Rendering/Core/vtkTDxMotionEventInfo.h
@@ -20,8 +20,8 @@
 // .SECTION See Also
 // vtkTDxDevice
 
-#ifndef __vtkTDxMotionEventInfo_h
-#define __vtkTDxMotionEventInfo_h
+#ifndef vtkTDxMotionEventInfo_h
+#define vtkTDxMotionEventInfo_h
 
 #include "vtkRenderingCoreModule.h" // For export macro
 #include "vtkObject.h" // for the export macro
diff --git a/Rendering/Core/vtkTextMapper.h b/Rendering/Core/vtkTextMapper.h
index 7586616bf9e3928d36fb8f7415c4ddd250dd0be9..acc723f9630c63ab85fc620ef9c11ea4c82538e2 100644
--- a/Rendering/Core/vtkTextMapper.h
+++ b/Rendering/Core/vtkTextMapper.h
@@ -30,8 +30,8 @@
 // newer features provided by this implementation (such as unicode and MathText
 // strings). Do not link with that library if such features are needed.
 
-#ifndef __vtkTextMapper_h
-#define __vtkTextMapper_h
+#ifndef vtkTextMapper_h
+#define vtkTextMapper_h
 
 #include "vtkRenderingCoreModule.h" // For export macro
 #include "vtkMapper2D.h"
diff --git a/Rendering/Core/vtkTextProperty.h b/Rendering/Core/vtkTextProperty.h
index e6926013787fe5d707d6ed15855048d037f4e601..49ddeb7fb209088a3f7702b400b7967a6583dfb0 100644
--- a/Rendering/Core/vtkTextProperty.h
+++ b/Rendering/Core/vtkTextProperty.h
@@ -21,8 +21,8 @@
 // .SECTION See Also
 // vtkTextMapper vtkTextActor vtkLegendBoxActor vtkCaptionActor2D
 
-#ifndef __vtkTextProperty_h
-#define __vtkTextProperty_h
+#ifndef vtkTextProperty_h
+#define vtkTextProperty_h
 
 #include "vtkRenderingCoreModule.h" // For export macro
 #include "vtkObject.h"
diff --git a/Rendering/Core/vtkTextRenderer.h b/Rendering/Core/vtkTextRenderer.h
index db343fc027563b73d5d7c02e4d2f74095e7b1273..99adb7e7e241e1c4cb1e9a0b572b1e9549c8c073 100644
--- a/Rendering/Core/vtkTextRenderer.h
+++ b/Rendering/Core/vtkTextRenderer.h
@@ -37,8 +37,8 @@
 // Note that this class is abstract -- link to the vtkRenderingFreetype module
 // to get the default implementation.
 
-#ifndef __vtkTextRenderer_h
-#define __vtkTextRenderer_h
+#ifndef vtkTextRenderer_h
+#define vtkTextRenderer_h
 
 #include "vtkRenderingCoreModule.h" // For export macro
 #include "vtkObject.h"
@@ -281,4 +281,4 @@ private:
   void operator=(const vtkTextRenderer &); // Not implemented.
 };
 
-#endif //__vtkTextRenderer_h
+#endif //vtkTextRenderer_h
diff --git a/Rendering/Core/vtkTexture.h b/Rendering/Core/vtkTexture.h
index 579535780e8c504bc30ed3ad4ff0f4f908e5d149..02f9d37c1afae610763ec2800c373e28c15c52f0 100644
--- a/Rendering/Core/vtkTexture.h
+++ b/Rendering/Core/vtkTexture.h
@@ -39,8 +39,8 @@
 // .SECTION See Also
 // vtkActor vtkRenderer vtkOpenGLTexture
 
-#ifndef __vtkTexture_h
-#define __vtkTexture_h
+#ifndef vtkTexture_h
+#define vtkTexture_h
 
 #include "vtkRenderingCoreModule.h" // For export macro
 #include "vtkImageAlgorithm.h"
diff --git a/Rendering/Core/vtkTexturedActor2D.h b/Rendering/Core/vtkTexturedActor2D.h
index 43e088dd773ea950257c35559d819414495539ce..a5e4ef039dfb3500856f4fae43c0c0a908b652de 100644
--- a/Rendering/Core/vtkTexturedActor2D.h
+++ b/Rendering/Core/vtkTexturedActor2D.h
@@ -21,8 +21,8 @@
 // .SECTION See Also
 // vtkActor2D vtkProp vtkMapper2D vtkProperty2D
 
-#ifndef __vtkTexturedActor2D_h
-#define __vtkTexturedActor2D_h
+#ifndef vtkTexturedActor2D_h
+#define vtkTexturedActor2D_h
 
 #include "vtkRenderingCoreModule.h" // For export macro
 #include "vtkActor2D.h"
diff --git a/Rendering/Core/vtkTransformCoordinateSystems.h b/Rendering/Core/vtkTransformCoordinateSystems.h
index 759630d77960929c25293fb057b4166962ad7c4a..78aadbf41c30064941786d09d61abfd25b02d310 100644
--- a/Rendering/Core/vtkTransformCoordinateSystems.h
+++ b/Rendering/Core/vtkTransformCoordinateSystems.h
@@ -22,8 +22,8 @@
 // .SECTION See Also
 // vtkCoordinate vtkTransformFilter vtkTransformPolyData vtkPolyDataMapper2D
 
-#ifndef __vtkTransformCoordinateSystems_h
-#define __vtkTransformCoordinateSystems_h
+#ifndef vtkTransformCoordinateSystems_h
+#define vtkTransformCoordinateSystems_h
 
 #include "vtkRenderingCoreModule.h" // For export macro
 #include "vtkPointSetAlgorithm.h"
diff --git a/Rendering/Core/vtkTransformInterpolator.h b/Rendering/Core/vtkTransformInterpolator.h
index 1db21fbc9d8c2ab75049a895a67a14ac1831bfea..5fd03e40d603b16bc78cb246ece42fd9dba444fd 100644
--- a/Rendering/Core/vtkTransformInterpolator.h
+++ b/Rendering/Core/vtkTransformInterpolator.h
@@ -44,8 +44,8 @@
 // best performance is obtained by 1) configuring the interpolators, 2) adding
 // all the transforms, and 3) finally performing interpolation.
 
-#ifndef __vtkTransformInterpolator_h
-#define __vtkTransformInterpolator_h
+#ifndef vtkTransformInterpolator_h
+#define vtkTransformInterpolator_h
 
 #include "vtkRenderingCoreModule.h" // For export macro
 #include "vtkObject.h"
diff --git a/Rendering/Core/vtkTupleInterpolator.h b/Rendering/Core/vtkTupleInterpolator.h
index fc68bc2dd4c15f7480432de2d920138352235583..9d683ed0d44df8d31719ee0ec69e30e5a4379af0 100644
--- a/Rendering/Core/vtkTupleInterpolator.h
+++ b/Rendering/Core/vtkTupleInterpolator.h
@@ -38,8 +38,8 @@
 // point is lost. Bisection methods are used to speed up the search for the
 // interpolation interval.
 
-#ifndef __vtkTupleInterpolator_h
-#define __vtkTupleInterpolator_h
+#ifndef vtkTupleInterpolator_h
+#define vtkTupleInterpolator_h
 
 #include "vtkRenderingCoreModule.h" // For export macro
 #include "vtkObject.h"
diff --git a/Rendering/Core/vtkViewDependentErrorMetric.h b/Rendering/Core/vtkViewDependentErrorMetric.h
index 3509cf307e7f0988f07e121654f0297a18a58047..debe1e63de1e2754b0bd1ef45edd59981f85177b 100644
--- a/Rendering/Core/vtkViewDependentErrorMetric.h
+++ b/Rendering/Core/vtkViewDependentErrorMetric.h
@@ -23,8 +23,8 @@
 // .SECTION See Also
 // vtkGenericCellTessellator vtkGenericSubdivisionErrorMetric
 
-#ifndef __vtkViewDependentErrorMetric_h
-#define __vtkViewDependentErrorMetric_h
+#ifndef vtkViewDependentErrorMetric_h
+#define vtkViewDependentErrorMetric_h
 
 #include "vtkRenderingCoreModule.h" // For export macro
 #include "vtkGenericSubdivisionErrorMetric.h"
diff --git a/Rendering/Core/vtkViewport.h b/Rendering/Core/vtkViewport.h
index e090bcbfe1315c9c69586a35c84d1aa81658d722..7d46a1be18875fc14caf7e96e7835ad482b526ae 100644
--- a/Rendering/Core/vtkViewport.h
+++ b/Rendering/Core/vtkViewport.h
@@ -26,8 +26,8 @@
 // .SECTION See Also
 // vtkWindow vtkRenderer
 
-#ifndef __vtkViewport_h
-#define __vtkViewport_h
+#ifndef vtkViewport_h
+#define vtkViewport_h
 
 #include "vtkRenderingCoreModule.h" // For export macro
 #include "vtkObject.h"
diff --git a/Rendering/Core/vtkVisibilitySort.h b/Rendering/Core/vtkVisibilitySort.h
index 5dc0740a4a22a736a240fc1c99f74fb07b700806..d6f150f3e1a6a2d40995897b17e504fab5f79d9e 100644
--- a/Rendering/Core/vtkVisibilitySort.h
+++ b/Rendering/Core/vtkVisibilitySort.h
@@ -40,8 +40,8 @@
 // collector.
 //
 
-#ifndef __vtkVisibilitySort_h
-#define __vtkVisibilitySort_h
+#ifndef vtkVisibilitySort_h
+#define vtkVisibilitySort_h
 
 #include "vtkRenderingCoreModule.h" // For export macro
 #include "vtkObject.h"
@@ -134,5 +134,5 @@ private:
   void operator=(const vtkVisibilitySort &);  // Not implemented.
 };
 
-#endif //__vtkVisibilitySort_h
+#endif //vtkVisibilitySort_h
 
diff --git a/Rendering/Core/vtkVolume.h b/Rendering/Core/vtkVolume.h
index 40826e3e3f93cc3e645906ba378088284ab7bcec..58e0cf1fdec81a4e739e9991a0aab33b36b06d47 100644
--- a/Rendering/Core/vtkVolume.h
+++ b/Rendering/Core/vtkVolume.h
@@ -25,8 +25,8 @@
 // .SECTION see also
 // vtkAbstractVolumeMapper vtkVolumeProperty vtkProp3D
 
-#ifndef __vtkVolume_h
-#define __vtkVolume_h
+#ifndef vtkVolume_h
+#define vtkVolume_h
 
 #include "vtkRenderingCoreModule.h" // For export macro
 #include "vtkProp3D.h"
diff --git a/Rendering/Core/vtkVolumeCollection.h b/Rendering/Core/vtkVolumeCollection.h
index ad7d7db2d688d398543cf3b67f5c11336aaf58d7..8a1bf4d290e96c18df2493e6480b7b7f5a4d4564 100644
--- a/Rendering/Core/vtkVolumeCollection.h
+++ b/Rendering/Core/vtkVolumeCollection.h
@@ -21,8 +21,8 @@
 // .SECTION see also
 // vtkCollection vtkVolume
 
-#ifndef __vtkVolumeCollection_h
-#define __vtkVolumeCollection_h
+#ifndef vtkVolumeCollection_h
+#define vtkVolumeCollection_h
 
 #include "vtkRenderingCoreModule.h" // For export macro
 #include "vtkPropCollection.h"
diff --git a/Rendering/Core/vtkVolumeProperty.h b/Rendering/Core/vtkVolumeProperty.h
index 06ac5ea7c065e97ccaa194cdb97aaaf440216955..0bb3f8eaed55f90353da0f65938a0ace19d76ec3 100644
--- a/Rendering/Core/vtkVolumeProperty.h
+++ b/Rendering/Core/vtkVolumeProperty.h
@@ -38,8 +38,8 @@
 // .SECTION see also
 // vtkPiecewiseFunction vtkColorTransferFunction
 
-#ifndef __vtkVolumeProperty_h
-#define __vtkVolumeProperty_h
+#ifndef vtkVolumeProperty_h
+#define vtkVolumeProperty_h
 
 #include "vtkRenderingCoreModule.h" // For export macro
 #include "vtkObject.h"
diff --git a/Rendering/Core/vtkWindowLevelLookupTable.h b/Rendering/Core/vtkWindowLevelLookupTable.h
index e2ddfa601041939c5bcff31205abcc641decfc44..d584d93eac7bfb932ac5ff42bf61fda7aa085b21 100644
--- a/Rendering/Core/vtkWindowLevelLookupTable.h
+++ b/Rendering/Core/vtkWindowLevelLookupTable.h
@@ -30,8 +30,8 @@
 // .SECTION See Also
 // vtkLogLookupTable
 
-#ifndef __vtkWindowLevelLookupTable_h
-#define __vtkWindowLevelLookupTable_h
+#ifndef vtkWindowLevelLookupTable_h
+#define vtkWindowLevelLookupTable_h
 
 #include "vtkRenderingCoreModule.h" // For export macro
 #include "vtkLookupTable.h"
diff --git a/Rendering/Core/vtkWindowToImageFilter.h b/Rendering/Core/vtkWindowToImageFilter.h
index 190ec93a3f8af36295f227922fdf343c2eac27ac..3228b4302e67cd2cd7a92b386dfdbe0753b62b2c 100644
--- a/Rendering/Core/vtkWindowToImageFilter.h
+++ b/Rendering/Core/vtkWindowToImageFilter.h
@@ -48,8 +48,8 @@
 // .SECTION see also
 // vtkWindow vtkRenderLargeImage
 
-#ifndef __vtkWindowToImageFilter_h
-#define __vtkWindowToImageFilter_h
+#ifndef vtkWindowToImageFilter_h
+#define vtkWindowToImageFilter_h
 
 #include "vtkRenderingCoreModule.h" // For export macro
 #include "vtkAlgorithm.h"
diff --git a/Rendering/Core/vtkWorldPointPicker.h b/Rendering/Core/vtkWorldPointPicker.h
index 0d314f71893802308b32ab2bcba8688bc3446946..b6e4aa1afd7e6fd173dd315cb0bb15d08e3fd914 100644
--- a/Rendering/Core/vtkWorldPointPicker.h
+++ b/Rendering/Core/vtkWorldPointPicker.h
@@ -26,8 +26,8 @@
 // .SECTION See Also
 // vtkPropPicker vtkPicker vtkCellPicker vtkPointPicker
 
-#ifndef __vtkWorldPointPicker_h
-#define __vtkWorldPointPicker_h
+#ifndef vtkWorldPointPicker_h
+#define vtkWorldPointPicker_h
 
 #include "vtkRenderingCoreModule.h" // For export macro
 #include "vtkAbstractPicker.h"
diff --git a/Rendering/FreeType/fonts/vtkEmbeddedFonts.h b/Rendering/FreeType/fonts/vtkEmbeddedFonts.h
index a33475f08a56d4e044e4a80d23efbeb6f89cd9c1..0524def53f387d0a4869deb0bc54caa6bd3adee0 100644
--- a/Rendering/FreeType/fonts/vtkEmbeddedFonts.h
+++ b/Rendering/FreeType/fonts/vtkEmbeddedFonts.h
@@ -13,8 +13,8 @@
 
 =========================================================================*/
 
-#ifndef __vtkEmbeddedFonts_h
-#define __vtkEmbeddedFonts_h
+#ifndef vtkEmbeddedFonts_h
+#define vtkEmbeddedFonts_h
 
 #include <stddef.h>
 
diff --git a/Rendering/FreeType/vtkFreeTypeStringToImage.h b/Rendering/FreeType/vtkFreeTypeStringToImage.h
index 1120dd80a2f47fbdb6a848bd0d2c8feb60d2577b..d88ded7b6846fc145cdb34bd55abfdc82fc7cdd7 100644
--- a/Rendering/FreeType/vtkFreeTypeStringToImage.h
+++ b/Rendering/FreeType/vtkFreeTypeStringToImage.h
@@ -18,8 +18,8 @@
 // .SECTION Description
 //
 
-#ifndef __vtkFreeTypeStringToImage_h
-#define __vtkFreeTypeStringToImage_h
+#ifndef vtkFreeTypeStringToImage_h
+#define vtkFreeTypeStringToImage_h
 
 #include "vtkRenderingFreeTypeModule.h" // For export macro
 #include "vtkStringToImage.h"
@@ -86,4 +86,4 @@ private:
   void operator=(const vtkFreeTypeStringToImage &);   // Not implemented.
 };
 
-#endif //__vtkFreeTypeStringToImage_h
+#endif //vtkFreeTypeStringToImage_h
diff --git a/Rendering/FreeType/vtkFreeTypeTools.h b/Rendering/FreeType/vtkFreeTypeTools.h
index 4ab24e100d7197f20be171f1e5664616a59beeb1..8402f9800b006705b1feb74973ab8571c88e0c13 100644
--- a/Rendering/FreeType/vtkFreeTypeTools.h
+++ b/Rendering/FreeType/vtkFreeTypeTools.h
@@ -20,8 +20,8 @@
 // .Section Caveats
 // Internal use only.
 
-#ifndef __vtkFreeTypeTools_h
-#define __vtkFreeTypeTools_h
+#ifndef vtkFreeTypeTools_h
+#define vtkFreeTypeTools_h
 
 #include "vtkRenderingFreeTypeModule.h" // For export macro
 #include "vtkObject.h"
diff --git a/Rendering/FreeType/vtkFreeTypeUtilities.h b/Rendering/FreeType/vtkFreeTypeUtilities.h
index 91033899d67bbd8b4a7c6b59aa06b6abcb2b35c4..99054737010d699b6b30de1b3b7892fc3b4a4f1a 100644
--- a/Rendering/FreeType/vtkFreeTypeUtilities.h
+++ b/Rendering/FreeType/vtkFreeTypeUtilities.h
@@ -20,8 +20,8 @@
 // Internal use only.
 // EXPERIMENTAL for the moment. Also include the old cache.
 
-#ifndef __vtkFreeTypeUtilities_h
-#define __vtkFreeTypeUtilities_h
+#ifndef vtkFreeTypeUtilities_h
+#define vtkFreeTypeUtilities_h
 
 #define VTK_FTFC_CACHE_CAPACITY 150
 
diff --git a/Rendering/FreeType/vtkMathTextFreeTypeTextRenderer.h b/Rendering/FreeType/vtkMathTextFreeTypeTextRenderer.h
index ae310d4b92ae69ed7bd1699a59db15ef33d7b5fb..ddbfbb72336c06ef4037e13ab4e63eccb64ac229 100644
--- a/Rendering/FreeType/vtkMathTextFreeTypeTextRenderer.h
+++ b/Rendering/FreeType/vtkMathTextFreeTypeTextRenderer.h
@@ -25,8 +25,8 @@
 // UTF16 strings passed to the MathText renderer will be converted to
 // UTF8.
 
-#ifndef __vtkMathTextFreeTypeTextRenderer_h
-#define __vtkMathTextFreeTypeTextRenderer_h
+#ifndef vtkMathTextFreeTypeTextRenderer_h
+#define vtkMathTextFreeTypeTextRenderer_h
 
 #include "vtkRenderingFreeTypeModule.h" // For export macro
 #include "vtkTextRenderer.h"
@@ -82,4 +82,4 @@ private:
   vtkMathTextUtilities *MathTextUtilities;
 };
 
-#endif //__vtkMathTextFreeTypeTextRenderer_h
+#endif //vtkMathTextFreeTypeTextRenderer_h
diff --git a/Rendering/FreeType/vtkMathTextUtilities.h b/Rendering/FreeType/vtkMathTextUtilities.h
index 6b8381709b07b1018627727be144e3c202665eb6..a53e2d59366cdab5669a924ae75c61f39ccc83c7 100644
--- a/Rendering/FreeType/vtkMathTextUtilities.h
+++ b/Rendering/FreeType/vtkMathTextUtilities.h
@@ -18,8 +18,8 @@
 // for use with the python matplotlib.mathtext module (implemented in the
 // vtkMatplotlib module).
 
-#ifndef __vtkMathTextUtilities_h
-#define __vtkMathTextUtilities_h
+#ifndef vtkMathTextUtilities_h
+#define vtkMathTextUtilities_h
 
 #include "vtkRenderingFreeTypeModule.h" // For export macro
 #include "vtkObject.h"
diff --git a/Rendering/FreeType/vtkScaledTextActor.h b/Rendering/FreeType/vtkScaledTextActor.h
index 2ebef83ec43375fa45554c0d4f84a7ab89bb0858..9c305de8ee459eb13266da79c6e25cfefbee7ef9 100644
--- a/Rendering/FreeType/vtkScaledTextActor.h
+++ b/Rendering/FreeType/vtkScaledTextActor.h
@@ -20,8 +20,8 @@
 // .SECTION See Also
 // vtkTextActor vtkActor2D vtkTextMapper
 
-#ifndef __vtkScaledTextActor_h
-#define __vtkScaledTextActor_h
+#ifndef vtkScaledTextActor_h
+#define vtkScaledTextActor_h
 
 #include "vtkRenderingFreeTypeModule.h" // For export macro
 #include "vtkTextActor.h"
diff --git a/Rendering/FreeType/vtkTextActor.h b/Rendering/FreeType/vtkTextActor.h
index d9756e600f3873a1d64af5e44bd9765aa6efb750..8313ba8e1f841fe9189ffa4fcc1f3b0676f80e5c 100644
--- a/Rendering/FreeType/vtkTextActor.h
+++ b/Rendering/FreeType/vtkTextActor.h
@@ -29,8 +29,8 @@
 // .SECTION See Also
 // vtkActor2D vtkPolyDataMapper vtkTextProperty vtkTextRenderer
 
-#ifndef __vtkTextActor_h
-#define __vtkTextActor_h
+#ifndef vtkTextActor_h
+#define vtkTextActor_h
 
 #include "vtkRenderingFreeTypeModule.h" // For export macro
 #include "vtkTexturedActor2D.h"
diff --git a/Rendering/FreeType/vtkTextActor3D.h b/Rendering/FreeType/vtkTextActor3D.h
index e30f1b957da02f4680da3d869843969e4e1fd3bb..5e8061696a1a44f9e9713aec6b696c7ad997d26f 100644
--- a/Rendering/FreeType/vtkTextActor3D.h
+++ b/Rendering/FreeType/vtkTextActor3D.h
@@ -27,8 +27,8 @@
 // .SECTION See Also
 // vtkProp3D
 
-#ifndef __vtkTextActor3D_h
-#define __vtkTextActor3D_h
+#ifndef vtkTextActor3D_h
+#define vtkTextActor3D_h
 
 #include "vtkRenderingFreeTypeModule.h" // For export macro
 #include "vtkProp3D.h"
diff --git a/Rendering/FreeType/vtkTextRendererStringToImage.h b/Rendering/FreeType/vtkTextRendererStringToImage.h
index 5eea22d6ff4f7756b10d5aba43a61085559598cb..845b7a70ccccfe5aa82e134100e6a7f72e6edecd 100644
--- a/Rendering/FreeType/vtkTextRendererStringToImage.h
+++ b/Rendering/FreeType/vtkTextRendererStringToImage.h
@@ -16,8 +16,8 @@
 // .NAME vtkTextRendererStringToImage - uses vtkTextRenderer to render the
 // supplied text to an image.
 
-#ifndef __vtkTextRendererStringToImage_h
-#define __vtkTextRendererStringToImage_h
+#ifndef vtkTextRendererStringToImage_h
+#define vtkTextRendererStringToImage_h
 
 #include "vtkRenderingFreeTypeModule.h" // For export macro
 #include "vtkStringToImage.h"
@@ -84,4 +84,4 @@ private:
   void operator=(const vtkTextRendererStringToImage &);   // Not implemented.
 };
 
-#endif //__vtkTextRendererStringToImage_h
+#endif //vtkTextRendererStringToImage_h
diff --git a/Rendering/FreeType/vtkVectorText.h b/Rendering/FreeType/vtkVectorText.h
index 5e0fb21c5d80f29aac29921bb0446e10d232abc2..6b0c5c3e362b84dd248ca150e489ea9a62038d66 100644
--- a/Rendering/FreeType/vtkVectorText.h
+++ b/Rendering/FreeType/vtkVectorText.h
@@ -29,8 +29,8 @@
 // .SECTION See Also
 // vtkTextMapper vtkCaptionActor2D
 
-#ifndef __vtkVectorText_h
-#define __vtkVectorText_h
+#ifndef vtkVectorText_h
+#define vtkVectorText_h
 
 #include "vtkRenderingFreeTypeModule.h" // For export macro
 #include "vtkPolyDataAlgorithm.h"
diff --git a/Rendering/FreeTypeFontConfig/vtkFontConfigFreeTypeTools.h b/Rendering/FreeTypeFontConfig/vtkFontConfigFreeTypeTools.h
index 8bbe1c7b3babd63ca14d64019a52b28b8aae1b8f..945dbab25cc053c72de9ca45fcff83f10d760014 100644
--- a/Rendering/FreeTypeFontConfig/vtkFontConfigFreeTypeTools.h
+++ b/Rendering/FreeTypeFontConfig/vtkFontConfigFreeTypeTools.h
@@ -28,8 +28,8 @@
 // Be aware that FontConfig lookup is disabled by default. To enable, call
 // vtkFreeTypeTools::GetInstance()->ForceCompiledFontsOff();
 
-#ifndef __vtkFontConfigFreeTypeTools_h
-#define __vtkFontConfigFreeTypeTools_h
+#ifndef vtkFontConfigFreeTypeTools_h
+#define vtkFontConfigFreeTypeTools_h
 
 #include "vtkRenderingFreeTypeFontConfigModule.h" // For export macro
 #include "vtkFreeTypeTools.h"
@@ -68,4 +68,4 @@ private:
   void operator=(const vtkFontConfigFreeTypeTools &);   // Not implemented.
 };
 
-#endif //__vtkFontConfigFreeTypeTools_h
+#endif //vtkFontConfigFreeTypeTools_h
diff --git a/Rendering/FreeTypeOpenGL/vtkOpenGLFreeTypeTextMapper.h b/Rendering/FreeTypeOpenGL/vtkOpenGLFreeTypeTextMapper.h
index 2d49dd1092c3c545baee8c5191c1cd2bdb789dac..e8e57cd14b83d9b9fbb7311d49d152875b0c5ccd 100644
--- a/Rendering/FreeTypeOpenGL/vtkOpenGLFreeTypeTextMapper.h
+++ b/Rendering/FreeTypeOpenGL/vtkOpenGLFreeTypeTextMapper.h
@@ -21,8 +21,8 @@
 // .SECTION See Also
 // vtkTextMapper
 
-#ifndef __vtkOpenGLFreeTypeTextMapper_h
-#define __vtkOpenGLFreeTypeTextMapper_h
+#ifndef vtkOpenGLFreeTypeTextMapper_h
+#define vtkOpenGLFreeTypeTextMapper_h
 
 #include "vtkRenderingFreeTypeOpenGLModule.h" // For export macro
 #include "vtkTextMapper.h"
diff --git a/Rendering/FreeTypeOpenGL2/vtkOpenGLFreeTypeTextMapper.h b/Rendering/FreeTypeOpenGL2/vtkOpenGLFreeTypeTextMapper.h
index 1d02ac889d9d0e96955036394f3e1ee92c4656cd..06762d869a104d8140934cef5bc70e157e92250a 100644
--- a/Rendering/FreeTypeOpenGL2/vtkOpenGLFreeTypeTextMapper.h
+++ b/Rendering/FreeTypeOpenGL2/vtkOpenGLFreeTypeTextMapper.h
@@ -21,8 +21,8 @@
 // .SECTION See Also
 // vtkTextMapper
 
-#ifndef __vtkOpenGLFreeTypeTextMapper_h
-#define __vtkOpenGLFreeTypeTextMapper_h
+#ifndef vtkOpenGLFreeTypeTextMapper_h
+#define vtkOpenGLFreeTypeTextMapper_h
 
 #include "vtkRenderingFreeTypeOpenGL2Module.h" // For export macro
 #include "vtkTextMapper.h"
diff --git a/Rendering/GL2PS/vtkGL2PSContextDevice2D.h b/Rendering/GL2PS/vtkGL2PSContextDevice2D.h
index c6b225054a6bc5f1f2ca6b9babb028763f44e5ea..31bb03d74f19f138eea7bafb3039d325b3929157 100644
--- a/Rendering/GL2PS/vtkGL2PSContextDevice2D.h
+++ b/Rendering/GL2PS/vtkGL2PSContextDevice2D.h
@@ -23,8 +23,8 @@
 // .SECTION See Also
 // vtkGL2PSExporter
 
-#ifndef __vtkGL2PSContextDevice2D_h
-#define __vtkGL2PSContextDevice2D_h
+#ifndef vtkGL2PSContextDevice2D_h
+#define vtkGL2PSContextDevice2D_h
 
 #include "vtkRenderingGL2PSModule.h" // For export macro
 #include "vtkOpenGLContextDevice2D.h"
@@ -174,4 +174,4 @@ private:
   void TransformSize(float &dx, float &dy) const;
 };
 
-#endif //__vtkGL2PSContextDevice2D_h
+#endif //vtkGL2PSContextDevice2D_h
diff --git a/Rendering/GL2PS/vtkGL2PSUtilities.h b/Rendering/GL2PS/vtkGL2PSUtilities.h
index 8c863589f5edbd66f889498110369899f0a58c78..0cfc1cb64536e25c0688cf4a2ef204e8160f6347 100644
--- a/Rendering/GL2PS/vtkGL2PSUtilities.h
+++ b/Rendering/GL2PS/vtkGL2PSUtilities.h
@@ -18,8 +18,8 @@
 // calling GL2PS routines on VTK objects. This class is meant for internal use
 // only and is subject to change.
 
-#ifndef __vtkGL2PSUtilities_h
-#define __vtkGL2PSUtilities_h
+#ifndef vtkGL2PSUtilities_h
+#define vtkGL2PSUtilities_h
 
 #include "vtkObject.h"
 #include "vtkRenderingGL2PSModule.h" // For export macro
diff --git a/Rendering/Image/vtkImageResliceMapper.h b/Rendering/Image/vtkImageResliceMapper.h
index cf7bf30023da22a44a91f58a0c9df28f568bfbfd..d80eba2a999f869619eb86b4260261b612fad2bc 100644
--- a/Rendering/Image/vtkImageResliceMapper.h
+++ b/Rendering/Image/vtkImageResliceMapper.h
@@ -23,8 +23,8 @@
 // .SECTION See also
 // vtkImageSlice vtkImageProperty vtkImageSliceMapper
 
-#ifndef __vtkImageResliceMapper_h
-#define __vtkImageResliceMapper_h
+#ifndef vtkImageResliceMapper_h
+#define vtkImageResliceMapper_h
 
 #include "vtkRenderingImageModule.h" // For export macro
 #include "vtkImageMapper3D.h"
diff --git a/Rendering/Image/vtkImageSliceCollection.h b/Rendering/Image/vtkImageSliceCollection.h
index 0d0be897aaa71099adb717e078b0aec5b1e20fd8..6e567e6313399bd23828c7453a400ddced481afd 100644
--- a/Rendering/Image/vtkImageSliceCollection.h
+++ b/Rendering/Image/vtkImageSliceCollection.h
@@ -20,8 +20,8 @@
 // .SECTION See Also
 // vtkImageSlice vtkImageAssembly
 
-#ifndef __vtkImageSliceCollection_h
-#define __vtkImageSliceCollection_h
+#ifndef vtkImageSliceCollection_h
+#define vtkImageSliceCollection_h
 
 #include "vtkRenderingImageModule.h" // For export macro
 #include "vtkPropCollection.h"
diff --git a/Rendering/Image/vtkImageStack.h b/Rendering/Image/vtkImageStack.h
index 964d1228c4e4a83061dace93199de5a47e0b556c..a4775ef037b829ca6707743241cd9b605149cd29 100644
--- a/Rendering/Image/vtkImageStack.h
+++ b/Rendering/Image/vtkImageStack.h
@@ -26,8 +26,8 @@
 // .SECTION See also
 // vtkImageMapper3D vtkImageProperty vtkProp3D
 
-#ifndef __vtkImageStack_h
-#define __vtkImageStack_h
+#ifndef vtkImageStack_h
+#define vtkImageStack_h
 
 #include "vtkRenderingImageModule.h" // For export macro
 #include "vtkImageSlice.h"
diff --git a/Rendering/LIC/Testing/Cxx/vtkStructuredGridLIC2DTestDriver.h b/Rendering/LIC/Testing/Cxx/vtkStructuredGridLIC2DTestDriver.h
index fdda712b52b45eab48672358cf42b4278b1fb526..51a9ed15a8d8cbe86e2d3f894004f6519133b8f2 100644
--- a/Rendering/LIC/Testing/Cxx/vtkStructuredGridLIC2DTestDriver.h
+++ b/Rendering/LIC/Testing/Cxx/vtkStructuredGridLIC2DTestDriver.h
@@ -12,8 +12,8 @@
      PURPOSE.  See the above copyright notice for more information.
 
 =========================================================================*/
-#ifndef  __vtkStructuredGridLIC2DTestDriver_h
-#define  __vtkStructuredGridLIC2DTestDriver_h
+#ifndef  vtkStructuredGridLIC2DTestDriver_h
+#define  vtkStructuredGridLIC2DTestDriver_h
 
 // Description:
 // For demo.
diff --git a/Rendering/LIC/Testing/Cxx/vtkSurfaceLICTestDriver.h b/Rendering/LIC/Testing/Cxx/vtkSurfaceLICTestDriver.h
index 4f985fbf1d331aceade0c7d9a63323c072861bbf..9cf88f8e59ab0f4424a4595e047ccb2597c072e4 100644
--- a/Rendering/LIC/Testing/Cxx/vtkSurfaceLICTestDriver.h
+++ b/Rendering/LIC/Testing/Cxx/vtkSurfaceLICTestDriver.h
@@ -12,8 +12,8 @@
      PURPOSE.  See the above copyright notice for more information.
 
 =========================================================================*/
-#ifndef __vtkTestSurfaceLICDriver_h
-#define __vtkTestSurfaceLICDriver_h
+#ifndef vtkTestSurfaceLICDriver_h
+#define vtkTestSurfaceLICDriver_h
 
 #include "vtkSystemIncludes.h" // include it first
 #include <vector> // for vector
diff --git a/Rendering/LIC/vtkImageDataLIC2D.h b/Rendering/LIC/vtkImageDataLIC2D.h
index 11214c670eea1a3613ab3e27222cfb72f4b2fb35..39818288ecb61fe37ba65a94c585756f31987835 100644
--- a/Rendering/LIC/vtkImageDataLIC2D.h
+++ b/Rendering/LIC/vtkImageDataLIC2D.h
@@ -30,8 +30,8 @@
 // .SECTION see also
 //  vtkSurfaceLICPainter vtkLineIntegralConvolution2D
 
-#ifndef __vtkImageDataLIC2D_h
-#define __vtkImageDataLIC2D_h
+#ifndef vtkImageDataLIC2D_h
+#define vtkImageDataLIC2D_h
 
 #include "vtkRenderingLICModule.h" // For export macro
 #include "vtkImageAlgorithm.h"
diff --git a/Rendering/LIC/vtkLineIntegralConvolution2D.h b/Rendering/LIC/vtkLineIntegralConvolution2D.h
index 1c2e010642820308d877fd34badb743711b1cc0e..dc942a82a38ed3937abfb2dfa3213fd5bd01ae52 100644
--- a/Rendering/LIC/vtkLineIntegralConvolution2D.h
+++ b/Rendering/LIC/vtkLineIntegralConvolution2D.h
@@ -86,8 +86,8 @@
 // .SECTION See Also
 //  vtkSurfaceLICPainter vtkImageDataLIC2D vtkStructuredGridLIC2D
 
-#ifndef __vtkLineIntegralConvolution2D_h
-#define __vtkLineIntegralConvolution2D_h
+#ifndef vtkLineIntegralConvolution2D_h
+#define vtkLineIntegralConvolution2D_h
 
 #include "vtkObject.h"
 #include "vtkWeakPointer.h" // for ren context
diff --git a/Rendering/LIC/vtkPainterCommunicator.h b/Rendering/LIC/vtkPainterCommunicator.h
index 19d5e4d945f5319082ba99fff40c0aa7ac027087..d909257cb76814eb82133490ae5d961f8c6af46d 100644
--- a/Rendering/LIC/vtkPainterCommunicator.h
+++ b/Rendering/LIC/vtkPainterCommunicator.h
@@ -21,8 +21,8 @@
 // This API is sufficient to allow for control flow with/without
 // MPI. The parallel parts of the code should use the derived
 // class vtkPPainterCommunicator.
-#ifndef __vtkPainterCommunicator_h
-#define __vtkPainterCommunicator_h
+#ifndef vtkPainterCommunicator_h
+#define vtkPainterCommunicator_h
 
 #include "vtkRenderingLICModule.h" // for export macro
 
diff --git a/Rendering/LIC/vtkPixelTransfer.h b/Rendering/LIC/vtkPixelTransfer.h
index 833eb619b8d7d54312690513b954f5c890a3ea56..3a49de981349d9217937784a6a8b25b239c23313 100644
--- a/Rendering/LIC/vtkPixelTransfer.h
+++ b/Rendering/LIC/vtkPixelTransfer.h
@@ -23,8 +23,8 @@
 // .SECTION See also
 // vtkPixelExtent vtkPPixelTransfer
 
-#ifndef __vtkPixelTransfer_h
-#define __vtkPixelTransfer_h
+#ifndef vtkPixelTransfer_h
+#define vtkPixelTransfer_h
 
 #include "vtkRenderingLICModule.h" // for export
 #include "vtkSetGet.h" // for macros
diff --git a/Rendering/LIC/vtkStructuredGridLIC2D.h b/Rendering/LIC/vtkStructuredGridLIC2D.h
index 912bdd6f239987d37cf7c293e3ac7d6fbccb6099..7807a6c3cf61b256b669a9bd20316fcb47c1e849 100644
--- a/Rendering/LIC/vtkStructuredGridLIC2D.h
+++ b/Rendering/LIC/vtkStructuredGridLIC2D.h
@@ -36,8 +36,8 @@
 // GL_ARB_draw_buffers
 // GL_EXT_framebuffer_object
 // GL_ARB_pixel_buffer_object
-#ifndef __vtkStructuredGridLIC2D_h
-#define __vtkStructuredGridLIC2D_h
+#ifndef vtkStructuredGridLIC2D_h
+#define vtkStructuredGridLIC2D_h
 
 #include "vtkRenderingLICModule.h" // For export macro
 #include "vtkStructuredGridAlgorithm.h"
diff --git a/Rendering/LIC/vtkSurfaceLICComposite.h b/Rendering/LIC/vtkSurfaceLICComposite.h
index a2aec7b8de6faee61dd47867b6f8d5eab3b166c0..063cef1531aaf15a3aab177c33579122b8abfb8c 100644
--- a/Rendering/LIC/vtkSurfaceLICComposite.h
+++ b/Rendering/LIC/vtkSurfaceLICComposite.h
@@ -20,8 +20,8 @@
 // image LIC is computed on the new decomposition this class will
 // un-shuffle the computed LIC back onto the original decomposition
 
-#ifndef __vtkSurfaceLICComposite_h
-#define __vtkSurfaceLICComposite_h
+#ifndef vtkSurfaceLICComposite_h
+#define vtkSurfaceLICComposite_h
 
 #include "vtkObject.h"
 #include "vtkRenderingLICModule.h" // for export macro
diff --git a/Rendering/LIC/vtkSurfaceLICDefaultPainter.h b/Rendering/LIC/vtkSurfaceLICDefaultPainter.h
index d10b344065167b2cb96d274eb8a2764b0bd8da54..9f475e92b476faa1a00f1fe5287d3eac4b054e22 100644
--- a/Rendering/LIC/vtkSurfaceLICDefaultPainter.h
+++ b/Rendering/LIC/vtkSurfaceLICDefaultPainter.h
@@ -24,8 +24,8 @@
 // .SECTION See Also
 //  vtkDefaultPainter vtkSurfaceLICPainter
 
-#ifndef __vtkSurfaceLICDefaultPainter_h
-#define __vtkSurfaceLICDefaultPainter_h
+#ifndef vtkSurfaceLICDefaultPainter_h
+#define vtkSurfaceLICDefaultPainter_h
 
 #include "vtkRenderingLICModule.h" // For export macro
 #include "vtkDefaultPainter.h"
diff --git a/Rendering/LIC/vtkSurfaceLICPainter.h b/Rendering/LIC/vtkSurfaceLICPainter.h
index fba532a5980f595aa7faaefd6a4e58aac28aea82..e83bca7208ceb7bbd72bab76964594ea14e2a3a1 100644
--- a/Rendering/LIC/vtkSurfaceLICPainter.h
+++ b/Rendering/LIC/vtkSurfaceLICPainter.h
@@ -49,8 +49,8 @@
 //
 // .SECTION See also
 // vtkSurfaceLICDefaultPainter vtkLineIntegralConvolution2D
-#ifndef __vtkSurfaceLICPainter_h
-#define __vtkSurfaceLICPainter_h
+#ifndef vtkSurfaceLICPainter_h
+#define vtkSurfaceLICPainter_h
 
 #include "vtkRenderingLICModule.h" // For export macro
 #include "vtkPainter.h"
diff --git a/Rendering/LIC/vtkTextureIO.h b/Rendering/LIC/vtkTextureIO.h
index a71662c2fc4b5d79b16708d14ac0e1bc7524fab6..d3d29bc81e5019bc6f8b1e7e615f096622c0d3a3 100644
--- a/Rendering/LIC/vtkTextureIO.h
+++ b/Rendering/LIC/vtkTextureIO.h
@@ -16,8 +16,8 @@
 // .SECTION Description
 // A small collection of I/O routines that write vtkTextureObject
 // to disk for debugging.
-#ifndef __vtkTextureIO_h
-#define __vtkTextureIO_h
+#ifndef vtkTextureIO_h
+#define vtkTextureIO_h
 
 #include "vtkRenderingLICModule.h" // for export
 #include "vtkPixelExtent.h" // for pixel extent
diff --git a/Rendering/LOD/vtkLODActor.h b/Rendering/LOD/vtkLODActor.h
index f17d631ad138e402d804e0473204c24c02ed87aa..c65a5b2a1f62cc344ea3759f960bd27b56794512 100644
--- a/Rendering/LOD/vtkLODActor.h
+++ b/Rendering/LOD/vtkLODActor.h
@@ -49,8 +49,8 @@
 // .SECTION see also
 // vtkActor vtkRenderer vtkLODProp3D
 
-#ifndef __vtkLODActor_h
-#define __vtkLODActor_h
+#ifndef vtkLODActor_h
+#define vtkLODActor_h
 
 #include "vtkRenderingLODModule.h" // For export macro
 #include "vtkActor.h"
diff --git a/Rendering/LOD/vtkQuadricLODActor.h b/Rendering/LOD/vtkQuadricLODActor.h
index 99b10430578c11010c28b8942980851ae7f42df1..33a78e8197d681bf3d9344be5bf231430bd16ad9 100644
--- a/Rendering/LOD/vtkQuadricLODActor.h
+++ b/Rendering/LOD/vtkQuadricLODActor.h
@@ -43,8 +43,8 @@
 // .SECTION See Also
 // vtkLODActor vtkQuadricClustering
 
-#ifndef __vtkQuadricLODActor_h
-#define __vtkQuadricLODActor_h
+#ifndef vtkQuadricLODActor_h
+#define vtkQuadricLODActor_h
 
 #include "vtkRenderingLODModule.h" // For export macro
 #include "vtkActor.h"
diff --git a/Rendering/Label/vtkDynamic2DLabelMapper.h b/Rendering/Label/vtkDynamic2DLabelMapper.h
index 3f732e3c88d829e12e6d0e80b7ac687127dbfb56..f9153c10995b4fea5a0825d8d700df73094906cf 100644
--- a/Rendering/Label/vtkDynamic2DLabelMapper.h
+++ b/Rendering/Label/vtkDynamic2DLabelMapper.h
@@ -47,8 +47,8 @@
 // Ken Been and Chee Yap. Dynamic Map Labeling. IEEE Transactions on
 // Visualization and Computer Graphics, Vol. 12, No. 5, 2006. pp. 773-780.
 
-#ifndef __vtkDynamic2DLabelMapper_h
-#define __vtkDynamic2DLabelMapper_h
+#ifndef vtkDynamic2DLabelMapper_h
+#define vtkDynamic2DLabelMapper_h
 
 #include "vtkRenderingLabelModule.h" // For export macro
 #include "vtkLabeledDataMapper.h"
diff --git a/Rendering/Label/vtkFreeTypeLabelRenderStrategy.h b/Rendering/Label/vtkFreeTypeLabelRenderStrategy.h
index eb6760d4ea178a412b18a39f0d51ff6e7e66ee0e..da02e2742350339549283687451f5938be5086c1 100644
--- a/Rendering/Label/vtkFreeTypeLabelRenderStrategy.h
+++ b/Rendering/Label/vtkFreeTypeLabelRenderStrategy.h
@@ -18,8 +18,8 @@
 // Uses the FreeType to render labels and compute label sizes.
 // This strategy may be used with vtkLabelPlacementMapper.
 
-#ifndef __vtkFreeTypeLabelRenderStrategy_h
-#define __vtkFreeTypeLabelRenderStrategy_h
+#ifndef vtkFreeTypeLabelRenderStrategy_h
+#define vtkFreeTypeLabelRenderStrategy_h
 
 #include "vtkRenderingLabelModule.h" // For export macro
 #include "vtkLabelRenderStrategy.h"
diff --git a/Rendering/Label/vtkLabelHierarchy.h b/Rendering/Label/vtkLabelHierarchy.h
index e84435de19d922a9d4e423dcf8732227c6ea8e39..81ad0e7948f74381c95bca65a0c207879fb7a4a7 100644
--- a/Rendering/Label/vtkLabelHierarchy.h
+++ b/Rendering/Label/vtkLabelHierarchy.h
@@ -55,8 +55,8 @@
 // end up with many more than \a TargetLabelCount entries per node and things
 // will be sloooow.
 
-#ifndef __vtkLabelHierarchy_h
-#define __vtkLabelHierarchy_h
+#ifndef vtkLabelHierarchy_h
+#define vtkLabelHierarchy_h
 
 #include "vtkRenderingLabelModule.h" // For export macro
 #include "vtkPointSet.h"
@@ -237,4 +237,4 @@ private:
   void operator = ( const vtkLabelHierarchy& ); // Not implemented.
 };
 
-#endif // __vtkLabelHierarchy_h
+#endif // vtkLabelHierarchy_h
diff --git a/Rendering/Label/vtkLabelHierarchyAlgorithm.h b/Rendering/Label/vtkLabelHierarchyAlgorithm.h
index 716aa70d90cf9fe010dcc26c2f90e3d3309648b9..f3ee1793aed97d3d2a12c30d06eaa3075764070f 100644
--- a/Rendering/Label/vtkLabelHierarchyAlgorithm.h
+++ b/Rendering/Label/vtkLabelHierarchyAlgorithm.h
@@ -28,8 +28,8 @@
 // RequestData and RequestInformation.  You should
 // implement RequestData( request, inputVec, outputVec) in subclasses.
 
-#ifndef __vtkLabelHierarchyAlgorithm_h
-#define __vtkLabelHierarchyAlgorithm_h
+#ifndef vtkLabelHierarchyAlgorithm_h
+#define vtkLabelHierarchyAlgorithm_h
 
 #include "vtkRenderingLabelModule.h" // For export macro
 #include "vtkAlgorithm.h"
diff --git a/Rendering/Label/vtkLabelHierarchyCompositeIterator.h b/Rendering/Label/vtkLabelHierarchyCompositeIterator.h
index 02dcf668740cae6c99797f5dd32b717c6cfaf68d..ec6c3a9afa9c05d7bed233afd9c37e6909d58bc1 100644
--- a/Rendering/Label/vtkLabelHierarchyCompositeIterator.h
+++ b/Rendering/Label/vtkLabelHierarchyCompositeIterator.h
@@ -31,8 +31,8 @@
 // </pre>
 // The order of iterators will be A,B,B,B,A,B,B,B,...
 
-#ifndef __vtkLabelHierarchyCompositeIterator_h
-#define __vtkLabelHierarchyCompositeIterator_h
+#ifndef vtkLabelHierarchyCompositeIterator_h
+#define vtkLabelHierarchyCompositeIterator_h
 
 
 #include "vtkRenderingLabelModule.h" // For export macro
@@ -113,4 +113,4 @@ private:
   void operator = ( const vtkLabelHierarchyCompositeIterator& ); // Not implemented.
 };
 
-#endif // __vtkLabelHierarchyCompositeIterator_h
+#endif // vtkLabelHierarchyCompositeIterator_h
diff --git a/Rendering/Label/vtkLabelHierarchyIterator.h b/Rendering/Label/vtkLabelHierarchyIterator.h
index 21c8becdae463a2fbf5b08a53e45a3cb344fa603..ab4d1ffcf43b17aa90aa40fb04abf35cf165d979 100644
--- a/Rendering/Label/vtkLabelHierarchyIterator.h
+++ b/Rendering/Label/vtkLabelHierarchyIterator.h
@@ -22,8 +22,8 @@
 // .SECTION Description
 // Abstract superclass for iterators over vtkLabelHierarchy.
 
-#ifndef __vtkLabelHierarchyIterator_h
-#define __vtkLabelHierarchyIterator_h
+#ifndef vtkLabelHierarchyIterator_h
+#define vtkLabelHierarchyIterator_h
 
 #include "vtkRenderingLabelModule.h" // For export macro
 #include "vtkObject.h"
@@ -145,4 +145,4 @@ private:
   void operator = ( const vtkLabelHierarchyIterator& ); // Not implemented.
 };
 
-#endif // __vtkLabelHierarchyIterator_h
+#endif // vtkLabelHierarchyIterator_h
diff --git a/Rendering/Label/vtkLabelHierarchyPrivate.h b/Rendering/Label/vtkLabelHierarchyPrivate.h
index 81176eb952719276bf7eb57f15e18b49730302a4..787194be0b70a1a74e70acc4fd8938416a6157a8 100644
--- a/Rendering/Label/vtkLabelHierarchyPrivate.h
+++ b/Rendering/Label/vtkLabelHierarchyPrivate.h
@@ -1,5 +1,5 @@
-#ifndef __vtkLabelHierarchyPrivate_h
-#define __vtkLabelHierarchyPrivate_h
+#ifndef vtkLabelHierarchyPrivate_h
+#define vtkLabelHierarchyPrivate_h
 
 #include "vtkObject.h" // for vtkstd
 #include <set>
@@ -254,5 +254,5 @@ inline void vtkLabelHierarchy::Implementation::LabelSet::AddChildren( octree<Lab
   this->SetChildGeometry( self );
 }
 
-#endif // __vtkLabelHierarchyPrivate_h
+#endif // vtkLabelHierarchyPrivate_h
 // VTK-HeaderTest-Exclude: vtkLabelHierarchyPrivate.h
diff --git a/Rendering/Label/vtkLabelPlacementMapper.h b/Rendering/Label/vtkLabelPlacementMapper.h
index e58523a2eb0de54f8cfb9c3739c0f85cfe473ec9..5d18f4934f7cf869ed3bedf255147151b9037cdd 100644
--- a/Rendering/Label/vtkLabelPlacementMapper.h
+++ b/Rendering/Label/vtkLabelPlacementMapper.h
@@ -29,8 +29,8 @@
 // and will render only those labels/icons. A label render strategy is used to
 // render the labels, and can use e.g. FreeType or Qt for rendering.
 
-#ifndef __vtkLabelPlacementMapper_h
-#define __vtkLabelPlacementMapper_h
+#ifndef vtkLabelPlacementMapper_h
+#define vtkLabelPlacementMapper_h
 
 #include "vtkRenderingLabelModule.h" // For export macro
 #include "vtkMapper2D.h"
diff --git a/Rendering/Label/vtkLabelPlacer.h b/Rendering/Label/vtkLabelPlacer.h
index a29dfb6ffc8417b1ad25c9f2d66ac5cd9ca7f84c..428f201f911b8e47c98301bc24ba97c51ef37657 100644
--- a/Rendering/Label/vtkLabelPlacer.h
+++ b/Rendering/Label/vtkLabelPlacer.h
@@ -36,8 +36,8 @@
 // has cell data indicating what label in the input it
 // corresponds to (via an array named "LabelId").
 
-#ifndef __vtkLabelPlacer_h
-#define __vtkLabelPlacer_h
+#ifndef vtkLabelPlacer_h
+#define vtkLabelPlacer_h
 
 #include "vtkRenderingLabelModule.h" // For export macro
 #include "vtkPolyDataAlgorithm.h"
@@ -197,4 +197,4 @@ private:
   void operator = ( const vtkLabelPlacer& ); // Not implemented.
 };
 
-#endif // __vtkLabelPlacer_h
+#endif // vtkLabelPlacer_h
diff --git a/Rendering/Label/vtkLabelRenderStrategy.h b/Rendering/Label/vtkLabelRenderStrategy.h
index a49688b200ef1187afd568444a26b3999f915b65..04b05f5d746f7e44eac1ddefdf87c2c1330298d4 100644
--- a/Rendering/Label/vtkLabelRenderStrategy.h
+++ b/Rendering/Label/vtkLabelRenderStrategy.h
@@ -17,8 +17,8 @@
 // .SECTION Description
 // These methods should only be called within a mapper.
 
-#ifndef __vtkLabelRenderStrategy_h
-#define __vtkLabelRenderStrategy_h
+#ifndef vtkLabelRenderStrategy_h
+#define vtkLabelRenderStrategy_h
 
 #include "vtkRenderingLabelModule.h" // For export macro
 #include "vtkObject.h"
diff --git a/Rendering/Label/vtkLabelSizeCalculator.h b/Rendering/Label/vtkLabelSizeCalculator.h
index 291e796bb7cf407833f0baa94f22f5a3ab4b8514..be6a7320e33321a11678ce3054cf3dff4bb5a2e0 100644
--- a/Rendering/Label/vtkLabelSizeCalculator.h
+++ b/Rendering/Label/vtkLabelSizeCalculator.h
@@ -32,8 +32,8 @@
 // Any type that does not map to a font property that was set will
 // be set to the type 0's type property.
 
-#ifndef __vtkLabelSizeCalculator_h
-#define __vtkLabelSizeCalculator_h
+#ifndef vtkLabelSizeCalculator_h
+#define vtkLabelSizeCalculator_h
 
 #include "vtkRenderingLabelModule.h" // For export macro
 #include "vtkPassInputTypeAlgorithm.h"
@@ -92,4 +92,4 @@ private:
   void operator = ( const vtkLabelSizeCalculator& ); // Not implemented.
 };
 
-#endif // __vtkLabelSizeCalculator_h
+#endif // vtkLabelSizeCalculator_h
diff --git a/Rendering/Label/vtkLabeledDataMapper.h b/Rendering/Label/vtkLabeledDataMapper.h
index 6139f0c612d48ee6f9365a523fb260ed72238da0..99917ea69190dd94b47b266726546d773f5a0bd4 100644
--- a/Rendering/Label/vtkLabeledDataMapper.h
+++ b/Rendering/Label/vtkLabeledDataMapper.h
@@ -40,8 +40,8 @@
 // vtkMapper2D vtkActor2D vtkTextMapper vtkTextProperty vtkSelectVisiblePoints
 // vtkIdFilter vtkCellCenters
 
-#ifndef __vtkLabeledDataMapper_h
-#define __vtkLabeledDataMapper_h
+#ifndef vtkLabeledDataMapper_h
+#define vtkLabeledDataMapper_h
 
 #include "vtkRenderingLabelModule.h" // For export macro
 #include "vtkMapper2D.h"
diff --git a/Rendering/Label/vtkLabeledTreeMapDataMapper.h b/Rendering/Label/vtkLabeledTreeMapDataMapper.h
index b602b443a665d4ed8538be3855714aca610a4d69..d447f76c686fcfefb2c0e3497ebb445248b93ffa 100644
--- a/Rendering/Label/vtkLabeledTreeMapDataMapper.h
+++ b/Rendering/Label/vtkLabeledTreeMapDataMapper.h
@@ -38,8 +38,8 @@
 // Thanks to Patricia Crossno, Ken Moreland, Andrew Wilson and Brian Wylie from
 // Sandia National Laboratories for their help in developing this class.
 
-#ifndef __vtkLabeledTreeMapDataMapper_h
-#define __vtkLabeledTreeMapDataMapper_h
+#ifndef vtkLabeledTreeMapDataMapper_h
+#define vtkLabeledTreeMapDataMapper_h
 
 #include "vtkRenderingLabelModule.h" // For export macro
 #include "vtkLabeledDataMapper.h"
diff --git a/Rendering/Label/vtkPointSetToLabelHierarchy.h b/Rendering/Label/vtkPointSetToLabelHierarchy.h
index 682908e6280ee367655ec4eb2b327c292500ef2c..3c4b16aa2c107368d8383832c6eadab6c21f234a 100644
--- a/Rendering/Label/vtkPointSetToLabelHierarchy.h
+++ b/Rendering/Label/vtkPointSetToLabelHierarchy.h
@@ -27,8 +27,8 @@
 // until the points each octree node contains have a variance
 // close to the node size and a limited population (< 100).
 
-#ifndef __vtkPointSetToLabelHierarchy_h
-#define __vtkPointSetToLabelHierarchy_h
+#ifndef vtkPointSetToLabelHierarchy_h
+#define vtkPointSetToLabelHierarchy_h
 
 #include "vtkRenderingLabelModule.h" // For export macro
 #include "vtkLabelHierarchyAlgorithm.h"
@@ -114,4 +114,4 @@ private:
   void operator = ( const vtkPointSetToLabelHierarchy& ); // Not implemented.
 };
 
-#endif // __vtkPointSetToLabelHierarchy_h
+#endif // vtkPointSetToLabelHierarchy_h
diff --git a/Rendering/Matplotlib/vtkMatplotlibMathTextUtilities.h b/Rendering/Matplotlib/vtkMatplotlibMathTextUtilities.h
index 0eb508080c4453ff092d9b7d32fab59ae2e515b8..9fe9ed0ca414b2684bcaf8c52f3404dbcfd8ca9c 100644
--- a/Rendering/Matplotlib/vtkMatplotlibMathTextUtilities.h
+++ b/Rendering/Matplotlib/vtkMatplotlibMathTextUtilities.h
@@ -22,8 +22,8 @@
 // - VTK_MATPLOTLIB_DEBUG: Enable verbose debugging output during initialization
 // of the python environment.
 
-#ifndef __vtkMatplotlibMathTextUtilities_h
-#define __vtkMatplotlibMathTextUtilities_h
+#ifndef vtkMatplotlibMathTextUtilities_h
+#define vtkMatplotlibMathTextUtilities_h
 
 #include "vtkRenderingMatplotlibModule.h" // For export macro
 #include "vtkMathTextUtilities.h"
diff --git a/Rendering/OpenGL/vtkCameraPass.h b/Rendering/OpenGL/vtkCameraPass.h
index d73b67f8db3c555887be976725d0dd87f36fd684..203267199ec5b972a7dcec3cc7d8ebfcbaadd225 100644
--- a/Rendering/OpenGL/vtkCameraPass.h
+++ b/Rendering/OpenGL/vtkCameraPass.h
@@ -26,8 +26,8 @@
 // .SECTION See Also
 // vtkRenderPass
 
-#ifndef __vtkCameraPass_h
-#define __vtkCameraPass_h
+#ifndef vtkCameraPass_h
+#define vtkCameraPass_h
 
 #include "vtkRenderingOpenGLModule.h" // For export macro
 #include "vtkRenderPass.h"
diff --git a/Rendering/OpenGL/vtkCarbonRenderWindow.h b/Rendering/OpenGL/vtkCarbonRenderWindow.h
index 66b83986572be975041fc4a29301f1eb8449f5d5..1c39ebb749759be0cd61ad34ca51b68f7a32d94e 100644
--- a/Rendering/OpenGL/vtkCarbonRenderWindow.h
+++ b/Rendering/OpenGL/vtkCarbonRenderWindow.h
@@ -28,8 +28,8 @@ PURPOSE.  See the above copyright notice for more information.
 // .SECTION See Also
 // vtkOpenGLRenderWindow vtkCocoaRenderWindow
 
-#ifndef __vtkCarbonRenderWindow_h
-#define __vtkCarbonRenderWindow_h
+#ifndef vtkCarbonRenderWindow_h
+#define vtkCarbonRenderWindow_h
 
 #if defined(__LP64__) && __LP64__
   #error VTK_USE_CARBON cannot work in 64 bit; use VTK_USE_COCOA instead.
diff --git a/Rendering/OpenGL/vtkCarbonRenderWindowInteractor.h b/Rendering/OpenGL/vtkCarbonRenderWindowInteractor.h
index 5d027aa9136b6ceb9caf05091080e058f5b14ba3..78dfd87d5e13f74b77548d1a22bb37cebf38d353 100644
--- a/Rendering/OpenGL/vtkCarbonRenderWindowInteractor.h
+++ b/Rendering/OpenGL/vtkCarbonRenderWindowInteractor.h
@@ -23,8 +23,8 @@
 // VTK prior to VTK 6.2, it was mapped to Alt.  On OS X, the Option key can be
 // used as Alt.
 
-#ifndef __vtkCarbonRenderWindowInteractor_h
-#define __vtkCarbonRenderWindowInteractor_h
+#ifndef vtkCarbonRenderWindowInteractor_h
+#define vtkCarbonRenderWindowInteractor_h
 
 #include "vtkRenderingOpenGLModule.h" // For export macro
 #include "vtkRenderWindowInteractor.h"
diff --git a/Rendering/OpenGL/vtkChooserPainter.h b/Rendering/OpenGL/vtkChooserPainter.h
index 42e0bc7f2099ca4f5846053b464c01d7ce5cbf7f..b3dddef06e6759bb246318186cf6094fc746271d 100644
--- a/Rendering/OpenGL/vtkChooserPainter.h
+++ b/Rendering/OpenGL/vtkChooserPainter.h
@@ -23,8 +23,8 @@
 //
 
 
-#ifndef __vtkChooserPainter_h
-#define __vtkChooserPainter_h
+#ifndef vtkChooserPainter_h
+#define vtkChooserPainter_h
 
 #include "vtkRenderingOpenGLModule.h" // For export macro
 #include "vtkPolyDataPainter.h"
diff --git a/Rendering/OpenGL/vtkClearRGBPass.h b/Rendering/OpenGL/vtkClearRGBPass.h
index e9b31104f756747d730716c6709d0b219b238f26..9ee9a72533caa039def876d2bef09f80bb717fc3 100644
--- a/Rendering/OpenGL/vtkClearRGBPass.h
+++ b/Rendering/OpenGL/vtkClearRGBPass.h
@@ -19,8 +19,8 @@
 // .SECTION See Also
 // vtkValuePasses
 
-#ifndef __vtkClearRGBPass_h
-#define __vtkClearRGBPass_h
+#ifndef vtkClearRGBPass_h
+#define vtkClearRGBPass_h
 
 #include "vtkRenderingOpenGLModule.h" // For export macro
 #include "vtkRenderPass.h"
diff --git a/Rendering/OpenGL/vtkClearZPass.h b/Rendering/OpenGL/vtkClearZPass.h
index d9b68c09b6e1692b74d4e650b3f5f0f9e5261c6b..cfaeaee7f3fda052c1287ed4d6adc80d704b8aec 100644
--- a/Rendering/OpenGL/vtkClearZPass.h
+++ b/Rendering/OpenGL/vtkClearZPass.h
@@ -19,8 +19,8 @@
 // .SECTION See Also
 // vtkRenderPass
 
-#ifndef __vtkClearZPass_h
-#define __vtkClearZPass_h
+#ifndef vtkClearZPass_h
+#define vtkClearZPass_h
 
 #include "vtkRenderingOpenGLModule.h" // For export macro
 #include "vtkRenderPass.h"
diff --git a/Rendering/OpenGL/vtkClipPlanesPainter.h b/Rendering/OpenGL/vtkClipPlanesPainter.h
index 080cbf5052973596601bf6ecd857bda5ea702f90..f47d38098a7b8a42c17354b4f3b104010eb05030 100644
--- a/Rendering/OpenGL/vtkClipPlanesPainter.h
+++ b/Rendering/OpenGL/vtkClipPlanesPainter.h
@@ -15,8 +15,8 @@
 // .NAME vtkClipPlanesPainter - abstract class defining interface for
 // painter that manages clipping.
 
-#ifndef __vtkClipPlanesPainter_h
-#define __vtkClipPlanesPainter_h
+#ifndef vtkClipPlanesPainter_h
+#define vtkClipPlanesPainter_h
 
 #include "vtkRenderingOpenGLModule.h" // For export macro
 #include "vtkPainter.h"
diff --git a/Rendering/OpenGL/vtkCocoaGLView.h b/Rendering/OpenGL/vtkCocoaGLView.h
index f02a4aefefc65cc613bc3faeacf93c1e392bca7b..fb9e792b82417737662a3310e62a0e2e56f1f3e0 100644
--- a/Rendering/OpenGL/vtkCocoaGLView.h
+++ b/Rendering/OpenGL/vtkCocoaGLView.h
@@ -34,8 +34,8 @@
 // .SECTION See Also
 // vtkCocoaRenderWindow vtkCocoaRenderWindowInteractor
 
-#ifndef __vtkCocoaGLView_h
-#define __vtkCocoaGLView_h
+#ifndef vtkCocoaGLView_h
+#define vtkCocoaGLView_h
 
 #import <Cocoa/Cocoa.h>
 
@@ -70,5 +70,5 @@
 
 @end
 
-#endif /* __vtkCocoaGLView_h */
+#endif /* vtkCocoaGLView_h */
 // VTK-HeaderTest-Exclude: vtkCocoaGLView.h
diff --git a/Rendering/OpenGL/vtkCocoaRenderWindow.h b/Rendering/OpenGL/vtkCocoaRenderWindow.h
index 15028570290cd193ba942c8988b8ab00acf4c696..ef4703d02cb83ee150b6d571bc85585cad8e810d 100644
--- a/Rendering/OpenGL/vtkCocoaRenderWindow.h
+++ b/Rendering/OpenGL/vtkCocoaRenderWindow.h
@@ -37,8 +37,8 @@ PURPOSE.  See the above copyright notice for more information.
 // That means no Objective-C may be used. That's why some instance variables
 // are void* instead of what they really should be.
 
-#ifndef __vtkCocoaRenderWindow_h
-#define __vtkCocoaRenderWindow_h
+#ifndef vtkCocoaRenderWindow_h
+#define vtkCocoaRenderWindow_h
 
 #include "vtkRenderingOpenGLModule.h" // For export macro
 #include "vtkOpenGLRenderWindow.h"
diff --git a/Rendering/OpenGL/vtkCocoaRenderWindowInteractor.h b/Rendering/OpenGL/vtkCocoaRenderWindowInteractor.h
index c8a5255a8e0e8b4f6f903e28eca677095d5f62cb..c02ca4df47f7db13afc27fdbefd3a6e3d8b0d1c3 100644
--- a/Rendering/OpenGL/vtkCocoaRenderWindowInteractor.h
+++ b/Rendering/OpenGL/vtkCocoaRenderWindowInteractor.h
@@ -27,8 +27,8 @@
 // files.  That means no Objective C may be used. That's why some instance
 // variables are void* instead of what they really should be.
 
-#ifndef __vtkCocoaRenderWindowInteractor_h
-#define __vtkCocoaRenderWindowInteractor_h
+#ifndef vtkCocoaRenderWindowInteractor_h
+#define vtkCocoaRenderWindowInteractor_h
 
 #include "vtkRenderingOpenGLModule.h" // For export macro
 #include "vtkRenderWindowInteractor.h"
diff --git a/Rendering/OpenGL/vtkCoincidentTopologyResolutionPainter.h b/Rendering/OpenGL/vtkCoincidentTopologyResolutionPainter.h
index 6824b6e14c9902963827cf6ae0ae002569f968e9..5a2bfd7639a27d18c21b99f2922cfd010813ee6d 100644
--- a/Rendering/OpenGL/vtkCoincidentTopologyResolutionPainter.h
+++ b/Rendering/OpenGL/vtkCoincidentTopologyResolutionPainter.h
@@ -20,8 +20,8 @@
 // and the edges lie on the mesh, this feature can be useful to get nice
 // looking lines.
 
-#ifndef __vtkCoincidentTopologyResolutionPainter_h
-#define __vtkCoincidentTopologyResolutionPainter_h
+#ifndef vtkCoincidentTopologyResolutionPainter_h
+#define vtkCoincidentTopologyResolutionPainter_h
 
 #include "vtkRenderingOpenGLModule.h" // For export macro
 #include "vtkPolyDataPainter.h"
diff --git a/Rendering/OpenGL/vtkColorMaterialHelper.h b/Rendering/OpenGL/vtkColorMaterialHelper.h
index e9a911f268588bd0c1a2895aa84c5699477418b0..fad6a6471866f21d0c1fd81b50003ee504e39c80 100644
--- a/Rendering/OpenGL/vtkColorMaterialHelper.h
+++ b/Rendering/OpenGL/vtkColorMaterialHelper.h
@@ -23,8 +23,8 @@
 // .SECTION see also
 //  vtkShaderProgram2
 
-#ifndef __vtkColorMaterialHelper_h
-#define __vtkColorMaterialHelper_h
+#ifndef vtkColorMaterialHelper_h
+#define vtkColorMaterialHelper_h
 
 #include "vtkRenderingOpenGLModule.h" // For export macro
 #include "vtkObject.h"
diff --git a/Rendering/OpenGL/vtkCompositePainter.h b/Rendering/OpenGL/vtkCompositePainter.h
index 82fe4e1786f865b709a4ff9a2f6bce546c24ce67..e27f7392f92a21fcd12d141d36cda94aec12aa04 100644
--- a/Rendering/OpenGL/vtkCompositePainter.h
+++ b/Rendering/OpenGL/vtkCompositePainter.h
@@ -19,8 +19,8 @@
 // This painter can also handle the case when the dataset is not a composite
 // dataset.
 
-#ifndef __vtkCompositePainter_h
-#define __vtkCompositePainter_h
+#ifndef vtkCompositePainter_h
+#define vtkCompositePainter_h
 
 #include "vtkRenderingOpenGLModule.h" // For export macro
 #include "vtkPainter.h"
diff --git a/Rendering/OpenGL/vtkCompositePolyDataMapper2.h b/Rendering/OpenGL/vtkCompositePolyDataMapper2.h
index 6bee03d859b07151ef7251ee3c0207d5e763e91c..5eb04246e16d27f7d4cdf89814dd8298f8a833ad 100644
--- a/Rendering/OpenGL/vtkCompositePolyDataMapper2.h
+++ b/Rendering/OpenGL/vtkCompositePolyDataMapper2.h
@@ -19,8 +19,8 @@
 // that instead of creating individual mapper for each block in the composite
 // dataset, it iterates over the blocks internally.
 
-#ifndef __vtkCompositePolyDataMapper2_h
-#define __vtkCompositePolyDataMapper2_h
+#ifndef vtkCompositePolyDataMapper2_h
+#define vtkCompositePolyDataMapper2_h
 
 #include "vtkRenderingOpenGLModule.h" // For export macro
 #include "vtkPainterPolyDataMapper.h"
diff --git a/Rendering/OpenGL/vtkDataTransferHelper.h b/Rendering/OpenGL/vtkDataTransferHelper.h
index ff6f5c852246b9fd4bc95f58be5c9a4a46793295..3244cf019936f8db245bca35278bb3b272b3b11c 100644
--- a/Rendering/OpenGL/vtkDataTransferHelper.h
+++ b/Rendering/OpenGL/vtkDataTransferHelper.h
@@ -25,8 +25,8 @@
 // .SECTION see also
 //  vtkPixelBufferObject vtkTextureObject vtkOpenGLExtensionManager
 
-#ifndef __vtkDataTransferHelper_h
-#define __vtkDataTransferHelper_h
+#ifndef vtkDataTransferHelper_h
+#define vtkDataTransferHelper_h
 
 #include "vtkRenderingOpenGLModule.h" // For export macro
 #include "vtkObject.h"
diff --git a/Rendering/OpenGL/vtkDefaultPainter.h b/Rendering/OpenGL/vtkDefaultPainter.h
index 1989770ab7dd4a8bfa337dd3423f74824d4a080e..af112b6ab37d9a629ceefc641d5ddaa76a8fa3b0 100644
--- a/Rendering/OpenGL/vtkDefaultPainter.h
+++ b/Rendering/OpenGL/vtkDefaultPainter.h
@@ -27,8 +27,8 @@
 // rendering graphics primitives or a vtkChooserPainter which can select appropriate
 // painters to do the rendering.
 
-#ifndef __vtkDefaultPainter_h
-#define __vtkDefaultPainter_h
+#ifndef vtkDefaultPainter_h
+#define vtkDefaultPainter_h
 
 #include "vtkRenderingOpenGLModule.h" // For export macro
 #include "vtkPainter.h"
diff --git a/Rendering/OpenGL/vtkDefaultPass.h b/Rendering/OpenGL/vtkDefaultPass.h
index 9ace203228885f2751bc19e8d45344b865c98d95..b302cb99e996000e633c033c0c8c4b2bbdecc83d 100644
--- a/Rendering/OpenGL/vtkDefaultPass.h
+++ b/Rendering/OpenGL/vtkDefaultPass.h
@@ -28,8 +28,8 @@
 // .SECTION See Also
 // vtkRenderPass
 
-#ifndef __vtkDefaultPass_h
-#define __vtkDefaultPass_h
+#ifndef vtkDefaultPass_h
+#define vtkDefaultPass_h
 
 #include "vtkRenderingOpenGLModule.h" // For export macro
 #include "vtkRenderPass.h"
diff --git a/Rendering/OpenGL/vtkDepthPeelingPass.h b/Rendering/OpenGL/vtkDepthPeelingPass.h
index b8048d4d90808a1993db453a795374f8fd90be97..af8ec5cc51afd868ae6174575ccf9cd59aeb6c52 100644
--- a/Rendering/OpenGL/vtkDepthPeelingPass.h
+++ b/Rendering/OpenGL/vtkDepthPeelingPass.h
@@ -33,8 +33,8 @@
 // .SECTION See Also
 // vtkRenderPass, vtkTranslucentPass
 
-#ifndef __vtkDepthPeelingPass_h
-#define __vtkDepthPeelingPass_h
+#ifndef vtkDepthPeelingPass_h
+#define vtkDepthPeelingPass_h
 
 #include "vtkRenderingOpenGLModule.h" // For export macro
 #include "vtkRenderPass.h"
diff --git a/Rendering/OpenGL/vtkDirectXGPUInfoList.h b/Rendering/OpenGL/vtkDirectXGPUInfoList.h
index 1fffa16640137f95b4ddf5b17dc139a31099ad14..3b60dbe4bd8bf7d6ec471470ae94a136b2c9576c 100644
--- a/Rendering/OpenGL/vtkDirectXGPUInfoList.h
+++ b/Rendering/OpenGL/vtkDirectXGPUInfoList.h
@@ -23,8 +23,8 @@
 // .SECTION See Also
 // vtkGPUInfo vtkGPUInfoList
 
-#ifndef __vtkDirectXGPUInfoList_h
-#define __vtkDirectXGPUInfoList_h
+#ifndef vtkDirectXGPUInfoList_h
+#define vtkDirectXGPUInfoList_h
 
 #include "vtkRenderingOpenGLModule.h" // For export macro
 #include "vtkGPUInfoList.h"
diff --git a/Rendering/OpenGL/vtkDisplayListPainter.h b/Rendering/OpenGL/vtkDisplayListPainter.h
index d64707c44f108cfc80d8d12507cc30d6e4434a86..8764577ddf95f7ffa2092ea955da4ff77f5d9418 100644
--- a/Rendering/OpenGL/vtkDisplayListPainter.h
+++ b/Rendering/OpenGL/vtkDisplayListPainter.h
@@ -15,8 +15,8 @@
 // .NAME vtkDisplayListPainter - abstract superclass for painter that
 // builds/uses display lists.
 
-#ifndef __vtkDisplayListPainter_h
-#define __vtkDisplayListPainter_h
+#ifndef vtkDisplayListPainter_h
+#define vtkDisplayListPainter_h
 
 #include "vtkRenderingOpenGLModule.h" // For export macro
 #include "vtkPainter.h"
diff --git a/Rendering/OpenGL/vtkDummyGPUInfoList.h b/Rendering/OpenGL/vtkDummyGPUInfoList.h
index 43dc8e309df039211f5a8594f8e7e54ecdb422f3..c409b314b0547418ad0499e3338509bc266ecaa0 100644
--- a/Rendering/OpenGL/vtkDummyGPUInfoList.h
+++ b/Rendering/OpenGL/vtkDummyGPUInfoList.h
@@ -20,8 +20,8 @@
 // .SECTION See Also
 // vtkGPUInfo vtkGPUInfoList
 
-#ifndef __vtkDummyGPUInfoList_h
-#define __vtkDummyGPUInfoList_h
+#ifndef vtkDummyGPUInfoList_h
+#define vtkDummyGPUInfoList_h
 
 #include "vtkRenderingOpenGLModule.h" // For export macro
 #include "vtkGPUInfoList.h"
diff --git a/Rendering/OpenGL/vtkFrameBufferObject.h b/Rendering/OpenGL/vtkFrameBufferObject.h
index 101fb4f75b156baf4ba32c1890735433ca37b913..546b6acf92f65a6f7fca64d80f685c0dfe590a42 100644
--- a/Rendering/OpenGL/vtkFrameBufferObject.h
+++ b/Rendering/OpenGL/vtkFrameBufferObject.h
@@ -22,8 +22,8 @@
 // DON'T PLAY WITH IT YET.
 // .SECTION See Also
 // vtkFrameBufferObject2, vtkRenderbufferObject
-#ifndef __vtkFrameBufferObject_h
-#define __vtkFrameBufferObject_h
+#ifndef vtkFrameBufferObject_h
+#define vtkFrameBufferObject_h
 
 #include "vtkObject.h"
 #include "vtkRenderingOpenGLModule.h" // For export macro
diff --git a/Rendering/OpenGL/vtkFrameBufferObject2.h b/Rendering/OpenGL/vtkFrameBufferObject2.h
index 85cc3a2d91b6c173a7476ec5ddc7b519ab3dd58a..7830d1dbb65ad474914897695a6c839cec771fbe 100644
--- a/Rendering/OpenGL/vtkFrameBufferObject2.h
+++ b/Rendering/OpenGL/vtkFrameBufferObject2.h
@@ -39,8 +39,8 @@
 // .SECTION See Also
 // vtkRenderbuffer, vtkPixelBufferObject
 
-#ifndef __vtkFrameBufferObject2_h
-#define __vtkFrameBufferObject2_h
+#ifndef vtkFrameBufferObject2_h
+#define vtkFrameBufferObject2_h
 
 #include "vtkObject.h"
 #include "vtkRenderingOpenGLModule.h" // For export macro
diff --git a/Rendering/OpenGL/vtkGLSLShaderDeviceAdapter2.h b/Rendering/OpenGL/vtkGLSLShaderDeviceAdapter2.h
index f8c8bc1760b5d90dca6da6fcbeb0b1e4760209f4..afb0333a21304613654f41f74fd2c043337752fa 100644
--- a/Rendering/OpenGL/vtkGLSLShaderDeviceAdapter2.h
+++ b/Rendering/OpenGL/vtkGLSLShaderDeviceAdapter2.h
@@ -17,8 +17,8 @@
 // .SECTION Description
 // vtkShaderDeviceAdapter subclass for vtkShaderProgram2.
 
-#ifndef __vtkGLSLShaderDeviceAdapter2_h
-#define __vtkGLSLShaderDeviceAdapter2_h
+#ifndef vtkGLSLShaderDeviceAdapter2_h
+#define vtkGLSLShaderDeviceAdapter2_h
 
 #include "vtkRenderingOpenGLModule.h" // For export macro
 #include "vtkShaderDeviceAdapter2.h"
diff --git a/Rendering/OpenGL/vtkGaussianBlurPass.h b/Rendering/OpenGL/vtkGaussianBlurPass.h
index 768f8f061a792a3da56a85ce4a419793de0e23d6..911492da25aacd2dcac59c87b0a55abe4af26e19 100644
--- a/Rendering/OpenGL/vtkGaussianBlurPass.h
+++ b/Rendering/OpenGL/vtkGaussianBlurPass.h
@@ -43,8 +43,8 @@
 // .SECTION See Also
 // vtkRenderPass
 
-#ifndef __vtkGaussianBlurPass_h
-#define __vtkGaussianBlurPass_h
+#ifndef vtkGaussianBlurPass_h
+#define vtkGaussianBlurPass_h
 
 #include "vtkRenderingOpenGLModule.h" // For export macro
 #include "vtkImageProcessingPass.h"
diff --git a/Rendering/OpenGL/vtkHardwareSelectionPolyDataPainter.h b/Rendering/OpenGL/vtkHardwareSelectionPolyDataPainter.h
index 77595b71a05b56cde24efb4b47e9b863a0b40d5f..0eb1f7377e006ee9a2e6c5f2effd1b1c32c9639e 100644
--- a/Rendering/OpenGL/vtkHardwareSelectionPolyDataPainter.h
+++ b/Rendering/OpenGL/vtkHardwareSelectionPolyDataPainter.h
@@ -20,8 +20,8 @@
 // .SECTION See Also
 // vtkHardwareSelector
 
-#ifndef __vtkHardwareSelectionPolyDataPainter_h
-#define __vtkHardwareSelectionPolyDataPainter_h
+#ifndef vtkHardwareSelectionPolyDataPainter_h
+#define vtkHardwareSelectionPolyDataPainter_h
 
 #include "vtkRenderingOpenGLModule.h" // For export macro
 #include "vtkStandardPolyDataPainter.h"
diff --git a/Rendering/OpenGL/vtkImageProcessingPass.h b/Rendering/OpenGL/vtkImageProcessingPass.h
index 3397c8f24d18e3f3058c3c1f8576893a74f9ddc6..fa03840ea39f133316cb27504f6781f69e8be1a2 100644
--- a/Rendering/OpenGL/vtkImageProcessingPass.h
+++ b/Rendering/OpenGL/vtkImageProcessingPass.h
@@ -22,8 +22,8 @@
 // .SECTION See Also
 // vtkRenderPass vtkGaussianBlurPass vtkSobelGradientMagnitudePass
 
-#ifndef __vtkImageProcessingPass_h
-#define __vtkImageProcessingPass_h
+#ifndef vtkImageProcessingPass_h
+#define vtkImageProcessingPass_h
 
 #include "vtkRenderingOpenGLModule.h" // For export macro
 #include "vtkRenderPass.h"
diff --git a/Rendering/OpenGL/vtkLightingHelper.h b/Rendering/OpenGL/vtkLightingHelper.h
index 3857fd0b0ba1f5947219583b60ecc9a3062a282e..317de431b6821a94706b5652b393ad92382227e9 100644
--- a/Rendering/OpenGL/vtkLightingHelper.h
+++ b/Rendering/OpenGL/vtkLightingHelper.h
@@ -23,8 +23,8 @@
 // .SECTION see also
 //  vtkShaderProgram2
 
-#ifndef __vtkLightingHelper_h
-#define __vtkLightingHelper_h
+#ifndef vtkLightingHelper_h
+#define vtkLightingHelper_h
 
 #include "vtkRenderingOpenGLModule.h" // For export macro
 #include "vtkObject.h"
diff --git a/Rendering/OpenGL/vtkLightingPainter.h b/Rendering/OpenGL/vtkLightingPainter.h
index bbb51ea70e407bf47ba41be60a6d8dac5a76be0a..9e99795e5d5d6cab1f60359323638330c56096a8 100644
--- a/Rendering/OpenGL/vtkLightingPainter.h
+++ b/Rendering/OpenGL/vtkLightingPainter.h
@@ -15,8 +15,8 @@
 // .NAME vtkLightingPainter - abstract class defining interface for painter
 // that can handle lightin.
 
-#ifndef __vtkLightingPainter_h
-#define __vtkLightingPainter_h
+#ifndef vtkLightingPainter_h
+#define vtkLightingPainter_h
 
 #include "vtkRenderingOpenGLModule.h" // For export macro
 #include "vtkPolyDataPainter.h"
diff --git a/Rendering/OpenGL/vtkLightsPass.h b/Rendering/OpenGL/vtkLightsPass.h
index e2700934a9474b12d0f24b73c21978ada8c96a2a..0f07105c9ba3d0a16f5a7801dfbe3d55d6d8086d 100644
--- a/Rendering/OpenGL/vtkLightsPass.h
+++ b/Rendering/OpenGL/vtkLightsPass.h
@@ -23,8 +23,8 @@
 // .SECTION See Also
 // vtkRenderPass
 
-#ifndef __vtkLightsPass_h
-#define __vtkLightsPass_h
+#ifndef vtkLightsPass_h
+#define vtkLightsPass_h
 
 #include "vtkRenderingOpenGLModule.h" // For export macro
 #include "vtkRenderPass.h"
diff --git a/Rendering/OpenGL/vtkLinesPainter.h b/Rendering/OpenGL/vtkLinesPainter.h
index 170a8e6e0826e596af63c951ec842909da838d75..d115f200d54adb5f867655b6cd2c1d73029d3162 100644
--- a/Rendering/OpenGL/vtkLinesPainter.h
+++ b/Rendering/OpenGL/vtkLinesPainter.h
@@ -22,8 +22,8 @@
 // propagated to the delegate painter.
 //
 
-#ifndef __vtkLinesPainter_h
-#define __vtkLinesPainter_h
+#ifndef vtkLinesPainter_h
+#define vtkLinesPainter_h
 
 #include "vtkRenderingOpenGLModule.h" // For export macro
 #include "vtkPrimitivePainter.h"
diff --git a/Rendering/OpenGL/vtkOSOpenGLRenderWindow.h b/Rendering/OpenGL/vtkOSOpenGLRenderWindow.h
index d778d3ee7f1d7e8b0300ca5386feb6a105692fa1..f426d575e43186eab411383947eaed22799d237f 100644
--- a/Rendering/OpenGL/vtkOSOpenGLRenderWindow.h
+++ b/Rendering/OpenGL/vtkOSOpenGLRenderWindow.h
@@ -23,8 +23,8 @@
 // Application programmers should normally use vtkRenderWindow instead of the
 // OpenGL specific version.
 
-#ifndef __vtkOSOpenGLRenderWindow_h
-#define __vtkOSOpenGLRenderWindow_h
+#ifndef vtkOSOpenGLRenderWindow_h
+#define vtkOSOpenGLRenderWindow_h
 
 #include "vtkRenderingOpenGLModule.h" // For export macro
 #include "vtkOpenGLRenderWindow.h"
diff --git a/Rendering/OpenGL/vtkOpaquePass.h b/Rendering/OpenGL/vtkOpaquePass.h
index 15e7e4e0c2bd06c426f91b8629b284a81b98b7a9..fc512a051b08357883f034215900e50fee1a6c81 100644
--- a/Rendering/OpenGL/vtkOpaquePass.h
+++ b/Rendering/OpenGL/vtkOpaquePass.h
@@ -25,8 +25,8 @@
 // .SECTION See Also
 // vtkRenderPass vtkDefaultPass
 
-#ifndef __vtkOpaquePass_h
-#define __vtkOpaquePass_h
+#ifndef vtkOpaquePass_h
+#define vtkOpaquePass_h
 
 #include "vtkRenderingOpenGLModule.h" // For export macro
 #include "vtkDefaultPass.h"
diff --git a/Rendering/OpenGL/vtkOpenGL.h b/Rendering/OpenGL/vtkOpenGL.h
index bad2c992569b20c752a00f1fe105cd803d7f741e..054b4fb4bf7438714c84375fc63bbacd060b1dfe 100644
--- a/Rendering/OpenGL/vtkOpenGL.h
+++ b/Rendering/OpenGL/vtkOpenGL.h
@@ -12,8 +12,8 @@
      PURPOSE.  See the above copyright notice for more information.
 
 =========================================================================*/
-#ifndef __vtkOpenGL_h
-#define __vtkOpenGL_h
+#ifndef vtkOpenGL_h
+#define vtkOpenGL_h
 
 #include "vtkRenderingOpenGLModule.h" // For export macro
 #include "vtkConfigure.h"
diff --git a/Rendering/OpenGL/vtkOpenGLActor.h b/Rendering/OpenGL/vtkOpenGLActor.h
index 188a63778946bcfa703610eb9e81945f2571e266..59895875892f2f084dbd1590c5c1d6dcfc184df1 100644
--- a/Rendering/OpenGL/vtkOpenGLActor.h
+++ b/Rendering/OpenGL/vtkOpenGLActor.h
@@ -17,8 +17,8 @@
 // vtkOpenGLActor is a concrete implementation of the abstract class vtkActor.
 // vtkOpenGLActor interfaces to the OpenGL rendering library.
 
-#ifndef __vtkOpenGLActor_h
-#define __vtkOpenGLActor_h
+#ifndef vtkOpenGLActor_h
+#define vtkOpenGLActor_h
 
 #include "vtkRenderingOpenGLModule.h" // For export macro
 #include "vtkActor.h"
diff --git a/Rendering/OpenGL/vtkOpenGLCamera.h b/Rendering/OpenGL/vtkOpenGLCamera.h
index 1953ee7f78194812c581cd46dc4b5e55d09fc570..7d5b77f7ce12951f8b8858df8e70ccfe324ab1ee 100644
--- a/Rendering/OpenGL/vtkOpenGLCamera.h
+++ b/Rendering/OpenGL/vtkOpenGLCamera.h
@@ -17,8 +17,8 @@
 // vtkOpenGLCamera is a concrete implementation of the abstract class
 // vtkCamera.  vtkOpenGLCamera interfaces to the OpenGL rendering library.
 
-#ifndef __vtkOpenGLCamera_h
-#define __vtkOpenGLCamera_h
+#ifndef vtkOpenGLCamera_h
+#define vtkOpenGLCamera_h
 
 #include "vtkRenderingOpenGLModule.h" // For export macro
 #include "vtkCamera.h"
diff --git a/Rendering/OpenGL/vtkOpenGLClipPlanesPainter.h b/Rendering/OpenGL/vtkOpenGLClipPlanesPainter.h
index 8b3e576da08f645c80683d4017d63ceded089df0..af3857183caaea29d4d3f0202ffe1c0e7323216f 100644
--- a/Rendering/OpenGL/vtkOpenGLClipPlanesPainter.h
+++ b/Rendering/OpenGL/vtkOpenGLClipPlanesPainter.h
@@ -18,8 +18,8 @@
 // This painter must typically be placed before the painter that
 // do the primitive rendering.
 
-#ifndef __vtkOpenGLClipPlanesPainter_h
-#define __vtkOpenGLClipPlanesPainter_h
+#ifndef vtkOpenGLClipPlanesPainter_h
+#define vtkOpenGLClipPlanesPainter_h
 
 #include "vtkRenderingOpenGLModule.h" // For export macro
 #include "vtkClipPlanesPainter.h"
diff --git a/Rendering/OpenGL/vtkOpenGLCoincidentTopologyResolutionPainter.h b/Rendering/OpenGL/vtkOpenGLCoincidentTopologyResolutionPainter.h
index d31a51dd93ba501bdd452f00265c7b8b9f9f0a68..c208ce9235d268ba8e9e30b9ced6c52da57b29d8 100644
--- a/Rendering/OpenGL/vtkOpenGLCoincidentTopologyResolutionPainter.h
+++ b/Rendering/OpenGL/vtkOpenGLCoincidentTopologyResolutionPainter.h
@@ -16,8 +16,8 @@
 // .SECTION Description
 // Implementation for vtkCoincidentTopologyResolutionPainter using OpenGL.
 
-#ifndef __vtkOpenGLCoincidentTopologyResolutionPainter_h
-#define __vtkOpenGLCoincidentTopologyResolutionPainter_h
+#ifndef vtkOpenGLCoincidentTopologyResolutionPainter_h
+#define vtkOpenGLCoincidentTopologyResolutionPainter_h
 
 #include "vtkRenderingOpenGLModule.h" // For export macro
 #include "vtkCoincidentTopologyResolutionPainter.h"
diff --git a/Rendering/OpenGL/vtkOpenGLCompositePainter.h b/Rendering/OpenGL/vtkOpenGLCompositePainter.h
index 39ee5b32ef2f3536e9340242072f5e83ca47936c..bcc3e29a0c47df6ac3eae8854710d78a891944e3 100644
--- a/Rendering/OpenGL/vtkOpenGLCompositePainter.h
+++ b/Rendering/OpenGL/vtkOpenGLCompositePainter.h
@@ -15,8 +15,8 @@
 // .NAME vtkOpenGLCompositePainter - composite painter for OpenGL.
 // .SECTION Description
 
-#ifndef __vtkOpenGLCompositePainter_h
-#define __vtkOpenGLCompositePainter_h
+#ifndef vtkOpenGLCompositePainter_h
+#define vtkOpenGLCompositePainter_h
 
 #include "vtkRenderingOpenGLModule.h" // For export macro
 #include "vtkCompositePainter.h"
diff --git a/Rendering/OpenGL/vtkOpenGLDisplayListPainter.h b/Rendering/OpenGL/vtkOpenGLDisplayListPainter.h
index b96d8e78495bf18298325fedb17e7e4cce2a8901..1dbc57e9f77168ac0d331a2ca8ac8bf48f7f8340 100644
--- a/Rendering/OpenGL/vtkOpenGLDisplayListPainter.h
+++ b/Rendering/OpenGL/vtkOpenGLDisplayListPainter.h
@@ -19,8 +19,8 @@
 // different set of typeflags. If any of the data or inputs change, then all
 // display lists are discarded.
 
-#ifndef __vtkOpenGLDisplayListPainter_h
-#define __vtkOpenGLDisplayListPainter_h
+#ifndef vtkOpenGLDisplayListPainter_h
+#define vtkOpenGLDisplayListPainter_h
 
 #include "vtkRenderingOpenGLModule.h" // For export macro
 #include "vtkDisplayListPainter.h"
diff --git a/Rendering/OpenGL/vtkOpenGLExtensionManager.h b/Rendering/OpenGL/vtkOpenGLExtensionManager.h
index 6b85079ade559ed33f49fc9d0fa393bbe2fa9fba..777740bea61dc4a4fb5cdedc8731fe840a6ebc90 100644
--- a/Rendering/OpenGL/vtkOpenGLExtensionManager.h
+++ b/Rendering/OpenGL/vtkOpenGLExtensionManager.h
@@ -119,8 +119,8 @@
 // with "vtkglX::".
 //
 
-#ifndef __vtkOpenGLExtensionManager_h
-#define __vtkOpenGLExtensionManager_h
+#ifndef vtkOpenGLExtensionManager_h
+#define vtkOpenGLExtensionManager_h
 
 #include "vtkObject.h"
 #include "vtkWeakPointer.h" // needed for vtkWeakPointer.
diff --git a/Rendering/OpenGL/vtkOpenGLGL2PSHelper.h b/Rendering/OpenGL/vtkOpenGLGL2PSHelper.h
index f16d0d8608ee0e8aba48b74f31e15db4522c8ac7..febd9f5b70d37f59a58410abe3dcb3c45013fb6c 100644
--- a/Rendering/OpenGL/vtkOpenGLGL2PSHelper.h
+++ b/Rendering/OpenGL/vtkOpenGLGL2PSHelper.h
@@ -27,8 +27,8 @@
 // gl2psLineWidth in order to keep GL2PS from being a module dependency for
 // vtkRenderingOpenGL.
 
-#ifndef __vtkOpenGLGL2PSHelper_h
-#define __vtkOpenGLGL2PSHelper_h
+#ifndef vtkOpenGLGL2PSHelper_h
+#define vtkOpenGLGL2PSHelper_h
 
 #include "vtkRenderingOpenGLModule.h" // For export macro
 #include "vtkOpenGL.h" // for GL defines.
@@ -105,5 +105,5 @@ private:
   void operator=(const vtkOpenGLGL2PSHelper &);   // Not implemented.
 };
 
-#endif //__vtkOpenGLGL2PSHelper_h
+#endif //vtkOpenGLGL2PSHelper_h
 // VTK-HeaderTest-Exclude: vtkOpenGLGL2PSHelper.h
diff --git a/Rendering/OpenGL/vtkOpenGLGlyph3DMapper.h b/Rendering/OpenGL/vtkOpenGLGlyph3DMapper.h
index dc7c51259559c2d02b06e35d15111cf54254dd45..98e2d0d8e7a96235804ca97ffda4319dc5f2f0d5 100644
--- a/Rendering/OpenGL/vtkOpenGLGlyph3DMapper.h
+++ b/Rendering/OpenGL/vtkOpenGLGlyph3DMapper.h
@@ -23,8 +23,8 @@
 // .SECTION See Also
 // vtkOpenGLGlyph3D
 
-#ifndef __vtkOpenGLGlyph3DMapper_h
-#define __vtkOpenGLGlyph3DMapper_h
+#ifndef vtkOpenGLGlyph3DMapper_h
+#define vtkOpenGLGlyph3DMapper_h
 
 #include "vtkRenderingOpenGLModule.h" // For export macro
 #include "vtkGlyph3DMapper.h"
diff --git a/Rendering/OpenGL/vtkOpenGLHardwareSelector.h b/Rendering/OpenGL/vtkOpenGLHardwareSelector.h
index 35a0122f3124d1a2212b4e08434641d8c7665411..d805636b80f195b7802ab3066c5542ef174e5345 100644
--- a/Rendering/OpenGL/vtkOpenGLHardwareSelector.h
+++ b/Rendering/OpenGL/vtkOpenGLHardwareSelector.h
@@ -21,8 +21,8 @@
 // .SECTION See Also
 // vtkHardwareSelector
 
-#ifndef __vtkOpenGLHardwareSelector_h
-#define __vtkOpenGLHardwareSelector_h
+#ifndef vtkOpenGLHardwareSelector_h
+#define vtkOpenGLHardwareSelector_h
 
 #include "vtkRenderingOpenGLModule.h" // For export macro
 #include "vtkHardwareSelector.h"
diff --git a/Rendering/OpenGL/vtkOpenGLHardwareSupport.h b/Rendering/OpenGL/vtkOpenGLHardwareSupport.h
index 3253153c9e0c827c21f4412e794bc8fcaeea1f2c..b62f4a22af7fa2b7cbac9677d5fc3c84362d0709 100644
--- a/Rendering/OpenGL/vtkOpenGLHardwareSupport.h
+++ b/Rendering/OpenGL/vtkOpenGLHardwareSupport.h
@@ -20,8 +20,8 @@
 // abstract super class vtkHardwareSupport should be implemented
 // for this class to derive from.
 
-#ifndef __vtkOpenGLHardwareSupport_h
-#define __vtkOpenGLHardwareSupport_h
+#ifndef vtkOpenGLHardwareSupport_h
+#define vtkOpenGLHardwareSupport_h
 
 #include "vtkRenderingOpenGLModule.h" // For export macro
 #include "vtkObject.h"
diff --git a/Rendering/OpenGL/vtkOpenGLImageMapper.h b/Rendering/OpenGL/vtkOpenGLImageMapper.h
index c4503376ba1fb8fdf8ff9333fb978f1b3232d3b6..e4317fb1a1199be598198181e91a4b7f351f35a1 100644
--- a/Rendering/OpenGL/vtkOpenGLImageMapper.h
+++ b/Rendering/OpenGL/vtkOpenGLImageMapper.h
@@ -24,8 +24,8 @@
 // .SECTION See Also
 // vtkImageMapper
 
-#ifndef __vtkOpenGLImageMapper_h
-#define __vtkOpenGLImageMapper_h
+#ifndef vtkOpenGLImageMapper_h
+#define vtkOpenGLImageMapper_h
 
 #include "vtkRenderingOpenGLModule.h" // For export macro
 #include "vtkImageMapper.h"
diff --git a/Rendering/OpenGL/vtkOpenGLImageSliceMapper.h b/Rendering/OpenGL/vtkOpenGLImageSliceMapper.h
index 732a81cb108950b24181a83b3f4cdaf48c84a041..9db18f7975339a560667f10f526f1d6e234d9231 100644
--- a/Rendering/OpenGL/vtkOpenGLImageSliceMapper.h
+++ b/Rendering/OpenGL/vtkOpenGLImageSliceMapper.h
@@ -20,8 +20,8 @@
 // Thanks to David Gobbi at the Seaman Family MR Centre and Dept. of Clinical
 // Neurosciences, Foothills Medical Centre, Calgary, for providing this class.
 
-#ifndef __vtkOpenGLImageSliceMapper_h
-#define __vtkOpenGLImageSliceMapper_h
+#ifndef vtkOpenGLImageSliceMapper_h
+#define vtkOpenGLImageSliceMapper_h
 
 #include "vtkRenderingOpenGLModule.h" // For export macro
 #include "vtkImageSliceMapper.h"
diff --git a/Rendering/OpenGL/vtkOpenGLLight.h b/Rendering/OpenGL/vtkOpenGLLight.h
index 1161cdccd1ea0e7d3c3dc3e13f825b7dec232f30..f0ad392fe027e56a0aaf8f45d854bc97c3aa6457 100644
--- a/Rendering/OpenGL/vtkOpenGLLight.h
+++ b/Rendering/OpenGL/vtkOpenGLLight.h
@@ -17,8 +17,8 @@
 // vtkOpenGLLight is a concrete implementation of the abstract class vtkLight.
 // vtkOpenGLLight interfaces to the OpenGL rendering library.
 
-#ifndef __vtkOpenGLLight_h
-#define __vtkOpenGLLight_h
+#ifndef vtkOpenGLLight_h
+#define vtkOpenGLLight_h
 
 #include "vtkRenderingOpenGLModule.h" // For export macro
 #include "vtkLight.h"
diff --git a/Rendering/OpenGL/vtkOpenGLLightingPainter.h b/Rendering/OpenGL/vtkOpenGLLightingPainter.h
index ed6b692a923abb3a72918fba5667134a6baaf538..208714ca75af2d26ed1df460da0511d8822d2f41 100644
--- a/Rendering/OpenGL/vtkOpenGLLightingPainter.h
+++ b/Rendering/OpenGL/vtkOpenGLLightingPainter.h
@@ -19,8 +19,8 @@
 // or rendering Polygons/TStrips and representation is points and no normals
 // are present.
 
-#ifndef __vtkOpenGLLightingPainter_h
-#define __vtkOpenGLLightingPainter_h
+#ifndef vtkOpenGLLightingPainter_h
+#define vtkOpenGLLightingPainter_h
 
 #include "vtkRenderingOpenGLModule.h" // For export macro
 #include "vtkLightingPainter.h"
diff --git a/Rendering/OpenGL/vtkOpenGLPainterDeviceAdapter.h b/Rendering/OpenGL/vtkOpenGLPainterDeviceAdapter.h
index 3b4cb9bdaf5ca8b10f7c35f2aa72b104dcd3d0f6..989162ff3198fa12f51eccf11fcad47458e15e1d 100644
--- a/Rendering/OpenGL/vtkOpenGLPainterDeviceAdapter.h
+++ b/Rendering/OpenGL/vtkOpenGLPainterDeviceAdapter.h
@@ -37,8 +37,8 @@
 // \endverbatim
 //
 
-#ifndef __vtkOpenGLPainterDeviceAdapter_h
-#define __vtkOpenGLPainterDeviceAdapter_h
+#ifndef vtkOpenGLPainterDeviceAdapter_h
+#define vtkOpenGLPainterDeviceAdapter_h
 
 #include "vtkRenderingOpenGLModule.h" // For export macro
 #include "vtkPainterDeviceAdapter.h"
diff --git a/Rendering/OpenGL/vtkOpenGLPolyDataMapper.h b/Rendering/OpenGL/vtkOpenGLPolyDataMapper.h
index 8ea41e9f0c9cd379887b9c8734ba29190345c3d7..5009af01bfe93ce6cb916598e2fed24fc9e37597 100644
--- a/Rendering/OpenGL/vtkOpenGLPolyDataMapper.h
+++ b/Rendering/OpenGL/vtkOpenGLPolyDataMapper.h
@@ -19,8 +19,8 @@
 // rendering library.
 // @deprecated Replaced by vtkPainterPolyDataMapper as of VTK 6.2.
 
-#ifndef __vtkOpenGLPolyDataMapper_h
-#define __vtkOpenGLPolyDataMapper_h
+#ifndef vtkOpenGLPolyDataMapper_h
+#define vtkOpenGLPolyDataMapper_h
 
 #include "vtkRenderingOpenGLModule.h" // For export macro
 #include "vtkPolyDataMapper.h"
diff --git a/Rendering/OpenGL/vtkOpenGLPolyDataMapper2D.h b/Rendering/OpenGL/vtkOpenGLPolyDataMapper2D.h
index 3153e2052493618b47c59692134cb8e5dfbdea87..3fbb9f418b0cacc858133e25236d9987aa9bb998 100644
--- a/Rendering/OpenGL/vtkOpenGLPolyDataMapper2D.h
+++ b/Rendering/OpenGL/vtkOpenGLPolyDataMapper2D.h
@@ -21,8 +21,8 @@
 // .SECTION See Also
 // vtkPolyDataMapper2D
 
-#ifndef __vtkOpenGLPolyDataMapper2D_h
-#define __vtkOpenGLPolyDataMapper2D_h
+#ifndef vtkOpenGLPolyDataMapper2D_h
+#define vtkOpenGLPolyDataMapper2D_h
 
 #include "vtkRenderingOpenGLModule.h" // For export macro
 #include "vtkPolyDataMapper2D.h"
diff --git a/Rendering/OpenGL/vtkOpenGLProperty.h b/Rendering/OpenGL/vtkOpenGLProperty.h
index 4741fc6023244416016010cb63cc8b1623a22791..2f6247c3855321563556322745cad048c3aa851b 100644
--- a/Rendering/OpenGL/vtkOpenGLProperty.h
+++ b/Rendering/OpenGL/vtkOpenGLProperty.h
@@ -17,8 +17,8 @@
 // vtkOpenGLProperty is a concrete implementation of the abstract class
 // vtkProperty. vtkOpenGLProperty interfaces to the OpenGL rendering library.
 
-#ifndef __vtkOpenGLProperty_h
-#define __vtkOpenGLProperty_h
+#ifndef vtkOpenGLProperty_h
+#define vtkOpenGLProperty_h
 
 #include "vtkRenderingOpenGLModule.h" // For export macro
 #include "vtkProperty.h"
diff --git a/Rendering/OpenGL/vtkOpenGLRenderWindow.h b/Rendering/OpenGL/vtkOpenGLRenderWindow.h
index 8197df3008bf1d11e2226a03cbd7b39006b55f1a..968af841512535cb2a5660c9b39c5e986f29b68c 100644
--- a/Rendering/OpenGL/vtkOpenGLRenderWindow.h
+++ b/Rendering/OpenGL/vtkOpenGLRenderWindow.h
@@ -19,8 +19,8 @@
 // library. Application programmers should normally use vtkRenderWindow
 // instead of the OpenGL specific version.
 
-#ifndef __vtkOpenGLRenderWindow_h
-#define __vtkOpenGLRenderWindow_h
+#ifndef vtkOpenGLRenderWindow_h
+#define vtkOpenGLRenderWindow_h
 
 #include "vtkRenderingOpenGLModule.h" // For export macro
 #include "vtkRenderWindow.h"
diff --git a/Rendering/OpenGL/vtkOpenGLRenderer.h b/Rendering/OpenGL/vtkOpenGLRenderer.h
index 62c0e67904562d544bdf47130a52d753278e63c2..b7b1ddd6573988a9cd4f8948271f37a045febb4d 100644
--- a/Rendering/OpenGL/vtkOpenGLRenderer.h
+++ b/Rendering/OpenGL/vtkOpenGLRenderer.h
@@ -17,8 +17,8 @@
 // vtkOpenGLRenderer is a concrete implementation of the abstract class
 // vtkRenderer. vtkOpenGLRenderer interfaces to the OpenGL graphics library.
 
-#ifndef __vtkOpenGLRenderer_h
-#define __vtkOpenGLRenderer_h
+#ifndef vtkOpenGLRenderer_h
+#define vtkOpenGLRenderer_h
 
 #include "vtkRenderingOpenGLModule.h" // For export macro
 #include "vtkRenderer.h"
diff --git a/Rendering/OpenGL/vtkOpenGLRepresentationPainter.h b/Rendering/OpenGL/vtkOpenGLRepresentationPainter.h
index 24d661bb56ad07733060f37818a87398824da88a..0620c99f81df9446ce199bf48a68df02563f6ec7 100644
--- a/Rendering/OpenGL/vtkOpenGLRepresentationPainter.h
+++ b/Rendering/OpenGL/vtkOpenGLRepresentationPainter.h
@@ -18,8 +18,8 @@
 // This is OpenGL implementation of a painter handling representation
 // i.e. Points, Wireframe, Surface.
 
-#ifndef __vtkOpenGLRepresentationPainter_h
-#define __vtkOpenGLRepresentationPainter_h
+#ifndef vtkOpenGLRepresentationPainter_h
+#define vtkOpenGLRepresentationPainter_h
 
 #include "vtkRenderingOpenGLModule.h" // For export macro
 #include "vtkRepresentationPainter.h"
diff --git a/Rendering/OpenGL/vtkOpenGLScalarsToColorsPainter.h b/Rendering/OpenGL/vtkOpenGLScalarsToColorsPainter.h
index a1eb902737f31fc12812c28222ee3b3b87418a27..7cd1480cc31c37980a70c7e7a7bd2fa1586bb7d0 100644
--- a/Rendering/OpenGL/vtkOpenGLScalarsToColorsPainter.h
+++ b/Rendering/OpenGL/vtkOpenGLScalarsToColorsPainter.h
@@ -18,8 +18,8 @@
 // vtkOpenGLScalarsToColorsPainter is a concrete subclass of
 // vtkScalarsToColorsPainter which uses OpenGL for color mapping.
 
-#ifndef __vtkOpenGLScalarsToColorsPainter_h
-#define __vtkOpenGLScalarsToColorsPainter_h
+#ifndef vtkOpenGLScalarsToColorsPainter_h
+#define vtkOpenGLScalarsToColorsPainter_h
 
 #include "vtkRenderingOpenGLModule.h" // For export macro
 #include "vtkScalarsToColorsPainter.h"
diff --git a/Rendering/OpenGL/vtkOpenGLState.h b/Rendering/OpenGL/vtkOpenGLState.h
index 85806c3203cd8f2445f19041868a120e76be20f9..9a5747226b3be045c01e715a77fd4f97d35449bc 100644
--- a/Rendering/OpenGL/vtkOpenGLState.h
+++ b/Rendering/OpenGL/vtkOpenGLState.h
@@ -28,8 +28,8 @@
 // .SECTION Implementation
 // Not all the OpenGL state is covered yet.
 
-#ifndef __vtkOpenGLState_h
-#define __vtkOpenGLState_h
+#ifndef vtkOpenGLState_h
+#define vtkOpenGLState_h
 
 #include "vtkRenderingOpenGLModule.h" // For export macro
 #include "vtkgl.h"
diff --git a/Rendering/OpenGL/vtkOpenGLTexture.h b/Rendering/OpenGL/vtkOpenGLTexture.h
index 7177f2027dbf9595409648725db781e8044a7767..b3fb764eb0a61a90119d6abd71711a0e8a3a6704 100644
--- a/Rendering/OpenGL/vtkOpenGLTexture.h
+++ b/Rendering/OpenGL/vtkOpenGLTexture.h
@@ -17,8 +17,8 @@
 // vtkOpenGLTexture is a concrete implementation of the abstract class
 // vtkTexture. vtkOpenGLTexture interfaces to the OpenGL rendering library.
 
-#ifndef __vtkOpenGLTexture_h
-#define __vtkOpenGLTexture_h
+#ifndef vtkOpenGLTexture_h
+#define vtkOpenGLTexture_h
 
 #include "vtkRenderingOpenGLModule.h" // For export macro
 #include "vtkTexture.h"
diff --git a/Rendering/OpenGL/vtkOverlayPass.h b/Rendering/OpenGL/vtkOverlayPass.h
index 02f5ceaa5e36213f3bf3a712b7412e354401cd10..dcd9155e3d100be73906369c5d54efc65813b7d3 100644
--- a/Rendering/OpenGL/vtkOverlayPass.h
+++ b/Rendering/OpenGL/vtkOverlayPass.h
@@ -25,8 +25,8 @@
 // .SECTION See Also
 // vtkRenderPass vtkDefaultPass
 
-#ifndef __vtkOverlayPass_h
-#define __vtkOverlayPass_h
+#ifndef vtkOverlayPass_h
+#define vtkOverlayPass_h
 
 #include "vtkRenderingOpenGLModule.h" // For export macro
 #include "vtkDefaultPass.h"
diff --git a/Rendering/OpenGL/vtkPainter.h b/Rendering/OpenGL/vtkPainter.h
index e4834cf8e9b45835ba82d8660c94102eadbb83be..bad3ef921dab9f41a1d5dbecae4accb5b872bdee 100644
--- a/Rendering/OpenGL/vtkPainter.h
+++ b/Rendering/OpenGL/vtkPainter.h
@@ -37,8 +37,8 @@
 // .SECTION See Also
 // vtkPainterPolyDataMapper
 
-#ifndef __vtkPainter_h
-#define __vtkPainter_h
+#ifndef vtkPainter_h
+#define vtkPainter_h
 
 #include "vtkRenderingOpenGLModule.h" // For export macro
 #include "vtkObject.h"
@@ -249,4 +249,4 @@ private:
 //ETX
 };
 
-#endif //__vtkPainter_h
+#endif //vtkPainter_h
diff --git a/Rendering/OpenGL/vtkPainterPolyDataMapper.h b/Rendering/OpenGL/vtkPainterPolyDataMapper.h
index ca82ed0ed83219642b2ed907b5a68ccfa6854a91..a226590edfb55fe303bb293e6874232522a490ff 100644
--- a/Rendering/OpenGL/vtkPainterPolyDataMapper.h
+++ b/Rendering/OpenGL/vtkPainterPolyDataMapper.h
@@ -19,8 +19,8 @@
 // Support for generic vertex attributes in VTK was contributed in
 // collaboration with Stephane Ploix at EDF.
 
-#ifndef __vtkPainterPolyDataMapper_h
-#define __vtkPainterPolyDataMapper_h
+#ifndef vtkPainterPolyDataMapper_h
+#define vtkPainterPolyDataMapper_h
 
 #include "vtkRenderingOpenGLModule.h" // For export macro
 #include "vtkPolyDataMapper.h"
diff --git a/Rendering/OpenGL/vtkPixelBufferObject.h b/Rendering/OpenGL/vtkPixelBufferObject.h
index ff1dfe777ad66c6c9d0303dc17a7c8e5b82b09f3..c24e89caea2ae57f44f21e4ed8ba6703c3b4deba 100644
--- a/Rendering/OpenGL/vtkPixelBufferObject.h
+++ b/Rendering/OpenGL/vtkPixelBufferObject.h
@@ -27,8 +27,8 @@
 // Since most PBO mappeds don't support double format all double data is converted to
 // float and then uploaded.
 
-#ifndef __vtkPixelBufferObject_h
-#define __vtkPixelBufferObject_h
+#ifndef vtkPixelBufferObject_h
+#define vtkPixelBufferObject_h
 
 #include "vtkObject.h"
 #include "vtkRenderingOpenGLModule.h" // For export macro
diff --git a/Rendering/OpenGL/vtkPointsPainter.h b/Rendering/OpenGL/vtkPointsPainter.h
index 9cd0be79dfbff12d43ed3ebd5869de23971ad200..44fdb6bbf5782e4c9f6b0fcd1f3d6b673a8900c9 100644
--- a/Rendering/OpenGL/vtkPointsPainter.h
+++ b/Rendering/OpenGL/vtkPointsPainter.h
@@ -20,8 +20,8 @@
 // present the request is passed on to the Delegate painter. If this
 // class is able to render the primitive, the render request is not
 // propagated to the delegate painter.
-#ifndef __vtkPointsPainter_h
-#define __vtkPointsPainter_h
+#ifndef vtkPointsPainter_h
+#define vtkPointsPainter_h
 
 #include "vtkRenderingOpenGLModule.h" // For export macro
 #include "vtkPrimitivePainter.h"
diff --git a/Rendering/OpenGL/vtkPolyDataPainter.h b/Rendering/OpenGL/vtkPolyDataPainter.h
index 30412f90803b24fe08349acb39e7d3f360cc18bf..3300563241e9c2fecdb3f2d30d2d72971f2495fa 100644
--- a/Rendering/OpenGL/vtkPolyDataPainter.h
+++ b/Rendering/OpenGL/vtkPolyDataPainter.h
@@ -38,8 +38,8 @@
 // vtkPainterDeviceAdapter
 //
 
-#ifndef __vtkPolyDataPainter_h
-#define __vtkPolyDataPainter_h
+#ifndef vtkPolyDataPainter_h
+#define vtkPolyDataPainter_h
 
 #include "vtkRenderingOpenGLModule.h" // For export macro
 #include "vtkPainter.h"
diff --git a/Rendering/OpenGL/vtkPolygonsPainter.h b/Rendering/OpenGL/vtkPolygonsPainter.h
index 4a30cc3b6c1961f4e09b6f31d750221b27ab0506..d8cc6dfa584bd1ec17c477d68ced84487d3ab7ca 100644
--- a/Rendering/OpenGL/vtkPolygonsPainter.h
+++ b/Rendering/OpenGL/vtkPolygonsPainter.h
@@ -17,8 +17,8 @@
 // This painter renders Polys in vtkPolyData. It can render the polys
 // in any representation (VTK_POINTS, VTK_WIREFRAME, VTK_SURFACE).
 
-#ifndef __vtkPolygonsPainter_h
-#define __vtkPolygonsPainter_h
+#ifndef vtkPolygonsPainter_h
+#define vtkPolygonsPainter_h
 
 #include "vtkRenderingOpenGLModule.h" // For export macro
 #include "vtkPrimitivePainter.h"
diff --git a/Rendering/OpenGL/vtkPrimitivePainter.h b/Rendering/OpenGL/vtkPrimitivePainter.h
index c4f69e0c6024717574145087355ea031316d953c..68fc3b354cec4251b1d1690f7f16c2939cd487a5 100644
--- a/Rendering/OpenGL/vtkPrimitivePainter.h
+++ b/Rendering/OpenGL/vtkPrimitivePainter.h
@@ -23,8 +23,8 @@
 // Support for generic vertex attributes in VTK was contributed in
 // collaboration with Stephane Ploix at EDF.
 
-#ifndef __vtkPrimitivePainter_h
-#define __vtkPrimitivePainter_h
+#ifndef vtkPrimitivePainter_h
+#define vtkPrimitivePainter_h
 
 #include "vtkRenderingOpenGLModule.h" // For export macro
 #include "vtkPolyDataPainter.h"
diff --git a/Rendering/OpenGL/vtkRenderPass.h b/Rendering/OpenGL/vtkRenderPass.h
index 8d7666a3136da2aae575268ff0fd7e154666be42..42cbd5c55c56e55a5767ab16ade52957a2079eb6 100644
--- a/Rendering/OpenGL/vtkRenderPass.h
+++ b/Rendering/OpenGL/vtkRenderPass.h
@@ -39,8 +39,8 @@
 // .SECTION See Also
 // vtkRenderState vtkRenderer
 
-#ifndef __vtkRenderPass_h
-#define __vtkRenderPass_h
+#ifndef vtkRenderPass_h
+#define vtkRenderPass_h
 
 #include "vtkRenderingOpenGLModule.h" // For export macro
 #include "vtkObject.h"
diff --git a/Rendering/OpenGL/vtkRenderPassCollection.h b/Rendering/OpenGL/vtkRenderPassCollection.h
index 967d7832c95a074c88a3d88afe856071f926d312..c443664b448d890b68170765235cf609486ea714 100644
--- a/Rendering/OpenGL/vtkRenderPassCollection.h
+++ b/Rendering/OpenGL/vtkRenderPassCollection.h
@@ -21,8 +21,8 @@
 // .SECTION see also
 // vtkRenderPass vtkCollection
 
-#ifndef __vtkRenderPassCollection_h
-#define __vtkRenderPassCollection_h
+#ifndef vtkRenderPassCollection_h
+#define vtkRenderPassCollection_h
 
 #include "vtkRenderingOpenGLModule.h" // For export macro
 #include "vtkCollection.h"
diff --git a/Rendering/OpenGL/vtkRenderState.h b/Rendering/OpenGL/vtkRenderState.h
index 44dea7cc6e1fa4567ab818d53250c7f920406aa0..51b4f6301caa74f581cfbf06c8e12e36bb09283d 100644
--- a/Rendering/OpenGL/vtkRenderState.h
+++ b/Rendering/OpenGL/vtkRenderState.h
@@ -23,8 +23,8 @@
 // .SECTION See Also
 // vtkRenderPass vtkRenderer vtkFrameBufferObject vtkProp
 
-#ifndef __vtkRenderState_h
-#define __vtkRenderState_h
+#ifndef vtkRenderState_h
+#define vtkRenderState_h
 
 #include "vtkRenderingOpenGLModule.h" // For export macro
 #include "vtkObject.h"
diff --git a/Rendering/OpenGL/vtkRenderbuffer.h b/Rendering/OpenGL/vtkRenderbuffer.h
index 85359c212422a6ba8d5743d92103b47cc3baee39..16a1aba17d837b2a83abddd5cfeeeb831476ee0f 100644
--- a/Rendering/OpenGL/vtkRenderbuffer.h
+++ b/Rendering/OpenGL/vtkRenderbuffer.h
@@ -15,8 +15,8 @@
 // .NAME vtkRenderbuffer - Storage for FBO's
 // .SECTION Description
 // Lightweight API to OpenGL Framebuffer Object EXT renderbuffers.
-#ifndef __vtkRenderbuffer_h
-#define __vtkRenderbuffer_h
+#ifndef vtkRenderbuffer_h
+#define vtkRenderbuffer_h
 
 #include "vtkObject.h"
 #include "vtkRenderingOpenGLModule.h" // for export macro
diff --git a/Rendering/OpenGL/vtkRepresentationPainter.h b/Rendering/OpenGL/vtkRepresentationPainter.h
index 8acde1e96906fe8ca6d6fbb1c2977b7d0fe68c07..5bdccf6d25565f619019ade52c5c7fd6b784da30 100644
--- a/Rendering/OpenGL/vtkRepresentationPainter.h
+++ b/Rendering/OpenGL/vtkRepresentationPainter.h
@@ -18,8 +18,8 @@
 // Subclasses will change the polygon rendering mode dependent on
 // the graphics library.
 
-#ifndef __vtkRepresentationPainter_h
-#define __vtkRepresentationPainter_h
+#ifndef vtkRepresentationPainter_h
+#define vtkRepresentationPainter_h
 
 #include "vtkRenderingOpenGLModule.h" // For export macro
 #include "vtkPolyDataPainter.h"
diff --git a/Rendering/OpenGL/vtkScalarsToColorsPainter.h b/Rendering/OpenGL/vtkScalarsToColorsPainter.h
index 8c1ff39f6fd01ef98656b87aba8e58e3f6fc3128..7dee3692b66af333075cb43d03514e95b5a980c0 100644
--- a/Rendering/OpenGL/vtkScalarsToColorsPainter.h
+++ b/Rendering/OpenGL/vtkScalarsToColorsPainter.h
@@ -19,8 +19,8 @@
 // colors. It enable/disables coloring state depending on the ScalarMode.
 // This painter is composite dataset enabled.
 
-#ifndef __vtkScalarsToColorsPainter_h
-#define __vtkScalarsToColorsPainter_h
+#ifndef vtkScalarsToColorsPainter_h
+#define vtkScalarsToColorsPainter_h
 
 #include "vtkRenderingOpenGLModule.h" // For export macro
 #include "vtkPainter.h"
diff --git a/Rendering/OpenGL/vtkSequencePass.h b/Rendering/OpenGL/vtkSequencePass.h
index 245bbca6b4ac84a37db32b54554d0780a36b77dd..2c1d53f70fe74d5e7ddb87d54724641db7ff35b6 100644
--- a/Rendering/OpenGL/vtkSequencePass.h
+++ b/Rendering/OpenGL/vtkSequencePass.h
@@ -24,8 +24,8 @@
 // .SECTION See Also
 // vtkRenderPass
 
-#ifndef __vtkSequencePass_h
-#define __vtkSequencePass_h
+#ifndef vtkSequencePass_h
+#define vtkSequencePass_h
 
 #include "vtkRenderingOpenGLModule.h" // For export macro
 #include "vtkRenderPass.h"
diff --git a/Rendering/OpenGL/vtkShader2.h b/Rendering/OpenGL/vtkShader2.h
index d9d77238ca2b49ed2f2e22db31f5d8a30db50592..260f00b3b5ea943e54a39198c7c98f79a6839cbb 100644
--- a/Rendering/OpenGL/vtkShader2.h
+++ b/Rendering/OpenGL/vtkShader2.h
@@ -33,8 +33,8 @@
 // .SECTION See Also
 // vtkShaderProgram2
 
-#ifndef __vtkShader2_h
-#define __vtkShader2_h
+#ifndef vtkShader2_h
+#define vtkShader2_h
 
 #include "vtkWeakPointer.h" // for ren context
 #include "vtkRenderingOpenGLModule.h" // For export macro
diff --git a/Rendering/OpenGL/vtkShader2Collection.h b/Rendering/OpenGL/vtkShader2Collection.h
index fb8bde39ff10e2e0050aa2153040a32eb8b3e2ec..91a3aa6376d9a349b9fc233f78f85c4e2535270d 100644
--- a/Rendering/OpenGL/vtkShader2Collection.h
+++ b/Rendering/OpenGL/vtkShader2Collection.h
@@ -21,8 +21,8 @@
 // .SECTION see also
 // vtkShader2 vtkCollection
 
-#ifndef __vtkShader2Collection_h
-#define __vtkShader2Collection_h
+#ifndef vtkShader2Collection_h
+#define vtkShader2Collection_h
 
 #include "vtkRenderingOpenGLModule.h" // For export macro
 #include "vtkCollection.h"
diff --git a/Rendering/OpenGL/vtkShaderProgram2.h b/Rendering/OpenGL/vtkShaderProgram2.h
index 71ea1c3b07e861885504d49c8cd5d7d0ec448340..f166c47873051abdf1df84592d7aa3fd185cd15a 100644
--- a/Rendering/OpenGL/vtkShaderProgram2.h
+++ b/Rendering/OpenGL/vtkShaderProgram2.h
@@ -19,8 +19,8 @@
 // piece of source code associated with one of the shader units (vertex,
 // fragment, geometry).
 
-#ifndef __vtkShaderProgram2_h
-#define __vtkShaderProgram2_h
+#ifndef vtkShaderProgram2_h
+#define vtkShaderProgram2_h
 
 #include <cassert> // for templated functions
 #include "vtkRenderingOpenGLModule.h" // for export macro
diff --git a/Rendering/OpenGL/vtkShadowMapBakerPass.h b/Rendering/OpenGL/vtkShadowMapBakerPass.h
index 6da337e8badd8f4a1f559ceec8e07201136b38f7..dd1ac34aa7d62845391f3896d8b7842c8d86d304 100644
--- a/Rendering/OpenGL/vtkShadowMapBakerPass.h
+++ b/Rendering/OpenGL/vtkShadowMapBakerPass.h
@@ -37,8 +37,8 @@
 // .SECTION See Also
 // vtkRenderPass, vtkOpaquePass, vtkShadowMapPass
 
-#ifndef __vtkShadowMapBakerPass_h
-#define __vtkShadowMapBakerPass_h
+#ifndef vtkShadowMapBakerPass_h
+#define vtkShadowMapBakerPass_h
 
 #include "vtkRenderingOpenGLModule.h" // For export macro
 #include "vtkRenderPass.h"
diff --git a/Rendering/OpenGL/vtkShadowMapPass.h b/Rendering/OpenGL/vtkShadowMapPass.h
index 13e5dd13e7273fdf09a2eeeaddfad12bb2ebb823..7da76375bc0a69eb3028fcef3d8f45690b02911f 100644
--- a/Rendering/OpenGL/vtkShadowMapPass.h
+++ b/Rendering/OpenGL/vtkShadowMapPass.h
@@ -35,8 +35,8 @@
 // .SECTION See Also
 // vtkRenderPass, vtkOpaquePass
 
-#ifndef __vtkShadowMapPass_h
-#define __vtkShadowMapPass_h
+#ifndef vtkShadowMapPass_h
+#define vtkShadowMapPass_h
 
 #include "vtkRenderingOpenGLModule.h" // For export macro
 #include "vtkRenderPass.h"
diff --git a/Rendering/OpenGL/vtkShadowMapPassInternal.h b/Rendering/OpenGL/vtkShadowMapPassInternal.h
index 8b5b35f1225d66e30dc66d893a0b5710cf10c381..5a304784935d2aa547bb3f8eb116c5768a6b0e8f 100644
--- a/Rendering/OpenGL/vtkShadowMapPassInternal.h
+++ b/Rendering/OpenGL/vtkShadowMapPassInternal.h
@@ -16,8 +16,8 @@
 // These internal classes are shared by vtkShadowMapBakerPass and
 // vtkShadowMapPass.
 
-#ifndef __vtkShadowMapPassInternal_h
-#define __vtkShadowMapPassInternal_h
+#ifndef vtkShadowMapPassInternal_h
+#define vtkShadowMapPassInternal_h
 
 #include "vtkCamera.h"
 #include "vtkTextureObject.h"
diff --git a/Rendering/OpenGL/vtkSobelGradientMagnitudePass.h b/Rendering/OpenGL/vtkSobelGradientMagnitudePass.h
index 59fa68e854b23722dae6ada4e5df2ebf3697243c..5969486eefab0f7369408ad4bd2c66af992c3880 100644
--- a/Rendering/OpenGL/vtkSobelGradientMagnitudePass.h
+++ b/Rendering/OpenGL/vtkSobelGradientMagnitudePass.h
@@ -53,8 +53,8 @@
 // .SECTION See Also
 // vtkRenderPass
 
-#ifndef __vtkSobelGradientMagnitudePass_h
-#define __vtkSobelGradientMagnitudePass_h
+#ifndef vtkSobelGradientMagnitudePass_h
+#define vtkSobelGradientMagnitudePass_h
 
 #include "vtkRenderingOpenGLModule.h" // For export macro
 #include "vtkImageProcessingPass.h"
diff --git a/Rendering/OpenGL/vtkStandardPolyDataPainter.h b/Rendering/OpenGL/vtkStandardPolyDataPainter.h
index d0ba3340a9e08e127974276e53787eb4061244a3..603aef059e106fd14b2c9d8f6187728b8536fc93 100644
--- a/Rendering/OpenGL/vtkStandardPolyDataPainter.h
+++ b/Rendering/OpenGL/vtkStandardPolyDataPainter.h
@@ -35,8 +35,8 @@
 // collaboration with Stephane Ploix at EDF.
 
 
-#ifndef __vtkStandardPolyDataPainter_h
-#define __vtkStandardPolyDataPainter_h
+#ifndef vtkStandardPolyDataPainter_h
+#define vtkStandardPolyDataPainter_h
 
 #include "vtkRenderingOpenGLModule.h" // For export macro
 #include "vtkPolyDataPainter.h"
@@ -89,4 +89,4 @@ private:
 //ETX
 };
 
-#endif //__vtkStandardPolyDataPainter_h
+#endif //vtkStandardPolyDataPainter_h
diff --git a/Rendering/OpenGL/vtkTDxDevice.h b/Rendering/OpenGL/vtkTDxDevice.h
index 9919919c668d9e6c9e64eed8bd90278a988ef0f4..4d4d7025f06f4995b8a5111738ed865115bc3b91 100644
--- a/Rendering/OpenGL/vtkTDxDevice.h
+++ b/Rendering/OpenGL/vtkTDxDevice.h
@@ -23,8 +23,8 @@
 // .SECTION Caveats
 // THIS IS EXPERIMENTAL CODE. THE API MIGHT CHANGE.
 
-#ifndef __vtkTDxDevice_h
-#define __vtkTDxDevice_h
+#ifndef vtkTDxDevice_h
+#define vtkTDxDevice_h
 
 #include "vtkRenderingOpenGLModule.h" // For export macro
 #include "vtkObject.h"
diff --git a/Rendering/OpenGL/vtkTDxInteractorStyleGeo.h b/Rendering/OpenGL/vtkTDxInteractorStyleGeo.h
index 174e06d35d06be432ce50cd73951c0d7f0b994a5..fb76c618aa1b511aa6b22b1c47f1c487a3f78d9c 100644
--- a/Rendering/OpenGL/vtkTDxInteractorStyleGeo.h
+++ b/Rendering/OpenGL/vtkTDxInteractorStyleGeo.h
@@ -22,8 +22,8 @@
 // vtkInteractorStyle vtkRenderWindowInteractor
 // vtkTDxInteractorStyle
 
-#ifndef __vtkTDxInteractorStyleGeo_h
-#define __vtkTDxInteractorStyleGeo_h
+#ifndef vtkTDxInteractorStyleGeo_h
+#define vtkTDxInteractorStyleGeo_h
 
 #include "vtkRenderingOpenGLModule.h" // For export macro
 #include "vtkTDxInteractorStyle.h"
diff --git a/Rendering/OpenGL/vtkTDxMacDevice.h b/Rendering/OpenGL/vtkTDxMacDevice.h
index 810ba86ff0c85d33af625a331a29f5038253b48b..9e64d1459ece448bdd8c83f5d1b38028e3bfb69e 100644
--- a/Rendering/OpenGL/vtkTDxMacDevice.h
+++ b/Rendering/OpenGL/vtkTDxMacDevice.h
@@ -19,8 +19,8 @@
 // .SECTION See Also
 // vtkTDxDevice, vtkTDxUnixDevice, vtkTDxWinDevice
 
-#ifndef __vtkTDxMacDevice_h
-#define __vtkTDxMacDevice_h
+#ifndef vtkTDxMacDevice_h
+#define vtkTDxMacDevice_h
 
 #include "vtkRenderingOpenGLModule.h" // For export macro
 #include "vtkTDxDevice.h"
diff --git a/Rendering/OpenGL/vtkTDxUnixDevice.h b/Rendering/OpenGL/vtkTDxUnixDevice.h
index 1daa4598d5320ec30ed51221a59c4a19f1d482e3..a2f44c78c9b403f689c824bbc0ccd8e42b7ea17f 100644
--- a/Rendering/OpenGL/vtkTDxUnixDevice.h
+++ b/Rendering/OpenGL/vtkTDxUnixDevice.h
@@ -19,8 +19,8 @@
 // .SECTION See Also
 // vtkTDxDevice, vtkTDxWinDevice
 
-#ifndef __vtkTDxUnixDevice_h
-#define __vtkTDxUnixDevice_h
+#ifndef vtkTDxUnixDevice_h
+#define vtkTDxUnixDevice_h
 
 #include "vtkRenderingOpenGLModule.h" // For export macro
 #include "vtkTDxDevice.h"
diff --git a/Rendering/OpenGL/vtkTDxWinDevice.h b/Rendering/OpenGL/vtkTDxWinDevice.h
index 46882239ffe11fbc7a9207946a9332e32dd7a15a..85400fdc1f3dc8f9ab687a45f5b8faf932d91e15 100644
--- a/Rendering/OpenGL/vtkTDxWinDevice.h
+++ b/Rendering/OpenGL/vtkTDxWinDevice.h
@@ -19,8 +19,8 @@
 // .SECTION See Also
 // vtkTDxDevice, vtkTDxWinDevice
 
-#ifndef __vtkTDxWinDevice_h
-#define __vtkTDxWinDevice_h
+#ifndef vtkTDxWinDevice_h
+#define vtkTDxWinDevice_h
 
 #include "vtkRenderingOpenGLModule.h" // For export macro
 #include "vtkTDxDevice.h"
diff --git a/Rendering/OpenGL/vtkTStripsPainter.h b/Rendering/OpenGL/vtkTStripsPainter.h
index 10581b223371629db11b7a4d9d5f16d90460bf01..26c83f7a135de5d2a30cc9821eb7b298aeb85d16 100644
--- a/Rendering/OpenGL/vtkTStripsPainter.h
+++ b/Rendering/OpenGL/vtkTStripsPainter.h
@@ -14,8 +14,8 @@
 =========================================================================*/
 // .NAME vtkTStripsPainter - painter for triangle strips.
 
-#ifndef __vtkTStripsPainter_h
-#define __vtkTStripsPainter_h
+#ifndef vtkTStripsPainter_h
+#define vtkTStripsPainter_h
 
 #include "vtkRenderingOpenGLModule.h" // For export macro
 #include "vtkPrimitivePainter.h"
diff --git a/Rendering/OpenGL/vtkTextureObject.h b/Rendering/OpenGL/vtkTextureObject.h
index df250fab3dbc418d2cd9ad70f096cdc31d35f1f2..e058f942585510ec71e92230669b81ebb789afb4 100644
--- a/Rendering/OpenGL/vtkTextureObject.h
+++ b/Rendering/OpenGL/vtkTextureObject.h
@@ -19,8 +19,8 @@
 // also be used to create textures without uploading any data.
 // .SECTION Caveats
 // DON'T PLAY WITH IT YET.
-#ifndef __vtkTextureObject_h
-#define __vtkTextureObject_h
+#ifndef vtkTextureObject_h
+#define vtkTextureObject_h
 
 #include "vtkRenderingOpenGLModule.h" // For export macro
 #include "vtkObject.h"
diff --git a/Rendering/OpenGL/vtkTextureUnitManager.h b/Rendering/OpenGL/vtkTextureUnitManager.h
index dce642069663892f2a8e8cd8671bc42eec166e10..aae92bb9e7231948e062a28c5c368923ddc922b9 100644
--- a/Rendering/OpenGL/vtkTextureUnitManager.h
+++ b/Rendering/OpenGL/vtkTextureUnitManager.h
@@ -24,8 +24,8 @@
 // .SECTION See Also
 // vtkOpenGLRenderWindow
 
-#ifndef __vtkTextureUnitManager_h
-#define __vtkTextureUnitManager_h
+#ifndef vtkTextureUnitManager_h
+#define vtkTextureUnitManager_h
 
 #include "vtkRenderingOpenGLModule.h" // For export macro
 #include "vtkObject.h"
diff --git a/Rendering/OpenGL/vtkTranslucentPass.h b/Rendering/OpenGL/vtkTranslucentPass.h
index 35d63f82dcce3481bd593344240adbc4b16d747e..186c2c7a702d7f552607639bbdf9b1b36611def1 100644
--- a/Rendering/OpenGL/vtkTranslucentPass.h
+++ b/Rendering/OpenGL/vtkTranslucentPass.h
@@ -25,8 +25,8 @@
 // .SECTION See Also
 // vtkRenderPass vtkDefaultPass
 
-#ifndef __vtkTranslucentPass_h
-#define __vtkTranslucentPass_h
+#ifndef vtkTranslucentPass_h
+#define vtkTranslucentPass_h
 
 #include "vtkRenderingOpenGLModule.h" // For export macro
 #include "vtkDefaultPass.h"
diff --git a/Rendering/OpenGL/vtkUniformVariables.h b/Rendering/OpenGL/vtkUniformVariables.h
index 4f4956ab3e9e431dabdbde5c24adf40009acbe2e..4899db086d559240de0b26920451ee181d8f0157 100644
--- a/Rendering/OpenGL/vtkUniformVariables.h
+++ b/Rendering/OpenGL/vtkUniformVariables.h
@@ -21,8 +21,8 @@
 // .SECTION See Also
 // vtkShader2 vtkShaderProgram2
 
-#ifndef __vtkUniformVariables_h
-#define __vtkUniformVariables_h
+#ifndef vtkUniformVariables_h
+#define vtkUniformVariables_h
 
 #include "vtkRenderingOpenGLModule.h" // For export macro
 #include "vtkObject.h"
diff --git a/Rendering/OpenGL/vtkValuePainter.h b/Rendering/OpenGL/vtkValuePainter.h
index 8feb0fdf2e64767cd3ace20314b9e874cb3b8cc2..84ce1ffcd3b2caf164d5c8ea2a12bcee26bd971b 100644
--- a/Rendering/OpenGL/vtkValuePainter.h
+++ b/Rendering/OpenGL/vtkValuePainter.h
@@ -22,8 +22,8 @@
 // .SECTION See Also
 // vtkValuePass, vtkValuePasses
 
-#ifndef __vtkValuePainter_h
-#define __vtkValuePainter_h
+#ifndef vtkValuePainter_h
+#define vtkValuePainter_h
 
 #include "vtkRenderingOpenGLModule.h" // For export macro
 #include "vtkStandardPolyDataPainter.h"
diff --git a/Rendering/OpenGL/vtkValuePass.h b/Rendering/OpenGL/vtkValuePass.h
index 3b9697e47528306a2ae127e92ef843c2a1e55251..ddf368fa893fa92939ee7442b666b85a6b685bb9 100644
--- a/Rendering/OpenGL/vtkValuePass.h
+++ b/Rendering/OpenGL/vtkValuePass.h
@@ -19,8 +19,8 @@
 // .SECTION See Also
 // vtkValuePainter, vtkValuePass
 
-#ifndef __vtkValuePass_h
-#define __vtkValuePass_h
+#ifndef vtkValuePass_h
+#define vtkValuePass_h
 
 #include "vtkRenderingOpenGLModule.h" // For export macro
 #include "vtkOpaquePass.h"
diff --git a/Rendering/OpenGL/vtkValuePasses.h b/Rendering/OpenGL/vtkValuePasses.h
index 9b12b4ec1e30e88e3ba0f60ed143f53870a7b279..0b4da5997b3b3f8ae54486e72c714402e952672f 100644
--- a/Rendering/OpenGL/vtkValuePasses.h
+++ b/Rendering/OpenGL/vtkValuePasses.h
@@ -22,8 +22,8 @@
 // .SECTION See Also
 // vtkClearRGBPass, vtkValuePass, vtkValuePainter
 
-#ifndef __vtkValuePasses_h
-#define __vtkValuePasses_h
+#ifndef vtkValuePasses_h
+#define vtkValuePasses_h
 
 #include "vtkRenderingOpenGLModule.h" // For export macro
 #include "vtkRenderPass.h"
diff --git a/Rendering/OpenGL/vtkVolumetricPass.h b/Rendering/OpenGL/vtkVolumetricPass.h
index 1d865588ed813edcdf3008d0abedd2d89d96a3fa..b433fe17100ba3e108eafe6f1cfbff80d17178b8 100644
--- a/Rendering/OpenGL/vtkVolumetricPass.h
+++ b/Rendering/OpenGL/vtkVolumetricPass.h
@@ -25,8 +25,8 @@
 // .SECTION See Also
 // vtkRenderPass vtkDefaultPass
 
-#ifndef __vtkVolumetricPass_h
-#define __vtkVolumetricPass_h
+#ifndef vtkVolumetricPass_h
+#define vtkVolumetricPass_h
 
 #include "vtkRenderingOpenGLModule.h" // For export macro
 #include "vtkDefaultPass.h"
diff --git a/Rendering/OpenGL/vtkWin32OpenGLRenderWindow.h b/Rendering/OpenGL/vtkWin32OpenGLRenderWindow.h
index c5c6093e8d287117c8af742e1edfc29984e98345..6bb24fde0fa9df3529bd02ef9cc054a13d1ab59b 100644
--- a/Rendering/OpenGL/vtkWin32OpenGLRenderWindow.h
+++ b/Rendering/OpenGL/vtkWin32OpenGLRenderWindow.h
@@ -18,8 +18,8 @@
 // class vtkRenderWindow. vtkWin32OpenGLRenderer interfaces to the standard
 // OpenGL graphics library in the Windows environment.
 
-#ifndef __vtkWin32OpenGLRenderWindow_h
-#define __vtkWin32OpenGLRenderWindow_h
+#ifndef vtkWin32OpenGLRenderWindow_h
+#define vtkWin32OpenGLRenderWindow_h
 
 #include "vtkRenderingOpenGLModule.h" // For export macro
 #include "vtkOpenGLRenderWindow.h"
diff --git a/Rendering/OpenGL/vtkWin32RenderWindowInteractor.h b/Rendering/OpenGL/vtkWin32RenderWindowInteractor.h
index c407058c7f80d7d9b6d926c2c353e8fc503e63d2..c8c7c4c153e13b44b67843a48c90c4388a612738 100644
--- a/Rendering/OpenGL/vtkWin32RenderWindowInteractor.h
+++ b/Rendering/OpenGL/vtkWin32RenderWindowInteractor.h
@@ -23,8 +23,8 @@
 // messages into the event bindings by setting InstallMessageProc to false.
 // This provides a minimal "Mapped" mode of interaction
 //
-#ifndef __vtkWin32RenderWindowInteractor_h
-#define __vtkWin32RenderWindowInteractor_h
+#ifndef vtkWin32RenderWindowInteractor_h
+#define vtkWin32RenderWindowInteractor_h
 
 #include "vtkRenderingOpenGLModule.h" // For export macro
 #include "vtkRenderWindowInteractor.h"
diff --git a/Rendering/OpenGL/vtkXGPUInfoList.h b/Rendering/OpenGL/vtkXGPUInfoList.h
index 47d7dc4886c2deab1bd94f2326d092e9160c3078..0eaa0de88177b75b160769d547f9db969997cb33 100644
--- a/Rendering/OpenGL/vtkXGPUInfoList.h
+++ b/Rendering/OpenGL/vtkXGPUInfoList.h
@@ -22,8 +22,8 @@
 // .SECTION See Also
 // vtkGPUInfo vtkGPUInfoList
 
-#ifndef __vtkXGPUInfoList_h
-#define __vtkXGPUInfoList_h
+#ifndef vtkXGPUInfoList_h
+#define vtkXGPUInfoList_h
 
 #include "vtkRenderingOpenGLModule.h" // For export macro
 #include "vtkGPUInfoList.h"
diff --git a/Rendering/OpenGL/vtkXOpenGLRenderWindow.h b/Rendering/OpenGL/vtkXOpenGLRenderWindow.h
index 23aaca600cfdef96a764885884bca315fec81e3f..8c0e9db0ea01ec8af5f403ab826657b067df030d 100644
--- a/Rendering/OpenGL/vtkXOpenGLRenderWindow.h
+++ b/Rendering/OpenGL/vtkXOpenGLRenderWindow.h
@@ -19,8 +19,8 @@
 // library. Application programmers should normally use vtkRenderWindow
 // instead of the OpenGL specific version.
 
-#ifndef __vtkXOpenGLRenderWindow_h
-#define __vtkXOpenGLRenderWindow_h
+#ifndef vtkXOpenGLRenderWindow_h
+#define vtkXOpenGLRenderWindow_h
 
 #include "vtkRenderingOpenGLModule.h" // For export macro
 #include "vtkOpenGLRenderWindow.h"
diff --git a/Rendering/OpenGL/vtkXRenderWindowInteractor.h b/Rendering/OpenGL/vtkXRenderWindowInteractor.h
index 11de16fff64e4346b931d748df786066b2b1a287..9bd0959fe0b2bf9e8056177fe7ce8d1225d1f7a8 100644
--- a/Rendering/OpenGL/vtkXRenderWindowInteractor.h
+++ b/Rendering/OpenGL/vtkXRenderWindowInteractor.h
@@ -27,8 +27,8 @@
 // the basic structure and if you're lucky it might even work!
 // but frankly I doubt it
 
-#ifndef __vtkXRenderWindowInteractor_h
-#define __vtkXRenderWindowInteractor_h
+#ifndef vtkXRenderWindowInteractor_h
+#define vtkXRenderWindowInteractor_h
 
 //===========================================================
 // now we define the C++ class
diff --git a/Rendering/OpenGL/vtkXRenderWindowTclInteractor.h b/Rendering/OpenGL/vtkXRenderWindowTclInteractor.h
index 9a134882151038da2e6e53881ea5b9212f8d88a4..64572d441b1438cec199c8560072c8c1dda26b12 100644
--- a/Rendering/OpenGL/vtkXRenderWindowTclInteractor.h
+++ b/Rendering/OpenGL/vtkXRenderWindowTclInteractor.h
@@ -23,8 +23,8 @@
 // .SECTION see also
 // vtkRenderWindowInteractor vtkXRenderWindowInteractor vtkXRenderWindow
 
-#ifndef __vtkXRenderWindowTclInteractor_h
-#define __vtkXRenderWindowTclInteractor_h
+#ifndef vtkXRenderWindowTclInteractor_h
+#define vtkXRenderWindowTclInteractor_h
 
 #include "vtkRenderingOpenGLModule.h" // For export macro
 #include "vtkXRenderWindowInteractor.h"
diff --git a/Rendering/OpenGL2/vtkAndroidRenderWindowInteractor.h b/Rendering/OpenGL2/vtkAndroidRenderWindowInteractor.h
index d77ee66fd37628faa3375f01a97d98be8071c6b2..7dd8773d187c7a7419a93d67ba662b26b5e3ecde 100644
--- a/Rendering/OpenGL2/vtkAndroidRenderWindowInteractor.h
+++ b/Rendering/OpenGL2/vtkAndroidRenderWindowInteractor.h
@@ -23,8 +23,8 @@
 // messages into the event bindings by setting InstallMessageProc to false.
 // This provides a minimal "Mapped" mode of interaction
 //
-#ifndef __vtkAndroidRenderWindowInteractor_h
-#define __vtkAndroidRenderWindowInteractor_h
+#ifndef vtkAndroidRenderWindowInteractor_h
+#define vtkAndroidRenderWindowInteractor_h
 
 #include "vtkRenderingOpenGL2Module.h" // For export macro
 #include "vtkRenderWindowInteractor.h"
diff --git a/Rendering/OpenGL2/vtkCameraPass.h b/Rendering/OpenGL2/vtkCameraPass.h
index 9621fc41b3960db105fd60280597c721cc4e9219..b09f57b1639eae2b0b356508c4c21cdeb81cecd3 100644
--- a/Rendering/OpenGL2/vtkCameraPass.h
+++ b/Rendering/OpenGL2/vtkCameraPass.h
@@ -26,8 +26,8 @@
 // .SECTION See Also
 // vtkRenderPass
 
-#ifndef __vtkCameraPass_h
-#define __vtkCameraPass_h
+#ifndef vtkCameraPass_h
+#define vtkCameraPass_h
 
 #include "vtkRenderingOpenGL2Module.h" // For export macro
 #include "vtkRenderPass.h"
diff --git a/Rendering/OpenGL2/vtkClearRGBPass.h b/Rendering/OpenGL2/vtkClearRGBPass.h
index 3dab1e147d2c44ac5bc25f2659846cd0af2db8ab..f337c038641b3f9af6c8ba621e3157a788cf64c8 100644
--- a/Rendering/OpenGL2/vtkClearRGBPass.h
+++ b/Rendering/OpenGL2/vtkClearRGBPass.h
@@ -19,8 +19,8 @@
 // .SECTION See Also
 // vtkValuePasses
 
-#ifndef __vtkClearRGBPass_h
-#define __vtkClearRGBPass_h
+#ifndef vtkClearRGBPass_h
+#define vtkClearRGBPass_h
 
 #include "vtkRenderingOpenGL2Module.h" // For export macro
 #include "vtkRenderPass.h"
diff --git a/Rendering/OpenGL2/vtkClearZPass.h b/Rendering/OpenGL2/vtkClearZPass.h
index 1abfd9e6b743f613f214c9b9880c4dfc6ca67dd1..c9a97d8ef5f26de61c216b458350d31784e3747a 100644
--- a/Rendering/OpenGL2/vtkClearZPass.h
+++ b/Rendering/OpenGL2/vtkClearZPass.h
@@ -19,8 +19,8 @@
 // .SECTION See Also
 // vtkRenderPass
 
-#ifndef __vtkClearZPass_h
-#define __vtkClearZPass_h
+#ifndef vtkClearZPass_h
+#define vtkClearZPass_h
 
 #include "vtkRenderingOpenGL2Module.h" // For export macro
 #include "vtkRenderPass.h"
diff --git a/Rendering/OpenGL2/vtkCocoaGLView.h b/Rendering/OpenGL2/vtkCocoaGLView.h
index f02a4aefefc65cc613bc3faeacf93c1e392bca7b..fb9e792b82417737662a3310e62a0e2e56f1f3e0 100644
--- a/Rendering/OpenGL2/vtkCocoaGLView.h
+++ b/Rendering/OpenGL2/vtkCocoaGLView.h
@@ -34,8 +34,8 @@
 // .SECTION See Also
 // vtkCocoaRenderWindow vtkCocoaRenderWindowInteractor
 
-#ifndef __vtkCocoaGLView_h
-#define __vtkCocoaGLView_h
+#ifndef vtkCocoaGLView_h
+#define vtkCocoaGLView_h
 
 #import <Cocoa/Cocoa.h>
 
@@ -70,5 +70,5 @@
 
 @end
 
-#endif /* __vtkCocoaGLView_h */
+#endif /* vtkCocoaGLView_h */
 // VTK-HeaderTest-Exclude: vtkCocoaGLView.h
diff --git a/Rendering/OpenGL2/vtkCocoaRenderWindow.h b/Rendering/OpenGL2/vtkCocoaRenderWindow.h
index b8a5ad5e8c02674dbf3700777db12632bafc8df0..ba9538583f51e1dbe5199129feb34ee5cfc7a9f1 100644
--- a/Rendering/OpenGL2/vtkCocoaRenderWindow.h
+++ b/Rendering/OpenGL2/vtkCocoaRenderWindow.h
@@ -37,8 +37,8 @@ PURPOSE.  See the above copyright notice for more information.
 // That means no Objective-C may be used. That's why some instance variables
 // are void* instead of what they really should be.
 
-#ifndef __vtkCocoaRenderWindow_h
-#define __vtkCocoaRenderWindow_h
+#ifndef vtkCocoaRenderWindow_h
+#define vtkCocoaRenderWindow_h
 
 #include "vtkRenderingOpenGL2Module.h" // For export macro
 #include "vtkOpenGLRenderWindow.h"
diff --git a/Rendering/OpenGL2/vtkCocoaRenderWindowInteractor.h b/Rendering/OpenGL2/vtkCocoaRenderWindowInteractor.h
index 0402352ea49dc67d3a7d7bb7f277c3ca7bdcfaf9..994ec89cbc659a72c205f82fe4fba0d6b31f6172 100644
--- a/Rendering/OpenGL2/vtkCocoaRenderWindowInteractor.h
+++ b/Rendering/OpenGL2/vtkCocoaRenderWindowInteractor.h
@@ -27,8 +27,8 @@
 // files.  That means no Objective C may be used. That's why some instance
 // variables are void* instead of what they really should be.
 
-#ifndef __vtkCocoaRenderWindowInteractor_h
-#define __vtkCocoaRenderWindowInteractor_h
+#ifndef vtkCocoaRenderWindowInteractor_h
+#define vtkCocoaRenderWindowInteractor_h
 
 #include "vtkRenderingOpenGL2Module.h" // For export macro
 #include "vtkRenderWindowInteractor.h"
diff --git a/Rendering/OpenGL2/vtkCompositePolyDataMapper2.h b/Rendering/OpenGL2/vtkCompositePolyDataMapper2.h
index af51b2494a3f05cc5c7aa44e2ab5d5ff08cc0ed9..2df356e9409f3461c5cfd8887b830f2a3038c272 100644
--- a/Rendering/OpenGL2/vtkCompositePolyDataMapper2.h
+++ b/Rendering/OpenGL2/vtkCompositePolyDataMapper2.h
@@ -19,8 +19,8 @@
 // that instead of creating individual mapper for each block in the composite
 // dataset, it iterates over the blocks internally.
 
-#ifndef __vtkCompositePolyDataMapper2_h
-#define __vtkCompositePolyDataMapper2_h
+#ifndef vtkCompositePolyDataMapper2_h
+#define vtkCompositePolyDataMapper2_h
 
 #include "vtkRenderingOpenGL2Module.h" // For export macro
 #include "vtkSmartPointer.h" // for vtkSmartPointer
diff --git a/Rendering/OpenGL2/vtkDefaultPass.h b/Rendering/OpenGL2/vtkDefaultPass.h
index 7454b1ed5e4bb1746923cf1e594cfe4a9f66ba05..0e30a34b63aaeac788aeb568877c97a8fa77c63f 100644
--- a/Rendering/OpenGL2/vtkDefaultPass.h
+++ b/Rendering/OpenGL2/vtkDefaultPass.h
@@ -28,8 +28,8 @@
 // .SECTION See Also
 // vtkRenderPass
 
-#ifndef __vtkDefaultPass_h
-#define __vtkDefaultPass_h
+#ifndef vtkDefaultPass_h
+#define vtkDefaultPass_h
 
 #include "vtkRenderingOpenGL2Module.h" // For export macro
 #include "vtkRenderPass.h"
diff --git a/Rendering/OpenGL2/vtkDepthPeelingPass.h b/Rendering/OpenGL2/vtkDepthPeelingPass.h
index b17f12ab0b0568795773380c1ad118065a5466f8..1ccae0c6ee733dec892c353e170d5ccb5951ff98 100644
--- a/Rendering/OpenGL2/vtkDepthPeelingPass.h
+++ b/Rendering/OpenGL2/vtkDepthPeelingPass.h
@@ -33,8 +33,8 @@
 // .SECTION See Also
 // vtkRenderPass, vtkTranslucentPass
 
-#ifndef __vtkDepthPeelingPass_h
-#define __vtkDepthPeelingPass_h
+#ifndef vtkDepthPeelingPass_h
+#define vtkDepthPeelingPass_h
 
 #include "vtkRenderingOpenGL2Module.h" // For export macro
 #include "vtkRenderPass.h"
diff --git a/Rendering/OpenGL2/vtkDummyGPUInfoList.h b/Rendering/OpenGL2/vtkDummyGPUInfoList.h
index 6f7e16b5aee4b7f082e7f302a4168a7118bf0124..af0cc22728f622359347ebe9a9c0d2a250fe9fa8 100644
--- a/Rendering/OpenGL2/vtkDummyGPUInfoList.h
+++ b/Rendering/OpenGL2/vtkDummyGPUInfoList.h
@@ -20,8 +20,8 @@
 // .SECTION See Also
 // vtkGPUInfo vtkGPUInfoList
 
-#ifndef __vtkDummyGPUInfoList_h
-#define __vtkDummyGPUInfoList_h
+#ifndef vtkDummyGPUInfoList_h
+#define vtkDummyGPUInfoList_h
 
 #include "vtkRenderingOpenGL2Module.h" // For export macro
 #include "vtkGPUInfoList.h"
diff --git a/Rendering/OpenGL2/vtkEGLRenderWindow.h b/Rendering/OpenGL2/vtkEGLRenderWindow.h
index b916d6f1994a2bf6ed93376ca7188049480c922f..653d302c0e895eae5147ae7064aa4bfe0cc2eae5 100644
--- a/Rendering/OpenGL2/vtkEGLRenderWindow.h
+++ b/Rendering/OpenGL2/vtkEGLRenderWindow.h
@@ -19,8 +19,8 @@
 // library. Application programmers should normally use vtkRenderWindow
 // instead of the OpenGL specific version.
 
-#ifndef __vtkEGLRenderWindow_h
-#define __vtkEGLRenderWindow_h
+#ifndef vtkEGLRenderWindow_h
+#define vtkEGLRenderWindow_h
 
 #include "vtkRenderingOpenGL2Module.h" // For export macro
 #include "vtkOpenGLRenderWindow.h"
diff --git a/Rendering/OpenGL2/vtkFrameBufferObject.h b/Rendering/OpenGL2/vtkFrameBufferObject.h
index 702a2a89a195c0990de64ec40ebc3854cf273fda..1526ea92463a6ecc612696aa7ea54bea2ca8ce46 100644
--- a/Rendering/OpenGL2/vtkFrameBufferObject.h
+++ b/Rendering/OpenGL2/vtkFrameBufferObject.h
@@ -22,8 +22,8 @@
 // DON'T PLAY WITH IT YET.
 // .SECTION See Also
 // vtkFrameBufferObject2, vtkRenderbufferObject
-#ifndef __vtkFrameBufferObject_h
-#define __vtkFrameBufferObject_h
+#ifndef vtkFrameBufferObject_h
+#define vtkFrameBufferObject_h
 
 #include "vtkObject.h"
 #include "vtkRenderingOpenGL2Module.h" // For export macro
diff --git a/Rendering/OpenGL2/vtkGaussianBlurPass.h b/Rendering/OpenGL2/vtkGaussianBlurPass.h
index a505eb2215d0cbadfbcc43d5efbe23e77175cb25..7b5f36e606c59fa63f5afb0d995f0e3769b508d5 100644
--- a/Rendering/OpenGL2/vtkGaussianBlurPass.h
+++ b/Rendering/OpenGL2/vtkGaussianBlurPass.h
@@ -43,8 +43,8 @@
 // .SECTION See Also
 // vtkRenderPass
 
-#ifndef __vtkGaussianBlurPass_h
-#define __vtkGaussianBlurPass_h
+#ifndef vtkGaussianBlurPass_h
+#define vtkGaussianBlurPass_h
 
 #include "vtkRenderingOpenGL2Module.h" // For export macro
 #include "vtkImageProcessingPass.h"
diff --git a/Rendering/OpenGL2/vtkIOSGLView.h b/Rendering/OpenGL2/vtkIOSGLView.h
index 551d229720d130c087ab9e518a6f89066b876500..af7682c9539209a81768ea8c9026684400c26a36 100644
--- a/Rendering/OpenGL2/vtkIOSGLView.h
+++ b/Rendering/OpenGL2/vtkIOSGLView.h
@@ -30,8 +30,8 @@
 // .SECTION See Also
 // vtkIOSRenderWindow
 
-#ifndef __vtkIOSGLView_h
-#define __vtkIOSGLView_h
+#ifndef vtkIOSGLView_h
+#define vtkIOSGLView_h
 
 #import <UIKit/UIKit.h>
 
@@ -66,5 +66,5 @@
 
 @end
 
-#endif /* __vtkIOSGLView_h */
+#endif /* vtkIOSGLView_h */
 // VTK-HeaderTest-Exclude: vtkIOSGLView.h
diff --git a/Rendering/OpenGL2/vtkIOSRenderWindow.h b/Rendering/OpenGL2/vtkIOSRenderWindow.h
index 4fab49e9e486b2736cbc14f86c1a54495afe488d..8601ffbea56eaf2f4c5d6b0c1205adb9591034cc 100644
--- a/Rendering/OpenGL2/vtkIOSRenderWindow.h
+++ b/Rendering/OpenGL2/vtkIOSRenderWindow.h
@@ -37,8 +37,8 @@ PURPOSE.  See the above copyright notice for more information.
 // That means no Objective-C may be used. That's why some instance variables
 // are void* instead of what they really should be.
 
-#ifndef __vtkIOSRenderWindow_h
-#define __vtkIOSRenderWindow_h
+#ifndef vtkIOSRenderWindow_h
+#define vtkIOSRenderWindow_h
 
 #include "vtkRenderingOpenGL2Module.h" // For export macro
 #include "vtkOpenGLRenderWindow.h"
diff --git a/Rendering/OpenGL2/vtkIOSRenderWindowInteractor.h b/Rendering/OpenGL2/vtkIOSRenderWindowInteractor.h
index 9579dd363bb4e9395eba63a1392ab6d56c7a5b80..d63941768352abeec7db001614d348061a198f44 100644
--- a/Rendering/OpenGL2/vtkIOSRenderWindowInteractor.h
+++ b/Rendering/OpenGL2/vtkIOSRenderWindowInteractor.h
@@ -23,8 +23,8 @@
 // That means no Objective C may be used. That's why some instance variables are
 // void* instead of what they really should be.
 
-#ifndef __vtkIOSRenderWindowInteractor_h
-#define __vtkIOSRenderWindowInteractor_h
+#ifndef vtkIOSRenderWindowInteractor_h
+#define vtkIOSRenderWindowInteractor_h
 
 #include "vtkRenderingOpenGL2Module.h" // For export macro
 #include "vtkRenderWindowInteractor.h"
diff --git a/Rendering/OpenGL2/vtkImageProcessingPass.h b/Rendering/OpenGL2/vtkImageProcessingPass.h
index 841aacb09735ecbd2d5456fa0a9914523b455455..db8e78a934300ae15c439ce88a9b7bce9f035a9a 100644
--- a/Rendering/OpenGL2/vtkImageProcessingPass.h
+++ b/Rendering/OpenGL2/vtkImageProcessingPass.h
@@ -22,8 +22,8 @@
 // .SECTION See Also
 // vtkRenderPass vtkGaussianBlurPass vtkSobelGradientMagnitudePass
 
-#ifndef __vtkImageProcessingPass_h
-#define __vtkImageProcessingPass_h
+#ifndef vtkImageProcessingPass_h
+#define vtkImageProcessingPass_h
 
 #include "vtkRenderingOpenGL2Module.h" // For export macro
 #include "vtkRenderPass.h"
diff --git a/Rendering/OpenGL2/vtkLightsPass.h b/Rendering/OpenGL2/vtkLightsPass.h
index 707ba04964843567480b6f1ee5127df139b0877b..9492da7a2ea58e941b3f01cfb0f4744788b3e482 100644
--- a/Rendering/OpenGL2/vtkLightsPass.h
+++ b/Rendering/OpenGL2/vtkLightsPass.h
@@ -23,8 +23,8 @@
 // .SECTION See Also
 // vtkRenderPass
 
-#ifndef __vtkLightsPass_h
-#define __vtkLightsPass_h
+#ifndef vtkLightsPass_h
+#define vtkLightsPass_h
 
 #include "vtkRenderingOpenGL2Module.h" // For export macro
 #include "vtkRenderPass.h"
diff --git a/Rendering/OpenGL2/vtkOSOpenGLRenderWindow.h b/Rendering/OpenGL2/vtkOSOpenGLRenderWindow.h
index b697634b4c090b193e36dc7874167a2acd26e479..3284f32900fd905eb4c1319ec929e7e73d364c5d 100644
--- a/Rendering/OpenGL2/vtkOSOpenGLRenderWindow.h
+++ b/Rendering/OpenGL2/vtkOSOpenGLRenderWindow.h
@@ -23,8 +23,8 @@
 // Application programmers should normally use vtkRenderWindow instead of the
 // OpenGL specific version.
 
-#ifndef __vtkOSOpenGLRenderWindow_h
-#define __vtkOSOpenGLRenderWindow_h
+#ifndef vtkOSOpenGLRenderWindow_h
+#define vtkOSOpenGLRenderWindow_h
 
 #include "vtkRenderingOpenGL2Module.h" // For export macro
 #include "vtkOpenGLRenderWindow.h"
diff --git a/Rendering/OpenGL2/vtkOpaquePass.h b/Rendering/OpenGL2/vtkOpaquePass.h
index 4a8a956dfbfea1102c37df16f1fa587ce2659225..58055064fd0fed83b221ea28b0872ef55513bb6c 100644
--- a/Rendering/OpenGL2/vtkOpaquePass.h
+++ b/Rendering/OpenGL2/vtkOpaquePass.h
@@ -25,8 +25,8 @@
 // .SECTION See Also
 // vtkRenderPass vtkDefaultPass
 
-#ifndef __vtkOpaquePass_h
-#define __vtkOpaquePass_h
+#ifndef vtkOpaquePass_h
+#define vtkOpaquePass_h
 
 #include "vtkRenderingOpenGL2Module.h" // For export macro
 #include "vtkDefaultPass.h"
diff --git a/Rendering/OpenGL2/vtkOpenGL.h b/Rendering/OpenGL2/vtkOpenGL.h
index ca506f9d09b3d169c5339aff9038d24f1e74a483..496344e05e355dc64ba2606776b0247e0a3852f8 100644
--- a/Rendering/OpenGL2/vtkOpenGL.h
+++ b/Rendering/OpenGL2/vtkOpenGL.h
@@ -12,8 +12,8 @@
      PURPOSE.  See the above copyright notice for more information.
 
 =========================================================================*/
-#ifndef __vtkOpenGL_h
-#define __vtkOpenGL_h
+#ifndef vtkOpenGL_h
+#define vtkOpenGL_h
 
 #include "vtkConfigure.h"
 
diff --git a/Rendering/OpenGL2/vtkOpenGLActor.h b/Rendering/OpenGL2/vtkOpenGLActor.h
index 706b168fca6111933c2e45febe11e06f7890ce52..f9209891a4e72db2e9bf0223f63732bb7a348042 100644
--- a/Rendering/OpenGL2/vtkOpenGLActor.h
+++ b/Rendering/OpenGL2/vtkOpenGLActor.h
@@ -17,8 +17,8 @@
 // vtkOpenGLActor is a concrete implementation of the abstract class vtkActor.
 // vtkOpenGLActor interfaces to the OpenGL rendering library.
 
-#ifndef __vtkOpenGLActor_h
-#define __vtkOpenGLActor_h
+#ifndef vtkOpenGLActor_h
+#define vtkOpenGLActor_h
 
 #include "vtkRenderingOpenGL2Module.h" // For export macro
 #include "vtkActor.h"
diff --git a/Rendering/OpenGL2/vtkOpenGLCamera.h b/Rendering/OpenGL2/vtkOpenGLCamera.h
index a46aa02774e60b270ecdcc57b3c33cbb4d2c1f9c..738f4117db17727842bdf7e7295deadde09f19b7 100644
--- a/Rendering/OpenGL2/vtkOpenGLCamera.h
+++ b/Rendering/OpenGL2/vtkOpenGLCamera.h
@@ -16,8 +16,8 @@
 // vtkOpenGLCamera is a concrete implementation of the abstract class
 // vtkCamera.  vtkOpenGLCamera interfaces to the OpenGL rendering library.
 
-#ifndef __vtkOpenGLCamera_h
-#define __vtkOpenGLCamera_h
+#ifndef vtkOpenGLCamera_h
+#define vtkOpenGLCamera_h
 
 #include "vtkRenderingOpenGL2Module.h" // For export macro
 #include "vtkCamera.h"
diff --git a/Rendering/OpenGL2/vtkOpenGLGlyph3DHelper.h b/Rendering/OpenGL2/vtkOpenGLGlyph3DHelper.h
index cbb4f9cc3e0f4c99d89a499e9b1524541e3e6a47..0d023c8c54a722bd0189195e4ecddc5c9a7d0c68 100644
--- a/Rendering/OpenGL2/vtkOpenGLGlyph3DHelper.h
+++ b/Rendering/OpenGL2/vtkOpenGLGlyph3DHelper.h
@@ -15,8 +15,8 @@
 // .SECTION Description
 // PolyDataMapper that uses a OpenGL to do the actual rendering.
 
-#ifndef __vtkOpenGLGlyph3DHelper_h
-#define __vtkOpenGLGlyph3DHelper_h
+#ifndef vtkOpenGLGlyph3DHelper_h
+#define vtkOpenGLGlyph3DHelper_h
 
 #include "vtkRenderingOpenGL2Module.h" // For export macro
 #include "vtkOpenGLPolyDataMapper.h"
diff --git a/Rendering/OpenGL2/vtkOpenGLGlyph3DMapper.h b/Rendering/OpenGL2/vtkOpenGLGlyph3DMapper.h
index b1644847e9d758a7df2c292efa54128df305e398..326bb6acc41ff743cd565caeee3403e84e02cd19 100644
--- a/Rendering/OpenGL2/vtkOpenGLGlyph3DMapper.h
+++ b/Rendering/OpenGL2/vtkOpenGLGlyph3DMapper.h
@@ -23,8 +23,8 @@
 // .SECTION See Also
 // vtkOpenGLGlyph3D
 
-#ifndef __vtkOpenGLGlyph3DMapper_h
-#define __vtkOpenGLGlyph3DMapper_h
+#ifndef vtkOpenGLGlyph3DMapper_h
+#define vtkOpenGLGlyph3DMapper_h
 
 #include "vtkRenderingOpenGL2Module.h" // For export macro
 #include "vtkGlyph3DMapper.h"
diff --git a/Rendering/OpenGL2/vtkOpenGLHardwareSelector.h b/Rendering/OpenGL2/vtkOpenGLHardwareSelector.h
index 353e9dee58b79bf5f2bc62460dbd3e6224f59a68..54759d29382def8fa911da538b542aec7a47f0fb 100644
--- a/Rendering/OpenGL2/vtkOpenGLHardwareSelector.h
+++ b/Rendering/OpenGL2/vtkOpenGLHardwareSelector.h
@@ -21,8 +21,8 @@
 // .SECTION See Also
 // vtkHardwareSelector
 
-#ifndef __vtkOpenGLHardwareSelector_h
-#define __vtkOpenGLHardwareSelector_h
+#ifndef vtkOpenGLHardwareSelector_h
+#define vtkOpenGLHardwareSelector_h
 
 #include "vtkRenderingOpenGL2Module.h" // For export macro
 #include "vtkHardwareSelector.h"
diff --git a/Rendering/OpenGL2/vtkOpenGLImageMapper.h b/Rendering/OpenGL2/vtkOpenGLImageMapper.h
index 5304f43893b0a81c7aab281febc478e600760a50..81cd793b4cfe3c8e0ea205222301213c83535d6c 100644
--- a/Rendering/OpenGL2/vtkOpenGLImageMapper.h
+++ b/Rendering/OpenGL2/vtkOpenGLImageMapper.h
@@ -24,8 +24,8 @@
 // .SECTION See Also
 // vtkImageMapper
 
-#ifndef __vtkOpenGLImageMapper_h
-#define __vtkOpenGLImageMapper_h
+#ifndef vtkOpenGLImageMapper_h
+#define vtkOpenGLImageMapper_h
 
 #include "vtkRenderingOpenGL2Module.h" // For export macro
 #include "vtkImageMapper.h"
diff --git a/Rendering/OpenGL2/vtkOpenGLImageSliceMapper.h b/Rendering/OpenGL2/vtkOpenGLImageSliceMapper.h
index 5165e36a3fffc625f405a21373b18df8d1f1260a..caf6a7cd315fb5299f867a4a4d4521896db64090 100644
--- a/Rendering/OpenGL2/vtkOpenGLImageSliceMapper.h
+++ b/Rendering/OpenGL2/vtkOpenGLImageSliceMapper.h
@@ -20,8 +20,8 @@
 // Thanks to David Gobbi at the Seaman Family MR Centre and Dept. of Clinical
 // Neurosciences, Foothills Medical Centre, Calgary, for providing this class.
 
-#ifndef __vtkOpenGLImageSliceMapper_h
-#define __vtkOpenGLImageSliceMapper_h
+#ifndef vtkOpenGLImageSliceMapper_h
+#define vtkOpenGLImageSliceMapper_h
 
 #include "vtkRenderingOpenGL2Module.h" // For export macro
 #include "vtkImageSliceMapper.h"
diff --git a/Rendering/OpenGL2/vtkOpenGLLight.h b/Rendering/OpenGL2/vtkOpenGLLight.h
index 3e57dbfa0d09736a1efc4019f63343f74c8bde72..fd1bcf12cae50f6c5f6dad7ef5c8fd61f1fcb797 100644
--- a/Rendering/OpenGL2/vtkOpenGLLight.h
+++ b/Rendering/OpenGL2/vtkOpenGLLight.h
@@ -16,8 +16,8 @@
 // vtkOpenGLLight is a concrete implementation of the abstract class vtkLight.
 // vtkOpenGLLight interfaces to the OpenGL rendering library.
 
-#ifndef __vtkOpenGLLight_h
-#define __vtkOpenGLLight_h
+#ifndef vtkOpenGLLight_h
+#define vtkOpenGLLight_h
 
 #include "vtkRenderingOpenGL2Module.h" // For export macro
 #include "vtkLight.h"
diff --git a/Rendering/OpenGL2/vtkOpenGLPolyDataMapper.h b/Rendering/OpenGL2/vtkOpenGLPolyDataMapper.h
index dbca2ff43b8de206607313ce842c527c54f22c25..91fb4303ad13c65cdf5745bf9ed4536115bac1f5 100644
--- a/Rendering/OpenGL2/vtkOpenGLPolyDataMapper.h
+++ b/Rendering/OpenGL2/vtkOpenGLPolyDataMapper.h
@@ -15,8 +15,8 @@
 // .SECTION Description
 // PolyDataMapper that uses a OpenGL to do the actual rendering.
 
-#ifndef __vtkOpenGLPolyDataMapper_h
-#define __vtkOpenGLPolyDataMapper_h
+#ifndef vtkOpenGLPolyDataMapper_h
+#define vtkOpenGLPolyDataMapper_h
 
 #include "vtkRenderingOpenGL2Module.h" // For export macro
 #include "vtkPolyDataMapper.h"
diff --git a/Rendering/OpenGL2/vtkOpenGLPolyDataMapper2D.h b/Rendering/OpenGL2/vtkOpenGLPolyDataMapper2D.h
index 8e985f97c8377b94572d43e004d9c2f6ef47c021..1b13811da3fa168d920638ad14a05b54f09009b9 100644
--- a/Rendering/OpenGL2/vtkOpenGLPolyDataMapper2D.h
+++ b/Rendering/OpenGL2/vtkOpenGLPolyDataMapper2D.h
@@ -21,8 +21,8 @@
 // .SECTION See Also
 // vtkPolyDataMapper2D
 
-#ifndef __vtkOpenGLPolyDataMapper2D_h
-#define __vtkOpenGLPolyDataMapper2D_h
+#ifndef vtkOpenGLPolyDataMapper2D_h
+#define vtkOpenGLPolyDataMapper2D_h
 
 #include "vtkRenderingOpenGL2Module.h" // For export macro
 #include "vtkPolyDataMapper2D.h"
diff --git a/Rendering/OpenGL2/vtkOpenGLProperty.h b/Rendering/OpenGL2/vtkOpenGLProperty.h
index 54aad66c07736ba41f3ece364b2a3ebe02305dc7..17e83ba8c977b63121ee85662d55c613d2174891 100644
--- a/Rendering/OpenGL2/vtkOpenGLProperty.h
+++ b/Rendering/OpenGL2/vtkOpenGLProperty.h
@@ -17,8 +17,8 @@
 // vtkOpenGLProperty is a concrete implementation of the abstract class
 // vtkProperty. vtkOpenGLProperty interfaces to the OpenGL rendering library.
 
-#ifndef __vtkOpenGLProperty_h
-#define __vtkOpenGLProperty_h
+#ifndef vtkOpenGLProperty_h
+#define vtkOpenGLProperty_h
 
 #include "vtkRenderingOpenGL2Module.h" // For export macro
 #include "vtkProperty.h"
diff --git a/Rendering/OpenGL2/vtkOpenGLRenderWindow.h b/Rendering/OpenGL2/vtkOpenGLRenderWindow.h
index ec161925e209c46f3ba7ac3a9c02400e2838dd97..0789b93554eee3011f549be9826e1c951d584df8 100644
--- a/Rendering/OpenGL2/vtkOpenGLRenderWindow.h
+++ b/Rendering/OpenGL2/vtkOpenGLRenderWindow.h
@@ -19,8 +19,8 @@
 // library. Application programmers should normally use vtkRenderWindow
 // instead of the OpenGL specific version.
 
-#ifndef __vtkOpenGLRenderWindow_h
-#define __vtkOpenGLRenderWindow_h
+#ifndef vtkOpenGLRenderWindow_h
+#define vtkOpenGLRenderWindow_h
 
 #include "vtkRenderingOpenGL2Module.h" // For export macro
 #include "vtkRenderWindow.h"
diff --git a/Rendering/OpenGL2/vtkOpenGLRenderer.h b/Rendering/OpenGL2/vtkOpenGLRenderer.h
index 630781723d22aca9faa42b8947a74bab7a29d3c8..437d0f0b0f0b1fdef7ca34265509289407098dc0 100644
--- a/Rendering/OpenGL2/vtkOpenGLRenderer.h
+++ b/Rendering/OpenGL2/vtkOpenGLRenderer.h
@@ -17,8 +17,8 @@
 // vtkOpenGLRenderer is a concrete implementation of the abstract class
 // vtkRenderer. vtkOpenGLRenderer interfaces to the OpenGL graphics library.
 
-#ifndef __vtkOpenGLRenderer_h
-#define __vtkOpenGLRenderer_h
+#ifndef vtkOpenGLRenderer_h
+#define vtkOpenGLRenderer_h
 
 #include "vtkRenderingOpenGL2Module.h" // For export macro
 #include "vtkRenderer.h"
diff --git a/Rendering/OpenGL2/vtkOpenGLShaderCache.h b/Rendering/OpenGL2/vtkOpenGLShaderCache.h
index b69681cb0205414c898f6c9bd09c1cec44e85e4d..beec35f1bfd521ffc4b9b4718deaccb0fd68f474 100644
--- a/Rendering/OpenGL2/vtkOpenGLShaderCache.h
+++ b/Rendering/OpenGL2/vtkOpenGLShaderCache.h
@@ -16,8 +16,8 @@
 // .SECTION Description
 // vtkOpenGLShaderCache manages shader program compilation and binding
 
-#ifndef __vtkOpenGLShaderCache_h
-#define __vtkOpenGLShaderCache_h
+#ifndef vtkOpenGLShaderCache_h
+#define vtkOpenGLShaderCache_h
 
 #include "vtkRenderingOpenGL2Module.h" // For export macro
 #include "vtkObject.h"
diff --git a/Rendering/OpenGL2/vtkOpenGLTexture.h b/Rendering/OpenGL2/vtkOpenGLTexture.h
index 1ec87c77f1ba664b2ebbc9e44590547948e7e337..8daa7e449c66f4d4c0790beb54811184221453ff 100644
--- a/Rendering/OpenGL2/vtkOpenGLTexture.h
+++ b/Rendering/OpenGL2/vtkOpenGLTexture.h
@@ -17,8 +17,8 @@
 // vtkOpenGLTexture is a concrete implementation of the abstract class
 // vtkTexture. vtkOpenGLTexture interfaces to the OpenGL rendering library.
 
-#ifndef __vtkOpenGLTexture_h
-#define __vtkOpenGLTexture_h
+#ifndef vtkOpenGLTexture_h
+#define vtkOpenGLTexture_h
 
 #include "vtkRenderingOpenGL2Module.h" // For export macro
 #include "vtkTexture.h"
diff --git a/Rendering/OpenGL2/vtkOverlayPass.h b/Rendering/OpenGL2/vtkOverlayPass.h
index 111d447a604bb790b24ac8e9ca5b78b65213b453..def6cb8d74ae77c7702e429232204cf0f5471293 100644
--- a/Rendering/OpenGL2/vtkOverlayPass.h
+++ b/Rendering/OpenGL2/vtkOverlayPass.h
@@ -25,8 +25,8 @@
 // .SECTION See Also
 // vtkRenderPass vtkDefaultPass
 
-#ifndef __vtkOverlayPass_h
-#define __vtkOverlayPass_h
+#ifndef vtkOverlayPass_h
+#define vtkOverlayPass_h
 
 #include "vtkRenderingOpenGL2Module.h" // For export macro
 #include "vtkDefaultPass.h"
diff --git a/Rendering/OpenGL2/vtkPixelBufferObject.h b/Rendering/OpenGL2/vtkPixelBufferObject.h
index fc7c850a0e29b6a0068605aee49b5847b1102660..37e3323c32c703dfcebdc02868ac9f9986d7c34d 100644
--- a/Rendering/OpenGL2/vtkPixelBufferObject.h
+++ b/Rendering/OpenGL2/vtkPixelBufferObject.h
@@ -27,8 +27,8 @@
 // Since most PBO mappeds don't support double format all double data is converted to
 // float and then uploaded.
 
-#ifndef __vtkPixelBufferObject_h
-#define __vtkPixelBufferObject_h
+#ifndef vtkPixelBufferObject_h
+#define vtkPixelBufferObject_h
 
 #include "vtkObject.h"
 #include "vtkRenderingOpenGL2Module.h" // For export macro
diff --git a/Rendering/OpenGL2/vtkRenderPass.h b/Rendering/OpenGL2/vtkRenderPass.h
index 55ba8bd44fd394fb86da8ac7a22b91a9fc66ba0b..cd1475eca8bdcf0533ff1a9199b428d95e30cb2d 100644
--- a/Rendering/OpenGL2/vtkRenderPass.h
+++ b/Rendering/OpenGL2/vtkRenderPass.h
@@ -39,8 +39,8 @@
 // .SECTION See Also
 // vtkRenderState vtkRenderer
 
-#ifndef __vtkRenderPass_h
-#define __vtkRenderPass_h
+#ifndef vtkRenderPass_h
+#define vtkRenderPass_h
 
 #include "vtkRenderingOpenGL2Module.h" // For export macro
 #include "vtkObject.h"
diff --git a/Rendering/OpenGL2/vtkRenderPassCollection.h b/Rendering/OpenGL2/vtkRenderPassCollection.h
index 330a78f58770f76255102da53f02988fd4f3760c..35a7178c147684272ed050fba85a0880d9790e7a 100644
--- a/Rendering/OpenGL2/vtkRenderPassCollection.h
+++ b/Rendering/OpenGL2/vtkRenderPassCollection.h
@@ -21,8 +21,8 @@
 // .SECTION see also
 // vtkRenderPass vtkCollection
 
-#ifndef __vtkRenderPassCollection_h
-#define __vtkRenderPassCollection_h
+#ifndef vtkRenderPassCollection_h
+#define vtkRenderPassCollection_h
 
 #include "vtkRenderingOpenGL2Module.h" // For export macro
 #include "vtkCollection.h"
diff --git a/Rendering/OpenGL2/vtkRenderState.h b/Rendering/OpenGL2/vtkRenderState.h
index e3ef544617241e2a79bb9063a8d0dad7609f87cf..16823148ad6f09b38b6fc3239fd81f25c0e3201d 100644
--- a/Rendering/OpenGL2/vtkRenderState.h
+++ b/Rendering/OpenGL2/vtkRenderState.h
@@ -23,8 +23,8 @@
 // .SECTION See Also
 // vtkRenderPass vtkRenderer vtkFrameBufferObject vtkProp
 
-#ifndef __vtkRenderState_h
-#define __vtkRenderState_h
+#ifndef vtkRenderState_h
+#define vtkRenderState_h
 
 #include "vtkRenderingOpenGL2Module.h" // For export macro
 #include "vtkObject.h"
diff --git a/Rendering/OpenGL2/vtkRenderStepsPass.h b/Rendering/OpenGL2/vtkRenderStepsPass.h
index 612cb1033bcc4cc0ea23893209c69a4176baf9ce..6f09eaea8ce071bf8d2d2ad7dcf83085695f3c2a 100644
--- a/Rendering/OpenGL2/vtkRenderStepsPass.h
+++ b/Rendering/OpenGL2/vtkRenderStepsPass.h
@@ -27,8 +27,8 @@
 // .SECTION See Also
 // vtkRenderPass
 
-#ifndef __vtkRenderStepsPass_h
-#define __vtkRenderStepsPass_h
+#ifndef vtkRenderStepsPass_h
+#define vtkRenderStepsPass_h
 
 #include "vtkRenderingOpenGL2Module.h" // For export macro
 #include "vtkRenderPass.h"
diff --git a/Rendering/OpenGL2/vtkRenderbuffer.h b/Rendering/OpenGL2/vtkRenderbuffer.h
index ef1ef273d854ebc962e204d2a9c57552420ee7fc..df05112ad245b762a53ed32ca5543729eee254a2 100644
--- a/Rendering/OpenGL2/vtkRenderbuffer.h
+++ b/Rendering/OpenGL2/vtkRenderbuffer.h
@@ -15,8 +15,8 @@
 // .NAME vtkRenderbuffer - Storage for FBO's
 // .SECTION Description
 // Lightweight API to OpenGL Framebuffer Object EXT renderbuffers.
-#ifndef __vtkRenderbuffer_h
-#define __vtkRenderbuffer_h
+#ifndef vtkRenderbuffer_h
+#define vtkRenderbuffer_h
 
 #include "vtkObject.h"
 #include "vtkRenderingOpenGL2Module.h" // for export macro
diff --git a/Rendering/OpenGL2/vtkSequencePass.h b/Rendering/OpenGL2/vtkSequencePass.h
index 658b262814e2195f35f8aeab786cc39fe59bd6fc..8705504d4a67302a9b96f9b7e023cdea89083844 100644
--- a/Rendering/OpenGL2/vtkSequencePass.h
+++ b/Rendering/OpenGL2/vtkSequencePass.h
@@ -24,8 +24,8 @@
 // .SECTION See Also
 // vtkRenderPass
 
-#ifndef __vtkSequencePass_h
-#define __vtkSequencePass_h
+#ifndef vtkSequencePass_h
+#define vtkSequencePass_h
 
 #include "vtkRenderingOpenGL2Module.h" // For export macro
 #include "vtkRenderPass.h"
diff --git a/Rendering/OpenGL2/vtkShader.h b/Rendering/OpenGL2/vtkShader.h
index 18928f26f8627ffd059a3ad862294433bec8f3ac..6a9af8e21d647231450906078706d21b347aa9b7 100644
--- a/Rendering/OpenGL2/vtkShader.h
+++ b/Rendering/OpenGL2/vtkShader.h
@@ -14,8 +14,8 @@
 // .NAME vtkShader - encapsulate a glsl shader
 // .SECTION Description
 // vtkShader represents a shader, vertex, fragment, geometry etc
-#ifndef __vtkShader_h
-#define __vtkShader_h
+#ifndef vtkShader_h
+#define vtkShader_h
 
 #include "vtkRenderingOpenGL2Module.h" // for export macro
 #include "vtkObject.h"
diff --git a/Rendering/OpenGL2/vtkShaderProgram.h b/Rendering/OpenGL2/vtkShaderProgram.h
index bb988cdcf3615a3a88330ca1f193dda096e479a2..a5e4169e17430097b91657dffb30d3fc5663fe5d 100644
--- a/Rendering/OpenGL2/vtkShaderProgram.h
+++ b/Rendering/OpenGL2/vtkShaderProgram.h
@@ -14,8 +14,8 @@
 // .NAME vtkShaderProgram - a glsl shader program
 // .SECTION Description
 // This class contains the vertex, fragment, geometry shaders that combine to make a shader program
-#ifndef __vtkShaderProgram_h
-#define __vtkShaderProgram_h
+#ifndef vtkShaderProgram_h
+#define vtkShaderProgram_h
 
 #include "vtkRenderingOpenGL2Module.h" // for export macro
 #include "vtkObject.h"
diff --git a/Rendering/OpenGL2/vtkSobelGradientMagnitudePass.h b/Rendering/OpenGL2/vtkSobelGradientMagnitudePass.h
index 75500ec0068865dad63e707133be93e94ebb8f15..60305059b0e3366c3a52bf78fce42b2e631081f8 100644
--- a/Rendering/OpenGL2/vtkSobelGradientMagnitudePass.h
+++ b/Rendering/OpenGL2/vtkSobelGradientMagnitudePass.h
@@ -53,8 +53,8 @@
 // .SECTION See Also
 // vtkRenderPass
 
-#ifndef __vtkSobelGradientMagnitudePass_h
-#define __vtkSobelGradientMagnitudePass_h
+#ifndef vtkSobelGradientMagnitudePass_h
+#define vtkSobelGradientMagnitudePass_h
 
 #include "vtkRenderingOpenGL2Module.h" // For export macro
 #include "vtkImageProcessingPass.h"
diff --git a/Rendering/OpenGL2/vtkTextureObject.h b/Rendering/OpenGL2/vtkTextureObject.h
index c3f8c0601fe203aa58eb573c626ca8b4296504e7..f69142d812dec497cd0f72c6389aa4f9371dc377 100644
--- a/Rendering/OpenGL2/vtkTextureObject.h
+++ b/Rendering/OpenGL2/vtkTextureObject.h
@@ -17,8 +17,8 @@
 // vtkTextureObject represents an OpenGL texture object. It provides API to
 // create textures using data already loaded into pixel buffer objects. It can
 // also be used to create textures without uploading any data.
-#ifndef __vtkTextureObject_h
-#define __vtkTextureObject_h
+#ifndef vtkTextureObject_h
+#define vtkTextureObject_h
 
 #include "vtkRenderingOpenGL2Module.h" // For export macro
 #include "vtkObject.h"
diff --git a/Rendering/OpenGL2/vtkTextureUnitManager.h b/Rendering/OpenGL2/vtkTextureUnitManager.h
index 74ac81bb8167193839310572c32188bd377394db..1106a87c4a475b75de1422e05afc176a4b2c1831 100644
--- a/Rendering/OpenGL2/vtkTextureUnitManager.h
+++ b/Rendering/OpenGL2/vtkTextureUnitManager.h
@@ -24,8 +24,8 @@
 // .SECTION See Also
 // vtkOpenGLRenderWindow
 
-#ifndef __vtkTextureUnitManager_h
-#define __vtkTextureUnitManager_h
+#ifndef vtkTextureUnitManager_h
+#define vtkTextureUnitManager_h
 
 #include "vtkRenderingOpenGL2Module.h" // For export macro
 #include "vtkObject.h"
diff --git a/Rendering/OpenGL2/vtkTranslucentPass.h b/Rendering/OpenGL2/vtkTranslucentPass.h
index 051685827d295996eb5fdca96b25ad8d88697d5a..0ce255a9061b487784fb05bc40b2520a12657483 100644
--- a/Rendering/OpenGL2/vtkTranslucentPass.h
+++ b/Rendering/OpenGL2/vtkTranslucentPass.h
@@ -25,8 +25,8 @@
 // .SECTION See Also
 // vtkRenderPass vtkDefaultPass
 
-#ifndef __vtkTranslucentPass_h
-#define __vtkTranslucentPass_h
+#ifndef vtkTranslucentPass_h
+#define vtkTranslucentPass_h
 
 #include "vtkRenderingOpenGL2Module.h" // For export macro
 #include "vtkDefaultPass.h"
diff --git a/Rendering/OpenGL2/vtkVolumetricPass.h b/Rendering/OpenGL2/vtkVolumetricPass.h
index f9c09f3110a75c4312a398dd4efdb521c73fd67c..32632bf41c740feb9df6a4411e506496eb97e274 100644
--- a/Rendering/OpenGL2/vtkVolumetricPass.h
+++ b/Rendering/OpenGL2/vtkVolumetricPass.h
@@ -25,8 +25,8 @@
 // .SECTION See Also
 // vtkRenderPass vtkDefaultPass
 
-#ifndef __vtkVolumetricPass_h
-#define __vtkVolumetricPass_h
+#ifndef vtkVolumetricPass_h
+#define vtkVolumetricPass_h
 
 #include "vtkRenderingOpenGL2Module.h" // For export macro
 #include "vtkDefaultPass.h"
diff --git a/Rendering/OpenGL2/vtkWin32OpenGLRenderWindow.h b/Rendering/OpenGL2/vtkWin32OpenGLRenderWindow.h
index 8437c152eb2c8f0ff722dd168370ad7f5bbc48a0..043196ccc716309ffe50784e7ad6ab2e4093a41b 100644
--- a/Rendering/OpenGL2/vtkWin32OpenGLRenderWindow.h
+++ b/Rendering/OpenGL2/vtkWin32OpenGLRenderWindow.h
@@ -18,8 +18,8 @@ PURPOSE.  See the above copyright notice for more information.
 // class vtkRenderWindow. vtkWin32OpenGL2Renderer interfaces to the standard
 // OpenGL graphics library in the Windows/NT environment..
 
-#ifndef __vtkWin32OpenGL2RenderWindow_h
-#define __vtkWin32OpenGL2RenderWindow_h
+#ifndef vtkWin32OpenGL2RenderWindow_h
+#define vtkWin32OpenGL2RenderWindow_h
 
 #include "vtkRenderingOpenGL2Module.h" // For export macro
 #include "vtkOpenGLRenderWindow.h"
diff --git a/Rendering/OpenGL2/vtkWin32OpenGLRenderWindowInteractor.h b/Rendering/OpenGL2/vtkWin32OpenGLRenderWindowInteractor.h
index e875bae5aa7d86074d83ed2cef152de0d67f6ac2..383f5cecb7052312faefaf80858db57a1ffb4a79 100644
--- a/Rendering/OpenGL2/vtkWin32OpenGLRenderWindowInteractor.h
+++ b/Rendering/OpenGL2/vtkWin32OpenGLRenderWindowInteractor.h
@@ -23,8 +23,8 @@
 // messages into the event bindings by setting InstallMessageProc to false.
 // This provides a minimal "Mapped" mode of interaction
 //
-#ifndef __vtkWin32OpenGLRenderWindowInteractor_h
-#define __vtkWin32OpenGLRenderWindowInteractor_h
+#ifndef vtkWin32OpenGLRenderWindowInteractor_h
+#define vtkWin32OpenGLRenderWindowInteractor_h
 
 #include "vtkRenderingOpenGL2Module.h" // For export macro
 #include "vtkRenderWindowInteractor.h"
diff --git a/Rendering/OpenGL2/vtkXInteractionDevice.h b/Rendering/OpenGL2/vtkXInteractionDevice.h
index acfa6f14d0fa07e4422b448378f941ec453edf2c..c9f10af8779221ebf5472a724f0d1e73c330bb62 100644
--- a/Rendering/OpenGL2/vtkXInteractionDevice.h
+++ b/Rendering/OpenGL2/vtkXInteractionDevice.h
@@ -11,8 +11,8 @@
      PURPOSE.  See the above copyright notice for more information.
 
 =========================================================================*/
-#ifndef __vtkXInteractionDevice_h
-#define __vtkXInteractionDevice_h
+#ifndef vtkXInteractionDevice_h
+#define vtkXInteractionDevice_h
 
 #include "vtkAbstractInteractionDevice.h"
 #include "vtkRenderingOpenGL2Module.h" // For export macro
diff --git a/Rendering/OpenGL2/vtkXOpenGLRenderDevice.h b/Rendering/OpenGL2/vtkXOpenGLRenderDevice.h
index 1493c3ae88ebfe086f95c0440616d2fd07367d97..9c82715c67656403d39d61ef0f6a1c2b1cd010df 100644
--- a/Rendering/OpenGL2/vtkXOpenGLRenderDevice.h
+++ b/Rendering/OpenGL2/vtkXOpenGLRenderDevice.h
@@ -11,8 +11,8 @@
      PURPOSE.  See the above copyright notice for more information.
 
 =========================================================================*/
-#ifndef __vtkXOpenGLRenderDevice_h
-#define __vtkXOpenGLRenderDevice_h
+#ifndef vtkXOpenGLRenderDevice_h
+#define vtkXOpenGLRenderDevice_h
 
 #include "vtkAbstractRenderDevice.h"
 #include "vtkRenderingOpenGL2Module.h" // For export macro
diff --git a/Rendering/OpenGL2/vtkXOpenGLRenderWindow.h b/Rendering/OpenGL2/vtkXOpenGLRenderWindow.h
index 3a1699086eb09283010905107af948ef8c8341c6..aa6eb636c6254cc6da5cbd418eb58b17e5ee1dfe 100644
--- a/Rendering/OpenGL2/vtkXOpenGLRenderWindow.h
+++ b/Rendering/OpenGL2/vtkXOpenGLRenderWindow.h
@@ -19,8 +19,8 @@
 // library. Application programmers should normally use vtkRenderWindow
 // instead of the OpenGL specific version.
 
-#ifndef __vtkXOpenGLRenderWindow_h
-#define __vtkXOpenGLRenderWindow_h
+#ifndef vtkXOpenGLRenderWindow_h
+#define vtkXOpenGLRenderWindow_h
 
 #include "vtkRenderingOpenGL2Module.h" // For export macro
 #include "vtkOpenGLRenderWindow.h"
diff --git a/Rendering/OpenGL2/vtkXOpenGLRenderWindowInteractor.h b/Rendering/OpenGL2/vtkXOpenGLRenderWindowInteractor.h
index b672e1fd1d95e751e706c32b1cbb5a709df13dfe..613f27b7bedbea1b78dfaa823347298b0e83289c 100644
--- a/Rendering/OpenGL2/vtkXOpenGLRenderWindowInteractor.h
+++ b/Rendering/OpenGL2/vtkXOpenGLRenderWindowInteractor.h
@@ -27,8 +27,8 @@
 // the basic structure and if you're lucky it might even work!
 // but frankly I doubt it
 
-#ifndef __vtkXOpenGLRenderWindowInteractor_h
-#define __vtkXOpenGLRenderWindowInteractor_h
+#ifndef vtkXOpenGLRenderWindowInteractor_h
+#define vtkXOpenGLRenderWindowInteractor_h
 
 //===========================================================
 // now we define the C++ class
diff --git a/Rendering/OpenGL2/vtkglBufferObject.h b/Rendering/OpenGL2/vtkglBufferObject.h
index 47d41ffa6d5a856f9e0f265498e3d1c712ed7828..e4430aa75cc6c072228a55885d07009de133d74a 100644
--- a/Rendering/OpenGL2/vtkglBufferObject.h
+++ b/Rendering/OpenGL2/vtkglBufferObject.h
@@ -11,8 +11,8 @@
      PURPOSE.  See the above copyright notice for more information.
 
 =========================================================================*/
-#ifndef __vtkglBufferObject_h
-#define __vtkglBufferObject_h
+#ifndef vtkglBufferObject_h
+#define vtkglBufferObject_h
 
 #include "vtkRenderingOpenGL2Module.h"
 #include "vtkStdString.h" // for std::string
diff --git a/Rendering/OpenGL2/vtkglVBOHelper.h b/Rendering/OpenGL2/vtkglVBOHelper.h
index cde6765f9bfab020aa46e92fbc334ab55235fd86..23ab6157ff9e13b3c787f1cc9908d08eb2f1a842 100644
--- a/Rendering/OpenGL2/vtkglVBOHelper.h
+++ b/Rendering/OpenGL2/vtkglVBOHelper.h
@@ -12,8 +12,8 @@
 
 =========================================================================*/
 
-#ifndef __vtkGLVBOHelpher_h
-#define __vtkGLVBOHelpher_h
+#ifndef vtkGLVBOHelpher_h
+#define vtkGLVBOHelpher_h
 
 #include "vtkRenderingOpenGL2Module.h" // for export macro
 
@@ -109,6 +109,6 @@ void CreateCellSupportArrays(vtkPolyData *poly, vtkCellArray *[4],
 
 } // End namespace
 
-#endif // __vtkGLVBOHelpher_h
+#endif // vtkGLVBOHelpher_h
 
 // VTK-HeaderTest-Exclude: vtkglVBOHelper.h
diff --git a/Rendering/OpenGL2/vtkglVertexArrayObject.h b/Rendering/OpenGL2/vtkglVertexArrayObject.h
index a4fbd0666664f7faf1ffca5d0a311112234ce09c..9288733f07f0ca13b74f60fd5694c0f7c8798e6a 100644
--- a/Rendering/OpenGL2/vtkglVertexArrayObject.h
+++ b/Rendering/OpenGL2/vtkglVertexArrayObject.h
@@ -11,8 +11,8 @@
      PURPOSE.  See the above copyright notice for more information.
 
 =========================================================================*/
-#ifndef __vtkglVertexArrayObject_h
-#define __vtkglVertexArrayObject_h
+#ifndef vtkglVertexArrayObject_h
+#define vtkglVertexArrayObject_h
 
 #include "vtkRenderingOpenGL2Module.h"
 #include <string> // For API.
@@ -80,6 +80,6 @@ private:
 
 } // End of vtkgl namespace
 
-#endif // __vtkglVertexArrayObject_h
+#endif // vtkglVertexArrayObject_h
 
 // VTK-HeaderTest-Exclude: vtkglVertexArrayObject.h
diff --git a/Rendering/Parallel/vtkClientServerCompositePass.h b/Rendering/Parallel/vtkClientServerCompositePass.h
index 822c4225f374f9391bd14c4b2d4b84f2bbcd1b93..1a998a3ff3f1c582c2ae13433f3831c127b939ba 100644
--- a/Rendering/Parallel/vtkClientServerCompositePass.h
+++ b/Rendering/Parallel/vtkClientServerCompositePass.h
@@ -18,8 +18,8 @@
 // image delivery. This is designed to be used in configurations in
 // two-processes configurations.
 
-#ifndef __vtkClientServerCompositePass_h
-#define __vtkClientServerCompositePass_h
+#ifndef vtkClientServerCompositePass_h
+#define vtkClientServerCompositePass_h
 
 #include "vtkRenderingParallelModule.h" // For export macro
 #include "vtkRenderPass.h"
diff --git a/Rendering/Parallel/vtkClientServerSynchronizedRenderers.h b/Rendering/Parallel/vtkClientServerSynchronizedRenderers.h
index 542d5694db03922aa0f9da4afd82965a4baac440..8f3a725be9ad860e343b02f83ae3bdd96f6642c5 100644
--- a/Rendering/Parallel/vtkClientServerSynchronizedRenderers.h
+++ b/Rendering/Parallel/vtkClientServerSynchronizedRenderers.h
@@ -17,8 +17,8 @@
 // vtkClientServerSynchronizedRenderers is a vtkSynchronizedRenderers subclass
 // designed to be used in 2 processes, client-server mode.
 
-#ifndef __vtkClientServerSynchronizedRenderers_h
-#define __vtkClientServerSynchronizedRenderers_h
+#ifndef vtkClientServerSynchronizedRenderers_h
+#define vtkClientServerSynchronizedRenderers_h
 
 #include "vtkRenderingParallelModule.h" // For export macro
 #include "vtkSynchronizedRenderers.h"
diff --git a/Rendering/Parallel/vtkCompositeRGBAPass.h b/Rendering/Parallel/vtkCompositeRGBAPass.h
index c729293694fa3be4b96fce8a831f26be1614c306..a4a023b672945e2ff19face5c1af81a20491bcda 100644
--- a/Rendering/Parallel/vtkCompositeRGBAPass.h
+++ b/Rendering/Parallel/vtkCompositeRGBAPass.h
@@ -25,8 +25,8 @@
 // .SECTION See Also
 // vtkRenderPass
 
-#ifndef __vtkCompositeRGBAPass_h
-#define __vtkCompositeRGBAPass_h
+#ifndef vtkCompositeRGBAPass_h
+#define vtkCompositeRGBAPass_h
 
 #include "vtkRenderingParallelModule.h" // For export macro
 #include "vtkRenderPass.h"
diff --git a/Rendering/Parallel/vtkCompositeRenderManager.h b/Rendering/Parallel/vtkCompositeRenderManager.h
index a605a4adca436b21318fd99dd802263d6c293b5d..f8bfd60825309eafd387d1001004c75dfe3d9234 100644
--- a/Rendering/Parallel/vtkCompositeRenderManager.h
+++ b/Rendering/Parallel/vtkCompositeRenderManager.h
@@ -21,8 +21,8 @@
 //
 
 
-#ifndef __vtkCompositeRenderManager_h
-#define __vtkCompositeRenderManager_h
+#ifndef vtkCompositeRenderManager_h
+#define vtkCompositeRenderManager_h
 
 #include "vtkRenderingParallelModule.h" // For export macro
 #include "vtkParallelRenderManager.h"
@@ -66,4 +66,4 @@ private:
   void operator=(const vtkCompositeRenderManager &);  //Not implemented
 };
 
-#endif //__vtkCompositeRenderManager_h
+#endif //vtkCompositeRenderManager_h
diff --git a/Rendering/Parallel/vtkCompositeZPass.h b/Rendering/Parallel/vtkCompositeZPass.h
index a943d95228909e631cb9864ca49fb6a140615c1b..dea7a0a9f1577ad41f4042417b946f78ff2bcfd2 100644
--- a/Rendering/Parallel/vtkCompositeZPass.h
+++ b/Rendering/Parallel/vtkCompositeZPass.h
@@ -25,8 +25,8 @@
 // .SECTION See Also
 // vtkRenderPass
 
-#ifndef __vtkCompositeZPass_h
-#define __vtkCompositeZPass_h
+#ifndef vtkCompositeZPass_h
+#define vtkCompositeZPass_h
 
 #include "vtkRenderingParallelModule.h" // For export macro
 #include "vtkRenderPass.h"
diff --git a/Rendering/Parallel/vtkCompositedSynchronizedRenderers.h b/Rendering/Parallel/vtkCompositedSynchronizedRenderers.h
index 06a15d371b4e7da80cb7f921656aa9eb9eaf849f..a5b18f955a5b9c86dd5c08cb223bc6d57265cc58 100644
--- a/Rendering/Parallel/vtkCompositedSynchronizedRenderers.h
+++ b/Rendering/Parallel/vtkCompositedSynchronizedRenderers.h
@@ -17,8 +17,8 @@
 // vtkCompositedSynchronizedRenderers is vtkSynchronizedRenderers that uses
 // vtkCompositer to composite the images on  the root node.
 
-#ifndef __vtkCompositedSynchronizedRenderers_h
-#define __vtkCompositedSynchronizedRenderers_h
+#ifndef vtkCompositedSynchronizedRenderers_h
+#define vtkCompositedSynchronizedRenderers_h
 
 #include "vtkRenderingParallelModule.h" // For export macro
 #include "vtkSynchronizedRenderers.h"
diff --git a/Rendering/Parallel/vtkCompositer.h b/Rendering/Parallel/vtkCompositer.h
index c23a8078aaeb1ee0fa6d52c43b022897d9235b9d..20cbd8f890fc988eff2fac3d425642bb7a461c2a 100644
--- a/Rendering/Parallel/vtkCompositer.h
+++ b/Rendering/Parallel/vtkCompositer.h
@@ -23,8 +23,8 @@
 // .SECTION See Also
 // vtkCompositeManager.
 
-#ifndef __vtkCompositer_h
-#define __vtkCompositer_h
+#ifndef vtkCompositer_h
+#define vtkCompositer_h
 
 #include "vtkRenderingParallelModule.h" // For export macro
 #include "vtkObject.h"
diff --git a/Rendering/Parallel/vtkCompressCompositer.h b/Rendering/Parallel/vtkCompressCompositer.h
index 8f4f092f1eed47b22e220d251986b7f4088929c3..556ab495de34b8f87ac2cc777e21b60ebaceebe8 100644
--- a/Rendering/Parallel/vtkCompressCompositer.h
+++ b/Rendering/Parallel/vtkCompressCompositer.h
@@ -24,8 +24,8 @@
 // SECTION See Also
 // vtkCompositeManager.
 
-#ifndef __vtkCompressCompositer_h
-#define __vtkCompressCompositer_h
+#ifndef vtkCompressCompositer_h
+#define vtkCompressCompositer_h
 
 #include "vtkRenderingParallelModule.h" // For export macro
 #include "vtkCompositer.h"
diff --git a/Rendering/Parallel/vtkImageRenderManager.h b/Rendering/Parallel/vtkImageRenderManager.h
index 1a0e89c6f16c3d9e5a7106b8993f79f89080b214..445142976d69d5f1daf1b6521f2abf1c50e5b3d9 100644
--- a/Rendering/Parallel/vtkImageRenderManager.h
+++ b/Rendering/Parallel/vtkImageRenderManager.h
@@ -24,8 +24,8 @@
 // .SECTION See Also
 // vtkCompositeRGBAPass
 
-#ifndef __vtkImageRenderManager_h
-#define __vtkImageRenderManager_h
+#ifndef vtkImageRenderManager_h
+#define vtkImageRenderManager_h
 
 #include "vtkRenderingParallelModule.h" // For export macro
 #include "vtkParallelRenderManager.h"
@@ -49,4 +49,4 @@ private:
   void operator=(const vtkImageRenderManager &);  //Not implemented
 };
 
-#endif //__vtkImageRenderManager_h
+#endif //vtkImageRenderManager_h
diff --git a/Rendering/Parallel/vtkPHardwareSelector.h b/Rendering/Parallel/vtkPHardwareSelector.h
index c26be53bb662e3a7ae1dbb325f0e91fbf50ffc34..dc1d77da7e7c5207373ab88b1d7d51cfca339623 100644
--- a/Rendering/Parallel/vtkPHardwareSelector.h
+++ b/Rendering/Parallel/vtkPHardwareSelector.h
@@ -24,8 +24,8 @@
 // fired and beginning of the render to ensure that vtkHardwareSelector's
 // CurrentPass is updated appropriately.
 
-#ifndef __vtkPHardwareSelector_h
-#define __vtkPHardwareSelector_h
+#ifndef vtkPHardwareSelector_h
+#define vtkPHardwareSelector_h
 
 #include "vtkRenderingParallelModule.h" // For export macro
 #include "vtkOpenGLHardwareSelector.h"
diff --git a/Rendering/Parallel/vtkParallelRenderManager.h b/Rendering/Parallel/vtkParallelRenderManager.h
index b083a20786af5f8710f7dec1ca80d9384a12d796..8122de3be72b402e08425fd5c61d7077497c9c8b 100644
--- a/Rendering/Parallel/vtkParallelRenderManager.h
+++ b/Rendering/Parallel/vtkParallelRenderManager.h
@@ -37,8 +37,8 @@
 // three-space
 //
 
-#ifndef __vtkParallelRenderManager_h
-#define __vtkParallelRenderManager_h
+#ifndef vtkParallelRenderManager_h
+#define vtkParallelRenderManager_h
 
 #include "vtkRenderingParallelModule.h" // For export macro
 #include "vtkObject.h"
@@ -584,4 +584,4 @@ private:
 //ETX
 };
 
-#endif //__vtkParalleRenderManager_h
+#endif //vtkParalleRenderManager_h
diff --git a/Rendering/Parallel/vtkSynchronizedRenderWindows.h b/Rendering/Parallel/vtkSynchronizedRenderWindows.h
index d165ec99a34002afaceb54f213705795b3093bac..e059a7cab9d1ea4a4aeab943c72461797d29e2a6 100644
--- a/Rendering/Parallel/vtkSynchronizedRenderWindows.h
+++ b/Rendering/Parallel/vtkSynchronizedRenderWindows.h
@@ -18,8 +18,8 @@
 // vtkSynchronizedRenderWindows is used to synchronize render windows across
 // processes for parallel rendering.
 
-#ifndef __vtkSynchronizedRenderWindows_h
-#define __vtkSynchronizedRenderWindows_h
+#ifndef vtkSynchronizedRenderWindows_h
+#define vtkSynchronizedRenderWindows_h
 
 #include "vtkRenderingParallelModule.h" // For export macro
 #include "vtkObject.h"
diff --git a/Rendering/Parallel/vtkSynchronizedRenderers.h b/Rendering/Parallel/vtkSynchronizedRenderers.h
index d382ead456f7bd73f13c84feb2e9ade2b9d80685..9e29ffbed20a1bc0681725d44a110910f1a85df0 100644
--- a/Rendering/Parallel/vtkSynchronizedRenderers.h
+++ b/Rendering/Parallel/vtkSynchronizedRenderers.h
@@ -23,8 +23,8 @@
 // of rendered images across processes on its own. You typically either subclass
 // to implement a compositing algorithm or use a renderer capable of compositing
 // eg. IceT based renderer.
-#ifndef __vtkSynchronizedRenderers_h
-#define __vtkSynchronizedRenderers_h
+#ifndef vtkSynchronizedRenderers_h
+#define vtkSynchronizedRenderers_h
 
 #include "vtkRenderingParallelModule.h" // For export macro
 #include "vtkObject.h"
diff --git a/Rendering/Parallel/vtkTreeCompositer.h b/Rendering/Parallel/vtkTreeCompositer.h
index 3acc0c1ed8f5270160dfae7a06ad0dbc3fa95748..e21a2d441ca3624f047ee8200ae5650da4f9b1ef 100644
--- a/Rendering/Parallel/vtkTreeCompositer.h
+++ b/Rendering/Parallel/vtkTreeCompositer.h
@@ -51,8 +51,8 @@
 // .SECTION See Also
 // vtkCompositeManager
 
-#ifndef __vtkTreeCompositer_h
-#define __vtkTreeCompositer_h
+#ifndef vtkTreeCompositer_h
+#define vtkTreeCompositer_h
 
 #include "vtkRenderingParallelModule.h" // For export macro
 #include "vtkCompositer.h"
diff --git a/Rendering/ParallelLIC/vtkMPIPixelTT.h b/Rendering/ParallelLIC/vtkMPIPixelTT.h
index f19d7009dbaafa4aae6fb7c499f6a9c4454dd540..b06cfa8589ae49ced60b325112a4434a9ad94d90 100644
--- a/Rendering/ParallelLIC/vtkMPIPixelTT.h
+++ b/Rendering/ParallelLIC/vtkMPIPixelTT.h
@@ -12,8 +12,8 @@
      PURPOSE.  See the above copyright notice for more information.
 
 =========================================================================*/
-#ifndef __vtkMPIPixelTT_h
-#define __vtkMPIPixelTT_h
+#ifndef vtkMPIPixelTT_h
+#define vtkMPIPixelTT_h
 
 #include "vtkType.h" // for vtk types
 #include "vtkMPI.h"
diff --git a/Rendering/ParallelLIC/vtkMPIPixelView.h b/Rendering/ParallelLIC/vtkMPIPixelView.h
index 6dc081cb3225ec6081df2d6e7ab85ef54fff1c2a..7766c2020a7160a5c9ab3dbbc2fda2000b664ac0 100644
--- a/Rendering/ParallelLIC/vtkMPIPixelView.h
+++ b/Rendering/ParallelLIC/vtkMPIPixelView.h
@@ -15,8 +15,8 @@
 // .NAME vtkMPIPixelView -- Templated helper function for creating
 // MPI datatypes that describe a vtkPixelExtent.
 
-#ifndef __vtkMPIPixelView_h
-#define __vtkMPIPixelView_h
+#ifndef vtkMPIPixelView_h
+#define vtkMPIPixelView_h
 
 #include "vtkPixelExtent.h" // for pixel extent
 #include "vtkMPI.h" // for mpi
diff --git a/Rendering/ParallelLIC/vtkPLineIntegralConvolution2D.h b/Rendering/ParallelLIC/vtkPLineIntegralConvolution2D.h
index 05933531fa0641272aa60e71d76e447f3e52922a..b1ef1711de7cd2496c719893a9e7e2419311753c 100644
--- a/Rendering/ParallelLIC/vtkPLineIntegralConvolution2D.h
+++ b/Rendering/ParallelLIC/vtkPLineIntegralConvolution2D.h
@@ -21,8 +21,8 @@
 // .SECTION See Also
 //  vtkPLineIntegralConvolution2D
 
-#ifndef __vtkPLineIntegralConvolution2D_h
-#define __vtkPLineIntegralConvolution2D_h
+#ifndef vtkPLineIntegralConvolution2D_h
+#define vtkPLineIntegralConvolution2D_h
 
 #include "vtkLineIntegralConvolution2D.h"
 #include "vtkRenderingParallelLICModule.h" // for export macro
diff --git a/Rendering/ParallelLIC/vtkPPainterCommunicator.h b/Rendering/ParallelLIC/vtkPPainterCommunicator.h
index 0859cbafb91e0fbee0d0340f3ad1257146b71129..b6cc31f090234888dff5ea676f267d87dbd28652 100644
--- a/Rendering/ParallelLIC/vtkPPainterCommunicator.h
+++ b/Rendering/ParallelLIC/vtkPPainterCommunicator.h
@@ -20,8 +20,8 @@
 // A simple container holding an MPI communicator. The simple API
 // is sufficient to allow serial code (no MPI available) to steer
 // execution.
-#ifndef __vtkPPainterCommunicator_h
-#define __vtkPPainterCommunicator_h
+#ifndef vtkPPainterCommunicator_h
+#define vtkPPainterCommunicator_h
 
 #include "vtkPainterCommunicator.h"
 #include "vtkRenderingParallelLICModule.h" // for export macro
diff --git a/Rendering/ParallelLIC/vtkPPixelTransfer.h b/Rendering/ParallelLIC/vtkPPixelTransfer.h
index e1fab6783b2e631390e7483cca0cec28d8fab210..66d89a64d9eba0f778fc2a77af6ebca08227d25a 100644
--- a/Rendering/ParallelLIC/vtkPPixelTransfer.h
+++ b/Rendering/ParallelLIC/vtkPPixelTransfer.h
@@ -24,8 +24,8 @@
 // .SECTION See also
 // vtkPixelExtent
 
-#ifndef __vtkPPixelTransfer_h
-#define __vtkPPixelTransfer_h
+#ifndef vtkPPixelTransfer_h
+#define vtkPPixelTransfer_h
 
 #include "vtkPixelTransfer.h"
 #include "vtkRenderingParallelLICModule.h" // for export
diff --git a/Rendering/ParallelLIC/vtkPSurfaceLICComposite.h b/Rendering/ParallelLIC/vtkPSurfaceLICComposite.h
index 6a654decfabe9a48f9ed36f6d842ad1e4034b567..9db5687e071c755cfea9b2c1171be0ba6a243141 100644
--- a/Rendering/ParallelLIC/vtkPSurfaceLICComposite.h
+++ b/Rendering/ParallelLIC/vtkPSurfaceLICComposite.h
@@ -20,8 +20,8 @@
 // image LIC is computed on the new decomposition this class will
 // un-shuffle the computed LIC back onto the original decomposition.
 
-#ifndef __vtkPSurfaceLICComposite_h
-#define __vtkPSurfaceLICComposite_h
+#ifndef vtkPSurfaceLICComposite_h
+#define vtkPSurfaceLICComposite_h
 
 #include "vtkSurfaceLICComposite.h"
 #include "vtkWeakPointer.h" // for ren context
diff --git a/Rendering/ParallelLIC/vtkPSurfaceLICPainter.h b/Rendering/ParallelLIC/vtkPSurfaceLICPainter.h
index 5702eca1e66bc9ad3800dc6b86378187e2ba3f20..fd8770ea527ecaefef94bfcdb5c667e296dd83dc 100644
--- a/Rendering/ParallelLIC/vtkPSurfaceLICPainter.h
+++ b/Rendering/ParallelLIC/vtkPSurfaceLICPainter.h
@@ -18,8 +18,8 @@
 // Parallel parts of the vtkSurfaceLICPainter, see that class for
 // documentation.
 
-#ifndef __vtkPSurfaceLICPainter_h
-#define __vtkPSurfaceLICPainter_h
+#ifndef vtkPSurfaceLICPainter_h
+#define vtkPSurfaceLICPainter_h
 
 #include "vtkSurfaceLICPainter.h"
 #include "vtkRenderingParallelLICModule.h" // For export macro
diff --git a/Rendering/ParallelLIC/vtkParallelTimer.h b/Rendering/ParallelLIC/vtkParallelTimer.h
index 3945fe9244aa0c8b8f0123190f98074fe153f3c0..64db844ba6438c5e72ea93a4aee7612297e170b3 100644
--- a/Rendering/ParallelLIC/vtkParallelTimer.h
+++ b/Rendering/ParallelLIC/vtkParallelTimer.h
@@ -33,8 +33,8 @@
 //  destroyed at exit by the signleton destructor. It can be
 //  destroyed explicitly by calling DeleteGlobalInstance.
 
-#ifndef __vtkParallelTimer_h
-#define __vtkParallelTimer_h
+#ifndef vtkParallelTimer_h
+#define vtkParallelTimer_h
 
 #define vtkParallelTimerDEBUG -1
 
diff --git a/Rendering/Qt/vtkQImageToImageSource.h b/Rendering/Qt/vtkQImageToImageSource.h
index 591c4d2683ea6f944e8addda3367b61933a746e3..4d34acd1c5bf57afbac2e8b1ba8d3b12101d89ac 100644
--- a/Rendering/Qt/vtkQImageToImageSource.h
+++ b/Rendering/Qt/vtkQImageToImageSource.h
@@ -16,8 +16,8 @@ PURPOSE.  See the above copyright notice for more information.
 // .SECTION Description
 // vtkQImageToImageSource produces image data from a QImage.
 
-#ifndef __vtkQImageToImageSource_h
-#define __vtkQImageToImageSource_h
+#ifndef vtkQImageToImageSource_h
+#define vtkQImageToImageSource_h
 
 #include "vtkRenderingQtModule.h" // For export macro
 #include "vtkImageAlgorithm.h"
diff --git a/Rendering/Qt/vtkQtInitialization.h b/Rendering/Qt/vtkQtInitialization.h
index 804f46fbcfc2d2422ca919575ddade1a8094ff26..127a31f9105834f420ef4234dd53765dffb7e4ac 100644
--- a/Rendering/Qt/vtkQtInitialization.h
+++ b/Rendering/Qt/vtkQtInitialization.h
@@ -26,8 +26,8 @@
 // their implementation - create an instance of vtkQtInitialization
 // prior to instantiating any filters that require Qt.
 
-#ifndef __vtkQtInitialization_h
-#define __vtkQtInitialization_h
+#ifndef vtkQtInitialization_h
+#define vtkQtInitialization_h
 
 #include "vtkRenderingQtModule.h" // For export macro
 #include "vtkObject.h"
@@ -55,5 +55,5 @@ private:
   //ETX
 };
 
-#endif // __vtkQtInitialization_h
+#endif // vtkQtInitialization_h
 
diff --git a/Rendering/Qt/vtkQtLabelRenderStrategy.h b/Rendering/Qt/vtkQtLabelRenderStrategy.h
index 2b425354b9ffb74d4c83f9f04ff6ae1e5cc2a71d..33f9586bedf7c03903637748217266e3ef4c6f02 100644
--- a/Rendering/Qt/vtkQtLabelRenderStrategy.h
+++ b/Rendering/Qt/vtkQtLabelRenderStrategy.h
@@ -19,8 +19,8 @@
 // rendered to a QImage, then EndFrame() converts that image to a vtkImageData
 // and textures the image onto a quad spanning the render area.
 
-#ifndef __vtkQtLabelRenderStrategy_h
-#define __vtkQtLabelRenderStrategy_h
+#ifndef vtkQtLabelRenderStrategy_h
+#define vtkQtLabelRenderStrategy_h
 
 #include "vtkRenderingQtModule.h" // For export macro
 #include "vtkLabelRenderStrategy.h"
diff --git a/Rendering/Qt/vtkQtStringToImage.h b/Rendering/Qt/vtkQtStringToImage.h
index 390cbb05c82af8e32e9215e79c3ed4ad42e9f82f..32c7c176246a5f8d876d599795548d32e0adc8de 100644
--- a/Rendering/Qt/vtkQtStringToImage.h
+++ b/Rendering/Qt/vtkQtStringToImage.h
@@ -18,8 +18,8 @@
 // .SECTION Description
 //
 
-#ifndef __vtkQtStringToImage_h
-#define __vtkQtStringToImage_h
+#ifndef vtkQtStringToImage_h
+#define vtkQtStringToImage_h
 
 #include "vtkRenderingQtModule.h" // For export macro
 #include "vtkStringToImage.h"
@@ -83,4 +83,4 @@ private:
   void operator=(const vtkQtStringToImage &);   // Not implemented.
 };
 
-#endif //__vtkQtStringToImage_h
+#endif //vtkQtStringToImage_h
diff --git a/Rendering/Qt/vtkQtTreeRingLabelMapper.h b/Rendering/Qt/vtkQtTreeRingLabelMapper.h
index 7d06d75426458021850640f14b658e1ee371ffdc..e01c05b446eb69fac6611bdc31d7b603696b1a2d 100644
--- a/Rendering/Qt/vtkQtTreeRingLabelMapper.h
+++ b/Rendering/Qt/vtkQtTreeRingLabelMapper.h
@@ -38,8 +38,8 @@
 // Thanks to Jason Shepherd from
 // Sandia National Laboratories for help in developing this class.
 
-#ifndef __vtkQtTreeRingLabelMapper_h
-#define __vtkQtTreeRingLabelMapper_h
+#ifndef vtkQtTreeRingLabelMapper_h
+#define vtkQtTreeRingLabelMapper_h
 
 #include "vtkRenderingQtModule.h" // For export macro
 #include "vtkLabeledDataMapper.h"
diff --git a/Rendering/Tk/vtkCocoaTkUtilities.h b/Rendering/Tk/vtkCocoaTkUtilities.h
index 34aeb93a3e993f58a442154b27ca439fa891d3fb..d30ae3330e98ad164a811a55ace14f081efc1ccb 100644
--- a/Rendering/Tk/vtkCocoaTkUtilities.h
+++ b/Rendering/Tk/vtkCocoaTkUtilities.h
@@ -28,8 +28,8 @@ PURPOSE.  See the above copyright notice for more information.
 // That means no Objective-C may be used. That's why some instance variables
 // are void* instead of what they really should be.
 
-#ifndef __vtkvtkCocoaTkUtilities_h
-#define __vtkvtkCocoaTkUtilities_h
+#ifndef vtkvtkCocoaTkUtilities_h
+#define vtkvtkCocoaTkUtilities_h
 
 #include "vtkObject.h"
 
diff --git a/Rendering/Tk/vtkTkImageViewerWidget.h b/Rendering/Tk/vtkTkImageViewerWidget.h
index ad7d8c1b1e36ec5173d28047f544c02cea52bb97..467c2e845e4e22ed30f5baf04bfc7f46419ea2f1 100644
--- a/Rendering/Tk/vtkTkImageViewerWidget.h
+++ b/Rendering/Tk/vtkTkImageViewerWidget.h
@@ -25,8 +25,8 @@
 // vtkImageViewer
 
 
-#ifndef __vtkTkImageViewerWidget_h
-#define __vtkTkImageViewerWidget_h
+#ifndef vtkTkImageViewerWidget_h
+#define vtkTkImageViewerWidget_h
 
 #include "vtkImageViewer.h"
 #include "vtkTcl.h"
diff --git a/Rendering/Tk/vtkTkRenderWidget.h b/Rendering/Tk/vtkTkRenderWidget.h
index a440fe6065e99d16302c0650ba2a353a2dd2e18a..5f035d66ddc31dd15221e4c578698e71cf8dae46 100644
--- a/Rendering/Tk/vtkTkRenderWidget.h
+++ b/Rendering/Tk/vtkTkRenderWidget.h
@@ -26,8 +26,8 @@
 // vtkRenderWindow vtkRenderer
 
 
-#ifndef __vtkTkRenderWidget_h
-#define __vtkTkRenderWidget_h
+#ifndef vtkTkRenderWidget_h
+#define vtkTkRenderWidget_h
 
 #include "vtkRenderWindow.h"
 #include "vtkTcl.h"
diff --git a/Rendering/Tk/vtkXRenderWindowTclInteractor.h b/Rendering/Tk/vtkXRenderWindowTclInteractor.h
index def6d0dddab9ec4e832a94d858ce44057ea6c024..78b56d4f1ad3327799aaef809e05b9e3fbee36ea 100644
--- a/Rendering/Tk/vtkXRenderWindowTclInteractor.h
+++ b/Rendering/Tk/vtkXRenderWindowTclInteractor.h
@@ -23,8 +23,8 @@
 // .SECTION see also
 // vtkRenderWindowInteractor vtkXRenderWindowInteractor vtkXRenderWindow
 
-#ifndef __vtkXRenderWindowTclInteractor_h
-#define __vtkXRenderWindowTclInteractor_h
+#ifndef vtkXRenderWindowTclInteractor_h
+#define vtkXRenderWindowTclInteractor_h
 
 #include "vtkXRenderWindowInteractor.h"
 
diff --git a/Rendering/Volume/vtkDirectionEncoder.h b/Rendering/Volume/vtkDirectionEncoder.h
index 75bf339e181a69009238b3668a29277cec7bd740..9164ead2837597c0d616c1622df8773001fde8e3 100644
--- a/Rendering/Volume/vtkDirectionEncoder.h
+++ b/Rendering/Volume/vtkDirectionEncoder.h
@@ -27,8 +27,8 @@
 // .SECTION see also
 // vtkRecursiveSphereDirectionEncoder
 
-#ifndef __vtkDirectionEncoder_h
-#define __vtkDirectionEncoder_h
+#ifndef vtkDirectionEncoder_h
+#define vtkDirectionEncoder_h
 
 #include "vtkRenderingVolumeModule.h" // For export macro
 #include "vtkObject.h"
diff --git a/Rendering/Volume/vtkEncodedGradientEstimator.h b/Rendering/Volume/vtkEncodedGradientEstimator.h
index 81c9bf99083abf6a7f3a7b8951b25a81bebd8e27..55ce3805c89fbdcb60c380d4b927401bc52fba36 100644
--- a/Rendering/Volume/vtkEncodedGradientEstimator.h
+++ b/Rendering/Volume/vtkEncodedGradientEstimator.h
@@ -28,8 +28,8 @@
 // .SECTION see also
 // vtkFiniteDifferenceGradientEstimator vtkDirectionEncoder
 
-#ifndef __vtkEncodedGradientEstimator_h
-#define __vtkEncodedGradientEstimator_h
+#ifndef vtkEncodedGradientEstimator_h
+#define vtkEncodedGradientEstimator_h
 
 #include "vtkRenderingVolumeModule.h" // For export macro
 #include "vtkObject.h"
diff --git a/Rendering/Volume/vtkEncodedGradientShader.h b/Rendering/Volume/vtkEncodedGradientShader.h
index 77f2999c75c7dfc064cde054a20b9f3030f0f79c..c02215a2ba7273a6be99a691722c4e1ef89d2e52 100644
--- a/Rendering/Volume/vtkEncodedGradientShader.h
+++ b/Rendering/Volume/vtkEncodedGradientShader.h
@@ -27,8 +27,8 @@
 // per volume. This is necessary because multiple volumes can share a
 // volume mapper.
 
-#ifndef __vtkEncodedGradientShader_h
-#define __vtkEncodedGradientShader_h
+#ifndef vtkEncodedGradientShader_h
+#define vtkEncodedGradientShader_h
 
 #include "vtkRenderingVolumeModule.h" // For export macro
 #include "vtkObject.h"
diff --git a/Rendering/Volume/vtkFiniteDifferenceGradientEstimator.h b/Rendering/Volume/vtkFiniteDifferenceGradientEstimator.h
index 573b4c3e721aaee6a4b1ef9c00d628a30d0500f1..5e93e18fa5fc41bdd74b17926b3414f9d928252f 100644
--- a/Rendering/Volume/vtkFiniteDifferenceGradientEstimator.h
+++ b/Rendering/Volume/vtkFiniteDifferenceGradientEstimator.h
@@ -33,8 +33,8 @@
 // .SECTION see also
 // vtkEncodedGradientEstimator
 
-#ifndef __vtkFiniteDifferenceGradientEstimator_h
-#define __vtkFiniteDifferenceGradientEstimator_h
+#ifndef vtkFiniteDifferenceGradientEstimator_h
+#define vtkFiniteDifferenceGradientEstimator_h
 
 #include "vtkRenderingVolumeModule.h" // For export macro
 #include "vtkEncodedGradientEstimator.h"
diff --git a/Rendering/Volume/vtkFixedPointRayCastImage.h b/Rendering/Volume/vtkFixedPointRayCastImage.h
index 0c7539426edd84baa92d6d10d77a5db3910af8a6..39ee52fab7cded7abb4c83e10f455fcfdb75ca67 100644
--- a/Rendering/Volume/vtkFixedPointRayCastImage.h
+++ b/Rendering/Volume/vtkFixedPointRayCastImage.h
@@ -27,8 +27,8 @@
 // .SECTION see also
 // vtkFixedPointVolumeRayCastMapper
 
-#ifndef __vtkFixedPointRayCastImage_h
-#define __vtkFixedPointRayCastImage_h
+#ifndef vtkFixedPointRayCastImage_h
+#define vtkFixedPointRayCastImage_h
 
 #include "vtkRenderingVolumeModule.h" // For export macro
 #include "vtkObject.h"
diff --git a/Rendering/Volume/vtkFixedPointVolumeRayCastCompositeGOHelper.h b/Rendering/Volume/vtkFixedPointVolumeRayCastCompositeGOHelper.h
index 010d9f0aea647d2d230e4fe8224008c5eb087a3f..74e73c5b71ad16952c1ca11d9bf0b4c872e89c77 100644
--- a/Rendering/Volume/vtkFixedPointVolumeRayCastCompositeGOHelper.h
+++ b/Rendering/Volume/vtkFixedPointVolumeRayCastCompositeGOHelper.h
@@ -26,8 +26,8 @@
 // .SECTION see also
 // vtkFixedPointVolumeRayCastMapper
 
-#ifndef __vtkFixedPointVolumeRayCastCompositeGOHelper_h
-#define __vtkFixedPointVolumeRayCastCompositeGOHelper_h
+#ifndef vtkFixedPointVolumeRayCastCompositeGOHelper_h
+#define vtkFixedPointVolumeRayCastCompositeGOHelper_h
 
 #include "vtkRenderingVolumeModule.h" // For export macro
 #include "vtkFixedPointVolumeRayCastHelper.h"
diff --git a/Rendering/Volume/vtkFixedPointVolumeRayCastCompositeGOShadeHelper.h b/Rendering/Volume/vtkFixedPointVolumeRayCastCompositeGOShadeHelper.h
index 70bac086e861f109d6acf30edb4065c1b33f3ced..15b60ee6ee741736009a177744208587ab5fb525 100644
--- a/Rendering/Volume/vtkFixedPointVolumeRayCastCompositeGOShadeHelper.h
+++ b/Rendering/Volume/vtkFixedPointVolumeRayCastCompositeGOShadeHelper.h
@@ -26,8 +26,8 @@
 // .SECTION see also
 // vtkFixedPointVolumeRayCastMapper
 
-#ifndef __vtkFixedPointVolumeRayCastCompositeGOShadeHelper_h
-#define __vtkFixedPointVolumeRayCastCompositeGOShadeHelper_h
+#ifndef vtkFixedPointVolumeRayCastCompositeGOShadeHelper_h
+#define vtkFixedPointVolumeRayCastCompositeGOShadeHelper_h
 
 #include "vtkRenderingVolumeModule.h" // For export macro
 #include "vtkFixedPointVolumeRayCastHelper.h"
diff --git a/Rendering/Volume/vtkFixedPointVolumeRayCastCompositeHelper.h b/Rendering/Volume/vtkFixedPointVolumeRayCastCompositeHelper.h
index e1a8f7bb601fe0a1e734ab80cfc7a732a7105952..92a0cf2c3b255dd3acd26a1f7ab729fa67209444 100644
--- a/Rendering/Volume/vtkFixedPointVolumeRayCastCompositeHelper.h
+++ b/Rendering/Volume/vtkFixedPointVolumeRayCastCompositeHelper.h
@@ -26,8 +26,8 @@
 // .SECTION see also
 // vtkFixedPointVolumeRayCastMapper
 
-#ifndef __vtkFixedPointVolumeRayCastCompositeHelper_h
-#define __vtkFixedPointVolumeRayCastCompositeHelper_h
+#ifndef vtkFixedPointVolumeRayCastCompositeHelper_h
+#define vtkFixedPointVolumeRayCastCompositeHelper_h
 
 #include "vtkRenderingVolumeModule.h" // For export macro
 #include "vtkFixedPointVolumeRayCastHelper.h"
diff --git a/Rendering/Volume/vtkFixedPointVolumeRayCastCompositeShadeHelper.h b/Rendering/Volume/vtkFixedPointVolumeRayCastCompositeShadeHelper.h
index b04cb9fdff596641635ebbd4e4fb245ec0a28dfb..913fb8e13890dbcea7ab02857b5d2e97ecf3ae2b 100644
--- a/Rendering/Volume/vtkFixedPointVolumeRayCastCompositeShadeHelper.h
+++ b/Rendering/Volume/vtkFixedPointVolumeRayCastCompositeShadeHelper.h
@@ -26,8 +26,8 @@
 // .SECTION see also
 // vtkFixedPointVolumeRayCastMapper
 
-#ifndef __vtkFixedPointVolumeRayCastCompositeShadeHelper_h
-#define __vtkFixedPointVolumeRayCastCompositeShadeHelper_h
+#ifndef vtkFixedPointVolumeRayCastCompositeShadeHelper_h
+#define vtkFixedPointVolumeRayCastCompositeShadeHelper_h
 
 #include "vtkRenderingVolumeModule.h" // For export macro
 #include "vtkFixedPointVolumeRayCastHelper.h"
diff --git a/Rendering/Volume/vtkFixedPointVolumeRayCastHelper.h b/Rendering/Volume/vtkFixedPointVolumeRayCastHelper.h
index e9aff90085b740bba24906437b50db9f2f203a1c..ef8a903d926cc5e9ca6b85f1be0cf6c6ce081699 100644
--- a/Rendering/Volume/vtkFixedPointVolumeRayCastHelper.h
+++ b/Rendering/Volume/vtkFixedPointVolumeRayCastHelper.h
@@ -20,8 +20,8 @@
 // .SECTION see also
 // vtkFixedPointVolumeRayCastMapper
 
-#ifndef __vtkFixedPointVolumeRayCastHelper_h
-#define __vtkFixedPointVolumeRayCastHelper_h
+#ifndef vtkFixedPointVolumeRayCastHelper_h
+#define vtkFixedPointVolumeRayCastHelper_h
 
 //BTX
 #define VTKKWRCHelper_GetCellScalarValues( DATA, SCALE, SHIFT ) \
diff --git a/Rendering/Volume/vtkFixedPointVolumeRayCastMIPHelper.h b/Rendering/Volume/vtkFixedPointVolumeRayCastMIPHelper.h
index 747dd15f7878cc59de01312459e7caf15862682d..93f743cf659db256580601deea23bad0bd7e5041 100644
--- a/Rendering/Volume/vtkFixedPointVolumeRayCastMIPHelper.h
+++ b/Rendering/Volume/vtkFixedPointVolumeRayCastMIPHelper.h
@@ -22,8 +22,8 @@
 // .SECTION see also
 // vtkFixedPointVolumeRayCastMapper
 
-#ifndef __vtkFixedPointVolumeRayCastMIPHelper_h
-#define __vtkFixedPointVolumeRayCastMIPHelper_h
+#ifndef vtkFixedPointVolumeRayCastMIPHelper_h
+#define vtkFixedPointVolumeRayCastMIPHelper_h
 
 #include "vtkRenderingVolumeModule.h" // For export macro
 #include "vtkFixedPointVolumeRayCastHelper.h"
diff --git a/Rendering/Volume/vtkFixedPointVolumeRayCastMapper.h b/Rendering/Volume/vtkFixedPointVolumeRayCastMapper.h
index 4707eebdbc0cf0adc1e28cc03a685ad8685b9cd9..5a3ae5c45311a2983dc78fd6c004b30da026c61e 100644
--- a/Rendering/Volume/vtkFixedPointVolumeRayCastMapper.h
+++ b/Rendering/Volume/vtkFixedPointVolumeRayCastMapper.h
@@ -55,8 +55,8 @@
 // .SECTION see also
 // vtkVolumeMapper
 
-#ifndef __vtkFixedPointVolumeRayCastMapper_h
-#define __vtkFixedPointVolumeRayCastMapper_h
+#ifndef vtkFixedPointVolumeRayCastMapper_h
+#define vtkFixedPointVolumeRayCastMapper_h
 
 #include "vtkRenderingVolumeModule.h" // For export macro
 #include "vtkVolumeMapper.h"
diff --git a/Rendering/Volume/vtkGPUVolumeRayCastMapper.h b/Rendering/Volume/vtkGPUVolumeRayCastMapper.h
index 20b6f16b11316223de176356f4dc115ff5d6600a..64968660ac14e9ef0ce5b190faed8ac64d0e6b5e 100644
--- a/Rendering/Volume/vtkGPUVolumeRayCastMapper.h
+++ b/Rendering/Volume/vtkGPUVolumeRayCastMapper.h
@@ -19,8 +19,8 @@
 //
 
 
-#ifndef __vtkGPUVolumeRayCastMapper_h
-#define __vtkGPUVolumeRayCastMapper_h
+#ifndef vtkGPUVolumeRayCastMapper_h
+#define vtkGPUVolumeRayCastMapper_h
 
 #include "vtkRenderingVolumeModule.h" // For export macro
 #include "vtkVolumeMapper.h"
diff --git a/Rendering/Volume/vtkHAVSVolumeMapper.h b/Rendering/Volume/vtkHAVSVolumeMapper.h
index 319e850dd195feb123056a95ab500d880c6e13c5..04e323fb4eb59a44f24da84fda4af62286a2e141 100644
--- a/Rendering/Volume/vtkHAVSVolumeMapper.h
+++ b/Rendering/Volume/vtkHAVSVolumeMapper.h
@@ -101,8 +101,8 @@ PURPOSE.  See the above copyright notice for more information.
 // by Sandia National Labs.
 //
 
-#ifndef __vtkHAVSVolumeMapper_h
-#define __vtkHAVSVolumeMapper_h
+#ifndef vtkHAVSVolumeMapper_h
+#define vtkHAVSVolumeMapper_h
 
 #include "vtkRenderingVolumeModule.h" // For export macro
 #include "vtkUnstructuredGridVolumeMapper.h"
diff --git a/Rendering/Volume/vtkProjectedAAHexahedraMapper.h b/Rendering/Volume/vtkProjectedAAHexahedraMapper.h
index a6c673789ab489abc0159738b26eb772475e8d2d..9604d9351c0c3ab95a52b71972c4396713466bcd 100644
--- a/Rendering/Volume/vtkProjectedAAHexahedraMapper.h
+++ b/Rendering/Volume/vtkProjectedAAHexahedraMapper.h
@@ -25,8 +25,8 @@
 // "High-Quality, Semi-Analytical Volume Rendering for AMR Data",
 // Stephane Marchesin and Guillaume Colin de Verdiere, IEEE Vis 2009.
 
-#ifndef __vtkProjectedAAHexahedraMapper_h
-#define __vtkProjectedAAHexahedraMapper_h
+#ifndef vtkProjectedAAHexahedraMapper_h
+#define vtkProjectedAAHexahedraMapper_h
 
 #include "vtkRenderingVolumeModule.h" // For export macro
 #include "vtkUnstructuredGridVolumeMapper.h"
diff --git a/Rendering/Volume/vtkProjectedTetrahedraMapper.h b/Rendering/Volume/vtkProjectedTetrahedraMapper.h
index aaf9a98405e77e915105b45452d244bbcf0c0091..84987d2e86aff44bcef15c01ca2c58825e3c611c 100644
--- a/Rendering/Volume/vtkProjectedTetrahedraMapper.h
+++ b/Rendering/Volume/vtkProjectedTetrahedraMapper.h
@@ -36,8 +36,8 @@
 // cause this mapper to produce artifacts.
 //
 
-#ifndef __vtkProjectedTetrahedraMapper_h
-#define __vtkProjectedTetrahedraMapper_h
+#ifndef vtkProjectedTetrahedraMapper_h
+#define vtkProjectedTetrahedraMapper_h
 
 #include "vtkRenderingVolumeModule.h" // For export macro
 #include "vtkUnstructuredGridVolumeMapper.h"
diff --git a/Rendering/Volume/vtkRayCastImageDisplayHelper.h b/Rendering/Volume/vtkRayCastImageDisplayHelper.h
index 9bb2e6527c158168b6a1fcd12767262b672a05ea..3c8e8f283ee4cea74735aa442e6a405a23506383 100644
--- a/Rendering/Volume/vtkRayCastImageDisplayHelper.h
+++ b/Rendering/Volume/vtkRayCastImageDisplayHelper.h
@@ -22,8 +22,8 @@
 // vtkVolumeRayCastMapper vtkUnstructuredGridVolumeRayCastMapper
 // vtkOpenGLRayCastImageDisplayHelper
 
-#ifndef __vtkRayCastImageDisplayHelper_h
-#define __vtkRayCastImageDisplayHelper_h
+#ifndef vtkRayCastImageDisplayHelper_h
+#define vtkRayCastImageDisplayHelper_h
 
 #include "vtkRenderingVolumeModule.h" // For export macro
 #include "vtkObject.h"
diff --git a/Rendering/Volume/vtkRecursiveSphereDirectionEncoder.h b/Rendering/Volume/vtkRecursiveSphereDirectionEncoder.h
index 415ca91039877eab07ba691b1e72a328b8b4fd10..c1810da4ca33f7eecfcc63309f7220f123019501 100644
--- a/Rendering/Volume/vtkRecursiveSphereDirectionEncoder.h
+++ b/Rendering/Volume/vtkRecursiveSphereDirectionEncoder.h
@@ -23,8 +23,8 @@
 // .SECTION see also
 // vtkDirectionEncoder
 
-#ifndef __vtkRecursiveSphereDirectionEncoder_h
-#define __vtkRecursiveSphereDirectionEncoder_h
+#ifndef vtkRecursiveSphereDirectionEncoder_h
+#define vtkRecursiveSphereDirectionEncoder_h
 
 #include "vtkRenderingVolumeModule.h" // For export macro
 #include "vtkDirectionEncoder.h"
diff --git a/Rendering/Volume/vtkSphericalDirectionEncoder.h b/Rendering/Volume/vtkSphericalDirectionEncoder.h
index 5a3a46d896f8489318a5408170c40db55d85cdeb..28c40ca2a7d5243b72015be4b7ac98f77b792b35 100644
--- a/Rendering/Volume/vtkSphericalDirectionEncoder.h
+++ b/Rendering/Volume/vtkSphericalDirectionEncoder.h
@@ -20,8 +20,8 @@
 // .SECTION see also
 // vtkDirectionEncoder
 
-#ifndef __vtkSphericalDirectionEncoder_h
-#define __vtkSphericalDirectionEncoder_h
+#ifndef vtkSphericalDirectionEncoder_h
+#define vtkSphericalDirectionEncoder_h
 
 #include "vtkRenderingVolumeModule.h" // For export macro
 #include "vtkDirectionEncoder.h"
diff --git a/Rendering/Volume/vtkUnstructuredGridBunykRayCastFunction.h b/Rendering/Volume/vtkUnstructuredGridBunykRayCastFunction.h
index 2965739c332f1865bdc57a2d2ac55232eea6eb2b..2cde860ec76974d44a428d16c56307aa320dd0f1 100644
--- a/Rendering/Volume/vtkUnstructuredGridBunykRayCastFunction.h
+++ b/Rendering/Volume/vtkUnstructuredGridBunykRayCastFunction.h
@@ -54,8 +54,8 @@
 // .SECTION See Also
 // vtkUnstructuredGridVolumeRayCastMapper
 
-#ifndef __vtkUnstructuredGridBunykRayCastFunction_h
-#define __vtkUnstructuredGridBunykRayCastFunction_h
+#ifndef vtkUnstructuredGridBunykRayCastFunction_h
+#define vtkUnstructuredGridBunykRayCastFunction_h
 
 #include "vtkRenderingVolumeModule.h" // For export macro
 #include "vtkUnstructuredGridVolumeRayCastFunction.h"
diff --git a/Rendering/Volume/vtkUnstructuredGridHomogeneousRayIntegrator.h b/Rendering/Volume/vtkUnstructuredGridHomogeneousRayIntegrator.h
index ce949358c3ea323cb1ee8d92ad5f174d5e66d7e8..5b824c2fac477b2caeb9d746080deaa0b245970d 100644
--- a/Rendering/Volume/vtkUnstructuredGridHomogeneousRayIntegrator.h
+++ b/Rendering/Volume/vtkUnstructuredGridHomogeneousRayIntegrator.h
@@ -31,8 +31,8 @@
 // that are defined on cells.
 //
 
-#ifndef __vtkUnstructuredGridHomogeneousRayIntegrator_h
-#define __vtkUnstructuredGridHomogeneousRayIntegrator_h
+#ifndef vtkUnstructuredGridHomogeneousRayIntegrator_h
+#define vtkUnstructuredGridHomogeneousRayIntegrator_h
 
 #include "vtkRenderingVolumeModule.h" // For export macro
 #include "vtkUnstructuredGridVolumeRayIntegrator.h"
@@ -85,4 +85,4 @@ private:
   void operator=(const vtkUnstructuredGridHomogeneousRayIntegrator&);  // Not implemented
 };
 
-#endif //__vtkUnstructuredGridHomogeneousRayIntegrator_h
+#endif //vtkUnstructuredGridHomogeneousRayIntegrator_h
diff --git a/Rendering/Volume/vtkUnstructuredGridLinearRayIntegrator.h b/Rendering/Volume/vtkUnstructuredGridLinearRayIntegrator.h
index 8a84d98b35049e240ad72badb81a9e0f043010cd..16f217b5102f9cfc35045be9dae01a1b152fedce 100644
--- a/Rendering/Volume/vtkUnstructuredGridLinearRayIntegrator.h
+++ b/Rendering/Volume/vtkUnstructuredGridLinearRayIntegrator.h
@@ -37,8 +37,8 @@
 // vtkUnstructuredGridPartialPreIntegration
 //
 
-#ifndef __vtkUnstructuredGridLinearRayIntegrator_h
-#define __vtkUnstructuredGridLinearRayIntegrator_h
+#ifndef vtkUnstructuredGridLinearRayIntegrator_h
+#define vtkUnstructuredGridLinearRayIntegrator_h
 
 #include "vtkRenderingVolumeModule.h" // For export macro
 #include "vtkUnstructuredGridVolumeRayIntegrator.h"
@@ -96,4 +96,4 @@ private:
   void operator=(const vtkUnstructuredGridLinearRayIntegrator&);  // Not implemented.
 };
 
-#endif //__vtkUnstructuredGridLinearRayIntegrator_h
+#endif //vtkUnstructuredGridLinearRayIntegrator_h
diff --git a/Rendering/Volume/vtkUnstructuredGridPartialPreIntegration.h b/Rendering/Volume/vtkUnstructuredGridPartialPreIntegration.h
index fe1a428602d26c098e88245e5959947ab4cd74c4..70a02321887318929070f8ffcb5b2d7c4a8ce925 100644
--- a/Rendering/Volume/vtkUnstructuredGridPartialPreIntegration.h
+++ b/Rendering/Volume/vtkUnstructuredGridPartialPreIntegration.h
@@ -36,8 +36,8 @@
 // This class is thread safe only after the first instance is created.
 //
 
-#ifndef __vtkUnstructuredGridPartialPreIntegration_h
-#define __vtkUnstructuredGridPartialPreIntegration_h
+#ifndef vtkUnstructuredGridPartialPreIntegration_h
+#define vtkUnstructuredGridPartialPreIntegration_h
 
 #include "vtkRenderingVolumeModule.h" // For export macro
 #include "vtkUnstructuredGridVolumeRayIntegrator.h"
@@ -164,4 +164,4 @@ inline void vtkUnstructuredGridPartialPreIntegration::IntegrateRay(
   color[3] += (1-color[3])*alpha;
 }
 
-#endif //__vtkUnstructuredGridPartialPreIntegration_h
+#endif //vtkUnstructuredGridPartialPreIntegration_h
diff --git a/Rendering/Volume/vtkUnstructuredGridPreIntegration.h b/Rendering/Volume/vtkUnstructuredGridPreIntegration.h
index c4d8c95c54de11d44806fbe975e0cc0d3ff3e578..ef82039321a1dce3f733dfa4a0ef407b11457857 100644
--- a/Rendering/Volume/vtkUnstructuredGridPreIntegration.h
+++ b/Rendering/Volume/vtkUnstructuredGridPreIntegration.h
@@ -38,8 +38,8 @@
 // independent scalars.  Thus, dependent scalars are not supported.
 //
 
-#ifndef __vtkUnstructuredGridPreIntegration_h
-#define __vtkUnstructuredGridPreIntegration_h
+#ifndef vtkUnstructuredGridPreIntegration_h
+#define vtkUnstructuredGridPreIntegration_h
 
 #include "vtkRenderingVolumeModule.h" // For export macro
 #include "vtkUnstructuredGridVolumeRayIntegrator.h"
@@ -181,4 +181,4 @@ inline float *vtkUnstructuredGridPreIntegration::GetTableEntry(
   return this->GetIndexedTableEntry(sfi, sbi, li, component);
 }
 
-#endif //__vtkUnstructuredGridPreIntegration_h
+#endif //vtkUnstructuredGridPreIntegration_h
diff --git a/Rendering/Volume/vtkUnstructuredGridVolumeMapper.h b/Rendering/Volume/vtkUnstructuredGridVolumeMapper.h
index 667fbb5ff639e5447f06899ba16724a399c118bd..d45eab5f211c1073e8a60e5ec73b8f27bc809507 100644
--- a/Rendering/Volume/vtkUnstructuredGridVolumeMapper.h
+++ b/Rendering/Volume/vtkUnstructuredGridVolumeMapper.h
@@ -22,8 +22,8 @@
 // .SECTION see also
 // vtkUnstructuredGridVolumeRayCastMapper
 
-#ifndef __vtkUnstructuredGridVolumeMapper_h
-#define __vtkUnstructuredGridVolumeMapper_h
+#ifndef vtkUnstructuredGridVolumeMapper_h
+#define vtkUnstructuredGridVolumeMapper_h
 
 #include "vtkRenderingVolumeModule.h" // For export macro
 #include "vtkAbstractVolumeMapper.h"
diff --git a/Rendering/Volume/vtkUnstructuredGridVolumeRayCastFunction.h b/Rendering/Volume/vtkUnstructuredGridVolumeRayCastFunction.h
index 2f2275dc40aa551d6db1b5ccb083f81433a457c6..115d08c4040133859a7a2fd967233aaf78d41596 100644
--- a/Rendering/Volume/vtkUnstructuredGridVolumeRayCastFunction.h
+++ b/Rendering/Volume/vtkUnstructuredGridVolumeRayCastFunction.h
@@ -22,8 +22,8 @@
 // .SECTION See Also
 // vtkUnstructuredGridVolumeRayCastMapper vtkUnstructuredGridVolumeRayIntegrator
 
-#ifndef __vtkUnstructuredGridVolumeRayCastFunction_h
-#define __vtkUnstructuredGridVolumeRayCastFunction_h
+#ifndef vtkUnstructuredGridVolumeRayCastFunction_h
+#define vtkUnstructuredGridVolumeRayCastFunction_h
 
 #include "vtkRenderingVolumeModule.h" // For export macro
 #include "vtkObject.h"
diff --git a/Rendering/Volume/vtkUnstructuredGridVolumeRayCastIterator.h b/Rendering/Volume/vtkUnstructuredGridVolumeRayCastIterator.h
index 0492c5cf2ec6586a1516a8cd0e6c1d9168f49e29..80db2fff985da4e00b653292c05a978d5aeeab7a 100644
--- a/Rendering/Volume/vtkUnstructuredGridVolumeRayCastIterator.h
+++ b/Rendering/Volume/vtkUnstructuredGridVolumeRayCastIterator.h
@@ -28,8 +28,8 @@
 // vtkUnstructuredGridVolumeRayCastFunction
 //
 
-#ifndef __vtkUnstructuredGridVolumeRayCastIterator_h
-#define __vtkUnstructuredGridVolumeRayCastIterator_h
+#ifndef vtkUnstructuredGridVolumeRayCastIterator_h
+#define vtkUnstructuredGridVolumeRayCastIterator_h
 
 #include "vtkRenderingVolumeModule.h" // For export macro
 #include "vtkObject.h"
@@ -90,5 +90,5 @@ private:
   void operator=(const vtkUnstructuredGridVolumeRayCastIterator&);  // Not implemented.
 };
 
-#endif //__vtkUnstructuredGridRayCastIterator_h
+#endif //vtkUnstructuredGridRayCastIterator_h
 
diff --git a/Rendering/Volume/vtkUnstructuredGridVolumeRayCastMapper.h b/Rendering/Volume/vtkUnstructuredGridVolumeRayCastMapper.h
index 891ca0e322abebff6c29f6a4ae5f4195080adf1a..dedb91d8a8a2c94d837905cb28ccb0da7aef3627 100644
--- a/Rendering/Volume/vtkUnstructuredGridVolumeRayCastMapper.h
+++ b/Rendering/Volume/vtkUnstructuredGridVolumeRayCastMapper.h
@@ -20,8 +20,8 @@
 // .SECTION see also
 // vtkVolumeMapper
 
-#ifndef __vtkUnstructuredGridVolumeRayCastMapper_h
-#define __vtkUnstructuredGridVolumeRayCastMapper_h
+#ifndef vtkUnstructuredGridVolumeRayCastMapper_h
+#define vtkUnstructuredGridVolumeRayCastMapper_h
 
 #include "vtkRenderingVolumeModule.h" // For export macro
 #include "vtkUnstructuredGridVolumeMapper.h"
diff --git a/Rendering/Volume/vtkUnstructuredGridVolumeRayIntegrator.h b/Rendering/Volume/vtkUnstructuredGridVolumeRayIntegrator.h
index 4d9c3d86699a2d87d690089846bd18114c67e550..5de3b0e4a61241316d87d84347538e0104747701 100644
--- a/Rendering/Volume/vtkUnstructuredGridVolumeRayIntegrator.h
+++ b/Rendering/Volume/vtkUnstructuredGridVolumeRayIntegrator.h
@@ -25,8 +25,8 @@
 // vtkUnstructuredGridVolumeRayCastMapper
 // vtkUnstructuredGridVolumeRayCastFunction
 
-#ifndef __vtkUnstructuredGridVolumeRayIntegrator_h
-#define __vtkUnstructuredGridVolumeRayIntegrator_h
+#ifndef vtkUnstructuredGridVolumeRayIntegrator_h
+#define vtkUnstructuredGridVolumeRayIntegrator_h
 
 #include "vtkRenderingVolumeModule.h" // For export macro
 #include "vtkObject.h"
diff --git a/Rendering/Volume/vtkUnstructuredGridVolumeZSweepMapper.h b/Rendering/Volume/vtkUnstructuredGridVolumeZSweepMapper.h
index 32cd2be58126952f3881783df1207c43a7159d06..74ad7163b8e44c51c31603aa4bc50783f8fa83ea 100644
--- a/Rendering/Volume/vtkUnstructuredGridVolumeZSweepMapper.h
+++ b/Rendering/Volume/vtkUnstructuredGridVolumeZSweepMapper.h
@@ -29,8 +29,8 @@
 // October 2000.
 // http://www.cse.ogi.edu/~csilva/papers/volvis2000.pdf
 
-#ifndef __vtkUnstructuredGridVolumeZSweepMapper_h
-#define __vtkUnstructuredGridVolumeZSweepMapper_h
+#ifndef vtkUnstructuredGridVolumeZSweepMapper_h
+#define vtkUnstructuredGridVolumeZSweepMapper_h
 
 #include "vtkRenderingVolumeModule.h" // For export macro
 #include "vtkUnstructuredGridVolumeMapper.h"
diff --git a/Rendering/Volume/vtkVolumeMapper.h b/Rendering/Volume/vtkVolumeMapper.h
index a4fd30ea32a695cfdafdc0357a5c415f03948efa..49703ef7922615fb15be803f6b026652826df31f 100644
--- a/Rendering/Volume/vtkVolumeMapper.h
+++ b/Rendering/Volume/vtkVolumeMapper.h
@@ -22,8 +22,8 @@
 // .SECTION see also
 // vtkVolumeRayCastMapper vtkVolumeTextureMapper2D
 
-#ifndef __vtkVolumeMapper_h
-#define __vtkVolumeMapper_h
+#ifndef vtkVolumeMapper_h
+#define vtkVolumeMapper_h
 
 #include "vtkRenderingVolumeModule.h" // For export macro
 #include "vtkAbstractVolumeMapper.h"
diff --git a/Rendering/Volume/vtkVolumeOutlineSource.h b/Rendering/Volume/vtkVolumeOutlineSource.h
index 01c4028af1383bc098fb0bfcc2b034a99342cf9e..1e97435bf2260f705bacdf484133331d0443f27b 100644
--- a/Rendering/Volume/vtkVolumeOutlineSource.h
+++ b/Rendering/Volume/vtkVolumeOutlineSource.h
@@ -24,8 +24,8 @@
 // .SECTION Thanks
 // Thanks to David Gobbi for contributing this class to VTK.
 
-#ifndef __vtkVolumeOutlineSource_h
-#define __vtkVolumeOutlineSource_h
+#ifndef vtkVolumeOutlineSource_h
+#define vtkVolumeOutlineSource_h
 
 #include "vtkRenderingVolumeModule.h" // For export macro
 #include "vtkPolyDataAlgorithm.h"
diff --git a/Rendering/Volume/vtkVolumePicker.h b/Rendering/Volume/vtkVolumePicker.h
index 332fe54eb4dbc03f8a4129cc8f94cb3a0e9db314..6e2469ac1b0d1a5268d57ec1eca2f649837ba3f8 100644
--- a/Rendering/Volume/vtkVolumePicker.h
+++ b/Rendering/Volume/vtkVolumePicker.h
@@ -27,8 +27,8 @@
 // .SECTION Thanks
 // This class was contributed to VTK by David Gobbi on behalf of Atamai Inc.
 
-#ifndef __vtkVolumePicker_h
-#define __vtkVolumePicker_h
+#ifndef vtkVolumePicker_h
+#define vtkVolumePicker_h
 
 #include "vtkRenderingVolumeModule.h" // For export macro
 #include "vtkCellPicker.h"
diff --git a/Rendering/Volume/vtkVolumeRayCastCompositeFunction.h b/Rendering/Volume/vtkVolumeRayCastCompositeFunction.h
index e31a02e6923489f2370b169de0ec4a2dd5ef2216..4756a940c56daf1ec1c4b8aa2149b716118a25ce 100644
--- a/Rendering/Volume/vtkVolumeRayCastCompositeFunction.h
+++ b/Rendering/Volume/vtkVolumeRayCastCompositeFunction.h
@@ -23,8 +23,8 @@
 // .SECTION See Also
 // vtkVolumeRayCastMapper vtkVolumeProperty vtkVolume
 
-#ifndef __vtkVolumeRayCastCompositeFunction_h
-#define __vtkVolumeRayCastCompositeFunction_h
+#ifndef vtkVolumeRayCastCompositeFunction_h
+#define vtkVolumeRayCastCompositeFunction_h
 
 #include "vtkRenderingVolumeModule.h" // For export macro
 #include "vtkVolumeRayCastFunction.h"
diff --git a/Rendering/Volume/vtkVolumeRayCastFunction.h b/Rendering/Volume/vtkVolumeRayCastFunction.h
index a64462efbeccf17ff066da459643d912e1b30e55..bd339b6580b23b1b8fd665de936239fa399e2a24 100644
--- a/Rendering/Volume/vtkVolumeRayCastFunction.h
+++ b/Rendering/Volume/vtkVolumeRayCastFunction.h
@@ -25,8 +25,8 @@
 // vtkVolumeRayCastCompositeFunction vtkVolumeRayCastMIPFunction
 // vtkVolumeRayCastIsosurfaceFunction vtkVolumeRayCastMapper
 
-#ifndef __vtkVolumeRayCastFunction_h
-#define __vtkVolumeRayCastFunction_h
+#ifndef vtkVolumeRayCastFunction_h
+#define vtkVolumeRayCastFunction_h
 
 #include "vtkRenderingVolumeModule.h" // For export macro
 #include "vtkObject.h"
diff --git a/Rendering/Volume/vtkVolumeRayCastIsosurfaceFunction.h b/Rendering/Volume/vtkVolumeRayCastIsosurfaceFunction.h
index 296e9f6ca0c4f887283d83c8cab5fbe77627d713..8605184ef13e308fcd083ccd7466be27a0d2674b 100644
--- a/Rendering/Volume/vtkVolumeRayCastIsosurfaceFunction.h
+++ b/Rendering/Volume/vtkVolumeRayCastIsosurfaceFunction.h
@@ -27,8 +27,8 @@
 // vtkVolumeRayCastCompositeFunction vtkVolumeRayCastMIPFunction
 // vtkVolume vtkVolumeProperty
 
-#ifndef __vtkVolumeRayCastIsosurfaceFunction_h
-#define __vtkVolumeRayCastIsosurfaceFunction_h
+#ifndef vtkVolumeRayCastIsosurfaceFunction_h
+#define vtkVolumeRayCastIsosurfaceFunction_h
 
 #include "vtkRenderingVolumeModule.h" // For export macro
 #include "vtkVolumeRayCastFunction.h"
diff --git a/Rendering/Volume/vtkVolumeRayCastMIPFunction.h b/Rendering/Volume/vtkVolumeRayCastMIPFunction.h
index ac42582e0da11192a3dba562462f8ab035f7dc23..248ff89c705a23eb7945068064a5835df7a55800 100644
--- a/Rendering/Volume/vtkVolumeRayCastMIPFunction.h
+++ b/Rendering/Volume/vtkVolumeRayCastMIPFunction.h
@@ -28,8 +28,8 @@
 // vtkVolumeRayCastCompositeFunction vtkVolumeRayCastIsosurfaceFunction
 // vtkVolume vtkVolumeProperty
 
-#ifndef __vtkVolumeRayCastMIPFunction_h
-#define __vtkVolumeRayCastMIPFunction_h
+#ifndef vtkVolumeRayCastMIPFunction_h
+#define vtkVolumeRayCastMIPFunction_h
 
 #include "vtkRenderingVolumeModule.h" // For export macro
 #include "vtkVolumeRayCastFunction.h"
diff --git a/Rendering/Volume/vtkVolumeRayCastMapper.h b/Rendering/Volume/vtkVolumeRayCastMapper.h
index 545bcc24025b908ec43310691aa97d007cf17eca..01abcc427a6fab4dfc50e78ab4a5a022c35731af 100644
--- a/Rendering/Volume/vtkVolumeRayCastMapper.h
+++ b/Rendering/Volume/vtkVolumeRayCastMapper.h
@@ -20,8 +20,8 @@
 // .SECTION see also
 // vtkVolumeMapper
 
-#ifndef __vtkVolumeRayCastMapper_h
-#define __vtkVolumeRayCastMapper_h
+#ifndef vtkVolumeRayCastMapper_h
+#define vtkVolumeRayCastMapper_h
 
 #include "vtkRenderingVolumeModule.h" // For export macro
 #include "vtkVolumeMapper.h"
diff --git a/Rendering/Volume/vtkVolumeRayCastSpaceLeapingImageFilter.h b/Rendering/Volume/vtkVolumeRayCastSpaceLeapingImageFilter.h
index 10ad8df9dae5b841e1f3e2ef4b928df5ac7d9de4..a522eb2977f7dfb4190d6aaa2faae91b8dfd765d 100644
--- a/Rendering/Volume/vtkVolumeRayCastSpaceLeapingImageFilter.h
+++ b/Rendering/Volume/vtkVolumeRayCastSpaceLeapingImageFilter.h
@@ -26,8 +26,8 @@
 // The block size may be changed at compile time. Its ifdef'ed to 4 in the CXX
 // file.
 
-#ifndef __vtkVolumeRayCastSpaceLeapingImageFilter_h
-#define __vtkVolumeRayCastSpaceLeapingImageFilter_h
+#ifndef vtkVolumeRayCastSpaceLeapingImageFilter_h
+#define vtkVolumeRayCastSpaceLeapingImageFilter_h
 
 #include "vtkRenderingVolumeModule.h" // For export macro
 #include "vtkThreadedImageAlgorithm.h"
diff --git a/Rendering/Volume/vtkVolumeTextureMapper.h b/Rendering/Volume/vtkVolumeTextureMapper.h
index 478bfd173aac39dc48816d5dac2650d5b15474ec..fda6aba1c27119536dc89d7bbc0edaccea4f3013 100644
--- a/Rendering/Volume/vtkVolumeTextureMapper.h
+++ b/Rendering/Volume/vtkVolumeTextureMapper.h
@@ -21,8 +21,8 @@
 // .SECTION see also
 // vtkVolumeMapper
 
-#ifndef __vtkVolumeTextureMapper_h
-#define __vtkVolumeTextureMapper_h
+#ifndef vtkVolumeTextureMapper_h
+#define vtkVolumeTextureMapper_h
 
 #include "vtkRenderingVolumeModule.h" // For export macro
 #include "vtkVolumeMapper.h"
diff --git a/Rendering/Volume/vtkVolumeTextureMapper2D.h b/Rendering/Volume/vtkVolumeTextureMapper2D.h
index c60cb34374cc1a1025cf3f5ae6d5eb15d4321475..6e21ab4fdee35e1afd2ebe2ca1413f07f2177423 100644
--- a/Rendering/Volume/vtkVolumeTextureMapper2D.h
+++ b/Rendering/Volume/vtkVolumeTextureMapper2D.h
@@ -21,8 +21,8 @@
 // .SECTION see also
 // vtkVolumeMapper
 
-#ifndef __vtkVolumeTextureMapper2D_h
-#define __vtkVolumeTextureMapper2D_h
+#ifndef vtkVolumeTextureMapper2D_h
+#define vtkVolumeTextureMapper2D_h
 
 #include "vtkRenderingVolumeModule.h" // For export macro
 #include "vtkVolumeTextureMapper.h"
diff --git a/Rendering/Volume/vtkVolumeTextureMapper3D.h b/Rendering/Volume/vtkVolumeTextureMapper3D.h
index 0db286ff2dea32b7a2c721fe2a2512cc2906b3d8..41e1fc5e6f416cbc76572099f59da292987dcfb3 100644
--- a/Rendering/Volume/vtkVolumeTextureMapper3D.h
+++ b/Rendering/Volume/vtkVolumeTextureMapper3D.h
@@ -70,8 +70,8 @@
 // .SECTION see also
 // vtkVolumeMapper
 
-#ifndef __vtkVolumeTextureMapper3D_h
-#define __vtkVolumeTextureMapper3D_h
+#ifndef vtkVolumeTextureMapper3D_h
+#define vtkVolumeTextureMapper3D_h
 
 #include "vtkRenderingVolumeModule.h" // For export macro
 #include "vtkVolumeMapper.h"
diff --git a/Rendering/VolumeAMR/vtkAMRVolumeMapper.h b/Rendering/VolumeAMR/vtkAMRVolumeMapper.h
index 75fcd5ff8a81db10f6e93e38782c6ce4e53e8f30..5e9dc29bd0cba9a67cb9c6184805e0e721e2916f 100644
--- a/Rendering/VolumeAMR/vtkAMRVolumeMapper.h
+++ b/Rendering/VolumeAMR/vtkAMRVolumeMapper.h
@@ -21,8 +21,8 @@
 // .SECTION see also
 //
 
-#ifndef __vtkAMRVolumeMapper_h
-#define __vtkAMRVolumeMapper_h
+#ifndef vtkAMRVolumeMapper_h
+#define vtkAMRVolumeMapper_h
 
 #include "vtkRenderingVolumeAMRModule.h" // For export macro
 #include "vtkVolumeMapper.h"
diff --git a/Rendering/VolumeOpenGL/vtkOpenGLGPUVolumeRayCastMapper.h b/Rendering/VolumeOpenGL/vtkOpenGLGPUVolumeRayCastMapper.h
index 20e7030767b09a772d6c5b3a82e5631d33db2907..2c4d34347736b6def8a3beec3ce110ade4f03e70 100644
--- a/Rendering/VolumeOpenGL/vtkOpenGLGPUVolumeRayCastMapper.h
+++ b/Rendering/VolumeOpenGL/vtkOpenGLGPUVolumeRayCastMapper.h
@@ -24,8 +24,8 @@
 // .SECTION Thanks
 // Thanks to Michael Granseier for helping to debug this class with respect
 // to maximum memory issues (which must be specified as vtkIdType and not int).
-#ifndef __vtkOpenGLGPUVolumeRayCastMapper_h
-#define __vtkOpenGLGPUVolumeRayCastMapper_h
+#ifndef vtkOpenGLGPUVolumeRayCastMapper_h
+#define vtkOpenGLGPUVolumeRayCastMapper_h
 
 #include "vtkRenderingVolumeOpenGLModule.h" // For export macro
 #include "vtkGPUVolumeRayCastMapper.h"
diff --git a/Rendering/VolumeOpenGL/vtkOpenGLHAVSVolumeMapper.h b/Rendering/VolumeOpenGL/vtkOpenGLHAVSVolumeMapper.h
index 19d3e1b2944e6f3660f3c11eb24cb0ec7122ccc3..562a3fbbf387e9b6b5babdc676fc508f3ac99730 100644
--- a/Rendering/VolumeOpenGL/vtkOpenGLHAVSVolumeMapper.h
+++ b/Rendering/VolumeOpenGL/vtkOpenGLHAVSVolumeMapper.h
@@ -102,8 +102,8 @@ PURPOSE.  See the above copyright notice for more information.
 // by Sandia National Labs.
 //
 
-#ifndef __vtkOpenGLHAVSVolumeMapper_h
-#define __vtkOpenGLHAVSVolumeMapper_h
+#ifndef vtkOpenGLHAVSVolumeMapper_h
+#define vtkOpenGLHAVSVolumeMapper_h
 
 #include "vtkRenderingVolumeOpenGLModule.h" // For export macro
 #include "vtkHAVSVolumeMapper.h"
diff --git a/Rendering/VolumeOpenGL/vtkOpenGLProjectedAAHexahedraMapper.h b/Rendering/VolumeOpenGL/vtkOpenGLProjectedAAHexahedraMapper.h
index eb4f8a2dacd57457a52282eb9892c6625900c3a2..7efdf00583d978f2f8de7f1204b6f812070cd130 100644
--- a/Rendering/VolumeOpenGL/vtkOpenGLProjectedAAHexahedraMapper.h
+++ b/Rendering/VolumeOpenGL/vtkOpenGLProjectedAAHexahedraMapper.h
@@ -25,8 +25,8 @@
 // "High-Quality, Semi-Analytical Volume Rendering for AMR Data",
 // Stephane Marchesin and Guillaume Colin de Verdiere, IEEE Vis 2009.
 
-#ifndef __vtkOpenGLProjectedAAHexahedraMapper_h
-#define __vtkOpenGLProjectedAAHexahedraMapper_h
+#ifndef vtkOpenGLProjectedAAHexahedraMapper_h
+#define vtkOpenGLProjectedAAHexahedraMapper_h
 
 #include "vtkRenderingVolumeOpenGLModule.h" // For export macro
 #include "vtkProjectedAAHexahedraMapper.h"
diff --git a/Rendering/VolumeOpenGL/vtkOpenGLProjectedTetrahedraMapper.h b/Rendering/VolumeOpenGL/vtkOpenGLProjectedTetrahedraMapper.h
index a5ef94701de50d70d9f10f5d22272b5b497b463a..f771882549d8d25c1fb42371156099973651e4ca 100644
--- a/Rendering/VolumeOpenGL/vtkOpenGLProjectedTetrahedraMapper.h
+++ b/Rendering/VolumeOpenGL/vtkOpenGLProjectedTetrahedraMapper.h
@@ -30,8 +30,8 @@
 // cause this mapper to produce artifacts.
 //
 
-#ifndef __vtkOpenGLProjectedTetrahedraMapper_h
-#define __vtkOpenGLProjectedTetrahedraMapper_h
+#ifndef vtkOpenGLProjectedTetrahedraMapper_h
+#define vtkOpenGLProjectedTetrahedraMapper_h
 
 #include "vtkRenderingVolumeOpenGLModule.h" // For export macro
 #include "vtkProjectedTetrahedraMapper.h"
diff --git a/Rendering/VolumeOpenGL/vtkOpenGLRayCastImageDisplayHelper.h b/Rendering/VolumeOpenGL/vtkOpenGLRayCastImageDisplayHelper.h
index 9cdaa18f9c644ec5d56448c30165db99ddc3bfdd..fedc601d2b9b16ad6341d5b92e5e6cb36baff270 100644
--- a/Rendering/VolumeOpenGL/vtkOpenGLRayCastImageDisplayHelper.h
+++ b/Rendering/VolumeOpenGL/vtkOpenGLRayCastImageDisplayHelper.h
@@ -21,8 +21,8 @@
 // .SECTION see also
 // vtkRayCastImageDisplayHelper
 
-#ifndef __vtkOpenGLRayCastImageDisplayHelper_h
-#define __vtkOpenGLRayCastImageDisplayHelper_h
+#ifndef vtkOpenGLRayCastImageDisplayHelper_h
+#define vtkOpenGLRayCastImageDisplayHelper_h
 
 #include "vtkRenderingVolumeOpenGLModule.h" // For export macro
 #include "vtkRayCastImageDisplayHelper.h"
diff --git a/Rendering/VolumeOpenGL/vtkOpenGLVolumeTextureMapper2D.h b/Rendering/VolumeOpenGL/vtkOpenGLVolumeTextureMapper2D.h
index 3a0d0984cef0b4dd14421ef46d2a2ec8f96d4a49..0dddffe98f311a37a2ba4d8aae0be3efa0061c6e 100644
--- a/Rendering/VolumeOpenGL/vtkOpenGLVolumeTextureMapper2D.h
+++ b/Rendering/VolumeOpenGL/vtkOpenGLVolumeTextureMapper2D.h
@@ -21,8 +21,8 @@
 // .SECTION see also
 // vtkVolumeMapper
 
-#ifndef __vtkOpenGLVolumeTextureMapper2D_h
-#define __vtkOpenGLVolumeTextureMapper2D_h
+#ifndef vtkOpenGLVolumeTextureMapper2D_h
+#define vtkOpenGLVolumeTextureMapper2D_h
 
 #include "vtkRenderingVolumeOpenGLModule.h" // For export macro
 #include "vtkVolumeTextureMapper2D.h"
diff --git a/Rendering/VolumeOpenGL/vtkOpenGLVolumeTextureMapper3D.h b/Rendering/VolumeOpenGL/vtkOpenGLVolumeTextureMapper3D.h
index 5f6181b1388c1ef696969ac3fe15497e4b8dad12..bd8b9faa45d93d30394ad594732811bd9299e766 100644
--- a/Rendering/VolumeOpenGL/vtkOpenGLVolumeTextureMapper3D.h
+++ b/Rendering/VolumeOpenGL/vtkOpenGLVolumeTextureMapper3D.h
@@ -21,8 +21,8 @@
 // .SECTION see also
 // vtkVolumeTextureMapper3D vtkVolumeMapper
 
-#ifndef __vtkOpenGLVolumeTextureMapper3D_h
-#define __vtkOpenGLVolumeTextureMapper3D_h
+#ifndef vtkOpenGLVolumeTextureMapper3D_h
+#define vtkOpenGLVolumeTextureMapper3D_h
 
 #include "vtkRenderingVolumeOpenGLModule.h" // For export macro
 #include "vtkVolumeTextureMapper3D.h"
diff --git a/Rendering/VolumeOpenGL/vtkSmartVolumeMapper.h b/Rendering/VolumeOpenGL/vtkSmartVolumeMapper.h
index 166101d426b7a94f3fb4385469378cf4ac270e57..390c0cbbfd0b82f47496b2fa21c77a3ed6a80c93 100644
--- a/Rendering/VolumeOpenGL/vtkSmartVolumeMapper.h
+++ b/Rendering/VolumeOpenGL/vtkSmartVolumeMapper.h
@@ -96,8 +96,8 @@
 // by alpha. Also note that the window / level operation leaves the alpha
 // component unchanged - it only adjusts the RGB values.
 
-#ifndef __vtkSmartVolumeMapper_h
-#define __vtkSmartVolumeMapper_h
+#ifndef vtkSmartVolumeMapper_h
+#define vtkSmartVolumeMapper_h
 
 #include "vtkRenderingVolumeOpenGLModule.h" // For export macro
 #include "vtkVolumeMapper.h"
diff --git a/Rendering/VolumeOpenGL2/vtkOpenGLGPUVolumeRayCastMapper.h b/Rendering/VolumeOpenGL2/vtkOpenGLGPUVolumeRayCastMapper.h
index 5a620caecec74a10a7de3ca0535279a623182224..aebd68a02015e2462fa0b225fed2216372f668b5 100644
--- a/Rendering/VolumeOpenGL2/vtkOpenGLGPUVolumeRayCastMapper.h
+++ b/Rendering/VolumeOpenGL2/vtkOpenGLGPUVolumeRayCastMapper.h
@@ -13,8 +13,8 @@
 
 =========================================================================*/
 
-#ifndef __vtkOpenGLGPUVolumeRayCastMapper_h
-#define __vtkOpenGLGPUVolumeRayCastMapper_h
+#ifndef vtkOpenGLGPUVolumeRayCastMapper_h
+#define vtkOpenGLGPUVolumeRayCastMapper_h
 
 #include "vtkRenderingVolumeOpenGL2Module.h" // For export macro
 
@@ -101,4 +101,4 @@ private:
   void operator=(const vtkOpenGLGPUVolumeRayCastMapper&); // Not implemented.
 };
 
-#endif // __vtkOpenGLGPUVolumeRayCastMapper_h
+#endif // vtkOpenGLGPUVolumeRayCastMapper_h
diff --git a/Rendering/VolumeOpenGL2/vtkOpenGLGradientOpacityTable.h b/Rendering/VolumeOpenGL2/vtkOpenGLGradientOpacityTable.h
index 56b29d4e304694e51639e810742bcb9adc4b3b2c..a6b0f662e763aa5d64fb48ef2d1365e0b30978ad 100644
--- a/Rendering/VolumeOpenGL2/vtkOpenGLGradientOpacityTable.h
+++ b/Rendering/VolumeOpenGL2/vtkOpenGLGradientOpacityTable.h
@@ -13,8 +13,8 @@
 
 =========================================================================*/
 
-#ifndef __vtkOpenGLGradientOpacityTable_h_
-#define __vtkOpenGLGradientOpacityTable_h_
+#ifndef vtkOpenGLGradientOpacityTable_h_
+#define vtkOpenGLGradientOpacityTable_h_
 
 #include <vtkPiecewiseFunction.h>
 #include <vtkVolumeMapper.h>
@@ -197,5 +197,5 @@ private:
   vtkOpenGLGradientOpacityTables &operator=(const vtkOpenGLGradientOpacityTables &other);
 };
 
-#endif // __vtkOpenGLGradientOpacityTable_h_
+#endif // vtkOpenGLGradientOpacityTable_h_
 // VTK-HeaderTest-Exclude: vtkOpenGLGradientOpacityTable.h
diff --git a/Rendering/VolumeOpenGL2/vtkOpenGLOpacityTable.h b/Rendering/VolumeOpenGL2/vtkOpenGLOpacityTable.h
index 2c8b15f4e170ac519e29054e52dad0b76b537815..1fe8c8dadc936e6e9e11023ee4a47b53f33a02e9 100644
--- a/Rendering/VolumeOpenGL2/vtkOpenGLOpacityTable.h
+++ b/Rendering/VolumeOpenGL2/vtkOpenGLOpacityTable.h
@@ -13,8 +13,8 @@
 
 =========================================================================*/
 
-#ifndef __vtkOpenGLVolumeOpacityTable_h_
-#define __vtkOpenGLVolumeOpacityTable_h_
+#ifndef vtkOpenGLVolumeOpacityTable_h_
+#define vtkOpenGLVolumeOpacityTable_h_
 
 #include <vtkPiecewiseFunction.h>
 #include <vtkVolumeMapper.h>
@@ -238,5 +238,5 @@ private:
   vtkOpenGLOpacityTables &operator=(const vtkOpenGLOpacityTables &other);
 };
 
-#endif // __vtkOpenGLVolumeOpacityTable_h_
+#endif // vtkOpenGLVolumeOpacityTable_h_
 // VTK-HeaderTest-Exclude: vtkOpenGLOpacityTable.h
diff --git a/Rendering/VolumeOpenGL2/vtkOpenGLProjectedTetrahedraMapper.h b/Rendering/VolumeOpenGL2/vtkOpenGLProjectedTetrahedraMapper.h
index 95d08f724f243759ab132dffd68d65836a3be6db..9c0837cb4e31e53ef87bd99f7341b0965dd51b5d 100644
--- a/Rendering/VolumeOpenGL2/vtkOpenGLProjectedTetrahedraMapper.h
+++ b/Rendering/VolumeOpenGL2/vtkOpenGLProjectedTetrahedraMapper.h
@@ -30,8 +30,8 @@
 // cause this mapper to produce artifacts.
 //
 
-#ifndef __vtkOpenGLProjectedTetrahedraMapper_h
-#define __vtkOpenGLProjectedTetrahedraMapper_h
+#ifndef vtkOpenGLProjectedTetrahedraMapper_h
+#define vtkOpenGLProjectedTetrahedraMapper_h
 
 #include "vtkRenderingVolumeOpenGL2Module.h" // For export macro
 #include "vtkProjectedTetrahedraMapper.h"
diff --git a/Rendering/VolumeOpenGL2/vtkOpenGLRGBTable.h b/Rendering/VolumeOpenGL2/vtkOpenGLRGBTable.h
index 6cbda8d8617caa9c930930b5c7837dcd6de230bd..54f2321344ecf9677f102d12a04ed4d9fcf25fb1 100644
--- a/Rendering/VolumeOpenGL2/vtkOpenGLRGBTable.h
+++ b/Rendering/VolumeOpenGL2/vtkOpenGLRGBTable.h
@@ -13,8 +13,8 @@
 
 =========================================================================*/
 
-#ifndef __vtkOpenGLRGBTable_h_
-#define __vtkOpenGLRGBTable_h_
+#ifndef vtkOpenGLRGBTable_h_
+#define vtkOpenGLRGBTable_h_
 
 #include <vtkColorTransferFunction.h>
 #include <vtk_glew.h>
@@ -152,5 +152,5 @@ protected:
   vtkTimeStamp BuildTime;
 };
 
-#endif // __vtkOpenGLRGBTable_h_
+#endif // vtkOpenGLRGBTable_h_
 // VTK-HeaderTest-Exclude: vtkOpenGLRGBTable.h
diff --git a/Rendering/VolumeOpenGL2/vtkOpenGLRayCastImageDisplayHelper.h b/Rendering/VolumeOpenGL2/vtkOpenGLRayCastImageDisplayHelper.h
index 7038bdd1131b93489bbf01e80b4bb006c829425e..3ff96c4df7da1408783e83ab4f88888b3b1e6021 100644
--- a/Rendering/VolumeOpenGL2/vtkOpenGLRayCastImageDisplayHelper.h
+++ b/Rendering/VolumeOpenGL2/vtkOpenGLRayCastImageDisplayHelper.h
@@ -21,8 +21,8 @@
 // .SECTION see also
 // vtkRayCastImageDisplayHelper
 
-#ifndef __vtkOpenGLRayCastImageDisplayHelper_h
-#define __vtkOpenGLRayCastImageDisplayHelper_h
+#ifndef vtkOpenGLRayCastImageDisplayHelper_h
+#define vtkOpenGLRayCastImageDisplayHelper_h
 
 #include "vtkRenderingVolumeOpenGL2Module.h" // For export macro
 #include "vtkRayCastImageDisplayHelper.h"
diff --git a/Rendering/VolumeOpenGL2/vtkSmartVolumeMapper.h b/Rendering/VolumeOpenGL2/vtkSmartVolumeMapper.h
index 258dd91fe67a7134fd5881655fded9991f7d6b81..52875e837cf68c7301e445b408009c5e403fcc7e 100644
--- a/Rendering/VolumeOpenGL2/vtkSmartVolumeMapper.h
+++ b/Rendering/VolumeOpenGL2/vtkSmartVolumeMapper.h
@@ -66,8 +66,8 @@
 // by alpha. Also note that the window / level operation leaves the alpha
 // component unchanged - it only adjusts the RGB values.
 
-#ifndef __vtkSmartVolumeMapper_h
-#define __vtkSmartVolumeMapper_h
+#ifndef vtkSmartVolumeMapper_h
+#define vtkSmartVolumeMapper_h
 
 #include "vtkRenderingVolumeOpenGL2Module.h" // For export macro
 #include "vtkVolumeMapper.h"
diff --git a/Rendering/VolumeOpenGL2/vtkVolumeMask.h b/Rendering/VolumeOpenGL2/vtkVolumeMask.h
index d73839ca705ec8d29253670a05b9672e11266910..052174a8c817bd9d79c8f7ea9c3b13f49be1175a 100644
--- a/Rendering/VolumeOpenGL2/vtkVolumeMask.h
+++ b/Rendering/VolumeOpenGL2/vtkVolumeMask.h
@@ -13,8 +13,8 @@
 
 =========================================================================*/
 
-#ifndef __vtkVolumeMask_h_
-#define __vtkVolumeMask_h_
+#ifndef vtkVolumeMask_h_
+#define vtkVolumeMask_h_
 
 #include <vtkDataArray.h>
 #include <vtkImageData.h>
@@ -345,5 +345,5 @@ private:
   vtkMapMaskTextureId &operator=(const vtkMapMaskTextureId &other);
 };
 
-#endif // __vtkVolumeMask_h_
+#endif // vtkVolumeMask_h_
 // VTK-HeaderTest-Exclude: vtkVolumeMask.h
diff --git a/Rendering/VolumeOpenGL2/vtkVolumeShaderComposer.h b/Rendering/VolumeOpenGL2/vtkVolumeShaderComposer.h
index 05bfccdf59f665bc23d66550827d7774c8f9c009..377d16862c27062b65cf16ed5a0e76f0d1e3d8ee 100644
--- a/Rendering/VolumeOpenGL2/vtkVolumeShaderComposer.h
+++ b/Rendering/VolumeOpenGL2/vtkVolumeShaderComposer.h
@@ -13,8 +13,8 @@
 
 =========================================================================*/
 
-#ifndef ___vtkVolumeShaderComposer_h
-#define ___vtkVolumeShaderComposer_h
+#ifndef _vtkVolumeShaderComposer_h
+#define _vtkVolumeShaderComposer_h
 
 #include "vtkVolumeMask.h"
 
@@ -1299,5 +1299,5 @@ namespace vtkvolume
   }
 }
 
-#endif // ___vtkVolumeShaderComposer_h
+#endif // _vtkVolumeShaderComposer_h
 // VTK-HeaderTest-Exclude: vtkVolumeShaderComposer.h
diff --git a/Rendering/VolumeOpenGL2/vtkVolumeStateRAII.h b/Rendering/VolumeOpenGL2/vtkVolumeStateRAII.h
index 501d00f9796f44c78371e54e4cf600b965e66f3a..15a00638827a84c903cdaf5d128ffbc19ee29e9b 100644
--- a/Rendering/VolumeOpenGL2/vtkVolumeStateRAII.h
+++ b/Rendering/VolumeOpenGL2/vtkVolumeStateRAII.h
@@ -13,8 +13,8 @@
 
 =========================================================================*/
 
-#ifndef __vtkVolumeStateRAII_h
-#define __vtkVolumeStateRAII_h
+#ifndef vtkVolumeStateRAII_h
+#define vtkVolumeStateRAII_h
 
 // Only these states can be queries via glIsEnabled:
 // http://www.khronos.org/opengles/sdk/docs/man/
@@ -98,5 +98,5 @@ private:
   bool CullFaceEnabled;
 };
 
-#endif // __vtkVolumeStateRAII_h
+#endif // vtkVolumeStateRAII_h
 // VTK-HeaderTest-Exclude: vtkVolumeStateRAII.h
diff --git a/Rendering/VolumeOpenGLNew/vtkOpenGLGPUVolumeRayCastMapper.h b/Rendering/VolumeOpenGLNew/vtkOpenGLGPUVolumeRayCastMapper.h
index 0fd209336223c9db7b2b51df92b7b2621761c1fa..4dd2a2bb9006d2cb2f072648e1c056ddf380bbd7 100644
--- a/Rendering/VolumeOpenGLNew/vtkOpenGLGPUVolumeRayCastMapper.h
+++ b/Rendering/VolumeOpenGLNew/vtkOpenGLGPUVolumeRayCastMapper.h
@@ -13,8 +13,8 @@
 
 =========================================================================*/
 
-#ifndef __vtkOpenGLGPUVolumeRayCastMapper_h
-#define __vtkOpenGLGPUVolumeRayCastMapper_h
+#ifndef vtkOpenGLGPUVolumeRayCastMapper_h
+#define vtkOpenGLGPUVolumeRayCastMapper_h
 
 #include "vtkRenderingVolumeOpenGLNewModule.h" // For export macro
 
@@ -91,4 +91,4 @@ private:
   void operator=(const vtkOpenGLGPUVolumeRayCastMapper&); // Not implemented.
 };
 
-#endif // __vtkOpenGLGPUVolumeRayCastMapper_h
+#endif // vtkOpenGLGPUVolumeRayCastMapper_h
diff --git a/Rendering/VolumeOpenGLNew/vtkOpenGLGradientOpacityTable.h b/Rendering/VolumeOpenGLNew/vtkOpenGLGradientOpacityTable.h
index 56b29d4e304694e51639e810742bcb9adc4b3b2c..a6b0f662e763aa5d64fb48ef2d1365e0b30978ad 100644
--- a/Rendering/VolumeOpenGLNew/vtkOpenGLGradientOpacityTable.h
+++ b/Rendering/VolumeOpenGLNew/vtkOpenGLGradientOpacityTable.h
@@ -13,8 +13,8 @@
 
 =========================================================================*/
 
-#ifndef __vtkOpenGLGradientOpacityTable_h_
-#define __vtkOpenGLGradientOpacityTable_h_
+#ifndef vtkOpenGLGradientOpacityTable_h_
+#define vtkOpenGLGradientOpacityTable_h_
 
 #include <vtkPiecewiseFunction.h>
 #include <vtkVolumeMapper.h>
@@ -197,5 +197,5 @@ private:
   vtkOpenGLGradientOpacityTables &operator=(const vtkOpenGLGradientOpacityTables &other);
 };
 
-#endif // __vtkOpenGLGradientOpacityTable_h_
+#endif // vtkOpenGLGradientOpacityTable_h_
 // VTK-HeaderTest-Exclude: vtkOpenGLGradientOpacityTable.h
diff --git a/Rendering/VolumeOpenGLNew/vtkOpenGLOpacityTable.h b/Rendering/VolumeOpenGLNew/vtkOpenGLOpacityTable.h
index 2c8b15f4e170ac519e29054e52dad0b76b537815..1fe8c8dadc936e6e9e11023ee4a47b53f33a02e9 100644
--- a/Rendering/VolumeOpenGLNew/vtkOpenGLOpacityTable.h
+++ b/Rendering/VolumeOpenGLNew/vtkOpenGLOpacityTable.h
@@ -13,8 +13,8 @@
 
 =========================================================================*/
 
-#ifndef __vtkOpenGLVolumeOpacityTable_h_
-#define __vtkOpenGLVolumeOpacityTable_h_
+#ifndef vtkOpenGLVolumeOpacityTable_h_
+#define vtkOpenGLVolumeOpacityTable_h_
 
 #include <vtkPiecewiseFunction.h>
 #include <vtkVolumeMapper.h>
@@ -238,5 +238,5 @@ private:
   vtkOpenGLOpacityTables &operator=(const vtkOpenGLOpacityTables &other);
 };
 
-#endif // __vtkOpenGLVolumeOpacityTable_h_
+#endif // vtkOpenGLVolumeOpacityTable_h_
 // VTK-HeaderTest-Exclude: vtkOpenGLOpacityTable.h
diff --git a/Rendering/VolumeOpenGLNew/vtkOpenGLRGBTable.h b/Rendering/VolumeOpenGLNew/vtkOpenGLRGBTable.h
index 6cbda8d8617caa9c930930b5c7837dcd6de230bd..54f2321344ecf9677f102d12a04ed4d9fcf25fb1 100644
--- a/Rendering/VolumeOpenGLNew/vtkOpenGLRGBTable.h
+++ b/Rendering/VolumeOpenGLNew/vtkOpenGLRGBTable.h
@@ -13,8 +13,8 @@
 
 =========================================================================*/
 
-#ifndef __vtkOpenGLRGBTable_h_
-#define __vtkOpenGLRGBTable_h_
+#ifndef vtkOpenGLRGBTable_h_
+#define vtkOpenGLRGBTable_h_
 
 #include <vtkColorTransferFunction.h>
 #include <vtk_glew.h>
@@ -152,5 +152,5 @@ protected:
   vtkTimeStamp BuildTime;
 };
 
-#endif // __vtkOpenGLRGBTable_h_
+#endif // vtkOpenGLRGBTable_h_
 // VTK-HeaderTest-Exclude: vtkOpenGLRGBTable.h
diff --git a/Rendering/VolumeOpenGLNew/vtkVolumeMask.h b/Rendering/VolumeOpenGLNew/vtkVolumeMask.h
index d73839ca705ec8d29253670a05b9672e11266910..052174a8c817bd9d79c8f7ea9c3b13f49be1175a 100644
--- a/Rendering/VolumeOpenGLNew/vtkVolumeMask.h
+++ b/Rendering/VolumeOpenGLNew/vtkVolumeMask.h
@@ -13,8 +13,8 @@
 
 =========================================================================*/
 
-#ifndef __vtkVolumeMask_h_
-#define __vtkVolumeMask_h_
+#ifndef vtkVolumeMask_h_
+#define vtkVolumeMask_h_
 
 #include <vtkDataArray.h>
 #include <vtkImageData.h>
@@ -345,5 +345,5 @@ private:
   vtkMapMaskTextureId &operator=(const vtkMapMaskTextureId &other);
 };
 
-#endif // __vtkVolumeMask_h_
+#endif // vtkVolumeMask_h_
 // VTK-HeaderTest-Exclude: vtkVolumeMask.h
diff --git a/Rendering/VolumeOpenGLNew/vtkVolumeShader.h b/Rendering/VolumeOpenGLNew/vtkVolumeShader.h
index 8af747c79279d7827c9b20be9e826ebf35f1acb8..5f6da56a0babefbe0913148dbf33f8e7ad6e72c4 100644
--- a/Rendering/VolumeOpenGLNew/vtkVolumeShader.h
+++ b/Rendering/VolumeOpenGLNew/vtkVolumeShader.h
@@ -13,8 +13,8 @@
 
 =========================================================================*/
 
-#ifndef __vtkVolumeShader_h
-#define __vtkVolumeShader_h
+#ifndef vtkVolumeShader_h
+#define vtkVolumeShader_h
 
 #include <vtk_glew.h>
 
@@ -54,5 +54,5 @@ private:
     map<string,GLuint> UniformLocationList;
 };
 
-#endif // __vtkVolumeShader_h
+#endif // vtkVolumeShader_h
 // VTK-HeaderTest-Exclude: vtkVolumeShader.h
diff --git a/Rendering/VolumeOpenGLNew/vtkVolumeShaderComposer.h b/Rendering/VolumeOpenGLNew/vtkVolumeShaderComposer.h
index 14d96bca2128b9586ccfc30c988a2e7a72cf5ffd..ed151b45e01f9a90a7023a491724783d544e3be1 100644
--- a/Rendering/VolumeOpenGLNew/vtkVolumeShaderComposer.h
+++ b/Rendering/VolumeOpenGLNew/vtkVolumeShaderComposer.h
@@ -13,8 +13,8 @@
 
 =========================================================================*/
 
-#ifndef ___vtkVolumeShaderComposer_h
-#define ___vtkVolumeShaderComposer_h
+#ifndef _vtkVolumeShaderComposer_h
+#define _vtkVolumeShaderComposer_h
 
 #include "vtkVolumeMask.h"
 
@@ -1082,5 +1082,5 @@ namespace vtkvolume
   }
 }
 
-#endif // ___vtkVolumeShaderComposer_h
+#endif // _vtkVolumeShaderComposer_h
 // VTK-HeaderTest-Exclude: vtkVolumeShaderComposer.h
diff --git a/Rendering/VolumeOpenGLNew/vtkVolumeStateRAII.h b/Rendering/VolumeOpenGLNew/vtkVolumeStateRAII.h
index 5e8b330ed896f3c9be9d63226bf448fbc120928b..eb28ca78d8d98fa8d247958a9a6ba9863c7f21e5 100644
--- a/Rendering/VolumeOpenGLNew/vtkVolumeStateRAII.h
+++ b/Rendering/VolumeOpenGLNew/vtkVolumeStateRAII.h
@@ -13,8 +13,8 @@
 
 =========================================================================*/
 
-#ifndef __vtkVolumeStateRAII_h
-#define __vtkVolumeStateRAII_h
+#ifndef vtkVolumeStateRAII_h
+#define vtkVolumeStateRAII_h
 
 // Only these states can be queries via glIsEnabled:
 // http://www.khronos.org/opengles/sdk/docs/man/
@@ -98,5 +98,5 @@ private:
   bool CullFaceEnabled;
 };
 
-#endif // __vtkVolumeStateRAII_h
+#endif // vtkVolumeStateRAII_h
 // VTK-HeaderTest-Exclude: vtkVolumeStateRAII.h
diff --git a/Testing/Core/vtkTestErrorObserver.h b/Testing/Core/vtkTestErrorObserver.h
index a90abe71b705c181f500223fa1a7f88196bc98ee..71f742fc5980447de4532c8ff79bb63888e0032c 100644
--- a/Testing/Core/vtkTestErrorObserver.h
+++ b/Testing/Core/vtkTestErrorObserver.h
@@ -12,8 +12,8 @@
      PURPOSE.  See the above copyright notice for more information.
 
 =========================================================================*/
-#ifndef __vtkTestErrorObserver_h
-#define __vtkTestErrorObserver_h
+#ifndef vtkTestErrorObserver_h
+#define vtkTestErrorObserver_h
 
 #include <vtkCommand.h>
 #include <string>
diff --git a/Testing/Core/vtkTestUtilities.h b/Testing/Core/vtkTestUtilities.h
index 2e28c336a064a8ed32ad72e460df8cf7b0900736..2f6e35ebf52b44e60282609f9a11843251f5f401 100644
--- a/Testing/Core/vtkTestUtilities.h
+++ b/Testing/Core/vtkTestUtilities.h
@@ -19,8 +19,8 @@
 // or a default value. Particularly, there are specialized methods to get the
 // root directory for VTK Data, expanding a filename with this root directory.
 
-#ifndef __vtkTestUtilities_h
-#define __vtkTestUtilities_h
+#ifndef vtkTestUtilities_h
+#define vtkTestUtilities_h
 
 #include "vtkSystemIncludes.h"
 
@@ -176,4 +176,4 @@ char* vtkTestUtilities::ExpandFileNameWithArgOrEnvOrDefault(const char* arg,
   return fullName;
 }
 
-#endif // __vtkTestUtilities_h
+#endif // vtkTestUtilities_h
diff --git a/Testing/Core/vtkTestingColors.h b/Testing/Core/vtkTestingColors.h
index 74c22384c2f5d79fea1dcbb66b9e401f5d3bb2ee..00229f1a10201defb532e2095451f4f80827c3ba 100644
--- a/Testing/Core/vtkTestingColors.h
+++ b/Testing/Core/vtkTestingColors.h
@@ -1,5 +1,5 @@
-#ifndef __vtkTestingColors_h
-#define __vtkTestingColors_h
+#ifndef vtkTestingColors_h
+#define vtkTestingColors_h
 
 // Standard colors used by many vtk scripts
 
@@ -215,4 +215,4 @@ static float vtk_violet_red[3] = { 0.8157, 0.1255, 0.5647 };
 static float vtk_violet_red_medium[3] = { 0.7804, 0.0824, 0.5216 };
 static float vtk_violet_red_pale[3] = { 0.8588, 0.4392, 0.5765 };
 
-#endif // __vtkTestingColors_h
+#endif // vtkTestingColors_h
diff --git a/Testing/GenericBridge/vtkBridgeAttribute.h b/Testing/GenericBridge/vtkBridgeAttribute.h
index 1d2e420a1f3135e71d61c56822db07a4c6dfe5b7..8afff6b7a764141a11cc6ebe0642df7e5a275529 100644
--- a/Testing/GenericBridge/vtkBridgeAttribute.h
+++ b/Testing/GenericBridge/vtkBridgeAttribute.h
@@ -20,8 +20,8 @@
 // vtkGenericAttribute, vtkBridgeDataSet
 
 
-#ifndef __vtkBridgeAttribute_h
-#define __vtkBridgeAttribute_h
+#ifndef vtkBridgeAttribute_h
+#define vtkBridgeAttribute_h
 
 #include "vtkBridgeExport.h" //for module export macro
 #include "vtkGenericAttribute.h"
diff --git a/Testing/GenericBridge/vtkBridgeCell.h b/Testing/GenericBridge/vtkBridgeCell.h
index 694f96600a0013d0ad4c7bdbd2c6500c77d7d6fc..7271ad49eb8cf7c4e6abe4a20a292177ccc2ef25 100644
--- a/Testing/GenericBridge/vtkBridgeCell.h
+++ b/Testing/GenericBridge/vtkBridgeCell.h
@@ -19,8 +19,8 @@
 // .SECTION See Also
 // vtkGenericAdaptorCell, vtkBridgeDataSet
 
-#ifndef __vtkBridgeCell_h
-#define __vtkBridgeCell_h
+#ifndef vtkBridgeCell_h
+#define vtkBridgeCell_h
 
 #include "vtkBridgeExport.h" //for module export macro
 #include "vtkGenericAdaptorCell.h"
diff --git a/Testing/GenericBridge/vtkBridgeCellIterator.h b/Testing/GenericBridge/vtkBridgeCellIterator.h
index 3eafa731b32090aa13a2e8e65d0aa4d61849d3cd..c1f3348fc591e49f15edf89bf09d9b9e74f51141 100644
--- a/Testing/GenericBridge/vtkBridgeCellIterator.h
+++ b/Testing/GenericBridge/vtkBridgeCellIterator.h
@@ -18,8 +18,8 @@
 // .SECTION See Also
 // vtkGenericCellIterator, vtkBridgeDataSet
 
-#ifndef __vtkBridgeCellIterator_h
-#define __vtkBridgeCellIterator_h
+#ifndef vtkBridgeCellIterator_h
+#define vtkBridgeCellIterator_h
 
 #include "vtkBridgeExport.h" //for module export macro
 #include "vtkGenericCellIterator.h"
diff --git a/Testing/GenericBridge/vtkBridgeCellIteratorOnCellBoundaries.h b/Testing/GenericBridge/vtkBridgeCellIteratorOnCellBoundaries.h
index 515be49fe6f88c6a31e2ae36b0552e46496f456a..c736cb094dedbc4c84c84ed6ac108daf9e2e6438 100644
--- a/Testing/GenericBridge/vtkBridgeCellIteratorOnCellBoundaries.h
+++ b/Testing/GenericBridge/vtkBridgeCellIteratorOnCellBoundaries.h
@@ -18,8 +18,8 @@
 // .SECTION See Also
 // vtkBridgeCellIterator, vtkBridgeDataSet, vtkBridgeCellIteratorStrategy
 
-#ifndef __vtkBridgeCellIteratorOnCellBoundaries_h
-#define __vtkBridgeCellIteratorOnCellBoundaries_h
+#ifndef vtkBridgeCellIteratorOnCellBoundaries_h
+#define vtkBridgeCellIteratorOnCellBoundaries_h
 
 #include "vtkBridgeCellIteratorStrategy.h"
 
diff --git a/Testing/GenericBridge/vtkBridgeCellIteratorOnCellList.h b/Testing/GenericBridge/vtkBridgeCellIteratorOnCellList.h
index b89ed65bdabb5117877280e2ccb961e7bbc841bf..fa5e8b66f07df2ec83e8e84e2dc07e62614678ae 100644
--- a/Testing/GenericBridge/vtkBridgeCellIteratorOnCellList.h
+++ b/Testing/GenericBridge/vtkBridgeCellIteratorOnCellList.h
@@ -18,8 +18,8 @@
 // .SECTION See Also
 // vtkBridgeCellIterator, vtkBridgeDataSet, vtkBridgeCellIteratorStrategy
 
-#ifndef __vtkBridgeCellIteratorOnCellList_h
-#define __vtkBridgeCellIteratorOnCellList_h
+#ifndef vtkBridgeCellIteratorOnCellList_h
+#define vtkBridgeCellIteratorOnCellList_h
 
 #include "vtkBridgeCellIteratorStrategy.h"
 
diff --git a/Testing/GenericBridge/vtkBridgeCellIteratorOnDataSet.h b/Testing/GenericBridge/vtkBridgeCellIteratorOnDataSet.h
index 6d54d51cc3eea9bcc0597b0d1cdd474a2213bf11..8c324504b5cbd3197a3c55dddf1fdd59e8866475 100644
--- a/Testing/GenericBridge/vtkBridgeCellIteratorOnDataSet.h
+++ b/Testing/GenericBridge/vtkBridgeCellIteratorOnDataSet.h
@@ -16,8 +16,8 @@
 // .SECTION See Also
 // vtkBridgeCellIterator, vtkBridgeDataSet, vtkBridgeCellIteratorStrategy
 
-#ifndef __vtkBridgeCellIteratorOnDataSet_h
-#define __vtkBridgeCellIteratorOnDataSet_h
+#ifndef vtkBridgeCellIteratorOnDataSet_h
+#define vtkBridgeCellIteratorOnDataSet_h
 
 #include "vtkBridgeCellIteratorStrategy.h"
 
diff --git a/Testing/GenericBridge/vtkBridgeCellIteratorOne.h b/Testing/GenericBridge/vtkBridgeCellIteratorOne.h
index 7db8a6f0e31c1a2ddc5da7e5e9f662c49c3fb64f..e0921904979b13c22e7b1009582e3675ae45c555 100644
--- a/Testing/GenericBridge/vtkBridgeCellIteratorOne.h
+++ b/Testing/GenericBridge/vtkBridgeCellIteratorOne.h
@@ -16,8 +16,8 @@
 // .SECTION See Also
 // vtkBridgeCellIterator, vtkBridgeDataSet, vtkBridgeCellIteratorStrategy
 
-#ifndef __vtkBridgeCellIteratorOne_h
-#define __vtkBridgeCellIteratorOne_h
+#ifndef vtkBridgeCellIteratorOne_h
+#define vtkBridgeCellIteratorOne_h
 
 #include "vtkBridgeCellIteratorStrategy.h"
 
diff --git a/Testing/GenericBridge/vtkBridgeCellIteratorStrategy.h b/Testing/GenericBridge/vtkBridgeCellIteratorStrategy.h
index 342da38249dbd38f514e3b0f790f520d6f6a74e0..db519be301883d2d2011de8d7d9549f90e803ba8 100644
--- a/Testing/GenericBridge/vtkBridgeCellIteratorStrategy.h
+++ b/Testing/GenericBridge/vtkBridgeCellIteratorStrategy.h
@@ -22,8 +22,8 @@
 // .SECTION See Also
 // vtkGenericCellIterator, vtkBridgeCellIterator, vtkBridgeDataSet, vtkBridgeCellIteratorOnDataSet, vtkBridgeCellIteratorOnDataSetBoundaries, vtkBridgeCellIteratorOnCellBoundaries, vtkBridgeCellIteratorOnCellNeighbors
 
-#ifndef __vtkBridgeCellIteratorStrategy_h
-#define __vtkBridgeCellIteratorStrategy_h
+#ifndef vtkBridgeCellIteratorStrategy_h
+#define vtkBridgeCellIteratorStrategy_h
 
 #include "vtkBridgeExport.h" //for module export macro
 #include "vtkGenericCellIterator.h"
diff --git a/Testing/GenericBridge/vtkBridgeDataSet.h b/Testing/GenericBridge/vtkBridgeDataSet.h
index 6ce48ba0b11919966527b9aa663b00bb852051bd..b4340e7a3e3586957cece87911593dc1a99de5a0 100644
--- a/Testing/GenericBridge/vtkBridgeDataSet.h
+++ b/Testing/GenericBridge/vtkBridgeDataSet.h
@@ -17,8 +17,8 @@
 // It is just an example that show how to implement the Generic. It is also
 // used for testing and evaluating the Generic.
 
-#ifndef __vtkBridgeDataSet_h
-#define __vtkBridgeDataSet_h
+#ifndef vtkBridgeDataSet_h
+#define vtkBridgeDataSet_h
 
 #include "vtkBridgeExport.h" //for module export macro
 #include "vtkGenericDataSet.h"
diff --git a/Testing/GenericBridge/vtkBridgeExport.h b/Testing/GenericBridge/vtkBridgeExport.h
index 02bcf33b3a4d9ff3fa274fff3d02503bd4b8a6a5..694468f657bbfd2054a963af9a235054691ed8d3 100644
--- a/Testing/GenericBridge/vtkBridgeExport.h
+++ b/Testing/GenericBridge/vtkBridgeExport.h
@@ -17,8 +17,8 @@
 // The vtkBridgeExport captures some system differences between Unix and
 // Windows operating systems.
 
-#ifndef __vtkBridgeExport_h
-#define __vtkBridgeExport_h
+#ifndef vtkBridgeExport_h
+#define vtkBridgeExport_h
 #include "vtkTestingGenericBridgeModule.h"
 #include "vtkSystemIncludes.h"
 
diff --git a/Testing/GenericBridge/vtkBridgePointIterator.h b/Testing/GenericBridge/vtkBridgePointIterator.h
index c7278abc2ec15e18123bccd53b66f06f04c595ae..25fdc07cbed3839a5624f4543a061e668673631d 100644
--- a/Testing/GenericBridge/vtkBridgePointIterator.h
+++ b/Testing/GenericBridge/vtkBridgePointIterator.h
@@ -19,8 +19,8 @@
 // .SECTION See Also
 // vtkGenericPointIterator, vtkBridgeDataSet
 
-#ifndef __vtkBridgePointIterator_h
-#define __vtkBridgePointIterator_h
+#ifndef vtkBridgePointIterator_h
+#define vtkBridgePointIterator_h
 
 #include "vtkBridgeExport.h" //for module export macro
 #include "vtkGenericPointIterator.h"
diff --git a/Testing/GenericBridge/vtkBridgePointIteratorOnCell.h b/Testing/GenericBridge/vtkBridgePointIteratorOnCell.h
index 052dc733fc368e2db75ce5406cd7617e93afe3b1..1d9af75aea06df31e1f895fbb0f8c33e700eef98 100644
--- a/Testing/GenericBridge/vtkBridgePointIteratorOnCell.h
+++ b/Testing/GenericBridge/vtkBridgePointIteratorOnCell.h
@@ -18,8 +18,8 @@
 // .SECTION See Also
 // vtkGenericPointIterator, vtkBridgeDataSet
 
-#ifndef __vtkBridgePointIteratorOnCell_h
-#define __vtkBridgePointIteratorOnCell_h
+#ifndef vtkBridgePointIteratorOnCell_h
+#define vtkBridgePointIteratorOnCell_h
 
 #include "vtkBridgeExport.h" //for module export macro
 #include "vtkGenericPointIterator.h"
diff --git a/Testing/GenericBridge/vtkBridgePointIteratorOnDataSet.h b/Testing/GenericBridge/vtkBridgePointIteratorOnDataSet.h
index 8608bebe8344432c107e82c98bac7be2673f7c67..d945f67298b95404d74bc37379d4b697a74ea0e5 100644
--- a/Testing/GenericBridge/vtkBridgePointIteratorOnDataSet.h
+++ b/Testing/GenericBridge/vtkBridgePointIteratorOnDataSet.h
@@ -19,8 +19,8 @@
 // .SECTION See Also
 // vtkGenericPointIterator, vtkBridgeDataSet
 
-#ifndef __vtkBridgePointIteratorOnDataSet_h
-#define __vtkBridgePointIteratorOnDataSet_h
+#ifndef vtkBridgePointIteratorOnDataSet_h
+#define vtkBridgePointIteratorOnDataSet_h
 
 #include "vtkBridgeExport.h" //for module export macro
 #include "vtkGenericPointIterator.h"
diff --git a/Testing/GenericBridge/vtkBridgePointIteratorOne.h b/Testing/GenericBridge/vtkBridgePointIteratorOne.h
index 5301e396058e44869016f383257a4d2c4831fc52..09b57f674eaf801bb962716d9359ff740dcf7c20 100644
--- a/Testing/GenericBridge/vtkBridgePointIteratorOne.h
+++ b/Testing/GenericBridge/vtkBridgePointIteratorOne.h
@@ -16,8 +16,8 @@
 // .SECTION See Also
 // vtkGenericPointIterator, vtkBridgeDataSet
 
-#ifndef __vtkBridgePointIteratorOne_h
-#define __vtkBridgePointIteratorOne_h
+#ifndef vtkBridgePointIteratorOne_h
+#define vtkBridgePointIteratorOne_h
 
 #include "vtkBridgeExport.h" //for module export macro
 #include "vtkGenericPointIterator.h"
diff --git a/Testing/Rendering/vtkRegressionTestImage.h b/Testing/Rendering/vtkRegressionTestImage.h
index 3900d45a4a4ca78dbb614189966519f676d7ae01..fcf18eebe168e4dde3dd79c091e6380da210d70c 100644
--- a/Testing/Rendering/vtkRegressionTestImage.h
+++ b/Testing/Rendering/vtkRegressionTestImage.h
@@ -12,8 +12,8 @@
      PURPOSE.  See the above copyright notice for more information.
 
 =========================================================================*/
-#ifndef __vtkRegressionTestImage_h
-#define __vtkRegressionTestImage_h
+#ifndef vtkRegressionTestImage_h
+#define vtkRegressionTestImage_h
 
 // Includes and a macro necessary for saving the image produced by a cxx
 // example program. This capability is critical for regression testing.
@@ -37,5 +37,5 @@ vtkTesting::Test(argc, argv, rw, 10)
 #define vtkRegressionTestImageThreshold(rw, t) \
 vtkTesting::Test(argc, argv, rw, t)
 
-#endif // __vtkRegressionTestImage_h
+#endif // vtkRegressionTestImage_h
 // VTK-HeaderTest-Exclude: vtkRegressionTestImage.h
diff --git a/Testing/Rendering/vtkTesting.h b/Testing/Rendering/vtkTesting.h
index 8d81e6b5696df27fa6ca635bd457485e111894aa..3f72ffbe218538a5b00d1795ac7106b43972c79b 100644
--- a/Testing/Rendering/vtkTesting.h
+++ b/Testing/Rendering/vtkTesting.h
@@ -56,8 +56,8 @@
 //    }
 //
 
-#ifndef __vtkTesting_h
-#define __vtkTesting_h
+#ifndef vtkTesting_h
+#define vtkTesting_h
 
 #include "vtkTestingRenderingModule.h" // For export macro
 #include "vtkObject.h"
diff --git a/Testing/Rendering/vtkTestingInteractor.h b/Testing/Rendering/vtkTestingInteractor.h
index 06d14917e41c72e037bdda670549404009f0bf03..01236630e64d20401e09ef440e1f49e071db44b8 100644
--- a/Testing/Rendering/vtkTestingInteractor.h
+++ b/Testing/Rendering/vtkTestingInteractor.h
@@ -21,8 +21,8 @@
 // .SECTION See Also
 // vtkTestingObjectFactory
 
-#ifndef __vtkTestingInteractor_h
-#define __vtkTestingInteractor_h
+#ifndef vtkTestingInteractor_h
+#define vtkTestingInteractor_h
 
 #include "vtkTestingRenderingModule.h" // For export macro
 #include "vtkRenderWindowInteractor.h"
diff --git a/Testing/Rendering/vtkTestingObjectFactory.h b/Testing/Rendering/vtkTestingObjectFactory.h
index 448e80a09fadb8883c04dbe7490b08bd60cf8914..4e4e24fae5234188061cd80f2cebbc12a6267d88 100644
--- a/Testing/Rendering/vtkTestingObjectFactory.h
+++ b/Testing/Rendering/vtkTestingObjectFactory.h
@@ -12,8 +12,8 @@
      PURPOSE.  See the above copyrgight notice for more information.
 
 =========================================================================*/
-#ifndef __vtkTestingObjectFactory_h
-#define __vtkTestingObjectFactory_h
+#ifndef vtkTestingObjectFactory_h
+#define vtkTestingObjectFactory_h
 
 // .NAME vtkTestingObjectFactory - Object overrides used during testing
 // .SECTION Description
diff --git a/ThirdParty/exodusII/vtk_exodusII.h b/ThirdParty/exodusII/vtk_exodusII.h
index 881cabaf20264545e3bca3e8718fc1cca298b2c0..d2f46d604b60ca850ca546ad35fcbf68b3f00cb1 100644
--- a/ThirdParty/exodusII/vtk_exodusII.h
+++ b/ThirdParty/exodusII/vtk_exodusII.h
@@ -12,8 +12,8 @@
      PURPOSE.  See the above copyright notice for more information.
 
 =========================================================================*/
-#ifndef __vtk_exodusII_h
-#define __vtk_exodusII_h
+#ifndef vtk_exodusII_h
+#define vtk_exodusII_h
 
 /* Use the exodusII library configured for VTK.  */
 #include <vtkexodusII/include/exodusII.h>
diff --git a/ThirdParty/verdict/vtk_verdict.h b/ThirdParty/verdict/vtk_verdict.h
index 445e842c11669611fcab547265599a77f6b0fcf4..7945380de7887d8240d3c741052ce1ceb0eeeaf0 100644
--- a/ThirdParty/verdict/vtk_verdict.h
+++ b/ThirdParty/verdict/vtk_verdict.h
@@ -12,8 +12,8 @@
      PURPOSE.  See the above copyright notice for more information.
 
 =========================================================================*/
-#ifndef __vtk_verdict_h
-#define __vtk_verdict_h
+#ifndef vtk_verdict_h
+#define vtk_verdict_h
 
 /* Use the verdict library configured for VTK.  */
 #include <vtkverdict/verdict.h>
diff --git a/Utilities/Python/vtkPython.h b/Utilities/Python/vtkPython.h
index 95675f0f701aee986c11e1421eae86ddac4df44e..17c3b02c4f055e292b78c2eae7c78fa139b4d97d 100644
--- a/Utilities/Python/vtkPython.h
+++ b/Utilities/Python/vtkPython.h
@@ -12,8 +12,8 @@
      PURPOSE.  See the above copyright notice for more information.
 
 =========================================================================*/
-#ifndef __vtkPython_h
-#define __vtkPython_h
+#ifndef vtkPython_h
+#define vtkPython_h
 
 #include "vtkPythonConfigure.h"
 #include "vtkABI.h"
diff --git a/Utilities/PythonInterpreter/vtkPythonInteractiveInterpreter.h b/Utilities/PythonInterpreter/vtkPythonInteractiveInterpreter.h
index d0b93e8b010490a213c7fc693ddbc6d576fc3a0d..c80a6855cd986e0a581bff97942d03c46084abf6 100644
--- a/Utilities/PythonInterpreter/vtkPythonInteractiveInterpreter.h
+++ b/Utilities/PythonInterpreter/vtkPythonInteractiveInterpreter.h
@@ -30,8 +30,8 @@
 // vtkCommand::ExitEvent, vtkCommand::UpdateEvent, vtkCommand::ErrorEvent and
 // vtkCommand::SetOutputEvent.
 
-#ifndef __vtkPythonInteractiveInterpreter_h
-#define __vtkPythonInteractiveInterpreter_h
+#ifndef vtkPythonInteractiveInterpreter_h
+#define vtkPythonInteractiveInterpreter_h
 
 #include "vtkObject.h"
 #include "vtkPythonInterpreterModule.h" // For export macro
diff --git a/Utilities/PythonInterpreter/vtkPythonInterpreter.h b/Utilities/PythonInterpreter/vtkPythonInterpreter.h
index 0e9942e029f744b9f6910ba5ac886a335d89137f..34b8ba6a33f2db47a4463288f3897252dfd8c926 100644
--- a/Utilities/PythonInterpreter/vtkPythonInterpreter.h
+++ b/Utilities/PythonInterpreter/vtkPythonInterpreter.h
@@ -46,8 +46,8 @@
 // after Finalize especially when concerning with imported modules. Refer to
 // Python docs for details. In short, modules like numpy don't continue to work
 // after a re-initialize. Hence use it with caution.
-#ifndef __vtkPythonInterpreter_h
-#define __vtkPythonInterpreter_h
+#ifndef vtkPythonInterpreter_h
+#define vtkPythonInterpreter_h
 
 #include "vtkObject.h"
 #include "vtkPythonInterpreterModule.h" // For export macro
diff --git a/Utilities/PythonInterpreter/vtkPythonStdStreamCaptureHelper.h b/Utilities/PythonInterpreter/vtkPythonStdStreamCaptureHelper.h
index 7f1d3a187e9c760f9b0cc2187d252886714f30b9..43000d3bb9e6f83f29f60d8578704c9458db8d92 100644
--- a/Utilities/PythonInterpreter/vtkPythonStdStreamCaptureHelper.h
+++ b/Utilities/PythonInterpreter/vtkPythonStdStreamCaptureHelper.h
@@ -14,8 +14,8 @@
 =========================================================================*/
 // .NAME vtkPythonStdStreamCaptureHelper
 // .SECTION Description
-#ifndef __vtkPythonStdStreamCaptureHelper_h
-#define __vtkPythonStdStreamCaptureHelper_h
+#ifndef vtkPythonStdStreamCaptureHelper_h
+#define vtkPythonStdStreamCaptureHelper_h
 
 #include "structmember.h"
 #include "vtkPythonInterpreter.h"
diff --git a/Views/Context2D/vtkContextInteractorStyle.h b/Views/Context2D/vtkContextInteractorStyle.h
index 2a399ae5fe09ef1c4a80e581b8118ada5af4c28e..2aa62feb45dfe1b85cefd917e25c40091c9ae57e 100644
--- a/Views/Context2D/vtkContextInteractorStyle.h
+++ b/Views/Context2D/vtkContextInteractorStyle.h
@@ -19,8 +19,8 @@
 //
 // .SECTION Description
 
-#ifndef __vtkContextInteractorStyle_h
-#define __vtkContextInteractorStyle_h
+#ifndef vtkContextInteractorStyle_h
+#define vtkContextInteractorStyle_h
 
 #include "vtkViewsContext2DModule.h" // For export macro
 #include "vtkInteractorStyle.h"
diff --git a/Views/Context2D/vtkContextView.h b/Views/Context2D/vtkContextView.h
index 079749b84f5c0a5c947d8c6cdb47c7d90c75032b..69a50f6335c3a890429c5f612723ca5ed5ad4234 100644
--- a/Views/Context2D/vtkContextView.h
+++ b/Views/Context2D/vtkContextView.h
@@ -22,8 +22,8 @@
 //
 // By default the scene has a white background.
 
-#ifndef __vtkContextView_h
-#define __vtkContextView_h
+#ifndef vtkContextView_h
+#define vtkContextView_h
 
 #include "vtkViewsContext2DModule.h" // For export macro
 #include "vtkRenderViewBase.h"
diff --git a/Views/Core/vtkConvertSelectionDomain.h b/Views/Core/vtkConvertSelectionDomain.h
index a9ea31ff498a06ca823e5fd42baa73bf382aed8a..54e7122b2d5e087a60c74031845cfc409067ef2b 100644
--- a/Views/Core/vtkConvertSelectionDomain.h
+++ b/Views/Core/vtkConvertSelectionDomain.h
@@ -35,8 +35,8 @@
 // The second output is the selection associated with the "current annotation"
 // normally representing the current interactive selection.
 
-#ifndef __vtkConvertSelectionDomain_h
-#define __vtkConvertSelectionDomain_h
+#ifndef vtkConvertSelectionDomain_h
+#define vtkConvertSelectionDomain_h
 
 #include "vtkViewsCoreModule.h" // For export macro
 #include "vtkPassInputTypeAlgorithm.h"
diff --git a/Views/Core/vtkDataRepresentation.h b/Views/Core/vtkDataRepresentation.h
index 7c2f160be050a1d4c70c65269caf9c237fb5351a..a5b53f3d8e94f207c3d024a19d69424b12db41c7 100644
--- a/Views/Core/vtkDataRepresentation.h
+++ b/Views/Core/vtkDataRepresentation.h
@@ -44,8 +44,8 @@
 // responsible for linking representations as appropriate by setting the
 // same vtkAnnotationLink on each linked representation.
 
-#ifndef __vtkDataRepresentation_h
-#define __vtkDataRepresentation_h
+#ifndef vtkDataRepresentation_h
+#define vtkDataRepresentation_h
 
 #include "vtkViewsCoreModule.h" // For export macro
 #include "vtkPassInputTypeAlgorithm.h"
diff --git a/Views/Core/vtkEmptyRepresentation.h b/Views/Core/vtkEmptyRepresentation.h
index d23ec17d39fa7fa30f86f8b0530d7babfabafc9b..6c1da03144fb0e29462f3373eebc7daff45cbf9f 100644
--- a/Views/Core/vtkEmptyRepresentation.h
+++ b/Views/Core/vtkEmptyRepresentation.h
@@ -21,8 +21,8 @@
 //
 // .SECTION Description
 
-#ifndef __vtkEmptyRepresentation_h
-#define __vtkEmptyRepresentation_h
+#ifndef vtkEmptyRepresentation_h
+#define vtkEmptyRepresentation_h
 
 #include "vtkViewsCoreModule.h" // For export macro
 #include "vtkDataRepresentation.h"
diff --git a/Views/Core/vtkRenderViewBase.h b/Views/Core/vtkRenderViewBase.h
index cfe931cf9b8226719b7fe4e09ce44731bb61f58d..2350017476c6f4c99082d94a861b5f85c4f3a5b8 100644
--- a/Views/Core/vtkRenderViewBase.h
+++ b/Views/Core/vtkRenderViewBase.h
@@ -31,8 +31,8 @@
 // widget->SetRenderWindow(view->GetRenderWindow());
 // \endcode
 
-#ifndef __vtkRenderViewBase_h
-#define __vtkRenderViewBase_h
+#ifndef vtkRenderViewBase_h
+#define vtkRenderViewBase_h
 
 #include "vtkViewsCoreModule.h" // For export macro
 #include "vtkView.h"
diff --git a/Views/Core/vtkView.h b/Views/Core/vtkView.h
index 9303a64257999f9182ecb481949900c893dd1266..88580fe27520d07bb0004cee7b0c986ec4cf345b 100644
--- a/Views/Core/vtkView.h
+++ b/Views/Core/vtkView.h
@@ -35,8 +35,8 @@
 // in multiple views, their selections may be linked by setting the same
 // vtkAnnotationLink on their representations (see vtkDataRepresentation).
 
-#ifndef __vtkView_h
-#define __vtkView_h
+#ifndef vtkView_h
+#define vtkView_h
 
 #include "vtkViewsCoreModule.h" // For export macro
 #include "vtkObject.h"
diff --git a/Views/Core/vtkViewTheme.h b/Views/Core/vtkViewTheme.h
index b3443e1a6ccedfb23731b730c378ce06dc92cca9..c01b8ca6eb5d33b8009613af2c7336efbd534aa9 100644
--- a/Views/Core/vtkViewTheme.h
+++ b/Views/Core/vtkViewTheme.h
@@ -27,8 +27,8 @@
 // solution based on style sheets.  Do not become overly-dependent on the
 // functionality of themes.
 
-#ifndef __vtkViewTheme_h
-#define __vtkViewTheme_h
+#ifndef vtkViewTheme_h
+#define vtkViewTheme_h
 
 #include "vtkViewsCoreModule.h" // For export macro
 #include "vtkObject.h"
diff --git a/Views/Geovis/vtkGeoView.h b/Views/Geovis/vtkGeoView.h
index 367c908a518f52b025137e467bacdabb21c08058..8d285c6a356fa6e353c49af5c67c26de774a4b28 100644
--- a/Views/Geovis/vtkGeoView.h
+++ b/Views/Geovis/vtkGeoView.h
@@ -37,8 +37,8 @@
 // .SECTION See Also
 // vtkGeoTerrain vtkGeoAlignedImageRepresentation vtkGeoSource
 
-#ifndef __vtkGeoView_h
-#define __vtkGeoView_h
+#ifndef vtkGeoView_h
+#define vtkGeoView_h
 
 #include "vtkViewsGeovisModule.h" // For export macro
 #include "vtkRenderView.h"
diff --git a/Views/Infovis/vtkApplyColors.h b/Views/Infovis/vtkApplyColors.h
index a21ae340b79efd5744f54760e725a7df4fe9ce5f..4879b706850cfe26d1b3b1ede431f51efa9729d1 100644
--- a/Views/Infovis/vtkApplyColors.h
+++ b/Views/Infovis/vtkApplyColors.h
@@ -71,8 +71,8 @@
 // than any of these three opacities. Selected items are always given the
 // selection opacity directly.
 
-#ifndef __vtkApplyColors_h
-#define __vtkApplyColors_h
+#ifndef vtkApplyColors_h
+#define vtkApplyColors_h
 
 #include "vtkViewsInfovisModule.h" // For export macro
 #include "vtkPassInputTypeAlgorithm.h"
diff --git a/Views/Infovis/vtkApplyIcons.h b/Views/Infovis/vtkApplyIcons.h
index 50d5f5c741ac36d9dc2d10f5f9d342b040535f02..05514e9c7c9035d32db4d22f505b5a45de1e3a8c 100644
--- a/Views/Infovis/vtkApplyIcons.h
+++ b/Views/Infovis/vtkApplyIcons.h
@@ -57,8 +57,8 @@
 // <li> Otherwise it will be glyphed with the default icon.
 // </ol>
 
-#ifndef __vtkApplyIcons_h
-#define __vtkApplyIcons_h
+#ifndef vtkApplyIcons_h
+#define vtkApplyIcons_h
 
 #include "vtkViewsInfovisModule.h" // For export macro
 #include "vtkPassInputTypeAlgorithm.h"
diff --git a/Views/Infovis/vtkDendrogramItem.h b/Views/Infovis/vtkDendrogramItem.h
index 2cd83c590b75b3f59dd0a3b0da8d87acdd45a07f..bc3a5399bfe5bb181439f6509a8824a97619ad6c 100644
--- a/Views/Infovis/vtkDendrogramItem.h
+++ b/Views/Infovis/vtkDendrogramItem.h
@@ -30,8 +30,8 @@
 // .SEE ALSO
 // vtkTree vtkNewickTreeReader
 
-#ifndef __vtkDendrogramItem_h
-#define __vtkDendrogramItem_h
+#ifndef vtkDendrogramItem_h
+#define vtkDendrogramItem_h
 
 #include "vtkViewsInfovisModule.h" // For export macro
 #include "vtkContextItem.h"
diff --git a/Views/Infovis/vtkGraphItem.h b/Views/Infovis/vtkGraphItem.h
index 225bc247a602c9036d56fe6aee3a34ab869942a2..f41ed87731192bae50aa8991b2239e847d9a6b81 100644
--- a/Views/Infovis/vtkGraphItem.h
+++ b/Views/Infovis/vtkGraphItem.h
@@ -22,8 +22,8 @@
 // subclass this item and override the property functions you wish to
 // customize.
 
-#ifndef __vtkMultiLineItem_h
-#define __vtkMultiLineItem_h
+#ifndef vtkMultiLineItem_h
+#define vtkMultiLineItem_h
 
 #include "vtkViewsInfovisModule.h" // For export macro
 #include "vtkContextItem.h"
diff --git a/Views/Infovis/vtkGraphLayoutView.h b/Views/Infovis/vtkGraphLayoutView.h
index 10e76e94d57217bacac2cbe8a9f984d28d5068ed..e3b3c98ff63c6db7aa5a7cd16cb1cdfb5aab3c18 100644
--- a/Views/Infovis/vtkGraphLayoutView.h
+++ b/Views/Infovis/vtkGraphLayoutView.h
@@ -36,8 +36,8 @@
 // .SECTION Thanks
 // Thanks a bunch to the holographic unfolding pattern.
 
-#ifndef __vtkGraphLayoutView_h
-#define __vtkGraphLayoutView_h
+#ifndef vtkGraphLayoutView_h
+#define vtkGraphLayoutView_h
 
 #include "vtkViewsInfovisModule.h" // For export macro
 #include "vtkRenderView.h"
diff --git a/Views/Infovis/vtkHeatmapItem.h b/Views/Infovis/vtkHeatmapItem.h
index 88fef4c851664035f6327a3857ffecb0e21e5be0..98353c89338dd52b6b679bf2422051e7c6824301 100644
--- a/Views/Infovis/vtkHeatmapItem.h
+++ b/Views/Infovis/vtkHeatmapItem.h
@@ -20,8 +20,8 @@
 // .SEE ALSO
 // vtkTable
 
-#ifndef __vtkHeatmapItem_h
-#define __vtkHeatmapItem_h
+#ifndef vtkHeatmapItem_h
+#define vtkHeatmapItem_h
 
 #include "vtkViewsInfovisModule.h" // For export macro
 #include "vtkContextItem.h"
diff --git a/Views/Infovis/vtkHierarchicalGraphView.h b/Views/Infovis/vtkHierarchicalGraphView.h
index 4b3913821ccc5bbb91ca69139147ef513bd1385f..d3e2c85f28a6a9e1b2fb6921c12ac55cb50a364c 100644
--- a/Views/Infovis/vtkHierarchicalGraphView.h
+++ b/Views/Infovis/vtkHierarchicalGraphView.h
@@ -35,8 +35,8 @@
 // Thanks to the turtle with jets for feet, without you this class wouldn't
 // have been possible.
 
-#ifndef __vtkHierarchicalGraphView_h
-#define __vtkHierarchicalGraphView_h
+#ifndef vtkHierarchicalGraphView_h
+#define vtkHierarchicalGraphView_h
 
 #include "vtkViewsInfovisModule.h" // For export macro
 #include "vtkGraphLayoutView.h"
diff --git a/Views/Infovis/vtkIcicleView.h b/Views/Infovis/vtkIcicleView.h
index 91cfe5d9ad861ecd84925f65d82a2ccf7003deb5..94418eb8b7c607827a7808181838e466d11d7cbe 100644
--- a/Views/Infovis/vtkIcicleView.h
+++ b/Views/Infovis/vtkIcicleView.h
@@ -25,8 +25,8 @@
 // Child sectors are below (or above) parent sectors, and may be
 // colored and sized by various parameters.
 
-#ifndef __vtkIcicleView_h
-#define __vtkIcicleView_h
+#ifndef vtkIcicleView_h
+#define vtkIcicleView_h
 
 #include "vtkViewsInfovisModule.h" // For export macro
 #include "vtkTreeAreaView.h"
diff --git a/Views/Infovis/vtkInteractorStyleAreaSelectHover.h b/Views/Infovis/vtkInteractorStyleAreaSelectHover.h
index 1552eab0b4bcfa3be2bfb032c31d9da329496cf1..1b932106c532f2329a0af94483a40521b8688c42 100644
--- a/Views/Infovis/vtkInteractorStyleAreaSelectHover.h
+++ b/Views/Infovis/vtkInteractorStyleAreaSelectHover.h
@@ -28,8 +28,8 @@
 // rubber band selection and provides a balloon containing the name of the
 // vertex hovered over.
 
-#ifndef __vtkInteractorStyleAreaSelectHover_h
-#define __vtkInteractorStyleAreaSelectHover_h
+#ifndef vtkInteractorStyleAreaSelectHover_h
+#define vtkInteractorStyleAreaSelectHover_h
 
 #include "vtkViewsInfovisModule.h" // For export macro
 #include "vtkInteractorStyleRubberBand2D.h"
diff --git a/Views/Infovis/vtkInteractorStyleTreeMapHover.h b/Views/Infovis/vtkInteractorStyleTreeMapHover.h
index d549941929d8a58d4fda0567ebafb6f34edc9514..5b8ef5ad3265faaabc1c5e0282924b47527ce40c 100644
--- a/Views/Infovis/vtkInteractorStyleTreeMapHover.h
+++ b/Views/Infovis/vtkInteractorStyleTreeMapHover.h
@@ -28,8 +28,8 @@
 // provides a balloon containing the name of the vertex hovered over,
 // and allows the user to highlight a vertex by clicking on it.
 
-#ifndef __vtkInteractorStyleTreeMapHover_h
-#define __vtkInteractorStyleTreeMapHover_h
+#ifndef vtkInteractorStyleTreeMapHover_h
+#define vtkInteractorStyleTreeMapHover_h
 
 #include "vtkViewsInfovisModule.h" // For export macro
 #include "vtkInteractorStyleImage.h"
diff --git a/Views/Infovis/vtkParallelCoordinatesHistogramRepresentation.h b/Views/Infovis/vtkParallelCoordinatesHistogramRepresentation.h
index d33fec70564f2e1a0c86044eebd3ae0d9750e997..f3641950590dfd9c41ecfe42c6a299085535c635 100644
--- a/Views/Infovis/vtkParallelCoordinatesHistogramRepresentation.h
+++ b/Views/Infovis/vtkParallelCoordinatesHistogramRepresentation.h
@@ -49,8 +49,8 @@
 // .SECTION Thanks
 //  Developed by David Feng at Sandia National Laboratories
 
-#ifndef __vtkParallelCoordinatesHistogramRepresentation_h
-#define __vtkParallelCoordinatesHistogramRepresentation_h
+#ifndef vtkParallelCoordinatesHistogramRepresentation_h
+#define vtkParallelCoordinatesHistogramRepresentation_h
 
 #include "vtkViewsInfovisModule.h" // For export macro
 #include "vtkParallelCoordinatesRepresentation.h"
diff --git a/Views/Infovis/vtkParallelCoordinatesRepresentation.h b/Views/Infovis/vtkParallelCoordinatesRepresentation.h
index 637e50b3e9af974f490165de5f88869b8867d3e4..594b886d7440d3f25d754bff8c767d0f1fcdf8d3 100644
--- a/Views/Infovis/vtkParallelCoordinatesRepresentation.h
+++ b/Views/Infovis/vtkParallelCoordinatesRepresentation.h
@@ -44,8 +44,8 @@
 // .SECTION Thanks
 //  Developed by David Feng at Sandia National Laboratories
 
-#ifndef __vtkParallelCoordinatesRepresentation_h
-#define __vtkParallelCoordinatesRepresentation_h
+#ifndef vtkParallelCoordinatesRepresentation_h
+#define vtkParallelCoordinatesRepresentation_h
 
 #include "vtkViewsInfovisModule.h" // For export macro
 #include "vtkRenderedRepresentation.h"
diff --git a/Views/Infovis/vtkParallelCoordinatesView.h b/Views/Infovis/vtkParallelCoordinatesView.h
index ebf70557081e30abcec3a50682c9c4941378ca3e..5a4c76061f25bdd0e7a67a704d3bf932910fc5ad 100644
--- a/Views/Infovis/vtkParallelCoordinatesView.h
+++ b/Views/Infovis/vtkParallelCoordinatesView.h
@@ -36,8 +36,8 @@ PURPOSE.  See the above copyright notice for more information.
 // There are several self-explanatory operators for combining selections: ADD, SUBTRACT
 // REPLACE, and INTERSECT.
 
-#ifndef __vtkParallelCoordinatesView_h
-#define __vtkParallelCoordinatesView_h
+#ifndef vtkParallelCoordinatesView_h
+#define vtkParallelCoordinatesView_h
 
 #include "vtkViewsInfovisModule.h" // For export macro
 #include "vtkRenderView.h"
diff --git a/Views/Infovis/vtkRenderView.h b/Views/Infovis/vtkRenderView.h
index 352e274e9a36dba2857d279525084270b44f08fc..6eec1fa4048c1bdb69036586006cfe7b514d6d53 100644
--- a/Views/Infovis/vtkRenderView.h
+++ b/Views/Infovis/vtkRenderView.h
@@ -28,8 +28,8 @@
 // This class is also the parent class for any more specialized view which uses
 // a renderer.
 
-#ifndef __vtkRenderView_h
-#define __vtkRenderView_h
+#ifndef vtkRenderView_h
+#define vtkRenderView_h
 
 #include "vtkViewsInfovisModule.h" // For export macro
 #include "vtkRenderViewBase.h"
diff --git a/Views/Infovis/vtkRenderedGraphRepresentation.h b/Views/Infovis/vtkRenderedGraphRepresentation.h
index aa787d78578f5660ab49554b05a380c91cfc6875..500a1e047dce8d8aac43ea4774b83d03b6aa3771 100644
--- a/Views/Infovis/vtkRenderedGraphRepresentation.h
+++ b/Views/Infovis/vtkRenderedGraphRepresentation.h
@@ -21,8 +21,8 @@
 //
 // .SECTION Description
 
-#ifndef __vtkRenderedGraphRepresentation_h
-#define __vtkRenderedGraphRepresentation_h
+#ifndef vtkRenderedGraphRepresentation_h
+#define vtkRenderedGraphRepresentation_h
 
 #include "vtkViewsInfovisModule.h" // For export macro
 #include "vtkRenderedRepresentation.h"
diff --git a/Views/Infovis/vtkRenderedHierarchyRepresentation.h b/Views/Infovis/vtkRenderedHierarchyRepresentation.h
index 8c1a2ad4cd24e6749eb1a8429ed41145617fb62d..736118260eadce95b70c77cd59a22d677e97aed5 100644
--- a/Views/Infovis/vtkRenderedHierarchyRepresentation.h
+++ b/Views/Infovis/vtkRenderedHierarchyRepresentation.h
@@ -21,8 +21,8 @@
 //
 // .SECTION Description
 
-#ifndef __vtkRenderedHierarchyRepresentation_h
-#define __vtkRenderedHierarchyRepresentation_h
+#ifndef vtkRenderedHierarchyRepresentation_h
+#define vtkRenderedHierarchyRepresentation_h
 
 #include "vtkViewsInfovisModule.h" // For export macro
 #include "vtkRenderedGraphRepresentation.h"
diff --git a/Views/Infovis/vtkRenderedRepresentation.h b/Views/Infovis/vtkRenderedRepresentation.h
index fe153a0b80888382d6390f34cb22f8aeceab3900..45eb6eddf5d2201f3bcbdd19b57e48c6afc1dd02 100644
--- a/Views/Infovis/vtkRenderedRepresentation.h
+++ b/Views/Infovis/vtkRenderedRepresentation.h
@@ -21,8 +21,8 @@
 //
 // .SECTION Description
 
-#ifndef __vtkRenderedRepresentation_h
-#define __vtkRenderedRepresentation_h
+#ifndef vtkRenderedRepresentation_h
+#define vtkRenderedRepresentation_h
 
 #include "vtkViewsInfovisModule.h" // For export macro
 #include "vtkDataRepresentation.h"
diff --git a/Views/Infovis/vtkRenderedSurfaceRepresentation.h b/Views/Infovis/vtkRenderedSurfaceRepresentation.h
index 2c58d8408cca62771d5cb30ec068c020bfc77162..ea3546853bd2daeaaa770089a2ef85d40bf772e7 100644
--- a/Views/Infovis/vtkRenderedSurfaceRepresentation.h
+++ b/Views/Infovis/vtkRenderedSurfaceRepresentation.h
@@ -25,8 +25,8 @@
 // polygonal data (e.g. volumetric data is converted to its external surface).
 // The representation may then be added to vtkRenderView.
 
-#ifndef __vtkRenderedSurfaceRepresentation_h
-#define __vtkRenderedSurfaceRepresentation_h
+#ifndef vtkRenderedSurfaceRepresentation_h
+#define vtkRenderedSurfaceRepresentation_h
 
 #include "vtkViewsInfovisModule.h" // For export macro
 #include "vtkRenderedRepresentation.h"
diff --git a/Views/Infovis/vtkRenderedTreeAreaRepresentation.h b/Views/Infovis/vtkRenderedTreeAreaRepresentation.h
index 05ecc462a3fc7789f63ef81e8a6de2681f97fd00..69380716584ce0cb0d2c36988b9ac4d56219eb50 100644
--- a/Views/Infovis/vtkRenderedTreeAreaRepresentation.h
+++ b/Views/Infovis/vtkRenderedTreeAreaRepresentation.h
@@ -21,8 +21,8 @@
 //
 // .SECTION Description
 
-#ifndef __vtkRenderedTreeAreaRepresentation_h
-#define __vtkRenderedTreeAreaRepresentation_h
+#ifndef vtkRenderedTreeAreaRepresentation_h
+#define vtkRenderedTreeAreaRepresentation_h
 
 #include "vtkViewsInfovisModule.h" // For export macro
 #include "vtkRenderedRepresentation.h"
diff --git a/Views/Infovis/vtkSCurveSpline.h b/Views/Infovis/vtkSCurveSpline.h
index fb95592e4f0a2b925df4a003823c508fbf9ae4cc..33dc4899850e4e07f40525a7a71eedf7a1e82395 100644
--- a/Views/Infovis/vtkSCurveSpline.h
+++ b/Views/Infovis/vtkSCurveSpline.h
@@ -27,8 +27,8 @@
 // .SECTION See Also
 // vtkSpline vtkKochanekSpline
 
-#ifndef __vtkSCurveSpline_h
-#define __vtkSCurveSpline_h
+#ifndef vtkSCurveSpline_h
+#define vtkSCurveSpline_h
 
 #include "vtkViewsInfovisModule.h" // For export macro
 #include "vtkSpline.h"
diff --git a/Views/Infovis/vtkTanglegramItem.h b/Views/Infovis/vtkTanglegramItem.h
index 2873443d4a3d35e3df29b82939cc61f46633c652..fd70377edc665893d505cb45ff6564c38820f723 100644
--- a/Views/Infovis/vtkTanglegramItem.h
+++ b/Views/Infovis/vtkTanglegramItem.h
@@ -23,8 +23,8 @@
 // .SEE ALSO
 // vtkTree vtkTable vtkDendrogramItem vtkNewickTreeReader
 
-#ifndef __vtkTanglegramItem_h
-#define __vtkTanglegramItem_h
+#ifndef vtkTanglegramItem_h
+#define vtkTanglegramItem_h
 
 #include "vtkViewsInfovisModule.h" // For export macro
 
diff --git a/Views/Infovis/vtkTreeAreaView.h b/Views/Infovis/vtkTreeAreaView.h
index 5bf2e7f65133805d31eed0bc46d8ee2bf9ac1da1..e227de0121d1bd9be6ae96c2674e2ad4af1ee2ed 100644
--- a/Views/Infovis/vtkTreeAreaView.h
+++ b/Views/Infovis/vtkTreeAreaView.h
@@ -34,8 +34,8 @@
 // .SECTION Thanks
 // Thanks to Jason Shepherd for implementing this class
 
-#ifndef __vtkTreeAreaView_h
-#define __vtkTreeAreaView_h
+#ifndef vtkTreeAreaView_h
+#define vtkTreeAreaView_h
 
 #include "vtkViewsInfovisModule.h" // For export macro
 #include "vtkRenderView.h"
diff --git a/Views/Infovis/vtkTreeHeatmapItem.h b/Views/Infovis/vtkTreeHeatmapItem.h
index 11e4752a1023dbb17398d142463bf0dc21b88630..daf5f2d7dbcdfd3c4aa73fe31a535d24bd83532e 100644
--- a/Views/Infovis/vtkTreeHeatmapItem.h
+++ b/Views/Infovis/vtkTreeHeatmapItem.h
@@ -30,8 +30,8 @@
 // .SEE ALSO
 // vtkDendrogramItem vtkHeatmapItem vtkTree vtkTable vtkNewickTreeReader
 
-#ifndef __vtkTreeHeatmapItem_h
-#define __vtkTreeHeatmapItem_h
+#ifndef vtkTreeHeatmapItem_h
+#define vtkTreeHeatmapItem_h
 
 #include "vtkViewsInfovisModule.h" // For export macro
 #include "vtkContextItem.h"
diff --git a/Views/Infovis/vtkTreeMapView.h b/Views/Infovis/vtkTreeMapView.h
index 07c4b31e81e647044185d91d416e3351ff28aa2d..341368a681fae9c66b4a0eb85109c909e02c3d1c 100644
--- a/Views/Infovis/vtkTreeMapView.h
+++ b/Views/Infovis/vtkTreeMapView.h
@@ -24,8 +24,8 @@
 // tree is represented by a box.  Child boxes are contained within the
 // parent box, and may be colored and sized by various parameters.
 
-#ifndef __vtkTreeMapView_h
-#define __vtkTreeMapView_h
+#ifndef vtkTreeMapView_h
+#define vtkTreeMapView_h
 
 #include "vtkViewsInfovisModule.h" // For export macro
 #include "vtkTreeAreaView.h"
diff --git a/Views/Infovis/vtkTreeRingView.h b/Views/Infovis/vtkTreeRingView.h
index 5877297b389836c9463ad41c6053023d3cbe499d..c62a942b49c4658ebf6cbc16b61bcb2c8c1a9be6 100644
--- a/Views/Infovis/vtkTreeRingView.h
+++ b/Views/Infovis/vtkTreeRingView.h
@@ -33,8 +33,8 @@
 // .SECTION Thanks
 // Thanks to Jason Shepherd for implementing this class
 
-#ifndef __vtkTreeRingView_h
-#define __vtkTreeRingView_h
+#ifndef vtkTreeRingView_h
+#define vtkTreeRingView_h
 
 #include "vtkViewsInfovisModule.h" // For export macro
 #include "vtkTreeAreaView.h"
diff --git a/Views/Infovis/vtkViewUpdater.h b/Views/Infovis/vtkViewUpdater.h
index 521035d7dab0d5ce149671539c8bdc00cae415b8..c56abde48f65c666e6a28125adbcaede2c702e9f 100644
--- a/Views/Infovis/vtkViewUpdater.h
+++ b/Views/Infovis/vtkViewUpdater.h
@@ -25,8 +25,8 @@
 // annotation changed event. This is often needed when multiple views share
 // a selection with vtkAnnotationLink.
 
-#ifndef __vtkViewUpdater_h
-#define __vtkViewUpdater_h
+#ifndef vtkViewUpdater_h
+#define vtkViewUpdater_h
 
 #include "vtkViewsInfovisModule.h" // For export macro
 #include "vtkObject.h"
diff --git a/Views/Qt/vtkQtAnnotationView.h b/Views/Qt/vtkQtAnnotationView.h
index 5eb660f9064bc04f4ba716e63f22d0ebdf6d2d26..8635646f24f178b932da4dacbdcbab415c03123c 100644
--- a/Views/Qt/vtkQtAnnotationView.h
+++ b/Views/Qt/vtkQtAnnotationView.h
@@ -25,8 +25,8 @@
 //
 // .SECTION Thanks
 
-#ifndef __vtkQtAnnotationView_h
-#define __vtkQtAnnotationView_h
+#ifndef vtkQtAnnotationView_h
+#define vtkQtAnnotationView_h
 
 #include "vtkViewsQtModule.h" // For export macro
 #include "QVTKWin32Header.h"
diff --git a/Views/Qt/vtkQtListView.h b/Views/Qt/vtkQtListView.h
index 5903ba144755a63fb89da0eb4395095cc265bc03..e0624a32fda4a25002f9cad3e51d98e34b5f9245 100644
--- a/Views/Qt/vtkQtListView.h
+++ b/Views/Qt/vtkQtListView.h
@@ -26,8 +26,8 @@
 // Thanks to Brian Wylie from Sandia National Laboratories for implementing
 // this class
 
-#ifndef __vtkQtListView_h
-#define __vtkQtListView_h
+#ifndef vtkQtListView_h
+#define vtkQtListView_h
 
 #include "vtkViewsQtModule.h" // For export macro
 #include "QVTKWin32Header.h"
diff --git a/Views/Qt/vtkQtRecordView.h b/Views/Qt/vtkQtRecordView.h
index adfbecfb0f95863fd728c0a1a3e43006fb243985..0a624e7b60f063126c03c1a7fbc9a8cea0149948 100644
--- a/Views/Qt/vtkQtRecordView.h
+++ b/Views/Qt/vtkQtRecordView.h
@@ -28,8 +28,8 @@
 // Thanks to Brian Wylie from Sandia National Laboratories for implementing
 // this class
 
-#ifndef __vtkQtRecordView_h
-#define __vtkQtRecordView_h
+#ifndef vtkQtRecordView_h
+#define vtkQtRecordView_h
 
 #include "vtkViewsQtModule.h" // For export macro
 #include "QVTKWin32Header.h"
diff --git a/Views/Qt/vtkQtTableRepresentation.h b/Views/Qt/vtkQtTableRepresentation.h
index 52c09718c674f715fe16ee9cd73b50cde4c909f1..7f124c04fdde5231901e19948ef46ed4574efa65 100644
--- a/Views/Qt/vtkQtTableRepresentation.h
+++ b/Views/Qt/vtkQtTableRepresentation.h
@@ -46,8 +46,8 @@
 // BEFORE the representation is added to a view or strange things
 // may happen, including segfaults.
 
-#ifndef __vtkQtTableRepresentation_h
-#define __vtkQtTableRepresentation_h
+#ifndef vtkQtTableRepresentation_h
+#define vtkQtTableRepresentation_h
 
 #include "vtkViewsQtModule.h" // For export macro
 #include "QVTKWin32Header.h"
diff --git a/Views/Qt/vtkQtTableView.h b/Views/Qt/vtkQtTableView.h
index 8000f6ba4fb816f49c51160d3a1e6268b74579ff..72cd22f557b063359eb9f56efca33a8b9ef9123a 100644
--- a/Views/Qt/vtkQtTableView.h
+++ b/Views/Qt/vtkQtTableView.h
@@ -26,8 +26,8 @@
 // Thanks to Brian Wylie from Sandia National Laboratories for implementing
 // this class
 
-#ifndef __vtkQtTableView_h
-#define __vtkQtTableView_h
+#ifndef vtkQtTableView_h
+#define vtkQtTableView_h
 
 #include "vtkViewsQtModule.h" // For export macro
 #include "QVTKWin32Header.h"
diff --git a/Views/Qt/vtkQtTreeView.h b/Views/Qt/vtkQtTreeView.h
index 056e0b3a13e8b843faae565bfd92058dff3c58d9..7cfa9cdb0121194710ac7bdadaa81bd16622c694 100644
--- a/Views/Qt/vtkQtTreeView.h
+++ b/Views/Qt/vtkQtTreeView.h
@@ -26,8 +26,8 @@
 // Thanks to Brian Wylie from Sandia National Laboratories for implementing
 // this class
 
-#ifndef __vtkQtTreeView_h
-#define __vtkQtTreeView_h
+#ifndef vtkQtTreeView_h
+#define vtkQtTreeView_h
 
 #include "vtkViewsQtModule.h" // For export macro
 #include "QVTKWin32Header.h"
diff --git a/Views/Qt/vtkQtView.h b/Views/Qt/vtkQtView.h
index 6f3e2f472cb8db98e22189fcc708c5d3906fc78a..db4d96101dbe62c3247b7e440fa711b647df125f 100644
--- a/Views/Qt/vtkQtView.h
+++ b/Views/Qt/vtkQtView.h
@@ -18,8 +18,8 @@
 //
 
 
-#ifndef __vtkQtView_h
-#define __vtkQtView_h
+#ifndef vtkQtView_h
+#define vtkQtView_h
 
 #include "vtkViewsQtModule.h" // For export macro
 #include "QVTKWin32Header.h"
diff --git a/Web/Core/vtkDataEncoder.h b/Web/Core/vtkDataEncoder.h
index a448e90fd6e5e357bee938d9df77dc22d62c6089..05bc6f134b9a07e0af3d787655e0122ee03bee07 100644
--- a/Web/Core/vtkDataEncoder.h
+++ b/Web/Core/vtkDataEncoder.h
@@ -27,8 +27,8 @@
 // if it was pushed in before the N-th location was even taken up for encoding
 // by the a thread in the thread pool.
 
-#ifndef __vtkDataEncoder_h
-#define __vtkDataEncoder_h
+#ifndef vtkDataEncoder_h
+#define vtkDataEncoder_h
 
 #include "vtkObject.h"
 #include "vtkWebCoreModule.h" // needed for exports
diff --git a/Web/Core/vtkObjectIdMap.h b/Web/Core/vtkObjectIdMap.h
index b582c2000c15618a7d127a8381dfbf16f597e409..862d1c55bae359c899067426018ffc356a2d04a3 100644
--- a/Web/Core/vtkObjectIdMap.h
+++ b/Web/Core/vtkObjectIdMap.h
@@ -15,8 +15,8 @@
 // .NAME vtkObjectIdMap - class used to assign Id to any VTK object and be able
 // to retreive it base on its id.
 
-#ifndef __vtkObjectIdMap_h
-#define __vtkObjectIdMap_h
+#ifndef vtkObjectIdMap_h
+#define vtkObjectIdMap_h
 
 #include "vtkObject.h"
 #include "vtkWebCoreModule.h" // needed for exports
diff --git a/Web/Core/vtkWebApplication.h b/Web/Core/vtkWebApplication.h
index 355ce221a99c62a021d94f6b865e2485f6197984..434b465bd555cb38e25e4a6edb53a229b138f402 100644
--- a/Web/Core/vtkWebApplication.h
+++ b/Web/Core/vtkWebApplication.h
@@ -18,8 +18,8 @@
 // This exposes methods that make it easier to manage views and rendered images
 // from views.
 
-#ifndef __vtkWebApplication_h
-#define __vtkWebApplication_h
+#ifndef vtkWebApplication_h
+#define vtkWebApplication_h
 
 #include "vtkObject.h"
 #include "vtkWebCoreModule.h" // needed for exports
diff --git a/Web/Core/vtkWebInteractionEvent.h b/Web/Core/vtkWebInteractionEvent.h
index fac5c63a6a0cec6881d718c9006fdcd603bd8b57..9473e841719e65090fcc6c24bcc4eec4187b007b 100644
--- a/Web/Core/vtkWebInteractionEvent.h
+++ b/Web/Core/vtkWebInteractionEvent.h
@@ -16,8 +16,8 @@
 // .SECTION Description
 //
 
-#ifndef __vtkWebInteractionEvent_h
-#define __vtkWebInteractionEvent_h
+#ifndef vtkWebInteractionEvent_h
+#define vtkWebInteractionEvent_h
 
 #include "vtkObject.h"
 #include "vtkWebCoreModule.h" // needed for exports
diff --git a/Web/Core/vtkWebUtilities.h b/Web/Core/vtkWebUtilities.h
index 144d9211b8e01e495ff566493ad7612c0df81d41..d62ebaed78aeec87a7be5c54d178537825c8de44 100644
--- a/Web/Core/vtkWebUtilities.h
+++ b/Web/Core/vtkWebUtilities.h
@@ -17,8 +17,8 @@
 // vtkWebUtilities consolidates miscellaneous utility functions useful for
 // Python scripts designed for ParaView Web.
 
-#ifndef __vtkWebUtilities_h
-#define __vtkWebUtilities_h
+#ifndef vtkWebUtilities_h
+#define vtkWebUtilities_h
 
 #include "vtkObject.h"
 #include "vtkWebCoreModule.h" // needed for exports
diff --git a/Web/WebGLExporter/vtkPVWebGLExporter.h b/Web/WebGLExporter/vtkPVWebGLExporter.h
index c01ee2ff942fe7c4a39f3fe8eaf9759ae640c925..b354b7feb9999177c6e6e37ab8e2514469d7df7e 100644
--- a/Web/WebGLExporter/vtkPVWebGLExporter.h
+++ b/Web/WebGLExporter/vtkPVWebGLExporter.h
@@ -12,8 +12,8 @@
      PURPOSE.  See the above copyright notice for more information.
 
 =========================================================================*/
-#ifndef __vtkPVWebGLExporter_h
-#define __vtkPVWebGLExporter_h
+#ifndef vtkPVWebGLExporter_h
+#define vtkPVWebGLExporter_h
 
 #include "vtkExporter.h"
 #include "vtkWebGLExporterModule.h" // needed for export macro
diff --git a/Web/WebGLExporter/vtkWebGLDataSet.h b/Web/WebGLExporter/vtkWebGLDataSet.h
index 28595e19006e21a1dbafce95ef0ae008527c4c1f..f3cbb0ea4cd6b98468a4bd01bed9669a1c2e897f 100644
--- a/Web/WebGLExporter/vtkWebGLDataSet.h
+++ b/Web/WebGLExporter/vtkWebGLDataSet.h
@@ -16,8 +16,8 @@
 // .SECTION Description
 // vtkWebGLDataSet represent vertices, lines, polygons, and triangles.
 
-#ifndef __vtkWebGLDataSet_h
-#define __vtkWebGLDataSet_h
+#ifndef vtkWebGLDataSet_h
+#define vtkWebGLDataSet_h
 
 #include "vtkObject.h"
 #include "vtkWebGLExporterModule.h" // needed for export macro
diff --git a/Web/WebGLExporter/vtkWebGLExporter.h b/Web/WebGLExporter/vtkWebGLExporter.h
index f67856631681dee74f81982b6ffb5fba08daeef4..48246919937a7e4c1d0a84bb1e27bd2dd28f55d8 100644
--- a/Web/WebGLExporter/vtkWebGLExporter.h
+++ b/Web/WebGLExporter/vtkWebGLExporter.h
@@ -16,8 +16,8 @@
 // .SECTION Description
 // vtkWebGLExporter export the data of the scene to be used in the WebGL.
 
-#ifndef __vtkWebGLExporter_h
-#define __vtkWebGLExporter_h
+#ifndef vtkWebGLExporter_h
+#define vtkWebGLExporter_h
 
 class vtkActor;
 class vtkActor2D;
diff --git a/Web/WebGLExporter/vtkWebGLObject.h b/Web/WebGLExporter/vtkWebGLObject.h
index b45be8341f37753ae7eccaee4b657c9cb5f9c522..98a3c4c29b2a1fe8109207b8540b51dfda847f95 100644
--- a/Web/WebGLExporter/vtkWebGLObject.h
+++ b/Web/WebGLExporter/vtkWebGLObject.h
@@ -16,8 +16,8 @@
 // .SECTION Description
 // vtkWebGLObject represent and manipulate an WebGL object and its data.
 
-#ifndef __vtkWebGLObject_h
-#define __vtkWebGLObject_h
+#ifndef vtkWebGLObject_h
+#define vtkWebGLObject_h
 
 #include "vtkObject.h"
 #include "vtkWebGLExporterModule.h" // needed for export macro
diff --git a/Web/WebGLExporter/vtkWebGLPolyData.h b/Web/WebGLExporter/vtkWebGLPolyData.h
index 151786202349a159d736cdd11f7fbd4eb4af66f9..c375ccba6d714ccbbaf954186367c1c6524ec23b 100644
--- a/Web/WebGLExporter/vtkWebGLPolyData.h
+++ b/Web/WebGLExporter/vtkWebGLPolyData.h
@@ -16,8 +16,8 @@
 // .SECTION Description
 // PolyData representation for WebGL.
 
-#ifndef __vtkWebGLPolyData_h
-#define __vtkWebGLPolyData_h
+#ifndef vtkWebGLPolyData_h
+#define vtkWebGLPolyData_h
 
 #include "vtkWebGLObject.h"
 #include "vtkWebGLExporterModule.h" // needed for export macro
diff --git a/Web/WebGLExporter/vtkWebGLWidget.h b/Web/WebGLExporter/vtkWebGLWidget.h
index 17538ec6396a3206e0bb95a308aa265e519c6c3f..69985d27f031103d7682d14d97ea1c3421530428 100644
--- a/Web/WebGLExporter/vtkWebGLWidget.h
+++ b/Web/WebGLExporter/vtkWebGLWidget.h
@@ -16,8 +16,8 @@
 // .SECTION Description
 // Widget representation for WebGL.
 
-#ifndef __vtkWebGLWidget_h
-#define __vtkWebGLWidget_h
+#ifndef vtkWebGLWidget_h
+#define vtkWebGLWidget_h
 
 #include "vtkWebGLObject.h"
 #include "vtkWebGLExporterModule.h" // needed for export macro
diff --git a/Wrapping/Java/vtkJavaUtil.h b/Wrapping/Java/vtkJavaUtil.h
index e7342a0874a4dfda6b04ac11c49be2d4888ece13..2683b89b85eeab990e134030981e736acb0dac2b 100644
--- a/Wrapping/Java/vtkJavaUtil.h
+++ b/Wrapping/Java/vtkJavaUtil.h
@@ -13,8 +13,8 @@
 
 =========================================================================*/
 
-#ifndef __vtkJavaUtil_h
-#define __vtkJavaUtil_h
+#ifndef vtkJavaUtil_h
+#define vtkJavaUtil_h
 
 #include "vtkSystemIncludes.h"
 #include <jni.h>
diff --git a/Wrapping/PythonCore/vtkPythonArgs.h b/Wrapping/PythonCore/vtkPythonArgs.h
index db5166410860135c223314a0fbf3a39ba08ece88..1d47a74660a9aeda8e659d237fbde8a2b2a5d8a4 100644
--- a/Wrapping/PythonCore/vtkPythonArgs.h
+++ b/Wrapping/PythonCore/vtkPythonArgs.h
@@ -23,8 +23,8 @@ resulting in wrapper code that is faster and more compact.
 
 // .NAME vtkPythonArgs
 
-#ifndef __vtkPythonArgs_h
-#define __vtkPythonArgs_h
+#ifndef vtkPythonArgs_h
+#define vtkPythonArgs_h
 
 #include "vtkWrappingPythonCoreModule.h" // For export macro
 #include "vtkPythonUtil.h"
diff --git a/Wrapping/PythonCore/vtkPythonCommand.h b/Wrapping/PythonCore/vtkPythonCommand.h
index f917b86256c480412c94b1abd1473c46a759a963..a00dcc1feeb98b0d6707e18749a2e430300b8546 100644
--- a/Wrapping/PythonCore/vtkPythonCommand.h
+++ b/Wrapping/PythonCore/vtkPythonCommand.h
@@ -13,8 +13,8 @@
 
 =========================================================================*/
 
-#ifndef __vtkPythonCommand_h
-#define __vtkPythonCommand_h
+#ifndef vtkPythonCommand_h
+#define vtkPythonCommand_h
 
 #include "vtkWrappingPythonCoreModule.h" // For export macro
 #include "vtkPython.h"
diff --git a/Wrapping/PythonCore/vtkPythonOverload.h b/Wrapping/PythonCore/vtkPythonOverload.h
index 1b029c145d4126cf5698ec5d06abd6a6c4f7d65b..3ad3499f69ea53defe04d8a13a5f90538b50c2c9 100644
--- a/Wrapping/PythonCore/vtkPythonOverload.h
+++ b/Wrapping/PythonCore/vtkPythonOverload.h
@@ -24,8 +24,8 @@
 
 // .NAME vtkPythonOverload
 
-#ifndef __vtkPythonOverload_h
-#define __vtkPythonOverload_h
+#ifndef vtkPythonOverload_h
+#define vtkPythonOverload_h
 
 #include "vtkWrappingPythonCoreModule.h" // For export macro
 #include "vtkPython.h"
diff --git a/Wrapping/PythonCore/vtkPythonUtil.h b/Wrapping/PythonCore/vtkPythonUtil.h
index b57cd992a677bd2de7d84b68bc6a729a9ce17dae..ba0a396e47401f729f6b9efc6c05e8a5b5ebe58a 100644
--- a/Wrapping/PythonCore/vtkPythonUtil.h
+++ b/Wrapping/PythonCore/vtkPythonUtil.h
@@ -15,8 +15,8 @@
 
 // .NAME vtkPythonUtil
 
-#ifndef __vtkPythonUtil_h
-#define __vtkPythonUtil_h
+#ifndef vtkPythonUtil_h
+#define vtkPythonUtil_h
 
 #include "vtkPython.h"
 #include "PyVTKClass.h"
diff --git a/Wrapping/Tcl/vtkTcl.h b/Wrapping/Tcl/vtkTcl.h
index 5e5c55f6fffb5646d804c4a6ca933ee48ac1bc43..9acfb7a0ba8301931f5f8f4f6df22865e1b1bda6 100644
--- a/Wrapping/Tcl/vtkTcl.h
+++ b/Wrapping/Tcl/vtkTcl.h
@@ -12,8 +12,8 @@
      PURPOSE.  See the above copyright notice for more information.
 
 =========================================================================*/
-#ifndef __vtkTcl_h
-#define __vtkTcl_h
+#ifndef vtkTcl_h
+#define vtkTcl_h
 
 #include "vtkConfigure.h"
 
diff --git a/Wrapping/Tcl/vtkTclUtil.h b/Wrapping/Tcl/vtkTclUtil.h
index f60457f1dd42382c8dc466435fae2e94645936dc..5fbb42b230b7bdd3139c3b0286ef2426a9ea87cc 100644
--- a/Wrapping/Tcl/vtkTclUtil.h
+++ b/Wrapping/Tcl/vtkTclUtil.h
@@ -13,8 +13,8 @@
 
 =========================================================================*/
 
-#ifndef __vtkTclInclude_h
-#define __vtkTclInclude_h
+#ifndef vtkTclInclude_h
+#define vtkTclInclude_h
 
 #include "vtkObject.h"
 #include "vtkCommand.h"
diff --git a/Wrapping/Tcl/vtkTk.h b/Wrapping/Tcl/vtkTk.h
index a21a34e77a2c36a04ca9d05b3368db1c2fa5ac67..8917769d204c3e11e88b7053c2ff33e902d3cad2 100644
--- a/Wrapping/Tcl/vtkTk.h
+++ b/Wrapping/Tcl/vtkTk.h
@@ -12,8 +12,8 @@
      PURPOSE.  See the above copyright notice for more information.
 
 =========================================================================*/
-#ifndef __vtkTk_h
-#define __vtkTk_h
+#ifndef vtkTk_h
+#define vtkTk_h
 
 #include "vtkConfigure.h"