diff --git a/Makefile b/Makefile
index d9fe648df..ea6bb8c41 100644
--- a/Makefile
+++ b/Makefile
@@ -283,7 +283,7 @@ cf-deploy: ## Deploys the app to Cloud Foundry
 	sleep 10
 
 	# get the new GUID, and find all crash events for that. If there were any crashes we will abort the deploy.
-	[ $(cf curl "/v2/events?q=type:app.crash&q=actee:$$(cf app --guid notify-delivery-worker-receipts)" | jq ".total_results") -eq 0 ]
+	[ $$(cf curl "/v2/events?q=type:app.crash&q=actee:$$(cf app --guid ${CF_APP})" | jq ".total_results") -eq 0 ]
 	cf delete -f ${CF_APP}-rollback
 
 .PHONY: cf-deploy-api-db-migration
diff --git a/app/config.py b/app/config.py
index f2d37a769..0205262a0 100644
--- a/app/config.py
+++ b/app/config.py
@@ -30,7 +30,7 @@ class QueueNames(object):
     RETRY = 'retry-tasks'
     NOTIFY = 'notify-internal-tasks'
     PROCESS_FTP = 'process-ftp-tasks'
-    CREATE_LETTERS_PDF = 'create-letters-pdf'
+    CREATE_LETTERS_PDF = 'create-letters-pdf-tasks'
     CALLBACKS = 'service-callbacks'
 
     @staticmethod