diff --git a/.gitignore b/.gitignore
index 03554467c..80ea8e866 100644
--- a/.gitignore
+++ b/.gitignore
@@ -62,6 +62,7 @@ stamp-h1
 config.sub
 config.guess
 INSTALL
+.dirstamp
 
 # Packages #
 ############
diff --git a/benchmarks/Benchmark_dwf.cc b/benchmarks/Benchmark_dwf.cc
index 0bf57182d..5ceec95fa 100644
--- a/benchmarks/Benchmark_dwf.cc
+++ b/benchmarks/Benchmark_dwf.cc
@@ -165,11 +165,11 @@ int main (int argc, char ** argv)
 
   if (1)
   {
-    typedef WilsonFermion5D<DomainWallRedBlack5dImplF> WilsonFermion5DF;
-    LatticeFermionF ssrc(sFGrid);
-    LatticeFermionF sref(sFGrid);
-    LatticeFermionF sresult(sFGrid);
-    WilsonFermion5DF sDw(1,Umu,*sFGrid,*sFrbGrid,*sUGrid,M5,params);
+    typedef WilsonFermion5D<DomainWallRedBlack5dImplR> WilsonFermion5DR;
+    LatticeFermion ssrc(sFGrid);
+    LatticeFermion sref(sFGrid);
+    LatticeFermion sresult(sFGrid);
+    WilsonFermion5DR sDw(1,Umu,*sFGrid,*sFrbGrid,*sUGrid,M5,params);
   
     for(int x=0;x<latt4[0];x++){
     for(int y=0;y<latt4[1];y++){
@@ -177,7 +177,7 @@ int main (int argc, char ** argv)
     for(int t=0;t<latt4[3];t++){
     for(int s=0;s<Ls;s++){
       std::vector<int> site({s,x,y,z,t});
-      SpinColourVectorF tmp;
+      SpinColourVector tmp;
       peekSite(tmp,src,site);
       pokeSite(tmp,ssrc,site);
     }}}}}
@@ -217,7 +217,7 @@ int main (int argc, char ** argv)
     for(int t=0;t<latt4[3];t++){
     for(int s=0;s<Ls;s++){
       std::vector<int> site({s,x,y,z,t});
-      SpinColourVectorF normal, simd;
+      SpinColourVector normal, simd;
       peekSite(normal,result,site);
       peekSite(simd,sresult,site);
       sum=sum+norm2(normal-simd);
@@ -230,8 +230,8 @@ int main (int argc, char ** argv)
 
     if (1) {
 
-      LatticeFermionF sr_eo(sFGrid);
-      LatticeFermionF serr(sFGrid);
+      LatticeFermion sr_eo(sFGrid);
+      LatticeFermion serr(sFGrid);
 
       LatticeFermion ssrc_e (sFrbGrid);
       LatticeFermion ssrc_o (sFrbGrid);
diff --git a/lib/.dirstamp b/lib/.dirstamp
new file mode 100644
index 000000000..e69de29bb
diff --git a/lib/algorithms/approx/.dirstamp b/lib/algorithms/approx/.dirstamp
new file mode 100644
index 000000000..e69de29bb
diff --git a/lib/communicator/.dirstamp b/lib/communicator/.dirstamp
new file mode 100644
index 000000000..e69de29bb
diff --git a/lib/qcd/action/fermion/.dirstamp b/lib/qcd/action/fermion/.dirstamp
new file mode 100644
index 000000000..e69de29bb
diff --git a/lib/qcd/hmc/.dirstamp b/lib/qcd/hmc/.dirstamp
new file mode 100644
index 000000000..e69de29bb
diff --git a/lib/qcd/spin/.dirstamp b/lib/qcd/spin/.dirstamp
new file mode 100644
index 000000000..e69de29bb
diff --git a/lib/qcd/utils/.dirstamp b/lib/qcd/utils/.dirstamp
new file mode 100644
index 000000000..e69de29bb
diff --git a/lib/stencil/.dirstamp b/lib/stencil/.dirstamp
new file mode 100644
index 000000000..e69de29bb