diff --git a/code/SubsitesVirtualPage.php b/code/SubsitesVirtualPage.php
index fe61c4b..6625f4f 100644
--- a/code/SubsitesVirtualPage.php
+++ b/code/SubsitesVirtualPage.php
@@ -3,7 +3,7 @@ class SubsitesVirtualPage extends VirtualPage {
 
 	private static $description = 'Displays the content of a page on another subsite';
 
-	public static $db = array(
+	private static $db = array(
 		'CustomMetaTitle' => 'Varchar(255)',
 		'CustomMetaKeywords' => 'Varchar(255)',
 		'CustomMetaDescription' => 'Text',
diff --git a/code/extensions/FileSubsites.php b/code/extensions/FileSubsites.php
index 1f00f37..e0db45a 100644
--- a/code/extensions/FileSubsites.php
+++ b/code/extensions/FileSubsites.php
@@ -10,10 +10,9 @@ class FileSubsites extends DataExtension {
 	// considered 'global', unless set otherwise
 	static $default_root_folders_global = false;
 	
-	public static $has_one=array(
+	private static $has_one=array(
 		'Subsite' => 'Subsite',
 	);
-	
 
 	/**
 	 * Amends the CMS tree title for folders in the Files & Images section.
diff --git a/code/extensions/GroupSubsites.php b/code/extensions/GroupSubsites.php
index e3cbd87..fcadc1f 100644
--- a/code/extensions/GroupSubsites.php
+++ b/code/extensions/GroupSubsites.php
@@ -6,19 +6,18 @@
  */
 class GroupSubsites extends DataExtension implements PermissionProvider {
 
-	public static $db=array(
+	private static $db = array(
 		'AccessAllSubsites' => 'Boolean'
 	);
-	
-	public static $many_many=array(
+
+	private static $many_many = array(
 		'Subsites' => 'Subsite'
 	);
-	
-	public static $defaults=array(
+
+	private static $defaults = array(
 		'AccessAllSubsites' => true
 	);
-	
-	
+
 	/**
 	 * Migrations for GroupSubsites data.
 	 */
diff --git a/code/extensions/LeftAndMainSubsites.php b/code/extensions/LeftAndMainSubsites.php
index a9cbe76..5c82ac3 100644
--- a/code/extensions/LeftAndMainSubsites.php
+++ b/code/extensions/LeftAndMainSubsites.php
@@ -6,7 +6,7 @@
  */
 class LeftAndMainSubsites extends Extension {
 
-	static $allowed_actions = array('CopyToSubsite');
+	private static $allowed_actions = array('CopyToSubsite');
 
 	function init() {
 		Requirements::css('subsites/css/LeftAndMain_Subsites.css');
diff --git a/code/extensions/SiteConfigSubsites.php b/code/extensions/SiteConfigSubsites.php
index 3c82bd2..c8b5fb5 100644
--- a/code/extensions/SiteConfigSubsites.php
+++ b/code/extensions/SiteConfigSubsites.php
@@ -4,11 +4,11 @@
  * Extension for the SiteConfig object to add subsites support
  */
 class SiteConfigSubsites extends DataExtension {		
-	public static $has_one=array(
+
+	private static $has_one = array(
 		'Subsite' => 'Subsite', // The subsite that this page belongs to
 	);
 	
-	
 	/**
 	 * Update any requests to limit the results to the current site
 	 */
diff --git a/code/extensions/SiteTreeSubsites.php b/code/extensions/SiteTreeSubsites.php
index 0f839fe..8057a5a 100644
--- a/code/extensions/SiteTreeSubsites.php
+++ b/code/extensions/SiteTreeSubsites.php
@@ -4,19 +4,19 @@
  * Extension for the SiteTree object to add subsites support
  */
 class SiteTreeSubsites extends DataExtension {
-	
-	public static $has_one=array(
+
+	private static $has_one = array(
 		'Subsite' => 'Subsite', // The subsite that this page belongs to
 	);
-	
-	public static $many_many=array(
+
+	private static $many_many = array(
 		'CrossSubsiteLinkTracking' => 'SiteTree' // Stored separately, as the logic for URL rewriting is different
 	);
-	
-	public static $many_many_extraFields=array(
+
+	private static $many_many_extraFields = array(
 		"CrossSubsiteLinkTracking" => array("FieldName" => "Varchar")
 	);
-	
+
 	function isMainSite() {
 		if($this->owner->SubsiteID == 0) return true;
 		return false;
diff --git a/code/model/Subsite.php b/code/model/Subsite.php
index 959dd27..5ef97ee 100644
--- a/code/model/Subsite.php
+++ b/code/model/Subsite.php
@@ -21,9 +21,9 @@ class Subsite extends DataObject implements PermissionProvider {
 
 	static $write_hostmap = true;
 	
-	static $default_sort = "\"Title\" ASC";
+	private static $default_sort = "\"Title\" ASC";
 
-	static $db = array(
+	private static $db = array(
 		'Title' => 'Varchar(255)',
 		'RedirectURL' => 'Varchar(255)',
 		'DefaultSite' => 'Boolean',
@@ -38,22 +38,22 @@ class Subsite extends DataObject implements PermissionProvider {
 		'PageTypeBlacklist' => 'Text',
 	);
 	
-	static $has_one = array(
+	private static $has_one = array(
 	);
 	
-	static $has_many = array(
+	private static $has_many = array(
 		'Domains' => 'SubsiteDomain',
 	);
 	
-	static $belongs_many_many = array(
+	private static $belongs_many_many = array(
 		"Groups" => "Group",
 	);
 
-	static $defaults = array(
+	private static $defaults = array(
 		'IsPublic' => 1
 	);
 
-	static $searchable_fields = array(
+	private static $searchable_fields = array(
 		'Title' => array(
 			'title' => 'Subsite Name'
 		),
@@ -65,7 +65,7 @@ class Subsite extends DataObject implements PermissionProvider {
 		),	
 	);
 
-	static $summary_fields = array(
+	private static $summary_fields = array(
 		'Title' => 'Subsite Name',
 		'PrimaryDomain' => 'Primary Domain',
 		'IsPublic' => 'Active subsite',
diff --git a/code/model/SubsiteDomain.php b/code/model/SubsiteDomain.php
index f3130e7..0ba1677 100644
--- a/code/model/SubsiteDomain.php
+++ b/code/model/SubsiteDomain.php
@@ -1,19 +1,21 @@
 <?php
 
 class SubsiteDomain extends DataObject {
-	static $db = array(
+
+	private static $db = array(
 		"Domain" => "Varchar(255)",
 		"IsPrimary" => "Boolean",
 	);
-	static $has_one = array(
+
+	private static $has_one = array(
  		"Subsite" => "Subsite",
 	);
-	
-	public static $summary_fields=array(
+
+	private static $summary_fields=array(
 		'Domain'=>'Domain',
 		'IsPrimary'=>'Is Primary Domain'
 	);
-	
+
 	/**
 	 * Whenever a Subsite Domain is written, rewrite the hostmap
 	 *