diff --git a/data/gnome-shell.schemas b/data/gnome-shell.schemas
index 1a887118a..80b36d1f0 100644
--- a/data/gnome-shell.schemas
+++ b/data/gnome-shell.schemas
@@ -44,19 +44,20 @@
       </schema>
 
       <schema>
-        <key>/schemas/desktop/gnome/shell/windows/side_by_side_tiling</key>
-        <applyto>/desktop/gnome/shell/windows/side_by_side_tiling</applyto>
+        <key>/schemas/desktop/gnome/shell/windows/edge_tiling</key>
+        <applyto>/desktop/gnome/shell/windows/edge_tiling</applyto>
         <owner>gnome-shell</owner>
         <type>bool</type>
         <default>true</default>
         <locale name="C">
-          <short>enable side-by-side tiling when dropping windows on screen edges</short>
+          <short>enable edge tiling when dropping windows on screen edges</short>
           <long>
-             If enabled, dropping windows on screen edges maximizes them
+             If enabled, dropping windows on vertical screen edges maximizes them
              vertically and resizes them horizontally to cover half of the
-             available area.
+             available area. Dropping windows on the top screen edge maximizes them
+             completely.
 
-             This key overrides /apps/metacity/general/side_by_side_tiling when
+             This key overrides /apps/metacity/general/edge_tiling when
              running GNOME Shell.
           </long>
         </locale>
diff --git a/src/gnome-shell-plugin.c b/src/gnome-shell-plugin.c
index 0a3959df4..9d96303c0 100644
--- a/src/gnome-shell-plugin.c
+++ b/src/gnome-shell-plugin.c
@@ -159,8 +159,8 @@ gnome_shell_plugin_init (GnomeShellPlugin *shell_plugin)
                                            "/desktop/gnome/shell/windows/attach_modal_dialogs");
   meta_prefs_override_preference_location ("/apps/metacity/general/button_layout",
                                            "/desktop/gnome/shell/windows/button_layout");
-  meta_prefs_override_preference_location ("/apps/metacity/general/side_by_side_tiling",
-                                           "/desktop/gnome/shell/windows/side_by_side_tiling");
+  meta_prefs_override_preference_location ("/apps/metacity/general/edge_tiling",
+                                           "/desktop/gnome/shell/windows/edge_tiling");
   meta_prefs_override_preference_location ("/apps/metacity/general/theme",
                                            "/desktop/gnome/shell/windows/theme");
 }