diff --git a/_config.php b/_config.php
index 96363ff6..e2e0eebe 100644
--- a/_config.php
+++ b/_config.php
@@ -9,7 +9,7 @@ Director::addRules(50, array(
 	'admin/newsletter/$Action/$ID' => 'NewsletterAdmin',
 	'admin/reports/$Action/$ID' => 'ReportAdmin',
 	'admin/assets/$Action/$ID' => 'AssetAdmin',
-	'admin/feedback/$Action' => 'FeedbackAdmin',
+	'admin/comments/$Action' => 'CommentAdmin',
 	'admin/ReportField/$Action/$ID/$Type/$OtherID' => 'ReportField_Controller',
 	'admin/bulkload/$Action/$ID/$OtherID' => 'BulkLoaderAdmin',
 	'admin/$Action/$ID/$OtherID' => 'CMSMain',
diff --git a/code/FeedbackAdmin.php b/code/CommentAdmin.php
similarity index 95%
rename from code/FeedbackAdmin.php
rename to code/CommentAdmin.php
index 5a92e371..9bb3adb5 100644
--- a/code/FeedbackAdmin.php
+++ b/code/CommentAdmin.php
@@ -1,19 +1,19 @@
 <?php
 
-class FeedbackAdmin extends LeftAndMain {
+class CommentAdmin extends LeftAndMain {
 	
 	public function init() {
 		parent::init();
 		
-		Requirements::javascript("cms/javascript/FeedbackAdmin_right.js");
+		Requirements::javascript("cms/javascript/CommentAdmin_right.js");
 	}
 	
 	public function Link($action = null) {
-		return "admin/feedback/$action";
+		return "admin/comments/$action";
 	}
 	
 	public function showtable($params) {
-	    return $this->getLastFormIn($this->renderWith('FeedbackAdmin_right'));
+	    return $this->getLastFormIn($this->renderWith('CommentAdmin_right'));
 	}
 	
 	public function Section() {
diff --git a/code/LeftAndMain.php b/code/LeftAndMain.php
index 84450bac..f287c596 100644
--- a/code/LeftAndMain.php
+++ b/code/LeftAndMain.php
@@ -154,7 +154,7 @@ abstract class LeftAndMain extends Controller {
 			"Newsletters" => array("newsletter", "admin/newsletter/", "NewsletterAdmin"),
 			"Reports" => array("report", "admin/reports/", "ReportAdmin"),
 			"Security" => array("security", "admin/security/", "SecurityAdmin"),
-			"Feedback" => array("feedback", "admin/feedback/", "FeedbackAdmin"),
+			"Comments" => array("comments", "admin/comments/", "CommentAdmin"),
 			"Help" => array("help", "http://userhelp.silverstripe.com"),
 		);
 
diff --git a/css/layout.css b/css/layout.css
index 09a7b5d9..e3983269 100644
--- a/css/layout.css
+++ b/css/layout.css
@@ -201,7 +201,7 @@ html>body #top #MainMenu li {
 #top #MainMenu #Menu-report { background-image: url(../images/mainmenu/reports.gif); }
 #top #MainMenu #Menu-newsletter { background-image: url(../images/mainmenu/emails.gif); }
 #top #MainMenu #Menu-files { background-image: url(../images/mainmenu/files.gif); }
-#top #MainMenu #Menu-feedback { background-image: url(../images/mainmenu/feedback.gif); }
+#top #MainMenu #Menu-comments { background-image: url(../images/mainmenu/comments.gif); }
 
 #top #MainMenu #Menu-help { background-image: url(../images/mainmenu/help.gif); 
 	float: right;
diff --git a/images/mainmenu/feedback.gif b/images/mainmenu/comments.gif
similarity index 100%
rename from images/mainmenu/feedback.gif
rename to images/mainmenu/comments.gif
diff --git a/javascript/FeedbackAdmin_right.js b/javascript/CommentAdmin_right.js
similarity index 78%
rename from javascript/FeedbackAdmin_right.js
rename to javascript/CommentAdmin_right.js
index 5b0b280c..cbb94814 100644
--- a/javascript/FeedbackAdmin_right.js
+++ b/javascript/CommentAdmin_right.js
@@ -3,7 +3,7 @@ Behaviour.register({
 		getPageFromServer : function(id) {
 			statusMessage("loading...");
 			
-			var requestURL = 'admin/feedback/showtable/' + id;
+			var requestURL = 'admin/comments/showtable/' + id;
 			
 			this.loadURLFromServer(requestURL);
 			
diff --git a/templates/Includes/FeedbackAdmin_SiteTree.ss b/templates/Includes/CommentAdmin_SiteTree.ss
similarity index 70%
rename from templates/Includes/FeedbackAdmin_SiteTree.ss
rename to templates/Includes/CommentAdmin_SiteTree.ss
index 373efd3b..da70ae26 100644
--- a/templates/Includes/FeedbackAdmin_SiteTree.ss
+++ b/templates/Includes/CommentAdmin_SiteTree.ss
@@ -2,13 +2,13 @@
 	<li id="$ID" class="Root"><a>Comments</a>
 		<ul>
 			<li id="record-approved" <% if Section=approved %>class="current"<% end_if %>>
-				<a href="$baseURL/admin/feedback/showtable/approved" title="Approved">Approved</a>
+				<a href="$baseURL/admin/comments/showtable/approved" title="Approved">Approved</a>
 			</li>
 			<li id="record-unmoderated" <% if Section=unmoderated %>class="current"<% end_if %>>
-				<a href="$baseURL/admin/feedback/showtable/unmoderated" title="Awaiting Moderation">Awaiting Moderation</a>
+				<a href="$baseURL/admin/comments/showtable/unmoderated" title="Awaiting Moderation">Awaiting Moderation</a>
 			</li>
 			<li id="record-spam">
-				<a href="$baseURL/admin/feedback/showtable/spam" title="Spam" <% if Section=spam %>class="current"<% end_if %>>Spam</a>
+				<a href="$baseURL/admin/comments/showtable/spam" title="Spam" <% if Section=spam %>class="current"<% end_if %>>Spam</a>
 			</li>
 		</ul>
 	</li>
diff --git a/templates/Includes/CommentAdmin_left.ss b/templates/Includes/CommentAdmin_left.ss
new file mode 100644
index 00000000..c9b6ba29
--- /dev/null
+++ b/templates/Includes/CommentAdmin_left.ss
@@ -0,0 +1,7 @@
+<div class="title"><div>Comments</div></div>
+
+<div id="treepanes">
+	<div id="sitetree_holder">
+		<% include CommentAdmin_SiteTree %>
+	</div>
+</div>
\ No newline at end of file
diff --git a/templates/Includes/CommentAdmin_right.ss b/templates/Includes/CommentAdmin_right.ss
new file mode 100644
index 00000000..df9c0937
--- /dev/null
+++ b/templates/Includes/CommentAdmin_right.ss
@@ -0,0 +1,14 @@
+<div class="title"><div>Comment Management</div></div>
+
+<div id="form_actions_right" class="ajaxActions">
+</div>
+
+<% if EditForm %>
+	$EditForm
+<% else %>
+	<form id="Form_EditForm" action="admin/comments?executeForm=EditForm" method="post" enctype="multipart/form-data">
+		<p>Welcome to the $ApplicationName comment management. Please select a folder in the tree on the left.</p>
+	</form>
+<% end_if %>
+
+<p id="statusMessage" style="visibility:hidden"></p>
diff --git a/templates/Includes/FeedbackAdmin_left.ss b/templates/Includes/FeedbackAdmin_left.ss
deleted file mode 100644
index dfbdb467..00000000
--- a/templates/Includes/FeedbackAdmin_left.ss
+++ /dev/null
@@ -1,7 +0,0 @@
-<div class="title"><div>Feedback</div></div>
-
-<div id="treepanes">
-	<div id="sitetree_holder">
-		<% include FeedbackAdmin_SiteTree %>
-	</div>
-</div>
\ No newline at end of file
diff --git a/templates/Includes/FeedbackAdmin_right.ss b/templates/Includes/FeedbackAdmin_right.ss
deleted file mode 100644
index 937f95da..00000000
--- a/templates/Includes/FeedbackAdmin_right.ss
+++ /dev/null
@@ -1,14 +0,0 @@
-<div class="title"><div>Feedback Management</div></div>
-
-<div id="form_actions_right" class="ajaxActions">
-</div>
-
-<% if EditForm %>
-	$EditForm
-<% else %>
-	<form id="Form_EditForm" action="admin/feedback?executeForm=EditForm" method="post" enctype="multipart/form-data">
-		<p>Welcome to the $ApplicationName feedback management. Please select a folder in the tree on the left.</p>
-	</form>
-<% end_if %>
-
-<p id="statusMessage" style="visibility:hidden"></p>