diff --git a/cura/CuraApplication.py b/cura/CuraApplication.py
index 5ac0f03b2e..d3ea3f134c 100755
--- a/cura/CuraApplication.py
+++ b/cura/CuraApplication.py
@@ -261,7 +261,7 @@ class CuraApplication(QtApplication):
             "TranslateTool",
             "FileLogger",
             "XmlMaterialProfile",
-            "PluginBrowser",
+            "Toolbox",
             "PrepareStage",
             "MonitorStage"
         ])
diff --git a/plugins/PluginBrowser/__init__.py b/plugins/PluginBrowser/__init__.py
deleted file mode 100644
index d414c36a99..0000000000
--- a/plugins/PluginBrowser/__init__.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright (c) 2017 Ultimaker B.V.
-# PluginBrowser is released under the terms of the LGPLv3 or higher.
-
-from . import PluginBrowser
-
-
-def getMetaData():
-    return {}
-
-
-def register(app):
-    return {"extension": PluginBrowser.PluginBrowser()}
diff --git a/plugins/PluginBrowser/plugin.json b/plugins/PluginBrowser/plugin.json
deleted file mode 100644
index 491e21f506..0000000000
--- a/plugins/PluginBrowser/plugin.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-    "name": "Plugin Browser",
-    "author": "Ultimaker B.V.",
-    "version": "1.0.0",
-    "api": 4,
-    "description": "Find, manage and install new plugins."
-}
\ No newline at end of file
diff --git a/plugins/PluginBrowser/PluginBrowser.py b/plugins/Toolbox/Toolbox/Toolbox.py
similarity index 98%
rename from plugins/PluginBrowser/PluginBrowser.py
rename to plugins/Toolbox/Toolbox/Toolbox.py
index 917502efa0..9c64efc9fa 100644
--- a/plugins/PluginBrowser/PluginBrowser.py
+++ b/plugins/Toolbox/Toolbox/Toolbox.py
@@ -1,5 +1,5 @@
-# Copyright (c) 2017 Ultimaker B.V.
-# PluginBrowser is released under the terms of the LGPLv3 or higher.
+# Copyright (c) 2018 Ultimaker B.V.
+# Toolbox is released under the terms of the LGPLv3 or higher.
 
 from PyQt5.QtCore import QUrl, QObject, pyqtProperty, pyqtSignal, pyqtSlot
 from PyQt5.QtNetwork import QNetworkAccessManager, QNetworkRequest, QNetworkReply
@@ -24,7 +24,7 @@ from cura.CuraApplication import CuraApplication
 
 i18n_catalog = i18nCatalog("cura")
 
-class PluginBrowser(QObject, Extension):
+class Toolbox(QObject, Extension):
     def __init__(self, parent=None):
         super().__init__(parent)
 
@@ -138,6 +138,7 @@ class PluginBrowser(QObject, Extension):
     def _createDialog(self, qml_name):
         Logger.log("d", "Creating dialog [%s]", qml_name)
         path = os.path.join(PluginRegistry.getInstance().getPluginPath(self.getPluginId()), "resources", "qml", qml_name)
+        Logger.log("d", "Creating dialog [%s]", path)
         dialog = Application.getInstance().createQmlComponent(path, {"manager": self})
         return dialog
 
