diff --git a/dfsclient/src/main/java/org/hpccsystems/dfs/client/CircularByteBuffer.java b/dfsclient/src/main/java/org/hpccsystems/dfs/client/CircularByteBuffer.java
index 2e0182b13..c4690e9b9 100644
--- a/dfsclient/src/main/java/org/hpccsystems/dfs/client/CircularByteBuffer.java
+++ b/dfsclient/src/main/java/org/hpccsystems/dfs/client/CircularByteBuffer.java
@@ -54,7 +54,7 @@ public int getBytesAvailable()
      * 
      * @return true, if successful
      */
-    public boolean hasSpace()
+    public boolean hasFreeSpace()
     {
         return getFreeSpace() > 0;
     }
@@ -82,7 +82,7 @@ public int getFreeSpace()
      */
     public int getContiguousFreeSpace()
     {
-        if (!hasSpace())
+        if (!hasFreeSpace())
         {
             return 0;
         }
diff --git a/dfsclient/src/main/java/org/hpccsystems/dfs/client/RowServiceInputStream.java b/dfsclient/src/main/java/org/hpccsystems/dfs/client/RowServiceInputStream.java
index c231b8fe0..8caac3551 100644
--- a/dfsclient/src/main/java/org/hpccsystems/dfs/client/RowServiceInputStream.java
+++ b/dfsclient/src/main/java/org/hpccsystems/dfs/client/RowServiceInputStream.java
@@ -1227,13 +1227,13 @@ private void readDataInFetch()
             remainingDataInCurrentRequest -= bytesToRead;
 
             // If we don't have enough room in the buffer. Return, and let the calling prefetch thread handle sleep etc
-            boolean hasSpace = false;
+            boolean hasFreeSpace = false;
             synchronized (readBuffer)
             {
-                hasSpace = readBuffer.hasSpace();
+                hasFreeSpace = readBuffer.hasFreeSpace();
             }
 
-            if (!hasSpace)
+            if (!hasFreeSpace)
             {
                 return;
             }
diff --git a/dfsclient/src/test/java/org/hpccsystems/dfs/client/CircularByteBufferTest.java b/dfsclient/src/test/java/org/hpccsystems/dfs/client/CircularByteBufferTest.java
index bde32e5d2..5de114ff3 100644
--- a/dfsclient/src/test/java/org/hpccsystems/dfs/client/CircularByteBufferTest.java
+++ b/dfsclient/src/test/java/org/hpccsystems/dfs/client/CircularByteBufferTest.java
@@ -42,7 +42,7 @@ public void spaceTest()
     {
         CircularByteBuffer cbb = new CircularByteBuffer(10);
         assertEquals(0, cbb.getBytesAvailable());
-        assertEquals(true, cbb.hasSpace());
+        assertEquals(true, cbb.hasFreeSpace());
         assertEquals(10, cbb.getFreeSpace());
         assertEquals(10, cbb.getContiguousFreeSpace());
     }
@@ -52,7 +52,7 @@ public void addTest()
     {
         CircularByteBuffer cbb = new CircularByteBuffer(10);
         assertEquals(0, cbb.getBytesAvailable());
-        assertEquals(true, cbb.hasSpace());
+        assertEquals(true, cbb.hasFreeSpace());
         assertEquals(10, cbb.getFreeSpace());
         assertEquals(10, cbb.getContiguousFreeSpace());
 
@@ -67,7 +67,7 @@ public void addTest()
             fail();
         }
         assertEquals(5, cbb.getBytesAvailable());
-        assertEquals(true, cbb.hasSpace());
+        assertEquals(true, cbb.hasFreeSpace());
         assertEquals(5, cbb.getFreeSpace());
         assertEquals(5, cbb.getContiguousFreeSpace());
     }
@@ -77,7 +77,7 @@ public void readTest()
     {
         CircularByteBuffer cbb = new CircularByteBuffer(10);
         assertEquals(0, cbb.getBytesAvailable());
-        assertEquals(true, cbb.hasSpace());
+        assertEquals(true, cbb.hasFreeSpace());
         assertEquals(10, cbb.getFreeSpace());
         assertEquals(10, cbb.getContiguousFreeSpace());
 
@@ -92,7 +92,7 @@ public void readTest()
             fail();
         }
         assertEquals(5, cbb.getBytesAvailable());
-        assertEquals(true, cbb.hasSpace());
+        assertEquals(true, cbb.hasFreeSpace());
         assertEquals(5, cbb.getFreeSpace());
         assertEquals(5, cbb.getContiguousFreeSpace());
 
@@ -107,7 +107,7 @@ public void readTest()
             fail();
         }
         assertEquals(0, cbb.getBytesAvailable());
-        assertEquals(true, cbb.hasSpace());
+        assertEquals(true, cbb.hasFreeSpace());
         assertEquals(10, cbb.getFreeSpace());
         assertEquals(5, cbb.getContiguousFreeSpace());
     }
@@ -117,7 +117,7 @@ public void markResetTest()
     {
         CircularByteBuffer cbb = new CircularByteBuffer(10);
         assertEquals(0, cbb.getBytesAvailable());
-        assertEquals(true, cbb.hasSpace());
+        assertEquals(true, cbb.hasFreeSpace());
         assertEquals(10, cbb.getFreeSpace());
         assertEquals(10, cbb.getContiguousFreeSpace());
 
@@ -132,7 +132,7 @@ public void markResetTest()
             fail();
         }
         assertEquals(10, cbb.getBytesAvailable());
-        assertEquals(false, cbb.hasSpace());
+        assertEquals(false, cbb.hasFreeSpace());
         assertEquals(0, cbb.getFreeSpace());
         assertEquals(0, cbb.getContiguousFreeSpace());
 
@@ -150,13 +150,13 @@ public void markResetTest()
         }
 
         assertEquals(5, cbb.getBytesAvailable());
-        assertEquals(false, cbb.hasSpace());
+        assertEquals(false, cbb.hasFreeSpace());
         assertEquals(0, cbb.getFreeSpace());
         assertEquals(0, cbb.getContiguousFreeSpace());
 
         cbb.reset();
         assertEquals(10, cbb.getBytesAvailable());
-        assertEquals(false, cbb.hasSpace());
+        assertEquals(false, cbb.hasFreeSpace());
         assertEquals(0, cbb.getFreeSpace());
         assertEquals(0, cbb.getContiguousFreeSpace());
     }