diff --git a/gnome-shell-extensions.spec b/gnome-shell-extensions.spec
index 28f26f8..7a7434f 100644
--- a/gnome-shell-extensions.spec
+++ b/gnome-shell-extensions.spec
@@ -1,11 +1,12 @@
 %global commit g63dd27c
+%global pkg_prefix gnome-shell-extension
 
 Name:           gnome-shell-extensions
 Version:        3.0.2
-Release:        1.%{commit}git%{?dist}
+Release:        2.%{commit}git%{?dist}
 Summary:        Modify and extend GNOME Shell functionality and behavior
 Group:          User Interface/Desktops
-License:        GPLv2+ 
+License:        GPLv2+
 URL:            http://live.gnome.org/GnomeShell/Extensions
 
 #  using git archive since upstream hasn't created tarballs.  Picking up a snapshot from master for a couple of minor but relevant changes
@@ -40,118 +41,139 @@ Enabled extensions:
 # TODO: uncomment when enabling systemMonitor
 #  * systemMonitor
 
-%package        common
+%package -n %{pkg_prefix}-common
 Summary:        Files common to GNOME Shell Extensions
 Group:          User Interface/Desktops
-License:        GPLv2+ 
-%description    common
+License:        GPLv2+
+Provides:       %{name}-common = %{version}-%{release}
+Obsoletes:      %{name}-common < %{version}-%{release}
+
+%description -n %{pkg_prefix}-common
 GNOME Shell Extensions is a collection of extensions providing additional 
 and optional functionality to GNOME Shell. Common files and directories 
 needed by extensions are provided here.
 
-%package        alternate-tab
+%package -n %{pkg_prefix}-alternate-tab
 Summary:        Classic Alt+Tab behavior. Window based instead of app based
 Group:          User Interface/Desktops
-License:        GPLv2+ 
-Requires:       %{name}-common = %{version}-%{release}
+License:        GPLv2+
+Provides:       %{name}-alternate-tab = %{version}-%{release}
+Obsoletes:      %{name}-alternate-tab < %{version}-%{release}
+Requires:       %{pkg_prefix}-common = %{version}-%{release}
 
-%description    alternate-tab
+%description -n %{pkg_prefix}-alternate-tab
 Lets you use classic Alt+Tab (window-based instead of app-based) in GNOME Shell.  
 GNOME Shell groups multiple instances of the same application together. 
 This extension disables grouping.  
 
-%package        alternative-status-menu
+%package -n %{pkg_prefix}-alternative-status-menu
 Summary:        For those who want a power off item visible at all the time
 Group:          User Interface/Desktops
-License:        GPLv2+ 
-Requires:       %{name}-common = %{version}-%{release}
+License:        GPLv2+
+Provides:       %{name}-alternative-status-menu = %{version}-%{release}
+Obsoletes:      %{name}-alternative-status-menu < %{version}-%{release}
+Requires:       %{pkg_prefix}-common = %{version}-%{release}
 
-%description    alternative-status-menu
+%description -n %{pkg_prefix}-alternative-status-menu
 For those who want a power off item visible at all the time, replaces 
 GNOME Shell status menu with one featuring separate Suspend and Power Off. 
 Adds the ability to hibernate as well.
 
-%package        dock
+%package -n %{pkg_prefix}-dock
 Summary:        Shows a dock-style task switcher permanently
 Group:          User Interface/Desktops
-License:        GPLv2+ 
-Requires:       %{name}-common = %{version}-%{release}
+License:        GPLv2+
+Provides:       %{name}-dock = %{version}-%{release}
+Obsoletes:      %{name}-dock < %{version}-%{release}
+Requires:       %{pkg_prefix}-common = %{version}-%{release}
 
-%description    dock
+%description -n %{pkg_prefix}-dock
 Shows a dock-style task switcher on the right side of the screen permanently.
 
-%package        windowsNavigator
+%package -n %{pkg_prefix}-windowsNavigator
 Summary:        Keyboard selection of windows and work-spaces in overlay mode
 Group:          User Interface/Desktops
-License:        GPLv2+ 
-Requires:       %{name}-common = %{version}-%{release}
+License:        GPLv2+
+Provides:       %{name}-windowsNavigator = %{version}-%{release}
+Obsoletes:      %{name}-windowsNavigator < %{version}-%{release}
+Requires:       %{pkg_prefix}-common = %{version}-%{release}
 
-%description    windowsNavigator
+%description -n %{pkg_prefix}-windowsNavigator
 Allow keyboard selection of windows and work-spaces in overlay mode in 
 GNOME Shell.  Switch to overview mode (press the windows or alt+f1 key) and 
 press the alt key to show numbers over windows.  Press any number to switch
 to the corresponding window.
 
