diff --git a/spring-data-jdbc/src/main/java/org/springframework/data/jdbc/core/mapping/schema/LiquibaseChangeSetWriter.java b/spring-data-jdbc/src/main/java/org/springframework/data/jdbc/core/mapping/schema/LiquibaseChangeSetWriter.java
index ab70d153c..504688fd3 100644
--- a/spring-data-jdbc/src/main/java/org/springframework/data/jdbc/core/mapping/schema/LiquibaseChangeSetWriter.java
+++ b/spring-data-jdbc/src/main/java/org/springframework/data/jdbc/core/mapping/schema/LiquibaseChangeSetWriter.java
@@ -336,7 +336,7 @@ public class LiquibaseChangeSetWriter {
 		Tables existingTables = getLiquibaseModel(database);
 		Stream<? extends RelationalPersistentEntity<?>> entities = mappingContext.getPersistentEntities().stream()
 				.filter(schemaFilter);
-		Tables mappedEntities = Tables.from(entities, sqlTypeMapping, database.getDefaultCatalogName(), mappingContext);
+		Tables mappedEntities = Tables.from(entities, sqlTypeMapping, database.getDefaultSchemaName(), mappingContext);
 
 		return SchemaDiff.diff(mappedEntities, existingTables, nameComparator);
 	}
@@ -462,7 +462,7 @@ public class LiquibaseChangeSetWriter {
 				continue;
 			}
 
-			Table tableModel = new Table(table.getSchema().getCatalogName(), table.getName());
+			Table tableModel = new Table(table.getSchema().getName(), table.getName());
 
 			List<liquibase.structure.core.Column> columns = table.getColumns();