diff --git a/common/src/main/java/io/druid/metadata/MetadataStorageActionHandlerFactory.java b/common/src/main/java/io/druid/metadata/MetadataStorageActionHandlerFactory.java
index 83140a2c423..baf9215efc2 100644
--- a/common/src/main/java/io/druid/metadata/MetadataStorageActionHandlerFactory.java
+++ b/common/src/main/java/io/druid/metadata/MetadataStorageActionHandlerFactory.java
@@ -21,8 +21,8 @@ package io.druid.metadata;
 
 public interface MetadataStorageActionHandlerFactory
 {
-  public <A,B,C,D> MetadataStorageActionHandler<A,B,C,D> create(
+  public <EntryType, StatusType, LogType, LockType> MetadataStorageActionHandler<EntryType, StatusType, LogType, LockType> create(
       final String entryType,
-      MetadataStorageActionHandlerTypes<A, B, C, D> payloadTypes
+      MetadataStorageActionHandlerTypes<EntryType, StatusType, LogType, LockType> payloadTypes
   );
 }
diff --git a/common/src/main/java/io/druid/metadata/MetadataStorageActionHandlerTypes.java b/common/src/main/java/io/druid/metadata/MetadataStorageActionHandlerTypes.java
index cf673fbd314..b0d355d766d 100644
--- a/common/src/main/java/io/druid/metadata/MetadataStorageActionHandlerTypes.java
+++ b/common/src/main/java/io/druid/metadata/MetadataStorageActionHandlerTypes.java
@@ -21,10 +21,10 @@ package io.druid.metadata;
 
 import com.fasterxml.jackson.core.type.TypeReference;
 
-public interface MetadataStorageActionHandlerTypes<A,B,C,D>
+public interface MetadataStorageActionHandlerTypes<EntryType, StatusType, LogType, LockType>
 {
-  public TypeReference<A> getEntryType();
-  public TypeReference<B> getStatusType();
-  public TypeReference<C> getLogType();
-  public TypeReference<D> getLockType();
+  public TypeReference<EntryType> getEntryType();
+  public TypeReference<StatusType> getStatusType();
+  public TypeReference<LogType> getLogType();
+  public TypeReference<LockType> getLockType();
 }