diff --git a/Modules/Core/Blueprints/include/elxBlueprint.h b/Modules/Core/Blueprints/include/elxBlueprint.h
index f0a9d19df23ee68bb071f4b27439226cc546eff0..3ceeded813fb2ceb0d725d8362bc831d224b61ee 100644
--- a/Modules/Core/Blueprints/include/elxBlueprint.h
+++ b/Modules/Core/Blueprints/include/elxBlueprint.h
@@ -1,5 +1,5 @@
-#ifndef __Blueprint_h
-#define __Blueprint_h
+#ifndef Blueprint_h
+#define Blueprint_h
 
 #include "boost/graph/graph_traits.hpp"
 #include "boost/graph/directed_graph.hpp"
@@ -103,4 +103,4 @@ private:
 
 }
 
-#endif // #define __Blueprint_h
\ No newline at end of file
+#endif // #define Blueprint_h
\ No newline at end of file
diff --git a/Modules/Core/Blueprints/src/elxBlueprint.cxx b/Modules/Core/Blueprints/src/elxBlueprint.cxx
index d78d2ce6882287d6a42176310b6afea3c2cb0ff4..2bdfce062b7692413430e31c2c52b3aa4b4ae87a 100644
--- a/Modules/Core/Blueprints/src/elxBlueprint.cxx
+++ b/Modules/Core/Blueprints/src/elxBlueprint.cxx
@@ -1,5 +1,5 @@
-#ifndef __Blueprint_cxx
-#define __Blueprint_cxx
+#ifndef Blueprint_cxx
+#define Blueprint_cxx
 
 #include "boost/graph/graphviz.hpp"
 
@@ -157,4 +157,4 @@ Blueprint
 
 } // namespace elx 
 
-#endif // __Blueprint_cxx
+#endif // Blueprint_cxx
diff --git a/Testing/Unit/elxDataManager.cxx b/Testing/Unit/elxDataManager.cxx
index 6b7da8aa318a592f9ff654404d5412f93d829dd5..7cc481db1157b2e9a0956a2af4630205b830d288 100644
--- a/Testing/Unit/elxDataManager.cxx
+++ b/Testing/Unit/elxDataManager.cxx
@@ -28,4 +28,4 @@ DataManager
   return path;
 }
 
-#endif // __elxTestData_cxx
\ No newline at end of file
+#endif // __DataManager_cxx
\ No newline at end of file