diff --git a/content/details/05_left b/content/details/05_left
index 13e7d49..bade88f 100644
--- a/content/details/05_left
+++ b/content/details/05_left
@@ -5,7 +5,7 @@
 		<p>Take a look at the <a
 			href="http://devel.cryptobox.org/file/trunk/README">README
 			file</a>. There you find more detailed information about the
-			installation and configuration of the CryptoBox-Server
+			installation and configuration of the CryptoNAS-Server
 			package.</p>
 	</div>
 
diff --git a/content/details/10_content b/content/details/10_content
index 6c38c2a..68cfbf2 100644
--- a/content/details/10_content
+++ b/content/details/10_content
@@ -1,6 +1,6 @@
 <div class="content">
-	<h2>Requirements for the CryptoBox live-CD</h2>
-	<p>The <i>CryptoBox live-CD</i> runs on any x86 compatible PC with:</p>
+	<h2>Requirements for the CryptoNAS live-CD</h2>
+	<p>The <i>CryptoNAS live-CD</i> runs on any x86 compatible PC with:</p>
 	<ul>
 		<li>CPU: min. 200MHz</li>
 		<li>RAM: 64 MB</li>
@@ -8,7 +8,7 @@
 		<li>a network connection</li>
 		<li>a harddisk for your data</li>
 	</ul>
-	<p>The harddisk does not need to inside the of CryptoBox computer. You
+	<p>The harddisk does not need to be inside of the CryptoNAS computer. You
 	can also use external devices like USB-drives.
 	All drives supported by the Linux kernel (2.6.20) can be used: IDE,
 	SCSI, USB, FireWire, SATA, RAID, ...</p>
@@ -19,8 +19,8 @@
 </div>
 
 <div class="content">
-	<h2>Requirements of the CryptoBox-Server</h2>
-	<p>The <i>CryptoBox-Server</i> package can be installed on any system with at least:</p>
+	<h2>Requirements of the CryptoNAS-Server</h2>
+	<p>The CryptoNAS-Server package can be installed on any system with at least:</p>
 	<ul>
 		<li>Linux kernel 2.6</li>
 		<li>cryptsetup with LUKS support</li>
@@ -36,14 +36,14 @@
 <div class="content">
 	<h2>File access</h2>
 	<p>Once you openend an encrypted volume through the web frontend of
-	the <i>CryptoBox</i> you can access the volume's data within your local
+	the CryptoNAS you can access the volume's data within your local
 	network via:</p>
 	<ul>
 		<li>Samba shares (also known as: <i>windows network share</i>)</li>
 		<!-- <li>WebDAV (aka: <i>web folder</i>)</li>
 		<li>nfs (*nix file sharing)</li> -->
 	</ul>
-	<p>The <i>CryptoBox-Server</i> package will smoothly integrate into your existing
+	<p>The <i>CryptoNAS-Server</i> package will smoothly integrate into your existing
 	fileserver. It provides mount points which can be shared via your
 	favourite protocols (e.g.: WebDAV or NFS).</p>
 </div>
@@ -57,8 +57,7 @@
 	href="http://devel.cryptobox.org/wiki/faq">FAQ</a>.</p>
 	<p>You can select your favourite encryption algorithm from all
 	ciphers supported by the linux kernel. The default is
-	<i>aes-cbc-essiv:sha256</i> (AES in CBC mode with ESSIV based on
-	SHA256).</p>
+	<i>aes-cbc-essiv:sha256</i>.</p>
 </div>
 
 
diff --git a/content/development/02_top b/content/development/02_top
index 6af3075..7847ace 100644
--- a/content/development/02_top
+++ b/content/development/02_top
@@ -1,7 +1,6 @@
 <div class="centercontent">
 	<h2>Contribute</h2>
 	<p>You are not just a consumer. At least not in the Open Source world.</p>
-	<p>There are various ways to take part in improving the CryptoBox
-		for all of us ...</p>
+	<p>There are various ways to take part in the CryptoNAS project - for all of us ...</p>
 </div>
 
diff --git a/content/development/10_center b/content/development/10_center
index fbb16bc..a6c3e4e 100644
--- a/content/development/10_center
+++ b/content/development/10_center
@@ -1,6 +1,6 @@
 <div class="content">
 	<h2>Translation center</h2>
-	<p>We want <i>you</i> to translate the CryptoBox!</p>
+	<p>We want <i>you</i> to translate the CryptoNAS!</p>
 	<p>This way you can help others to access the CryptoBox in their native language.
 		The <a href="http://translate.cryptobox.org/projects/cryptobox/">translation center</a> serves
 		this purpose. Just register and use the webinterface for translations.
@@ -28,7 +28,7 @@
 
 <div class="content">
 	<h2>Bleeding edge source code</h2>
