diff --git a/lib/simd/Grid_generic_types.h b/lib/simd/Grid_generic_types.h
index 83d15538..db1ee015 100644
--- a/lib/simd/Grid_generic_types.h
+++ b/lib/simd/Grid_generic_types.h
@@ -63,7 +63,7 @@ namespace Optimization {
     constexpr static unsigned int c = GEN_SIMD_WIDTH/8u;
     constexpr static unsigned int r = GEN_SIMD_WIDTH/4u;
   };
-  template <> struct W<int> {
+  template <> struct W<Integer> {
     constexpr static unsigned int r = GEN_SIMD_WIDTH/4u;
   };
   
@@ -75,6 +75,6 @@ namespace Optimization {
 
   typedef vec<float>   vecf;
   typedef vec<double>  vecd;
-  typedef vec<int>     veci;
+  typedef vec<Integer>     veci;
   
 }}
diff --git a/lib/simd/Grid_qpx.h b/lib/simd/Grid_qpx.h
index 5db25d4e..41bd80b9 100644
--- a/lib/simd/Grid_qpx.h
+++ b/lib/simd/Grid_qpx.h
@@ -72,7 +72,7 @@ namespace Optimization {
     inline veci operator()(Integer a){
       veci out;
       
-      VECTOR_FOR(i, W<int>::r, 1)
+      VECTOR_FOR(i, W<Integer>::r, 1)
       {
         out.v[i] = a;
       }
@@ -220,7 +220,7 @@ namespace Optimization {
     inline veci operator()(veci a, veci b){
       veci out;
       
-      VECTOR_FOR(i, W<int>::r, 1)
+      VECTOR_FOR(i, W<Integer>::r, 1)
       {
         out.v[i] = a.v[i] + b.v[i];
       }
@@ -242,7 +242,7 @@ namespace Optimization {
     inline veci operator()(veci a, veci b){
       veci out;
       
-      VECTOR_FOR(i, W<int>::r, 1)
+      VECTOR_FOR(i, W<Integer>::r, 1)
       {
         out.v[i] = a.v[i] - b.v[i];
       }
@@ -282,7 +282,7 @@ namespace Optimization {
     inline veci operator()(veci a, veci b){
       veci out;
       
-      VECTOR_FOR(i, W<int>::r, 1)
+      VECTOR_FOR(i, W<Integer>::r, 1)
       {
         out.v[i] = a.v[i]*b.v[i];
       }
@@ -304,7 +304,7 @@ namespace Optimization {
     inline veci operator()(veci a, veci b){
       veci out;
       
-      VECTOR_FOR(i, W<int>::r, 1)
+      VECTOR_FOR(i, W<Integer>::r, 1)
       {
         out.v[i] = a.v[i]/b.v[i];
       }