diff --git a/event-scripts/apache2_dav b/event-scripts/apache2_dav
index b9385d4..d94e572 100755
--- a/event-scripts/apache2_dav
+++ b/event-scripts/apache2_dav
@@ -33,7 +33,7 @@ APACHE_SHARE_TEMPLATE=$(cat - <<-"EOF"
 	# this is an automatically generarted file for the CryptoNAS
 	# please do not change
 	<Location "/cryptonas/_VOLUME_NAME_">
-		\tDav filesystem
+		Dav filesystem
 	</Location>
 EOF
 )
diff --git a/templates/footer.cs b/templates/footer.cs
index f75bbc6..93246c3 100644
--- a/templates/footer.cs
+++ b/templates/footer.cs
@@ -14,7 +14,7 @@
 
 	<tr><td/><td><div id="footer">
 		<?cs var:Data.Version ?>&nbsp;&nbsp;
-		<a href="http://cryptobox.org" title="<?cs var:html_escape(Lang.Text.ProjectHomePage) ?>">CryptoBox-Home</a>&nbsp;&nbsp;&nbsp;<?cs var:html_escape(Lang.Text.ProjectNote) ?>&nbsp;<a href="http://senselab.org/" title="systemausfall.org">sense.lab</a>
+		<a href="http://cryptonas.org" title="<?cs var:html_escape(Lang.Text.ProjectHomePage) ?>">CryptoNAS-Home</a>&nbsp;&nbsp;&nbsp;<?cs var:html_escape(Lang.Text.ProjectNote) ?>&nbsp;<a href="http://senselab.org/" title="systemausfall.org">sense.lab</a>
 	</div></td><td/></tr>
 	<?cs # ugly way of getting a 'min-width' for IE6 ?>
 	<tr><td/><td><p style="width:600px;" /><td/></tr>
diff --git a/templates/header.cs b/templates/header.cs
index 5f26c64..307033f 100644
--- a/templates/header.cs
+++ b/templates/header.cs
@@ -72,7 +72,7 @@ if:subcount(Data.StylesheetFiles) > 0
 		<table> 
 		<tr><td>
 			<a href="<?cs call:link("", "", "", "", "")
-					?>" title="CryptoBox"><img src="cryptobox-misc/cbx_logo_left.png" 
+					?>" title="CryptoNAS"><img src="cryptobox-misc/cryptonas_logo_left.png" 
 					alt="icon: logo" /></a>
 			<h2><?cs var:html_escape(Lang.Title.Slogan) ?></h2>
 		</td>
@@ -83,7 +83,7 @@ if:subcount(Data.StylesheetFiles) > 0
 				set:logoFile = "cbx_logo_right.png" ?><?cs
 			/if ?>
 			<div class="logo_right"><a href="<?cs call:link("", "", "", "", "")
-					?>" title="CryptoBox"><img src="cryptobox-misc/<?cs var:logoFile
+					?>" title="CryptoNAS"><img src="cryptobox-misc/<?cs var:logoFile
 					?>" alt="icon: logo" />
 			</a></div>
 			<?cs call:help_link() ?>