--- a/src/ai/api/ai_abstractlist.hpp.sq	Sat Feb 23 14:33:18 2008 +0000
+++ b/src/ai/api/ai_abstractlist.hpp.sq	Sat Feb 23 14:42:07 2008 +0000
@@ -19,7 +19,7 @@
 	template <> int Return<AIAbstractList *>(HSQUIRRELVM vm, AIAbstractList *res) { if (res == NULL) { sq_pushnull(vm); return 1; } res->AddRef(); Squirrel::CreateClassInstanceVM(vm, "AIAbstractList", res, NULL, DefSQDestructorCallback<AIAbstractList>); return 1; }
 }; // namespace SQConvert
 
-void SQAIAbstractListRegister(Squirrel *engine) {
+void SQAIAbstractList_Register(Squirrel *engine) {
 	DefSQClass <AIAbstractList> SQAIAbstractList("AIAbstractList");
 	SQAIAbstractList.PreRegister(engine);
 	SQAIAbstractList.AddConstructor<void (AIAbstractList::*)(), 1>(engine, "x");

--- a/src/ai/api/ai_accounting.hpp.sq	Sat Feb 23 14:33:18 2008 +0000
+++ b/src/ai/api/ai_accounting.hpp.sq	Sat Feb 23 14:42:07 2008 +0000
@@ -9,7 +9,7 @@
 	template <> int Return<AIAccounting *>(HSQUIRRELVM vm, AIAccounting *res) { if (res == NULL) { sq_pushnull(vm); return 1; } res->AddRef(); Squirrel::CreateClassInstanceVM(vm, "AIAccounting", res, NULL, DefSQDestructorCallback<AIAccounting>); return 1; }
 }; // namespace SQConvert
 
-void SQAIAccountingRegister(Squirrel *engine) {
+void SQAIAccounting_Register(Squirrel *engine) {
 	DefSQClass <AIAccounting> SQAIAccounting("AIAccounting");
 	SQAIAccounting.PreRegister(engine);
 	SQAIAccounting.AddConstructor<void (AIAccounting::*)(), 1>(engine, "x");

--- a/src/ai/api/ai_airport.hpp.sq	Sat Feb 23 14:33:18 2008 +0000
+++ b/src/ai/api/ai_airport.hpp.sq	Sat Feb 23 14:42:07 2008 +0000
@@ -13,7 +13,7 @@
 	template <> int Return<AIAirport *>(HSQUIRRELVM vm, AIAirport *res) { if (res == NULL) { sq_pushnull(vm); return 1; } res->AddRef(); Squirrel::CreateClassInstanceVM(vm, "AIAirport", res, NULL, DefSQDestructorCallback<AIAirport>); return 1; }
 }; // namespace SQConvert
 
-void SQAIAirportRegister(Squirrel *engine) {
+void SQAIAirport_Register(Squirrel *engine) {
 	DefSQClass <AIAirport> SQAIAirport("AIAirport");
 	SQAIAirport.PreRegister(engine);
 	SQAIAirport.AddConstructor<void (AIAirport::*)(), 1>(engine, "x");

--- a/src/ai/api/ai_base.hpp.sq	Sat Feb 23 14:33:18 2008 +0000
+++ b/src/ai/api/ai_base.hpp.sq	Sat Feb 23 14:42:07 2008 +0000
@@ -9,7 +9,7 @@
 	template <> int Return<AIBase *>(HSQUIRRELVM vm, AIBase *res) { if (res == NULL) { sq_pushnull(vm); return 1; } res->AddRef(); Squirrel::CreateClassInstanceVM(vm, "AIBase", res, NULL, DefSQDestructorCallback<AIBase>); return 1; }
 }; // namespace SQConvert
 
-void SQAIBaseRegister(Squirrel *engine) {
+void SQAIBase_Register(Squirrel *engine) {
 	DefSQClass <AIBase> SQAIBase("AIBase");
 	SQAIBase.PreRegister(engine);
 	SQAIBase.AddConstructor<void (AIBase::*)(), 1>(engine, "x");

--- a/src/ai/api/ai_cargo.hpp.sq	Sat Feb 23 14:33:18 2008 +0000
+++ b/src/ai/api/ai_cargo.hpp.sq	Sat Feb 23 14:42:07 2008 +0000
@@ -9,7 +9,7 @@
 	template <> int Return<AICargo *>(HSQUIRRELVM vm, AICargo *res) { if (res == NULL) { sq_pushnull(vm); return 1; } res->AddRef(); Squirrel::CreateClassInstanceVM(vm, "AICargo", res, NULL, DefSQDestructorCallback<AICargo>); return 1; }
 }; // namespace SQConvert
 
-void SQAICargoRegister(Squirrel *engine) {
+void SQAICargo_Register(Squirrel *engine) {
 	DefSQClass <AICargo> SQAICargo("AICargo");
 	SQAICargo.PreRegister(engine);
 	SQAICargo.AddConstructor<void (AICargo::*)(), 1>(engine, "x");

--- a/src/ai/api/ai_company.hpp.sq	Sat Feb 23 14:33:18 2008 +0000
+++ b/src/ai/api/ai_company.hpp.sq	Sat Feb 23 14:42:07 2008 +0000
@@ -13,7 +13,7 @@
 	template <> int Return<AICompany *>(HSQUIRRELVM vm, AICompany *res) { if (res == NULL) { sq_pushnull(vm); return 1; } res->AddRef(); Squirrel::CreateClassInstanceVM(vm, "AICompany", res, NULL, DefSQDestructorCallback<AICompany>); return 1; }
 }; // namespace SQConvert
 
-void SQAICompanyRegister(Squirrel *engine) {
+void SQAICompany_Register(Squirrel *engine) {
 	DefSQClass <AICompany> SQAICompany("AICompany");
 	SQAICompany.PreRegister(engine);
 	SQAICompany.AddConstructor<void (AICompany::*)(), 1>(engine, "x");

--- a/src/ai/api/ai_engine.hpp.sq	Sat Feb 23 14:33:18 2008 +0000
+++ b/src/ai/api/ai_engine.hpp.sq	Sat Feb 23 14:42:07 2008 +0000
@@ -9,7 +9,7 @@
 	template <> int Return<AIEngine *>(HSQUIRRELVM vm, AIEngine *res) { if (res == NULL) { sq_pushnull(vm); return 1; } res->AddRef(); Squirrel::CreateClassInstanceVM(vm, "AIEngine", res, NULL, DefSQDestructorCallback<AIEngine>); return 1; }
 }; // namespace SQConvert
 
-void SQAIEngineRegister(Squirrel *engine) {
+void SQAIEngine_Register(Squirrel *engine) {
 	DefSQClass <AIEngine> SQAIEngine("AIEngine");
 	SQAIEngine.PreRegister(engine);
 	SQAIEngine.AddConstructor<void (AIEngine::*)(), 1>(engine, "x");

--- a/src/ai/api/ai_enginelist.hpp.sq	Sat Feb 23 14:33:18 2008 +0000
+++ b/src/ai/api/ai_enginelist.hpp.sq	Sat Feb 23 14:42:07 2008 +0000
@@ -9,7 +9,7 @@
 	template <> int Return<AIEngineList *>(HSQUIRRELVM vm, AIEngineList *res) { if (res == NULL) { sq_pushnull(vm); return 1; } res->AddRef(); Squirrel::CreateClassInstanceVM(vm, "AIEngineList", res, NULL, DefSQDestructorCallback<AIEngineList>); return 1; }
 }; // namespace SQConvert
 
-void SQAIEngineListRegister(Squirrel *engine) {
+void SQAIEngineList_Register(Squirrel *engine) {
 	DefSQClass <AIEngineList> SQAIEngineList("AIEngineList");
 	SQAIEngineList.PreRegister(engine, "AIAbstractList");
 	SQAIEngineList.AddConstructor<void (AIEngineList::*)(AIVehicle::VehicleType type), 2>(engine, "xi");

--- a/src/ai/api/ai_enginelist_valuator.hpp.sq	Sat Feb 23 14:33:18 2008 +0000
+++ b/src/ai/api/ai_enginelist_valuator.hpp.sq	Sat Feb 23 14:42:07 2008 +0000
@@ -9,7 +9,7 @@
 	template <> int Return<AIEngineListCargoType *>(HSQUIRRELVM vm, AIEngineListCargoType *res) { if (res == NULL) { sq_pushnull(vm); return 1; } res->AddRef(); Squirrel::CreateClassInstanceVM(vm, "AIEngineListCargoType", res, NULL, DefSQDestructorCallback<AIEngineListCargoType>); return 1; }
 }; // namespace SQConvert
 
-void SQAIEngineListCargoTypeRegister(Squirrel *engine) {
+void SQAIEngineListCargoType_Register(Squirrel *engine) {
 	DefSQClass <AIEngineListCargoType> SQAIEngineListCargoType("AIEngineListCargoType");
 	SQAIEngineListCargoType.PreRegister(engine);
 	SQAIEngineListCargoType.AddConstructor<void (AIEngineListCargoType::*)(), 1>(engine, "x");
@@ -28,7 +28,7 @@
 	template <> int Return<AIEngineListCapacity *>(HSQUIRRELVM vm, AIEngineListCapacity *res) { if (res == NULL) { sq_pushnull(vm); return 1; } res->AddRef(); Squirrel::CreateClassInstanceVM(vm, "AIEngineListCapacity", res, NULL, DefSQDestructorCallback<AIEngineListCapacity>); return 1; }
 }; // namespace SQConvert
 
-void SQAIEngineListCapacityRegister(Squirrel *engine) {
+void SQAIEngineListCapacity_Register(Squirrel *engine) {
 	DefSQClass <AIEngineListCapacity> SQAIEngineListCapacity("AIEngineListCapacity");
 	SQAIEngineListCapacity.PreRegister(engine);
 	SQAIEngineListCapacity.AddConstructor<void (AIEngineListCapacity::*)(), 1>(engine, "x");
@@ -47,7 +47,7 @@
 	template <> int Return<AIEngineListReliability *>(HSQUIRRELVM vm, AIEngineListReliability *res) { if (res == NULL) { sq_pushnull(vm); return 1; } res->AddRef(); Squirrel::CreateClassInstanceVM(vm, "AIEngineListReliability", res, NULL, DefSQDestructorCallback<AIEngineListReliability>); return 1; }
 }; // namespace SQConvert
 
-void SQAIEngineListReliabilityRegister(Squirrel *engine) {
+void SQAIEngineListReliability_Register(Squirrel *engine) {
 	DefSQClass <AIEngineListReliability> SQAIEngineListReliability("AIEngineListReliability");
 	SQAIEngineListReliability.PreRegister(engine);
 	SQAIEngineListReliability.AddConstructor<void (AIEngineListReliability::*)(), 1>(engine, "x");
@@ -66,7 +66,7 @@
 	template <> int Return<AIEngineListMaxSpeed *>(HSQUIRRELVM vm, AIEngineListMaxSpeed *res) { if (res == NULL) { sq_pushnull(vm); return 1; } res->AddRef(); Squirrel::CreateClassInstanceVM(vm, "AIEngineListMaxSpeed", res, NULL, DefSQDestructorCallback<AIEngineListMaxSpeed>); return 1; }
 }; // namespace SQConvert
 
-void SQAIEngineListMaxSpeedRegister(Squirrel *engine) {
+void SQAIEngineListMaxSpeed_Register(Squirrel *engine) {
 	DefSQClass <AIEngineListMaxSpeed> SQAIEngineListMaxSpeed("AIEngineListMaxSpeed");
 	SQAIEngineListMaxSpeed.PreRegister(engine);
 	SQAIEngineListMaxSpeed.AddConstructor<void (AIEngineListMaxSpeed::*)(), 1>(engine, "x");
@@ -85,7 +85,7 @@
 	template <> int Return<AIEngineListPrice *>(HSQUIRRELVM vm, AIEngineListPrice *res) { if (res == NULL) { sq_pushnull(vm); return 1; } res->AddRef(); Squirrel::CreateClassInstanceVM(vm, "AIEngineListPrice", res, NULL, DefSQDestructorCallback<AIEngineListPrice>); return 1; }
 }; // namespace SQConvert
 
-void SQAIEngineListPriceRegister(Squirrel *engine) {
+void SQAIEngineListPrice_Register(Squirrel *engine) {
 	DefSQClass <AIEngineListPrice> SQAIEngineListPrice("AIEngineListPrice");
 	SQAIEngineListPrice.PreRegister(engine);
 	SQAIEngineListPrice.AddConstructor<void (AIEngineListPrice::*)(), 1>(engine, "x");

--- a/src/ai/api/ai_event.hpp.sq	Sat Feb 23 14:33:18 2008 +0000
+++ b/src/ai/api/ai_event.hpp.sq	Sat Feb 23 14:42:07 2008 +0000
@@ -13,7 +13,7 @@
 	template <> int Return<AIEvent *>(HSQUIRRELVM vm, AIEvent *res) { if (res == NULL) { sq_pushnull(vm); return 1; } res->AddRef(); Squirrel::CreateClassInstanceVM(vm, "AIEvent", res, NULL, DefSQDestructorCallback<AIEvent>); return 1; }
 }; // namespace SQConvert
 
-void SQAIEventRegister(Squirrel *engine) {
+void SQAIEvent_Register(Squirrel *engine) {
 	DefSQClass <AIEvent> SQAIEvent("AIEvent");
 	SQAIEvent.PreRegister(engine);
 	SQAIEvent.AddConstructor<void (AIEvent::*)(AIEvent::AIEventType type), 2>(engine, "xi");
@@ -38,7 +38,7 @@
 	template <> int Return<AIEventController *>(HSQUIRRELVM vm, AIEventController *res) { if (res == NULL) { sq_pushnull(vm); return 1; } res->AddRef(); Squirrel::CreateClassInstanceVM(vm, "AIEventController", res, NULL, DefSQDestructorCallback<AIEventController>); return 1; }
 }; // namespace SQConvert
 
-void SQAIEventControllerRegister(Squirrel *engine) {
+void SQAIEventController_Register(Squirrel *engine) {
 	DefSQClass <AIEventController> SQAIEventController("AIEventController");
 	SQAIEventController.PreRegister(engine);
 	SQAIEventController.AddConstructor<void (AIEventController::*)(), 1>(engine, "x");

--- a/src/ai/api/ai_event_types.hpp.sq	Sat Feb 23 14:33:18 2008 +0000
+++ b/src/ai/api/ai_event_types.hpp.sq	Sat Feb 23 14:42:07 2008 +0000
@@ -9,7 +9,7 @@
 	template <> int Return<AIEventTest *>(HSQUIRRELVM vm, AIEventTest *res) { if (res == NULL) { sq_pushnull(vm); return 1; } res->AddRef(); Squirrel::CreateClassInstanceVM(vm, "AIEventTest", res, NULL, DefSQDestructorCallback<AIEventTest>); return 1; }
 }; // namespace SQConvert
 
-void SQAIEventTestRegister(Squirrel *engine) {
+void SQAIEventTest_Register(Squirrel *engine) {
 	DefSQClass <AIEventTest> SQAIEventTest("AIEventTest");
 	SQAIEventTest.PreRegister(engine, "AIEvent");
 	SQAIEventTest.AddConstructor<void (AIEventTest::*)(uint test), 2>(engine, "xi");
@@ -31,7 +31,7 @@
 	template <> int Return<AIEventVehicleCrash *>(HSQUIRRELVM vm, AIEventVehicleCrash *res) { if (res == NULL) { sq_pushnull(vm); return 1; } res->AddRef(); Squirrel::CreateClassInstanceVM(vm, "AIEventVehicleCrash", res, NULL, DefSQDestructorCallback<AIEventVehicleCrash>); return 1; }
 }; // namespace SQConvert
 
-void SQAIEventVehicleCrashRegister(Squirrel *engine) {
+void SQAIEventVehicleCrash_Register(Squirrel *engine) {
 	DefSQClass <AIEventVehicleCrash> SQAIEventVehicleCrash("AIEventVehicleCrash");
 	SQAIEventVehicleCrash.PreRegister(engine, "AIEvent");
 	SQAIEventVehicleCrash.AddConstructor<void (AIEventVehicleCrash::*)(VehicleID vehicle, TileIndex crash_site), 3>(engine, "xii");

--- a/src/ai/api/ai_execmode.hpp.sq	Sat Feb 23 14:33:18 2008 +0000
+++ b/src/ai/api/ai_execmode.hpp.sq	Sat Feb 23 14:42:07 2008 +0000
@@ -9,7 +9,7 @@
 	template <> int Return<AIExecMode *>(HSQUIRRELVM vm, AIExecMode *res) { if (res == NULL) { sq_pushnull(vm); return 1; } res->AddRef(); Squirrel::CreateClassInstanceVM(vm, "AIExecMode", res, NULL, DefSQDestructorCallback<AIExecMode>); return 1; }
 }; // namespace SQConvert
 
-void SQAIExecModeRegister(Squirrel *engine) {
+void SQAIExecMode_Register(Squirrel *engine) {
 	DefSQClass <AIExecMode> SQAIExecMode("AIExecMode");
 	SQAIExecMode.PreRegister(engine);
 	SQAIExecMode.AddConstructor<void (AIExecMode::*)(), 1>(engine, "x");

--- a/src/ai/api/ai_industry.hpp.sq	Sat Feb 23 14:33:18 2008 +0000
+++ b/src/ai/api/ai_industry.hpp.sq	Sat Feb 23 14:42:07 2008 +0000
@@ -9,7 +9,7 @@
 	template <> int Return<AIIndustry *>(HSQUIRRELVM vm, AIIndustry *res) { if (res == NULL) { sq_pushnull(vm); return 1; } res->AddRef(); Squirrel::CreateClassInstanceVM(vm, "AIIndustry", res, NULL, DefSQDestructorCallback<AIIndustry>); return 1; }
 }; // namespace SQConvert
 
-void SQAIIndustryRegister(Squirrel *engine) {
+void SQAIIndustry_Register(Squirrel *engine) {
 	DefSQClass <AIIndustry> SQAIIndustry("AIIndustry");
 	SQAIIndustry.PreRegister(engine);
 	SQAIIndustry.AddConstructor<void (AIIndustry::*)(), 1>(engine, "x");

--- a/src/ai/api/ai_industrylist.hpp.sq	Sat Feb 23 14:33:18 2008 +0000
+++ b/src/ai/api/ai_industrylist.hpp.sq	Sat Feb 23 14:42:07 2008 +0000
@@ -9,7 +9,7 @@
 	template <> int Return<AIIndustryList *>(HSQUIRRELVM vm, AIIndustryList *res) { if (res == NULL) { sq_pushnull(vm); return 1; } res->AddRef(); Squirrel::CreateClassInstanceVM(vm, "AIIndustryList", res, NULL, DefSQDestructorCallback<AIIndustryList>); return 1; }
 }; // namespace SQConvert
 
-void SQAIIndustryListRegister(Squirrel *engine) {
+void SQAIIndustryList_Register(Squirrel *engine) {
 	DefSQClass <AIIndustryList> SQAIIndustryList("AIIndustryList");
 	SQAIIndustryList.PreRegister(engine, "AIAbstractList");
 	SQAIIndustryList.AddConstructor<void (AIIndustryList::*)(), 1>(engine, "x");

--- a/src/ai/api/ai_industrylist_valuator.hpp.sq	Sat Feb 23 14:33:18 2008 +0000
+++ b/src/ai/api/ai_industrylist_valuator.hpp.sq	Sat Feb 23 14:42:07 2008 +0000
@@ -9,7 +9,7 @@
 	template <> int Return<AIIndustryListProduction *>(HSQUIRRELVM vm, AIIndustryListProduction *res) { if (res == NULL) { sq_pushnull(vm); return 1; } res->AddRef(); Squirrel::CreateClassInstanceVM(vm, "AIIndustryListProduction", res, NULL, DefSQDestructorCallback<AIIndustryListProduction>); return 1; }
 }; // namespace SQConvert
 
-void SQAIIndustryListProductionRegister(Squirrel *engine) {
+void SQAIIndustryListProduction_Register(Squirrel *engine) {
 	DefSQClass <AIIndustryListProduction> SQAIIndustryListProduction("AIIndustryListProduction");
 	SQAIIndustryListProduction.PreRegister(engine);
 	SQAIIndustryListProduction.AddConstructor<void (AIIndustryListProduction::*)(CargoID cargo_type), 2>(engine, "xi");
@@ -28,7 +28,7 @@
 	template <> int Return<AIIndustryListCargoAccepted *>(HSQUIRRELVM vm, AIIndustryListCargoAccepted *res) { if (res == NULL) { sq_pushnull(vm); return 1; } res->AddRef(); Squirrel::CreateClassInstanceVM(vm, "AIIndustryListCargoAccepted", res, NULL, DefSQDestructorCallback<AIIndustryListCargoAccepted>); return 1; }
 }; // namespace SQConvert
 
-void SQAIIndustryListCargoAcceptedRegister(Squirrel *engine) {
+void SQAIIndustryListCargoAccepted_Register(Squirrel *engine) {
 	DefSQClass <AIIndustryListCargoAccepted> SQAIIndustryListCargoAccepted("AIIndustryListCargoAccepted");
 	SQAIIndustryListCargoAccepted.PreRegister(engine);
 	SQAIIndustryListCargoAccepted.AddConstructor<void (AIIndustryListCargoAccepted::*)(CargoID cargo_type), 2>(engine, "xi");
@@ -47,7 +47,7 @@
 	template <> int Return<AIIndustryListLocation *>(HSQUIRRELVM vm, AIIndustryListLocation *res) { if (res == NULL) { sq_pushnull(vm); return 1; } res->AddRef(); Squirrel::CreateClassInstanceVM(vm, "AIIndustryListLocation", res, NULL, DefSQDestructorCallback<AIIndustryListLocation>); return 1; }
 }; // namespace SQConvert
 
-void SQAIIndustryListLocationRegister(Squirrel *engine) {
+void SQAIIndustryListLocation_Register(Squirrel *engine) {
 	DefSQClass <AIIndustryListLocation> SQAIIndustryListLocation("AIIndustryListLocation");
 	SQAIIndustryListLocation.PreRegister(engine);
 	SQAIIndustryListLocation.AddConstructor<void (AIIndustryListLocation::*)(), 1>(engine, "x");
@@ -66,7 +66,7 @@
 	template <> int Return<AIIndustryListDistanceManhattanToTile *>(HSQUIRRELVM vm, AIIndustryListDistanceManhattanToTile *res) { if (res == NULL) { sq_pushnull(vm); return 1; } res->AddRef(); Squirrel::CreateClassInstanceVM(vm, "AIIndustryListDistanceManhattanToTile", res, NULL, DefSQDestructorCallback<AIIndustryListDistanceManhattanToTile>); return 1; }
 }; // namespace SQConvert
 
-void SQAIIndustryListDistanceManhattanToTileRegister(Squirrel *engine) {
+void SQAIIndustryListDistanceManhattanToTile_Register(Squirrel *engine) {
 	DefSQClass <AIIndustryListDistanceManhattanToTile> SQAIIndustryListDistanceManhattanToTile("AIIndustryListDistanceManhattanToTile");
 	SQAIIndustryListDistanceManhattanToTile.PreRegister(engine);
 	SQAIIndustryListDistanceManhattanToTile.AddConstructor<void (AIIndustryListDistanceManhattanToTile::*)(TileIndex tile), 2>(engine, "xi");
@@ -85,7 +85,7 @@
 	template <> int Return<AIIndustryListDistanceSquareToTile *>(HSQUIRRELVM vm, AIIndustryListDistanceSquareToTile *res) { if (res == NULL) { sq_pushnull(vm); return 1; } res->AddRef(); Squirrel::CreateClassInstanceVM(vm, "AIIndustryListDistanceSquareToTile", res, NULL, DefSQDestructorCallback<AIIndustryListDistanceSquareToTile>); return 1; }
 }; // namespace SQConvert
 
-void SQAIIndustryListDistanceSquareToTileRegister(Squirrel *engine) {
+void SQAIIndustryListDistanceSquareToTile_Register(Squirrel *engine) {
 	DefSQClass <AIIndustryListDistanceSquareToTile> SQAIIndustryListDistanceSquareToTile("AIIndustryListDistanceSquareToTile");
 	SQAIIndustryListDistanceSquareToTile.PreRegister(engine);
 	SQAIIndustryListDistanceSquareToTile.AddConstructor<void (AIIndustryListDistanceSquareToTile::*)(TileIndex tile), 2>(engine, "xi");

--- a/src/ai/api/ai_list.hpp.sq	Sat Feb 23 14:33:18 2008 +0000
+++ b/src/ai/api/ai_list.hpp.sq	Sat Feb 23 14:42:07 2008 +0000
@@ -9,7 +9,7 @@
 	template <> int Return<AIList *>(HSQUIRRELVM vm, AIList *res) { if (res == NULL) { sq_pushnull(vm); return 1; } res->AddRef(); Squirrel::CreateClassInstanceVM(vm, "AIList", res, NULL, DefSQDestructorCallback<AIList>); return 1; }
 }; // namespace SQConvert
 
-void SQAIListRegister(Squirrel *engine) {
+void SQAIList_Register(Squirrel *engine) {
 	DefSQClass <AIList> SQAIList("AIList");
 	SQAIList.PreRegister(engine, "AIAbstractList");
 	SQAIList.AddConstructor<void (AIList::*)(), 1>(engine, "x");

--- a/src/ai/api/ai_list_valuator.hpp.sq	Sat Feb 23 14:33:18 2008 +0000
+++ b/src/ai/api/ai_list_valuator.hpp.sq	Sat Feb 23 14:42:07 2008 +0000
@@ -9,7 +9,7 @@
 	template <> int Return<AIListRandomize *>(HSQUIRRELVM vm, AIListRandomize *res) { if (res == NULL) { sq_pushnull(vm); return 1; } res->AddRef(); Squirrel::CreateClassInstanceVM(vm, "AIListRandomize", res, NULL, DefSQDestructorCallback<AIListRandomize>); return 1; }
 }; // namespace SQConvert
 
-void SQAIListRandomizeRegister(Squirrel *engine) {
+void SQAIListRandomize_Register(Squirrel *engine) {
 	DefSQClass <AIListRandomize> SQAIListRandomize("AIListRandomize");
 	SQAIListRandomize.PreRegister(engine);
 	SQAIListRandomize.AddConstructor<void (AIListRandomize::*)(), 1>(engine, "x");

--- a/src/ai/api/ai_map.hpp.sq	Sat Feb 23 14:33:18 2008 +0000
+++ b/src/ai/api/ai_map.hpp.sq	Sat Feb 23 14:42:07 2008 +0000
@@ -9,7 +9,7 @@
 	template <> int Return<AIMap *>(HSQUIRRELVM vm, AIMap *res) { if (res == NULL) { sq_pushnull(vm); return 1; } res->AddRef(); Squirrel::CreateClassInstanceVM(vm, "AIMap", res, NULL, DefSQDestructorCallback<AIMap>); return 1; }
 }; // namespace SQConvert
 
-void SQAIMapRegister(Squirrel *engine) {
+void SQAIMap_Register(Squirrel *engine) {
 	DefSQClass <AIMap> SQAIMap("AIMap");
 	SQAIMap.PreRegister(engine);
 	SQAIMap.AddConstructor<void (AIMap::*)(), 1>(engine, "x");

--- a/src/ai/api/ai_marine.hpp.sq	Sat Feb 23 14:33:18 2008 +0000
+++ b/src/ai/api/ai_marine.hpp.sq	Sat Feb 23 14:42:07 2008 +0000
@@ -9,7 +9,7 @@
 	template <> int Return<AIMarine *>(HSQUIRRELVM vm, AIMarine *res) { if (res == NULL) { sq_pushnull(vm); return 1; } res->AddRef(); Squirrel::CreateClassInstanceVM(vm, "AIMarine", res, NULL, DefSQDestructorCallback<AIMarine>); return 1; }
 }; // namespace SQConvert
 
-void SQAIMarineRegister(Squirrel *engine) {
+void SQAIMarine_Register(Squirrel *engine) {
 	DefSQClass <AIMarine> SQAIMarine("AIMarine");
 	SQAIMarine.PreRegister(engine);
 	SQAIMarine.AddConstructor<void (AIMarine::*)(), 1>(engine, "x");

--- a/src/ai/api/ai_order.hpp.sq	Sat Feb 23 14:33:18 2008 +0000
+++ b/src/ai/api/ai_order.hpp.sq	Sat Feb 23 14:42:07 2008 +0000
@@ -13,7 +13,7 @@
 	template <> int Return<AIOrder *>(HSQUIRRELVM vm, AIOrder *res) { if (res == NULL) { sq_pushnull(vm); return 1; } res->AddRef(); Squirrel::CreateClassInstanceVM(vm, "AIOrder", res, NULL, DefSQDestructorCallback<AIOrder>); return 1; }
 }; // namespace SQConvert
 
-void SQAIOrderRegister(Squirrel *engine) {
+void SQAIOrder_Register(Squirrel *engine) {
 	DefSQClass <AIOrder> SQAIOrder("AIOrder");
 	SQAIOrder.PreRegister(engine);
 	SQAIOrder.AddConstructor<void (AIOrder::*)(), 1>(engine, "x");

--- a/src/ai/api/ai_pathfinder.hpp.sq	Sat Feb 23 14:33:18 2008 +0000
+++ b/src/ai/api/ai_pathfinder.hpp.sq	Sat Feb 23 14:42:07 2008 +0000
@@ -13,7 +13,7 @@
 	template <> int Return<AIPathFinder *>(HSQUIRRELVM vm, AIPathFinder *res) { if (res == NULL) { sq_pushnull(vm); return 1; } res->AddRef(); Squirrel::CreateClassInstanceVM(vm, "AIPathFinder", res, NULL, DefSQDestructorCallback<AIPathFinder>); return 1; }
 }; // namespace SQConvert
 
-void SQAIPathFinderRegister(Squirrel *engine) {
+void SQAIPathFinder_Register(Squirrel *engine) {
 	DefSQClass <AIPathFinder> SQAIPathFinder("AIPathFinder");
 	SQAIPathFinder.PreRegister(engine);
 

--- a/src/ai/api/ai_pathfinder_stupid.hpp.sq	Sat Feb 23 14:33:18 2008 +0000
+++ b/src/ai/api/ai_pathfinder_stupid.hpp.sq	Sat Feb 23 14:42:07 2008 +0000
@@ -9,7 +9,7 @@
 	template <> int Return<AIPathFinderStupid *>(HSQUIRRELVM vm, AIPathFinderStupid *res) { if (res == NULL) { sq_pushnull(vm); return 1; } res->AddRef(); Squirrel::CreateClassInstanceVM(vm, "AIPathFinderStupid", res, NULL, DefSQDestructorCallback<AIPathFinderStupid>); return 1; }
 }; // namespace SQConvert
 
-void SQAIPathFinderStupidRegister(Squirrel *engine) {
+void SQAIPathFinderStupid_Register(Squirrel *engine) {
 	DefSQClass <AIPathFinderStupid> SQAIPathFinderStupid("AIPathFinderStupid");
 	SQAIPathFinderStupid.PreRegister(engine, "AIPathFinder");
 	SQAIPathFinderStupid.AddConstructor<void (AIPathFinderStupid::*)(AIPathFinder::PathFinderType type), 2>(engine, "xi");

--- a/src/ai/api/ai_road.hpp.sq	Sat Feb 23 14:33:18 2008 +0000
+++ b/src/ai/api/ai_road.hpp.sq	Sat Feb 23 14:42:07 2008 +0000
@@ -9,7 +9,7 @@
 	template <> int Return<AIRoad *>(HSQUIRRELVM vm, AIRoad *res) { if (res == NULL) { sq_pushnull(vm); return 1; } res->AddRef(); Squirrel::CreateClassInstanceVM(vm, "AIRoad", res, NULL, DefSQDestructorCallback<AIRoad>); return 1; }
 }; // namespace SQConvert
 
-void SQAIRoadRegister(Squirrel *engine) {
+void SQAIRoad_Register(Squirrel *engine) {
 	DefSQClass <AIRoad> SQAIRoad("AIRoad");
 	SQAIRoad.PreRegister(engine);
 	SQAIRoad.AddConstructor<void (AIRoad::*)(), 1>(engine, "x");

--- a/src/ai/api/ai_settings.hpp.sq	Sat Feb 23 14:33:18 2008 +0000
+++ b/src/ai/api/ai_settings.hpp.sq	Sat Feb 23 14:42:07 2008 +0000
@@ -9,7 +9,7 @@
 	template <> int Return<AISettings *>(HSQUIRRELVM vm, AISettings *res) { if (res == NULL) { sq_pushnull(vm); return 1; } res->AddRef(); Squirrel::CreateClassInstanceVM(vm, "AISettings", res, NULL, DefSQDestructorCallback<AISettings>); return 1; }
 }; // namespace SQConvert
 
-void SQAISettingsRegister(Squirrel *engine) {
+void SQAISettings_Register(Squirrel *engine) {
 	DefSQClass <AISettings> SQAISettings("AISettings");
 	SQAISettings.PreRegister(engine);
 	SQAISettings.AddConstructor<void (AISettings::*)(), 1>(engine, "x");

--- a/src/ai/api/ai_sign.hpp.sq	Sat Feb 23 14:33:18 2008 +0000
+++ b/src/ai/api/ai_sign.hpp.sq	Sat Feb 23 14:42:07 2008 +0000
@@ -9,7 +9,7 @@
 	template <> int Return<AISign *>(HSQUIRRELVM vm, AISign *res) { if (res == NULL) { sq_pushnull(vm); return 1; } res->AddRef(); Squirrel::CreateClassInstanceVM(vm, "AISign", res, NULL, DefSQDestructorCallback<AISign>); return 1; }
 }; // namespace SQConvert
 
-void SQAISignRegister(Squirrel *engine) {
+void SQAISign_Register(Squirrel *engine) {
 	DefSQClass <AISign> SQAISign("AISign");
 	SQAISign.PreRegister(engine);
 	SQAISign.AddConstructor<void (AISign::*)(), 1>(engine, "x");

--- a/src/ai/api/ai_station.hpp.sq	Sat Feb 23 14:33:18 2008 +0000
+++ b/src/ai/api/ai_station.hpp.sq	Sat Feb 23 14:42:07 2008 +0000
@@ -13,7 +13,7 @@
 	template <> int Return<AIStation *>(HSQUIRRELVM vm, AIStation *res) { if (res == NULL) { sq_pushnull(vm); return 1; } res->AddRef(); Squirrel::CreateClassInstanceVM(vm, "AIStation", res, NULL, DefSQDestructorCallback<AIStation>); return 1; }
 }; // namespace SQConvert
 
-void SQAIStationRegister(Squirrel *engine) {
+void SQAIStation_Register(Squirrel *engine) {
 	DefSQClass <AIStation> SQAIStation("AIStation");
 	SQAIStation.PreRegister(engine);
 	SQAIStation.AddConstructor<void (AIStation::*)(), 1>(engine, "x");

--- a/src/ai/api/ai_stationlist.hpp.sq	Sat Feb 23 14:33:18 2008 +0000
+++ b/src/ai/api/ai_stationlist.hpp.sq	Sat Feb 23 14:42:07 2008 +0000
@@ -9,7 +9,7 @@
 	template <> int Return<AIStationList *>(HSQUIRRELVM vm, AIStationList *res) { if (res == NULL) { sq_pushnull(vm); return 1; } res->AddRef(); Squirrel::CreateClassInstanceVM(vm, "AIStationList", res, NULL, DefSQDestructorCallback<AIStationList>); return 1; }
 }; // namespace SQConvert
 
-void SQAIStationListRegister(Squirrel *engine) {
+void SQAIStationList_Register(Squirrel *engine) {
 	DefSQClass <AIStationList> SQAIStationList("AIStationList");
 	SQAIStationList.PreRegister(engine, "AIAbstractList");
 	SQAIStationList.AddConstructor<void (AIStationList::*)(AIStation::StationType type), 2>(engine, "xi");
@@ -28,7 +28,7 @@
 	template <> int Return<AIVehicleStationList *>(HSQUIRRELVM vm, AIVehicleStationList *res) { if (res == NULL) { sq_pushnull(vm); return 1; } res->AddRef(); Squirrel::CreateClassInstanceVM(vm, "AIVehicleStationList", res, NULL, DefSQDestructorCallback<AIVehicleStationList>); return 1; }
 }; // namespace SQConvert
 
-void SQAIVehicleStationListRegister(Squirrel *engine) {
+void SQAIVehicleStationList_Register(Squirrel *engine) {
 	DefSQClass <AIVehicleStationList> SQAIVehicleStationList("AIVehicleStationList");
 	SQAIVehicleStationList.PreRegister(engine, "AIAbstractList");
 	SQAIVehicleStationList.AddConstructor<void (AIVehicleStationList::*)(VehicleID vehicle_id), 2>(engine, "xi");

--- a/src/ai/api/ai_stationlist_valuator.hpp.sq	Sat Feb 23 14:33:18 2008 +0000
+++ b/src/ai/api/ai_stationlist_valuator.hpp.sq	Sat Feb 23 14:42:07 2008 +0000
@@ -9,7 +9,7 @@
 	template <> int Return<AIStationListLocation *>(HSQUIRRELVM vm, AIStationListLocation *res) { if (res == NULL) { sq_pushnull(vm); return 1; } res->AddRef(); Squirrel::CreateClassInstanceVM(vm, "AIStationListLocation", res, NULL, DefSQDestructorCallback<AIStationListLocation>); return 1; }
 }; // namespace SQConvert
 
-void SQAIStationListLocationRegister(Squirrel *engine) {
+void SQAIStationListLocation_Register(Squirrel *engine) {
 	DefSQClass <AIStationListLocation> SQAIStationListLocation("AIStationListLocation");
 	SQAIStationListLocation.PreRegister(engine);
 	SQAIStationListLocation.AddConstructor<void (AIStationListLocation::*)(), 1>(engine, "x");
@@ -28,7 +28,7 @@
 	template <> int Return<AIStationListCargoWaiting *>(HSQUIRRELVM vm, AIStationListCargoWaiting *res) { if (res == NULL) { sq_pushnull(vm); return 1; } res->AddRef(); Squirrel::CreateClassInstanceVM(vm, "AIStationListCargoWaiting", res, NULL, DefSQDestructorCallback<AIStationListCargoWaiting>); return 1; }
 }; // namespace SQConvert
 
-void SQAIStationListCargoWaitingRegister(Squirrel *engine) {
+void SQAIStationListCargoWaiting_Register(Squirrel *engine) {
 	DefSQClass <AIStationListCargoWaiting> SQAIStationListCargoWaiting("AIStationListCargoWaiting");
 	SQAIStationListCargoWaiting.PreRegister(engine);
 	SQAIStationListCargoWaiting.AddConstructor<void (AIStationListCargoWaiting::*)(CargoID cargo_type), 2>(engine, "xi");
@@ -47,7 +47,7 @@
 	template <> int Return<AIStationListCargoRating *>(HSQUIRRELVM vm, AIStationListCargoRating *res) { if (res == NULL) { sq_pushnull(vm); return 1; } res->AddRef(); Squirrel::CreateClassInstanceVM(vm, "AIStationListCargoRating", res, NULL, DefSQDestructorCallback<AIStationListCargoRating>); return 1; }
 }; // namespace SQConvert
 
-void SQAIStationListCargoRatingRegister(Squirrel *engine) {
+void SQAIStationListCargoRating_Register(Squirrel *engine) {
 	DefSQClass <AIStationListCargoRating> SQAIStationListCargoRating("AIStationListCargoRating");
 	SQAIStationListCargoRating.PreRegister(engine);
 	SQAIStationListCargoRating.AddConstructor<void (AIStationListCargoRating::*)(CargoID cargo_type), 2>(engine, "xi");
@@ -66,7 +66,7 @@
 	template <> int Return<AIStationListDistanceManhattanToTile *>(HSQUIRRELVM vm, AIStationListDistanceManhattanToTile *res) { if (res == NULL) { sq_pushnull(vm); return 1; } res->AddRef(); Squirrel::CreateClassInstanceVM(vm, "AIStationListDistanceManhattanToTile", res, NULL, DefSQDestructorCallback<AIStationListDistanceManhattanToTile>); return 1; }
 }; // namespace SQConvert
 
-void SQAIStationListDistanceManhattanToTileRegister(Squirrel *engine) {
+void SQAIStationListDistanceManhattanToTile_Register(Squirrel *engine) {
 	DefSQClass <AIStationListDistanceManhattanToTile> SQAIStationListDistanceManhattanToTile("AIStationListDistanceManhattanToTile");
 	SQAIStationListDistanceManhattanToTile.PreRegister(engine);
 	SQAIStationListDistanceManhattanToTile.AddConstructor<void (AIStationListDistanceManhattanToTile::*)(TileIndex tile), 2>(engine, "xi");
@@ -85,7 +85,7 @@
 	template <> int Return<AIStationListDistanceSquareToTile *>(HSQUIRRELVM vm, AIStationListDistanceSquareToTile *res) { if (res == NULL) { sq_pushnull(vm); return 1; } res->AddRef(); Squirrel::CreateClassInstanceVM(vm, "AIStationListDistanceSquareToTile", res, NULL, DefSQDestructorCallback<AIStationListDistanceSquareToTile>); return 1; }
 }; // namespace SQConvert
 
-void SQAIStationListDistanceSquareToTileRegister(Squirrel *engine) {
+void SQAIStationListDistanceSquareToTile_Register(Squirrel *engine) {
 	DefSQClass <AIStationListDistanceSquareToTile> SQAIStationListDistanceSquareToTile("AIStationListDistanceSquareToTile");
 	SQAIStationListDistanceSquareToTile.PreRegister(engine);
 	SQAIStationListDistanceSquareToTile.AddConstructor<void (AIStationListDistanceSquareToTile::*)(TileIndex tile), 2>(engine, "xi");

--- a/src/ai/api/ai_testmode.hpp.sq	Sat Feb 23 14:33:18 2008 +0000
+++ b/src/ai/api/ai_testmode.hpp.sq	Sat Feb 23 14:42:07 2008 +0000
@@ -9,7 +9,7 @@
 	template <> int Return<AITestMode *>(HSQUIRRELVM vm, AITestMode *res) { if (res == NULL) { sq_pushnull(vm); return 1; } res->AddRef(); Squirrel::CreateClassInstanceVM(vm, "AITestMode", res, NULL, DefSQDestructorCallback<AITestMode>); return 1; }
 }; // namespace SQConvert
 
-void SQAITestModeRegister(Squirrel *engine) {
+void SQAITestMode_Register(Squirrel *engine) {
 	DefSQClass <AITestMode> SQAITestMode("AITestMode");
 	SQAITestMode.PreRegister(engine);
 	SQAITestMode.AddConstructor<void (AITestMode::*)(), 1>(engine, "x");

--- a/src/ai/api/ai_tile.hpp.sq	Sat Feb 23 14:33:18 2008 +0000
+++ b/src/ai/api/ai_tile.hpp.sq	Sat Feb 23 14:42:07 2008 +0000
@@ -13,7 +13,7 @@
 	template <> int Return<AITile *>(HSQUIRRELVM vm, AITile *res) { if (res == NULL) { sq_pushnull(vm); return 1; } res->AddRef(); Squirrel::CreateClassInstanceVM(vm, "AITile", res, NULL, DefSQDestructorCallback<AITile>); return 1; }
 }; // namespace SQConvert
 
-void SQAITileRegister(Squirrel *engine) {
+void SQAITile_Register(Squirrel *engine) {
 	DefSQClass <AITile> SQAITile("AITile");
 	SQAITile.PreRegister(engine);
 	SQAITile.AddConstructor<void (AITile::*)(), 1>(engine, "x");

--- a/src/ai/api/ai_tilelist.hpp.sq	Sat Feb 23 14:33:18 2008 +0000
+++ b/src/ai/api/ai_tilelist.hpp.sq	Sat Feb 23 14:42:07 2008 +0000
@@ -9,7 +9,7 @@
 	template <> int Return<AITileList *>(HSQUIRRELVM vm, AITileList *res) { if (res == NULL) { sq_pushnull(vm); return 1; } res->AddRef(); Squirrel::CreateClassInstanceVM(vm, "AITileList", res, NULL, DefSQDestructorCallback<AITileList>); return 1; }
 }; // namespace SQConvert
 
-void SQAITileListRegister(Squirrel *engine) {
+void SQAITileList_Register(Squirrel *engine) {
 	DefSQClass <AITileList> SQAITileList("AITileList");
 	SQAITileList.PreRegister(engine, "AIAbstractList");
 	SQAITileList.AddConstructor<void (AITileList::*)(), 1>(engine, "x");

--- a/src/ai/api/ai_tilelist_valuator.hpp.sq	Sat Feb 23 14:33:18 2008 +0000
+++ b/src/ai/api/ai_tilelist_valuator.hpp.sq	Sat Feb 23 14:42:07 2008 +0000
@@ -9,7 +9,7 @@
 	template <> int Return<AITileListBuildable *>(HSQUIRRELVM vm, AITileListBuildable *res) { if (res == NULL) { sq_pushnull(vm); return 1; } res->AddRef(); Squirrel::CreateClassInstanceVM(vm, "AITileListBuildable", res, NULL, DefSQDestructorCallback<AITileListBuildable>); return 1; }
 }; // namespace SQConvert
 
-void SQAITileListBuildableRegister(Squirrel *engine) {
+void SQAITileListBuildable_Register(Squirrel *engine) {
 	DefSQClass <AITileListBuildable> SQAITileListBuildable("AITileListBuildable");
 	SQAITileListBuildable.PreRegister(engine);
 	SQAITileListBuildable.AddConstructor<void (AITileListBuildable::*)(), 1>(engine, "x");
@@ -28,7 +28,7 @@
 	template <> int Return<AITileListWater *>(HSQUIRRELVM vm, AITileListWater *res) { if (res == NULL) { sq_pushnull(vm); return 1; } res->AddRef(); Squirrel::CreateClassInstanceVM(vm, "AITileListWater", res, NULL, DefSQDestructorCallback<AITileListWater>); return 1; }
 }; // namespace SQConvert
 
-void SQAITileListWaterRegister(Squirrel *engine) {
+void SQAITileListWater_Register(Squirrel *engine) {
 	DefSQClass <AITileListWater> SQAITileListWater("AITileListWater");
 	SQAITileListWater.PreRegister(engine);
 	SQAITileListWater.AddConstructor<void (AITileListWater::*)(), 1>(engine, "x");
@@ -47,7 +47,7 @@
 	template <> int Return<AITileListBuildableRectangle *>(HSQUIRRELVM vm, AITileListBuildableRectangle *res) { if (res == NULL) { sq_pushnull(vm); return 1; } res->AddRef(); Squirrel::CreateClassInstanceVM(vm, "AITileListBuildableRectangle", res, NULL, DefSQDestructorCallback<AITileListBuildableRectangle>); return 1; }
 }; // namespace SQConvert
 
-void SQAITileListBuildableRectangleRegister(Squirrel *engine) {
+void SQAITileListBuildableRectangle_Register(Squirrel *engine) {
 	DefSQClass <AITileListBuildableRectangle> SQAITileListBuildableRectangle("AITileListBuildableRectangle");
 	SQAITileListBuildableRectangle.PreRegister(engine);
 	SQAITileListBuildableRectangle.AddConstructor<void (AITileListBuildableRectangle::*)(uint width, uint height), 3>(engine, "xii");
@@ -66,7 +66,7 @@
 	template <> int Return<AITileListSlope *>(HSQUIRRELVM vm, AITileListSlope *res) { if (res == NULL) { sq_pushnull(vm); return 1; } res->AddRef(); Squirrel::CreateClassInstanceVM(vm, "AITileListSlope", res, NULL, DefSQDestructorCallback<AITileListSlope>); return 1; }
 }; // namespace SQConvert
 
-void SQAITileListSlopeRegister(Squirrel *engine) {
+void SQAITileListSlope_Register(Squirrel *engine) {
 	DefSQClass <AITileListSlope> SQAITileListSlope("AITileListSlope");
 	SQAITileListSlope.PreRegister(engine);
 	SQAITileListSlope.AddConstructor<void (AITileListSlope::*)(), 1>(engine, "x");
@@ -85,7 +85,7 @@
 	template <> int Return<AITileListHeight *>(HSQUIRRELVM vm, AITileListHeight *res) { if (res == NULL) { sq_pushnull(vm); return 1; } res->AddRef(); Squirrel::CreateClassInstanceVM(vm, "AITileListHeight", res, NULL, DefSQDestructorCallback<AITileListHeight>); return 1; }
 }; // namespace SQConvert
 
-void SQAITileListHeightRegister(Squirrel *engine) {
+void SQAITileListHeight_Register(Squirrel *engine) {
 	DefSQClass <AITileListHeight> SQAITileListHeight("AITileListHeight");
 	SQAITileListHeight.PreRegister(engine);
 	SQAITileListHeight.AddConstructor<void (AITileListHeight::*)(), 1>(engine, "x");
@@ -104,7 +104,7 @@
 	template <> int Return<AITileListNeighbourRoadCount *>(HSQUIRRELVM vm, AITileListNeighbourRoadCount *res) { if (res == NULL) { sq_pushnull(vm); return 1; } res->AddRef(); Squirrel::CreateClassInstanceVM(vm, "AITileListNeighbourRoadCount", res, NULL, DefSQDestructorCallback<AITileListNeighbourRoadCount>); return 1; }
 }; // namespace SQConvert
 
-void SQAITileListNeighbourRoadCountRegister(Squirrel *engine) {
+void SQAITileListNeighbourRoadCount_Register(Squirrel *engine) {
 	DefSQClass <AITileListNeighbourRoadCount> SQAITileListNeighbourRoadCount("AITileListNeighbourRoadCount");
 	SQAITileListNeighbourRoadCount.PreRegister(engine);
 	SQAITileListNeighbourRoadCount.AddConstructor<void (AITileListNeighbourRoadCount::*)(), 1>(engine, "x");
@@ -123,7 +123,7 @@
 	template <> int Return<AITileListRoadTile *>(HSQUIRRELVM vm, AITileListRoadTile *res) { if (res == NULL) { sq_pushnull(vm); return 1; } res->AddRef(); Squirrel::CreateClassInstanceVM(vm, "AITileListRoadTile", res, NULL, DefSQDestructorCallback<AITileListRoadTile>); return 1; }
 }; // namespace SQConvert
 
-void SQAITileListRoadTileRegister(Squirrel *engine) {
+void SQAITileListRoadTile_Register(Squirrel *engine) {
 	DefSQClass <AITileListRoadTile> SQAITileListRoadTile("AITileListRoadTile");
 	SQAITileListRoadTile.PreRegister(engine);
 	SQAITileListRoadTile.AddConstructor<void (AITileListRoadTile::*)(), 1>(engine, "x");
@@ -142,7 +142,7 @@
 	template <> int Return<AITileListCargoAcceptance *>(HSQUIRRELVM vm, AITileListCargoAcceptance *res) { if (res == NULL) { sq_pushnull(vm); return 1; } res->AddRef(); Squirrel::CreateClassInstanceVM(vm, "AITileListCargoAcceptance", res, NULL, DefSQDestructorCallback<AITileListCargoAcceptance>); return 1; }
 }; // namespace SQConvert
 
-void SQAITileListCargoAcceptanceRegister(Squirrel *engine) {
+void SQAITileListCargoAcceptance_Register(Squirrel *engine) {
 	DefSQClass <AITileListCargoAcceptance> SQAITileListCargoAcceptance("AITileListCargoAcceptance");
 	SQAITileListCargoAcceptance.PreRegister(engine);
 	SQAITileListCargoAcceptance.AddConstructor<void (AITileListCargoAcceptance::*)(CargoID cargo_type, uint width, uint height, uint radius), 5>(engine, "xiiii");
@@ -161,7 +161,7 @@
 	template <> int Return<AITileListDistanceManhattanToTile *>(HSQUIRRELVM vm, AITileListDistanceManhattanToTile *res) { if (res == NULL) { sq_pushnull(vm); return 1; } res->AddRef(); Squirrel::CreateClassInstanceVM(vm, "AITileListDistanceManhattanToTile", res, NULL, DefSQDestructorCallback<AITileListDistanceManhattanToTile>); return 1; }
 }; // namespace SQConvert
 
-void SQAITileListDistanceManhattanToTileRegister(Squirrel *engine) {
+void SQAITileListDistanceManhattanToTile_Register(Squirrel *engine) {
 	DefSQClass <AITileListDistanceManhattanToTile> SQAITileListDistanceManhattanToTile("AITileListDistanceManhattanToTile");
 	SQAITileListDistanceManhattanToTile.PreRegister(engine);
 	SQAITileListDistanceManhattanToTile.AddConstructor<void (AITileListDistanceManhattanToTile::*)(TileIndex tile), 2>(engine, "xi");
@@ -180,7 +180,7 @@
 	template <> int Return<AITileListDistanceSquareToTile *>(HSQUIRRELVM vm, AITileListDistanceSquareToTile *res) { if (res == NULL) { sq_pushnull(vm); return 1; } res->AddRef(); Squirrel::CreateClassInstanceVM(vm, "AITileListDistanceSquareToTile", res, NULL, DefSQDestructorCallback<AITileListDistanceSquareToTile>); return 1; }
 }; // namespace SQConvert
 
-void SQAITileListDistanceSquareToTileRegister(Squirrel *engine) {
+void SQAITileListDistanceSquareToTile_Register(Squirrel *engine) {
 	DefSQClass <AITileListDistanceSquareToTile> SQAITileListDistanceSquareToTile("AITileListDistanceSquareToTile");
 	SQAITileListDistanceSquareToTile.PreRegister(engine);
 	SQAITileListDistanceSquareToTile.AddConstructor<void (AITileListDistanceSquareToTile::*)(TileIndex tile), 2>(engine, "xi");

--- a/src/ai/api/ai_town.hpp.sq	Sat Feb 23 14:33:18 2008 +0000
+++ b/src/ai/api/ai_town.hpp.sq	Sat Feb 23 14:42:07 2008 +0000
@@ -9,7 +9,7 @@
 	template <> int Return<AITown *>(HSQUIRRELVM vm, AITown *res) { if (res == NULL) { sq_pushnull(vm); return 1; } res->AddRef(); Squirrel::CreateClassInstanceVM(vm, "AITown", res, NULL, DefSQDestructorCallback<AITown>); return 1; }
 }; // namespace SQConvert
 
-void SQAITownRegister(Squirrel *engine) {
+void SQAITown_Register(Squirrel *engine) {
 	DefSQClass <AITown> SQAITown("AITown");
 	SQAITown.PreRegister(engine);
 	SQAITown.AddConstructor<void (AITown::*)(), 1>(engine, "x");

--- a/src/ai/api/ai_townlist.hpp.sq	Sat Feb 23 14:33:18 2008 +0000
+++ b/src/ai/api/ai_townlist.hpp.sq	Sat Feb 23 14:42:07 2008 +0000
@@ -9,7 +9,7 @@
 	template <> int Return<AITownList *>(HSQUIRRELVM vm, AITownList *res) { if (res == NULL) { sq_pushnull(vm); return 1; } res->AddRef(); Squirrel::CreateClassInstanceVM(vm, "AITownList", res, NULL, DefSQDestructorCallback<AITownList>); return 1; }
 }; // namespace SQConvert
 
-void SQAITownListRegister(Squirrel *engine) {
+void SQAITownList_Register(Squirrel *engine) {
 	DefSQClass <AITownList> SQAITownList("AITownList");
 	SQAITownList.PreRegister(engine, "AIAbstractList");
 	SQAITownList.AddConstructor<void (AITownList::*)(), 1>(engine, "x");

--- a/src/ai/api/ai_townlist_valuator.hpp.sq	Sat Feb 23 14:33:18 2008 +0000
+++ b/src/ai/api/ai_townlist_valuator.hpp.sq	Sat Feb 23 14:42:07 2008 +0000
@@ -9,7 +9,7 @@
 	template <> int Return<AITownListRandomize *>(HSQUIRRELVM vm, AITownListRandomize *res) { if (res == NULL) { sq_pushnull(vm); return 1; } res->AddRef(); Squirrel::CreateClassInstanceVM(vm, "AITownListRandomize", res, NULL, DefSQDestructorCallback<AITownListRandomize>); return 1; }
 }; // namespace SQConvert
 
-void SQAITownListRandomizeRegister(Squirrel *engine) {
+void SQAITownListRandomize_Register(Squirrel *engine) {
 	DefSQClass <AITownListRandomize> SQAITownListRandomize("AITownListRandomize");
 	SQAITownListRandomize.PreRegister(engine);
 	SQAITownListRandomize.AddConstructor<void (AITownListRandomize::*)(), 1>(engine, "x");
@@ -28,7 +28,7 @@
 	template <> int Return<AITownListPopulation *>(HSQUIRRELVM vm, AITownListPopulation *res) { if (res == NULL) { sq_pushnull(vm); return 1; } res->AddRef(); Squirrel::CreateClassInstanceVM(vm, "AITownListPopulation", res, NULL, DefSQDestructorCallback<AITownListPopulation>); return 1; }
 }; // namespace SQConvert
 
-void SQAITownListPopulationRegister(Squirrel *engine) {
+void SQAITownListPopulation_Register(Squirrel *engine) {
 	DefSQClass <AITownListPopulation> SQAITownListPopulation("AITownListPopulation");
 	SQAITownListPopulation.PreRegister(engine);
 	SQAITownListPopulation.AddConstructor<void (AITownListPopulation::*)(), 1>(engine, "x");
@@ -47,7 +47,7 @@
 	template <> int Return<AITownListLocation *>(HSQUIRRELVM vm, AITownListLocation *res) { if (res == NULL) { sq_pushnull(vm); return 1; } res->AddRef(); Squirrel::CreateClassInstanceVM(vm, "AITownListLocation", res, NULL, DefSQDestructorCallback<AITownListLocation>); return 1; }
 }; // namespace SQConvert
 
-void SQAITownListLocationRegister(Squirrel *engine) {
+void SQAITownListLocation_Register(Squirrel *engine) {
 	DefSQClass <AITownListLocation> SQAITownListLocation("AITownListLocation");
 	SQAITownListLocation.PreRegister(engine);
 	SQAITownListLocation.AddConstructor<void (AITownListLocation::*)(), 1>(engine, "x");
@@ -66,7 +66,7 @@
 	template <> int Return<AITownListDistanceManhattanToTile *>(HSQUIRRELVM vm, AITownListDistanceManhattanToTile *res) { if (res == NULL) { sq_pushnull(vm); return 1; } res->AddRef(); Squirrel::CreateClassInstanceVM(vm, "AITownListDistanceManhattanToTile", res, NULL, DefSQDestructorCallback<AITownListDistanceManhattanToTile>); return 1; }
 }; // namespace SQConvert
 
-void SQAITownListDistanceManhattanToTileRegister(Squirrel *engine) {
+void SQAITownListDistanceManhattanToTile_Register(Squirrel *engine) {
 	DefSQClass <AITownListDistanceManhattanToTile> SQAITownListDistanceManhattanToTile("AITownListDistanceManhattanToTile");
 	SQAITownListDistanceManhattanToTile.PreRegister(engine);
 	SQAITownListDistanceManhattanToTile.AddConstructor<void (AITownListDistanceManhattanToTile::*)(TileIndex tile), 2>(engine, "xi");
@@ -85,7 +85,7 @@
 	template <> int Return<AITownListDistanceSquareToTile *>(HSQUIRRELVM vm, AITownListDistanceSquareToTile *res) { if (res == NULL) { sq_pushnull(vm); return 1; } res->AddRef(); Squirrel::CreateClassInstanceVM(vm, "AITownListDistanceSquareToTile", res, NULL, DefSQDestructorCallback<AITownListDistanceSquareToTile>); return 1; }
 }; // namespace SQConvert
 
-void SQAITownListDistanceSquareToTileRegister(Squirrel *engine) {
+void SQAITownListDistanceSquareToTile_Register(Squirrel *engine) {
 	DefSQClass <AITownListDistanceSquareToTile> SQAITownListDistanceSquareToTile("AITownListDistanceSquareToTile");
 	SQAITownListDistanceSquareToTile.PreRegister(engine);
 	SQAITownListDistanceSquareToTile.AddConstructor<void (AITownListDistanceSquareToTile::*)(TileIndex tile), 2>(engine, "xi");

--- a/src/ai/api/ai_transactionmode.hpp.sq	Sat Feb 23 14:33:18 2008 +0000
+++ b/src/ai/api/ai_transactionmode.hpp.sq	Sat Feb 23 14:42:07 2008 +0000
@@ -9,7 +9,7 @@
 	template <> int Return<AITransactionMode *>(HSQUIRRELVM vm, AITransactionMode *res) { if (res == NULL) { sq_pushnull(vm); return 1; } res->AddRef(); Squirrel::CreateClassInstanceVM(vm, "AITransactionMode", res, NULL, DefSQDestructorCallback<AITransactionMode>); return 1; }
 }; // namespace SQConvert
 
-void SQAITransactionModeRegister(Squirrel *engine) {
+void SQAITransactionMode_Register(Squirrel *engine) {
 	DefSQClass <AITransactionMode> SQAITransactionMode("AITransactionMode");
 	SQAITransactionMode.PreRegister(engine);
 	SQAITransactionMode.AddConstructor<void (AITransactionMode::*)(), 1>(engine, "x");

--- a/src/ai/api/ai_vehicle.hpp.sq	Sat Feb 23 14:33:18 2008 +0000
+++ b/src/ai/api/ai_vehicle.hpp.sq	Sat Feb 23 14:42:07 2008 +0000
@@ -13,7 +13,7 @@
 	template <> int Return<AIVehicle *>(HSQUIRRELVM vm, AIVehicle *res) { if (res == NULL) { sq_pushnull(vm); return 1; } res->AddRef(); Squirrel::CreateClassInstanceVM(vm, "AIVehicle", res, NULL, DefSQDestructorCallback<AIVehicle>); return 1; }
 }; // namespace SQConvert
 
-void SQAIVehicleRegister(Squirrel *engine) {
+void SQAIVehicle_Register(Squirrel *engine) {
 	DefSQClass <AIVehicle> SQAIVehicle("AIVehicle");
 	SQAIVehicle.PreRegister(engine);
 	SQAIVehicle.AddConstructor<void (AIVehicle::*)(), 1>(engine, "x");

--- a/src/ai/api/ai_vehiclelist.hpp.sq	Sat Feb 23 14:33:18 2008 +0000
+++ b/src/ai/api/ai_vehiclelist.hpp.sq	Sat Feb 23 14:42:07 2008 +0000
@@ -9,7 +9,7 @@
 	template <> int Return<AIVehicleList *>(HSQUIRRELVM vm, AIVehicleList *res) { if (res == NULL) { sq_pushnull(vm); return 1; } res->AddRef(); Squirrel::CreateClassInstanceVM(vm, "AIVehicleList", res, NULL, DefSQDestructorCallback<AIVehicleList>); return 1; }
 }; // namespace SQConvert
 
-void SQAIVehicleListRegister(Squirrel *engine) {
+void SQAIVehicleList_Register(Squirrel *engine) {
 	DefSQClass <AIVehicleList> SQAIVehicleList("AIVehicleList");
 	SQAIVehicleList.PreRegister(engine, "AIAbstractList");
 	SQAIVehicleList.AddConstructor<void (AIVehicleList::*)(), 1>(engine, "x");
@@ -28,7 +28,7 @@
 	template <> int Return<AIStationVehicleList *>(HSQUIRRELVM vm, AIStationVehicleList *res) { if (res == NULL) { sq_pushnull(vm); return 1; } res->AddRef(); Squirrel::CreateClassInstanceVM(vm, "AIStationVehicleList", res, NULL, DefSQDestructorCallback<AIStationVehicleList>); return 1; }
 }; // namespace SQConvert
 
-void SQAIStationVehicleListRegister(Squirrel *engine) {
+void SQAIStationVehicleList_Register(Squirrel *engine) {
 	DefSQClass <AIStationVehicleList> SQAIStationVehicleList("AIStationVehicleList");
 	SQAIStationVehicleList.PreRegister(engine, "AIAbstractList");
 	SQAIStationVehicleList.AddConstructor<void (AIStationVehicleList::*)(StationID station_id), 2>(engine, "xi");

--- a/src/ai/api/ai_vehiclelist_valuator.hpp.sq	Sat Feb 23 14:33:18 2008 +0000
+++ b/src/ai/api/ai_vehiclelist_valuator.hpp.sq	Sat Feb 23 14:42:07 2008 +0000
@@ -9,7 +9,7 @@
 	template <> int Return<AIVehicleListLocation *>(HSQUIRRELVM vm, AIVehicleListLocation *res) { if (res == NULL) { sq_pushnull(vm); return 1; } res->AddRef(); Squirrel::CreateClassInstanceVM(vm, "AIVehicleListLocation", res, NULL, DefSQDestructorCallback<AIVehicleListLocation>); return 1; }
 }; // namespace SQConvert
 
-void SQAIVehicleListLocationRegister(Squirrel *engine) {
+void SQAIVehicleListLocation_Register(Squirrel *engine) {
 	DefSQClass <AIVehicleListLocation> SQAIVehicleListLocation("AIVehicleListLocation");
 	SQAIVehicleListLocation.PreRegister(engine);
 	SQAIVehicleListLocation.AddConstructor<void (AIVehicleListLocation::*)(), 1>(engine, "x");
@@ -28,7 +28,7 @@
 	template <> int Return<AIVehicleListEngineType *>(HSQUIRRELVM vm, AIVehicleListEngineType *res) { if (res == NULL) { sq_pushnull(vm); return 1; } res->AddRef(); Squirrel::CreateClassInstanceVM(vm, "AIVehicleListEngineType", res, NULL, DefSQDestructorCallback<AIVehicleListEngineType>); return 1; }
 }; // namespace SQConvert
 
-void SQAIVehicleListEngineTypeRegister(Squirrel *engine) {
+void SQAIVehicleListEngineType_Register(Squirrel *engine) {
 	DefSQClass <AIVehicleListEngineType> SQAIVehicleListEngineType("AIVehicleListEngineType");
 	SQAIVehicleListEngineType.PreRegister(engine);
 	SQAIVehicleListEngineType.AddConstructor<void (AIVehicleListEngineType::*)(), 1>(engine, "x");
@@ -47,7 +47,7 @@
 	template <> int Return<AIVehicleListUnitNumber *>(HSQUIRRELVM vm, AIVehicleListUnitNumber *res) { if (res == NULL) { sq_pushnull(vm); return 1; } res->AddRef(); Squirrel::CreateClassInstanceVM(vm, "AIVehicleListUnitNumber", res, NULL, DefSQDestructorCallback<AIVehicleListUnitNumber>); return 1; }
 }; // namespace SQConvert
 
-void SQAIVehicleListUnitNumberRegister(Squirrel *engine) {
+void SQAIVehicleListUnitNumber_Register(Squirrel *engine) {
 	DefSQClass <AIVehicleListUnitNumber> SQAIVehicleListUnitNumber("AIVehicleListUnitNumber");
 	SQAIVehicleListUnitNumber.PreRegister(engine);
 	SQAIVehicleListUnitNumber.AddConstructor<void (AIVehicleListUnitNumber::*)(), 1>(engine, "x");
@@ -66,7 +66,7 @@
 	template <> int Return<AIVehicleListAge *>(HSQUIRRELVM vm, AIVehicleListAge *res) { if (res == NULL) { sq_pushnull(vm); return 1; } res->AddRef(); Squirrel::CreateClassInstanceVM(vm, "AIVehicleListAge", res, NULL, DefSQDestructorCallback<AIVehicleListAge>); return 1; }
 }; // namespace SQConvert
 
-void SQAIVehicleListAgeRegister(Squirrel *engine) {
+void SQAIVehicleListAge_Register(Squirrel *engine) {
 	DefSQClass <AIVehicleListAge> SQAIVehicleListAge("AIVehicleListAge");
 	SQAIVehicleListAge.PreRegister(engine);
 	SQAIVehicleListAge.AddConstructor<void (AIVehicleListAge::*)(), 1>(engine, "x");
@@ -85,7 +85,7 @@
 	template <> int Return<AIVehicleListMaxAge *>(HSQUIRRELVM vm, AIVehicleListMaxAge *res) { if (res == NULL) { sq_pushnull(vm); return 1; } res->AddRef(); Squirrel::CreateClassInstanceVM(vm, "AIVehicleListMaxAge", res, NULL, DefSQDestructorCallback<AIVehicleListMaxAge>); return 1; }
 }; // namespace SQConvert
 
-void SQAIVehicleListMaxAgeRegister(Squirrel *engine) {
+void SQAIVehicleListMaxAge_Register(Squirrel *engine) {
 	DefSQClass <AIVehicleListMaxAge> SQAIVehicleListMaxAge("AIVehicleListMaxAge");
 	SQAIVehicleListMaxAge.PreRegister(engine);
 	SQAIVehicleListMaxAge.AddConstructor<void (AIVehicleListMaxAge::*)(), 1>(engine, "x");
@@ -104,7 +104,7 @@
 	template <> int Return<AIVehicleListAgeLeft *>(HSQUIRRELVM vm, AIVehicleListAgeLeft *res) { if (res == NULL) { sq_pushnull(vm); return 1; } res->AddRef(); Squirrel::CreateClassInstanceVM(vm, "AIVehicleListAgeLeft", res, NULL, DefSQDestructorCallback<AIVehicleListAgeLeft>); return 1; }
 }; // namespace SQConvert
 
-void SQAIVehicleListAgeLeftRegister(Squirrel *engine) {
+void SQAIVehicleListAgeLeft_Register(Squirrel *engine) {
 	DefSQClass <AIVehicleListAgeLeft> SQAIVehicleListAgeLeft("AIVehicleListAgeLeft");
 	SQAIVehicleListAgeLeft.PreRegister(engine);
 	SQAIVehicleListAgeLeft.AddConstructor<void (AIVehicleListAgeLeft::*)(), 1>(engine, "x");
@@ -123,7 +123,7 @@
 	template <> int Return<AIVehicleListProfitThisYear *>(HSQUIRRELVM vm, AIVehicleListProfitThisYear *res) { if (res == NULL) { sq_pushnull(vm); return 1; } res->AddRef(); Squirrel::CreateClassInstanceVM(vm, "AIVehicleListProfitThisYear", res, NULL, DefSQDestructorCallback<AIVehicleListProfitThisYear>); return 1; }
 }; // namespace SQConvert
 
-void SQAIVehicleListProfitThisYearRegister(Squirrel *engine) {
+void SQAIVehicleListProfitThisYear_Register(Squirrel *engine) {
 	DefSQClass <AIVehicleListProfitThisYear> SQAIVehicleListProfitThisYear("AIVehicleListProfitThisYear");
 	SQAIVehicleListProfitThisYear.PreRegister(engine);
 	SQAIVehicleListProfitThisYear.AddConstructor<void (AIVehicleListProfitThisYear::*)(), 1>(engine, "x");
@@ -142,7 +142,7 @@
 	template <> int Return<AIVehicleListProfitLastYear *>(HSQUIRRELVM vm, AIVehicleListProfitLastYear *res) { if (res == NULL) { sq_pushnull(vm); return 1; } res->AddRef(); Squirrel::CreateClassInstanceVM(vm, "AIVehicleListProfitLastYear", res, NULL, DefSQDestructorCallback<AIVehicleListProfitLastYear>); return 1; }
 }; // namespace SQConvert
 
-void SQAIVehicleListProfitLastYearRegister(Squirrel *engine) {
+void SQAIVehicleListProfitLastYear_Register(Squirrel *engine) {
 	DefSQClass <AIVehicleListProfitLastYear> SQAIVehicleListProfitLastYear("AIVehicleListProfitLastYear");
 	SQAIVehicleListProfitLastYear.PreRegister(engine);
 	SQAIVehicleListProfitLastYear.AddConstructor<void (AIVehicleListProfitLastYear::*)(), 1>(engine, "x");
@@ -161,7 +161,7 @@
 	template <> int Return<AIVehicleListVehicleType *>(HSQUIRRELVM vm, AIVehicleListVehicleType *res) { if (res == NULL) { sq_pushnull(vm); return 1; } res->AddRef(); Squirrel::CreateClassInstanceVM(vm, "AIVehicleListVehicleType", res, NULL, DefSQDestructorCallback<AIVehicleListVehicleType>); return 1; }
 }; // namespace SQConvert
 
-void SQAIVehicleListVehicleTypeRegister(Squirrel *engine) {
+void SQAIVehicleListVehicleType_Register(Squirrel *engine) {
 	DefSQClass <AIVehicleListVehicleType> SQAIVehicleListVehicleType("AIVehicleListVehicleType");
 	SQAIVehicleListVehicleType.PreRegister(engine);
 	SQAIVehicleListVehicleType.AddConstructor<void (AIVehicleListVehicleType::*)(), 1>(engine, "x");

--- a/src/ai/api/squirrel_export.awk	Sat Feb 23 14:33:18 2008 +0000
+++ b/src/ai/api/squirrel_export.awk	Sat Feb 23 14:42:07 2008 +0000
@@ -162,7 +162,7 @@
 
 	print "";
 	# Then do the registration functions of the class. */
-	print "void SQ" cls "Register(Squirrel *engine) {"
+	print "void SQ" cls "_Register(Squirrel *engine) {"
 	print "	DefSQClass <" cls "> SQ" cls "(\"" cls "\");"
 	if (super_cls == "AIObject" || super_cls == "AIAbstractList::Valuator") {
 		print "	SQ" cls ".PreRegister(engine);"

--- a/src/ai/api/squirrel_export.sh	Sat Feb 23 14:33:18 2008 +0000
+++ b/src/ai/api/squirrel_export.sh	Sat Feb 23 14:42:07 2008 +0000
@@ -50,11 +50,11 @@
 { }
 /.hpp.sq/ { next }
 /squirrel_register_std/ { next }
-/SQAI.*Register/ { next }
+/SQAI.*_Register/ { next }
 
 /Note: this line a marker in squirrel_export.sh. Do not change!/ {
 	print \$0
-	split(\"`grep '^void SQAI.*Register(Squirrel \*engine) {$' *.hpp.sq | sed 's/:.*$//' | sort | uniq | tr -d '\r' | tr '\n' ' '`\", files, \" \")
+	split(\"`grep '^void SQAI.*_Register(Squirrel \*engine) {$' *.hpp.sq | sed 's/:.*$//' | sort | uniq | tr -d '\r' | tr '\n' ' '`\", files, \" \")
 
 	for (i = 1; files[i] != \"\"; i++) {
 		print \"#include \\\"api/\" files[i] \"\\\"\"
@@ -66,7 +66,7 @@
 /\/\* Register all classes \*\// {
 	print \$0
 	print \"	squirrel_register_std(this->engine);\"
-	split(\"`grep '^void SQAI.*Register(Squirrel \*engine) {$' *.hpp.sq | sed 's/^.*void //;s/Squirrel \*/this->/;s/ {/;/' | sort  | tr -d '\r' | tr '\n' ' '`\", regs, \" \")
+	split(\"`grep '^void SQAI.*_Register(Squirrel \*engine) {$' *.hpp.sq | sed 's/^.*void //;s/Squirrel \*/this->/;s/ {/;/;s/_Register/0000Register/g;' | sort | sed 's/0000Register/_Register/g' | tr -d '\r' | tr '\n' ' '`\", regs, \" \")
 
 	for (i = 1; regs[i] != \"\"; i++) {
 		print \"	\" regs[i]