diff --git a/SQL/mysql.initial.sql b/SQL/mysql.initial.sql
index 4a20665..e6fcbf5 100644
--- a/SQL/mysql.initial.sql
+++ b/SQL/mysql.initial.sql
@@ -1,50 +1,50 @@
-CREATE TABLE IF NOT EXISTS ident_switch
+CREATE TABLE IF NOT EXISTS `ident_switch`
 (
-	id
+	`id`
 		int(10) UNSIGNED
 		NOT NULL
 		AUTO_INCREMENT,
-	user_id
+	`user_id`
 		int(10) UNSIGNED
 		NOT NULL,
-	iid
+	`iid`
 		int(10) UNSIGNED
 		NOT NULL,
-	username
+	`username`
 		varchar(64),
-	password
+	`password`
 		varchar(64),
-	imap_host
+	`imap_host`
 		varchar(64),
-	imap_port
+	`imap_port`
 		int
-		CHECK(imap_port > 0 AND imap_port <= 65535),
-    imap_delimiter
-        char(1),
-	label
+		CHECK(`imap_port` > 0 AND `imap_port` <= 65535),
+	`imap_delimiter`
+		char(1),
+	`label`
 		varchar(32),
-	flags
+	`flags`
 		int
 		NOT NULL
 		DEFAULT 0,
-  smtp_host
-    varchar(64),
-  smtp_port
-    int
-    CHECK(smtp_port > 0 AND smtp_port <= 65535),
-	drafts_mbox
-	  varchar(64),
-	sent_mbox
-	  varchar(64),
-	junk_mbox
-	  varchar(64),
-	trash_mbox
-	  varchar(64),
-  UNIQUE KEY user_id_label (user_id, label),
-  CONSTRAINT fk_user_id FOREIGN KEY (user_id) REFERENCES users(user_id) ON DELETE CASCADE ON UPDATE CASCADE,
-  CONSTRAINT fk_identity_id FOREIGN KEY (iid) REFERENCES identities(identity_id) ON DELETE CASCADE ON UPDATE CASCADE,
-  PRIMARY KEY(id),
-  INDEX IX_ident_switch_user_id (user_id),
-  INDEX IX_ident_switch_iid (iid)
+	`smtp_host`
+		varchar(64),
+	`smtp_port`
+		int
+		CHECK(`smtp_port` > 0 AND `smtp_port` <= 65535),
+	`drafts_mbox`
+		varchar(64),
+	`sent_mbox`
+		varchar(64),
+	`junk_mbox`
+		varchar(64),
+	`trash_mbox`
+		varchar(64),
+	UNIQUE KEY `user_id_label` (`user_id`, `label`),
+	CONSTRAINT `fk_user_id` FOREIGN KEY (`user_id`) REFERENCES `users`(`user_id`) ON DELETE CASCADE ON UPDATE CASCADE,
+	CONSTRAINT `fk_identity_id` FOREIGN KEY (`iid`) REFERENCES `identities`(`identity_id`) ON DELETE CASCADE ON UPDATE CASCADE,
+	PRIMARY KEY(`id`),
+	INDEX `IX_ident_switch_user_id`(`user_id`),
+	INDEX `IX_ident_switch_iid`(`iid`)
 );
 
diff --git a/SQL/mysql/2016060200.sql b/SQL/mysql/2016060200.sql
index 15297c3..562f4ed 100644
--- a/SQL/mysql/2016060200.sql
+++ b/SQL/mysql/2016060200.sql
@@ -1,5 +1,5 @@
 ALTER TABLE
-	ident_switch
+	`ident_switch`
 MODIFY
-	username
+	`username`
 		varchar(64);
diff --git a/SQL/mysql/2018071600.sql b/SQL/mysql/2018071600.sql
index 175f1c2..3a4e396 100644
--- a/SQL/mysql/2018071600.sql
+++ b/SQL/mysql/2018071600.sql
@@ -1,6 +1,6 @@
 ALTER TABLE
-	ident_switch
+	`ident_switch`
 MODIFY
-	username
-	varchar(64)
-	NULL;
+	`username`
+		varchar(64)
+		NULL;
diff --git a/SQL/mysql/2018121800.sql b/SQL/mysql/2018121800.sql
index 5ba7458..f920e1c 100644
--- a/SQL/mysql/2018121800.sql
+++ b/SQL/mysql/2018121800.sql
@@ -1,29 +1,29 @@
 ALTER TABLE
-  ident_switch
+  `ident_switch`
 CHANGE
-  host
-  imap_host varchar(64);
+  `host`
+  `imap_host` varchar(64);
 
 ALTER TABLE
-  ident_switch
+  `ident_switch`
 CHANGE
-  port
-  imap_port int;
+  `port`
+  `imap_port` int;
 
 ALTER TABLE
-  ident_switch
+  `ident_switch`
 ADD COLUMN
-	smtp_host
+	`smtp_host`
     varchar(64);
 
 ALTER TABLE
-  ident_switch
+  `ident_switch`
 ADD COLUMN
-  smtp_port
+  `smtp_port`
 		int
-		CHECK(smtp_port > 0 AND smtp_port <= 65535);
+		CHECK(`smtp_port` > 0 AND `smtp_port` <= 65535);
 
 ALTER TABLE
-  ident_switch
+  `ident_switch`
 DROP COLUMN
-  delimiter;
\ No newline at end of file
+  `delimiter`;
\ No newline at end of file
diff --git a/SQL/mysql/2019112000.sql b/SQL/mysql/2019112000.sql
index 2d3e4e1..3bfa1b4 100644
--- a/SQL/mysql/2019112000.sql
+++ b/SQL/mysql/2019112000.sql
@@ -1,5 +1,5 @@
 ALTER TABLE
-  ident_switch
+  `ident_switch`
 ADD COLUMN
-	imap_delimiter
+	`imap_delimiter`
     char(1);
\ No newline at end of file
diff --git a/SQL/mysql/2019121300.sql b/SQL/mysql/2019121300.sql
index 94a469d..9ae8be2 100644
--- a/SQL/mysql/2019121300.sql
+++ b/SQL/mysql/2019121300.sql
@@ -1,14 +1,14 @@
 ALTER TABLE
-  ident_switch
+  `ident_switch`
 ADD COLUMN
-	drafts_mbox
-    varchar(64),
+	`drafts_mbox`
+        varchar(64),
 ADD COLUMN
-	sent_mbox
-    varchar(64),
+	`sent_mbox`
+        varchar(64),
 ADD COLUMN
-	junk_mbox
-    varchar(64),
+	`junk_mbox`
+        varchar(64),
 ADD COLUMN
-	trash_mbox
-    varchar(64);
+	`trash_mbox`
+        varchar(64);