diff --git a/src/gpu/GksMeshAdapter/GksMeshAdapter.cpp b/src/gpu/GksMeshAdapter/GksMeshAdapter.cpp
index 8d032dfeead2f582c5af2426c45b09ead33883cc..ca6b223c90859656231360142b08d543b019b7ad 100644
--- a/src/gpu/GksMeshAdapter/GksMeshAdapter.cpp
+++ b/src/gpu/GksMeshAdapter/GksMeshAdapter.cpp
@@ -186,7 +186,7 @@ void GksMeshAdapter::findCellToCellConnectivity()
 
         for( uint idx = 0; idx < 27; idx++ )
         {
-            if( idx == DIR_27_ZERO ) continue;
+            if( idx == DIR_27_REST ) continue;
 
             int xSign = dirs.directions[idx][0];
             int ySign = dirs.directions[idx][1];
diff --git a/src/gpu/GridGenerator/grid/GridInterface.cpp b/src/gpu/GridGenerator/grid/GridInterface.cpp
index 47cb8ef9dd7c4704e420ca68888ce0d56c48a59e..9c0a8cf0a281aadc6e28b19b1e7481e57fb88504 100644
--- a/src/gpu/GridGenerator/grid/GridInterface.cpp
+++ b/src/gpu/GridGenerator/grid/GridInterface.cpp
@@ -373,7 +373,7 @@ uint GridInterface::findOffsetCF(const uint& indexOnCoarseGrid, GridImp* coarseG
     Cell cell(x, y, z, coarseGrid->getDelta());
 
     if( coarseGrid->cellContainsOnly( cell, FLUID, FLUID_CFC ) ){
-        this->cf.offset[ interfaceIndex ] = DIR_27_ZERO;
+        this->cf.offset[ interfaceIndex ] = DIR_27_REST;
         return indexOnCoarseGrid;
     }
 
@@ -408,7 +408,7 @@ uint GridInterface::findOffsetFC(const uint& indexOnFineGrid, GridImp* fineGrid,
     Cell cell(x, y, z, fineGrid->getDelta());
 
     if( fineGrid->cellContainsOnly( cell, FLUID, FLUID_FCF ) ){
-        this->fc.offset[ interfaceIndex ] = DIR_27_ZERO;
+        this->fc.offset[ interfaceIndex ] = DIR_27_REST;
         return indexOnFineGrid;
     }
 
diff --git a/src/gpu/GridGenerator/grid/distributions/D3Q27.h b/src/gpu/GridGenerator/grid/distributions/D3Q27.h
index 20f8fcb64a882694db05aad54ff744f3c7b5ff9b..be51ad55902e3772a25c57e92057ef9cb77e113b 100644
--- a/src/gpu/GridGenerator/grid/distributions/D3Q27.h
+++ b/src/gpu/GridGenerator/grid/distributions/D3Q27.h
@@ -65,7 +65,7 @@
 #define DIR_27_BSE   24
 #define DIR_27_BSW   25
 
-#define DIR_27_ZERO  26
+#define DIR_27_REST  26
 
 
 
@@ -177,8 +177,8 @@
 #define DIR_27_BSW_Y  -1
 #define DIR_27_BSW_Z  -1
 
-#define DIR_27_ZERO_X  0
-#define DIR_27_ZERO_Y  0
-#define DIR_27_ZERO_Z  0
+#define DIR_27_REST_X  0
+#define DIR_27_REST_Y  0
+#define DIR_27_REST_Z  0
 
 #endif
diff --git a/src/gpu/GridGenerator/grid/distributions/Distribution.cpp b/src/gpu/GridGenerator/grid/distributions/Distribution.cpp
index 25e80d6050e327785b70d52bd00dc7546bcbdca8..bfbe24e89d4dc128f63f50ca52655df933e3b193 100644
--- a/src/gpu/GridGenerator/grid/distributions/Distribution.cpp
+++ b/src/gpu/GridGenerator/grid/distributions/Distribution.cpp
@@ -70,7 +70,7 @@ Distribution DistributionHelper::getDistribution27()
     d27.directions[DIR_27_BN] = Direction(DIR_27_BN_X, DIR_27_BN_Y, DIR_27_BN_Z);
     d27.directions[DIR_27_TS] = Direction(DIR_27_TS_X, DIR_27_TS_Y, DIR_27_TS_Z);
 
-    d27.directions[DIR_27_ZERO] = Direction(DIR_27_ZERO_X, DIR_27_ZERO_Y, DIR_27_ZERO_Z);
+    d27.directions[DIR_27_REST] = Direction(DIR_27_REST_X, DIR_27_REST_Y, DIR_27_REST_Z);
 
     d27.directions[DIR_27_TNE] = Direction(DIR_27_TNE_X, DIR_27_TNE_Y, DIR_27_TNE_Z);
     d27.directions[DIR_27_TNW] = Direction(DIR_27_TNW_X, DIR_27_TNW_Y, DIR_27_TNW_Z);
@@ -155,9 +155,9 @@ Distribution DistributionHelper::getDistribution27()
     d27.dirs[DIR_27_TS * 3 + 1] = DIR_27_TS_Y;
     d27.dirs[DIR_27_TS * 3 + 2] = DIR_27_TS_Z;
 
-    d27.dirs[DIR_27_ZERO * 3    ] = DIR_27_ZERO_X;   //
-    d27.dirs[DIR_27_ZERO * 3 + 1] = DIR_27_ZERO_Y;   //  ZERO ELEMENT
-    d27.dirs[DIR_27_ZERO * 3 + 2] = DIR_27_ZERO_Z;   //
+    d27.dirs[DIR_27_REST * 3    ] = DIR_27_REST_X;   //
+    d27.dirs[DIR_27_REST * 3 + 1] = DIR_27_REST_Y;   //  ZERO ELEMENT
+    d27.dirs[DIR_27_REST * 3 + 2] = DIR_27_REST_Z;   //
 
     d27.dirs[DIR_27_TNE * 3    ] = DIR_27_TNE_X;
     d27.dirs[DIR_27_TNE * 3 + 1] = DIR_27_TNE_Y;
diff --git a/src/gpu/GridGenerator/grid/distributions/DistributionTest.cpp b/src/gpu/GridGenerator/grid/distributions/DistributionTest.cpp
index b41e4bd4f506ce4f1c26b9108f46530e90994699..8d5bf836fd32267ebe0df63bc7b19228f6298ce5 100644
--- a/src/gpu/GridGenerator/grid/distributions/DistributionTest.cpp
+++ b/src/gpu/GridGenerator/grid/distributions/DistributionTest.cpp
@@ -22,12 +22,12 @@ TEST(DistributionTest, DistributionReturnsCorrectDirections)
     EXPECT_THAT(dist.dirs[DIR_27_B * 3 + 1], testing::Eq(DIR_27_B_Y));
     EXPECT_THAT(dist.dirs[DIR_27_B * 3 + 2], testing::Eq(DIR_27_B_Z));
     
-    EXPECT_THAT(dist.directions[DIR_27_ZERO][0], testing::Eq(0));
-    EXPECT_THAT(dist.directions[DIR_27_ZERO][1], testing::Eq(0));
-    EXPECT_THAT(dist.directions[DIR_27_ZERO][2], testing::Eq(0));
-    EXPECT_THAT(dist.dirs[DIR_27_ZERO * 3    ], testing::Eq(0));
-    EXPECT_THAT(dist.dirs[DIR_27_ZERO * 3 + 1], testing::Eq(0));
-    EXPECT_THAT(dist.dirs[DIR_27_ZERO * 3 + 2], testing::Eq(0));
+    EXPECT_THAT(dist.directions[DIR_27_REST][0], testing::Eq(0));
+    EXPECT_THAT(dist.directions[DIR_27_REST][1], testing::Eq(0));
+    EXPECT_THAT(dist.directions[DIR_27_REST][2], testing::Eq(0));
+    EXPECT_THAT(dist.dirs[DIR_27_REST * 3    ], testing::Eq(0));
+    EXPECT_THAT(dist.dirs[DIR_27_REST * 3 + 1], testing::Eq(0));
+    EXPECT_THAT(dist.dirs[DIR_27_REST * 3 + 2], testing::Eq(0));
 
     EXPECT_THAT(dist.directions[DIR_27_NE][0], testing::Eq(DIR_27_NE_X));
     EXPECT_THAT(dist.directions[DIR_27_NE][1], testing::Eq(DIR_27_NE_Y));