diff --git a/header.php b/header.php
index 6ead771fe..567b5e231 100644
--- a/header.php
+++ b/header.php
@@ -30,7 +30,7 @@
 			<h2 class="site-description"><?php bloginfo( 'description' ); ?></h2>
 		</hgroup>
 
-		<nav class="main-navigation" role="navigation">
+		<nav class="site-navigation main-navigation" role="navigation">
 			<h3 class="assistive-text"><?php _e( 'Show navigation', 'twentytwelve' ); ?></h3>
 			<div class="skip-link assistive-text"><a href="#content" title="<?php esc_attr_e( 'Skip to content', 'twentytwelve' ); ?>"><?php _e( 'Skip to content', 'twentytwelve' ); ?></a></div>
 			<?php wp_nav_menu( array( 'theme_location' => 'primary' ) ); ?>
diff --git a/js/theme.js b/js/theme.js
index 5ff38605a..c24569516 100644
--- a/js/theme.js
+++ b/js/theme.js
@@ -10,8 +10,8 @@ jQuery( document ).ready( function( $ ) {
 		timeout = false;
 
 	$.fn.smallMenu = function() {
-		masthead.find( '.main-navigation' ).removeClass( 'main-navigation' ).addClass( 'main-small-navigation' );
-		masthead.find( '.main-navigation h3' ).removeClass( 'assistive-text' ).addClass( 'menu-toggle' );
+		masthead.find( '.site-navigation' ).removeClass( 'main-navigation' ).addClass( 'main-small-navigation' );
+		masthead.find( '.site-navigation h3' ).removeClass( 'assistive-text' ).addClass( 'menu-toggle' );
 
 		$( '.menu-toggle' ).off( 'click' ).click( function() {
 			masthead.find( '.menu' ).slideToggle();
@@ -32,8 +32,8 @@ jQuery( document ).ready( function( $ ) {
 			if ( ! largeWindow.matches ) {
 				$.fn.smallMenu();
 			} else {
-				masthead.find( '.main-navigation' ).removeClass( 'main-small-navigation' ).addClass( 'main-navigation' );
-				masthead.find( '.main-navigation h3' ).removeClass( 'menu-toggle' ).addClass( 'assistive-text' );
+				masthead.find( '.site-navigation' ).removeClass( 'main-small-navigation' ).addClass( 'main-navigation' );
+				masthead.find( '.site-navigation h3' ).removeClass( 'menu-toggle' ).addClass( 'assistive-text' );
 				masthead.find( '.menu' ).removeAttr( 'style' );
 			}
 		}, 200 );
diff --git a/style.css b/style.css
index 2c2725faf..9f0dd7c5d 100644
--- a/style.css
+++ b/style.css
@@ -217,7 +217,8 @@ article.post-password-required input[type=submit]:hover {
 	background-image: -o-linear-gradient(top, #f9f9f9, #ebebeb);
 	background-image: linear-gradient(top, #f9f9f9, #ebebeb);
 }
-.menu-toggle:active, .menu-toggle.toggled-on,
+.menu-toggle:active,
+.menu-toggle.toggled-on,
 input#searchsubmit:active,
 article.post-password-required input[type=submit]:active,
 input#searchsubmit.toggled-on {
@@ -494,10 +495,6 @@ a:hover {
 	display: inline-block;
 	text-decoration: none;
 }
-.main-navigation li a .main-small-navigation,
-.main-navigation li .main-small-navigation {
-	display: list-item;
-}
 .main-navigation li a {
 	text-transform: uppercase;
 	color: #6a6a6a;
@@ -1448,7 +1445,7 @@ label ~ span.required {
 	img.header-image {
 		display: none;
 	}
-	nav.main-navigation {
+	nav.site-navigation {
 		display: none;
 	}
 	.wrapper {