diff --git a/openflexure_microscope/microscope_settings.default.json b/openflexure_microscope/microscope_settings.default.json
index 64d0bc0d..40ea86e8 100644
--- a/openflexure_microscope/microscope_settings.default.json
+++ b/openflexure_microscope/microscope_settings.default.json
@@ -9,6 +9,6 @@
   "plugins": [
     "openflexure_microscope.plugins.default.autofocus:AutofocusPlugin",
     "openflexure_microscope.plugins.default.scan:ScanPlugin",
-    "openflexure_microscope.plugins.default.camera_calibration:Plugin"
+    "openflexure_microscope.plugins.default.camera_calibration:AutocalibrationPlugin"
   ]
 }
\ No newline at end of file
diff --git a/openflexure_microscope/plugins/default/camera_calibration/__init__.py b/openflexure_microscope/plugins/default/camera_calibration/__init__.py
index 0a7ba613..46032671 100644
--- a/openflexure_microscope/plugins/default/camera_calibration/__init__.py
+++ b/openflexure_microscope/plugins/default/camera_calibration/__init__.py
@@ -1,2 +1,2 @@
 __all__ = ["Plugin"]
-from .plugin import Plugin
+from .plugin import AutocalibrationPlugin
diff --git a/openflexure_microscope/plugins/default/camera_calibration/plugin.py b/openflexure_microscope/plugins/default/camera_calibration/plugin.py
index 126bb86c..b682be02 100644
--- a/openflexure_microscope/plugins/default/camera_calibration/plugin.py
+++ b/openflexure_microscope/plugins/default/camera_calibration/plugin.py
@@ -21,9 +21,9 @@ class RecalibrateAPIView(MicroscopeViewPlugin):
         return jsonify(task.state), 201
 
 
-class Plugin(MicroscopePlugin):
+class AutocalibrationPlugin(MicroscopePlugin):
     """
-    A set of default plugins
+    Auto-calibration plugin
     """
 
     api_views = {"/recalibrate": RecalibrateAPIView}
diff --git a/openflexure_microscope/plugins/loader.py b/openflexure_microscope/plugins/loader.py
index 0981d822..503bb2d0 100644
--- a/openflexure_microscope/plugins/loader.py
+++ b/openflexure_microscope/plugins/loader.py
@@ -204,7 +204,7 @@ class PluginLoader(object):
                     # Store the plugin object, and it's properties
                     self._plugins.append(plugin_object)
                     # DEPRECATED: Store the plugin with it's old name
-                    self._legacy_plugins[plugin_name_python_safe] = plugin_object
+                    self._legacy_plugins[plugin_name] = plugin_object
 
                     # Grant plugin access to the hardware
                     if isinstance(plugin_object, MicroscopePlugin):