diff --git a/paper b/paper
index 24bc958b55..f80040c8f6 100755
--- a/paper
+++ b/paper
@@ -99,7 +99,7 @@ case "$1" in
     "e" | "edit")
         case "$2" in
             "s" | "server")
-            export LAST_EDIT="$basedir/Paper-Server"
+            export PAPER_LAST_EDIT="$basedir/Paper-Server"
             cd "$basedir/Paper-Server"
             (
                 set -e
@@ -110,7 +110,7 @@ case "$1" in
             )
             ;;
             "a" | "api")
-            export LAST_EDIT="$basedir/Paper-API"
+            export PAPER_LAST_EDIT="$basedir/Paper-API"
             cd "$basedir/Paper-API"
             (
                 set -e
@@ -121,8 +121,8 @@ case "$1" in
             )
             ;;
             "c" | "continue")
-            cd "$LAST_EDIT"
-            unset LAST_EDIT
+            cd "$PAPER_LAST_EDIT"
+            unset PAPER_LAST_EDIT
             (
                 set -e