diff --git a/source/dbconnection.pas b/source/dbconnection.pas
index 18a42303..f1b53473 100644
--- a/source/dbconnection.pas
+++ b/source/dbconnection.pas
@@ -4560,7 +4560,7 @@ function TTableColumn.SQLCode: String;
 var
   IsVirtual: Boolean;
 begin
-  Result := FConnection.QuoteIdent(Name, False) + ' ' +DataType.Name;
+  Result := FConnection.QuoteIdent(Name) + ' ' +DataType.Name;
   IsVirtual := (Expression <> '') and (Virtuality <> '');
   if LengthSet <> '' then
     Result := Result + '(' + LengthSet + ')';
@@ -4625,11 +4625,11 @@ begin
   else begin
     if IndexType <> KEY then
       Result := Result + IndexType + ' ';
-    Result := Result + 'INDEX ' + FConnection.QuoteIdent(Name, False) + ' ';
+    Result := Result + 'INDEX ' + FConnection.QuoteIdent(Name) + ' ';
   end;
   Result := Result + '(';
   for i:=0 to Columns.Count-1 do begin
-    Result := Result + FConnection.QuoteIdent(Columns[i], False);
+    Result := Result + FConnection.QuoteIdent(Columns[i]);
     if SubParts[i] <> '' then
       Result := Result + '(' + SubParts[i] + ')';
     Result := Result + ', ';
@@ -4670,14 +4670,14 @@ begin
   Result := '';
   // Symbol names are unique in a db. In order to autocreate a valid name we leave the constraint clause away.
   if IncludeSymbolName then
-    Result := 'CONSTRAINT '+FConnection.QuoteIdent(KeyName, False)+' ';
+    Result := 'CONSTRAINT '+FConnection.QuoteIdent(KeyName)+' ';
   Result := Result + 'FOREIGN KEY (';
   for i:=0 to Columns.Count-1 do
-    Result := Result + FConnection.QuoteIdent(Columns[i], False) + ', ';
+    Result := Result + FConnection.QuoteIdent(Columns[i]) + ', ';
   if Columns.Count > 0 then Delete(Result, Length(Result)-1, 2);
-  Result := Result + ') REFERENCES ' + FConnection.QuoteIdent(ReferenceTable, False, '.') + ' (';
+  Result := Result + ') REFERENCES ' + FConnection.QuoteIdent(ReferenceTable, True, '.') + ' (';
   for i:=0 to ForeignColumns.Count-1 do
-    Result := Result + FConnection.QuoteIdent(ForeignColumns[i], False) + ', ';
+    Result := Result + FConnection.QuoteIdent(ForeignColumns[i]) + ', ';
   if ForeignColumns.Count > 0 then Delete(Result, Length(Result)-1, 2);
   Result := Result + ')';
   if OnUpdate <> '' then
diff --git a/source/table_editor.pas b/source/table_editor.pas
index 49692179..2b49ad45 100644
--- a/source/table_editor.pas
+++ b/source/table_editor.pas
@@ -467,7 +467,7 @@ var
   begin
     if Specs.Count > 0 then begin
       Query := TSQLSentence.Create;
-      Query.SQL := 'ALTER TABLE '+DBObject.Connection.QuoteIdent(DBObject.Name, False) + CRLF + #9 + ImplodeStr(',' + CRLF + #9, Specs);
+      Query.SQL := 'ALTER TABLE '+DBObject.Connection.QuoteIdent(DBObject.Name) + CRLF + #9 + ImplodeStr(',' + CRLF + #9, Specs);
       Query.SQL := Trim(Query.SQL);
       Result.Add(Query);
       Specs.Clear;
@@ -487,7 +487,7 @@ begin
   //   ALTER TABLE  statement. Separate statements are required."
   for i:=0 to FForeignKeys.Count-1 do begin
     if FForeignKeys[i].Modified and (not FForeignKeys[i].Added) then
-      Specs.Add('DROP FOREIGN KEY '+DBObject.Connection.QuoteIdent(FForeignKeys[i].OldKeyName, False));
+      Specs.Add('DROP FOREIGN KEY '+DBObject.Connection.QuoteIdent(FForeignKeys[i].OldKeyName));
   end;
   AddQuery;
 
@@ -500,12 +500,12 @@ begin
       and (FColumns[i].DefaultType = cdtNothing)
       and (FColumns[i].OldDataType.HasDefault)
       then
-      Specs.Add('ALTER '+DBObject.Connection.QuoteIdent(FColumns[i].OldName, False)+' DROP DEFAULT');
+      Specs.Add('ALTER '+DBObject.Connection.QuoteIdent(FColumns[i].OldName)+' DROP DEFAULT');
   end;
   AddQuery;
 
   if editName.Text <> DBObject.Name then
