diff --git a/CQGui/Command.py b/CQGui/Command.py
index fab7bda..df7b793 100644
--- a/CQGui/Command.py
+++ b/CQGui/Command.py
@@ -229,7 +229,7 @@ class CadQueryExecuteScript:
 
             # We import this way because using execfile() causes non-standard script execution in some situations
             with revert_sys_modules():
-                imp.load_source('temp_module', tempFile.name)
+                imp.load_source('__cq_freecad_module__', tempFile.name)
 
         msg = QtGui.QApplication.translate(
             "cqCodeWidget",
diff --git a/Libs/cadquery/cadquery/cqgi.py b/Libs/cadquery/cadquery/cqgi.py
index 8a4c029..bde5178 100644
--- a/Libs/cadquery/cadquery/cqgi.py
+++ b/Libs/cadquery/cadquery/cqgi.py
@@ -101,6 +101,7 @@ class CQModel(object):
             self.set_param_values(build_parameters)
             collector = ScriptCallback()
             env = EnvironmentBuilder().with_real_builtins().with_cadquery_objects() \
+                .add_entry("__name__", "__cqgi__") \
                 .add_entry("show_object", collector.show_object) \
                 .add_entry("debug", collector.debug) \
                 .add_entry("describe_parameter",collector.describe_parameter) \