diff --git a/wp-admin/admin-ajax.php b/wp-admin/admin-ajax.php
index 1a92c0eeda..038f0048a7 100644
--- a/wp-admin/admin-ajax.php
+++ b/wp-admin/admin-ajax.php
@@ -1007,7 +1007,7 @@ case 'closed-postboxes' :
 
 	if ( is_array($hidden) ) {
 		$hidden = array_diff( $hidden, array('submitdiv', 'linksubmitdiv', 'manage-menu', 'create-menu') ); // postboxes that are always shown
-		update_user_option($user->ID, "meta-box-hidden_$page", $hidden, true);
+		update_user_option($user->ID, "metaboxhidden_$page", $hidden, true);
 	}
 
 	die('1');
diff --git a/wp-admin/includes/nav-menu.php b/wp-admin/includes/nav-menu.php
index 1ebe308721..ee320a683b 100644
--- a/wp-admin/includes/nav-menu.php
+++ b/wp-admin/includes/nav-menu.php
@@ -18,7 +18,7 @@ function wp_nav_menu_metaboxes_setup() {
 function wp_initial_nav_menu_meta_boxes() {
 	global $wp_meta_boxes;
 
-	if ( !get_user_option( 'meta-box-hidden_nav-menus' ) && is_array($wp_meta_boxes) ) {
+	if ( !get_user_option( 'metaboxhidden_nav-menus' ) && is_array($wp_meta_boxes) ) {
 
 		$initial_meta_boxes = array( 'manage-menu', 'create-menu', 'add-custom-links', 'add-page', 'add-category' );
 		$hidden_meta_boxes = array();
@@ -35,7 +35,7 @@ function wp_initial_nav_menu_meta_boxes() {
 			}
 		}
 		$user = wp_get_current_user();
-		update_user_meta( $user->ID, 'meta-box-hidden_nav-menus', $hidden_meta_boxes );
+		update_user_meta( $user->ID, 'metaboxhidden_nav-menus', $hidden_meta_boxes );
 
 		// returns all the hidden metaboxes to the js function: wpNavMenu.initial_meta_boxes()
 		return join( ',', $hidden_meta_boxes );
diff --git a/wp-admin/includes/template.php b/wp-admin/includes/template.php
index fe402d6986..7de419e077 100644
--- a/wp-admin/includes/template.php
+++ b/wp-admin/includes/template.php
@@ -2967,7 +2967,7 @@ function get_hidden_meta_boxes($screen) {
 	if ( is_string($screen) )
 		$screen = convert_to_screen($screen);
 
-	$hidden = get_user_option( "meta-box-hidden_$screen->id" );
+	$hidden = get_user_option( "metaboxhidden_$screen->id" );
 
 	// Hide slug boxes by default
 	if ( !is_array($hidden) )