diff --git a/launchd/LaunchAgents/com.googlecode.munki-loginwindow.plist b/launchd/LaunchAgents/com.googlecode.munki.managedinstaller-loginwindow.plist
similarity index 86%
rename from launchd/LaunchAgents/com.googlecode.munki-loginwindow.plist
rename to launchd/LaunchAgents/com.googlecode.munki.managedinstaller-loginwindow.plist
index acd1dbf2..5a439f80 100644
--- a/launchd/LaunchAgents/com.googlecode.munki-loginwindow.plist
+++ b/launchd/LaunchAgents/com.googlecode.munki.managedinstaller-loginwindow.plist
@@ -3,7 +3,7 @@
 <plist version="1.0">
 <dict>
   <key>Label</key>
-  <string>com.googlecode.munki-loginwindow</string>
+  <string>com.googlecode.munki.managedinstaller-loginwindow</string>
   <key>LimitLoadToSessionType</key>
   <array>
     <string>LoginWindow</string>
diff --git a/launchd/LaunchDaemons/com.googlecode.munki.installcheck.plist b/launchd/LaunchDaemons/com.googlecode.munki.installcheck.plist
new file mode 100644
index 00000000..c3b7dbbe
--- /dev/null
+++ b/launchd/LaunchDaemons/com.googlecode.munki.installcheck.plist
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+  <key>Debug</key>
+  <true/>
+  <key>Label</key>
+  <string>com.googlecode.munki.installcheck</string>
+  <key>ProgramArguments</key>
+  <array>
+    <string>/path/to/installcheck</string>
+    <string>--randomsleep=900</string>
+  </array>
+  <key>StartCalendarInterval</key>
+  <dict>
+    <key>Minute</key>
+    <integer>10</integer>
+  </dict>
+</dict>
+</plist>
+
diff --git a/launchd/LaunchDaemons/com.googlecode.munki-managedinstaller.plist b/launchd/LaunchDaemons/com.googlecode.munki.managedinstaller.plist
similarity index 89%
rename from launchd/LaunchDaemons/com.googlecode.munki-managedinstaller.plist
rename to launchd/LaunchDaemons/com.googlecode.munki.managedinstaller.plist
index cd5ed8f3..d1caea04 100644
--- a/launchd/LaunchDaemons/com.googlecode.munki-managedinstaller.plist
+++ b/launchd/LaunchDaemons/com.googlecode.munki.managedinstaller.plist
@@ -5,7 +5,7 @@
   <key>Debug</key>
   <true/>
   <key>Label</key>
-  <string>com.googlecode.munki-managedinstaller</string>
+  <string>com.googlecode.munki.managedinstaller</string>
   <key>ProgramArguments</key>
   <array>
     <string>/path/to/managedinstaller</string>