diff --git a/mozilla/webtools/hendrix/index.cgi b/mozilla/webtools/hendrix/index.cgi
index 29bc91ba19d..343d32c8024 100755
--- a/mozilla/webtools/hendrix/index.cgi
+++ b/mozilla/webtools/hendrix/index.cgi
@@ -44,7 +44,7 @@ my $STATIC_CAPTCHA_RESULT = "7";
 my %product_destination_map = (
 	"Firefox"                       => "mozilla.feedback.firefox",
 	"Firefox Release Candidate"     => "mozilla.feedback.firefox.prerelease",
-	"Gran Paradiso"                 => "mozilla.feedback.firefox.prerelease",
+	"Shiretoko"                     => "mozilla.feedback.firefox.prerelease",
 	"Minefield"                     => "mozilla.feedback",
 	"Thunderbird"                   => "mozilla.feedback.thunderbird",
 	"Thunderbird Release Candidate" => "mozilla.feedback.thunderbird.prerelease",
@@ -60,7 +60,7 @@ my %product_destination_map = (
 # List of products to show on the main Hendrix page (in order)
 my @products_list = (
 	"Firefox", "Firefox Release Candidate", "Thunderbird", 
-  "Thunderbird Release Candidate", "Gran Paradiso", "Minefield", 
+  "Thunderbird Release Candidate", "Shiretoko", "Minefield", 
   "Camino", "SeaMonkey", "Mozilla Suite", "Sunbird", 
 	"Developer Center", "Other"
 );
diff --git a/mozilla/webtools/hendrix/template/index.html.tmpl b/mozilla/webtools/hendrix/template/index.html.tmpl
index 0fb1926583b..2e06817eb65 100644
--- a/mozilla/webtools/hendrix/template/index.html.tmpl
+++ b/mozilla/webtools/hendrix/template/index.html.tmpl
@@ -88,23 +88,22 @@ function onLoad() {
    onload = "onLoad()"
 %]
 
-<p>This is Hendrix - the mozilla.org system for leaving quick feedback on and suggestions for our products. </p>
+<p style="text-align: center; color: darkred">
+<b>Please accept our thanks, but do not expect a response to feedback sumitted here.</b></p>
 
 <fieldset>
   <legend>Other Options</legend>
   <ul>
-  <li><b>Need help or support?</b> 
+  <li><b>Need support?</b> 
       <a href="http://www.mozilla.org/support/">Go here</a>
-  <li><b>Broken website in Firefox?</b> 
-      Pull down the Help menu and select "Report Broken Web Site"
+  <li><b>Broken website?</b> 
+      Pull down the Help menu in Firefox and select "Report Broken Web Site"
   <li><b>Specific and detailed bug report?</b> 
       <a href="https://bugzilla.mozilla.org/enter_bug.cgi">Go here</a>
   </ul>
 </fieldset>
 
-<p>
-Information from this form will be published to a newsgroup or mailing list so project contributors can read it. <b>Do not submit private information.</b> Your email address will be obfuscated to make life difficult for spammers.
-</p>
+<br>
 
 <form id="feedback-form" method="POST">
   <table id="feedback-table">
@@ -147,7 +146,7 @@ Information from this form will be published to a newsgroup or mailing list so p
     </tr>
     <tr>
       <td class="label">
-        Detailed Comments: 
+        Detailed Feedback: 
       </td>
       <td class="widget">
         <textarea id="comments" name="comments" wrap="hard" cols="72"
@@ -183,6 +182,8 @@ Information from this form will be published to a newsgroup or mailing list so p
   <input type="hidden" name="action" value="submit"/>  
 </form>
 
-<p>Due to the number of suggestions and comments that are received, you should not expect a direct response. But your views are important to us, so please do let us know what you think.</p>
+<p>
+Information submitted here will be publicly-readable. <b>Do not submit private information.</b> Your email address will be obfuscated to make life difficult for spammers.
+</p>
 
 [% PROCESS footer.html.tmpl %]