diff --git a/src/commands/cmdhandler.py b/src/commands/cmdhandler.py
index ab71361ff6..990ec7b1b0 100644
--- a/src/commands/cmdhandler.py
+++ b/src/commands/cmdhandler.py
@@ -238,7 +238,7 @@ def cmdhandler(caller, raw_string, testing=False):
             # post-command hook
             cmd.at_post_cmd()
 
-            if cmd.save_next:
+            if cmd.save_for_next:
                 # store a reference to this command, possibly
                 # accessible by the next command.
                 caller.ndb.last_cmd = copy(cmd)
diff --git a/src/commands/command.py b/src/commands/command.py
index 6e2960d533..8e475cf886 100644
--- a/src/commands/command.py
+++ b/src/commands/command.py
@@ -26,8 +26,8 @@ class CommandMeta(type):
             except Exception: 
                 mcs.aliases = []
         mcs.aliases = [str(alias).strip() for alias in mcs.aliases]
-        if not hasattr(mcs, "save_next"):
-            mcs.save_next = False
+        if not hasattr(mcs, "save_for_next"):
+            mcs.save_for_next = False
 
         # pre-process locks as defined in class definition
         temp = []