diff --git a/cdist/emulator.py b/cdist/emulator.py
index 4f91cd8e..1e8701cf 100644
--- a/cdist/emulator.py
+++ b/cdist/emulator.py
@@ -145,14 +145,14 @@ class Emulator(object):
             if value is not None:
                 self.parameters[key] = value
 
-        if self.cdist_object.exists and not 'CDIST_ALLOW_OVERRIDE' in os.environ:
+        if self.cdist_object.exists and not 'CDIST_OVERRIDE' in os.environ:
             if self.cdist_object.parameters != self.parameters:
                 raise cdist.Error("Object %s already exists with conflicting parameters:\n%s: %s\n%s: %s"
                     % (self.cdist_object.name, " ".join(self.cdist_object.source), self.cdist_object.parameters, self.object_source, self.parameters)
             )
         else:
             if self.cdist_object.exists:
-                self.log.debug('Object %s override forced with CDIST_ALLOW_OVERRIDE',self.cdist_object.name)
+                self.log.debug('Object %s override forced with CDIST_OVERRIDE',self.cdist_object.name)
                 self.cdist_object.create(True)
             else:
                 self.cdist_object.create()
diff --git a/docs/man/man7/cdist-manifest.text b/docs/man/man7/cdist-manifest.text
index 7f1b95dc..cfbd8bea 100644
--- a/docs/man/man7/cdist-manifest.text
+++ b/docs/man/man7/cdist-manifest.text
@@ -133,7 +133,7 @@ OVERRIDES
 ---------
 In some special cases, you would like to create an already defined object 
 with different parameters. In normal situations this leads to an error in cdist.
-If you whish, you can setup the environment variable CDIST_ALLOW_OVERRIDE
+If you whish, you can setup the environment variable CDIST_OVERRIDE
 (any value or even empty is ok) to tell cdist, that this object override is 
 wanted and should be accepted.
 ATTENTION: Only use this feature if you are 100% sure in which order 
@@ -190,7 +190,7 @@ __user foobar --password 'some_fancy_hash' --home /home/foobarexample
 __user foobar --password 'some_other_hash' 
 
 # this tells cdist, that you know that this is an override and should be accepted
-CDIST_ALLOW_OVERRIDE=yes __user foobar --password 'some_other_hash'
+CDIST_OVERRIDE=yes __user foobar --password 'some_other_hash'
 # its only an override, means the parameter --home is not touched 
 # and stay at the original value of /home/foobarexample
 --------------------------------------------------------------------------------