Index: src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs
===================================================================
--- src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs	(revision 2882)
+++ src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs	(working copy)
@@ -137,7 +137,7 @@
         private static readonly uint SkipDelta = 10;
         private static readonly int VolumeDelta = 10;
         
-        protected override void PluginInitialize()
+        protected override void ExtensionInitialize()
         {
         }
         
@@ -188,7 +188,7 @@
             InterfaceElements.MainWindow.KeyPressEvent += OnKeyPressEvent;
         }
 
-        protected override void PluginDispose() 
+        protected override void ExtensionDispose() 
         {
             if (notif_area != null) {
                 notif_area.Destroy();
@@ -592,28 +592,28 @@
         }*/
         
         public static readonly SchemaEntry<bool> EnabledSchema = new SchemaEntry<bool>(
-            "plugins.notification_area", "enabled",
+            "extensions.notification_area", "enabled",
             true,
-            "Plugin enabled",
-            "Notification area plugin enabled"
+            "Extension enabled",
+            "Notification area extension enabled"
         );
                 
         public static readonly SchemaEntry<bool> ShowNotificationsSchema = new SchemaEntry<bool>(
-            "plugins.notification_area", "show_notifications",
+            "extension.notification_area", "show_notifications",
             true,
             "Show notifications",
             "Show track information notifications when track starts playing"
         );
                 
         public static readonly SchemaEntry<bool> NotifyOnCloseSchema = new SchemaEntry<bool>(
-            "plugins.notification_area", "notify_on_close",
+            "extension.notification_area", "notify_on_close",
             true,
             "Show a notification when closing main window",
             "When the main window is closed, show a notification stating this has happened."
         );
                 
         public static readonly SchemaEntry<bool> QuitOnCloseSchema = new SchemaEntry<bool>(
-            "plugins.notification_area", "quit_on_close",
+            "extension.notification_area", "quit_on_close",
             false,
             "Quit on close",
             "Quit instead of hide to notification area on close"
Index: src/Core/Banshee.ThickClient/Resources/core-ui-actions-layout.xml
===================================================================
--- src/Core/Banshee.ThickClient/Resources/core-ui-actions-layout.xml	(revision 2882)
+++ src/Core/Banshee.ThickClient/Resources/core-ui-actions-layout.xml	(working copy)
@@ -149,7 +149,7 @@
             <menuitem name="Properties" action="PropertiesAction" />
             <menuitem name="SelectedSourceProperties" action="SelectedSourcePropertiesAction" />
             <separator />
-            <menuitem name="Plugins" action="PluginsAction" />
+            <menuitem name="Extensions" action="ExtensionsAction" />
             <menuitem name="Preferences" action="PreferencesAction" />
         </menu>
 
Index: src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs
===================================================================
--- src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs	(revision 2882)
+++ src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs	(working copy)
@@ -125,8 +125,8 @@
         protected override void OpenUri(SafeUri uri)
         {
             // The GStreamer engine can use the XID of the main window if it ever
-            // needs to bring up the plugin installer so it can be transient to
-            // the main window.
+            // needs to bring up the extension installer so it can be transient 
+			// to the main window.
 
             IPropertyStoreExpose service = ServiceManager.Get<IService> ("GtkElementsService") as IPropertyStoreExpose;
             if (service != null) {
