Index: branches/new_class_id/src/lib/graphics/effects/cloud_effect.cc
===================================================================
--- branches/new_class_id/src/lib/graphics/effects/cloud_effect.cc	(revision 9694)
+++ branches/new_class_id/src/lib/graphics/effects/cloud_effect.cc	(revision 9709)
@@ -40,4 +40,5 @@
 float     CloudEffect::fadeTime;
 
+NewObjectListDefinitionID(CloudEffect, CL_CLOUD_EFFECT);
 
 
@@ -56,6 +57,5 @@
 
 
-CREATE_FACTORY(CloudEffect, CL_CLOUD_EFFECT);
-NewObjectListDefinitionID(CloudEffect, CL_CLOUD_EFFECT);
+CREATE_FACTORY(CloudEffect);
 
 CloudEffect::CloudEffect(const TiXmlElement* root) {
Index: branches/new_class_id/src/lib/graphics/effects/fog_effect.cc
===================================================================
--- branches/new_class_id/src/lib/graphics/effects/fog_effect.cc	(revision 9694)
+++ branches/new_class_id/src/lib/graphics/effects/fog_effect.cc	(revision 9709)
@@ -22,4 +22,5 @@
 #include "cloud_effect.h"
 
+NewObjectListDefinition(FogEffect);
 // Define shell commands
 //SHELL_COMMAND(activate, FogEffect, activateFog);
@@ -37,6 +38,5 @@
                        );
 
-CREATE_FACTORY(FogEffect, CL_FOG_EFFECT);
-NewObjectListDefinition(FogEffect);
+CREATE_FACTORY(FogEffect);
 
 /**
Index: branches/new_class_id/src/lib/graphics/effects/lense_flare.cc
===================================================================
--- branches/new_class_id/src/lib/graphics/effects/lense_flare.cc	(revision 9694)
+++ branches/new_class_id/src/lib/graphics/effects/lense_flare.cc	(revision 9709)
@@ -35,6 +35,6 @@
 #include "class_id.h"
 
-CREATE_FACTORY(LenseFlare, CL_LENSE_FLARE);
 NewObjectListDefinitionID(LenseFlare, CL_LENSE_FLARE);
+CREATE_FACTORY(LenseFlare);
 
 /**
Index: branches/new_class_id/src/lib/graphics/effects/lightning_effect.cc
===================================================================
--- branches/new_class_id/src/lib/graphics/effects/lightning_effect.cc	(revision 9694)
+++ branches/new_class_id/src/lib/graphics/effects/lightning_effect.cc	(revision 9709)
@@ -29,4 +29,6 @@
 #include "class_id.h"
 
+NewObjectListDefinitionID(LightningEffect, CL_LIGHTNING_EFFECT);
+
 SHELL_COMMAND(activate, LightningEffect, activateLightning);
 SHELL_COMMAND(deactivate, LightningEffect, deactivateLightning);
@@ -37,6 +39,5 @@
                        );
 
-CREATE_FACTORY(LightningEffect, CL_LIGHTNING_EFFECT);
-NewObjectListDefinitionID(LightningEffect, CL_LIGHTNING_EFFECT);
+CREATE_FACTORY(LightningEffect);
 
 LightningEffect::LightningEffect(const TiXmlElement* root) {
Index: branches/new_class_id/src/lib/graphics/effects/rain_effect.cc
===================================================================
--- branches/new_class_id/src/lib/graphics/effects/rain_effect.cc	(revision 9694)
+++ branches/new_class_id/src/lib/graphics/effects/rain_effect.cc	(revision 9709)
@@ -33,4 +33,6 @@
 #include "class_id.h"
 
+NewObjectListDefinitionID(RainEffect, CL_RAIN_EFFECT);
+
 // Define shell commands
 //SHELL_COMMAND(activate, RainEffect, activateRain);
@@ -48,6 +50,5 @@
                        );
 
-CREATE_FACTORY(RainEffect, CL_RAIN_EFFECT);
-NewObjectListDefinitionID(RainEffect, CL_RAIN_EFFECT);
+CREATE_FACTORY(RainEffect);
 
 /**
Index: branches/new_class_id/src/lib/graphics/effects/snow_effect.cc
===================================================================
--- branches/new_class_id/src/lib/graphics/effects/snow_effect.cc	(revision 9694)
+++ branches/new_class_id/src/lib/graphics/effects/snow_effect.cc	(revision 9709)
@@ -32,4 +32,5 @@
 #include "class_id.h"
 
+NewObjectListDefinitionID(SnowEffect, CL_SNOW_EFFECT);
 SHELL_COMMAND(activate, SnowEffect, activateSnow);
 SHELL_COMMAND(deactivate, SnowEffect, deactivateSnow);
@@ -41,6 +42,5 @@
                        );
 
-CREATE_FACTORY(SnowEffect, CL_SNOW_EFFECT);
-NewObjectListDefinitionID(SnowEffect, CL_SNOW_EFFECT);
+CREATE_FACTORY(SnowEffect);
 
 SnowEffect::SnowEffect(const TiXmlElement* root)
Index: branches/new_class_id/src/lib/graphics/effects/volfog_effect.cc
===================================================================
--- branches/new_class_id/src/lib/graphics/effects/volfog_effect.cc	(revision 9694)
+++ branches/new_class_id/src/lib/graphics/effects/volfog_effect.cc	(revision 9709)
@@ -48,7 +48,6 @@
 
 #include "class_id.h"
-
-CREATE_FACTORY(VolFogEffect, CL_VOLFOG_EFFECT);
 NewObjectListDefinitionID(VolFogEffect, CL_VOLFOG_EFFECT);
+CREATE_FACTORY(VolFogEffect);
 
 VolFogEffect::VolFogEffect(const TiXmlElement* root) {
Index: branches/new_class_id/src/lib/graphics/light.cc
===================================================================
--- branches/new_class_id/src/lib/graphics/light.cc	(revision 9694)
+++ branches/new_class_id/src/lib/graphics/light.cc	(revision 9709)
@@ -29,6 +29,6 @@
 #include "class_id.h"
 
-CREATE_FACTORY(Light, CL_LIGHT);
 NewObjectListDefinitionID(Light, CL_LIGHT);
+CREATE_FACTORY(Light);
 
 //! Definition of the Lights and their Names
Index: branches/new_class_id/src/lib/graphics/render2D/image_plane.cc
===================================================================
--- branches/new_class_id/src/lib/graphics/render2D/image_plane.cc	(revision 9694)
+++ branches/new_class_id/src/lib/graphics/render2D/image_plane.cc	(revision 9709)
@@ -25,7 +25,7 @@
 
 #include "class_id.h"
-CREATE_FACTORY(ImagePlane, CL_IMAGE_ENTITY);
 
-NewObjectListDefinitionID(ImagePlane, CL_IMAGE_ENTITY);
+NewObjectListDefinitionID(ImagePlane, CL_IMAGE_PLANE);
+CREATE_FACTORY(ImagePlane);
 
 