-%package        user-theme
+%package -n %{pkg_prefix}-user-theme
 Summary:        Lets the user select a custom theme for the shell
 Group:          User Interface/Desktops
-License:        GPLv2+ 
-Requires:       %{name}-common = %{version}-%{release}
+License:        GPLv2+
+Provides:       %{name}-user-theme = %{version}-%{release}
+Obsoletes:      %{name}-user-theme < %{version}-%{release}
+Requires:       %{pkg_prefix}-common = %{version}-%{release}
 
-%description    user-theme
+%description -n %{pkg_prefix}-user-theme
 Lets the user select a custom theme for the Gnome shell. It will allow you to 
 apply a style from /.themes/[themeName]/gnome-shell/gnome-shell.css
 
-%package        auto-move-windows
+%package -n %{pkg_prefix}-auto-move-windows
 Summary:        Assign specific workspaces to applications
 Group:          User Interface/Desktops
-License:        GPLv2+ 
-Requires:       %{name}-common = %{version}-%{release}
+License:        GPLv2+
+Provides:       %{name}-auto-move-windows = %{version}-%{release}
+Obsoletes:      %{name}-auto-move-windows < %{version}-%{release}
+Requires:       %{pkg_prefix}-common = %{version}-%{release}
 
-%description    auto-move-windows
+%description -n %{pkg_prefix}-auto-move-windows
 Lets you manage your workspaces more easily, assigning a specific workspace to
 each application as soon as it creates a window, in a manner configurable with a
 GSettings key.
 
-%package        drive-menu
+%package -n %{pkg_prefix}-drive-menu
 Summary:        Disk device manager in the system status area
 Group:          User Interface/Desktops
-License:        GPLv2+ 
-Requires:       %{name}-common = %{version}-%{release}
+License:        GPLv2+
+Provides:       %{name}-drive-menu = %{version}-%{release}
+Obsoletes:      %{name}-drive-menu < %{version}-%{release}
+Requires:       %{pkg_prefix}-common = %{version}-%{release}
 
-%description    drive-menu
+%description -n %{pkg_prefix}-drive-menu
 Adds a menu in the system status area that tracks removable disk devices
 attached and offers to browse them and eject/unmount them.
 
-%package        places-menu
+%package -n %{pkg_prefix}-places-menu
 Summary:        Places menu indicator in the system status area
 Group:          User Interface/Desktops
-License:        GPLv2+ 
-Requires:       %{name}-common = %{version}-%{release}
+License:        GPLv2+
+Provides:       %{name}-places-menu = %{version}-%{release}
+Obsoletes:      %{name}-places-menu < %{version}-%{release}
+Requires:       %{pkg_prefix}-common = %{version}-%{release}
 
-%description    places-menu
+%description -n %{pkg_prefix}-places-menu
 Adds a menu in the system status area that resembles the Places menu from
 GNOME 2.x
 
-%package        native-window-placement
+%package -n %{pkg_prefix}-native-window-placement
 Summary:        Arrange windows in overview in a more native way
 Group:          User Interface/Desktops
-License:        GPLv2+ 
-Requires:       %{name}-common = %{version}-%{release}
+License:        GPLv2+
+Provides:       %{name}-native-window-placement = %{version}-%{release}
+Obsoletes:      %{name}-native-window-placement < %{version}-%{release}
+Requires:       %{pkg_prefix}-common = %{version}-%{release}
 
-%description    native-window-placement
+%description  -n %{pkg_prefix}-native-window-placement
 This extension employs an algorithm (taken from KDE) for layouting the
 thumbnails in the overview that more closely reflects the positions and relative
 sizes of the actual windows, instead of using a fixed grid.
 
 # TODO: uncomment when enabling systemMonitor
-#%package        systemMonitor
+#%package -n %{pkg_prefix}-systemMonitor
 #Summary:        Monitor your system status
 #Group:          User Interface/Desktops
-#License:        GPLv2+ 
-#Requires:       %{name}-common = %{version}-%{release}
+#License:        GPLv2+
+#Requires:       %{pkg_prefix}-common = %{version}-%{release}
 #
-#%description    systemMonitor
+#%description -n %{pkg_prefix}-systemMonitor
 #Monitor your system status
 
 %prep
@@ -179,90 +201,93 @@ make install DESTDIR=$RPM_BUILD_ROOT
 
 %find_lang %{name}
 
-%files common -f %{name}.lang
+%files -n %{pkg_prefix}-common -f %{name}.lang
 %defattr(-,root,root,-)
 %doc README
 %dir %{_datadir}/gnome-shell/extensions/
 
