diff --git a/footer.php b/footer.php
index c700d6b..05069de 100644
--- a/footer.php
+++ b/footer.php
@@ -17,7 +17,7 @@
 </div><!-- #push -->
 
 <div id="menu"><?php /* Our navigation menu.  If one isn't filled out, wp_nav_menu falls back to wp_page_menu.  The menu assiged to the primary position is the one used. If none is assigned, the menu with the lowest ID is used.  */ ?>
-<?php wp_nav_menu( array( 'container_class' => 'menu-footer', 'theme_location' => 'primary' ) ); ?>
+<?php wp_nav_menu( array( 'container_class' => 'melville_footer_menu', 'theme_location' => 'footer-menu' ) ); ?>
 </div> <!-- #menu -->
 
 <div id="footer">
diff --git a/functions.php b/functions.php
index 7c60229..2824d33 100644
--- a/functions.php
+++ b/functions.php
@@ -66,7 +66,7 @@ function melville_setup() {
 	// This theme uses wp_nav_menu() in one locations.
 	register_nav_menus( array(
     'header-menu' => __( 'Header Menu', 'twentyten'),
-		'primary' => __( 'Footer Navigation Menu', 'twentyten' )
+		'footer-menu' => __( 'Footer Menu', 'twentyten' )
 	) );
 }
 endif;
@@ -323,7 +323,7 @@ function melville_theme_options_page() { ?>
 
 add_theme_support( 'align-wide' );
 
-function twentyten_widgets_init() {
+function melville_widgets_init() {
 
 	// Area 3, located in the footer. Empty by default.
 	register_sidebar(
@@ -378,7 +378,7 @@ function twentyten_widgets_init() {
 	);
 }
 /** Register sidebars by running twentyten_widgets_init() on the widgets_init hook. */
-add_action( 'widgets_init', 'twentyten_widgets_init' );
+add_action( 'widgets_init', 'melville_widgets_init' );
 
 
 ?>
diff --git a/header.php b/header.php
index cd78986..03e334c 100644
--- a/header.php
+++ b/header.php
@@ -64,7 +64,7 @@
 <body <?php body_class(); ?>>
 <div id="wrapper">
 <?php /* Our navigation menu.  If one isn't filled out, wp_nav_menu falls back to wp_page_menu.  The menu assiged to the primary position is the one used. If none is assigned, the menu with the lowest ID is used.  */ ?>
-  <?php wp_nav_menu( array( 'container_class' => 'melville_menu', 'theme_location' => 'header-menu' ) ); ?>
+  <?php wp_nav_menu( array( 'container_class' => 'melville_header_menu', 'theme_location' => 'header-menu' ) ); ?>
 
 	<div id="header">
 		<?php $heading_tag = ( is_home() || is_front_page() ) ? 'h1' : 'div'; ?>
