diff --git a/templates/navpages.php b/templates/navpages.php
index 51d4cee..43c24bc 100644
--- a/templates/navpages.php
+++ b/templates/navpages.php
@@ -14,7 +14,7 @@ foreach($site_dirs as $site_dir){
     $navsite = $navpage_template;
     $site_location = "$site_dir.$domain.$tld/$default_page";
     $site_class = "class=\"navsite_link\"";
-    $site_name = str_replace("_", " ", $site_location);
+    $site_name = str_replace("_", " ", $site_dir);
     $navsite = str_replace("__CLASS__", $site_class, $navsite);
     $navsite = str_replace("__LOCATION__", $site_location, $navsite);
     $navsite = str_replace("__NAME__", $site_name, $navsite);
@@ -34,7 +34,7 @@ foreach($site_dirs as $site_dir){
 
         $page_location = "$site_dir.$domain.$tld/$page_dir";
 
-        $page_name = str_replace("_", " ", $page_location);
+        $page_name = str_replace("_", " ", $page_dir);
 
         $navpage = str_replace("__CLASS__", $page_class, $navpage);
         $navpage = str_replace("__LOCATION__", $page_location, $navpage);