diff --git a/dcc b/dcc
index ae418dc..61729a2 100755
--- a/dcc
+++ b/dcc
@@ -11,6 +11,7 @@ COMMAND=()
 PWADPATH="${HOME}/doom/pwads/${PWAD}"
 DEMOPATH="${HOME}/doom/demos/${PWAD}"
 VIDPATH="${HOME}/doom/fabricate/${PWAD}"
+MAPSTR="$(tr ' ' '-' <<< "${MAP}")"
 
 if ! [[ -e "${PWADPATH}" ]]; then
 	echo "PWAD ${PWAD} not found." >&2
@@ -22,14 +23,14 @@ case $1 in
 		;;
 	"record")
 		mkdir -p "${DEMOPATH}"
-		COMMAND=("-record" "${DEMOPATH}/${PWAD}_map${MAP}.lmp")
+		COMMAND=("-record" "${DEMOPATH}/${PWAD}_map${MAPSTR}.lmp")
 		;;
 	"fabricate")
 		mkdir -p "${VIDPATH}"
-		COMMAND=("-timedemo" "${DEMOPATH}/${PWAD}_map${MAP}.lmp" "-viddump" "${VIDPATH}/${PWAD}_map${MAP}.mp4")
+		COMMAND=("-timedemo" "${DEMOPATH}/${PWAD}_map${MAPSTR}.lmp" "-viddump" "${VIDPATH}/${PWAD}_map${MAPSTR}.mp4")
 		;;
 	"pb")
-		ffplay "${HOME}/doom/fabricate/${PWAD}/${PWAD}_map${MAP}.mp4"
+		ffplay "${HOME}/doom/fabricate/${PWAD}/${PWAD}_map${MAPSTR}.mp4"
 		exit $?
 		;;
 	*)