diff --git a/check_home_assistant.conf b/check_home_assistant_state.conf
similarity index 53%
rename from check_home_assistant.conf
rename to check_home_assistant_state.conf
index 5a1c120..c79b9f4 100644
--- a/check_home_assistant.conf
+++ b/check_home_assistant_state.conf
@@ -1,20 +1,20 @@
-object CheckCommand "home_assistant" {
-  command = [ PluginContribDir + "/check_home_assistant/check_home_assistant.py" ]
+object CheckCommand "home_assistant_state" {
+  command = [ PluginContribDir + "/check_home_assistant_state/check_home_assistant_state.py" ]
   arguments = {
     "--token" = {
-      value = "$home_assistant_token$"
+      value = "$home_assistant_state_token$"
       description = "API token for Home Assistant"
     }
     "--url" = {
-      value = "$home_assistant_url$"
+      value = "$home_assistant_state_url$"
       description = "URL for Home Assistant"
     }    
     "--warning" = {
-      value = "$home_assistant_warning$"
+      value = "$home_assistant_state_warning$"
       description = "Return warning if battery percentage is outside RANGE"
     }
     "--critical" = {
-      value = "$home_assistant_critical$"
+      value = "$home_assistant_state_critical$"
       description = "Return critical if battery percentage is outside RANGE"
     }
   }
diff --git a/check_home_assistant.py b/check_home_assistant_state.py
similarity index 100%
rename from check_home_assistant.py
rename to check_home_assistant_state.py