-	<p>The current source code of the <i>CryptoBox-Server</i> package is always
+	<p>The current source code of the <i>CryptoNAS-Server</i> package is always
 		available via our <a href="https://svn.systemausfall.org/svn/cryptobox/"
 		title="browse subversion repository">Subversion repository</a>.</p>
 	<p><a href="http://devel.cryptobox.org/wiki/SvnNotes">Read more ...</a></p>
@@ -40,7 +40,7 @@
 	all the people for their help (in order of appearance). So, thank you!
 	:)</p>
 	<ul>
-		<li><a href="http://codecoop.org">codecoop.org</a> - webspace</li>
+		<li><a href="http://codecoop.org">CodeCoop</a> - webspace</li>
 		<li>Clavdia Horvat, Tadej Brce &amp; Dusan Rebolj - Slovenian translation</li>
 		<li>Rike - French translation</li>
 		<li>Fabrizio Tarizzo - Italian translation</li>
@@ -55,7 +55,7 @@
 
 <div class="content">
 		<h2>Acknowledgements</h2>
-		<p>The CryptoBox project heavily depends on the following Free Software
+		<p>The CryptoNAS project heavily depends on the following Free Software
 		projects. Thanks for your hard work!</p>
 		<ul>
 			<li><a href="http://kernel.org">Linux kernel</a></li>
@@ -66,9 +66,9 @@
 			<li><a href="http://www.saout.de/misc/dm-crypt">DM-crypt</a></li>
 			<li><a href="http://luks.endorphin.org">CryptSetup LUKS</a></li>
 			<li><a href="http://www.voidspace.org.uk/python/configobj.html">ConfigObj</a></li>
-			<li>...</li>
+            <li>...</li>
 		</ul>
-		<p>This list is by far incomplete - so: thanks to everyone involved in
+		<p>This list is by far incomplete. So thanks to everyone else involved in
 		improving Free Software!</p>
 </div>
 
diff --git a/content/download/05_left b/content/download/05_left
index fe11736..8bcc24f 100644
--- a/content/download/05_left
+++ b/content/download/05_left
@@ -13,19 +13,18 @@
 	<div class="leftcontent">
 		<h2>Planned major releases:</h2>
 		<p>Server package:</p>
-		<ul><li>v0.4 <span class="date">09/20/02007</span></li></ul>
+		<ul><li>v0.4 <span class="date">24/12/02007</span></li></ul>
 		<p>Live-CD:</p>
-		<ul><li>v0.4.x <span class="date">10/10/02007</span></li></ul>
+		<ul><li>v0.4.x <span class="date">24/12/02007</span></li></ul>
 		<p>Read the <a href="http://devel.cryptobox.org/roadmap">development roadmap</a>
 			for more details.</p>
 	</div>
 
 	<div class="leftcontent">
 		<h2>Details</h2>
-		<p>Read what's <a href="details.html">under the hood</a> of the CryptoBox.</p>
+		<p>Read what's <a href="details.html">under the hood</a> of the CryptoNAS.</p>
 	</div>
 
-
 	<div class="leftcontent">
 		<h2>License</h2>
 		<p>All code is licensed under the <a href="http://www.fsf.org/licensing/licenses/gpl.html">GPL</a>.</p>
diff --git a/content/download/10_center b/content/download/10_center
index 451d1c6..7f45570 100644
--- a/content/download/10_center
+++ b/content/download/10_center
@@ -1,5 +1,5 @@
 <div class="content">
-	<h2>CryptoBox live-CD</h2>
+	<h2>CryptoNAS live-CD</h2>
 	<p>Get the latest <i>CryptoBox live-CD</i> image and burn it on a CD.</p>
 	<p><a href="%(current-cd-url)s">CryptoBox live-CD download</a></p>
 	<p>Follow <a
@@ -10,20 +10,20 @@
 </div>
 
 <div class="content">
-	<h2>CryptoBox-Server Debian package</h2>
+	<h2>CryptoNAS-Server Debian package</h2>
 	<p>Use the <i>CryptoBox-Server</i> package in your Debian/Ubuntu Linux system.</p>
 	<p><a href="%(current-server-url)s">CryptoBox-Server debian package
 		download</a><br /></p>
 	<p><br />Install it with: <tt>dpkg -i cryptobox-server.deb</tt></p>
 	<p>We strongly recommend to use the server package of our
-		(inofficial) debian package repository instead installing manually,
+		debian package repository instead installing manually,
 		as it is much easier to maintain. Take a look at the <a
 		href="http://devel.cryptobox.org/wiki/faq#HowdoIusetheserverpackagefromtheDebianrepository">FAQ</a>
 		for details.</p>
 </div>
 
 <div class="content">
-	<h2>CryptoBox-Server source files</h2>
+	<h2>CryptoNAS-Server source files</h2>
 	<p>Users of a non-debian-based Linux distributions have to fetch
 	the source file. The installation procedure is easy but you have to fulfil
 	some software dependencies, which might be uncomfortable depending on you Linux distribution.</p>
