diff --git a/forward_engineering/alterScript/alterScriptHelpers/entityHelpers/alterTableNameHelper.js b/forward_engineering/alterScript/alterScriptHelpers/entityHelpers/alterTableNameHelper.js
index d39adf1..c1770e3 100644
--- a/forward_engineering/alterScript/alterScriptHelpers/entityHelpers/alterTableNameHelper.js
+++ b/forward_engineering/alterScript/alterScriptHelpers/entityHelpers/alterTableNameHelper.js
@@ -5,6 +5,7 @@ const {
 	getSchemaOfAlterCollection,
 	getSchemaNameFromCollection,
 	getNamePrefixedWithSchemaName,
+	wrapInQuotes,
 } = require('../../../utils/general');
 const { assignTemplates } = require('../../../utils/assignTemplates');
 const templates = require('../../../ddlProvider/templates');
@@ -40,10 +41,7 @@ const getRenameTableScriptDtos = collection => {
 	const isContainerActivated = isParentContainerActivated(collection);
 	const isCollectionActivated = isContainerActivated && isObjectInDeltaModelActivated(collection);
 
-	const script = alterTableName(
-		getNamePrefixedWithSchemaName({ name: oldName, schemaName }),
-		getNamePrefixedWithSchemaName({ name: newName, schemaName }),
-	);
+	const script = alterTableName(getNamePrefixedWithSchemaName({ name: oldName, schemaName }), wrapInQuotes(newName));
 
 	return [AlterScriptDto.getInstance([script], isCollectionActivated, false)];
 };
diff --git a/shared/Db2Client/src/main/java/org/db2/Db2Service.java b/shared/Db2Client/src/main/java/org/db2/Db2Service.java
index 55b7aec..1062443 100644
--- a/shared/Db2Client/src/main/java/org/db2/Db2Service.java
+++ b/shared/Db2Client/src/main/java/org/db2/Db2Service.java
@@ -74,7 +74,7 @@ public int applyScript(String script) throws SQLException {
 	}
 
 	private String removeComments(String script) {
-		return script.replaceAll("(?s)(?m)(?<=\\n)(?:/\\*.*?\\*/|--.*?$)(?=\\n)", "");
+		return script.replaceAll("(?s)(?m)(?:^|(?<=\\n))(?:/\\*.*?\\*/|--.*?)(?=\\n|$)", "");
 	}
 
 	private String[] splitStatements(String query) {
diff --git a/shared/addons/Db2Client.jar b/shared/addons/Db2Client.jar
index 62923b8..b44c3d6 100644
Binary files a/shared/addons/Db2Client.jar and b/shared/addons/Db2Client.jar differ