diff --git a/ChangeLog b/ChangeLog
index e98162e1..fb7e6a4d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -21515,3 +21515,7 @@
 	* Escaped all SQL identifiers in 'rdlogin/'.
 	* Replaced " with ' delimiters in all SQL literal strings in
 	'rdlogin/'.
+2021-04-19 Fred Gleason <fredg@paravelsystems.com>
+	* Escaped all SQL identifiers in 'rdlogmanager/'.
+	* Replaced " with ' delimiters in all SQL literal strings in
+	'rdlogmanager/'.
diff --git a/rdlogmanager/clocklistmodel.cpp b/rdlogmanager/clocklistmodel.cpp
index df13119b..fbab9e73 100644
--- a/rdlogmanager/clocklistmodel.cpp
+++ b/rdlogmanager/clocklistmodel.cpp
@@ -207,8 +207,9 @@ void ClockListModel::refresh(const QModelIndex &row)
   if(row.row()<d_texts.size()) {
     QString sql=sqlFields()+
       "where "+
-      "CLOCKS.NAME=\""+RDEscapeString(d_texts.at(row.row()).at(0).toString())+
-      "\"";
+      "`CLOCKS`.`NAME`='"+
+      RDEscapeString(d_texts.at(row.row()).at(0).toString())+
+      "'";
     RDSqlQuery *q=new RDSqlQuery(sql);
     if(q->first()) {
       updateRow(row.row(),q);
@@ -247,7 +248,7 @@ void ClockListModel::updateModel()
   RDSqlQuery *q=NULL;
   QString sql=sqlFields()+
     d_filter_sql+
-    "order by CLOCKS.NAME ";
+    "order by `CLOCKS`.`NAME` ";
   beginResetModel();
   d_texts.clear();
   d_icons.clear();
@@ -267,7 +268,7 @@ void ClockListModel::updateRowLine(int line)
   if(line<d_texts.size()) {
     QString sql=sqlFields()+
       "where "+
-      "CLOCKS.NAME=\""+RDEscapeString(d_texts.at(line).at(0).toString())+"\"";
+      "`CLOCKS`.`NAME`='"+RDEscapeString(d_texts.at(line).at(0).toString())+"'";
     RDSqlQuery *q=new RDSqlQuery(sql);
     if(q->first()) {
       updateRow(line,q);
@@ -295,10 +296,10 @@ void ClockListModel::updateRow(int row,RDSqlQuery *q)
 QString ClockListModel::sqlFields() const
 {
   QString sql=QString("select ")+
-    "NAME,"+        // 00
-    "SHORT_NAME,"+  // 01
-    "COLOR "+       // 02
-    "from CLOCKS ";
+    "`NAME`,"+        // 00
+    "`SHORT_NAME`,"+  // 01
+    "`COLOR` "+       // 02
+    "from `CLOCKS` ";
 
     return sql;
 }
diff --git a/rdlogmanager/edit_clock.cpp b/rdlogmanager/edit_clock.cpp
index 7f2f34ef..f9b6293d 100644
--- a/rdlogmanager/edit_clock.cpp
+++ b/rdlogmanager/edit_clock.cpp
@@ -447,8 +447,8 @@ void EditClock::saveAsData()
     return;
   }
   sql=
-    QString("select SHORT_NAME from CLOCKS where ")+
-    "SHORT_NAME=\""+RDEscapeString(edit_shortname_edit->text())+"\"";
+    QString("select `SHORT_NAME` from `CLOCKS` where ")+
+    "`SHORT_NAME`='"+RDEscapeString(edit_shortname_edit->text())+"'";
   q=new RDSqlQuery(sql);
   if(q->first()) {
     QMessageBox::warning(this,tr("Code Exists"),
@@ -465,8 +465,8 @@ void EditClock::saveAsData()
   }
   delete addclock;
   edit_name=clockname;
-  sql=QString("select NAME from CLOCKS where ")+
-    "NAME=\""+RDEscapeString(clockname)+"\"";
+  sql=QString("select `NAME` from `CLOCKS` where ")+
+    "`NAME`='"+RDEscapeString(clockname)+"'";
   q=new RDSqlQuery(sql);
   if(q->first()) {
     if(QMessageBox::question(this,tr("Clock Exists"),
@@ -654,17 +654,15 @@ void EditClock::CopyClockPerms(QString old_name,QString new_name)
 {
   QString sql;
   RDSqlQuery *q;
-  RDSqlQuery *q1;
 
-  sql=QString("select SERVICE_NAME from CLOCK_PERMS where ")+
-    "CLOCK_NAME=\""+RDEscapeString(old_name)+"\"";
+  sql=QString("select `SERVICE_NAME` from `CLOCK_PERMS` where ")+
+    "`CLOCK_NAME`='"+RDEscapeString(old_name)+"'";
   q=new RDSqlQuery(sql);
   while(q->next()) {
-    sql=QString("insert into CLOCK_PERMS set ")+
-      "CLOCK_NAME=\""+RDEscapeString(new_name)+"\","+
-      "SERVICE_NAME=\""+RDEscapeString(q->value(0).toString())+"\"";
-    q1=new RDSqlQuery(sql);
-    delete q1;
+    sql=QString("insert into `CLOCK_PERMS` set ")+
+      "`CLOCK_NAME`='"+RDEscapeString(new_name)+"',"+
+      "`SERVICE_NAME`='"+RDEscapeString(q->value(0).toString())+"'";
+    RDSqlQuery::apply(sql);
   }
   delete q;
 }
@@ -675,11 +673,11 @@ void EditClock::AbandonClock(QString name)
   if(name==edit_name) {
     return;
   }
-  QString sql=QString("delete from CLOCKS where ")+
-    "NAME=\""+RDEscapeString(name)+"\"";
+  QString sql=QString("delete from `CLOCKS` where ")+
+    "`NAME`='"+RDEscapeString(name)+"'";
   RDSqlQuery::apply(sql);
-  sql=QString("delete from CLOCK_LINES where ")+
-    "CLOCK_NAME=\""+RDEscapeString(name)+"\"";
+  sql=QString("delete from `CLOCK_LINES` where ")+
+    "`CLOCK_NAME`='"+RDEscapeString(name)+"'";
   RDSqlQuery::apply(sql);
 }
 
@@ -691,9 +689,9 @@ bool EditClock::ValidateCode()
 			     tr("You must provide a clock code!"));
     return false;
   }
-  QString sql=QString("select SHORT_NAME from CLOCKS where ")+
-    "(SHORT_NAME=\""+RDEscapeString(edit_shortname_edit->text())+"\")&&"+
-    "(NAME!=\""+RDEscapeString(edit_name)+"\")";
+  QString sql=QString("select `SHORT_NAME` from `CLOCKS` where ")+
+    "(`SHORT_NAME`='"+RDEscapeString(edit_shortname_edit->text())+"')&&"+
+    "(`NAME`!='"+RDEscapeString(edit_name)+"')";
   RDSqlQuery *q=new RDSqlQuery(sql);
   if(q->next()) {
     QMessageBox::information(this,"RDLogManager - "+tr("Duplicate Code"),
diff --git a/rdlogmanager/edit_event.cpp b/rdlogmanager/edit_event.cpp
index a1c00362..7016703a 100644
--- a/rdlogmanager/edit_event.cpp
+++ b/rdlogmanager/edit_event.cpp
@@ -157,12 +157,12 @@ EditEvent::EditEvent(QString eventname,bool new_event,
   RDSqlQuery *q;
   event_player = NULL;
   sql=QString("select ")+
-    "OUTPUT_CARD,"+  // 00
-    "OUTPUT_PORT,"+  // 01
-    "START_CART,"+   // 02
-    "END_CART "+     // 03
-    "from RDLOGEDIT where "+
-    "STATION=\""+RDEscapeString(rda->station()->name())+"\"";
+    "`OUTPUT_CARD`,"+  // 00
+    "`OUTPUT_PORT`,"+  // 01
+    "`START_CART`,"+   // 02
+    "`END_CART` "+     // 03
+    "from `RDLOGEDIT` where "+
+    "`STATION`='"+RDEscapeString(rda->station()->name())+"'";
   q=new RDSqlQuery(sql);
   if(q->first()) {
     event_player=
@@ -561,7 +561,7 @@ EditEvent::EditEvent(QString eventname,bool new_event,
   event_have_code_box->insertItem(tr("[None]"));
   event_have_code2_box->insertItem(tr("[None]"));
 
-  sql2="select CODE from SCHED_CODES order by CODE";
+  sql2="select `CODE` from `SCHED_CODES` order by `CODE`";
   q2=new RDSqlQuery(sql2);
   while(q2->next()) {
     event_have_code_box->insertItem(q2->value(0).toString());
@@ -811,9 +811,9 @@ EditEvent::EditEvent(QString eventname,bool new_event,
     event_color_button->setPalette(QPalette(color,palette().color(QPalette::Background)));
   }
   QString str=event_event->nestedEvent();
-  sql=QString("select NAME from EVENTS where ")+
-    "NAME!=\""+RDEscapeString(eventname)+"\""+
-    "order by NAME";
+  sql=QString("select `NAME` from `EVENTS` where ")+
+    "`NAME`!='"+RDEscapeString(eventname)+"'"+
+    "order by `NAME`";
   q=new RDSqlQuery(sql);
   while(q->next()) {
     event_nestevent_box->insertItem(event_nestevent_box->count(),
@@ -1147,8 +1147,8 @@ void EditEvent::saveAsData()
     return;
   }
   delete add_dialog;
-  QString sql=QString("select NAME from EVENTS where ")+
-    "NAME=\""+RDEscapeString(event_name)+"\"";
+  QString sql=QString("select `NAME` from `EVENTS` where ")+
+    "`NAME`='"+RDEscapeString(event_name)+"'";
   RDSqlQuery *q=new RDSqlQuery(sql);
   if(!q->first()) {
     delete event_event;
@@ -1173,8 +1173,8 @@ void EditEvent::saveAsData()
     event_event=new RDEvent(event_name,true);
     Save();
     event_new_events->push_back(event_name);
-    sql=QString("delete from EVENT_PERMS where ")+
-      "EVENT_NAME=\""+RDEscapeString(event_name)+"\"";
+    sql=QString("delete from `EVENT_PERMS` where ")+
+      "`EVENT_NAME`='"+RDEscapeString(event_name)+"'";
     q=new RDSqlQuery(sql);
     delete q;
     CopyEventPerms(old_name,event_name);
@@ -1406,13 +1406,13 @@ void EditEvent::CopyEventPerms(QString old_name,QString new_name)
   RDSqlQuery *q;
   RDSqlQuery *q1;
 
-  sql=QString("select SERVICE_NAME from EVENT_PERMS where ")+
-    "EVENT_NAME=\""+RDEscapeString(old_name)+"\"";
+  sql=QString("select `SERVICE_NAME` from `EVENT_PERMS` where ")+
+    "`EVENT_NAME`='"+RDEscapeString(old_name)+"'";
   q=new RDSqlQuery(sql);
   while(q->next()) {
-    sql=QString("insert into EVENT_PERMS set ")+
-      "EVENT_NAME=\""+RDEscapeString(new_name)+"\","+
-      "SERVICE_NAME=\""+RDEscapeString(q->value(0).toString())+"\"";
+    sql=QString("insert into `EVENT_PERMS` set ")+
+      "`EVENT_NAME`='"+RDEscapeString(new_name)+"',"+
+      "`SERVICE_NAME`='"+RDEscapeString(q->value(0).toString())+"'";
     q1=new RDSqlQuery(sql);
     delete q1;
   }
@@ -1425,16 +1425,16 @@ void EditEvent::AbandonEvent(QString name)
   if(name==event_name) {
     return;
   }
-  QString sql=QString("delete from EVENTS where ")+
-    "NAME=\""+RDEscapeString(name)+"\"";
+  QString sql=QString("delete from `EVENTS` where ")+
+    "`NAME`='"+RDEscapeString(name)+"'";
   RDSqlQuery *q=new RDSqlQuery(sql);
   delete q;
-  sql=QString("delete from EVENT_PERMS where ")+
-    "EVENT_NAME=\""+RDEscapeString(name)+"\"";
+  sql=QString("delete from `EVENT_PERMS` where ")+
+    "`EVENT_NAME`='"+RDEscapeString(name)+"'";
   q=new RDSqlQuery(sql);
   delete q;
 
-  sql=QString("delete from EVENT_LINES where ")+
-    "EVENT_NAME=\""+RDEscapeString(name)+"\"";
+  sql=QString("delete from `EVENT_LINES` where ")+
+    "`EVENT_NAME`='"+RDEscapeString(name)+"'";
   RDSqlQuery::apply(sql);
 }
diff --git a/rdlogmanager/edit_grid.cpp b/rdlogmanager/edit_grid.cpp
index e6ce5923..34cad0d0 100644
--- a/rdlogmanager/edit_grid.cpp
+++ b/rdlogmanager/edit_grid.cpp
@@ -144,16 +144,16 @@ void EditGrid::hourButtonData(int id)
   }
   delete listclocks;
   current_clockname=clockname;
-  QString sql=QString("update SERVICE_CLOCKS set ");
+  QString sql=QString("update `SERVICE_CLOCKS` set ");
   if(clockname.isEmpty()) {
-    sql+="CLOCK_NAME=null ";
+    sql+="`CLOCK_NAME`=null ";
   }
   else {
-    sql+="CLOCK_NAME=\""+RDEscapeString(clockname)+"\" ";
+    sql+="`CLOCK_NAME`='"+RDEscapeString(clockname)+"' ";
   }
   sql+=QString("where ")+
-    "(SERVICE_NAME=\""+RDEscapeString(edit_servicename)+"\")&&"+
-    QString().sprintf("(HOUR=%d)",id);
+    "(`SERVICE_NAME`='"+RDEscapeString(edit_servicename)+"')&&"+
+    QString().sprintf("(`HOUR`=%d)",id);
   RDSqlQuery *q=new RDSqlQuery(sql);
   delete q;
   LabelButton(dayofweek,hour,clockname);
@@ -172,9 +172,9 @@ void EditGrid::allHourButtonData()
   if(QMessageBox::question(this,"RDLogManager - "+tr("Clear Clocks"),
 			   tr("Are you sure you want to update ALL clocks in the grid?")+"\n"+tr("This operation cannot be undone!"),QMessageBox::Yes,QMessageBox::No)==QMessageBox::Yes) {
     for(int id=0;id<168;id++) {
-      QString sql=QString("update SERVICE_CLOCKS set ")+
-	"CLOCK_NAME=\""+RDEscapeString(clockname)+"\" where "+
-	"SERVICE_NAME=\""+RDEscapeString(edit_servicename)+"\"";
+      QString sql=QString("update `SERVICE_CLOCKS` set ")+
+	"`CLOCK_NAME`='"+RDEscapeString(clockname)+"' where "+
+	"`SERVICE_NAME`='"+RDEscapeString(edit_servicename)+"'";
       RDSqlQuery *q=new RDSqlQuery(sql);
       delete q;
       int dayofweek=id/24+1;
@@ -236,8 +236,8 @@ void EditGrid::clearHourData()
   int dayofweek=edit_rightclick_id/24+1;
   int hour=edit_rightclick_id-24*(dayofweek-1);
 
-  QString sql=QString("update SERVICE_CLOCKS set CLOCK_NAME=null where ")+
-    "(SERVICE_NAME=\""+RDEscapeString(edit_servicename)+"\")&&"+
+  QString sql=QString("update `SERVICE_CLOCKS` set `CLOCK_NAME`=null where ")+
+    "(`SERVICE_NAME`='"+RDEscapeString(edit_servicename)+"')&&"+
     QString().sprintf("(HOUR=%d)",(dayofweek-1)*24+hour);
   RDSqlQuery *q=new RDSqlQuery(sql);
   delete q;
@@ -273,10 +273,10 @@ void EditGrid::LabelButton(int dayofweek,int hour,QString clockname)
   QColor color=palette().color(QPalette::Background);
 
   QString sql=QString("select ")+
-    "SHORT_NAME,"+  // 00
-    "COLOR "+       // 01
-    "from CLOCKS where "+
-    "NAME=\""+RDEscapeString(clockname)+"\"";
+    "`SHORT_NAME`,"+  // 00
+    "`COLOR` "+       // 01
+    "from `CLOCKS` where "+
+    "`NAME`='"+RDEscapeString(clockname)+"'";
   RDSqlQuery *q=new RDSqlQuery(sql);
   if(q->first()) {
     code=q->value(0).toString();
@@ -293,9 +293,9 @@ void EditGrid::LabelButton(int dayofweek,int hour,QString clockname)
 
 QString EditGrid::GetClock(int dayofweek,int hour)
 {
-  QString sql=QString("select CLOCK_NAME from SERVICE_CLOCKS where ")+
-    "(SERVICE_NAME=\""+RDEscapeString(edit_servicename)+"\")&&"+
-    QString().sprintf("(HOUR=%d)",24*(dayofweek-1)+hour);
+  QString sql=QString("select `CLOCK_NAME` from `SERVICE_CLOCKS` where ")+
+    "(`SERVICE_NAME`='"+RDEscapeString(edit_servicename)+"')&&"+
+    QString().sprintf("(`HOUR`=%d)",24*(dayofweek-1)+hour);
 
   RDSqlQuery *q=new RDSqlQuery(sql);
   if(q->first()) {
diff --git a/rdlogmanager/edit_perms.cpp b/rdlogmanager/edit_perms.cpp
index 7cdf858f..fe86e6bb 100644
--- a/rdlogmanager/edit_perms.cpp
+++ b/rdlogmanager/edit_perms.cpp
@@ -2,7 +2,7 @@
 //
 // Edit RDLogManager Service Associations
 //
-//   (C) Copyright 2002-2019 Fred Gleason <fredg@paravelsystems.com>
+//   (C) Copyright 2002-2021 Fred Gleason <fredg@paravelsystems.com>
 //
 //   This program is free software; you can redistribute it and/or modify
 //   it under the terms of the GNU General Public License version 2 as
@@ -80,14 +80,14 @@ EditPerms::EditPerms(QString object_name,ObjectType type,QWidget *parent)
     break;
   }
   sql=QString("select ")+
-    "SERVICE_NAME from "+object_type+"_PERMS where "+
-    object_type+"_NAME=\""+RDEscapeString(object_name)+"\"";
+    "SERVICE_NAME from `"+object_type+"_PERMS` where `"+
+    object_type+"_NAME`='"+RDEscapeString(object_name)+"'";
   q=new RDSqlQuery(sql);
   while(q->next()) {
     svc_object_sel->destInsertItem(q->value(0).toString());
   }
   delete q;
-  sql=QString().sprintf("select NAME from SERVICES");
+  sql=QString().sprintf("select `NAME` from `SERVICES`");
   q=new RDSqlQuery(sql);
   while(q->next()) {
     if(svc_object_sel->destFindItem(q->value(0).toString())==0) {
@@ -124,18 +124,17 @@ void EditPerms::okData()
   // Add New Objects
   //
   for(unsigned i=0;i<svc_object_sel->destCount();i++) {
-    sql=QString("select ")+object_type+"_NAME from "+
-      object_type+"_PERMS where "+
-      "SERVICE_NAME=\""+RDEscapeString(svc_object_sel->destText(i))+"\" && "+
-      object_type+"_NAME=\""+RDEscapeString(sel_name)+"\"";
+    sql=QString("select `")+object_type+"_NAME` from `"+
+      object_type+"_PERMS` where "+
+      "`SERVICE_NAME`='"+RDEscapeString(svc_object_sel->destText(i))+"' && `"+
+      object_type+"_NAME`='"+RDEscapeString(sel_name)+"'";
     q=new RDSqlQuery(sql);
     if(q->size()==0) {
-      delete q;
-      sql=QString("insert into ")+object_type+"_PERMS "+
-	"(SERVICE_NAME,"+object_type+"_NAME) "+
-	"values (\""+RDEscapeString(svc_object_sel->destText(i))+"\","+
-	"\""+RDEscapeString(sel_name)+"\")";
-      q=new RDSqlQuery(sql);
+      sql=QString("insert into `")+object_type+"_PERMS` "+
+	"(`SERVICE_NAME`,`"+object_type+"_NAME`) "+
+	"values ('"+RDEscapeString(svc_object_sel->destText(i))+"',"+
+	"'"+RDEscapeString(sel_name)+"')";
+      RDSqlQuery::apply(sql);
     }
     delete q;
   }
@@ -143,12 +142,12 @@ void EditPerms::okData()
   //
   // Delete Old Hosts
   //
-  sql=QString("delete from ")+
-    object_type+"_PERMS where "+
-    object_type+"_NAME=\""+RDEscapeString(sel_name)+"\"";
+  sql=QString("delete from `")+
+    object_type+"_PERMS` where `"+
+    object_type+"_NAME`='"+RDEscapeString(sel_name)+"'";
   for(unsigned i=0;i<svc_object_sel->destCount();i++) {
-    sql+=QString(" && SERVICE_NAME<>\"")+
-      RDEscapeString(svc_object_sel->destText(i))+"\"";
+    sql+=QString(" && `SERVICE_NAME`<>'")+
+      RDEscapeString(svc_object_sel->destText(i))+"'";
   }
   q=new RDSqlQuery(sql);
   delete q;
diff --git a/rdlogmanager/edit_schedcoderules.cpp b/rdlogmanager/edit_schedcoderules.cpp
index 21536490..d61b22b2 100644
--- a/rdlogmanager/edit_schedcoderules.cpp
+++ b/rdlogmanager/edit_schedcoderules.cpp
@@ -126,16 +126,16 @@ int EditSchedCodeRules::exec(unsigned rule_id)
   edit_rule_id=rule_id;
 
   QString sql=QString("select ")+
-    "RULE_LINES.CODE,"+          // 00
-    "SCHED_CODES.DESCRIPTION,"+  // 01
-    "RULE_LINES.MAX_ROW,"+       // 01
-    "RULE_LINES.MIN_WAIT,"+      // 02
-    "RULE_LINES.NOT_AFTER,"+     // 03
-    "RULE_LINES.OR_AFTER,"+      // 04
-    "RULE_LINES.OR_AFTER_II "+   // 05
-    "from RULE_LINES left join SCHED_CODES "+
-    "on RULE_LINES.CODE=SCHED_CODES.CODE "+
-    QString().sprintf("where RULE_LINES.ID=%u",rule_id);
+    "`RULE_LINES.CODE`,"+          // 00
+    "`SCHED_CODES.DESCRIPTION`,"+  // 01
+    "`RULE_LINES.MAX_ROW`,"+       // 01
+    "`RULE_LINES.MIN_WAIT`,"+      // 02
+    "`RULE_LINES.NOT_AFTER`,"+     // 03
+    "`RULE_LINES.OR_AFTER`,"+      // 04
+    "`RULE_LINES.OR_AFTER_II` "+   // 05
+    "from `RULE_LINES` left join `SCHED_CODES` "+
+    "on `RULE_LINES`.`CODE`=`SCHED_CODES`.`CODE` "+
+    QString().sprintf("where `RULE_LINES`.`ID`=%u",rule_id);
   RDSqlQuery *q=new RDSqlQuery(sql);
   if(q->first()) {
     if(q->value(1).toString().isEmpty()) {
@@ -166,13 +166,13 @@ void EditSchedCodeRules::okData()
 {
   QStringList codes;
   QStringList fields;
-  fields.push_back("NOT_AFTER");
-  fields.push_back("OR_AFTER");
-  fields.push_back("OR_AFTER_II");
+  fields.push_back("`NOT_AFTER`");
+  fields.push_back("`OR_AFTER`");
+  fields.push_back("`OR_AFTER_II`");
 
-  QString sql=QString("update RULE_LINES set ")+
-    QString().sprintf("MAX_ROW=%u,",edit_max_row_spin->value())+
-    QString().sprintf("MIN_WAIT=%u,",edit_min_wait_spin->value());
+  QString sql=QString("update `RULE_LINES` set ")+
+    QString().sprintf("`MAX_ROW`=%u,",edit_max_row_spin->value())+
+    QString().sprintf("`MIN_WAIT`=%u,",edit_min_wait_spin->value());
   for(int i=0;i<3;i++) {
     if(edit_notafter_boxes[i]->currentText()!=tr("[none]")&&
        (!codes.contains(edit_notafter_boxes[i]->currentText()))) {
@@ -190,7 +190,7 @@ void EditSchedCodeRules::okData()
     }
   }
   sql=sql.left(sql.length()-1);
-  sql+=QString().sprintf(" where ID=%u",edit_rule_id);
+  sql+=QString().sprintf(" where `ID`=%u",edit_rule_id);
   RDSqlQuery::apply(sql);
 
   done(true);
diff --git a/rdlogmanager/eventlistmodel.cpp b/rdlogmanager/eventlistmodel.cpp
index a6f58577..908fb45b 100644
--- a/rdlogmanager/eventlistmodel.cpp
+++ b/rdlogmanager/eventlistmodel.cpp
@@ -199,7 +199,8 @@ void EventListModel::refresh(const QModelIndex &row)
   if(row.row()<d_texts.size()) {
     QString sql=sqlFields()+
       "where "+
-      "EVENTS.NAME=\""+RDEscapeString(d_texts.at(row.row()).at(0).toString())+
+      "`EVENTS`.`NAME`=\""+
+      RDEscapeString(d_texts.at(row.row()).at(0).toString())+
       "\"";
     RDSqlQuery *q=new RDSqlQuery(sql);
     if(q->first()) {
@@ -239,7 +240,7 @@ void EventListModel::updateModel()
   RDSqlQuery *q=NULL;
   QString sql=sqlFields()+
     d_filter_sql+
-    "order by EVENTS.NAME ";
+    "order by `EVENTS`.`NAME` ";
   beginResetModel();
   d_texts.clear();
   d_icons.clear();
@@ -259,7 +260,8 @@ void EventListModel::updateRowLine(int line)
   if(line<d_texts.size()) {
     QString sql=sqlFields()+
       "where "+
-      "EVENTS.NAME=\""+RDEscapeString(d_texts.at(line).at(0).toString())+"\"";
+      "`EVENTS`.`NAME`=\""+
+      RDEscapeString(d_texts.at(line).at(0).toString())+"\"";
     RDSqlQuery *q=new RDSqlQuery(sql);
     if(q->first()) {
       updateRow(line,q);
@@ -297,16 +299,16 @@ void EventListModel::updateRow(int row,RDSqlQuery *q)
 QString EventListModel::sqlFields() const
 {
   QString sql=QString("select ")+
-    "NAME,"+              // 00
-    "COLOR,"+             // 01
-    "PREPOSITION,"+       // 02
-    "FIRST_TRANS_TYPE,"+  // 03
-    "TIME_TYPE,"+         // 04
-    "GRACE_TIME,"+        // 05
-    "USE_AUTOFILL,"+      // 06
-    "IMPORT_SOURCE,"+     // 07
-    "NESTED_EVENT "+      // 08
-    "from EVENTS ";
+    "`NAME`,"+              // 00
+    "`COLOR`,"+             // 01
+    "`PREPOSITION`,"+       // 02
+    "`FIRST_TRANS_TYPE`,"+  // 03
+    "`TIME_TYPE`,"+         // 04
+    "`GRACE_TIME`,"+        // 05
+    "`USE_AUTOFILL`,"+      // 06
+    "`IMPORT_SOURCE`,"+     // 07
+    "`NESTED_EVENT` "+      // 08
+    "from `EVENTS` ";
 
     return sql;
 }
diff --git a/rdlogmanager/generate_log.cpp b/rdlogmanager/generate_log.cpp
index 9a6a6b85..d596a5cc 100644
--- a/rdlogmanager/generate_log.cpp
+++ b/rdlogmanager/generate_log.cpp
@@ -70,7 +70,7 @@ GenerateLog::GenerateLog(QWidget *parent,int cmd_switch,QString *cmd_service,
   gen_service_label->setFont(labelFont());
   gen_service_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter);
 
-  QString sql="select NAME from SERVICES";
+  QString sql="select `NAME` from `SERVICES`";
   RDSqlQuery *q=new RDSqlQuery(sql);
   while(q->next()) {
     services_list.append( q->value(0).toString() );
diff --git a/rdlogmanager/importcartsmodel.cpp b/rdlogmanager/importcartsmodel.cpp
index ee0557e1..8ac7618d 100644
--- a/rdlogmanager/importcartsmodel.cpp
+++ b/rdlogmanager/importcartsmodel.cpp
@@ -262,11 +262,11 @@ void ImportCartsModel::setCartNumber(const QModelIndex &row,unsigned cartnum)
     int total_len=totalLength();
     d_texts[row.row()][0]=QString().sprintf("%06u",cartnum);
     QString sql=QString("select ")+
-      "NUMBER "          // 00
-      "TYPE,"+           // 01
-      "FORCED_LENGTH "+  // 02
-      "from CART where "+
-      QString().sprintf("NUMBER=%u",cartnum);
+      "`NUMBER`,"          // 00
+      "`TYPE`,"+           // 01
+      "`FORCED_LENGTH` "+  // 02
+      "from `CART` where "+
+      QString().sprintf("`NUMBER`=%u",cartnum);
     RDSqlQuery *q=new RDSqlQuery(sql);
     if(q->first()) {
       d_texts[row.row()][3]=q->value(0);
@@ -334,9 +334,9 @@ int ImportCartsModel::lineCount() const
 
 void ImportCartsModel::save(RDLogLine::TransType first_trans)
 {
-  QString sql=QString("delete from EVENT_LINES where ")+
-    "EVENT_NAME=\""+RDEscapeString(d_event_name)+"\" && "+
-    QString().sprintf("TYPE=%u",d_import_type);
+  QString sql=QString("delete from `EVENT_LINES` where ")+
+    "`EVENT_NAME`='"+RDEscapeString(d_event_name)+"' && "+
+    QString().sprintf("`TYPE`=%u",d_import_type);
   RDSqlQuery::apply(sql);
 
   for(int i=0;i<lineCount();i++) {
@@ -345,29 +345,29 @@ void ImportCartsModel::save(RDLogLine::TransType first_trans)
     if(trans==RDLogLine::NoTrans) {
       trans=RDLogLine::Play;
     }
-    sql=QString("insert into EVENT_LINES set ")+
-      "EVENT_NAME=\""+RDEscapeString(d_event_name)+"\","+\
-      QString().sprintf("TYPE=%u,",d_import_type)+
-      QString().sprintf("COUNT=%d,",i)+
-      QString().sprintf("EVENT_TYPE=%u,",d_event_types.at(i));
+    sql=QString("insert into `EVENT_LINES` set ")+
+      "`EVENT_NAME`='"+RDEscapeString(d_event_name)+"',"+\
+      QString().sprintf("`TYPE`=%u,",d_import_type)+
+      QString().sprintf("`COUNT`=%d,",i)+
+      QString().sprintf("`EVENT_TYPE`=%u,",d_event_types.at(i));
     if((i==0)&&(first_trans!=RDLogLine::NoTrans)) {
-      sql+=QString().sprintf("TRANS_TYPE=%u,",first_trans);
+      sql+=QString().sprintf("`TRANS_TYPE`=%u,",first_trans);
     }
     else {
-      sql+=QString().sprintf("TRANS_TYPE=%u,",d_trans_types.at(i));
+      sql+=QString().sprintf("`TRANS_TYPE`=%u,",d_trans_types.at(i));
     }
     switch(d_event_types.at(i)) {
     case RDLogLine::Cart:
     case RDLogLine::Macro:
       sql+=QString().
-	sprintf("CART_NUMBER=%u,",d_texts.at(i).at(0).toString().toUInt())+
-	"MARKER_COMMENT=null";
+	sprintf("`CART_NUMBER`=%u,",d_texts.at(i).at(0).toString().toUInt())+
+	"`MARKER_COMMENT`=null";
       break;
 
     case RDLogLine::Marker:
     case RDLogLine::Track:
-      sql+=QString("CART_NUMBER=null,")+
-	"MARKER_COMMENT=\""+RDEscapeString(d_marker_comments.at(i))+"\"";
+      sql+=QString("`CART_NUMBER`=null,")+
+	"`MARKER_COMMENT`='"+RDEscapeString(d_marker_comments.at(i))+"'";
       break;
 
     case RDLogLine::MusicLink:
@@ -472,9 +472,9 @@ void ImportCartsModel::updateModel()
   //
   d_group_colors.clear();
   QString sql=QString("select ")+
-    "NAME,"+   // 00
-    "COLOR "+  // 01
-    "from GROUPS order by NAME";
+    "`NAME`,"+   // 00
+    "`COLOR` "+  // 01
+    "from `GROUPS` order by `NAME`";
   RDSqlQuery *q=new RDSqlQuery(sql);
   while(q->next()) {
     d_group_colors[q->value(0).toString()]=QColor(q->value(1).toString());
@@ -485,9 +485,9 @@ void ImportCartsModel::updateModel()
   QList<QVariant> icons;
 
   sql=sqlFields()+"where "+
-    "EVENT_LINES.EVENT_NAME=\""+RDEscapeString(d_event_name)+"\" && "+
-    QString().sprintf("EVENT_LINES.TYPE=%u ",d_import_type)+
-    "order by EVENT_LINES.COUNT ";
+    "`EVENT_LINES`.`EVENT_NAME`='"+RDEscapeString(d_event_name)+"' && "+
+    QString().sprintf("`EVENT_LINES`.`TYPE`=%u ",d_import_type)+
+    "order by `EVENT_LINES`.`COUNT` ";
   beginResetModel();
   d_marker_comments.clear();
   d_texts.clear();
@@ -608,19 +608,19 @@ void ImportCartsModel::updateRow(int row,RDSqlQuery *q)
 QString ImportCartsModel::sqlFields() const
 {
   QString sql=QString("select ")+
-    "EVENT_LINES.ID,"+              // 00
-    "EVENT_LINES.EVENT_TYPE,"+      // 01
-    "EVENT_LINES.CART_NUMBER,"+     // 02
-    "CART.GROUP_NAME,"+             // 03
-    "GROUPS.COLOR,"+                // 04
-    "CART.FORCED_LENGTH,"+          // 05
-    "CART.TITLE,"+                  // 06
-    "EVENT_LINES.TRANS_TYPE,"+      // 07
-    "EVENT_LINES.MARKER_COMMENT "+  // 08
-    "from EVENT_LINES left join CART "+
-    "on EVENT_LINES.CART_NUMBER=CART.NUMBER "+
-    "left join GROUPS "+
-    "on CART.GROUP_NAME=GROUPS.NAME ";
+    "`EVENT_LINES`.`ID`,"+              // 00
+    "`EVENT_LINES`.`EVENT_TYPE`,"+      // 01
+    "`EVENT_LINES`.`CART_NUMBER`,"+     // 02
+    "`CART`.`GROUP_NAME`,"+             // 03
+    "`GROUPS`.`COLOR`,"+                // 04
+    "`CART`.`FORCED_LENGTH`,"+          // 05
+    "`CART`.`TITLE`,"+                  // 06
+    "`EVENT_LINES`.`TRANS_TYPE`,"+      // 07
+    "`EVENT_LINES`.`MARKER_COMMENT` "+  // 08
+    "from `EVENT_LINES` left join `CART` "+
+    "on `EVENT_LINES`.`CART_NUMBER`=`CART`.`NUMBER` "+
+    "left join `GROUPS` "+
+    "on `CART`.`GROUP_NAME`=`GROUPS`.`NAME` ";
 
     return sql;
 }
diff --git a/rdlogmanager/list_clocks.cpp b/rdlogmanager/list_clocks.cpp
index 61cb9ec4..85b7ea9b 100644
--- a/rdlogmanager/list_clocks.cpp
+++ b/rdlogmanager/list_clocks.cpp
@@ -150,7 +150,7 @@ ListClocks::ListClocks(QString *clockname,QWidget *parent)
   edit_filter_box->insertItem(0,tr("ALL"));
   edit_filter_box->insertItem(1,tr("NONE"));
 
-  QString sql="select NAME from SERVICES";
+  QString sql="select `NAME` from `SERVICES`";
   RDSqlQuery *q=new RDSqlQuery(sql);
   while(q->next()) {
     services_list.append( q->value(0).toString() );
@@ -200,8 +200,8 @@ void ListClocks::addData()
     return;
   }
   delete add_dialog;
-  sql=QString("select NAME from CLOCKS where ")+
-    "NAME=\""+RDEscapeString(clockname)+"\"";
+  sql=QString("select `NAME` from `CLOCKS` where ")+
+    "NAME='"+RDEscapeString(clockname)+"'";
   q=new RDSqlQuery(sql);
   if(q->first()) {
     QMessageBox::
@@ -211,23 +211,23 @@ void ListClocks::addData()
     return;
   }
   delete q;
-  sql=QString("insert into CLOCKS set ")+
-    "NAME=\""+RDEscapeString(clockname)+"\","+
-    "ARTISTSEP=15";
+  sql=QString("insert into `CLOCKS` set ")+
+    "`NAME`='"+RDEscapeString(clockname)+"',"+
+    "`ARTISTSEP`=15";
   RDSqlQuery::apply(sql);
 
   //
   // Create default schedcode rules
   //
   sql=QString("select ")+
-    "CODE "+  // 00
-    "from SCHED_CODES "+
-    "order by CODE";
+    "`CODE` "+  // 00
+    "from `SCHED_CODES` "+
+    "order by `CODE`";
   q=new RDSqlQuery(sql);
   while(q->next()) {
-    sql=QString("insert into RULE_LINES set ")+
-      "CLOCK_NAME=\""+RDEscapeString(clockname)+"\","+
-      "CODE=\""+RDEscapeString(q->value(0).toString())+"\"";
+    sql=QString("insert into `RULE_LINES` set ")+
+      "`CLOCK_NAME`='"+RDEscapeString(clockname)+"',"+
+      "`CODE`='"+RDEscapeString(q->value(0).toString())+"'";
     RDSqlQuery::apply(sql);
   }
   delete q;
@@ -235,14 +235,14 @@ void ListClocks::addData()
   EditClock *clock_dialog=new EditClock(clockname,true,&new_clocks,this);
   if(clock_dialog->exec()<0) {
     // Back everything out!
-    sql=QString("delete from RULE_LINES where ")+
-      "CLOCK_NAME=\""+RDEscapeString(clockname)+"\"";
+    sql=QString("delete from `RULE_LINES` where ")+
+      "`CLOCK_NAME`='"+RDEscapeString(clockname)+"'";
     RDSqlQuery::apply(sql);
-    sql=QString("delete from CLOCK_LINES where ")+
-      "CLOCK_NAME=\""+RDEscapeString(clockname)+"\"";
+    sql=QString("delete from `CLOCK_LINES` where ")+
+      "`CLOCK_NAME`='"+RDEscapeString(clockname)+"'";
     RDSqlQuery::apply(sql);
-    sql=QString("delete from CLOCKS where ")+
-      "NAME=\""+RDEscapeString(clockname)+"\"";
+    sql=QString("delete from `CLOCKS` where ")+
+      "`NAME`='"+RDEscapeString(clockname)+"'";
     RDSqlQuery::apply(sql);
   }
   else {
@@ -251,17 +251,17 @@ void ListClocks::addData()
       // Create default clock permissions
       //
       sql=QString("select ")+
-	"ID "+  // 00
-	"from CLOCK_PERMS where "+
-	"CLOCK_NAME=\""+RDEscapeString(clockname)+"\"";
+	"`ID` "+  // 00
+	"from `CLOCK_PERMS` where "+
+	"`CLOCK_NAME`='"+RDEscapeString(clockname)+"'";
       q=new RDSqlQuery(sql);
       if(!q->first()) {
-	sql="select NAME from SERVICES";
+	sql="select `NAME` from `SERVICES`";
 	q1=new RDSqlQuery(sql);
 	while(q1->next()) {
-	  sql=QString("insert into CLOCK_PERMS set ")+
-	    "CLOCK_NAME=\""+RDEscapeString(clockname)+"\","+
-	    "SERVICE_NAME=\""+RDEscapeString(q1->value(0).toString())+"\"";
+	  sql=QString("insert into `CLOCK_PERMS` set ")+
+	    "`CLOCK_NAME`='"+RDEscapeString(clockname)+"',"+
+	    "`SERVICE_NAME`='"+RDEscapeString(q1->value(0).toString())+"'";
 	  RDSqlQuery::apply(sql);
 	}
 	delete q1;
@@ -269,9 +269,9 @@ void ListClocks::addData()
       delete q;
     }
     else {
-      sql=QString("insert into CLOCK_PERMS set ")+
-	"CLOCK_NAME=\""+RDEscapeString(clockname)+"\","+
-	"SERVICE_NAME=\""+RDEscapeString(edit_filter_box->currentText())+"\"";
+      sql=QString("insert into `CLOCK_PERMS` set ")+
+	"`CLOCK_NAME`='"+RDEscapeString(clockname)+"',"+
+	"`SERVICE_NAME`='"+RDEscapeString(edit_filter_box->currentText())+"'";
       RDSqlQuery::apply(sql);
     }
     QModelIndex row=edit_clocks_model->addClock(clockname);
@@ -359,15 +359,15 @@ void ListClocks::renameData()
   //
   // Rename Grid References
   //
-  sql="select NAME from SERVICES";
+  sql="select `NAME` from `SERVICES`";
   // FIXME: not sure if the usersec service filter should be applied here, or
   // if all services should be brought over
   q=new RDSqlQuery(sql);
   while(q->next()) {
     for(int i=0;i<168;i++) {
-      sql=QString("update SERVICE_CLOCKS set ")+
-	"CLOCK_NAME=\""+RDEscapeString(new_name)+"\" where "+
-	"CLOCK_NAME=\""+RDEscapeString(edit_clocks_model->clockName(rows.first()))+"\"";
+      sql=QString("update `SERVICE_CLOCKS` set ")+
+	"`CLOCK_NAME`='"+RDEscapeString(new_name)+"' where "+
+	"`CLOCK_NAME`='"+RDEscapeString(edit_clocks_model->clockName(rows.first()))+"'";
       RDSqlQuery::apply(sql);
     }
   }
@@ -376,30 +376,30 @@ void ListClocks::renameData()
   //
   // Rename Meta Table
   //
-  sql=QString("update CLOCK_LINES set ")+
-    "CLOCK_NAME=\""+RDEscapeString(new_name)+"\" where "+
-    "CLOCK_NAME=\""+RDEscapeString(edit_clocks_model->clockName(rows.first()))+"\"";
+  sql=QString("update `CLOCK_LINES` set ")+
+    "`CLOCK_NAME`='"+RDEscapeString(new_name)+"' where "+
+    "`CLOCK_NAME`='"+RDEscapeString(edit_clocks_model->clockName(rows.first()))+"'";
   RDSqlQuery::apply(sql);
 
-  sql=QString("update RULE_LINES set ")+
-    "CLOCK_NAME=\""+RDEscapeString(new_name)+"\" where "+
-    "CLOCK_NAME=\""+RDEscapeString(edit_clocks_model->clockName(rows.first()))+"\"";
+  sql=QString("update `RULE_LINES` set ")+
+    "`CLOCK_NAME`='"+RDEscapeString(new_name)+"' where "+
+    "`CLOCK_NAME`='"+RDEscapeString(edit_clocks_model->clockName(rows.first()))+"'";
   RDSqlQuery::apply(sql);
 
   //
   // Rename Service Permissions
   //
-  sql=QString("update CLOCK_PERMS set ")+
-    "CLOCK_NAME=\""+RDEscapeString(new_name)+"\" where "+
-    "CLOCK_NAME=\""+RDEscapeString(edit_clocks_model->clockName(rows.first()))+"\"";
+  sql=QString("update `CLOCK_PERMS` set ")+
+    "`CLOCK_NAME`='"+RDEscapeString(new_name)+"' where "+
+    "`CLOCK_NAME`='"+RDEscapeString(edit_clocks_model->clockName(rows.first()))+"'";
   RDSqlQuery::apply(sql);
 
   //
   // Rename Primary Key
   //
-  sql=QString("update CLOCKS set ")+
-    "NAME=\""+RDEscapeString(new_name)+"\" where "+
-    "NAME=\""+RDEscapeString(edit_clocks_model->clockName(rows.first()))+"\"";
+  sql=QString("update `CLOCKS` set ")+
+    "`NAME`='"+RDEscapeString(new_name)+"' where "+
+    "`NAME`='"+RDEscapeString(edit_clocks_model->clockName(rows.first()))+"'";
   RDSqlQuery::apply(sql);
 
   edit_clocks_model->removeClock(old_name);
@@ -504,8 +504,8 @@ int ListClocks::ActiveClocks(QString clockname,QString *svc_list)
   QString svcname;
   QStringList svcs;
 
-  sql=QString("select SERVICE_NAME from SERVICE_CLOCKS where ")+
-    "CLOCK_NAME=\""+RDEscapeString(clockname)+"\" order by CLOCK_NAME";
+  sql=QString("select `SERVICE_NAME` from `SERVICE_CLOCKS` where ")+
+    "`CLOCK_NAME`='"+RDEscapeString(clockname)+"' order by `CLOCK_NAME`";
   q=new RDSqlQuery(sql);
   while(q->next()) {
     if((svcs.size()==0)||(svcs.back()!=q->value(0).toString())) {
@@ -532,31 +532,31 @@ void ListClocks::DeleteClock(QString clockname)
   //
   // Clear Active Clocks
   //
-  sql=QString("update SERVICE_CLOCKS set ")+
-    "CLOCK_NAME=null where "+
-    "CLOCK_NAME=\""+RDEscapeString(clockname)+"\"";
+  sql=QString("update `SERVICE_CLOCKS` set ")+
+    "`CLOCK_NAME`=null where "+
+    "`CLOCK_NAME`='"+RDEscapeString(clockname)+"'";
   q=new RDSqlQuery(sql);
   delete q;
 
   //
   // Delete Service Associations
   //
-  sql=QString("delete from CLOCK_PERMS where ")+
-    "CLOCK_NAME=\""+RDEscapeString(clockname)+"\"";
+  sql=QString("delete from `CLOCK_PERMS` where ")+
+    "`CLOCK_NAME`='"+RDEscapeString(clockname)+"'";
   q=new RDSqlQuery(sql);
   delete q;
 
   //
   // Delete Clock Definition
   //
-  sql=QString("delete from CLOCKS where ")+
-    "NAME=\""+RDEscapeString(clockname)+"\"";
+  sql=QString("delete from `CLOCKS` where ")+
+    "`NAME`='"+RDEscapeString(clockname)+"'";
   RDSqlQuery::apply(sql);
-  sql=QString("delete from CLOCK_LINES where ")+
-    "CLOCK_NAME=\""+RDEscapeString(clockname)+"\"";
+  sql=QString("delete from `CLOCK_LINES` where ")+
+    "`CLOCK_NAME`='"+RDEscapeString(clockname)+"'";
   RDSqlQuery::apply(sql);
-  sql=QString("delete from RULE_LINES where ")+
-    "CLOCK_NAME=\""+RDEscapeString(clockname)+"\"";
+  sql=QString("delete from `RULE_LINES` where ")+
+    "`CLOCK_NAME`='"+RDEscapeString(clockname)+"'";
   RDSqlQuery::apply(sql);
 }
 
@@ -564,18 +564,18 @@ void ListClocks::DeleteClock(QString clockname)
 QString ListClocks::GetClockFilter(QString svc_name)
 {
   QString filter="where ";
-  QString sql=QString("select CLOCK_NAME from CLOCK_PERMS where ")+
-    "SERVICE_NAME=\""+RDEscapeString(svc_name)+"\"";
+  QString sql=QString("select `CLOCK_NAME` from `CLOCK_PERMS` where ")+
+    "`SERVICE_NAME`='"+RDEscapeString(svc_name)+"'";
   RDSqlQuery *q=new RDSqlQuery(sql);
   if(q->size()>0) {
     while(q->next()) {
-      filter+=QString("(NAME=\"")+
-	RDEscapeString(q->value(0).toString())+"\")||";
+      filter+=QString("(`NAME`='")+
+	RDEscapeString(q->value(0).toString())+"')||";
     }
     filter=filter.left(filter.length()-2);
   }
   else {
-    filter="(SERVICE_NAME=\"\")";
+    filter="(`SERVICE_NAME`='')";
   }
   delete q;
 
@@ -589,13 +589,13 @@ QString ListClocks::GetNoneFilter()
   RDSqlQuery *q;
   QString filter;
 
-  sql="select CLOCK_NAME from CLOCK_PERMS";
+  sql="select `CLOCK_NAME` from `CLOCK_PERMS`";
   q=new RDSqlQuery(sql);
   if(q->size()>0) {
     filter="where ";
   }
   while(q->next()) {
-    filter+=QString("(NAME!=\"")+RDEscapeString(q->value(0).toString())+"\")&&";
+    filter+=QString("(`NAME`!='")+RDEscapeString(q->value(0).toString())+"')&&";
   }
   if(q->size()>0) {
     filter=filter.left(filter.length()-2);
diff --git a/rdlogmanager/list_events.cpp b/rdlogmanager/list_events.cpp
index 4a39e021..6cf76e77 100644
--- a/rdlogmanager/list_events.cpp
+++ b/rdlogmanager/list_events.cpp
@@ -143,7 +143,7 @@ ListEvents::ListEvents(QString *eventname,QWidget *parent)
   edit_filter_box->insertItem(0,tr("ALL"));
   edit_filter_box->insertItem(1,tr("NONE"));
 
-  QString sql="select NAME from SERVICES";
+  QString sql="select `NAME` from `SERVICES`";
   RDSqlQuery *q=new RDSqlQuery(sql);
   while(q->next()) {
     services_list.append( q->value(0).toString() );
@@ -188,9 +188,9 @@ void ListEvents::addData()
   }
   delete add_dialog;
   QString sql=QString("select ")+
-    "NAME "+
-    "from EVENTS where "+
-    "NAME=\""+RDEscapeString(logname)+"\"";
+    "`NAME` "+
+    "from `EVENTS` where "+
+    "`NAME`='"+RDEscapeString(logname)+"'";
   q=new RDSqlQuery(sql);
   if(q->first()) {
     QMessageBox::
@@ -204,26 +204,25 @@ void ListEvents::addData()
   delete event;
   EditEvent *event_dialog=new EditEvent(logname,true,&new_events,this);
   if(event_dialog->exec()<-1) {
-    sql=QString("delete from EVENTS where ")+
-      "NAME=\""+RDEscapeString(logname)+"\"";
-    q=new RDSqlQuery(sql);
-    delete q;
+    sql=QString("delete from `EVENTS` where ")+
+      "`NAME`='"+RDEscapeString(logname)+"'";
+    RDSqlQuery::apply(sql);
     return;
   }
   else {
     if(edit_filter_box->currentIndex()==0) {
       sql=QString(" select ")+
-	"ID "+  // 00
-	"from EVENT_PERMS where "+
-	"EVENT_NAME=\""+RDEscapeString(logname)+"\"";
+	"`ID` "+  // 00
+	"from `EVENT_PERMS` where "+
+	"`EVENT_NAME`='"+RDEscapeString(logname)+"'";
       q=new RDSqlQuery(sql);
       if(!q->first()) {
-	sql="select NAME from SERVICES";
+	sql="select `NAME` from `SERVICES`";
 	q1=new RDSqlQuery(sql);
 	while(q1->next()) {
-	  sql=QString("insert into EVENT_PERMS set ")+
-	    "EVENT_NAME=\""+RDEscapeString(logname)+"\","+
-	    "SERVICE_NAME=\""+RDEscapeString(q1->value(0).toString())+"\"";
+	  sql=QString("insert into `EVENT_PERMS` set ")+
+	    "`EVENT_NAME`='"+RDEscapeString(logname)+"',"+
+	    "`SERVICE_NAME`='"+RDEscapeString(q1->value(0).toString())+"'";
 	  RDSqlQuery::apply(sql);
 	}
 	delete q1;
@@ -231,9 +230,9 @@ void ListEvents::addData()
       delete q;
     }
     else {
-      sql=QString("insert into EVENT_PERMS set ")+
-	"EVENT_NAME=\""+RDEscapeString(logname)+"\","+
-	"SERVICE_NAME=\""+RDEscapeString(edit_filter_box->currentText())+"\"";
+      sql=QString("insert into `EVENT_PERMS` set ")+
+	"`EVENT_NAME`='"+RDEscapeString(logname)+"',"+
+	"`SERVICE_NAME`='"+RDEscapeString(edit_filter_box->currentText())+"'";
       RDSqlQuery::apply(sql);
     }
     QModelIndex row=edit_events_model->addEvent(logname);
@@ -327,33 +326,33 @@ void ListEvents::renameData()
   //
   // Rename Clock References
   //
-  sql=QString("update CLOCK_LINES set ")+
-    "EVENT_NAME=\""+RDEscapeString(new_name)+"\" where "+
-    "EVENT_NAME=\""+RDEscapeString(old_name)+"\"";
+  sql=QString("update `CLOCK_LINES` set ")+
+    "`EVENT_NAME`='"+RDEscapeString(new_name)+"' where "+
+    "`EVENT_NAME`='"+RDEscapeString(old_name)+"'";
   RDSqlQuery::apply(sql);
 
   //
   // Rename Event Line References
   //
-  sql=QString("update EVENT_LINES set ")+
-    "EVENT_NAME=\""+RDEscapeString(new_name)+"\" where "+
-    "EVENT_NAME=\""+RDEscapeString(old_name)+"\"";
+  sql=QString("update `EVENT_LINES` set ")+
+    "`EVENT_NAME`='"+RDEscapeString(new_name)+"' where "+
+    "`EVENT_NAME`='"+RDEscapeString(old_name)+"'";
   RDSqlQuery::apply(sql);
 
   //
   // Rename Service Permissions
   //
-  sql=QString("update EVENT_PERMS set ")+
-    "EVENT_NAME=\""+RDEscapeString(new_name)+"\" "+
-    "where EVENT_NAME=\""+RDEscapeString(old_name)+"\"";
+  sql=QString("update `EVENT_PERMS` set ")+
+    "`EVENT_NAME`='"+RDEscapeString(new_name)+"' "+
+    "where `EVENT_NAME`='"+RDEscapeString(old_name)+"'";
   RDSqlQuery::apply(sql);
 
   //
   // Rename Primary Key
   //
-  sql=QString("update EVENTS set ")+
-    "NAME=\""+RDEscapeString(new_name)+"\" where "+
-    "NAME=\""+RDEscapeString(old_name)+"\"";
+  sql=QString("update `EVENTS` set ")+
+    "`NAME`='"+RDEscapeString(new_name)+"' where "+
+    "`NAME`='"+RDEscapeString(old_name)+"'";
   RDSqlQuery::apply(sql);
 
   edit_events_model->removeEvent(old_name);
@@ -442,14 +441,14 @@ int ListEvents::ActiveEvents(QString event_name,QString *clock_list)
   QString sql;
   RDSqlQuery *q,*q1;
 
-  sql="select NAME from CLOCKS";
+  sql="select `NAME` from `CLOCKS`";
   q=new RDSqlQuery(sql);
   while(q->next()) {
     sql=QString("select ")+
-      "EVENT_NAME "+
-      "from CLOCK_LINES where "+
-      "CLOCK_NAME=\""+RDEscapeString(q->value(0).toString())+"\" && "+
-      "EVENT_NAME=\""+RDEscapeString(event_name)+"\"";
+      "`EVENT_NAME` "+
+      "from `CLOCK_LINES` where "+
+      "`CLOCK_NAME`='"+RDEscapeString(q->value(0).toString())+"' && "+
+      "`EVENT_NAME`='"+RDEscapeString(event_name)+"'";
     q1=new RDSqlQuery(sql);
     if(q1->first()) {
       *clock_list+=
@@ -467,40 +466,40 @@ int ListEvents::ActiveEvents(QString event_name,QString *clock_list)
 void ListEvents::DeleteEvent(QString event_name)
 {
   QString sql;
-  RDSqlQuery *q,*q1;
+  RDSqlQuery *q;
   QString base_name=event_name;
   base_name.replace(" ","_");
 
   //
   // Delete Active Clock Entries
   //
-  sql="select NAME from CLOCKS";
+  sql="select `NAME` from `CLOCKS`";
   q=new RDSqlQuery(sql);
   while(q->next()) {
-    sql=QString("delete from CLOCK_LINES where ")+
-      "CLOCK_NAME=\""+RDEscapeString(q->value(0).toString())+"\" && "+
-      "EVENT_NAME=\""+RDEscapeString(event_name)+"\"";
-    q1=new RDSqlQuery(sql);
-    delete q1;
+    sql=QString("delete from `CLOCK_LINES` where ")+
+      "`CLOCK_NAME`='"+RDEscapeString(q->value(0).toString())+"' && "+
+      "`EVENT_NAME`='"+RDEscapeString(event_name)+"'";
+    RDSqlQuery::apply(sql);
   }
   delete q;
 
   //
   // Delete Service Associations
   //
-  sql=QString("delete from EVENT_PERMS where ")+
-    "EVENT_NAME=\""+RDEscapeString(event_name)+"\"";
+  sql=QString("delete from `EVENT_PERMS` where ")+
+    "`EVENT_NAME`='"+RDEscapeString(event_name)+"'";
   q=new RDSqlQuery(sql);
   delete q;
 
   //
   // Delete Event Definition
   //
-  sql=QString("delete from EVENTS where ")+
-    "NAME=\""+RDEscapeString(event_name)+"\"";
+  sql=QString("delete from `EVENTS` where ")+
+    "`NAME`='"+RDEscapeString(event_name)+"'";
   RDSqlQuery::apply(sql);
-  sql=QString("delete from EVENT_LINES where ")+
-    "EVENT_NAME=\""+RDEscapeString(event_name)+"\"";
+
+  sql=QString("delete from `EVENT_LINES` where ")+
+    "`EVENT_NAME`='"+RDEscapeString(event_name)+"'";
   RDSqlQuery::apply(sql);
 }
 
@@ -508,18 +507,18 @@ void ListEvents::DeleteEvent(QString event_name)
 QString ListEvents::GetEventFilter(QString svc_name)
 {
   QString filter="where ";
-  QString sql=QString("select EVENT_NAME from EVENT_PERMS where ")+
-    "SERVICE_NAME=\""+RDEscapeString(svc_name)+"\"";
+  QString sql=QString("select `EVENT_NAME` from `EVENT_PERMS` where ")+
+    "`SERVICE_NAME`='"+RDEscapeString(svc_name)+"'";
   RDSqlQuery *q=new RDSqlQuery(sql);
   if(q->size()>0) {
     while(q->next()) {
-      filter+=QString().sprintf("(NAME=\"%s\")||",
+      filter+=QString().sprintf("(`NAME`='%s')||",
 				q->value(0).toString().toUtf8().constData());
     }
     filter=filter.left(filter.length()-2);
   }
   else {
-    filter="(SERVICE_NAME=\"\")";
+    filter="(`SERVICE_NAME`='')";
   }
   delete q;
 
@@ -533,13 +532,13 @@ QString ListEvents::GetNoneFilter()
   RDSqlQuery *q;
   QString filter;
 
-  sql="select EVENT_NAME from EVENT_PERMS";
+  sql="select `EVENT_NAME` from `EVENT_PERMS`";
   q=new RDSqlQuery(sql);
   if(q->size()>0) {
     filter="where ";
   }
   while(q->next()) {
-    filter+=QString().sprintf("(NAME!=\"%s\")&&",
+    filter+=QString().sprintf("(`NAME`!='%s')&&",
 			      RDEscapeString(q->value(0).toString()).toUtf8().constData());
   }
   if(q->size()>0) {
diff --git a/rdlogmanager/pick_report_dates.cpp b/rdlogmanager/pick_report_dates.cpp
index 602c76f4..3465456b 100644
--- a/rdlogmanager/pick_report_dates.cpp
+++ b/rdlogmanager/pick_report_dates.cpp
@@ -59,9 +59,9 @@ PickReportDates::PickReportDates(const QString &svcname,QWidget *parent)
   label->setGeometry(10,11,60,19);
   label->setFont(labelFont());
   label->setAlignment(Qt::AlignRight|Qt::AlignVCenter);
-  sql=QString("select REPORT_NAME from REPORT_SERVICES where ")+
-    "SERVICE_NAME=\""+RDEscapeString(svcname)+"\" "+
-    "order by REPORT_NAME";
+  sql=QString("select `REPORT_NAME` from `REPORT_SERVICES` where ")+
+    "`SERVICE_NAME`='"+RDEscapeString(svcname)+"' "+
+    "order by `REPORT_NAME`";
   q=new RDSqlQuery(sql);
   while(q->next()) {
     edit_report_box->
diff --git a/rdlogmanager/rename_item.cpp b/rdlogmanager/rename_item.cpp
index 6a794c1e..f0c7c3fb 100644
--- a/rdlogmanager/rename_item.cpp
+++ b/rdlogmanager/rename_item.cpp
@@ -117,9 +117,9 @@ void RenameItem::okData()
     return;
   }
   QString sql=QString("select ")+
-    "NAME "+
-    "from "+edit_tablename+" where "+
-    "NAME=\""+RDEscapeString(edit_name_edit->text())+"\"";
+    "`NAME` "+
+    "from `"+edit_tablename+"` where "+
+    "`NAME`='"+RDEscapeString(edit_name_edit->text())+"'";
   RDSqlQuery *q=new RDSqlQuery(sql);
   if(q->next()) {
     delete q;
diff --git a/rdlogmanager/schedrulesmodel.cpp b/rdlogmanager/schedrulesmodel.cpp
index 29cbbac3..c1da6528 100644
--- a/rdlogmanager/schedrulesmodel.cpp
+++ b/rdlogmanager/schedrulesmodel.cpp
@@ -192,8 +192,8 @@ void SchedRulesModel::updateModel()
 
   RDSqlQuery *q=NULL;
   QString sql=sqlFields()+"where "+
-    "RULE_LINES.CLOCK_NAME=\""+RDEscapeString(d_clock_name)+"\" "+
-    "order by RULE_LINES.CODE ";
+    "`RULE_LINES`.`CLOCK_NAME`=\""+RDEscapeString(d_clock_name)+"\" "+
+    "order by `RULE_LINES`.`CODE` ";
   beginResetModel();
   d_texts.clear();
   d_ids.clear();
@@ -212,7 +212,7 @@ void SchedRulesModel::updateRowLine(int line)
 {
   if(line<d_texts.size()) {
     QString sql=sqlFields()+
-      QString().sprintf("where RULE_LINES.ID=%u",d_ids.at(line)); 
+      QString().sprintf("where `RULE_LINES`.`ID`=%u",d_ids.at(line)); 
     RDSqlQuery *q=new RDSqlQuery(sql);
     if(q->first()) {
       updateRow(line,q);
@@ -256,16 +256,16 @@ void SchedRulesModel::updateRow(int row,RDSqlQuery *q)
 QString SchedRulesModel::sqlFields() const
 {
   QString sql=QString("select ")+
-    "RULE_LINES.ID,"+            // 00
-    "SCHED_CODES.CODE,"+         // 01
-    "RULE_LINES.MAX_ROW,"+       // 02
-    "RULE_LINES.MIN_WAIT,"+      // 03
-    "RULE_LINES.NOT_AFTER,"+     // 04
-    "RULE_LINES.OR_AFTER,"+      // 05
-    "RULE_LINES.OR_AFTER_II,"+   // 06
-    "SCHED_CODES.DESCRIPTION "+  // 07
-    "from SCHED_CODES left join RULE_LINES "+
-    "on SCHED_CODES.CODE=RULE_LINES.CODE ";
+    "`RULE_LINES`.`ID`,"+            // 00
+    "`SCHED_CODES`.`CODE`,"+         // 01
+    "`RULE_LINES`.`MAX_ROW`,"+       // 02
+    "`RULE_LINES`.`MIN_WAIT`,"+      // 03
+    "`RULE_LINES`.`NOT_AFTER`,"+     // 04
+    "`RULE_LINES`.`OR_AFTER`,"+      // 05
+    "`RULE_LINES`.`OR_AFTER_II`,"+   // 06
+    "`SCHED_CODES`.`DESCRIPTION` "+  // 07
+    "from `SCHED_CODES` left join `RULE_LINES` "+
+    "on `SCHED_CODES`.`CODE`=`RULE_LINES`.`CODE` ";
 
     return sql;
 }
diff --git a/rdlogmanager/svc_rec.cpp b/rdlogmanager/svc_rec.cpp
index 2dc1d716..e3e538db 100644
--- a/rdlogmanager/svc_rec.cpp
+++ b/rdlogmanager/svc_rec.cpp
@@ -46,9 +46,9 @@ SvcRec::SvcRec(const QString &svcname,QWidget *parent)
   QDate current_date=QDate::currentDate();
   pick_high_year=current_date.year();
   pick_low_year=pick_high_year;
-  sql=QString("select EVENT_DATETIME from ELR_LINES where ")+
-    "SERVICE_NAME=\""+RDEscapeString(svcname)+"\" "+
-    "order by EVENT_DATETIME";
+  sql=QString("select `EVENT_DATETIME` from `ELR_LINES` where ")+
+    "`SERVICE_NAME`='"+RDEscapeString(svcname)+"' "+
+    "order by `EVENT_DATETIME`";
   q=new RDSqlQuery(sql);
   if(q->first()) {
     pick_low_year=q->value(0).toDate().year();
@@ -210,10 +210,10 @@ void SvcRec::deleteDay()
   QString sql;
   RDSqlQuery *q;
 
-  sql=QString("delete from ELR_LINES where ")+
-    "SERVICE_NAME=\""+RDEscapeString(pick_service_name)+"\" && "+
-    "EVENT_DATETIME>=\""+date().toString("yyyy-MM-dd 00:00:00")+"\" && "+
-    "EVENT_DATETIME<\""+date().addDays(1).toString("yyyy-MM-dd 00:00:00")+"\"";
+  sql=QString("delete from `ELR_LINES` where ")+
+    "`SERVICE_NAME`='"+RDEscapeString(pick_service_name)+"' && "+
+    "`EVENT_DATETIME`>='"+date().toString("yyyy-MM-dd 00:00:00")+"' && "+
+    "`EVENT_DATETIME`<'"+date().addDays(1).toString("yyyy-MM-dd 00:00:00")+"'";
   q=new RDSqlQuery(sql);
   delete q;
   GetActiveDays(pick_date);
@@ -396,10 +396,10 @@ void SvcRec::GetActiveDays(const QDate &date)
   RDSqlQuery *q;
 
   for(int i=0;i<=date.daysInMonth();i++) {
-    sql=QString("select ID from ELR_LINES where ")+
-      "SERVICE_NAME=\""+RDEscapeString(pick_service_name)+"\" && "+
-      "(EVENT_DATETIME>=\""+date.toString("yyyy-MM")+QString().sprintf("-%02d 00:00:00\")&&",i+1)+
-      "(EVENT_DATETIME<=\""+date.toString("yyyy-MM")+QString().sprintf("-%02d 23:59:59\")",i+1);
+    sql=QString("select `ID` from `ELR_LINES` where ")+
+      "`SERVICE_NAME`='"+RDEscapeString(pick_service_name)+"' && "+
+      "(`EVENT_DATETIME`>='"+date.toString("yyyy-MM")+QString().sprintf("-%02d 00:00:00')&&",i+1)+
+      "(`EVENT_DATETIME`<='"+date.toString("yyyy-MM")+QString().sprintf("-%02d 23:59:59')",i+1);
     q=new RDSqlQuery(sql);
     pick_active_days[i]=q->first();
     delete q;