-    Specs.Add('RENAME TO ' + DBObject.Connection.QuoteIdent(editName.Text, False));
+    Specs.Add('RENAME TO ' + DBObject.Connection.QuoteIdent(editName.Text));
   if memoComment.Tag = ModifiedFlag then
     Specs.Add('COMMENT=' + esc(memoComment.Text));
   if (comboCollation.Tag = ModifiedFlag) or (chkCharsetConvert.Checked) then
@@ -549,7 +549,7 @@ begin
     Mainform.ProgressBarStatus.StepIt;
     Col := listColumns.GetNodeData(Node);
     if Col.Status <> esUntouched then begin
-      ColSpec := DBObject.Connection.QuoteIdent(Col.Name, False);
+      ColSpec := DBObject.Connection.QuoteIdent(Col.Name);
       ColSpec := ColSpec + ' ' + Col.DataType.Name;
       IsVirtual := (Col.Expression <> '') and (Col.Virtuality <> '');
       if Col.LengthSet <> '' then
@@ -583,10 +583,10 @@ begin
         if PreviousCol = nil then
           ColSpec := ColSpec + ' FIRST'
         else
-          ColSpec := ColSpec + ' AFTER '+DBObject.Connection.QuoteIdent(PreviousCol.Name, False);
+          ColSpec := ColSpec + ' AFTER '+DBObject.Connection.QuoteIdent(PreviousCol.Name);
       end;
       if Col.Status = esModified then
-        Specs.Add('CHANGE COLUMN '+DBObject.Connection.QuoteIdent(Col.OldName, False) + ' ' + ColSpec)
+        Specs.Add('CHANGE COLUMN '+DBObject.Connection.QuoteIdent(Col.OldName) + ' ' + ColSpec)
       else if Col.Status in [esAddedUntouched, esAddedModified] then
         Specs.Add('ADD COLUMN ' + ColSpec);
     end;
@@ -597,7 +597,7 @@ begin
   // Deleted columns, not available as Node in above loop
   for i:=0 to FColumns.Count-1 do begin
     if FColumns[i].Status = esDeleted then
-      Specs.Add('DROP COLUMN '+DBObject.Connection.QuoteIdent(FColumns[i].OldName, False));
+      Specs.Add('DROP COLUMN '+DBObject.Connection.QuoteIdent(FColumns[i].OldName));
   end;
 
   // Drop indexes, also changed indexes, which will be readded below
@@ -606,7 +606,7 @@ begin
     if DeletedKeys[i] = PKEY then
       IndexSQL := 'PRIMARY KEY'
     else
-      IndexSQL := 'INDEX ' + DBObject.Connection.QuoteIdent(DeletedKeys[i], False);
+      IndexSQL := 'INDEX ' + DBObject.Connection.QuoteIdent(DeletedKeys[i]);
     Specs.Add('DROP '+IndexSQL);
   end;
   // Add changed or added indexes
@@ -616,7 +616,7 @@ begin
       if FKeys[i].OldIndexType = PKEY then
         IndexSQL := 'PRIMARY KEY'
       else
-        IndexSQL := 'INDEX ' + DBObject.Connection.QuoteIdent(FKeys[i].OldName, False);
+        IndexSQL := 'INDEX ' + DBObject.Connection.QuoteIdent(FKeys[i].OldName);
       Specs.Add('DROP '+IndexSQL);
     end;
     if FKeys[i].Added or FKeys[i].Modified then
@@ -624,7 +624,7 @@ begin
   end;
 
   for i:=0 to DeletedForeignKeys.Count-1 do
-    Specs.Add('DROP FOREIGN KEY '+DBObject.Connection.QuoteIdent(DeletedForeignKeys[i], False));
+    Specs.Add('DROP FOREIGN KEY '+DBObject.Connection.QuoteIdent(DeletedForeignKeys[i]));
   for i:=0 to FForeignKeys.Count-1 do begin
     if FForeignKeys[i].Added or FForeignKeys[i].Modified then
       Specs.Add('ADD '+FForeignKeys[i].SQLCode(True));
@@ -651,7 +651,7 @@ begin
   Result := TSQLBatch.Create;
   Query := TSQLSentence.Create;
   Result.Add(Query);
-  Query.SQL := 'CREATE TABLE '+DBObject.Connection.QuoteIdent(editName.Text, False)+' ('+CRLF;
+  Query.SQL := 'CREATE TABLE '+DBObject.Connection.QuoteIdent(editName.Text)+' ('+CRLF;
   Node := listColumns.GetFirst;
   while Assigned(Node) do begin
     Col := listColumns.GetNodeData(Node);