diff --git a/deluge/core/core.py b/deluge/core/core.py
index 8f3e911a0..4cccd771a 100644
--- a/deluge/core/core.py
+++ b/deluge/core/core.py
@@ -664,12 +664,12 @@ class Core(component.Component):
         f = open(os.path.join(self.config["config_location"], "plugins", filename), "wb")
         f.write(plugin_data.data)
         f.close()
-        component.get("PluginManager").scan_for_plugins()
+        component.get("CorePluginManager").scan_for_plugins()
 
     @export()
     def rescan_plugins(self):
         """Rescans the plugin folders for new plugins"""
-        component.get("PluginManager").scan_for_plugins()
+        component.get("CorePluginManager").scan_for_plugins()
 
     @export()
     def rename_files(self, torrent_id, filenames):
diff --git a/deluge/core/pluginmanager.py b/deluge/core/pluginmanager.py
index 86c27f062..5d1648022 100644
--- a/deluge/core/pluginmanager.py
+++ b/deluge/core/pluginmanager.py
@@ -38,7 +38,7 @@ class PluginManager(deluge.pluginmanagerbase.PluginManagerBase,
     functions to access parts of the core."""
 
     def __init__(self, core):
-        component.Component.__init__(self, "PluginManager")
+        component.Component.__init__(self, "CorePluginManager")
         self.core = core
         # Set up the hooks dictionary
         self.hooks = {
diff --git a/deluge/core/torrentmanager.py b/deluge/core/torrentmanager.py
index 3c7c7a30c..7a2831697 100644
--- a/deluge/core/torrentmanager.py
+++ b/deluge/core/torrentmanager.py
@@ -168,7 +168,7 @@ class TorrentManager(component.Component):
 
     def start(self):
         # Get the pluginmanager reference
-        self.plugins = component.get("PluginManager")
+        self.plugins = component.get("CorePluginManager")
 
         self.signals = component.get("SignalManager")