diff --git a/README.txt b/README.txt
index cb087d03d..1ec0bd17e 100644
--- a/README.txt
+++ b/README.txt
@@ -1,5 +1,4 @@
-AnnotateModels
-==============
+== AnnotateModels
 
 Add a comment summarizing the current schema to the top of each ActiveRecord model source file.
 
@@ -21,29 +20,27 @@ Note that this code will blow away the initial comment block in your models if i
 previously added by annotate models, so you don't want to add additional text to an automatically 
 created comment block.
 
-Install
-=======
+== Install
 
   sudo gem install sake annotate_models
   
-Usage
-=====
+== Usage
+
   cd [your project]
   annotate
 
-Source
-======
+== Source
 
   http://github.com/ctran/annotate_models
   
   
-Author:
+== Author
    Dave Thomas
    Pragmatic Programmers, LLC
 
 Released under the same license as Ruby. No Support. No Warranty. 
 
 
-Modifications by:
+== Modifications
  - alex@pivotallabs.com
  - ctran@pragmaquest.com
diff --git a/config/hoe.rb b/config/hoe.rb
index 13a6d924d..190cd0d20 100644
--- a/config/hoe.rb
+++ b/config/hoe.rb
@@ -3,7 +3,7 @@
 AUTHOR = 'Dave Thomas'  # can also be an array of Authors
 EMAIL = "ctran@pragmaquest.com"
 DESCRIPTION = "Add a comment summarizing the current schema to the top of each ActiveRecord model source file"
-GEM_NAME = 'annotate_models' # what ppl will type to install your gem
+GEM_NAME = 'annotate-models' # what ppl will type to install your gem
 RUBYFORGE_PROJECT = 'annotate-models' # The unix name for your project
 HOMEPATH = "http://#{RUBYFORGE_PROJECT}.rubyforge.org"
 DOWNLOAD_PATH = "http://rubyforge.org/projects/#{RUBYFORGE_PROJECT}"
diff --git a/website/index.html b/website/index.html
index 4e86655e6..f5fa2e8d7 100644
--- a/website/index.html
+++ b/website/index.html
@@ -5,7 +5,7 @@
   <link rel="stylesheet" href="stylesheets/screen.css" type="text/css" media="screen" />
   <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
   <title>
-      annotate_models
+      annotate-models
   </title>
   <script src="javascripts/rounded_corners_lite.inc.js" type="text/javascript"></script>
 <style>
@@ -30,12 +30,12 @@
 <body>
 <div id="main">
 
-    <h1>annotate_models</h1>
+    <h1>annotate-models</h1>
     <div id="version" class="clickable" onclick='document.location = "http://rubyforge.org/projects/annotate-models"; return false'>
       <p>Get Version</p>
       <a href="http://rubyforge.org/projects/annotate-models" class="numbers">1.0.0</a>
     </div>
-    <h1>&#x2192; &#8216;annotate_models&#8217;</h1>
+    <h1>&#x2192; &#8216;annotate-models&#8217;</h1>
 
 
 	<h2>What</h2>
@@ -45,7 +45,7 @@ <h2>Installing</h2>
 
 
 	<p><pre class='syntax'>
-  <span class="ident">sudo</span> <span class="ident">gem</span> <span class="ident">install</span> <span class="ident">annotate_models</span>
+  <span class="ident">sudo</span> <span class="ident">gem</span> <span class="ident">install</span> <span class="ident">annotate</span><span class="punct">-</span><span class="ident">models</span>
 </pre></p>
 
 
diff --git a/website/index.txt b/website/index.txt
index 6a1be1c56..a9fe0c168 100644
--- a/website/index.txt
+++ b/website/index.txt
@@ -1,6 +1,6 @@
-h1. annotate_models
+h1. annotate-models
 
-h1. &#x2192; 'annotate_models'
+h1. &#x2192; 'annotate-models'
 
 
 h2. What
@@ -9,7 +9,7 @@ h2. What
 h2. Installing
 
 <pre syntax="ruby">
-  sudo gem install annotate_models
+  sudo gem install annotate-models
 </pre>
 
 h2. The basics
diff --git a/website/template.rhtml b/website/template.rhtml
index c6fae5957..692a4d699 100644
--- a/website/template.rhtml
+++ b/website/template.rhtml
@@ -37,7 +37,7 @@
     </div>
     <%= body %>
     <p class="coda">
-      <a href="ctran@pragmaquest.com">Cuong Tran</a>, <%= modified.pretty %><br>
+      <a href="http://www.pragmaquest.com">Cuong Tran</a>, <%= modified.pretty %><br>
       Theme extended from <a href="http://rb2js.rubyforge.org/">Paul Battley</a>
     </p>
 </div>
