minor updates to function and class names

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' );
 
 
 ?>