diff --git a/code/CMSMain.php b/code/CMSMain.php
index 66b5ef6a..0aeee5d6 100755
--- a/code/CMSMain.php
+++ b/code/CMSMain.php
@@ -46,7 +46,7 @@ class CMSMain extends LeftAndMain implements CurrentPageIdentifier, PermissionPr
 		'unpublish',
 		'versions',
 		'EditForm',
-		'AddPageOptionsForm',
+		'AddForm',
 		'SiteTreeAsUL',
 		'getshowdeletedsubtree',
 		'getfilteredsubtree',
@@ -1015,7 +1015,7 @@ JS;
 		}
 	}
 
-	function AddPageOptionsForm() {
+	function AddForm() {
 		$pageTypes = array();
 
 		foreach( $this->PageTypes() as $arrayData ) {
@@ -1032,7 +1032,7 @@ JS;
 			new FormAction("addpage", _t('CMSMain.GO',"Go"))
 		);
 
-		$form = new Form($this, "AddPageOptionsForm", $fields, $actions);
+		$form = new Form($this, "AddForm", $fields, $actions);
 		
 		$form->addExtraClass('actionparams');
 		
diff --git a/javascript/CMSMain.js b/javascript/CMSMain.js
index 0a2445b0..38b3ce75 100644
--- a/javascript/CMSMain.js
+++ b/javascript/CMSMain.js
@@ -156,12 +156,12 @@
 	/**
 	 * @class Simple form with a page type dropdown
 	 * which creates a new page through #Form_EditForm and adds a new tree node.
-	 * @name ss.Form_AddPageOptionsForm
+	 * @name ss.Form_AddForm
 	 * @requires ss.i18n
 	 * @requires ss.Form_EditForm
 	 */
-	$('#Form_AddPageOptionsForm').concrete(function($) {
-	  return/** @lends ss.Form_AddPageOptionsForm */{
+	$('#Form_AddForm').concrete(function($) {
+	  return/** @lends ss.Form_AddForm */{
 			/**
 			 * @type DOMElement
 			 */
diff --git a/javascript/LeftAndMain.Tree.js b/javascript/LeftAndMain.Tree.js
index 5484dc66..d185bb57 100755
--- a/javascript/LeftAndMain.Tree.js
+++ b/javascript/LeftAndMain.Tree.js
@@ -11,7 +11,7 @@ SiteTreeHandlers.showRecord_url = 'admin/show/';
 SiteTreeHandlers.controller_url = 'admin';
 
 var _HANDLER_FORMS = {
-	addpage : 'Form_AddPageOptionsForm',
+	addpage : 'Form_AddForm',
 	batchactions : 'batchactionsforms',
 	search : 'search_options'
 };
diff --git a/templates/Includes/CMSMain_TreeTools.ss b/templates/Includes/CMSMain_TreeTools.ss
index 7c8fb207..ea9257c6 100644
--- a/templates/Includes/CMSMain_TreeTools.ss
+++ b/templates/Includes/CMSMain_TreeTools.ss
@@ -19,7 +19,7 @@
 				</ul>
 			
 				<div id="TreeActions-create">
-					$AddPageOptionsForm
+					$AddForm
 				</div>
 			
 				<div id="TreeActions-search">