diff --git a/modules/overlay/overlay-child-rtl.css b/modules/overlay/overlay-child-rtl.css
index 2e5a267..2ebaaa6 100644
--- a/modules/overlay/overlay-child-rtl.css
+++ b/modules/overlay/overlay-child-rtl.css
@@ -12,7 +12,7 @@ html {
   float: right;
   left: auto;
 }
-#overlay {
+#overlay-wrapper {
   padding: 0.2em;
   padding-left: 26px;
 }
diff --git a/modules/overlay/overlay-child.css b/modules/overlay/overlay-child.css
index 959ebdd..6fb1f3c3 100644
--- a/modules/overlay/overlay-child.css
+++ b/modules/overlay/overlay-child.css
@@ -15,7 +15,7 @@ html.js body {
   padding: 20px 0;
 }
 
-#overlay {
+#overlay-wrapper {
   display: table;
   margin: 0 auto;
   min-height: 100px;
diff --git a/modules/overlay/overlay-parent.js b/modules/overlay/overlay-parent.js
index 7452a51..990c295 100644
--- a/modules/overlay/overlay-parent.js
+++ b/modules/overlay/overlay-parent.js
@@ -751,7 +751,7 @@ Drupal.overlay.eventhandlerDispatchEvent = function (event) {
  *
  * @return
  *   A URL that will trigger the overlay (in the form
- *   /node/1#overlay=admin/config).
+ *   /node/1#overlay-wrapper=admin/config).
  */
 Drupal.overlay.fragmentizeLink = function (link, parentLocation) {
   // Don't operate on links that are already overlay-ready.
diff --git a/modules/overlay/overlay.install b/modules/overlay/overlay.install
index 2df860b..4bed8aa 100644
--- a/modules/overlay/overlay.install
+++ b/modules/overlay/overlay.install
@@ -13,7 +13,7 @@
  */
 function overlay_enable() {
   if (strpos(current_path(), 'admin/modules') === 0) {
-    // Flag for a redirect to <front>#overlay=admin/modules on hook_init().
+    // Flag for a redirect to <front>#overlay-wrapper=admin/modules on hook_init().
     $_SESSION['overlay_enable_redirect'] = 1;
   }
 }
diff --git a/modules/overlay/overlay.tpl.php b/modules/overlay/overlay.tpl.php
index df86337..c403125 100644
--- a/modules/overlay/overlay.tpl.php
+++ b/modules/overlay/overlay.tpl.php
@@ -23,7 +23,7 @@
 ?>
 
 <?php print render($disable_overlay); ?>
-<div id="overlay" <?php print $attributes; ?>>
+<div id="overlay-wrapper" <?php print $attributes; ?>>
   <div id="overlay-titlebar" class="clearfix">
     <div id="overlay-title-wrapper" class="clearfix">
       <h1 id="overlay-title"<?php print $title_attributes; ?>><?php print $title; ?></h1>
diff --git a/themes/garland/style.css b/themes/garland/style.css
index f36fa96..5efbd4b 100644
--- a/themes/garland/style.css
+++ b/themes/garland/style.css
@@ -616,15 +616,15 @@ div#branding strong {
 /**
  * Overlay
  */
-#overlay #overlay-tabs li a {
+#overlay-wrapper #overlay-tabs li a {
   background: #d9eaf5;
   color: #000;
 }
-#overlay #overlay-tabs li a:hover,
-#overlay #overlay-tabs li a:focus {
+#overlay-wrapper #overlay-tabs li a:hover,
+#overlay-wrapper #overlay-tabs li a:focus {
   background: #fff;
 }
-#overlay #overlay-tabs li.active a {
+#overlay-wrapper #overlay-tabs li.active a {
   background: url("images/body.png") repeat-x scroll 50% -58px #edf5fa;
   color: #fff;
 }