diff --git a/fabfile.py b/fabfile.py
index 8c6268565..b53a775c2 100644
--- a/fabfile.py
+++ b/fabfile.py
@@ -54,7 +54,7 @@ def pep8():
 
 def prepare_commit():
     """
-    Does everything before a commit should be done.
+    Does everything that should be done before a commit.
 
     At the moment it is running the tests and check for PEP 8 errors.
     """
diff --git a/openslides/motion/models.py b/openslides/motion/models.py
index 44c364697..1d3e9f0ff 100644
--- a/openslides/motion/models.py
+++ b/openslides/motion/models.py
@@ -180,7 +180,7 @@ class Motion(SlideMixin, models.Model):
 
         # Set the active version of this motion. This has to be done after the
         # version is saved to the database
-        if not self.state.dont_set_new_version_active or self.active_version is None:
+        if self.active_version is None or not self.state.leave_old_version_active:
             self.active_version = version
             self.save()
 
@@ -803,7 +803,7 @@ class State(models.Model):
     MotionDisableVersioningMixin.
     """
 
-    dont_set_new_version_active = models.BooleanField(default=False)
+    leave_old_version_active = models.BooleanField(default=False)
     """If true, new versions are not automaticly set active."""
 
     dont_set_identifier = models.BooleanField(default=False)
diff --git a/openslides/motion/signals.py b/openslides/motion/signals.py
index 7c65d07f3..76f2f9668 100644
--- a/openslides/motion/signals.py
+++ b/openslides/motion/signals.py
@@ -160,7 +160,7 @@ def create_builtin_workflows(sender, **kwargs):
                                      allow_create_poll=True,
                                      allow_submitter_edit=True,
                                      versioning=True,
-                                     dont_set_new_version_active=True)
+                                     leave_old_version_active=True)
     state_2_3 = State.objects.create(name=ugettext_noop('accepted'),
                                      workflow=workflow_2,
                                      action_word=ugettext_noop('Accept'),
diff --git a/tests/motion/test_models.py b/tests/motion/test_models.py
index 8c89de4e7..2ff9d8870 100644
--- a/tests/motion/test_models.py
+++ b/tests/motion/test_models.py
@@ -147,7 +147,7 @@ class ModelTest(TestCase):
         motion.text = 'bar'
         first_version = motion.version
         my_state = State.objects.create(name='automatic_versioning', workflow=self.workflow,
-                                        versioning=True, dont_set_new_version_active=True)
+                                        versioning=True, leave_old_version_active=True)
         motion.state = my_state
         motion.save()