diff --git a/lib/constants.py b/lib/constants.py
index 140ac521c0d0ce9ad75567ae65714757176ddc07..ea8f408fe09e0750e697cbcbd685feb6764f41bc 100644
--- a/lib/constants.py
+++ b/lib/constants.py
@@ -138,7 +138,7 @@ CONFD_HMAC_KEY = DATA_DIR + "/hmac.key"
 CLUSTER_DOMAIN_SECRET_FILE = DATA_DIR + "/cluster-domain-secret"
 WATCHER_STATEFILE = DATA_DIR + "/watcher.data"
 WATCHER_PAUSEFILE = DATA_DIR + "/watcher.pause"
-INSTANCE_UPFILE = RUN_GANETI_DIR + "/instance-status"
+INSTANCE_STATUS_FILE = RUN_GANETI_DIR + "/instance-status"
 SSH_KNOWN_HOSTS_FILE = DATA_DIR + "/known_hosts"
 RAPI_USERS_FILE = DATA_DIR + "/rapi/users"
 QUEUE_DIR = DATA_DIR + "/queue"
diff --git a/lib/watcher/__init__.py b/lib/watcher/__init__.py
index 9f6b2c952d6cd9cb1b77f6df0ad651e3398ba4e0..f931388d3efe30079133fa989c57fe0c133117f2 100644
--- a/lib/watcher/__init__.py
+++ b/lib/watcher/__init__.py
@@ -318,9 +318,9 @@ def GetClusterData():
 
   instances = {}
 
-  # write the upfile
+  # write the instance status file
   up_data = "".join(["%s %s\n" % (fields[0], fields[1]) for fields in result])
-  utils.WriteFile(file_name=constants.INSTANCE_UPFILE, data=up_data)
+  utils.WriteFile(file_name=constants.INSTANCE_STATUS_FILE, data=up_data)
 
   for fields in result:
     (name, status, autostart, snodes) = fields