diff --git a/daemons/ganeti-masterd b/daemons/ganeti-masterd
index 11b779e172f0c52d45f5c575ffb29977302d6acb..9b866b083d5ace24724f5937095fcfd086cc522a 100755
--- a/daemons/ganeti-masterd
+++ b/daemons/ganeti-masterd
@@ -329,7 +329,7 @@ def main():
     utils.Daemonize(logfile=constants.LOG_MASTERDAEMON,
                     noclose_fds=[master.fileno()])
 
-  utils.WritePidFile('ganeti-masterd')
+  utils.WritePidFile(constants.MASTERD_PID)
 
   logger.SetupDaemon(constants.LOG_MASTERDAEMON, debug=options.debug,
                      stderr_logging=not options.fork)
@@ -341,7 +341,7 @@ def main():
     master.serve_forever()
   finally:
     master.server_cleanup()
-    utils.RemovePidFile('ganeti-masterd')
+    utils.RemovePidFile(constants.MASTERD_PID)
 
 
 if __name__ == "__main__":
diff --git a/daemons/ganeti-noded b/daemons/ganeti-noded
index 2ebc685ccb8922a6962009bf880fa5e12076f50a..c52a74ea7fd17955e629ac6837753f3f5b1c0da1 100755
--- a/daemons/ganeti-noded
+++ b/daemons/ganeti-noded
@@ -615,7 +615,7 @@ def main():
   if options.fork:
     utils.Daemonize(logfile=constants.LOG_NODESERVER)
 
-  utils.WritePidFile('ganeti-noded')
+  utils.WritePidFile(constants.NODED_PID)
 
   logger.SetupDaemon(logfile=constants.LOG_NODESERVER, debug=options.debug,
                      stderr_logging=not options.fork)
@@ -629,7 +629,7 @@ def main():
   try:
     server.serve_forever()
   finally:
-    utils.RemovePidFile('ganeti-noded')
+    utils.RemovePidFile(constants.NODED_PID)
 
 
 if __name__ == '__main__':
diff --git a/daemons/ganeti-rapi b/daemons/ganeti-rapi
index cf3724e5442f7afe0de8f1e8c25962798ad54b6d..1d0795c9014f52d6ed9deb95ee4ff4ec109dbb5d 100755
--- a/daemons/ganeti-rapi
+++ b/daemons/ganeti-rapi
@@ -132,7 +132,7 @@ def main():
   if options.fork:
     utils.Daemonize(logfile=constants.LOG_RAPISERVER)
 
-  utils.WritePidFile('ganeti-rapi')
+  utils.WritePidFile(constants.RAPI_PID)
 
   log_fd = open(constants.LOG_RAPIACCESS, 'a')
   try:
@@ -143,7 +143,7 @@ def main():
       httpd.serve_forever()
     finally:
       httpd.server_close()
-      utils.RemovePidFile('ganeti-rapi')
+      utils.RemovePidFile(constants.RAPI_PID)
 
   finally:
     log_fd.close()
diff --git a/lib/constants.py b/lib/constants.py
index 8a56e07a9afa143439128fb08c6687c89f2a13f1..335e73b099b5e1f3825c9371f5efffa1b1b24b7d 100644
--- a/lib/constants.py
+++ b/lib/constants.py
@@ -97,6 +97,11 @@ ETC_HOSTS = "/etc/hosts"
 DEFAULT_FILE_STORAGE_DIR = _autoconf.FILE_STORAGE_DIR
 MASTER_SOCKET = RUN_GANETI_DIR + "/master.sock"
 
+# PID files
+MASTERD_PID = "ganeti-master"
+NODED_PID = "ganeti-noded"
+RAPI_PID = "ganeti-rapi"
+
 NODE_INITD_SCRIPT = _autoconf.SYSCONFDIR + "/init.d/ganeti"
 DEFAULT_NODED_PORT = 1811
 FIRST_DRBD_PORT = 11000