diff --git a/src/octoprint/server/__init__.py b/src/octoprint/server/__init__.py
index e2e138b3..9561f89a 100644
--- a/src/octoprint/server/__init__.py
+++ b/src/octoprint/server/__init__.py
@@ -224,7 +224,7 @@ class Server():
 
 		# start up watchdogs
 		observer = Observer()
-		observer.schedule(GcodeWatchdogHandler(gcodeManager, printer), settings().getBaseFolder("watchdog"))
+		observer.schedule(GcodeWatchdogHandler(gcodeManager, printer), settings().getBaseFolder("watched"))
 		observer.schedule(UploadCleanupWatchdogHandler(gcodeManager), settings().getBaseFolder("uploads"))
 		observer.start()
 
diff --git a/src/octoprint/server/util.py b/src/octoprint/server/util.py
index 506d3108..9c198163 100644
--- a/src/octoprint/server/util.py
+++ b/src/octoprint/server/util.py
@@ -511,7 +511,7 @@ class UploadCleanupWatchdogHandler(PatternMatchingEventHandler):
 
 class GcodeWatchdogHandler(PatternMatchingEventHandler):
 	"""
-	Takes care of automatically "uploading" files that get added to the watchdog folder.
+	Takes care of automatically "uploading" files that get added to the watched folder.
 	"""
 
 	patterns = map(lambda x: "*.%s" % x, gcodefiles.SUPPORTED_EXTENSIONS)
diff --git a/src/octoprint/settings.py b/src/octoprint/settings.py
index 0c3c4ded..c182d983 100644
--- a/src/octoprint/settings.py
+++ b/src/octoprint/settings.py
@@ -78,7 +78,7 @@ default_settings = {
 		"timelapse_tmp": None,
 		"logs": None,
 		"virtualSd": None,
-		"watchdog": None
+		"watched": None
 	},
 	"temperature": {
 		"profiles":