diff --git a/code/SiteTreeSubsites.php b/code/SiteTreeSubsites.php
index d020095..7be2343 100644
--- a/code/SiteTreeSubsites.php
+++ b/code/SiteTreeSubsites.php
@@ -228,15 +228,15 @@ class SiteTreeSubsites extends SiteTreeDecorator {
 		return DataObject::get('RelatedPageLink', "\"RelatedPageLink\".\"RelatedPageID\" = {$this->owner->ID}
 			AND R2.\"ID\" IS NULL", '',
 			"INNER JOIN \"SiteTree\" ON \"SiteTree\".\"ID\" = \"RelatedPageLink\".\"MasterPageID\"
-			LEFT JOIN \"RelatedPageLink\" AS R2 ON R2.MasterPageID = {$this->owner->ID}
-			AND R2.RelatedPageID = RelatedPageLink.MasterPageID
+			LEFT JOIN \"RelatedPageLink\" AS R2 ON R2.\"MasterPageID\" = {$this->owner->ID}
+			AND R2.\"RelatedPageID\" = \"RelatedPageLink\".\"MasterPageID\"
 			"
 		);
 	}
 	
 	function NormalRelated() {
 		$return = new DataObjectSet();
-		$links = DataObject::get('RelatedPageLink', 'MasterPageID = ' . $this->owner->ID);
+		$links = DataObject::get('RelatedPageLink', '"MasterPageID" = ' . $this->owner->ID);
 		if($links) foreach($links as $link) {
 			if($link->RelatedPage()->exists()) {
 				$return->push($link->RelatedPage());
@@ -248,7 +248,7 @@ class SiteTreeSubsites extends SiteTreeDecorator {
 	
 	function alternateSiteConfig() {
 		if(!$this->owner->SubsiteID) return false;
-		$sc = DataObject::get_one('SiteConfig', 'SubsiteID = ' . $this->owner->SubsiteID);
+		$sc = DataObject::get_one('SiteConfig', '"SubsiteID" = ' . $this->owner->SubsiteID);
 		if(!$sc) {
 			$sc = new SiteConfig();
 			$sc->SubsiteID = $this->owner->SubsiteID;
diff --git a/code/Subsite.php b/code/Subsite.php
index 2c8c9ec..50974db 100644
--- a/code/Subsite.php
+++ b/code/Subsite.php
@@ -430,7 +430,7 @@ JS;
 
 		$rolesSubsites = DataObject::get(
 			'Subsite',
-			"\"Subsite\".Title != ''",
+			"\"Subsite\".\"Title\" != ''",
 			'',
 			"LEFT JOIN \"Group_Subsites\" 
 				ON \"Group_Subsites\".\"SubsiteID\" = \"Subsite\".\"ID\"
diff --git a/tests/SubsiteTest.php b/tests/SubsiteTest.php
index d3cbe6d..9faa80e 100644
--- a/tests/SubsiteTest.php
+++ b/tests/SubsiteTest.php
@@ -139,7 +139,7 @@ class SubsiteTest extends SapphireTest {
 		$subsite2 = $subsite1->duplicate();
 		$subsite2->activate();
 		// change content on dupe
-		$page2 = DataObject::get_one('Page', "Title = 'MyAwesomePage'");
+		$page2 = DataObject::get_one('Page', "\"Title\" = 'MyAwesomePage'");
 		$page2->Title = 'MyNewAwesomePage';
 		$page2->write();
 		$page2->doPublish();
diff --git a/tests/SubsitesVirtualPageTest.php b/tests/SubsitesVirtualPageTest.php
index be84d94..d0183dd 100644
--- a/tests/SubsitesVirtualPageTest.php
+++ b/tests/SubsitesVirtualPageTest.php
@@ -177,12 +177,12 @@ class SubsitesVirtualPageTest extends SapphireTest {
 		$page->doUnpublish();
 		
 		Subsite::changeSubsite($vp1->SubsiteID);
-		$onLive = Versioned::get_one_by_stage('SubsitesVirtualPage', 'Live', "SiteTree_Live.ID = ".$vp1->ID);
+		$onLive = Versioned::get_one_by_stage('SubsitesVirtualPage', 'Live', "\"SiteTree_Live\".\"ID\" = ".$vp1->ID);
 		$this->assertFalse($onLive, 'SVP has been removed from live');
 		
 		$subsite = $this->objFromFixture('Subsite_Template', 'subsite2');
 		Subsite::changeSubsite($vp2->SubsiteID);
-		$onLive = Versioned::get_one_by_stage('SubsitesVirtualPage', 'Live', "SiteTree_Live.ID = ".$vp2->ID);
+		$onLive = Versioned::get_one_by_stage('SubsitesVirtualPage', 'Live', "\"SiteTree_Live\".\"ID\" = ".$vp2->ID);
 		$this->assertFalse($onLive, 'SVP has been removed from live');
 	}