diff --git a/dbcon/execplan/simplecolumn.cpp b/dbcon/execplan/simplecolumn.cpp
index 206194954..75864892e 100644
--- a/dbcon/execplan/simplecolumn.cpp
+++ b/dbcon/execplan/simplecolumn.cpp
@@ -211,9 +211,9 @@ const string SimpleColumn::data() const
     if (!fData.empty())
         return fData;
     else if (!fTableAlias.empty())
-        return string(fSchemaName + '.' + fTableAlias + '.' + fColumnName);
+        return string("`" + fSchemaName + "`.`" + fTableAlias + "`.`" + fColumnName + "`");
 
-    return string(fSchemaName + '.' + fTableName + '.' + fColumnName);
+    return string("`" + fSchemaName + "`.`" + fTableName + "`.`" + fColumnName + "`");
 }
 
 SimpleColumn& SimpleColumn::operator=(const SimpleColumn& rhs)
diff --git a/dbcon/joblist/crossenginestep.cpp b/dbcon/joblist/crossenginestep.cpp
index d3cef7928..e46e1fe22 100644
--- a/dbcon/joblist/crossenginestep.cpp
+++ b/dbcon/joblist/crossenginestep.cpp
@@ -727,17 +727,17 @@ void CrossEngineStep::setProjectBPP(JobStep* jobStep1, JobStep*)
     else
         fSelectClause += "SELECT ";
 
-    fSelectClause += jobStep1->name();
+    fSelectClause += "`" + jobStep1->name() + "`";
 }
 
 
 string CrossEngineStep::makeQuery()
 {
     ostringstream oss;
-    oss << fSelectClause << " FROM " << fTable;
+    oss << fSelectClause << " FROM `" << fTable << "`";
 
     if (fTable.compare(fAlias) != 0)
-        oss << " " << fAlias;
+        oss << " `" << fAlias << "`";
 
     if (!fWhereClause.empty())
         oss << fWhereClause;