diff --git a/src/main/java/org/prebid/server/cache/BasicPbcStorageService.java b/src/main/java/org/prebid/server/cache/BasicPbcStorageService.java
index 6db93819349..956330cd1ca 100644
--- a/src/main/java/org/prebid/server/cache/BasicPbcStorageService.java
+++ b/src/main/java/org/prebid/server/cache/BasicPbcStorageService.java
@@ -47,17 +47,17 @@ public Future<Void> storeEntry(String key,
                                    StorageDataType type,
                                    Integer ttlseconds,
                                    String application,
-                                   String moduleCode) {
+                                   String appCode) {
 
         try {
-            validateStoreData(key, value, application, type, moduleCode);
+            validateStoreData(key, value, application, type, appCode);
         } catch (PreBidException e) {
             return Future.failedFuture(e);
         }
 
         final ModuleCacheRequest moduleCacheRequest =
                 ModuleCacheRequest.of(
-                        constructEntryKey(key, moduleCode),
+                        constructEntryKey(key, appCode),
                         type,
                         prepareValueForStoring(value, type),
                         application,
@@ -124,18 +124,18 @@ private Future<Void> processStoreResponse(int statusCode, String responseBody) {
     }
 
     @Override
-    public Future<ModuleCacheResponse> retrieveModuleEntry(String key,
-                                                           String moduleCode,
-                                                           String application) {
+    public Future<ModuleCacheResponse> retrieveEntry(String key,
+                                                     String appCode,
+                                                     String application) {
 
         try {
-            validateRetrieveData(key, application, moduleCode);
+            validateRetrieveData(key, application, appCode);
         } catch (PreBidException e) {
             return Future.failedFuture(e);
         }
 
         return httpClient.get(
-                        getRetrieveEndpoint(key, moduleCode, application),
+                        getRetrieveEndpoint(key, appCode, application),
                         securedCallHeaders(),
                         callTimeoutMs)
                 .map(response -> toModuleCacheResponse(response.getStatusCode(), response.getBody()));
diff --git a/src/main/java/org/prebid/server/cache/PbcStorageService.java b/src/main/java/org/prebid/server/cache/PbcStorageService.java
index 4e8d432a158..c76f0884d52 100644
--- a/src/main/java/org/prebid/server/cache/PbcStorageService.java
+++ b/src/main/java/org/prebid/server/cache/PbcStorageService.java
@@ -11,9 +11,9 @@ Future<Void> storeEntry(String key,
                             StorageDataType type,
                             Integer ttlseconds,
                             String application,
-                            String moduleCode);
+                            String appCode);
 
-    Future<ModuleCacheResponse> retrieveModuleEntry(String key, String moduleCode, String application);
+    Future<ModuleCacheResponse> retrieveEntry(String key, String appCode, String application);
 
     static NoOpPbcStorageService noOp() {
         return new NoOpPbcStorageService();
@@ -27,13 +27,13 @@ public Future<Void> storeEntry(String key,
                                        StorageDataType type,
                                        Integer ttlseconds,
                                        String application,
-                                       String moduleCode) {
+                                       String appCode) {
 
             return Future.succeededFuture();
         }
 
         @Override
-        public Future<ModuleCacheResponse> retrieveModuleEntry(String key, String moduleCode, String application) {
+        public Future<ModuleCacheResponse> retrieveEntry(String key, String appCode, String application) {
             return Future.succeededFuture(ModuleCacheResponse.empty());
         }
     }
diff --git a/src/test/java/org/prebid/server/cache/BasicPbcStorageServiceTest.java b/src/test/java/org/prebid/server/cache/BasicPbcStorageServiceTest.java
index 3a146a26dc4..c7b09518ae7 100644
--- a/src/test/java/org/prebid/server/cache/BasicPbcStorageServiceTest.java
+++ b/src/test/java/org/prebid/server/cache/BasicPbcStorageServiceTest.java
@@ -225,10 +225,10 @@ public void storeEntryShouldCreateCallWithApiKeyInHeader() {
     }
 
     @Test
-    public void retrieveModuleEntryShouldReturnFailedFutureIfModuleKeyIsMissed() {
+    public void retrieveModuleEntryShouldReturnFailedFutureIfKeyIsMissed() {
         // when
         final Future<ModuleCacheResponse> result =
-                target.retrieveModuleEntry(null, "some-module-code", "some-app");
+                target.retrieveEntry(null, "some-module-code", "some-app");
 
         // then
         assertThat(result.failed()).isTrue();
@@ -237,10 +237,10 @@ public void retrieveModuleEntryShouldReturnFailedFutureIfModuleKeyIsMissed() {
     }
 
     @Test
-    public void retrieveModuleEntryShouldReturnFailedFutureIfModuleApplicationIsMissed() {
+    public void retrieveModuleEntryShouldReturnFailedFutureIfApplicationIsMissed() {
         // when
         final Future<ModuleCacheResponse> result =
-                target.retrieveModuleEntry("some-key", "some-module-code", null);
+                target.retrieveEntry("some-key", "some-module-code", null);
 
         // then
         assertThat(result.failed()).isTrue();
@@ -249,10 +249,10 @@ public void retrieveModuleEntryShouldReturnFailedFutureIfModuleApplicationIsMiss
     }
 
     @Test
-    public void retrieveModuleEntryShouldReturnFailedFutureIfModuleCodeIsMissed() {
+    public void retrieveModuleEntryShouldReturnFailedFutureIfCodeIsMissed() {
         // when
         final Future<ModuleCacheResponse> result =
-                target.retrieveModuleEntry("some-key", null, "some-app");
+                target.retrieveEntry("some-key", null, "some-app");
 
         // then
         assertThat(result.failed()).isTrue();
@@ -261,9 +261,9 @@ public void retrieveModuleEntryShouldReturnFailedFutureIfModuleCodeIsMissed() {
     }
 
     @Test
-    public void retrieveModuleEntryShouldCreateCallWithApiKeyInHeader() {
+    public void retrieveEntryShouldCreateCallWithApiKeyInHeader() {
         // when
-        target.retrieveModuleEntry("some-key", "some-module-code", "some-app");
+        target.retrieveEntry("some-key", "some-module-code", "some-app");
 
         // then
         final MultiMap result = captureRetrieveRequestHeaders();
@@ -271,9 +271,9 @@ public void retrieveModuleEntryShouldCreateCallWithApiKeyInHeader() {
     }
 
     @Test
-    public void retrieveModuleEntryShouldCreateCallWithKeyInParams() {
+    public void retrieveEntryShouldCreateCallWithKeyInParams() {
         // when
-        target.retrieveModuleEntry("some-key", "some-module-code", "some-app");
+        target.retrieveEntry("some-key", "some-module-code", "some-app");
 
         // then
         final String result = captureRetrieveUrl();
@@ -282,10 +282,10 @@ public void retrieveModuleEntryShouldCreateCallWithKeyInParams() {
     }
 
     @Test
-    public void retrieveModuleEntryShouldReturnExpectedResponse() {
+    public void retrieveEntryShouldReturnExpectedResponse() {
         // when
         final Future<ModuleCacheResponse> result =
-                target.retrieveModuleEntry("some-key", "some-module-code", "some-app");
+                target.retrieveEntry("some-key", "some-module-code", "some-app");
 
         // then
         assertThat(result.result())