diff --git a/Hadrons/Modules/templates/Module_in_NS.cc.template b/Hadrons/Modules/templates/Module_in_NS.cc.template
index 8b2a0ec0..477148e0 100644
--- a/Hadrons/Modules/templates/Module_in_NS.cc.template
+++ b/Hadrons/Modules/templates/Module_in_NS.cc.template
@@ -1,4 +1,4 @@
-#include <Grid/Hadrons/Modules/___NAMESPACE___/___FILEBASENAME___.hpp>
+#include <Hadrons/Modules/___NAMESPACE___/___FILEBASENAME___.hpp>
 
 using namespace Grid;
 using namespace Hadrons;
diff --git a/Hadrons/Modules/templates/Module_in_NS.hpp.template b/Hadrons/Modules/templates/Module_in_NS.hpp.template
index b34568c2..982babda 100644
--- a/Hadrons/Modules/templates/Module_in_NS.hpp.template
+++ b/Hadrons/Modules/templates/Module_in_NS.hpp.template
@@ -1,9 +1,9 @@
 #ifndef Hadrons____NAMESPACE_______FILEBASENAME____hpp_
 #define Hadrons____NAMESPACE_______FILEBASENAME____hpp_
 
-#include <Grid/Hadrons/Global.hpp>
-#include <Grid/Hadrons/Module.hpp>
-#include <Grid/Hadrons/ModuleFactory.hpp>
+#include <Hadrons/Global.hpp>
+#include <Hadrons/Module.hpp>
+#include <Hadrons/ModuleFactory.hpp>
 
 BEGIN_HADRONS_NAMESPACE
 
diff --git a/Hadrons/Modules/templates/Module_tmp_in_NS.cc.template b/Hadrons/Modules/templates/Module_tmp_in_NS.cc.template
index 8dfafcf8..d8a19618 100644
--- a/Hadrons/Modules/templates/Module_tmp_in_NS.cc.template
+++ b/Hadrons/Modules/templates/Module_tmp_in_NS.cc.template
@@ -1,4 +1,4 @@
-#include <Grid/Hadrons/Modules/___NAMESPACE___/___FILEBASENAME___.hpp>
+#include <Hadrons/Modules/___NAMESPACE___/___FILEBASENAME___.hpp>
 
 using namespace Grid;
 using namespace Hadrons;
diff --git a/Hadrons/Modules/templates/Module_tmp_in_NS.hpp.template b/Hadrons/Modules/templates/Module_tmp_in_NS.hpp.template
index 5a05a498..da5bc370 100644
--- a/Hadrons/Modules/templates/Module_tmp_in_NS.hpp.template
+++ b/Hadrons/Modules/templates/Module_tmp_in_NS.hpp.template
@@ -1,9 +1,9 @@
 #ifndef Hadrons____NAMESPACE_______FILEBASENAME____hpp_
 #define Hadrons____NAMESPACE_______FILEBASENAME____hpp_
 
-#include <Grid/Hadrons/Global.hpp>
-#include <Grid/Hadrons/Module.hpp>
-#include <Grid/Hadrons/ModuleFactory.hpp>
+#include <Hadrons/Global.hpp>
+#include <Hadrons/Module.hpp>
+#include <Hadrons/ModuleFactory.hpp>
 
 BEGIN_HADRONS_NAMESPACE