diff --git a/src/firebolt/model/V2/database.py b/src/firebolt/model/V2/database.py
index 34e546b296..ac215f7173 100644
--- a/src/firebolt/model/V2/database.py
+++ b/src/firebolt/model/V2/database.py
@@ -33,17 +33,10 @@ class Database(FireboltBaseModel):
     _service: DatabaseService = field(repr=False, compare=False)
 
     # required
-    name: str = field(metadata={"db_name": "database_name"})
+    name: str = field(metadata={"db_name": "catalog_name"})
     description: str = field()
-    region: str = field()
-    data_size_full: int = field(metadata={"db_name": "uncompressed_size"})
-    data_size_compressed: int = field(metadata={"db_name": "compressed_size"})
-    _attached_engine_names: str = field(
-        repr=False, metadata={"db_name": "attached_engines"}, compare=False
-    )
-    create_time: datetime = field(metadata={"db_name": "created_on"})
-    create_actor: str = field(metadata={"db_name": "created_by"})
-    _errors: str = field(repr=False, metadata={"db_name": "errors"})
+    create_time: datetime = field(metadata={"db_name": "created"})
+    create_actor: str = field(metadata={"db_name": "catalog_owner"})
 
     def get_attached_engines(self) -> List[Engine]:
         """Get a list of engines that are attached to this database."""
diff --git a/src/firebolt/service/V2/database.py b/src/firebolt/service/V2/database.py
index 0f72f4fbcc..de6ba58834 100644
--- a/src/firebolt/service/V2/database.py
+++ b/src/firebolt/service/V2/database.py
@@ -11,18 +11,13 @@
 
 class DatabaseService(BaseService):
     DB_FIELDS = (
-        "database_name",
+        "catalog_name",
         "description",
-        "region",
-        "uncompressed_size",
-        "compressed_size",
-        "attached_engines",
-        "created_on",
-        "created_by",
-        "errors",
+        "created",
+        "catalog_owner",
     )
-    GET_SQL = f"SELECT {', '.join(DB_FIELDS)} FROM information_schema.databases"
-    GET_BY_NAME_SQL = GET_SQL + " WHERE database_name=?"
+    GET_SQL = f"SELECT {', '.join(DB_FIELDS)} FROM information_schema.catalogs"
+    GET_BY_NAME_SQL = GET_SQL + " WHERE catalog_name=?"
     GET_WHERE_SQL = " WHERE "
 
     CREATE_PREFIX_SQL = 'CREATE DATABASE {}"{}"'
@@ -86,7 +81,7 @@ def get_many(
             )
 
         if name_contains:
-            sql += " WHERE database_name like ?"
+            sql += " WHERE catalog_name like ?"
             parameters.append(f"%{name_contains}%")
 
         with self._connection.cursor() as c:
diff --git a/tests/integration/resource_manager/V2/test_database.py b/tests/integration/resource_manager/V2/test_database.py
index 4cfe73a7f8..10dcaca76a 100644
--- a/tests/integration/resource_manager/V2/test_database.py
+++ b/tests/integration/resource_manager/V2/test_database.py
@@ -31,19 +31,5 @@ def test_databases_get_many(
     with raises(ValueError):
         rm.databases.get_many(attached_engine_name_contains=engine_name)
 
-    region = [db for db in databases if db.name == database_name][0].region
-
-    # get all databases, with region_eq
-    databases = rm.databases.get_many(region_eq=region)
-    assert len(databases) > 0
-    assert database_name in {db.name for db in databases}
-
-    # get all databases, with all filters
-    kwargs = {
-        "name_contains": database_name,
-        "region_eq": region,
-    }
-
-    databases = rm.databases.get_many(**kwargs)
-    assert len(databases) > 0
-    assert database_name in {db.name for db in databases}
+    with raises(ValueError):
+        rm.databases.get_many(region_eq="us-west-2")
diff --git a/tests/unit/service/conftest.py b/tests/unit/service/conftest.py
index b23ae3e3f6..0759b4609d 100644
--- a/tests/unit/service/conftest.py
+++ b/tests/unit/service/conftest.py
@@ -65,13 +65,8 @@ def mock_database(db_name: str) -> Database:
     return Database(
         name=db_name,
         description="mock_db_description",
-        region="",
-        data_size_full=0,
-        data_size_compressed=0,
         create_time=datetime.now().isoformat(),
         create_actor="",
-        _attached_engine_names="-",
-        _errors="",
         _service=None,
     )
 
@@ -81,13 +76,8 @@ def mock_database_2() -> Database:
     return Database(
         name="database2",
         description="completely different db",
-        region="",
-        data_size_full=0,
-        data_size_compressed=0,
         create_time=datetime.now().isoformat(),
         create_actor="",
-        _attached_engine_names="-",
-        _errors="",
         _service=None,
     )