diff --git a/apps/openmw/engine.cpp b/apps/openmw/engine.cpp
index 9be158a60..744187563 100644
--- a/apps/openmw/engine.cpp
+++ b/apps/openmw/engine.cpp
@@ -7,7 +7,7 @@
 
 #include <MyGUI_WidgetManager.h>
 
-#include <components/compiler/registerextensions.hpp>
+#include <components/compiler/extensions0.hpp>
 
 #include <components/bsa/bsa_archive.hpp>
 #include <components/files/configurationmanager.hpp>
@@ -397,8 +397,8 @@ void OMW::Engine::prepareEngine (Settings::Manager & settings)
       mTranslationDataStorage.loadTranslationData(mFileCollections, mMaster[i]);
 
     // Create window manager - this manages all the MW-specific GUI windows
-    // MWScript::registerExtensions (mExtensions); // WHY DOES THIS NOT HAVE THE BOOL PARAMETER?
-    Compiler::registerExtensions (mExtensions, false);
+    // before compiler reorganization the following line was "MWScript::registerExtensions (mExtensions);"
+    Compiler::registerExtensions (mExtensions, false); 
 
     mEnvironment.setWindowManager (new MWGui::WindowManager(
         mExtensions, mFpsLevel, mOgre, mCfgMgr.getLogPath().string() + std::string("/"),
diff --git a/apps/openmw/mwgui/console.cpp b/apps/openmw/mwgui/console.cpp
index 7779488a6..a1e3fb738 100644
--- a/apps/openmw/mwgui/console.cpp
+++ b/apps/openmw/mwgui/console.cpp
@@ -1,7 +1,7 @@
 #include "console.hpp"
 
 #include <components/compiler/exception.hpp>
-#include <components/compiler/registerextensions.hpp>
+#include <components/compiler/extensions0.hpp>
 
 #include "../mwscript/extensions.hpp"
 
diff --git a/components/CMakeLists.txt b/components/CMakeLists.txt
index acb0c39ab..44e67674d 100644
--- a/components/CMakeLists.txt
+++ b/components/CMakeLists.txt
@@ -54,7 +54,7 @@ add_component_dir (files
 add_component_dir (compiler
     context controlparser errorhandler exception exprparser extensions fileparser generator
     lineparser literals locals output parser scanner scriptparser skipparser streamerrorhandler
-    stringparser tokenloc nullerrorhandler opcodes registerextensions
+    stringparser tokenloc nullerrorhandler opcodes extensions0
     )
 
 add_component_dir (interpreter
diff --git a/components/compiler/registerextensions.cpp b/components/compiler/extensions0.cpp
similarity index 99%
rename from components/compiler/registerextensions.cpp
rename to components/compiler/extensions0.cpp
index 274b7f06e..470bc6080 100644
--- a/components/compiler/registerextensions.cpp
+++ b/components/compiler/extensions0.cpp
@@ -1,4 +1,4 @@
-#include "registerextensions.hpp"
+#include "extensions0.hpp"
 
 #include "opcodes.hpp"
 #include "extensions.hpp"
diff --git a/components/compiler/registerextensions.hpp b/components/compiler/extensions0.hpp
similarity index 94%
rename from components/compiler/registerextensions.hpp
rename to components/compiler/extensions0.hpp
index e210fd289..a4e1f649f 100644
--- a/components/compiler/registerextensions.hpp
+++ b/components/compiler/extensions0.hpp
@@ -1,5 +1,5 @@
-#ifndef COMPILER_REGISTEREXTENSIONS_H
-#define COMPILER_REGISTEREXTENSIONS_H
+#ifndef COMPILER_EXTENSIONS0_H
+#define COMPILER_EXTENSIONS0_H
 
 namespace Compiler
 {
diff --git a/components/compiler/opcodes.hpp b/components/compiler/opcodes.hpp
index 32c19c9c2..b9e22d37a 100644
--- a/components/compiler/opcodes.hpp
+++ b/components/compiler/opcodes.hpp
@@ -100,8 +100,6 @@ namespace Compiler
 
     namespace Control
     {
-    	// not opcodes, but are required by apps/openmw and components/compiler
-    	// do they belong here?
     	const int numberOfControls = 7;
 
     	extern const char *controls[numberOfControls];
@@ -261,8 +259,6 @@ namespace Compiler
 
     namespace Stats
     {
-    	// not opcodes, but are required by apps/openmw and components/compiler
-    	// do they belong here?
     	const int numberOfAttributes = 8;
         const int numberOfDynamics = 3;
         const int numberOfSkills = 27;