diff --git a/lib/qcd/utils/SpaceTimeGrid.h b/lib/qcd/utils/SpaceTimeGrid.h
index 61613e4d..f7d0a13e 100644
--- a/lib/qcd/utils/SpaceTimeGrid.h
+++ b/lib/qcd/utils/SpaceTimeGrid.h
@@ -1,4 +1,4 @@
-    /*************************************************************************************
+/*************************************************************************************
 
     Grid physics library, www.github.com/paboyle/Grid 
 
@@ -23,15 +23,15 @@ Author: Peter Boyle <paboyle@ph.ed.ac.uk>
     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
     See the full license in the file "LICENSE" in the top level distribution directory
-    *************************************************************************************/
-    /*  END LEGAL */
+*************************************************************************************/
+/*  END LEGAL */
 #ifndef GRID_QCD_SPACE_TIME_GRID_H
 #define GRID_QCD_SPACE_TIME_GRID_H
-namespace Grid {
-namespace QCD {
+
+NAMESPACE_BEGIN(Grid);
 
 class SpaceTimeGrid {
- public:
+public:
 
   static GridCartesian         *makeFourDimGrid(const std::vector<int> & latt,const std::vector<int> &simd,const std::vector<int> &mpi);
   static GridRedBlackCartesian *makeFourDimRedBlackGrid       (const GridCartesian *FourDimGrid);
@@ -45,6 +45,6 @@ class SpaceTimeGrid {
 
 };
 
-}}
+NAMESPACE_END(Grid);
 
 #endif