diff --git a/content/index/02_top b/content/index/02_top
index 1d80c42..d15b835 100644
--- a/content/index/02_top
+++ b/content/index/02_top
@@ -1,18 +1,17 @@
 <div class="centercontent">
 	<h2>What is it about?</h2>
-	<p>The CryptoBox project aims to bring data encryption to the masses.</p>
-	<p>Therefore we develop two Free Software packages:</p>
+	<p>The CryptoNAS project brings data encryption to the masses.</p>
 	<ul>
-		<li>The <b>CryptoBox live-CD</b> is made for people who want to encrypt
+		<li>The <b>CryptoNAS live-CD</b> is made for people who want to encrypt
 			their data without bothering about complicated technical issues.<br/>
-			A computer running the CryptoBox live-CD works as a fileserver/NAS
-			and encrypts your private data.</li>
+			A computer running the CryptoNAS live-CD works as a fileserver (NAS)
+			that encrypts your private data.</li>
 		<br/>
-		<li>The <b>CryptoBox-Server package</b> adds a user friendly,
-			web-based frontend for harddisk encryption to a fileserver.</li>
+		<li>The <b>CryptoNAS-Server package</b> adds a user friendly,
+			web-based frontend for harddisk encryption to an existing fileserver.</li>
 	</ul>
-	<p>Take a look at the <a href="cartoon.html">CryptoBox usage example</a>!<br />
-	It may give you a better understanding of what the CryptoBox does and how it
+	<p>Take a look at the <a href="cartoon.html">CryptoNAS usage example</a>!<br />
+	It may give you a better understanding of what the CryptoNAS does and how it
 	works. </p>
 </div>
 
diff --git a/content/index/10_center b/content/index/10_center
index fcaca99..5f83f09 100644
--- a/content/index/10_center
+++ b/content/index/10_center
@@ -1,11 +1,9 @@
 <div class="content">
-	<h2>CryptoBox is looking for a new name. Vote now!</h2>
-    <p>Due to some legal reasons this project needs a new name. We collected <a href="http://devel.cryptobox.org/wiki/NameProposals">your suggestions</a> and now you can decide. If you like more than one name, vote twice or more. The poll is open until 2007-11-25. Have fun!
+	<h2>CrypoBox is now CryptoNAS</h2>
+    <p>Due to some legal reasons this project needed a new name. So
+    don't feel confused if you stumble upon CryptoBox in the
+    Documentation, Translation or Code. The complete namechange will take a while.
     </p>
-    <div align="center">
-        <script language="javascript" src="http://www.polldaddy.com/p/138126.js"> </script>
-        <noscript> <a href ="http://www.polldaddy.com/poll.asp?p=138126" >Vote now!</a></noscript>
-    </div>
 </div>
 
 <div class="content">
diff --git a/content/news/10_center b/content/news/10_center
index 6b6002e..057b465 100644
--- a/content/news/10_center
+++ b/content/news/10_center
@@ -1,3 +1,11 @@
+<div class="centercontent">
+	<h2>NEWS: Crypto[Box/NAS] name change</h2>
+	<p class="date">06/12/02007</p>
+    <p>The name-change-poll made it clear. We will call the CryptoBox
+    CryptoNAS now. Under the hood it stays the same solid, user-friendly, strong
+    encrypting fileserver. </p>
+    <!-- <p>Please update your links to <a href="http://cryptonas.org">http://cryptonas.org</a>! </p> -->
+</div>
 <div class="centercontent">
 	<h2>NEWS: CodeCoop up 'n running</h2>
 	<p class="date">22/11/02007</p>
diff --git a/content/support/05_left b/content/support/05_left
index f910525..6bb214f 100644
--- a/content/support/05_left
+++ b/content/support/05_left
@@ -2,7 +2,7 @@
 
 	<div class="leftcontent">
 		<h2>Missing your language?</h2>
-		<p>The CryptoBox is easily extensible via plugins. It also has
+		<p>The CryptoNAS is easily extensible via plugins. It also has
 		support for multiple languages. You can help us with some 
 		<a href="http://translate.cryptobox.org/projects/cryptobox/">translations</a>.</p>
 	</div>
diff --git a/content/support/10_center b/content/support/10_center
index 7db33db..3567faa 100644
--- a/content/support/10_center
+++ b/content/support/10_center
@@ -7,9 +7,9 @@
 
 <div class="content">
 	<h2>Let us know!</h2>
-	<p>Write us your experiences with the CryptoBox. In which
+	<p>Write us your experiences with the CryptoNAS. In which
 	environment do you use it? Is it useful for your private stuff or do
 	you use it in a bigger network? Did you run into any trouble with
 	installation or configuration? Are some important things missing?
-	Which hardware serves your CryptoBox? How's the usability?</p>
+	Which hardware serves your CryptoNAS? How's the usability?</p>
 </div>