diff --git a/themes/three_nids/controllers/admin_theme_3nids.php b/themes/three_nids/controllers/admin_theme_3nids.php
index d5869b2e..7f586fd5 100644
--- a/themes/three_nids/controllers/admin_theme_3nids.php
+++ b/themes/three_nids/controllers/admin_theme_3nids.php
@@ -18,11 +18,11 @@
  * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-class Admin_theme_three_nids_Controller extends Admin_Controller {
+class Admin_three_nids_Controller extends Admin_Controller {
   public function index() {
     // Generate a new admin page.
     $view = new Admin_View("admin.html");
-    $view->content = new View("admin_theme_three_nids.html");
+    $view->content = new View("admin_three_nids.html");
 
     // Generate a form for Google Maps Settings.
     $view->content->theme_form = $this->_get_three_nids_form();
@@ -35,7 +35,7 @@ class Admin_theme_three_nids_Controller extends Admin_Controller {
 
   private function _get_three_nids_form() {
     // Make a new form for inputing information associated with google maps.
-    $form = new Forge("admin/theme_three_nids/savethree_nidsprefs", "", "post",
+    $form = new Forge("admin/three_nids/savethree_nidsprefs", "", "post",
                       array("id" => "gTagsMapAdminForm"));
 
     // Input box for the Maps API Key
@@ -74,6 +74,6 @@ class Admin_theme_three_nids_Controller extends Admin_Controller {
 
     // Display a success message and redirect back to the TagsMap admin page.
     message::success(t("Your Settings Have Been Saved."));
-    url::redirect("admin/theme_three_nids");
+    url::redirect("admin/three_nids");
   }
 }
\ No newline at end of file
diff --git a/themes/three_nids/helpers/comment_3nids.php b/themes/three_nids/helpers/comment_three_nids.php
similarity index 100%
rename from themes/three_nids/helpers/comment_3nids.php
rename to themes/three_nids/helpers/comment_three_nids.php
diff --git a/themes/three_nids/helpers/three_nids.php b/themes/three_nids/helpers/three_nids.php
index 131429f9..5d93a7f6 100644
--- a/themes/three_nids/helpers/three_nids.php
+++ b/themes/three_nids/helpers/three_nids.php
@@ -18,7 +18,7 @@
  * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-class theme_three_nids_Core {
+class three_nids_Core {
   public function fancylink($item, $view_type="album", $group_img = true,
                             $display_comment = true, $parent_title_class = "h2") {
     // view_type = album || dynamic || header
diff --git a/themes/three_nids/views/album.html.php b/themes/three_nids/views/album.html.php
index 5cbbd983..ab67f100 100644
--- a/themes/three_nids/views/album.html.php
+++ b/themes/three_nids/views/album.html.php
@@ -16,7 +16,7 @@ $children_offset = ($theme->pagination->current_page -1) * $page_size ;
   <? if (count($children)): ?>
     <? for ($i = 0; $i < $children_offset; $i++): ?>
        <? $child = $children_all[$i] ?>
-       <?= theme_three_nids::fancylink($child, "header") ?>
+       <?= three_nids::fancylink($child, "header") ?>
     <? endfor ?>
 
     <? foreach ($children as $i => $child): ?>
@@ -26,7 +26,7 @@ $children_offset = ($theme->pagination->current_page -1) * $page_size ;
       <? endif ?>
       <li id="g-item-id-<?= $child->id ?>" class="g-item <?= $item_class ?>">
         <?= $theme->thumb_top($child) ?>
-        <?= theme_three_nids::fancylink($child, "album") ?>
+        <?= three_nids::fancylink($child, "album") ?>
         <?= $theme->thumb_bottom($child) ?>
         <?= $theme->context_menu($child, "#g-item-id-{$child->id} .g-thumbnail") ?>
       </li>
@@ -34,7 +34,7 @@ $children_offset = ($theme->pagination->current_page -1) * $page_size ;
 
     <? for($i= $children_offset + $page_size; $i < $children_count; $i++): ?>
        <? $child = $children_all[$i] ?>
-       <?= theme_three_nids::fancylink($child, "header") ?>
+       <?= three_nids::fancylink($child, "header") ?>
     <? endfor ?>
   <? else: ?>
     <? if ($user->admin || access::can("add", $item)): ?>
diff --git a/themes/three_nids/views/dynamic.html.php b/themes/three_nids/views/dynamic.html.php
index a8cf8b01..7c0e7131 100644
--- a/themes/three_nids/views/dynamic.html.php
+++ b/themes/three_nids/views/dynamic.html.php
@@ -14,7 +14,7 @@
 <ul id="g-album-grid" class="ui-helper-clearfix">
 <? for($i=0;$i<$children_offset;$i++): ?>
 	<? $child = $children_all[$i] ?>
-	<?= theme_three_nids::fancylink($child,"header") ?>
+	<?= three_nids::fancylink($child,"header") ?>
 <? endfor ?>
 
   <? foreach ($children as $i => $child): ?>
@@ -22,7 +22,7 @@
   <!--<li class="g-Item <?= $child->is_album() ? "g-album" : "" ?>">!-->
   <li id="g-item-id-<?= $child->id ?>" class="g-item g-album">
 	<?= $theme->thumb_top($child) ?>
-	<?= theme_three_nids::fancylink($child,"dynamic") ?>
+	<?= three_nids::fancylink($child,"dynamic") ?>
 	<?= $theme->thumb_bottom($child) ?>
 	<?= $theme->context_menu($child, "#g-ItemId-{$child->id} .g-Thumbnail") ?>
   </li>
@@ -30,7 +30,7 @@
 </ul>
 <? for($i=$children_offset+$page_size;$i<$children_count;$i++): ?>
 	 <? $child = $children_all[$i] ?>
-	<?= theme_three_nids::fancylink($child,"header") ?>
+	<?= three_nids::fancylink($child,"header") ?>
 <? endfor ?>
 <?= $theme->dynamic_bottom() ?>
 
diff --git a/themes/three_nids/views/image_block_block.html.php b/themes/three_nids/views/image_block_block.html.php
index bbe6062b..0b56af20 100644
--- a/themes/three_nids/views/image_block_block.html.php
+++ b/themes/three_nids/views/image_block_block.html.php
@@ -1,3 +1,3 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
 
-<?= theme_three_nids::fancylink($item, "dynamic", false, false, "h4") ?>
+<?= three_nids::fancylink($item, "dynamic", false, false, "h4") ?>
diff --git a/themes/three_nids/views/search.html.php b/themes/three_nids/views/search.html.php
index 6c38deb1..0699decd 100644
--- a/themes/three_nids/views/search.html.php
+++ b/themes/three_nids/views/search.html.php
@@ -13,19 +13,19 @@
   <ul id="g-album-grid" class="ui-helper-clearfix">
 <? for($i=0;$i<$children_offset;$i++): ?>
 	<? $child = $children_all[$i] ?>
-	<?= theme_three_nids::fancylink($child,"header") ?>
+	<?= three_nids::fancylink($child,"header") ?>
 <? endfor ?>
 <? foreach ($items as $child): ?>
   <li id="g-item-id-<?= $child->id ?>" class="g-item g-album">
 	<?= $theme->thumb_top($child) ?>
-	<?= theme_three_nids::fancylink($child,"dynamic") ?>
+	<?= three_nids::fancylink($child,"dynamic") ?>
 	<?= $theme->thumb_bottom($child) ?>
 	<?= $theme->context_menu($child, "#g-item-id-{$child->id} .g-thumbnail") ?>
   </li>
 <? endforeach ?>
 <? for($i=$children_offset+$page_size;$i<$children_count;$i++): ?>
 	 <? $child = $children_all[$i] ?>
-	<?= theme_three_nids::fancylink($child,"header") ?>
+	<?= three_nids::fancylink($child,"header") ?>
 <? endfor ?>
 </ul>
   <?= $theme->paginator() ?>