diff --git a/core/src/main/java/com/scalar/db/common/CheckedDistributedStorageAdmin.java b/core/src/main/java/com/scalar/db/common/CommonDistributedStorageAdmin.java
similarity index 98%
rename from core/src/main/java/com/scalar/db/common/CheckedDistributedStorageAdmin.java
rename to core/src/main/java/com/scalar/db/common/CommonDistributedStorageAdmin.java
index 299ee77fc3..1758c297ae 100644
--- a/core/src/main/java/com/scalar/db/common/CheckedDistributedStorageAdmin.java
+++ b/core/src/main/java/com/scalar/db/common/CommonDistributedStorageAdmin.java
@@ -13,13 +13,13 @@
 import java.util.Set;
 import javax.annotation.Nullable;
 
-public class CheckedDistributedStorageAdmin implements DistributedStorageAdmin {
+public class CommonDistributedStorageAdmin implements DistributedStorageAdmin {
 
   private final DistributedStorageAdmin admin;
   private final String systemNamespaceName;
 
   @SuppressFBWarnings("EI_EXPOSE_REP2")
-  public CheckedDistributedStorageAdmin(DistributedStorageAdmin admin, DatabaseConfig config) {
+  public CommonDistributedStorageAdmin(DistributedStorageAdmin admin, DatabaseConfig config) {
     this.admin = admin;
     systemNamespaceName = config.getSystemNamespaceName();
   }
diff --git a/core/src/main/java/com/scalar/db/storage/cassandra/CassandraProvider.java b/core/src/main/java/com/scalar/db/storage/cassandra/CassandraProvider.java
index 178ef33999..6f2b2eed14 100644
--- a/core/src/main/java/com/scalar/db/storage/cassandra/CassandraProvider.java
+++ b/core/src/main/java/com/scalar/db/storage/cassandra/CassandraProvider.java
@@ -3,7 +3,7 @@
 import com.scalar.db.api.DistributedStorage;
 import com.scalar.db.api.DistributedStorageAdmin;
 import com.scalar.db.api.DistributedStorageProvider;
-import com.scalar.db.common.CheckedDistributedStorageAdmin;
+import com.scalar.db.common.CommonDistributedStorageAdmin;
 import com.scalar.db.config.DatabaseConfig;
 
 public class CassandraProvider implements DistributedStorageProvider {
@@ -19,6 +19,6 @@ public DistributedStorage createDistributedStorage(DatabaseConfig config) {
 
   @Override
   public DistributedStorageAdmin createDistributedStorageAdmin(DatabaseConfig config) {
-    return new CheckedDistributedStorageAdmin(new CassandraAdmin(config), config);
+    return new CommonDistributedStorageAdmin(new CassandraAdmin(config), config);
   }
 }
diff --git a/core/src/main/java/com/scalar/db/storage/cosmos/CosmosProvider.java b/core/src/main/java/com/scalar/db/storage/cosmos/CosmosProvider.java
index 38a81209bd..5407182c96 100644
--- a/core/src/main/java/com/scalar/db/storage/cosmos/CosmosProvider.java
+++ b/core/src/main/java/com/scalar/db/storage/cosmos/CosmosProvider.java
@@ -3,7 +3,7 @@
 import com.scalar.db.api.DistributedStorage;
 import com.scalar.db.api.DistributedStorageAdmin;
 import com.scalar.db.api.DistributedStorageProvider;
-import com.scalar.db.common.CheckedDistributedStorageAdmin;
+import com.scalar.db.common.CommonDistributedStorageAdmin;
 import com.scalar.db.config.DatabaseConfig;
 
 public class CosmosProvider implements DistributedStorageProvider {
@@ -19,6 +19,6 @@ public DistributedStorage createDistributedStorage(DatabaseConfig config) {
 
   @Override
   public DistributedStorageAdmin createDistributedStorageAdmin(DatabaseConfig config) {
-    return new CheckedDistributedStorageAdmin(new CosmosAdmin(config), config);
+    return new CommonDistributedStorageAdmin(new CosmosAdmin(config), config);
   }
 }
diff --git a/core/src/main/java/com/scalar/db/storage/dynamo/DynamoProvider.java b/core/src/main/java/com/scalar/db/storage/dynamo/DynamoProvider.java
index 40846a8b2c..59c87a7573 100644
--- a/core/src/main/java/com/scalar/db/storage/dynamo/DynamoProvider.java
+++ b/core/src/main/java/com/scalar/db/storage/dynamo/DynamoProvider.java
@@ -3,7 +3,7 @@
 import com.scalar.db.api.DistributedStorage;
 import com.scalar.db.api.DistributedStorageAdmin;
 import com.scalar.db.api.DistributedStorageProvider;
-import com.scalar.db.common.CheckedDistributedStorageAdmin;
+import com.scalar.db.common.CommonDistributedStorageAdmin;
 import com.scalar.db.config.DatabaseConfig;
 
 public class DynamoProvider implements DistributedStorageProvider {
@@ -19,6 +19,6 @@ public DistributedStorage createDistributedStorage(DatabaseConfig config) {
 
   @Override
   public DistributedStorageAdmin createDistributedStorageAdmin(DatabaseConfig config) {
-    return new CheckedDistributedStorageAdmin(new DynamoAdmin(config), config);
+    return new CommonDistributedStorageAdmin(new DynamoAdmin(config), config);
   }
 }
diff --git a/core/src/main/java/com/scalar/db/storage/jdbc/JdbcProvider.java b/core/src/main/java/com/scalar/db/storage/jdbc/JdbcProvider.java
index f2c0dcb3c9..7a24f59c35 100644
--- a/core/src/main/java/com/scalar/db/storage/jdbc/JdbcProvider.java
+++ b/core/src/main/java/com/scalar/db/storage/jdbc/JdbcProvider.java
@@ -3,7 +3,7 @@
 import com.scalar.db.api.DistributedStorage;
 import com.scalar.db.api.DistributedStorageAdmin;
 import com.scalar.db.api.DistributedStorageProvider;
-import com.scalar.db.common.CheckedDistributedStorageAdmin;
+import com.scalar.db.common.CommonDistributedStorageAdmin;
 import com.scalar.db.config.DatabaseConfig;
 
 public class JdbcProvider implements DistributedStorageProvider {
@@ -19,6 +19,6 @@ public DistributedStorage createDistributedStorage(DatabaseConfig config) {
 
   @Override
   public DistributedStorageAdmin createDistributedStorageAdmin(DatabaseConfig config) {
-    return new CheckedDistributedStorageAdmin(new JdbcAdmin(config), config);
+    return new CommonDistributedStorageAdmin(new JdbcAdmin(config), config);
   }
 }
diff --git a/core/src/main/java/com/scalar/db/transaction/jdbc/JdbcTransactionAdmin.java b/core/src/main/java/com/scalar/db/transaction/jdbc/JdbcTransactionAdmin.java
index d0151272bf..ed9d9f5150 100644
--- a/core/src/main/java/com/scalar/db/transaction/jdbc/JdbcTransactionAdmin.java
+++ b/core/src/main/java/com/scalar/db/transaction/jdbc/JdbcTransactionAdmin.java
@@ -5,7 +5,7 @@
 import com.scalar.db.api.DistributedStorageAdmin;
 import com.scalar.db.api.DistributedTransactionAdmin;
 import com.scalar.db.api.TableMetadata;
-import com.scalar.db.common.CheckedDistributedStorageAdmin;
+import com.scalar.db.common.CommonDistributedStorageAdmin;
 import com.scalar.db.config.DatabaseConfig;
 import com.scalar.db.exception.storage.ExecutionException;
 import com.scalar.db.io.DataType;
@@ -21,7 +21,7 @@ public class JdbcTransactionAdmin implements DistributedTransactionAdmin {
 
   @Inject
   public JdbcTransactionAdmin(DatabaseConfig databaseConfig) {
-    jdbcAdmin = new CheckedDistributedStorageAdmin(new JdbcAdmin(databaseConfig), databaseConfig);
+    jdbcAdmin = new CommonDistributedStorageAdmin(new JdbcAdmin(databaseConfig), databaseConfig);
   }
 
   @VisibleForTesting
diff --git a/core/src/test/java/com/scalar/db/common/CheckedDistributedStorageAdminTest.java b/core/src/test/java/com/scalar/db/common/CommonDistributedStorageAdminTest.java
similarity index 79%
rename from core/src/test/java/com/scalar/db/common/CheckedDistributedStorageAdminTest.java
rename to core/src/test/java/com/scalar/db/common/CommonDistributedStorageAdminTest.java
index 74d8c7222d..abcfd0f13c 100644
--- a/core/src/test/java/com/scalar/db/common/CheckedDistributedStorageAdminTest.java
+++ b/core/src/test/java/com/scalar/db/common/CommonDistributedStorageAdminTest.java
@@ -19,14 +19,14 @@
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 
-public class CheckedDistributedStorageAdminTest {
+public class CommonDistributedStorageAdminTest {
 
   private static final String SYSTEM_NAMESPACE = "scalardb";
 
   @Mock private DistributedStorageAdmin admin;
   @Mock private DatabaseConfig databaseConfig;
 
-  private CheckedDistributedStorageAdmin checkedAdmin;
+  private CommonDistributedStorageAdmin commonDistributedStorageAdmin;
 
   @BeforeEach
   public void setUp() throws Exception {
@@ -34,7 +34,7 @@ public void setUp() throws Exception {
 
     // Arrange
     when(databaseConfig.getSystemNamespaceName()).thenReturn(SYSTEM_NAMESPACE);
-    checkedAdmin = new CheckedDistributedStorageAdmin(admin, databaseConfig);
+    commonDistributedStorageAdmin = new CommonDistributedStorageAdmin(admin, databaseConfig);
   }
 
   @Test
@@ -42,7 +42,7 @@ public void createNamespace_SystemNamespaceNameGiven_ShouldThrowIllegalArgumentE
     // Arrange
 
     // Act Assert
-    assertThatThrownBy(() -> checkedAdmin.createNamespace(SYSTEM_NAMESPACE))
+    assertThatThrownBy(() -> commonDistributedStorageAdmin.createNamespace(SYSTEM_NAMESPACE))
         .isInstanceOf(IllegalArgumentException.class);
   }
 
@@ -51,7 +51,7 @@ public void dropNamespace_SystemNamespaceNameGiven_ShouldThrowIllegalArgumentExc
     // Arrange
 
     // Act Assert
-    assertThatThrownBy(() -> checkedAdmin.dropNamespace(SYSTEM_NAMESPACE))
+    assertThatThrownBy(() -> commonDistributedStorageAdmin.dropNamespace(SYSTEM_NAMESPACE))
         .isInstanceOf(IllegalArgumentException.class);
   }
 
@@ -67,7 +67,7 @@ public void createTable_ShouldCallAdminProperly() throws ExecutionException {
     when(admin.tableExists(namespaceName, tableName)).thenReturn(true);
 
     // Act
-    checkedAdmin.createTable(namespaceName, tableName, tableMetadata, options);
+    commonDistributedStorageAdmin.createTable(namespaceName, tableName, tableMetadata, options);
 
     // Assert
     verify(admin).createTable(namespaceName, tableName, tableMetadata, options);
@@ -91,7 +91,9 @@ public void createTable_ShouldCallAdminProperly() throws ExecutionException {
 
     // Act Assert
     assertThatThrownBy(
-            () -> checkedAdmin.createTable(namespaceName, tableName, tableMetadata, options))
+            () ->
+                commonDistributedStorageAdmin.createTable(
+                    namespaceName, tableName, tableMetadata, options))
         .isInstanceOf(UnsupportedOperationException.class);
   }
 
@@ -101,7 +103,7 @@ public void namespaceExists_SystemNamespaceNameGiven_ShouldReturnTrue()
     // Arrange
 
     // Act
-    boolean actual = checkedAdmin.namespaceExists(SYSTEM_NAMESPACE);
+    boolean actual = commonDistributedStorageAdmin.namespaceExists(SYSTEM_NAMESPACE);
 
     // Assert
     assertThat(actual).isTrue();
@@ -114,7 +116,7 @@ public void getNamespaceNames_ShouldReturnListWithSystemNamespaceName()
     when(admin.getNamespaceNames()).thenReturn(Collections.emptySet());
 
     // Act
-    Set<String> actual = checkedAdmin.getNamespaceNames();
+    Set<String> actual = commonDistributedStorageAdmin.getNamespaceNames();
 
     // Assert
     assertThat(actual).containsExactly(SYSTEM_NAMESPACE);
@@ -130,7 +132,7 @@ public void repairTable_ShouldCallAdminProperly() throws ExecutionException {
     Map<String, String> options = ImmutableMap.of("name", "value");
 
     // Act
-    checkedAdmin.repairTable(namespaceName, tableName, tableMetadata, options);
+    commonDistributedStorageAdmin.repairTable(namespaceName, tableName, tableMetadata, options);
 
     // Assert
     verify(admin).repairTable(namespaceName, tableName, tableMetadata, options);
@@ -150,7 +152,9 @@ public void repairTable_ShouldCallAdminProperly() throws ExecutionException {
 
     // Act Assert
     assertThatThrownBy(
-            () -> checkedAdmin.repairTable(namespaceName, tableName, tableMetadata, options))
+            () ->
+                commonDistributedStorageAdmin.repairTable(
+                    namespaceName, tableName, tableMetadata, options))
         .isInstanceOf(UnsupportedOperationException.class);
   }
 }