diff --git a/Home.md b/Home.md
index e8abc2a..d627202 100644
--- a/Home.md
+++ b/Home.md
@@ -1,10 +1,10 @@
 
 
 <div style="margin-right: 60; float: left; width:50%;">
-	<h1 style="color: #2f8ab5; font-family: helvetica, arial, sans-serif">Welcome to Allmydata.org "Tahoe"</h1>
+	<h1 style="color: #2f8ab5; font-family: helvetica, arial, sans-serif">Welcome to Tahoe-LAFS</h1>
 		<div style="margin-right: 400">
 			<p>
-				Tahoe is a secure, decentralized, fault-tolerant filesystem. All of the source code is available under a choice of two Free Software, Open Source licences. 
+				Tahoe-LAFS is a secure, decentralized, fault-tolerant filesystem. All of the source code is available under a choice of two Free Software, Open Source licences. 
 				This filesystem is encrypted and spread over multiple peers in such a way that it remains available even when some of the peers are unavailable, malfunctioning, or malicious.</p>
 <p><a href="<http://allmydata.org/source/tahoe/trunk/docs/about.html>"><img src="(@@http://testgrid.allmydata.org:3567/file/URI%3ACHK%3A6opfg3uvhrvixw7c5u7kye3bjq%3Aeiqvmup7yog2rlwa2acoom2jrmgciuwr5bw5vkemxuqyg2jfbsqq%3A3%3A10%3A50638/@@named=/network-and-reliance-topology-thumb512.png@@)"></img></a></p>
 <p><a href="<http://allmydata.org/source/tahoe/trunk/docs/about.html>">The one-page summary</a> explains the unique properties of this system.</p>
@@ -12,7 +12,7 @@
 		
  <h1 style="color: #2f8ab5; font-family: helvetica, arial, sans-serif; margin-top: 10">Get Started</h1>
   <ul>
-    <li><a href="<http://testgrid.allmydata.org:3567/uri/URI%3ADIR2%3Adjrdkfawoqihigoett4g6auz6a%3Ajx5mplfpwexnoqff7y5e4zjus4lidm76dcuarpct7cckorh2dpgq>">Try Tahoe-LAFS without installing it.</a> (See also <a href="<http://allmydata.org/trac/tahoe/wiki/TestGrid>">the [TestGrid](TestGrid) Page</a> on the wiki.)</li>
+    <li><a href="<http://testgrid.allmydata.org:3567/uri/URI%3ADIR2%3Adjrdkfawoqihigoett4g6auz6a%3Ajx5mplfpwexnoqff7y5e4zjus4lidm76dcuarpct7cckorh2dpgq>">Try Tahoe-LAFS now!</a> (For more information see <a href="<http://allmydata.org/trac/tahoe/wiki/TestGrid>">the [TestGrid](TestGrid) Page</a> on the wiki.)</li>
     <li><a href="<http://allmydata.org/source/tahoe/trunk/docs/install.html>">Download</a> and install it on your own system.</li>
   </ul>
     
@@ -20,19 +20,19 @@
   <ul>
     <li><a href="<http://allmydata.org/cgi-bin/mailman/listinfo/tahoe-dev>">The tahoe-dev mailing list</a> is the community forum.</li>
     <li><a href="<http://allmydata.org/cgi-bin/mailman/listinfo/tahoe-announce>">The tahoe-announce mailing list</a> is a low-volume mailing list for announcements.</li>
-    <li><a href="<http://allmydata.org/trac/tahoe/wiki/Dev>">The Dev page</a> is the place to start hacking on Tahoe.</li>
+    <li><a href="<http://allmydata.org/trac/tahoe/wiki/Dev>">The Dev page</a> is the place to start hacking on Tahoe-LAFS.</li>
   </ul>
 
  <h1 style="color: #2f8ab5; font-family: helvetica, arial, sans-serif; margin-top: 10">Documentation</h1>
   <ul>
-    <li>See <a href="<http://allmydata.org/trac/tahoe/wiki/Doc>">the Doc page</a> for explanation of how Tahoe works.</li>
+    <li>See <a href="<http://allmydata.org/trac/tahoe/wiki/Doc>">the Doc page</a> for explanation of how Tahoe-LAFS works.</li>
     <li>See <a href="<http://allmydata.org/trac/tahoe/wiki/TracStartingPoints>">TracStartingPoints</a> for how to use this bug-tracker/source-code-browser/wiki.</li>
     <li><a href="<http://allmydata.org/trac/tahoe/wiki/TitleIndex>">TitleIndex</a> is a complete list of pages on this wiki.</li>
   </ul>
 
   <h1 style="color: #2f8ab5; font-family: helvetica, arial, sans-serif; margin-top: 10">Sponsorship</h1>
 		<p>
