diff --git a/partiql-spi/api/partiql-spi.api b/partiql-spi/api/partiql-spi.api
index c252cc456..55098bf5f 100644
--- a/partiql-spi/api/partiql-spi.api
+++ b/partiql-spi/api/partiql-spi.api
@@ -261,7 +261,7 @@ public final class org/partiql/spi/catalog/Session$Builder {
 	public final fun namespace (Lorg/partiql/spi/catalog/Namespace;)Lorg/partiql/spi/catalog/Session$Builder;
 	public final fun namespace ([Ljava/lang/String;)Lorg/partiql/spi/catalog/Session$Builder;
 	public final fun property (Ljava/lang/String;Ljava/lang/String;)Lorg/partiql/spi/catalog/Session$Builder;
-	public final fun systemCatalog (Lorg/partiql/spi/catalog/Catalog;)Lorg/partiql/spi/catalog/Session$Builder;
+	public final fun system (Lorg/partiql/spi/catalog/Catalog;)Lorg/partiql/spi/catalog/Session$Builder;
 }
 
 public final class org/partiql/spi/catalog/Session$Companion {
diff --git a/partiql-spi/src/main/kotlin/org/partiql/spi/catalog/Session.kt b/partiql-spi/src/main/kotlin/org/partiql/spi/catalog/Session.kt
index 688410c21..4b4ec6cd1 100644
--- a/partiql-spi/src/main/kotlin/org/partiql/spi/catalog/Session.kt
+++ b/partiql-spi/src/main/kotlin/org/partiql/spi/catalog/Session.kt
@@ -62,7 +62,7 @@ public interface Session {
 
         private var identity: String = "unknown"
         private var catalog: String? = null
-        private var systemCatalogName: String = "\$pql_system"
+        private var systemCatalogName: String = "\$system"
         private var systemCatalog: Catalog = PartiQLSystemCatalog(systemCatalogName)
         private var catalogs: Catalogs.Builder = Catalogs.builder()
         private var namespace: Namespace = Namespace.empty()
@@ -103,7 +103,7 @@ public interface Session {
          * to the system at hand.
          * If this is never invoked, a default system catalog is provided.
          */
-        public fun systemCatalog(catalog: Catalog): Builder {
+        public fun system(catalog: Catalog): Builder {
             this.systemCatalogName = catalog.getName()
             return this
         }