diff --git a/presto-main/src/main/java/io/prestosql/FullConnectorSession.java b/presto-main/src/main/java/io/prestosql/FullConnectorSession.java
index 663715822efb..65f281e33f6f 100644
--- a/presto-main/src/main/java/io/prestosql/FullConnectorSession.java
+++ b/presto-main/src/main/java/io/prestosql/FullConnectorSession.java
@@ -63,7 +63,7 @@ public FullConnectorSession(
         this.session = requireNonNull(session, "session is null");
         this.identity = requireNonNull(identity, "identity is null");
         this.properties = ImmutableMap.copyOf(requireNonNull(properties, "properties is null"));
-        this.catalogName = requireNonNull(catalogName, "connectorId is null");
+        this.catalogName = requireNonNull(catalogName, "catalogName is null");
         this.catalog = requireNonNull(catalog, "catalog is null");
         this.sessionPropertyManager = requireNonNull(sessionPropertyManager, "sessionPropertyManager is null");
         this.isLegacyTimestamp = SystemSessionProperties.isLegacyTimestamp(session);
diff --git a/presto-main/src/main/java/io/prestosql/Session.java b/presto-main/src/main/java/io/prestosql/Session.java
index efb5ea5b8a74..0882716fbe11 100644
--- a/presto-main/src/main/java/io/prestosql/Session.java
+++ b/presto-main/src/main/java/io/prestosql/Session.java
@@ -430,7 +430,7 @@ public ConnectorSession toConnectorSession()
 
     public ConnectorSession toConnectorSession(CatalogName catalogName)
     {
-        requireNonNull(catalogName, "connectorId is null");
+        requireNonNull(catalogName, "catalogName is null");
 
         return new FullConnectorSession(
                 this,
diff --git a/presto-main/src/main/java/io/prestosql/connector/ConnectorAwareNodeManager.java b/presto-main/src/main/java/io/prestosql/connector/ConnectorAwareNodeManager.java
index e4ff35477375..d5126fac7418 100644
--- a/presto-main/src/main/java/io/prestosql/connector/ConnectorAwareNodeManager.java
+++ b/presto-main/src/main/java/io/prestosql/connector/ConnectorAwareNodeManager.java
@@ -33,7 +33,7 @@ public ConnectorAwareNodeManager(InternalNodeManager nodeManager, String environ
     {
         this.nodeManager = requireNonNull(nodeManager, "nodeManager is null");
         this.environment = requireNonNull(environment, "environment is null");
-        this.catalogName = requireNonNull(catalogName, "connectorId is null");
+        this.catalogName = requireNonNull(catalogName, "catalogName is null");
     }
 
     @Override
diff --git a/presto-main/src/main/java/io/prestosql/connector/ConnectorManager.java b/presto-main/src/main/java/io/prestosql/connector/ConnectorManager.java
index 3301c5791a12..d8269e5ba0b2 100644
--- a/presto-main/src/main/java/io/prestosql/connector/ConnectorManager.java
+++ b/presto-main/src/main/java/io/prestosql/connector/ConnectorManager.java
@@ -343,7 +343,7 @@ private static class MaterializedConnector
 
         public MaterializedConnector(CatalogName catalogName, Connector connector)
         {
-            this.catalogName = requireNonNull(catalogName, "connectorId is null");
+            this.catalogName = requireNonNull(catalogName, "catalogName is null");
             this.connector = requireNonNull(connector, "connector is null");
 
             splitManager = connector.getSplitManager();
diff --git a/presto-main/src/main/java/io/prestosql/connector/system/SystemConnector.java b/presto-main/src/main/java/io/prestosql/connector/system/SystemConnector.java
index c6d76f24fe26..2d5674ef1ff2 100644
--- a/presto-main/src/main/java/io/prestosql/connector/system/SystemConnector.java
+++ b/presto-main/src/main/java/io/prestosql/connector/system/SystemConnector.java
@@ -53,7 +53,7 @@ public SystemConnector(
             SystemTablesProvider tables,
             Function<TransactionId, ConnectorTransactionHandle> transactionHandleFunction)
     {
-        requireNonNull(catalogName, "connectorId is null");
+        requireNonNull(catalogName, "catalogName is null");
         requireNonNull(nodeManager, "nodeManager is null");
         requireNonNull(tables, "tables is null");
         requireNonNull(transactionHandleFunction, "transactionHandleFunction is null");
diff --git a/presto-main/src/main/java/io/prestosql/connector/system/SystemTransactionHandle.java b/presto-main/src/main/java/io/prestosql/connector/system/SystemTransactionHandle.java
index 3b580db7384a..b528bd5513fa 100644
--- a/presto-main/src/main/java/io/prestosql/connector/system/SystemTransactionHandle.java
+++ b/presto-main/src/main/java/io/prestosql/connector/system/SystemTransactionHandle.java
@@ -39,7 +39,7 @@ public class SystemTransactionHandle
             TransactionId transactionId,
             Function<TransactionId, ConnectorTransactionHandle> transactionHandleFunction)
     {
-        this.catalogName = requireNonNull(catalogName, "connectorId is null");
+        this.catalogName = requireNonNull(catalogName, "catalogName is null");
         this.transactionId = requireNonNull(transactionId, "transactionId is null");
         requireNonNull(transactionHandleFunction, "transactionHandleFunction is null");
         this.connectorTransactionHandle = Suppliers.memoize(() -> transactionHandleFunction.apply(transactionId));
@@ -47,11 +47,11 @@ public class SystemTransactionHandle
 
     @JsonCreator
     public SystemTransactionHandle(
-            @JsonProperty("connectorId") CatalogName catalogName,
+            @JsonProperty("catalogName") CatalogName catalogName,
             @JsonProperty("transactionId") TransactionId transactionId,
             @JsonProperty("connectorTransactionHandle") ConnectorTransactionHandle connectorTransactionHandle)
     {
-        this.catalogName = requireNonNull(catalogName, "connectorId is null");
+        this.catalogName = requireNonNull(catalogName, "catalogName is null");
         this.transactionId = requireNonNull(transactionId, "transactionId is null");
         requireNonNull(connectorTransactionHandle, "connectorTransactionHandle is null");
         this.connectorTransactionHandle = () -> connectorTransactionHandle;
diff --git a/presto-main/src/main/java/io/prestosql/execution/Input.java b/presto-main/src/main/java/io/prestosql/execution/Input.java
index a1aca485c7c1..2e4d64084011 100644
--- a/presto-main/src/main/java/io/prestosql/execution/Input.java
+++ b/presto-main/src/main/java/io/prestosql/execution/Input.java
@@ -38,13 +38,13 @@ public final class Input
 
     @JsonCreator
     public Input(
-            @JsonProperty("connectorId") CatalogName catalogName,
+            @JsonProperty("catalogName") CatalogName catalogName,
             @JsonProperty("schema") String schema,
             @JsonProperty("table") String table,
             @JsonProperty("connectorInfo") Optional<Object> connectorInfo,
             @JsonProperty("columns") List<Column> columns)
     {
-        requireNonNull(catalogName, "connectorId is null");
+        requireNonNull(catalogName, "catalogName is null");
         requireNonNull(schema, "schema is null");
         requireNonNull(table, "table is null");
         requireNonNull(connectorInfo, "connectorInfo is null");
diff --git a/presto-main/src/main/java/io/prestosql/execution/Output.java b/presto-main/src/main/java/io/prestosql/execution/Output.java
index 56650a411d1c..21c88438fbcc 100644
--- a/presto-main/src/main/java/io/prestosql/execution/Output.java
+++ b/presto-main/src/main/java/io/prestosql/execution/Output.java
@@ -32,11 +32,11 @@ public final class Output
 
     @JsonCreator
     public Output(
-            @JsonProperty("connectorId") CatalogName catalogName,
+            @JsonProperty("catalogName") CatalogName catalogName,
             @JsonProperty("schema") String schema,
             @JsonProperty("table") String table)
     {
-        this.catalogName = requireNonNull(catalogName, "connectorId is null");
+        this.catalogName = requireNonNull(catalogName, "catalogName is null");
         this.schema = requireNonNull(schema, "schema is null");
         this.table = requireNonNull(table, "table is null");
     }
diff --git a/presto-main/src/main/java/io/prestosql/index/IndexManager.java b/presto-main/src/main/java/io/prestosql/index/IndexManager.java
index 1985eccd21ff..c54869148981 100644
--- a/presto-main/src/main/java/io/prestosql/index/IndexManager.java
+++ b/presto-main/src/main/java/io/prestosql/index/IndexManager.java
@@ -35,7 +35,7 @@ public class IndexManager
 
     public void addIndexProvider(CatalogName catalogName, ConnectorIndexProvider indexProvider)
     {
-        requireNonNull(catalogName, "connectorId is null");
+        requireNonNull(catalogName, "catalogName is null");
         requireNonNull(indexProvider, "indexProvider is null");
         checkState(providers.putIfAbsent(catalogName, indexProvider) == null, "IndexProvider for connector '%s' is already registered", catalogName);
     }
diff --git a/presto-main/src/main/java/io/prestosql/metadata/AbstractPropertyManager.java b/presto-main/src/main/java/io/prestosql/metadata/AbstractPropertyManager.java
index 919bf7f285f4..55f7ca2603dd 100644
--- a/presto-main/src/main/java/io/prestosql/metadata/AbstractPropertyManager.java
+++ b/presto-main/src/main/java/io/prestosql/metadata/AbstractPropertyManager.java
@@ -55,7 +55,7 @@ protected AbstractPropertyManager(String propertyType, ErrorCodeSupplier propert
 
     public final void addProperties(CatalogName catalogName, List<PropertyMetadata<?>> properties)
     {
-        requireNonNull(catalogName, "connectorId is null");
+        requireNonNull(catalogName, "catalogName is null");
         requireNonNull(properties, "properties is null");
 
         Map<String, PropertyMetadata<?>> propertiesByName = Maps.uniqueIndex(properties, PropertyMetadata::getName);
diff --git a/presto-main/src/main/java/io/prestosql/metadata/AnalyzeTableHandle.java b/presto-main/src/main/java/io/prestosql/metadata/AnalyzeTableHandle.java
index 1a95b50dd778..49c3bbdb1c80 100644
--- a/presto-main/src/main/java/io/prestosql/metadata/AnalyzeTableHandle.java
+++ b/presto-main/src/main/java/io/prestosql/metadata/AnalyzeTableHandle.java
@@ -31,11 +31,11 @@ public class AnalyzeTableHandle
 
     @JsonCreator
     public AnalyzeTableHandle(
-            @JsonProperty("connectorId") CatalogName catalogName,
+            @JsonProperty("catalogName") CatalogName catalogName,
             @JsonProperty("transactionHandle") ConnectorTransactionHandle transactionHandle,
             @JsonProperty("connectorHandle") ConnectorTableHandle connectorHandle)
     {
-        this.catalogName = requireNonNull(catalogName, "connectorId is null");
+        this.catalogName = requireNonNull(catalogName, "catalogName is null");
         this.transactionHandle = requireNonNull(transactionHandle, "transactionHandle is null");
         this.connectorHandle = requireNonNull(connectorHandle, "connectorHandle is null");
     }
diff --git a/presto-main/src/main/java/io/prestosql/metadata/CatalogMetadata.java b/presto-main/src/main/java/io/prestosql/metadata/CatalogMetadata.java
index 4fa232f5f5b0..aa8ac3f92ad5 100644
--- a/presto-main/src/main/java/io/prestosql/metadata/CatalogMetadata.java
+++ b/presto-main/src/main/java/io/prestosql/metadata/CatalogMetadata.java
@@ -56,7 +56,7 @@ public CatalogMetadata(
             ConnectorTransactionHandle systemTablesTransactionHandle,
             Set<ConnectorCapabilities> connectorCapabilities)
     {
-        this.catalogName = requireNonNull(catalogName, "connectorId is null");
+        this.catalogName = requireNonNull(catalogName, "catalogName is null");
         this.metadata = requireNonNull(metadata, "metadata is null");
         this.transactionHandle = requireNonNull(transactionHandle, "transactionHandle is null");
         this.informationSchemaId = requireNonNull(informationSchemaId, "informationSchemaId is null");
diff --git a/presto-main/src/main/java/io/prestosql/metadata/IndexHandle.java b/presto-main/src/main/java/io/prestosql/metadata/IndexHandle.java
index 4d9a58ed310e..4a603e6b2dd9 100644
--- a/presto-main/src/main/java/io/prestosql/metadata/IndexHandle.java
+++ b/presto-main/src/main/java/io/prestosql/metadata/IndexHandle.java
@@ -31,11 +31,11 @@ public final class IndexHandle
 
     @JsonCreator
     public IndexHandle(
-            @JsonProperty("connectorId") CatalogName catalogName,
+            @JsonProperty("catalogName") CatalogName catalogName,
             @JsonProperty("transactionHandle") ConnectorTransactionHandle transactionHandle,
             @JsonProperty("connectorHandle") ConnectorIndexHandle connectorHandle)
     {
-        this.catalogName = requireNonNull(catalogName, "connectorId is null");
+        this.catalogName = requireNonNull(catalogName, "catalogName is null");
         this.transactionHandle = requireNonNull(transactionHandle, "transactionHandle is null");
         this.connectorHandle = requireNonNull(connectorHandle, "connectorHandle is null");
     }
diff --git a/presto-main/src/main/java/io/prestosql/metadata/InsertTableHandle.java b/presto-main/src/main/java/io/prestosql/metadata/InsertTableHandle.java
index 362bead441f8..dbeb4023d777 100644
--- a/presto-main/src/main/java/io/prestosql/metadata/InsertTableHandle.java
+++ b/presto-main/src/main/java/io/prestosql/metadata/InsertTableHandle.java
@@ -31,11 +31,11 @@ public final class InsertTableHandle
 
     @JsonCreator
     public InsertTableHandle(
-            @JsonProperty("connectorId") CatalogName catalogName,
+            @JsonProperty("catalogName") CatalogName catalogName,
             @JsonProperty("transactionHandle") ConnectorTransactionHandle transactionHandle,
             @JsonProperty("connectorHandle") ConnectorInsertTableHandle connectorHandle)
     {
-        this.catalogName = requireNonNull(catalogName, "connectorId is null");
+        this.catalogName = requireNonNull(catalogName, "catalogName is null");
         this.transactionHandle = requireNonNull(transactionHandle, "transactionHandle is null");
         this.connectorHandle = requireNonNull(connectorHandle, "connectorHandle is null");
     }
diff --git a/presto-main/src/main/java/io/prestosql/metadata/NewTableLayout.java b/presto-main/src/main/java/io/prestosql/metadata/NewTableLayout.java
index 12b6da842dd5..a8c77377a9ff 100644
--- a/presto-main/src/main/java/io/prestosql/metadata/NewTableLayout.java
+++ b/presto-main/src/main/java/io/prestosql/metadata/NewTableLayout.java
@@ -35,11 +35,11 @@ public class NewTableLayout
 
     @JsonCreator
     public NewTableLayout(
-            @JsonProperty("connectorId") CatalogName catalogName,
+            @JsonProperty("catalogName") CatalogName catalogName,
             @JsonProperty("transactionHandle") ConnectorTransactionHandle transactionHandle,
             @JsonProperty("layout") ConnectorNewTableLayout layout)
     {
-        this.catalogName = requireNonNull(catalogName, "connectorId is null");
+        this.catalogName = requireNonNull(catalogName, "catalogName is null");
         this.transactionHandle = requireNonNull(transactionHandle, "transactionHandle is null");
         this.layout = requireNonNull(layout, "layout is null");
     }
diff --git a/presto-main/src/main/java/io/prestosql/metadata/OutputTableHandle.java b/presto-main/src/main/java/io/prestosql/metadata/OutputTableHandle.java
index ed366671b551..d898f190781b 100644
--- a/presto-main/src/main/java/io/prestosql/metadata/OutputTableHandle.java
+++ b/presto-main/src/main/java/io/prestosql/metadata/OutputTableHandle.java
@@ -31,11 +31,11 @@ public final class OutputTableHandle
 
     @JsonCreator
     public OutputTableHandle(
-            @JsonProperty("connectorId") CatalogName catalogName,
+            @JsonProperty("catalogName") CatalogName catalogName,
             @JsonProperty("transactionHandle") ConnectorTransactionHandle transactionHandle,
             @JsonProperty("connectorHandle") ConnectorOutputTableHandle connectorHandle)
     {
-        this.catalogName = requireNonNull(catalogName, "connectorId is null");
+        this.catalogName = requireNonNull(catalogName, "catalogName is null");
         this.transactionHandle = requireNonNull(transactionHandle, "transactionHandle is null");
         this.connectorHandle = requireNonNull(connectorHandle, "connectorHandle is null");
     }
diff --git a/presto-main/src/main/java/io/prestosql/metadata/ProcedureRegistry.java b/presto-main/src/main/java/io/prestosql/metadata/ProcedureRegistry.java
index dea9ce29986d..7d76dd5c0d4f 100644
--- a/presto-main/src/main/java/io/prestosql/metadata/ProcedureRegistry.java
+++ b/presto-main/src/main/java/io/prestosql/metadata/ProcedureRegistry.java
@@ -57,7 +57,7 @@ public ProcedureRegistry(TypeManager typeManager)
 
     public void addProcedures(CatalogName catalogName, Collection<Procedure> procedures)
     {
-        requireNonNull(catalogName, "connectorId is null");
+        requireNonNull(catalogName, "catalogName is null");
         requireNonNull(procedures, "procedures is null");
 
         procedures.forEach(this::validateProcedure);
diff --git a/presto-main/src/main/java/io/prestosql/metadata/ResolvedIndex.java b/presto-main/src/main/java/io/prestosql/metadata/ResolvedIndex.java
index 161c56d300ac..e16b05964810 100644
--- a/presto-main/src/main/java/io/prestosql/metadata/ResolvedIndex.java
+++ b/presto-main/src/main/java/io/prestosql/metadata/ResolvedIndex.java
@@ -28,7 +28,7 @@ public final class ResolvedIndex
 
     public ResolvedIndex(CatalogName catalogName, ConnectorTransactionHandle transactionHandle, ConnectorResolvedIndex index)
     {
-        requireNonNull(catalogName, "connectorId is null");
+        requireNonNull(catalogName, "catalogName is null");
         requireNonNull(index, "index is null");
 
         indexHandle = new IndexHandle(catalogName, transactionHandle, index.getIndexHandle());
diff --git a/presto-main/src/main/java/io/prestosql/metadata/SessionPropertyManager.java b/presto-main/src/main/java/io/prestosql/metadata/SessionPropertyManager.java
index ca6256f21023..e508fedbf111 100644
--- a/presto-main/src/main/java/io/prestosql/metadata/SessionPropertyManager.java
+++ b/presto-main/src/main/java/io/prestosql/metadata/SessionPropertyManager.java
@@ -91,7 +91,7 @@ public void addSystemSessionProperty(PropertyMetadata<?> sessionProperty)
 
     public void addConnectorSessionProperties(CatalogName catalogName, List<PropertyMetadata<?>> properties)
     {
-        requireNonNull(catalogName, "connectorId is null");
+        requireNonNull(catalogName, "catalogName is null");
         requireNonNull(properties, "properties is null");
 
         Map<String, PropertyMetadata<?>> propertiesByName = Maps.uniqueIndex(properties, PropertyMetadata::getName);
@@ -112,7 +112,7 @@ public Optional<PropertyMetadata<?>> getSystemSessionPropertyMetadata(String nam
 
     public Optional<PropertyMetadata<?>> getConnectorSessionPropertyMetadata(CatalogName catalogName, String propertyName)
     {
-        requireNonNull(catalogName, "connectorId is null");
+        requireNonNull(catalogName, "catalogName is null");
         requireNonNull(propertyName, "propertyName is null");
         Map<String, PropertyMetadata<?>> properties = connectorSessionProperties.get(catalogName);
         if (properties == null || properties.isEmpty()) {
diff --git a/presto-main/src/main/java/io/prestosql/metadata/Split.java b/presto-main/src/main/java/io/prestosql/metadata/Split.java
index ccc95eabe34f..79096d56e947 100644
--- a/presto-main/src/main/java/io/prestosql/metadata/Split.java
+++ b/presto-main/src/main/java/io/prestosql/metadata/Split.java
@@ -33,11 +33,11 @@ public final class Split
 
     @JsonCreator
     public Split(
-            @JsonProperty("connectorId") CatalogName catalogName,
+            @JsonProperty("catalogName") CatalogName catalogName,
             @JsonProperty("connectorSplit") ConnectorSplit connectorSplit,
             @JsonProperty("lifespan") Lifespan lifespan)
     {
-        this.catalogName = requireNonNull(catalogName, "connectorId is null");
+        this.catalogName = requireNonNull(catalogName, "catalogName is null");
         this.connectorSplit = requireNonNull(connectorSplit, "connectorSplit is null");
         this.lifespan = requireNonNull(lifespan, "lifespan is null");
     }
diff --git a/presto-main/src/main/java/io/prestosql/metadata/TableHandle.java b/presto-main/src/main/java/io/prestosql/metadata/TableHandle.java
index d27d1d5d0db2..78e5b3ec3329 100644
--- a/presto-main/src/main/java/io/prestosql/metadata/TableHandle.java
+++ b/presto-main/src/main/java/io/prestosql/metadata/TableHandle.java
@@ -36,12 +36,12 @@ public final class TableHandle
 
     @JsonCreator
     public TableHandle(
-            @JsonProperty("connectorId") CatalogName catalogName,
+            @JsonProperty("catalogName") CatalogName catalogName,
             @JsonProperty("connectorHandle") ConnectorTableHandle connectorHandle,
             @JsonProperty("transaction") ConnectorTransactionHandle transaction,
             @JsonProperty("layout") Optional<ConnectorTableLayoutHandle> layout)
     {
-        this.catalogName = requireNonNull(catalogName, "connectorId is null");
+        this.catalogName = requireNonNull(catalogName, "catalogName is null");
         this.connectorHandle = requireNonNull(connectorHandle, "connectorHandle is null");
         this.transaction = requireNonNull(transaction, "transaction is null");
         this.layout = requireNonNull(layout, "layout is null");
diff --git a/presto-main/src/main/java/io/prestosql/metadata/TableProperties.java b/presto-main/src/main/java/io/prestosql/metadata/TableProperties.java
index 36891afed63f..04088ede28e1 100644
--- a/presto-main/src/main/java/io/prestosql/metadata/TableProperties.java
+++ b/presto-main/src/main/java/io/prestosql/metadata/TableProperties.java
@@ -38,7 +38,7 @@ public class TableProperties
 
     public TableProperties(CatalogName catalogName, ConnectorTransactionHandle transaction, ConnectorTableProperties tableProperties)
     {
-        requireNonNull(catalogName, "connectorId is null");
+        requireNonNull(catalogName, "catalogName is null");
         requireNonNull(transaction, "transaction is null");
         requireNonNull(tableProperties, "layout is null");
 
diff --git a/presto-main/src/main/java/io/prestosql/security/AccessControlManager.java b/presto-main/src/main/java/io/prestosql/security/AccessControlManager.java
index 2429f26a364a..4040e9047021 100644
--- a/presto-main/src/main/java/io/prestosql/security/AccessControlManager.java
+++ b/presto-main/src/main/java/io/prestosql/security/AccessControlManager.java
@@ -98,7 +98,7 @@ public void addSystemAccessControlFactory(SystemAccessControlFactory accessContr
 
     public void addCatalogAccessControl(CatalogName catalogName, ConnectorAccessControl accessControl)
     {
-        requireNonNull(catalogName, "connectorId is null");
+        requireNonNull(catalogName, "catalogName is null");
         requireNonNull(accessControl, "accessControl is null");
         checkState(connectorAccessControl.putIfAbsent(catalogName, new CatalogAccessControlEntry(catalogName, accessControl)) == null,
                 "Access control for connector '%s' is already registered", catalogName);
@@ -784,7 +784,7 @@ private class CatalogAccessControlEntry
 
         public CatalogAccessControlEntry(CatalogName catalogName, ConnectorAccessControl accessControl)
         {
-            this.catalogName = requireNonNull(catalogName, "connectorId is null");
+            this.catalogName = requireNonNull(catalogName, "catalogName is null");
             this.accessControl = requireNonNull(accessControl, "accessControl is null");
         }
 
diff --git a/presto-main/src/main/java/io/prestosql/split/ConnectorAwareSplitSource.java b/presto-main/src/main/java/io/prestosql/split/ConnectorAwareSplitSource.java
index d97a16a74126..c466ce16b77d 100644
--- a/presto-main/src/main/java/io/prestosql/split/ConnectorAwareSplitSource.java
+++ b/presto-main/src/main/java/io/prestosql/split/ConnectorAwareSplitSource.java
@@ -36,7 +36,7 @@ public class ConnectorAwareSplitSource
 
     public ConnectorAwareSplitSource(CatalogName catalogName, ConnectorSplitSource source)
     {
-        this.catalogName = requireNonNull(catalogName, "connectorId is null");
+        this.catalogName = requireNonNull(catalogName, "catalogName is null");
         this.source = requireNonNull(source, "source is null");
     }
 
diff --git a/presto-main/src/main/java/io/prestosql/split/EmptySplit.java b/presto-main/src/main/java/io/prestosql/split/EmptySplit.java
index 50c41c8f17d4..2918a0c12711 100644
--- a/presto-main/src/main/java/io/prestosql/split/EmptySplit.java
+++ b/presto-main/src/main/java/io/prestosql/split/EmptySplit.java
@@ -31,9 +31,9 @@ public class EmptySplit
 
     @JsonCreator
     public EmptySplit(
-            @JsonProperty("connectorId") CatalogName catalogName)
+            @JsonProperty("catalogName") CatalogName catalogName)
     {
-        this.catalogName = requireNonNull(catalogName, "connectorId is null");
+        this.catalogName = requireNonNull(catalogName, "catalogName is null");
     }
 
     @Override
diff --git a/presto-main/src/main/java/io/prestosql/split/PageSinkManager.java b/presto-main/src/main/java/io/prestosql/split/PageSinkManager.java
index 6da1a6cdde18..c6ba894a98a4 100644
--- a/presto-main/src/main/java/io/prestosql/split/PageSinkManager.java
+++ b/presto-main/src/main/java/io/prestosql/split/PageSinkManager.java
@@ -35,7 +35,7 @@ public class PageSinkManager
 
     public void addConnectorPageSinkProvider(CatalogName catalogName, ConnectorPageSinkProvider pageSinkProvider)
     {
-        requireNonNull(catalogName, "connectorId is null");
+        requireNonNull(catalogName, "catalogName is null");
         requireNonNull(pageSinkProvider, "pageSinkProvider is null");
         checkState(pageSinkProviders.put(catalogName, pageSinkProvider) == null, "PageSinkProvider for connector '%s' is already registered", catalogName);
     }
diff --git a/presto-main/src/main/java/io/prestosql/split/PageSourceManager.java b/presto-main/src/main/java/io/prestosql/split/PageSourceManager.java
index a9f5509c6713..132c15841f63 100644
--- a/presto-main/src/main/java/io/prestosql/split/PageSourceManager.java
+++ b/presto-main/src/main/java/io/prestosql/split/PageSourceManager.java
@@ -36,7 +36,7 @@ public class PageSourceManager
 
     public void addConnectorPageSourceProvider(CatalogName catalogName, ConnectorPageSourceProvider pageSourceProvider)
     {
-        requireNonNull(catalogName, "connectorId is null");
+        requireNonNull(catalogName, "catalogName is null");
         requireNonNull(pageSourceProvider, "pageSourceProvider is null");
         checkState(pageSourceProviders.put(catalogName, pageSourceProvider) == null, "PageSourceProvider for connector '%s' is already registered", catalogName);
     }
diff --git a/presto-main/src/main/java/io/prestosql/split/SplitManager.java b/presto-main/src/main/java/io/prestosql/split/SplitManager.java
index de826b79ee31..2326a5f33126 100644
--- a/presto-main/src/main/java/io/prestosql/split/SplitManager.java
+++ b/presto-main/src/main/java/io/prestosql/split/SplitManager.java
@@ -54,7 +54,7 @@ public SplitManager(QueryManagerConfig config, Metadata metadata)
 
     public void addConnectorSplitManager(CatalogName catalogName, ConnectorSplitManager connectorSplitManager)
     {
-        requireNonNull(catalogName, "connectorId is null");
+        requireNonNull(catalogName, "catalogName is null");
         requireNonNull(connectorSplitManager, "connectorSplitManager is null");
         checkState(splitManagers.putIfAbsent(catalogName, connectorSplitManager) == null, "SplitManager for connector '%s' is already registered", catalogName);
     }
diff --git a/presto-main/src/main/java/io/prestosql/sql/planner/NodePartitioningManager.java b/presto-main/src/main/java/io/prestosql/sql/planner/NodePartitioningManager.java
index b3365c6237a3..e375e0ab04a1 100644
--- a/presto-main/src/main/java/io/prestosql/sql/planner/NodePartitioningManager.java
+++ b/presto-main/src/main/java/io/prestosql/sql/planner/NodePartitioningManager.java
@@ -63,7 +63,7 @@ public NodePartitioningManager(NodeScheduler nodeScheduler)
 
     public void addPartitioningProvider(CatalogName catalogName, ConnectorNodePartitioningProvider nodePartitioningProvider)
     {
-        requireNonNull(catalogName, "connectorId is null");
+        requireNonNull(catalogName, "catalogName is null");
         requireNonNull(nodePartitioningProvider, "nodePartitioningProvider is null");
         checkArgument(partitioningProviders.putIfAbsent(catalogName, nodePartitioningProvider) == null,
                 "NodePartitioningProvider for connector '%s' is already registered", catalogName);
diff --git a/presto-main/src/main/java/io/prestosql/transaction/InMemoryTransactionManager.java b/presto-main/src/main/java/io/prestosql/transaction/InMemoryTransactionManager.java
index 550324a14887..1848613d7e62 100644
--- a/presto-main/src/main/java/io/prestosql/transaction/InMemoryTransactionManager.java
+++ b/presto-main/src/main/java/io/prestosql/transaction/InMemoryTransactionManager.java
@@ -567,7 +567,7 @@ private static class ConnectorTransactionMetadata
 
             public ConnectorTransactionMetadata(CatalogName catalogName, Connector connector, ConnectorTransactionHandle transactionHandle)
             {
-                this.catalogName = requireNonNull(catalogName, "connectorId is null");
+                this.catalogName = requireNonNull(catalogName, "catalogName is null");
                 this.connector = requireNonNull(connector, "connector is null");
                 this.transactionHandle = requireNonNull(transactionHandle, "transactionHandle is null");
                 this.connectorMetadata = connector.getMetadata(transactionHandle);