-			<a href="<http://www.allmydata.com/index.php?tracking=allmydata_org>">allmydata.com</a> sponsors the Tahoe project by providing hardware and data-center facilities along with the initial developer time. We are eternally grateful for their generous and public-spirited support. Please contact secorp@allmydata.org if you would like to sponsor Tahoe too!
+			<a href="<http://www.allmydata.com/index.php?tracking=allmydata_org>">allmydata.com</a> sponsors the Tahoe-LAFS project by providing hardware and data-center facilities along with the initial developer time. We are eternally grateful for their generous and public-spirited support. Please contact secorp@allmydata.org if you would like to sponsor Tahoe-LAFS too!
 		</p>
 	<h1 style="color: #2f8ab5; font-family: helvetica, arial, sans-serif">Buzz</h1>
 <p>what others are saying</p>
@@ -52,7 +52,7 @@ Carbonite CEO: Online Backups Sell</a></td></tr>
 <div style="margin-left: 60px">
 	<h1 style="color: #2f8ab5; font-family: helvetica, arial, sans-serif; margin-top: 10">Donate!</h1>
 		<p>
-			&nbsp;&nbsp;&nbsp;&nbsp;You can sponsor the Tahoe project!
+			&nbsp;&nbsp;&nbsp;&nbsp;You can sponsor the Tahoe-LAFS project!
 <form action="<https://www.paypal.com/cgi-bin/webscr>" method="post">
 <input type="hidden" name="cmd" value="_s-xclick">
 <input type="hidden" name="hosted_button_id" value="5529087">
@@ -64,11 +64,11 @@ Carbonite CEO: Online Backups Sell</a></td></tr>
 	<h1 style="color: #2f8ab5; font-family: helvetica, arial, sans-serif">Latest News</h1> 
 
 		<p>
- 			<b>2009-05-27</b> -- The <a href="<http://blog.okfn.org/2009/05/13/launch-of-open-data-grid/>">Open Knowledge Foundation</a> is now running a Tahoe grid!
+ 			<b>2009-05-27</b> -- The <a href="<http://blog.okfn.org/2009/05/13/launch-of-open-data-grid/>">Open Knowledge Foundation</a> is now running a Tahoe-LAFS grid!
 		<p>
  			<b>2009-05-07</b> -- The <em><strong>"Hack Tahoe!"</strong></em> Contest <a href="<http://hacktahoe.org>">Hall of Fame</a> has been updated to show a picture of Christian Grothoff's smiling face as he receives his personalized <em><strong>"I Hacked Tahoe"</strong></em> t-shirt.
 		<p>
- 			<b>2009-04-18</b> -- NEWSFLASH!  Tahoe Developer Goes Crazy -- <a href="<http://testgrid.allmydata.org:3567/uri/URI:DIR2-RO:j74uhg25nwdpjpacl6rkat2yhm:kav7ijeft5h7r7rxdp5bgtlt3viv32yabqajkrdykozia5544jqa/wiki.html#%5B%5BLaptop%20Versus%20Axe%5D%5D>">Laptop Versus Axe!</a> -- Chaos On Stage At [CodeCon](CodeCon) -- Film at 11
+ 			<b>2009-04-18</b> -- NEWSFLASH!  Tahoe-LAFS Developer Goes Crazy -- <a href="<http://testgrid.allmydata.org:3567/uri/URI:DIR2-RO:j74uhg25nwdpjpacl6rkat2yhm:kav7ijeft5h7r7rxdp5bgtlt3viv32yabqajkrdykozia5544jqa/wiki.html#%5B%5BLaptop%20Versus%20Axe%5D%5D>">Laptop Versus Axe!</a> -- Chaos On Stage At [CodeCon](CodeCon) -- Film at 11
 		</p>
 		<p>
  			<b>2009-04-13</b> -- v1.4 released! This is a major release adding garbage collection, improved diagnostics, and fixing a major performance problem with downloading multi-GB files. Please see the <a href="<http://allmydata.org/trac/tahoe/browser/relnotes.txt?rev=8c687c78dac5b56a>">Release Notes.</a>