diff --git a/das/start_das.php b/das/start_das.php
index 61f44ab..2230d09 100644
--- a/das/start_das.php
+++ b/das/start_das.php
@@ -96,7 +96,7 @@ $server->on('receive', function ($server, $fd, $reactorId, $data) use ($c, $pdo)
     
     // Perform the DAS lookup
     try {
-        $query = "SELECT name FROM `registry`.`domain` WHERE `name` = :domain";
+        $query = "SELECT name FROM registry.domain WHERE name = :domain";
         $stmt = $pdo->prepare($query);
         $stmt->bindParam(':domain', $domain, PDO::PARAM_STR);
         $stmt->execute();
diff --git a/rdap/start_rdap.php b/rdap/start_rdap.php
index ae64561..3e10cde 100644
--- a/rdap/start_rdap.php
+++ b/rdap/start_rdap.php
@@ -199,7 +199,7 @@ function handleDomainQuery($request, $response, $pdo, $domainName) {
     // Perform the RDAP lookup
     try {
         // Query 1: Get domain details
-        $stmt1 = $pdo->prepare("SELECT * FROM `registry`.`domain` WHERE `name` = :domain");
+        $stmt1 = $pdo->prepare("SELECT * FROM registry.domain WHERE name = :domain");
         $stmt1->bindParam(':domain', $domain, PDO::PARAM_STR);
         $stmt1->execute();
         $domainDetails = $stmt1->fetch(PDO::FETCH_ASSOC);
@@ -223,30 +223,30 @@ function handleDomainQuery($request, $response, $pdo, $domainName) {
         }
 
         // Query 2: Get status details
-        $stmt2 = $pdo->prepare("SELECT `status` FROM `domain_status` WHERE `domain_id` = :domain_id");
+        $stmt2 = $pdo->prepare("SELECT status FROM domain_status WHERE domain_id = :domain_id");
         $stmt2->bindParam(':domain_id', $domainDetails['id'], PDO::PARAM_INT);
         $stmt2->execute();
         $statuses = $stmt2->fetchAll(PDO::FETCH_COLUMN, 0);
         
         // Query: Get DNSSEC details
-        $stmt2a = $pdo->prepare("SELECT `interface` FROM `secdns` WHERE `domain_id` = :domain_id");
+        $stmt2a = $pdo->prepare("SELECT interface FROM secdns WHERE domain_id = :domain_id");
         $stmt2a->bindParam(':domain_id', $domainDetails['id'], PDO::PARAM_INT);
         $stmt2a->execute();
         $isDelegationSigned = $stmt2a->fetchColumn() > 0;
 
-        $stmt2b = $pdo->prepare("SELECT `secure` FROM `domain_tld` WHERE `tld` = :tld");
+        $stmt2b = $pdo->prepare("SELECT secure FROM domain_tld WHERE tld = :tld");
         $stmt2b->bindParam(':tld', $tld, PDO::PARAM_STR);
         $stmt2b->execute();
         $isZoneSigned = ($stmt2b->fetchColumn() == 1);
 
         // Query 3: Get registrar details
-        $stmt3 = $pdo->prepare("SELECT `name`,`iana_id`,`whois_server`,`rdap_server`,`url`,`abuse_email`,`abuse_phone` FROM `registrar` WHERE `id` = :clid");
+        $stmt3 = $pdo->prepare("SELECT name,iana_id,whois_server,rdap_server,url,abuse_email,abuse_phone FROM registrar WHERE id = :clid");
         $stmt3->bindParam(':clid', $domainDetails['clid'], PDO::PARAM_INT);
         $stmt3->execute();
         $registrarDetails = $stmt3->fetch(PDO::FETCH_ASSOC);
         
         // Query: Get registrar abuse details
-        $stmt3a = $pdo->prepare("SELECT `first_name`,`last_name` FROM `registrar_contact` WHERE `registrar_id` = :clid AND `type` = 'abuse'");
+        $stmt3a = $pdo->prepare("SELECT first_name,last_name FROM registrar_contact WHERE registrar_id = :clid AND type = 'abuse'");
         $stmt3a->bindParam(':clid', $domainDetails['clid'], PDO::PARAM_INT);
         $stmt3a->execute();
         $registrarAbuseDetails = $stmt3a->fetch(PDO::FETCH_ASSOC);
@@ -531,19 +531,19 @@ function handleEntityQuery($request, $response, $pdo, $entityHandle) {
     // Perform the RDAP lookup
     try {
         // Query 1: Get registrar details
-        $stmt1 = $pdo->prepare("SELECT `id`,`name`,`clid`,`iana_id`,`whois_server`,`rdap_server`,`url`,`email`,`abuse_email`,`abuse_phone` FROM `registrar` WHERE `iana_id` = :iana_id");
+        $stmt1 = $pdo->prepare("SELECT id,name,clid,iana_id,whois_server,rdap_server,url,email,abuse_email,abuse_phone FROM registrar WHERE iana_id = :iana_id");
         $stmt1->bindParam(':iana_id', $entity, PDO::PARAM_INT);
         $stmt1->execute();
         $registrarDetails = $stmt1->fetch(PDO::FETCH_ASSOC);
 
         // Query 2: Get registrar abuse details
-        $stmt2 = $pdo->prepare("SELECT `first_name`,`last_name` FROM `registrar_contact` WHERE `registrar_id` = :clid AND `type` = 'abuse'");
+        $stmt2 = $pdo->prepare("SELECT first_name,last_name FROM registrar_contact WHERE registrar_id = :clid AND type = 'abuse'");
         $stmt2->bindParam(':clid', $registrarDetails['id'], PDO::PARAM_STR);
         $stmt2->execute();
         $registrarAbuseDetails = $stmt2->fetch(PDO::FETCH_ASSOC);
 
         // Query 3: Get registrar abuse details
-        $stmt3 = $pdo->prepare("SELECT `org`,`street1`,`street2`,`city`,`sp`,`pc`,`cc` FROM `registrar_contact` WHERE `registrar_id` = :clid AND `type` = 'owner'");
+        $stmt3 = $pdo->prepare("SELECT org,street1,street2,city,sp,pc,cc FROM registrar_contact WHERE registrar_id = :clid AND type = 'owner'");
         $stmt3->bindParam(':clid', $registrarDetails['id'], PDO::PARAM_STR);
         $stmt3->execute();
         $registrarContact = $stmt3->fetch(PDO::FETCH_ASSOC);
@@ -729,7 +729,7 @@ function handleNameserverQuery($request, $response, $pdo, $nameserverHandle) {
     // Perform the RDAP lookup
     try {
         // Query 1: Get nameserver details
-        $stmt1 = $pdo->prepare("SELECT `id`,`name`,`clid` FROM `registry`.`host` WHERE `name` = :ns");
+        $stmt1 = $pdo->prepare("SELECT id,name,clid FROM registry.host WHERE name = :ns");
         $stmt1->bindParam(':ns', $ns, PDO::PARAM_STR);
         $stmt1->execute();
         $hostDetails = $stmt1->fetch(PDO::FETCH_ASSOC);
@@ -750,31 +750,31 @@ function handleNameserverQuery($request, $response, $pdo, $nameserverHandle) {
         }
 
         // Query 2: Get status details
-        $stmt2 = $pdo->prepare("SELECT `status` FROM `host_status` WHERE `host_id` = :host_id");
+        $stmt2 = $pdo->prepare("SELECT status FROM host_status WHERE host_id = :host_id");
         $stmt2->bindParam(':host_id', $hostDetails['id'], PDO::PARAM_INT);
         $stmt2->execute();
         $statuses = $stmt2->fetchAll(PDO::FETCH_COLUMN, 0);
         
         // Query 2a: Get associated status details
-        $stmt2a = $pdo->prepare("SELECT `domain_id` FROM `domain_host_map` WHERE `host_id` = :host_id");
+        $stmt2a = $pdo->prepare("SELECT domain_id FROM domain_host_map WHERE host_id = :host_id");
         $stmt2a->bindParam(':host_id', $hostDetails['id'], PDO::PARAM_INT);
         $stmt2a->execute();
         $associated = $stmt2a->fetchAll(PDO::FETCH_COLUMN, 0);
         
         // Query 3: Get IP details
-        $stmt3 = $pdo->prepare("SELECT `addr`,`ip` FROM `host_addr` WHERE `host_id` = :host_id");
+        $stmt3 = $pdo->prepare("SELECT addr,ip FROM host_addr WHERE host_id = :host_id");
         $stmt3->bindParam(':host_id', $hostDetails['id'], PDO::PARAM_INT);
         $stmt3->execute();
         $ipDetails = $stmt3->fetchAll(PDO::FETCH_COLUMN, 0);
 
         // Query 4: Get registrar details
-        $stmt4 = $pdo->prepare("SELECT `name`,`iana_id`,`whois_server`,`rdap_server`,`url`,`abuse_email`,`abuse_phone` FROM `registrar` WHERE `id` = :clid");
+        $stmt4 = $pdo->prepare("SELECT name,iana_id,whois_server,rdap_server,url,abuse_email,abuse_phone FROM registrar WHERE id = :clid");
         $stmt4->bindParam(':clid', $hostDetails['clid'], PDO::PARAM_INT);
         $stmt4->execute();
         $registrarDetails = $stmt4->fetch(PDO::FETCH_ASSOC);
         
         // Query 5: Get registrar abuse details
-        $stmt5 = $pdo->prepare("SELECT `first_name`,`last_name` FROM `registrar_contact` WHERE `registrar_id` = :clid AND `type` = 'abuse'");
+        $stmt5 = $pdo->prepare("SELECT first_name,last_name FROM registrar_contact WHERE registrar_id = :clid AND type = 'abuse'");
         $stmt5->bindParam(':clid', $hostDetails['clid'], PDO::PARAM_INT);
         $stmt5->execute();
         $registrarAbuseDetails = $stmt5->fetch(PDO::FETCH_ASSOC);
diff --git a/whois/port43/start_whois.php b/whois/port43/start_whois.php
index 2f9e41f..25da4de 100644
--- a/whois/port43/start_whois.php
+++ b/whois/port43/start_whois.php
@@ -84,7 +84,7 @@ $server->on('receive', function ($server, $fd, $reactorId, $data) use ($c, $pdo)
         
         // Perform the WHOIS lookup
         try {
-            $query = "SELECT `name`,`clid` FROM `host` WHERE `name` = :nameserver";
+            $query = "SELECT name,clid FROM host WHERE name = :nameserver";
             $stmt = $pdo->prepare($query);
             $stmt->bindParam(':nameserver', $nameserver, PDO::PARAM_STR);
             $stmt->execute();
@@ -93,7 +93,7 @@ $server->on('receive', function ($server, $fd, $reactorId, $data) use ($c, $pdo)
                 $res = "Server Name: ".$f['name'];
                     
             // Fetch the registrar details for this registrar using the id
-            $regQuery = "SELECT `id`,`name`,`iana_id`,`whois_server`,`url`,`abuse_email`,`abuse_phone` FROM `registrar` WHERE `id` = :clid";
+            $regQuery = "SELECT id,name,iana_id,whois_server,url,abuse_email,abuse_phone FROM registrar WHERE id = :clid";
             $regStmt = $pdo->prepare($regQuery);
             $regStmt->bindParam(':clid', $f['clid'], PDO::PARAM_INT);
             $regStmt->execute();
@@ -186,7 +186,7 @@ $server->on('receive', function ($server, $fd, $reactorId, $data) use ($c, $pdo)
         
         // Perform the WHOIS lookup
         try {
-            $query = "SELECT `id`,`name`,`iana_id`,`whois_server`,`url`,`abuse_email`,`abuse_phone` FROM `registrar` WHERE `name` = :registrar";
+            $query = "SELECT id,name,iana_id,whois_server,url,abuse_email,abuse_phone FROM registrar WHERE name = :registrar";
             $stmt = $pdo->prepare($query);
             $stmt->bindParam(':registrar', $registrar, PDO::PARAM_STR);
             $stmt->execute();
@@ -200,7 +200,7 @@ $server->on('receive', function ($server, $fd, $reactorId, $data) use ($c, $pdo)
                     ."\nRegistrar Abuse Contact Phone: ".$f['abuse_phone'];
                     
             // Fetch the contact details for this registrar using the id
-            $contactQuery = "SELECT * FROM `registrar_contact` WHERE `id` = :registrar_id";
+            $contactQuery = "SELECT * FROM registrar_contact WHERE id = :registrar_id";
             $contactStmt = $pdo->prepare($contactQuery);
             $contactStmt->bindParam(':registrar_id', $f['id'], PDO::PARAM_INT);
             $contactStmt->execute();
@@ -329,7 +329,7 @@ $server->on('receive', function ($server, $fd, $reactorId, $data) use ($c, $pdo)
 
         // Perform the WHOIS lookup
         try {
-            $query = "SELECT * FROM `registry`.`domain` WHERE `name` = :domain";
+            $query = "SELECT * FROM registry.domain WHERE name = :domain";
             $stmt = $pdo->prepare($query);
             $stmt->bindParam(':domain', $domain, PDO::PARAM_STR);
             $stmt->execute();
@@ -343,14 +343,14 @@ $server->on('receive', function ($server, $fd, $reactorId, $data) use ($c, $pdo)
                 }
                 $f['exdate'] = (new DateTime($f['exdate']))->format('Y-m-d\TH:i:s.v\Z');
                 
-                $query2 = "SELECT `tld` FROM `domain_tld` WHERE `id` = :tldid";
+                $query2 = "SELECT tld FROM domain_tld WHERE id = :tldid";
                 $stmt2 = $pdo->prepare($query2);
                 $stmt2->bindParam(':tldid', $f['tldid'], PDO::PARAM_INT);
                 $stmt2->execute();
 
                 $tld = $stmt2->fetch(PDO::FETCH_ASSOC);
             
-                $query3 = "SELECT `name`,`iana_id`,`whois_server`,`url`,`abuse_email`,`abuse_phone` FROM `registrar` WHERE `id` = :clid";
+                $query3 = "SELECT name,iana_id,whois_server,url,abuse_email,abuse_phone FROM registrar WHERE id = :clid";
                 $stmt3 = $pdo->prepare($query3);
                 $stmt3->bindParam(':clid', $f['clid'], PDO::PARAM_INT);
                 $stmt3->execute();
@@ -369,7 +369,7 @@ $server->on('receive', function ($server, $fd, $reactorId, $data) use ($c, $pdo)
                     ."\nRegistrar Abuse Contact Email: ".$clidF['abuse_email']
                     ."\nRegistrar Abuse Contact Phone: ".$clidF['abuse_phone'];
                     
-                $query4 = "SELECT `status` FROM `domain_status` WHERE `domain_id` = :domain_id";
+                $query4 = "SELECT status FROM domain_status WHERE domain_id = :domain_id";
                 $stmt4 = $pdo->prepare($query4);
                 $stmt4->bindParam(':domain_id', $f['id'], PDO::PARAM_INT);
                 $stmt4->execute();
@@ -526,7 +526,7 @@ $server->on('receive', function ($server, $fd, $reactorId, $data) use ($c, $pdo)
                     ."\nTech Email: ".$f2['email'];
                 }
 
-                $query9 = "SELECT `name` FROM `domain_host_map`,`host` WHERE `domain_host_map`.`domain_id` = :domain_id AND `domain_host_map`.`host_id` = `host`.`id`";
+                $query9 = "SELECT name FROM domain_host_map,host WHERE domain_host_map.domain_id = :domain_id AND domain_host_map.host_id = host.id";
                 $stmt9 = $pdo->prepare($query9);
                 $stmt9->bindParam(':domain_id', $f['id'], PDO::PARAM_INT);
                 $stmt9->execute();
@@ -539,7 +539,7 @@ $server->on('receive', function ($server, $fd, $reactorId, $data) use ($c, $pdo)
                      $counter++;
                 }
 
-                $query_dnssec = "SELECT EXISTS(SELECT 1 FROM `secdns` WHERE `domain_id` = :domain_id)";
+                $query_dnssec = "SELECT EXISTS(SELECT 1 FROM secdns WHERE domain_id = :domain_id)";
                 $stmt_dnssec = $pdo->prepare($query_dnssec);
                 $stmt_dnssec->bindParam(':domain_id', $f['id'], PDO::PARAM_INT);
                 $stmt_dnssec->execute();