diff --git a/zanata-war/src/main/java/org/zanata/action/ProjectIterationFilesAction.java b/zanata-war/src/main/java/org/zanata/action/ProjectIterationFilesAction.java
index 3a56ee3fb0..5c2f9314f4 100644
--- a/zanata-war/src/main/java/org/zanata/action/ProjectIterationFilesAction.java
+++ b/zanata-war/src/main/java/org/zanata/action/ProjectIterationFilesAction.java
@@ -124,7 +124,7 @@ public class ProjectIterationFilesAction implements Serializable
    @In
    private LocaleDAO localeDAO;
 
-   @In("fileSystemPersistService")
+   @In("filePersistService")
    private FilePersistService filePersistService;
 
    @In
diff --git a/zanata-war/src/main/java/org/zanata/file/FileSystemPersistService.java b/zanata-war/src/main/java/org/zanata/file/FileSystemPersistService.java
index 753530a668..2839e85100 100644
--- a/zanata-war/src/main/java/org/zanata/file/FileSystemPersistService.java
+++ b/zanata-war/src/main/java/org/zanata/file/FileSystemPersistService.java
@@ -43,7 +43,7 @@
 
 import com.google.common.io.Files;
 
-@Name("fileSystemPersistService")
+@Name("filePersistService")
 @Scope(ScopeType.STATELESS)
 @AutoCreate
 @Slf4j
diff --git a/zanata-war/src/main/java/org/zanata/file/SourceDocumentUpload.java b/zanata-war/src/main/java/org/zanata/file/SourceDocumentUpload.java
index 75db4f4d56..59a4d6a070 100644
--- a/zanata-war/src/main/java/org/zanata/file/SourceDocumentUpload.java
+++ b/zanata-war/src/main/java/org/zanata/file/SourceDocumentUpload.java
@@ -72,7 +72,7 @@ public class SourceDocumentUpload
 
    @In(create = true, value = "documentUploadUtil")
    private DocumentUploadUtil util;
-   @In("fileSystemPersistService")
+   @In("filePersistService")
    private FilePersistService filePersistService;
    @In
    private ZanataIdentity identity;
diff --git a/zanata-war/src/main/java/org/zanata/rest/service/FileService.java b/zanata-war/src/main/java/org/zanata/rest/service/FileService.java
index aa78285068..a3cb7ce381 100644
--- a/zanata-war/src/main/java/org/zanata/rest/service/FileService.java
+++ b/zanata-war/src/main/java/org/zanata/rest/service/FileService.java
@@ -107,7 +107,7 @@ public class FileService implements FileResource
    @In(value = "translationDocumentUploader", create = true)
    private TranslationDocumentUpload translationUploader;
 
-   @In("fileSystemPersistService")
+   @In("filePersistService")
    private FilePersistService filePersistService;
 
    @Override
diff --git a/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetDocumentListHandler.java b/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetDocumentListHandler.java
index 258c78a50b..10db761d3a 100644
--- a/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetDocumentListHandler.java
+++ b/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetDocumentListHandler.java
@@ -43,7 +43,7 @@ public class GetDocumentListHandler extends AbstractActionHandler<GetDocumentLis
    @In
    private TranslationFileService translationFileServiceImpl;
 
-   @In("fileSystemPersistService")
+   @In("filePersistService")
    private FilePersistService filePersistService;
 
    @Override
diff --git a/zanata-war/src/test/java/org/zanata/rest/service/FileServiceTest.java b/zanata-war/src/test/java/org/zanata/rest/service/FileServiceTest.java
index 43f8dcb118..0d8f213e64 100644
--- a/zanata-war/src/test/java/org/zanata/rest/service/FileServiceTest.java
+++ b/zanata-war/src/test/java/org/zanata/rest/service/FileServiceTest.java
@@ -105,7 +105,7 @@ public void beforeTest()
       .use("translationFileServiceImpl", translationFileService)
       .use("documentServiceImpl", documentService)
       .use("documentDAO", documentDAO)
-      .use("fileSystemPersistService", filePersistService)
+      .use("filePersistService", filePersistService)
       .allowCycles();
 
       fileService = seam.autowire(FileService.class);
diff --git a/zanata-war/src/test/java/org/zanata/webtrans/server/rpc/GetDocumentListHandlerTest.java b/zanata-war/src/test/java/org/zanata/webtrans/server/rpc/GetDocumentListHandlerTest.java
index be94ef504c..3967ce8bb5 100644
--- a/zanata-war/src/test/java/org/zanata/webtrans/server/rpc/GetDocumentListHandlerTest.java
+++ b/zanata-war/src/test/java/org/zanata/webtrans/server/rpc/GetDocumentListHandlerTest.java
@@ -59,7 +59,7 @@ public void setUp() throws Exception
             .use("documentDAO", documentDAO)
             .use("translationFileServiceImpl", translationFileServiceImpl)
             .use("translationStateCacheImpl", translationStateCacheImpl)
-            .use("fileSystemPersistService", filePersistService)
+            .use("filePersistService", filePersistService)
             .ignoreNonResolvable()
             .autowire(GetDocumentListHandler.class);
       // @formatter:on