diff --git a/lib/qcd/action/gauge/GaugeImplementations.h b/lib/qcd/action/gauge/GaugeImplementations.h
index 2d7464a9..1fbda152 100644
--- a/lib/qcd/action/gauge/GaugeImplementations.h
+++ b/lib/qcd/action/gauge/GaugeImplementations.h
@@ -25,14 +25,13 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 See the full license in the file "LICENSE" in the top level distribution
 directory
 *************************************************************************************/
-/*  END LEGAL */
+			   /*  END LEGAL */
 #ifndef GRID_QCD_GAUGE_IMPLEMENTATIONS_H
 #define GRID_QCD_GAUGE_IMPLEMENTATIONS_H
 
 #include "GaugeImplTypes.h"
 
-namespace Grid {
-namespace QCD {
+NAMESPACE_BEGIN(Grid);
 
 // Composition with smeared link, bc's etc.. probably need multiple inheritance
 // Variable precision "S" and variable Nc
@@ -141,8 +140,6 @@ typedef ConjugateGaugeImpl<GimplTypesR> ConjugateGimplR; // Real.. whichever pre
 typedef ConjugateGaugeImpl<GimplTypesF> ConjugateGimplF; // Float
 typedef ConjugateGaugeImpl<GimplTypesD> ConjugateGimplD; // Double
 
-
-}
-}
+NAMESPACE_END(Grid);
 
 #endif