diff --git a/extras/Hadrons/Modules/MContraction/WardIdentity.hpp b/extras/Hadrons/Modules/MContraction/WardIdentity.hpp
index 82b0317a..8a56e0eb 100644
--- a/extras/Hadrons/Modules/MContraction/WardIdentity.hpp
+++ b/extras/Hadrons/Modules/MContraction/WardIdentity.hpp
@@ -26,8 +26,8 @@ See the full license in the file "LICENSE" in the top level distribution directo
 *************************************************************************************/
 /*  END LEGAL */
 
-#ifndef Hadrons_WardIdentity_hpp_
-#define Hadrons_WardIdentity_hpp_
+#ifndef Hadrons_MContraction_WardIdentity_hpp_
+#define Hadrons_MContraction_WardIdentity_hpp_
 
 #include <Grid/Hadrons/Global.hpp>
 #include <Grid/Hadrons/Module.hpp>
diff --git a/extras/Hadrons/Modules/MSource/SeqConserved.hpp b/extras/Hadrons/Modules/MSource/SeqConserved.hpp
index 67086f11..86a7dfb9 100644
--- a/extras/Hadrons/Modules/MSource/SeqConserved.hpp
+++ b/extras/Hadrons/Modules/MSource/SeqConserved.hpp
@@ -26,8 +26,8 @@ See the full license in the file "LICENSE" in the top level distribution directo
 *************************************************************************************/
 /*  END LEGAL */
 
-#ifndef Hadrons_SeqConserved_hpp_
-#define Hadrons_SeqConserved_hpp_
+#ifndef Hadrons_MSource_SeqConserved_hpp_
+#define Hadrons_MSource_SeqConserved_hpp_
 
 #include <Grid/Hadrons/Global.hpp>
 #include <Grid/Hadrons/Module.hpp>
diff --git a/extras/Hadrons/Modules/MUtilities/TestSeqConserved.hpp b/extras/Hadrons/Modules/MUtilities/TestSeqConserved.hpp
index faebab0a..b085eb8c 100644
--- a/extras/Hadrons/Modules/MUtilities/TestSeqConserved.hpp
+++ b/extras/Hadrons/Modules/MUtilities/TestSeqConserved.hpp
@@ -26,8 +26,8 @@ See the full license in the file "LICENSE" in the top level distribution directo
 *************************************************************************************/
 /*  END LEGAL */
 
-#ifndef Hadrons_TestSeqConserved_hpp_
-#define Hadrons_TestSeqConserved_hpp_
+#ifndef Hadrons_MUtilities_TestSeqConserved_hpp_
+#define Hadrons_MUtilities_TestSeqConserved_hpp_
 
 #include <Grid/Hadrons/Global.hpp>
 #include <Grid/Hadrons/Module.hpp>
diff --git a/extras/Hadrons/Modules/MUtilities/TestSeqGamma.hpp b/extras/Hadrons/Modules/MUtilities/TestSeqGamma.hpp
index 1b057c29..3dbd7d63 100644
--- a/extras/Hadrons/Modules/MUtilities/TestSeqGamma.hpp
+++ b/extras/Hadrons/Modules/MUtilities/TestSeqGamma.hpp
@@ -1,5 +1,5 @@
-#ifndef Hadrons_TestSeqGamma_hpp_
-#define Hadrons_TestSeqGamma_hpp_
+#ifndef Hadrons_MUtilities_TestSeqGamma_hpp_
+#define Hadrons_MUtilities_TestSeqGamma_hpp_
 
 #include <Grid/Hadrons/Global.hpp>
 #include <Grid/Hadrons/Module.hpp>