diff --git a/tests/test_history.py b/tests/test_history.py
index 5e76c60a..12af8906 100644
--- a/tests/test_history.py
+++ b/tests/test_history.py
@@ -27,16 +27,16 @@ class TestHistory(object):
 
     def test_set(self, db):
         history = History()
-        history.update(last_script='ls',
-                       last_fixed_script=None)
-        assert db == {'1-last_script': 'ls',
-                      '1-last_fixed_script': None}
+        history.update(last_command='ls',
+                       last_fixed_command=None)
+        assert db == {'1-last_command': 'ls',
+                      '1-last_fixed_command': None}
 
     def test_get(self, db):
         history = History()
-        db['1-last_script'] = 'cd ..'
-        assert history.last_script == 'cd ..'
+        db['1-last_command'] = 'cd ..'
+        assert history.last_command == 'cd ..'
 
     def test_get_without_value(self):
         history = History()
-        assert history.last_script is None
+        assert history.last_command is None
diff --git a/tests/test_main.py b/tests/test_main.py
index 8e730f08..45e48806 100644
--- a/tests/test_main.py
+++ b/tests/test_main.py
@@ -62,13 +62,13 @@ class TestGetCommand(object):
 
     @pytest.mark.parametrize('history, args, result', [
         (Mock(), [''], None),
-        (Mock(last_script='ls', last_fixed_script='ls -la'),
+        (Mock(last_command='ls', last_fixed_command='ls -la'),
          ['thefuck', 'fuck'], 'ls -la'),
-        (Mock(last_script='ls', last_fixed_script='ls -la'),
+        (Mock(last_command='ls', last_fixed_command='ls -la'),
          ['thefuck', 'ls'], 'ls -la'),
-        (Mock(last_script='ls', last_fixed_script=''),
+        (Mock(last_command='ls', last_fixed_command=''),
          ['thefuck', 'ls'], 'ls'),
-        (Mock(last_script='ls', last_fixed_script=''),
+        (Mock(last_command='ls', last_fixed_command=''),
          ['thefuck', 'fuck'], 'ls')])
     def test_get_command_script(self, history, args, result):
         if result:
@@ -127,8 +127,8 @@ class TestRunRule(object):
         history = Mock()
         main.run_rule(Rule(get_new_command=lambda *_: 'ls -lah'),
                       Command('ls'), history, None)
-        history.update.assert_called_once_with(last_script='ls',
-                                               last_fixed_script='ls -lah')
+        history.update.assert_called_once_with(last_command='ls',
+                                               last_fixed_command='ls -lah')
 
     def test_when_not_comfirmed(self, capsys, confirm):
         confirm.return_value = False
diff --git a/thefuck/main.py b/thefuck/main.py
index d75a43ec..de1c425b 100644
--- a/thefuck/main.py
+++ b/thefuck/main.py
@@ -67,14 +67,14 @@ def get_command(settings, history, args):
     else:
         script = ' '.join(args[1:])
 
-    if script == 'fuck' or script == history.last_script:
-        script = history.last_fixed_script or history.last_script
+    if script == 'fuck' or script == history.last_command:
+        script = history.last_fixed_command or history.last_command
 
     if not script:
         return
 
-    history.update(last_script=script,
-                   last_fixed_script=None)
+    history.update(last_command=script,
+                   last_fixed_command=None)
     result = Popen(script, shell=True, stdout=PIPE, stderr=PIPE,
                    env=dict(os.environ, LANG='C'))
     if wait_output(settings, result):
@@ -113,8 +113,8 @@ def run_rule(rule, command, history, settings):
     if confirm(new_command, rule.side_effect, settings):
         if rule.side_effect:
             rule.side_effect(command, settings)
-        history.update(last_script=command.script,
-                       last_fixed_script=new_command)
+        history.update(last_command=command.script,
+                       last_fixed_command=new_command)
         print(new_command)