diff --git a/core/client/src/main/java/alluxio/client/file/FileInStream.java b/core/client/src/main/java/alluxio/client/file/FileInStream.java
index b5c72ba2ec8a..1c087066e5f5 100644
--- a/core/client/src/main/java/alluxio/client/file/FileInStream.java
+++ b/core/client/src/main/java/alluxio/client/file/FileInStream.java
@@ -231,9 +231,9 @@ private void checkAndAdvanceBlockInStream() throws IOException {
         try {
           long blockSize = getCurrentBlockSize();
           WorkerNetAddress address = mLocationPolicy.getWorkerForNextBlock(
-              mContext.getAluxioBlockStore().getWorkerInfoList(), blockSize);
+              mContext.getAlluxioBlockStore().getWorkerInfoList(), blockSize);
           mCurrentCacheStream =
-              mContext.getAluxioBlockStore().getOutStream(currentBlockId, blockSize, address);
+              mContext.getAlluxioBlockStore().getOutStream(currentBlockId, blockSize, address);
         } catch (IOException e) {
           LOG.warn(BLOCK_ID_NOT_CACHED, currentBlockId, e);
           mShouldCacheCurrentBlock = false;
@@ -311,9 +311,9 @@ private void seekBlockInStream(long newPos) throws IOException {
         try {
           long blockSize = getCurrentBlockSize();
           WorkerNetAddress address = mLocationPolicy.getWorkerForNextBlock(
-              mContext.getAluxioBlockStore().getWorkerInfoList(), blockSize);
+              mContext.getAlluxioBlockStore().getWorkerInfoList(), blockSize);
           mCurrentCacheStream =
-              mContext.getAluxioBlockStore().getOutStream(currentBlockId, blockSize, address);
+              mContext.getAlluxioBlockStore().getOutStream(currentBlockId, blockSize, address);
         } catch (IOException e) {
           LOG.warn(BLOCK_ID_NOT_CACHED, getCurrentBlockId(), e);
           mShouldCacheCurrentBlock = false;
@@ -342,13 +342,13 @@ private void updateBlockInStream(long blockId) throws IOException {
     try {
       if (mAlluxioStorageType.isPromote()) {
         try {
-          mContext.getAluxioBlockStore().promote(blockId);
+          mContext.getAlluxioBlockStore().promote(blockId);
         } catch (IOException e) {
           // Failed to promote
           LOG.warn("Promotion of block with ID {} failed.", blockId, e);
         }
       }
-      mCurrentBlockInStream = mContext.getAluxioBlockStore().getInStream(blockId);
+      mCurrentBlockInStream = mContext.getAlluxioBlockStore().getInStream(blockId);
       mShouldCacheCurrentBlock =
           !(mCurrentBlockInStream instanceof LocalBlockInStream) && mAlluxioStorageType.isStore();
     } catch (IOException e) {
diff --git a/core/client/src/main/java/alluxio/client/file/FileOutStream.java b/core/client/src/main/java/alluxio/client/file/FileOutStream.java
index ee2a83b05a4f..ac3eda6502d4 100644
--- a/core/client/src/main/java/alluxio/client/file/FileOutStream.java
+++ b/core/client/src/main/java/alluxio/client/file/FileOutStream.java
@@ -262,9 +262,9 @@ private void getNextBlock() throws IOException {
     if (mAlluxioStorageType.isStore()) {
       try {
         WorkerNetAddress address = mLocationPolicy
-            .getWorkerForNextBlock(mContext.getAluxioBlockStore().getWorkerInfoList(), mBlockSize);
+            .getWorkerForNextBlock(mContext.getAlluxioBlockStore().getWorkerInfoList(), mBlockSize);
         mCurrentBlockOutStream =
-            mContext.getAluxioBlockStore().getOutStream(getNextBlockId(), mBlockSize, address);
+            mContext.getAlluxioBlockStore().getOutStream(getNextBlockId(), mBlockSize, address);
         mShouldCacheCurrentBlock = true;
       } catch (AlluxioException e) {
         throw new IOException(e);
diff --git a/core/client/src/main/java/alluxio/client/file/FileSystemContext.java b/core/client/src/main/java/alluxio/client/file/FileSystemContext.java
index 59a65f936049..2b1e0ef69f05 100644
--- a/core/client/src/main/java/alluxio/client/file/FileSystemContext.java
+++ b/core/client/src/main/java/alluxio/client/file/FileSystemContext.java
@@ -63,7 +63,7 @@ public void releaseMasterClient(FileSystemMasterClient masterClient) {
   /**
    * @return the Alluxio block store
    */
-  public AlluxioBlockStore getAluxioBlockStore() {
+  public AlluxioBlockStore getAlluxioBlockStore() {
     return mAlluxioBlockStore;
   }
 
diff --git a/core/client/src/test/java/alluxio/client/file/FileInStreamTest.java b/core/client/src/test/java/alluxio/client/file/FileInStreamTest.java
index cc884d614bd3..7384a1cdaccc 100644
--- a/core/client/src/test/java/alluxio/client/file/FileInStreamTest.java
+++ b/core/client/src/test/java/alluxio/client/file/FileInStreamTest.java
@@ -81,7 +81,7 @@ public void before() throws IOException {
 
     mContext = PowerMockito.mock(FileSystemContext.class);
     mBlockStore = PowerMockito.mock(AlluxioBlockStore.class);
-    Mockito.when(mContext.getAluxioBlockStore()).thenReturn(mBlockStore);
+    Mockito.when(mContext.getAlluxioBlockStore()).thenReturn(mBlockStore);
 
     // Set up BufferedBlockInStreams and caching streams
     mCacheStreams = Lists.newArrayList();
diff --git a/core/client/src/test/java/alluxio/client/file/FileOutStreamTest.java b/core/client/src/test/java/alluxio/client/file/FileOutStreamTest.java
index 1033942f6a90..0c47a360c7ea 100644
--- a/core/client/src/test/java/alluxio/client/file/FileOutStreamTest.java
+++ b/core/client/src/test/java/alluxio/client/file/FileOutStreamTest.java
@@ -95,7 +95,7 @@ public void before() throws Exception {
     mFileSystemMasterClient = PowerMockito.mock(FileSystemMasterClient.class);
     mBlockWorkerClient = PowerMockito.mock(BlockWorkerClient.class);
 
-    Mockito.when(mFileSystemContext.getAluxioBlockStore()).thenReturn(mBlockStore);
+    Mockito.when(mFileSystemContext.getAlluxioBlockStore()).thenReturn(mBlockStore);
     Mockito.when(mBlockStoreContext.acquireWorkerClient()).thenReturn(mBlockWorkerClient);
     Mockito.when(mFileSystemContext.acquireMasterClient()).thenReturn(mFileSystemMasterClient);
     Mockito.when(mFileSystemMasterClient.getStatus(Mockito.any(AlluxioURI.class))).thenReturn(