diff --git a/Makefile b/Makefile
index a456141..87dcd6e 100644
--- a/Makefile
+++ b/Makefile
@@ -1,15 +1,13 @@
-#
-# This makefile is a secondary way of installing SilverStripe.
-# It is used for things like continuous integration
-#
-# Most users should simply visit the site root in your web browser.
-#
-
 update:
-	# sapphire master
-	if [ -d $(CURDIR)/src/sapphire_master ]; then cd $(CURDIR)/src/sapphire_master; git pull -q; else git clone -q git://github.com/silverstripe/sapphire.git $(CURDIR)/src/sapphire_master; fi
+	# remove any existing sapphire master locations, as we renamed from sapphire to framework
+	if [ -d $(CURDIR)/src/sapphire_master ]; then rm -rf $(CURDIR)/src/sapphire_master; fi
+
+	# framework master
+	if [ -d $(CURDIR)/src/framework_master ]; then cd $(CURDIR)/src/framework_master; git pull -q; else git clone -q git://github.com/silverstripe/sapphire.git $(CURDIR)/src/framework_master; fi
+
 	# sapphire 2.4
 	if [ -d $(CURDIR)/src/sapphire_2.4 ]; then cd $(CURDIR)/src/sapphire_2.4; git pull -q; else git clone -q --branch 2.4 git://github.com/silverstripe/sapphire.git $(CURDIR)/src/sapphire_2.4; fi
+
 	# sapphire 2.3
 	if [ -d $(CURDIR)/src/sapphire_2.3 ]; then cd $(CURDIR)/src/sapphire_2.3; git pull -q; else git clone -q --branch 2.3 git://github.com/silverstripe/sapphire.git $(CURDIR)/src/sapphire_2.3; fi
 
@@ -19,12 +17,3 @@ update:
 test:
 	$(MAKE) QUERYSTRING="$(QUERYSTRING)&SkipTests=RestfulServiceTest" -C sapphire test
 
-getallmodules:
-	if [ -d auth_openid ]; then svn update auth_openid; else svn co http://svn.silverstripe.com/open/modules/auth_openid/trunk auth_openid; fi
-	if [ -d blog ]; then svn update blog; else svn co http://svn.silverstripe.com/open/modules/blog/trunk blog; fi
-	if [ -d cmsworkflow ]; then svn update cmsworkflow; else svn co http://svn.silverstripe.com/open/modules/cmsworkflow/trunk cmsworkflow; fi
-	if [ -d forum ]; then svn update forum; else svn co http://svn.silverstripe.com/open/modules/forum/trunk forum; fi
-	if [ -d genericdataadmin ]; then svn update genericdataadmin; else svn co http://svn.silverstripe.com/open/modules/genericdataadmin/trunk genericdataadmin; fi
-	if [ -d multiform ]; then svn update multiform; else svn co http://svn.silverstripe.com/open/modules/multiform/trunk multiform; fi
-	if [ -d subsites ]; then svn update subsites; else svn co http://svn.silverstripe.com/open/modules/subsites/trunk subsites; fi
-	if [ -d userforms ]; then svn update userforms; else svn co http://svn.silverstripe.com/open/modules/userforms/trunk userforms; fi
diff --git a/mysite/_config.php b/mysite/_config.php
index 61ec25a..e4002ef 100644
--- a/mysite/_config.php
+++ b/mysite/_config.php
@@ -38,7 +38,7 @@ $isRunningTest = (
 if(!$isRunningTest) {
 	Director::addRules(10, array(
 		'$Action' => 'DocumentationViewer',
-		'' => '->sapphire/en/'
+		'' => '->framework/en/'
 	));
 }
 
@@ -46,7 +46,7 @@ DocumentationService::set_automatic_registration(false);
 DocumentationSearch::enable();
 
 try{	
-	DocumentationService::register("sapphire", BASE_PATH ."/src/sapphire_master/docs/", 'trunk');
+	DocumentationService::register("framework", BASE_PATH ."/src/framework_master/docs/", 'trunk');
 	DocumentationService::register("sapphire", BASE_PATH ."/src/sapphire_2.4/docs/", '2.4');
 	DocumentationService::register("sapphire", BASE_PATH ."/src/sapphire_2.3/docs/", '2.3');
 } catch(InvalidArgumentException $e) {
@@ -65,7 +65,7 @@ Validator::set_javascript_validation_handler('none');
 
 DocumentationSearch::set_meta_data(array(
 	'ShortName' => 'SilverStripe Documentation',
-	'Description' => 'Documentation for SilverStripe CMS and the Sapphire Framework',
+	'Description' => 'Documentation for SilverStripe CMS / Framework',
 	'Tags' => 'silverstripe sapphire php framework cms content management system'
 ));