diff --git a/code/controllers/CMSMain.php b/code/controllers/CMSMain.php
index ce569cfd..7ede328e 100644
--- a/code/controllers/CMSMain.php
+++ b/code/controllers/CMSMain.php
@@ -1254,8 +1254,8 @@ class CMSMain extends LeftAndMain implements CurrentPageIdentifier, PermissionPr
 			$pages = null;
 		}
 
-		$content = new HtmlEditorField('Content');
-		$download = new HtmlEditorField('Download');
+		$content = new HTMLEditorField('Content');
+		$download = new HTMLEditorField('Download');
 
 		foreach($newPageSet as $i => $page) {
 			$page->HasBrokenLink = 0;
diff --git a/code/model/SiteTree.php b/code/model/SiteTree.php
index c2e79033..1af2a475 100755
--- a/code/model/SiteTree.php
+++ b/code/model/SiteTree.php
@@ -1815,7 +1815,7 @@ class SiteTree extends DataObject implements PermissionProvider,i18nEntityProvid
 					new TextField("Title", $this->fieldLabel('Title')),
 					$urlsegment,
 					new TextField("MenuTitle", $this->fieldLabel('MenuTitle')),
-					$htmlField = new HtmlEditorField("Content", _t('SiteTree.HTMLEDITORTITLE', "Content", 'HTML editor title')),
+					$htmlField = new HTMLEditorField("Content", _t('SiteTree.HTMLEDITORTITLE', "Content", 'HTML editor title')),
 					ToggleCompositeField::create('Metadata', _t('SiteTree.MetadataToggle', 'Metadata'),
 						array(
 							$metaFieldDesc = new TextareaField("MetaDescription", $this->fieldLabel('MetaDescription')),
diff --git a/tests/model/SiteTreeHTMLEditorFieldTest.php b/tests/model/SiteTreeHTMLEditorFieldTest.php
index b8d66602..8e0f378c 100644
--- a/tests/model/SiteTreeHTMLEditorFieldTest.php
+++ b/tests/model/SiteTreeHTMLEditorFieldTest.php
@@ -1,12 +1,12 @@
 <?php
-class SiteTreeHtmlEditorFieldTest extends FunctionalTest {
-	protected static $fixture_file = 'SiteTreeHtmlEditorFieldTest.yml';
+class SiteTreeHTMLEditorFieldTest extends FunctionalTest {
+	protected static $fixture_file = 'SiteTreeHTMLEditorFieldTest.yml';
 
 	protected static $use_draft_site = true;
 
 	public function setUp() {
 		parent::setUp();
-		AssetStoreTest_SpyStore::activate('SiteTreeHtmlEditorFieldTest');
+		AssetStoreTest_SpyStore::activate('SiteTreeHTMLEditorFieldTest');
 		$this->logInWithPermission('ADMIN');
 
 		// Write file contents
@@ -25,7 +25,7 @@ class SiteTreeHtmlEditorFieldTest extends FunctionalTest {
 
 	public function testLinkTracking() {
 		$sitetree = $this->objFromFixture('SiteTree', 'home');
-		$editor   = new HtmlEditorField('Content');
+		$editor   = new HTMLEditorField('Content');
 
 		$aboutID   = $this->idFromFixture('SiteTree', 'about');
 		$contactID = $this->idFromFixture('SiteTree', 'contact');
@@ -64,7 +64,7 @@ class SiteTreeHtmlEditorFieldTest extends FunctionalTest {
 
 	public function testFileLinkTracking() {
 		$sitetree = $this->objFromFixture('SiteTree', 'home');
-		$editor   = new HtmlEditorField('Content');
+		$editor   = new HTMLEditorField('Content');
 		$fileID   = $this->idFromFixture('File', 'example_file');
 
 		$editor->setValue(sprintf(
@@ -98,7 +98,7 @@ class SiteTreeHtmlEditorFieldTest extends FunctionalTest {
 
 	public function testImageInsertion() {
 		$sitetree = new SiteTree();
-		$editor   = new HtmlEditorField('Content');
+		$editor   = new HTMLEditorField('Content');
 
 		$editor->setValue('<img src="assets/example.jpg" />');
 		$editor->saveInto($sitetree);
@@ -121,7 +121,7 @@ class SiteTreeHtmlEditorFieldTest extends FunctionalTest {
 
 	public function testImageTracking() {
 		$sitetree = $this->objFromFixture('SiteTree', 'home');
-		$editor = new HtmlEditorField('Content');
+		$editor = new HTMLEditorField('Content');
 		$file = $this->objFromFixture('Image', 'example_image');
 
 		$editor->setValue(sprintf('[image src="%s" id="%d"]', $file->getURL(), $file->ID));
@@ -144,7 +144,7 @@ class SiteTreeHtmlEditorFieldTest extends FunctionalTest {
 
 	public function testBrokenSiteTreeLinkTracking() {
 		$sitetree = new SiteTree();
-		$editor   = new HtmlEditorField('Content');
+		$editor   = new HTMLEditorField('Content');
 
 		$this->assertFalse((bool) $sitetree->HasBrokenLink);
 
@@ -167,7 +167,7 @@ class SiteTreeHtmlEditorFieldTest extends FunctionalTest {
 
 	public function testBrokenFileLinkTracking() {
 		$sitetree = new SiteTree();
-		$editor   = new HtmlEditorField('Content');
+		$editor   = new HTMLEditorField('Content');
 
 		$this->assertFalse((bool) $sitetree->HasBrokenFile);
 
diff --git a/tests/model/SiteTreeHtmlEditorFieldTest.yml b/tests/model/SiteTreeHTMLEditorFieldTest.yml
similarity index 100%
rename from tests/model/SiteTreeHtmlEditorFieldTest.yml
rename to tests/model/SiteTreeHTMLEditorFieldTest.yml