diff --git a/dev/default.nix b/dev/default.nix
index 53ea6ce..e3cf966 100644
--- a/dev/default.nix
+++ b/dev/default.nix
@@ -97,9 +97,9 @@ in
       failScript = pkgs.writeScript "fail.sh" ''
         #!${pkgs.bash}/bin/bash
 
-        1>&2 echo "You did something wrong :("
+        echo "You did something wrong :("
 
-        echo "You did something wrong, but you shouldn't see this."
+        1>&2 echo "You did something wrong, but you shouldn't see this."
 
         exit 1
       '';
@@ -144,9 +144,9 @@ in
         export CONFIG_CHECKING_COMMAND=${echoScript}
         export INFO_COMMAND=${infoScript}
         export NOTIFICATION_COMMAND=${writeScript}
-        export DEPLOYMENT_OVERRIDES_COMMAND=${infoScript}
+        export DEPLOYMENT_CONFIG_COMMAND=${infoScript}
         export DEPLOYMENT_KEYS_COMMAND=${infoScript}
-        export APPLICATION_OVERRIDES_COMMAND=${infoScript}
+        export APPLICATION_CONFIG_COMMAND=${infoScript}
         export APPLICATION_KEYS_COMMAND=${infoScript}
         export UNARCHIVE_COMMAND=${writeScript}
         export POWER_AUTHORIZATION_HEADER="123"
diff --git a/octopod-backend/src/Octopod/Server.hs b/octopod-backend/src/Octopod/Server.hs
index 5c38e63..6125e72 100644
--- a/octopod-backend/src/Octopod/Server.hs
+++ b/octopod-backend/src/Octopod/Server.hs
@@ -187,9 +187,9 @@ runOctopodServer sha = do
   archiveCheckingCmd <- Command . pack <$> getEnvOrDie "ARCHIVE_CHECKING_COMMAND"
   tagCheckingCmd <- Command . pack <$> getEnvOrDie "CONFIG_CHECKING_COMMAND"
   infoCmd <- Command . pack <$> getEnvOrDie "INFO_COMMAND"
-  dOverridesCmd <- Command . pack <$> getEnvOrDie "DEPLOYMENT_OVERRIDES_COMMAND"
+  dOverridesCmd <- Command . pack <$> getEnvOrDie "DEPLOYMENT_CONFIG_COMMAND"
   dKeysCmd <- Command . pack <$> getEnvOrDie "DEPLOYMENT_KEYS_COMMAND"
-  aOverridesCmd <- Command . pack <$> getEnvOrDie "APPLICATION_OVERRIDES_COMMAND"
+  aOverridesCmd <- Command . pack <$> getEnvOrDie "APPLICATION_CONFIG_COMMAND"
   aKeysCmd <- Command . pack <$> getEnvOrDie "APPLICATION_KEYS_COMMAND"
   unarchiveCmd <- Command . pack <$> getEnvOrDie "UNARCHIVE_COMMAND"
   powerAuthorizationHeader <- AuthHeader . BSC.pack <$> getEnvOrDie "POWER_AUTHORIZATION_HEADER"
@@ -1109,11 +1109,11 @@ upsertDeploymentMetadatum dName dMetadata =
 failIfImageNotFound :: Deployment -> AppM ()
 failIfImageNotFound dep = do
   cfg <- getDeploymentConfig dep
-  (ec, _, Stderr err, _) <- runCommandArgs configCheckingCommand =<< configCheckCommandArgs cfg dep
+  (ec, Stdout out, _, _) <- runCommandArgs configCheckingCommand =<< configCheckCommandArgs cfg dep
   case ec of
     ExitSuccess -> pure ()
     ExitFailure _ ->
-      throwError err400 {errBody = BSL.fromStrict $ T.encodeUtf8 err}
+      throwError err400 {errBody = BSL.fromStrict $ T.encodeUtf8 out}
 
 -- | Helper to create an application-level error.
 appError :: Text -> BSL.ByteString
diff --git a/octopod-backend/src/Octopod/Server/ControlScriptUtils.hs b/octopod-backend/src/Octopod/Server/ControlScriptUtils.hs
index ef7229b..8ce03f8 100644
--- a/octopod-backend/src/Octopod/Server/ControlScriptUtils.hs
+++ b/octopod-backend/src/Octopod/Server/ControlScriptUtils.hs
@@ -255,5 +255,5 @@ overridesArgs (Config cc) =
     $ cc
   where
     argumentName = case knownOverrideLevel @l of
-      ApplicationLevel -> "--app-env-override"
-      DeploymentLevel -> "--deployment-override"
+      ApplicationLevel -> "--application-config"
+      DeploymentLevel -> "--deployment-config"