diff --git a/dev/install/config-form.html b/dev/install/config-form.html
index 9cfecc056..2b008df00 100644
--- a/dev/install/config-form.html
+++ b/dev/install/config-form.html
@@ -32,7 +32,7 @@
 							<?php if(isset($hasErrorOtherThanDatabase)) { ?>
 								<p class="message error">
 									You aren't currently able to install the software.  Please <a href="#requirements">see below</a> for details.<br>
-									If you are having problems meeting the requirements, see the <a href="http://doc.silverstripe.org/sapphire/en/installation/server-requirements">server requirements</a>.
+									If you are having problems meeting the requirements, see the <a href="http://doc.silverstripe.org/framework/en/installation/server-requirements">server requirements</a>.
 								</p>
 								<?php if (isset($phpIniLocation)) { ?>  
 									<p>Your php.ini file is located at <?php echo $phpIniLocation; ?></p>
@@ -46,7 +46,7 @@
 								<?php } else if($req->hasWarnings()) { ?>
 									<div class="message warning">
 										<p>There are some issues that we recommend you look at before installing, however, you are still able to install the software.
-										<br>Please see below for details. If you are having problems meeting the requirements, see the <a href="http://doc.silverstripe.org/sapphire/en/installation/server-requirements">server requirements</a>.</p>
+										<br>Please see below for details. If you are having problems meeting the requirements, see the <a href="http://doc.silverstripe.org/framework/en/installation/server-requirements">server requirements</a>.</p>
 									</div>
 								<?php } else if(!$dbReq->hasErrors() && !$adminReq->hasErrors()) { ?>
 									<div class="message goodInstall"><p>You're ready to install! Please confirm the configuration options below. <a href="#install">Install SilverStripe</a></p>
@@ -71,7 +71,7 @@
 							<?php $dbReq->showTable(); ?>
 							
 							<p class="helpText requirementsHelpText">
-								Read more about our <a href="http://doc.silverstripe.org/sapphire/en/installation/server-requirements" target="_blank">server requirements</a>.
+								Read more about our <a href="http://doc.silverstripe.org/framework/en/installation/server-requirements" target="_blank">server requirements</a>.
 							</p>
 							
 							<div class="action">
@@ -178,7 +178,7 @@
 										<?php if($envFileExists) { ?>
 										<div id="use_environment_field" class="field">
 											<input id="use_environment" type="checkbox" name="useEnv" <?php if($usingEnv) echo "checked=\"checked\"" ?>>
-											<label for="use_environment">Use _ss_environment file for configuration (<a href="http://doc.silverstripe.org/sapphire/en/topics/environment-management" target="_blank">?</a>)</label>
+											<label for="use_environment">Use _ss_environment file for configuration (<a href="http://doc.silverstripe.org/framework/en/topics/environment-management" target="_blank">?</a>)</label>
 										</div>
 										<?php } ?>
 										
@@ -244,7 +244,7 @@
 							<h3 class="sectionHeading">Theme selection <small>Step 4 of 5</small></h3>
 							<p class="helpText">You can change the theme or <a href="http://silverstripe.org/themes">download</a> another from the SilverStripe website after installation.</p>
 							<ul id="Themes">
-								<li><input type="radio" name="template" value="simple" id="Simple" <?php if(!isset($_POST['template']) || $_POST['template'] == 'simple') {?>checked="checked"<?php }?>><label for="Simple"><a href="https://github.com/silverstripe-themes/silverstripe-simple">Simple</a> - our default theme ready to use, or begin the <a href="http://doc.silverstripe.org/sapphire/en/tutorials" target="_blank">tutorial</a>.</label></li>
+								<li><input type="radio" name="template" value="simple" id="Simple" <?php if(!isset($_POST['template']) || $_POST['template'] == 'simple') {?>checked="checked"<?php }?>><label for="Simple"><a href="https://github.com/silverstripe-themes/silverstripe-simple">Simple</a> - our default theme ready to use, or begin the <a href="http://doc.silverstripe.org/framework/en/tutorials" target="_blank">tutorial</a>.</label></li>
 								<li><input type="radio" name="template" value="tutorial" id="EmptyTemplate" <?php if(isset($_POST['template']) && $_POST['template'] == 'tutorial') {?>checked="checked"<?php }?>><label for="EmptyTemplate">Empty template</label></li>
 							</ul>
 							<h3 class="sectionHeading" id="install">Confirm Install <small>Step 5 of 5</small></h3>
diff --git a/dev/install/php5-required.html b/dev/install/php5-required.html
index 658caa2da..8db360a21 100644
--- a/dev/install/php5-required.html
+++ b/dev/install/php5-required.html
@@ -1,7 +1,7 @@
 <html>
 	<head>
 		<title>PHP 5.3.2 is required</title>
-		<link rel="stylesheet" type="text/css" href="sapphire/dev/install/css/install.css">
+		<link rel="stylesheet" type="text/css" href="framework/dev/install/css/install.css">
 	</head>
 	<body>
 		<div id="BgContainer">
diff --git a/forms/DateField.php b/forms/DateField.php
index 7fd8ac472..36155cfff 100644
--- a/forms/DateField.php
+++ b/forms/DateField.php
@@ -37,7 +37,7 @@ require_once 'Zend/Date.php';
  * configuration accordingly. Changing the locale through {@link setLocale()} will not update the 
  * `dateformat` configuration automatically.
  * 
- * See http://doc.silverstripe.org/sapphire/en/topics/i18n for more information about localizing form fields.
+ * See http://doc.silverstripe.org/framework/en/topics/i18n for more information about localizing form fields.
  * 
  * # Usage
  * 
diff --git a/javascript/i18n.js b/javascript/i18n.js
index e039e9657..cb99aa58b 100644
--- a/javascript/i18n.js
+++ b/javascript/i18n.js
@@ -4,7 +4,7 @@ if(typeof(ss) == 'undefined') ss = {};
  * Lightweight clientside i18n implementation.
  * Caution: Only available after DOM loaded because we need to detect the language
  * 
- * For non-i18n stub implementation, see sapphire/javascript/i18nx.js
+ * For non-i18n stub implementation, see framework/javascript/i18nx.js
  * 
  * Based on jQuery i18n plugin: 1.0.0  Feb-10-2008
  * 
diff --git a/javascript/i18nx.js b/javascript/i18nx.js
index c66886a11..13e97037a 100644
--- a/javascript/i18nx.js
+++ b/javascript/i18nx.js
@@ -2,7 +2,7 @@ if(typeof(ss) == 'undefined') ss = {};
 
 /**
  * Stub implementation for ss.i18n code.
- * Use instead of sapphire/javascript/i18n.js
+ * Use instead of framework/javascript/i18n.js
  * if you want to use any SilverStripe javascript
  * without internationalization support.
  */
diff --git a/tests/core/manifest/ClassLoaderTest.php b/tests/core/manifest/ClassLoaderTest.php
index bcf4c6c3b..edcfa2c98 100644
--- a/tests/core/manifest/ClassLoaderTest.php
+++ b/tests/core/manifest/ClassLoaderTest.php
@@ -2,7 +2,7 @@
 /**
  * Tests for the {@link SS_ClassManifest} class.
  *
- * @package    sapphire
+ * @package    framework
  * @subpackage tests
  */
 class ClassLoaderTest extends SapphireTest {
diff --git a/thirdparty/greybox/greybox.js b/thirdparty/greybox/greybox.js
index 80342d984..af33ecca7 100644
--- a/thirdparty/greybox/greybox.js
+++ b/thirdparty/greybox/greybox.js
@@ -20,9 +20,9 @@ var GB_ONLY_ONE = null;
 // modified 2006-01-06 by Silverstripe Ltd.
 try {
 	var theBaseHref = document.getElementsByTagName("base")[0].href;
-	var GB_IMG_DIR = theBaseHref + "sapphire/thirdparty/greybox/"; 
+	var GB_IMG_DIR = theBaseHref + "framework/thirdparty/greybox/"; 
 } catch(err) {
-	var GB_IMG_DIR = "sapphire/thirdparty/greybox/"; 
+	var GB_IMG_DIR = "framework/thirdparty/greybox/"; 
 }
 
 function GreyBox() {
diff --git a/thirdparty/zend_translate_railsyaml/tests/TestHelper.php b/thirdparty/zend_translate_railsyaml/tests/TestHelper.php
index ec5e3f966..4706a7b3e 100644
--- a/thirdparty/zend_translate_railsyaml/tests/TestHelper.php
+++ b/thirdparty/zend_translate_railsyaml/tests/TestHelper.php
@@ -46,7 +46,7 @@ error_reporting(E_ALL | E_STRICT);
  * distribution.
  */
 $ds = DIRECTORY_SEPARATOR;
-$zfRoot        = realpath(dirname(dirname(dirname(__FILE__)))) . $ds . 'sapphire' . $ds . 'thirdparty';
+$zfRoot        = realpath(dirname(dirname(dirname(__FILE__)))) . $ds . 'framework' . $ds . 'thirdparty';
 $zfCoreLibrary = "$zfRoot";
 $zfCoreTests   = "$zfRoot/tests";
 $zfCustomLibrary = realpath(dirname(dirname(__FILE__))) . $ds . 'library';