-%files alternate-tab
+%files -n %{pkg_prefix}-alternate-tab
 %defattr(-,root,root,-)
 %{_datadir}/gnome-shell/extensions/alternate-tab*
 
-%files alternative-status-menu
+%files -n %{pkg_prefix}-alternative-status-menu
 %defattr(-,root,root,-)
 %{_datadir}/gnome-shell/extensions/alternative-status-menu*
 
-%files dock
+%files -n %{pkg_prefix}-dock
 %defattr(-,root,root,-)
 %{_datadir}/glib-2.0/schemas/org.gnome.shell.extensions.dock.gschema.xml
 %{_datadir}/gnome-shell/extensions/dock*
 
-%files windowsNavigator
+%files -n %{pkg_prefix}-windowsNavigator
 %defattr(-,root,root,-)
 %{_datadir}/gnome-shell/extensions/windowsNavigator*
 
-%files user-theme
+%files -n %{pkg_prefix}-user-theme
 %defattr(-,root,root,-)
 %{_datadir}/glib-2.0/schemas/org.gnome.shell.extensions.user-theme.gschema.xml
 %{_datadir}/gnome-shell/extensions/user-theme*
 
-%files auto-move-windows
+%files -n %{pkg_prefix}-auto-move-windows
 %defattr(-,root,root,-)
 %{_datadir}/glib-2.0/schemas/org.gnome.shell.extensions.auto-move-windows.gschema.xml
 %{_datadir}/gnome-shell/extensions/auto-move-windows*
 
-%files drive-menu
+%files -n %{pkg_prefix}-drive-menu
 %defattr(-,root,root,-)
 %{_datadir}/gnome-shell/extensions/drive-menu*
 
-%files places-menu
+%files -n %{pkg_prefix}-places-menu
 %defattr(-,root,root,-)
 %{_datadir}/gnome-shell/extensions/places-menu*
 
-%files places-menu
+%files -n %{pkg_prefix}-places-menu
 %defattr(-,root,root,-)
 %{_datadir}/gnome-shell/extensions/places-menu*
 
-%files auto-move-windows
+%files -n %{pkg_prefix}-auto-move-windows
 %defattr(-,root,root,-)
 %{_datadir}/glib-2.0/schemas/org.gnome.shell.extensions.auto-move-windows.gschema.xml
 %{_datadir}/gnome-shell/extensions/auto-move-windows*
 
-%files native-window-placement
+%files -n %{pkg_prefix}-native-window-placement
 %defattr(-,root,root,-)
 %{_datadir}/glib-2.0/schemas/org.gnome.shell.extensions.native-window-placement.gschema.xml
 %{_datadir}/gnome-shell/extensions/native-window-placement*
 
 # TODO: uncomment when enabling systemMonitor
-#%files systemMonitor
+#%files -n %{pkg_prefix}-systemMonitor
 #%defattr(-,root,root,-)
 #%{_datadir}/gnome-shell/extensions/systemMonitor*
 
-%posttrans user-theme
+%posttrans -n %{pkg_prefix}-user-theme
 glib-compile-schemas --allow-any-name %{_datadir}/glib-2.0/schemas || :
 
-%postun user-theme
+%postun -n %{pkg_prefix}-user-theme
 glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
 
-%posttrans auto-move-windows
+%posttrans -n %{pkg_prefix}-auto-move-windows
 glib-compile-schemas --allow-any-name %{_datadir}/glib-2.0/schemas || :
 
-%postun auto-move-windows
+%postun -n %{pkg_prefix}-auto-move-windows
 glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
 
-%posttrans native-window-placement
+%posttrans -n %{pkg_prefix}-native-window-placement
 glib-compile-schemas --allow-any-name %{_datadir}/glib-2.0/schemas || :
 
-%postun native-window-placement
+%postun -n %{pkg_prefix}-native-window-placement
 glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
 
-%posttrans dock
+%posttrans -n %{pkg_prefix}-dock
 glib-compile-schemas --allow-any-name %{_datadir}/glib-2.0/schemas || :
 
-%postun dock
+%postun -n %{pkg_prefix}-dock
 glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
 
 %changelog
+* Sun Aug 21 2011 Michel Salim <salimma@fedoraproject.org> - 3.0.2-2.g63dd27cgit%{?dist}
+- Rename subpackages in line with new guidelines (# 715367)
+
 * Sat May 28 2011 Timur Kristóf <venemo@fedoraproject.org> - 3.0.2-1.g63dd27cgit
 - Update to a newer git snapshot
 - Fix RHBZ bug #708230