diff --git a/plugins/Toolbox/__init__.py b/plugins/Toolbox/__init__.py
new file mode 100644
index 0000000000..dc2d6c9c23
--- /dev/null
+++ b/plugins/Toolbox/__init__.py
@@ -0,0 +1,12 @@
+# Copyright (c) 2018 Ultimaker B.V.
+# Toolbox is released under the terms of the LGPLv3 or higher.
+
+from .Toolbox import Toolbox
+
+
+def getMetaData():
+    return {}
+
+
+def register(app):
+    return {"extension": Toolbox.Toolbox()}
diff --git a/plugins/Toolbox/plugin.json b/plugins/Toolbox/plugin.json
new file mode 100644
index 0000000000..7c85851df7
--- /dev/null
+++ b/plugins/Toolbox/plugin.json
@@ -0,0 +1,7 @@
+{
+    "name": "Toolbox",
+    "author": "Ultimaker B.V.",
+    "version": "1.0.0",
+    "api": 4,
+    "description": "Find, manage and install new cura packages."
+}
\ No newline at end of file
diff --git a/plugins/PluginBrowser/resources/qml/PluginBrowser.qml b/plugins/Toolbox/resources/qml/PluginBrowser.qml
similarity index 100%
rename from plugins/PluginBrowser/resources/qml/PluginBrowser.qml
rename to plugins/Toolbox/resources/qml/PluginBrowser.qml
diff --git a/plugins/PluginBrowser/resources/qml/PluginEntry.qml b/plugins/Toolbox/resources/qml/PluginEntry.qml
similarity index 100%
rename from plugins/PluginBrowser/resources/qml/PluginEntry.qml
rename to plugins/Toolbox/resources/qml/PluginEntry.qml
diff --git a/plugins/PluginBrowser/resources/qml/SectionShadow.qml b/plugins/Toolbox/resources/qml/SectionShadow.qml
similarity index 100%
rename from plugins/PluginBrowser/resources/qml/SectionShadow.qml
rename to plugins/Toolbox/resources/qml/SectionShadow.qml
diff --git a/plugins/PluginBrowser/resources/qml/ToolboxDetailBlock.qml b/plugins/Toolbox/resources/qml/ToolboxDetailBlock.qml
similarity index 100%
rename from plugins/PluginBrowser/resources/qml/ToolboxDetailBlock.qml
rename to plugins/Toolbox/resources/qml/ToolboxDetailBlock.qml
diff --git a/plugins/PluginBrowser/resources/qml/ToolboxFooter.qml b/plugins/Toolbox/resources/qml/ToolboxFooter.qml
similarity index 100%
rename from plugins/PluginBrowser/resources/qml/ToolboxFooter.qml
rename to plugins/Toolbox/resources/qml/ToolboxFooter.qml
diff --git a/plugins/PluginBrowser/resources/qml/ToolboxGrid.qml b/plugins/Toolbox/resources/qml/ToolboxGrid.qml
similarity index 100%
rename from plugins/PluginBrowser/resources/qml/ToolboxGrid.qml
rename to plugins/Toolbox/resources/qml/ToolboxGrid.qml
diff --git a/plugins/PluginBrowser/resources/qml/ToolboxGridTile.qml b/plugins/Toolbox/resources/qml/ToolboxGridTile.qml
similarity index 100%
rename from plugins/PluginBrowser/resources/qml/ToolboxGridTile.qml
rename to plugins/Toolbox/resources/qml/ToolboxGridTile.qml
diff --git a/plugins/PluginBrowser/resources/qml/ToolboxHeader.qml b/plugins/Toolbox/resources/qml/ToolboxHeader.qml
similarity index 100%
rename from plugins/PluginBrowser/resources/qml/ToolboxHeader.qml
rename to plugins/Toolbox/resources/qml/ToolboxHeader.qml
diff --git a/plugins/PluginBrowser/resources/qml/ToolboxLicenseDialog.qml b/plugins/Toolbox/resources/qml/ToolboxLicenseDialog.qml
similarity index 100%
rename from plugins/PluginBrowser/resources/qml/ToolboxLicenseDialog.qml
rename to plugins/Toolbox/resources/qml/ToolboxLicenseDialog.qml
diff --git a/plugins/PluginBrowser/resources/qml/ToolboxRestartDialog.qml b/plugins/Toolbox/resources/qml/ToolboxRestartDialog.qml
similarity index 100%
rename from plugins/PluginBrowser/resources/qml/ToolboxRestartDialog.qml
rename to plugins/Toolbox/resources/qml/ToolboxRestartDialog.qml
diff --git a/plugins/PluginBrowser/resources/qml/ToolboxShowcase.qml b/plugins/Toolbox/resources/qml/ToolboxShowcase.qml
similarity index 100%
rename from plugins/PluginBrowser/resources/qml/ToolboxShowcase.qml
rename to plugins/Toolbox/resources/qml/ToolboxShowcase.qml
diff --git a/plugins/PluginBrowser/resources/qml/ToolboxShowcaseTile.qml b/plugins/Toolbox/resources/qml/ToolboxShowcaseTile.qml
similarity index 100%
rename from plugins/PluginBrowser/resources/qml/ToolboxShowcaseTile.qml
rename to plugins/Toolbox/resources/qml/ToolboxShowcaseTile.qml
diff --git a/plugins/PluginBrowser/resources/qml/ToolboxViewDetail.qml b/plugins/Toolbox/resources/qml/ToolboxViewDetail.qml
similarity index 100%
rename from plugins/PluginBrowser/resources/qml/ToolboxViewDetail.qml
rename to plugins/Toolbox/resources/qml/ToolboxViewDetail.qml
diff --git a/plugins/PluginBrowser/resources/qml/ToolboxViewDownloads.qml b/plugins/Toolbox/resources/qml/ToolboxViewDownloads.qml
similarity index 100%
rename from plugins/PluginBrowser/resources/qml/ToolboxViewDownloads.qml
rename to plugins/Toolbox/resources/qml/ToolboxViewDownloads.qml
diff --git a/plugins/PluginBrowser/resources/qml/ToolboxViewInstalled.qml b/plugins/Toolbox/resources/qml/ToolboxViewInstalled.qml
similarity index 100%
rename from plugins/PluginBrowser/resources/qml/ToolboxViewInstalled.qml
rename to plugins/Toolbox/resources/qml/ToolboxViewInstalled.qml
diff --git a/resources/qml/Actions.qml b/resources/qml/Actions.qml
index 7002711614..cb9299e69c 100644
--- a/resources/qml/Actions.qml
+++ b/resources/qml/Actions.qml
@@ -430,7 +430,7 @@ Item
     Action
     {
         id: browsePluginsAction
-        text: catalog.i18nc("@action:menu", "Browse plugins...")
+        text: catalog.i18nc("@action:menu", "Browse packages...")
         iconName: "plugins_browse"
     }
 
diff --git a/resources/qml/Cura.qml b/resources/qml/Cura.qml
index c4ebb790e8..db5be5ea25 100644
--- a/resources/qml/Cura.qml
+++ b/resources/qml/Cura.qml
@@ -270,7 +270,7 @@ UM.MainWindow
             Menu
             {
                 id: plugin_menu
-                title: catalog.i18nc("@title:menu menubar:toplevel", "P&lugins")
+                title: catalog.i18nc("@title:menu menubar:toplevel", "&Toolbox")
 
                 MenuItem { action: Cura.Actions.browsePlugins }
             }
@@ -670,7 +670,7 @@ UM.MainWindow
     {
         target: Cura.Actions.browsePlugins
         onTriggered: {
-            curaExtensions.callExtensionMethod("Plugin Browser", "browsePlugins")
+            curaExtensions.callExtensionMethod("Toolbox", "browsePlugins")
         }
     }