diff --git a/admin/helpers/compiler/get.php b/admin/helpers/compiler/aGet.php
similarity index 100%
rename from admin/helpers/compiler/get.php
rename to admin/helpers/compiler/aGet.php
diff --git a/admin/helpers/compiler/structure.php b/admin/helpers/compiler/bStructure.php
similarity index 100%
rename from admin/helpers/compiler/structure.php
rename to admin/helpers/compiler/bStructure.php
diff --git a/admin/helpers/compiler/fields.php b/admin/helpers/compiler/cFields.php
similarity index 100%
rename from admin/helpers/compiler/fields.php
rename to admin/helpers/compiler/cFields.php
diff --git a/admin/helpers/compiler/interpretation.php b/admin/helpers/compiler/eInterpretation.php
similarity index 100%
rename from admin/helpers/compiler/interpretation.php
rename to admin/helpers/compiler/eInterpretation.php
diff --git a/admin/helpers/compiler/infusion.php b/admin/helpers/compiler/fInfusion.php
similarity index 100%
rename from admin/helpers/compiler/infusion.php
rename to admin/helpers/compiler/fInfusion.php
diff --git a/admin/helpers/componentbuilder.php b/admin/helpers/componentbuilder.php
index 7747bc6b7..e3945fa33 100644
--- a/admin/helpers/componentbuilder.php
+++ b/admin/helpers/componentbuilder.php
@@ -39,10 +39,10 @@ abstract class ComponentbuilderHelper
 	public static function autoLoader()
 	{
 		// load the compiler classes
-		require_once JPATH_ADMINISTRATOR.'/components/com_componentbuilder/helpers/get.php';
-		require_once JPATH_ADMINISTRATOR.'/components/com_componentbuilder/helpers/structure.php';
-		require_once JPATH_ADMINISTRATOR.'/components/com_componentbuilder/helpers/interpretation.php';
-		require_once JPATH_ADMINISTRATOR.'/components/com_componentbuilder/helpers/infusion.php';
+		foreach (glob(JPATH_ADMINISTRATOR."/components/com_componentbuilder/helpers/compiler/*.php") as $compilerFile)
+		{
+			require_once $compilerFile;
+		}
 		// import the Joomla librarys
 		jimport('joomla.filesystem.file');
 		jimport('joomla.filesystem.folder');