diff --git a/moonraker/moonraker.py b/moonraker/moonraker.py
index 0285e36..280ff83 100644
--- a/moonraker/moonraker.py
+++ b/moonraker/moonraker.py
@@ -26,7 +26,7 @@ MAX_LOG_ATTEMPTS = 10 * LOG_ATTEMPT_INTERVAL
 
 CORE_PLUGINS = [
     'file_manager', 'klippy_apis', 'machine',
-    'temperature_store', 'shell_command']
+    'data_store', 'shell_command']
 
 class Sentinel:
     pass
diff --git a/moonraker/plugins/temperature_store.py b/moonraker/plugins/data_store.py
similarity index 97%
rename from moonraker/plugins/temperature_store.py
rename to moonraker/plugins/data_store.py
index a511500..02c2fb7 100644
--- a/moonraker/plugins/temperature_store.py
+++ b/moonraker/plugins/data_store.py
@@ -1,4 +1,4 @@
-# Heater sensor temperature storage
+# Klipper data logging and storage storage
 #
 # Copyright (C) 2020 Eric Callahan <arksine.code@gmail.com>
 #
@@ -10,7 +10,7 @@ from tornado.ioloop import IOLoop, PeriodicCallback
 TEMPERATURE_UPDATE_MS = 1000
 TEMPERATURE_STORE_SIZE = 20 * 60
 
-class TemperatureStore:
+class DataStore:
     def __init__(self, config):
         self.server = config.get_server()
 
@@ -99,4 +99,4 @@ class TemperatureStore:
         self.temp_update_cb.stop()
 
 def load_plugin(config):
-    return TemperatureStore(config)
+    return DataStore(config)