Index: code/branches/core7/src/orxonox/chat/ChatManager.cc
===================================================================
--- code/branches/core7/src/orxonox/chat/ChatManager.cc	(revision 10349)
+++ code/branches/core7/src/orxonox/chat/ChatManager.cc	(revision 10362)
@@ -113,5 +113,5 @@
     // ChatListener                                                         //
     //////////////////////////////////////////////////////////////////////////
-    RegisterAbstractClass(ChatListener).inheritsFrom(Class(Listable));
+    RegisterAbstractClass(ChatListener).inheritsFrom<Listable>();
 
     ChatListener::ChatListener()
Index: code/branches/core7/src/orxonox/collisionshapes/CollisionShape.cc
===================================================================
--- code/branches/core7/src/orxonox/collisionshapes/CollisionShape.cc	(revision 10349)
+++ code/branches/core7/src/orxonox/collisionshapes/CollisionShape.cc	(revision 10362)
@@ -44,5 +44,5 @@
 namespace orxonox
 {
-    RegisterAbstractClass(CollisionShape).inheritsFrom(Class(BaseObject)).inheritsFrom(Class(Synchronisable));
+    RegisterAbstractClass(CollisionShape).inheritsFrom<BaseObject>().inheritsFrom<Synchronisable>();
 
     /**
Index: code/branches/core7/src/orxonox/gamestates/GSLevel.cc
===================================================================
--- code/branches/core7/src/orxonox/gamestates/GSLevel.cc	(revision 10349)
+++ code/branches/core7/src/orxonox/gamestates/GSLevel.cc	(revision 10362)
@@ -252,5 +252,5 @@
     ///////////////////////////////////////////////////////////////////////////
 
-    RegisterAbstractClass(GSLevelMemento).inheritsFrom(Class(OrxonoxInterface));
+    RegisterAbstractClass(GSLevelMemento).inheritsFrom<OrxonoxInterface>();
 
     GSLevelMemento::GSLevelMemento()
Index: code/branches/core7/src/orxonox/infos/PlayerInfo.cc
===================================================================
--- code/branches/core7/src/orxonox/infos/PlayerInfo.cc	(revision 10349)
+++ code/branches/core7/src/orxonox/infos/PlayerInfo.cc	(revision 10362)
@@ -40,5 +40,5 @@
 namespace orxonox
 {
-    RegisterAbstractClass(PlayerInfo).inheritsFrom(Class(Info));
+    RegisterAbstractClass(PlayerInfo).inheritsFrom<Info>();
 
     PlayerInfo::PlayerInfo(Context* context) : Info(context)
Index: code/branches/core7/src/orxonox/interfaces/InterfaceCompilation.cc
===================================================================
--- code/branches/core7/src/orxonox/interfaces/InterfaceCompilation.cc	(revision 10349)
+++ code/branches/core7/src/orxonox/interfaces/InterfaceCompilation.cc	(revision 10362)
@@ -50,5 +50,5 @@
     // GametypeMessageListener
     //----------------------------
-    RegisterAbstractClass(GametypeMessageListener).inheritsFrom(Class(OrxonoxInterface));
+    RegisterAbstractClass(GametypeMessageListener).inheritsFrom<OrxonoxInterface>();
 
     GametypeMessageListener::GametypeMessageListener()
@@ -60,5 +60,5 @@
     // PlayerTrigger
     //----------------------------
-    RegisterAbstractClass(PlayerTrigger).inheritsFrom(Class(OrxonoxInterface));
+    RegisterAbstractClass(PlayerTrigger).inheritsFrom<OrxonoxInterface>();
 
     PlayerTrigger::PlayerTrigger()
@@ -80,5 +80,5 @@
     // RadarListener
     //----------------------------
-    RegisterAbstractClass(RadarListener).inheritsFrom(Class(OrxonoxInterface));
+    RegisterAbstractClass(RadarListener).inheritsFrom<OrxonoxInterface>();
 
     RadarListener::RadarListener()
@@ -90,5 +90,5 @@
     // TeamColourable
     //----------------------------
-    RegisterAbstractClass(TeamColourable).inheritsFrom(Class(OrxonoxInterface));
+    RegisterAbstractClass(TeamColourable).inheritsFrom<OrxonoxInterface>();
 
     TeamColourable::TeamColourable()
@@ -100,5 +100,5 @@
     // Rewardable
     //----------------------------
-    RegisterAbstractClass(Rewardable).inheritsFrom(Class(OrxonoxInterface));
+    RegisterAbstractClass(Rewardable).inheritsFrom<OrxonoxInterface>();
 
     Rewardable::Rewardable()
Index: code/branches/core7/src/orxonox/interfaces/PickupCarrier.cc
===================================================================
--- code/branches/core7/src/orxonox/interfaces/PickupCarrier.cc	(revision 10349)
+++ code/branches/core7/src/orxonox/interfaces/PickupCarrier.cc	(revision 10362)
@@ -41,5 +41,5 @@
 namespace orxonox
 {
-    RegisterAbstractClass(PickupCarrier).inheritsFrom(Class(OrxonoxInterface));
+    RegisterAbstractClass(PickupCarrier).inheritsFrom<OrxonoxInterface>();
 
     /**
Index: code/branches/core7/src/orxonox/interfaces/Pickupable.cc
===================================================================
--- code/branches/core7/src/orxonox/interfaces/Pickupable.cc	(revision 10349)
+++ code/branches/core7/src/orxonox/interfaces/Pickupable.cc	(revision 10362)
@@ -46,5 +46,5 @@
 namespace orxonox
 {
-    RegisterAbstractClass(Pickupable).inheritsFrom(Class(OrxonoxInterface)).inheritsFrom(Class(Rewardable));
+    RegisterAbstractClass(Pickupable).inheritsFrom<OrxonoxInterface>().inheritsFrom<Rewardable>();
 
     /**
Index: code/branches/core7/src/orxonox/interfaces/RadarViewable.cc
===================================================================
--- code/branches/core7/src/orxonox/interfaces/RadarViewable.cc	(revision 10349)
+++ code/branches/core7/src/orxonox/interfaces/RadarViewable.cc	(revision 10362)
@@ -38,5 +38,5 @@
 namespace orxonox
 {
-    RegisterAbstractClass(RadarViewable).inheritsFrom(Class(OrxonoxInterface));
+    RegisterAbstractClass(RadarViewable).inheritsFrom<OrxonoxInterface>();
 
     /**
Index: code/branches/core7/src/orxonox/sound/BaseSound.cc
===================================================================
--- code/branches/core7/src/orxonox/sound/BaseSound.cc	(revision 10349)
+++ code/branches/core7/src/orxonox/sound/BaseSound.cc	(revision 10362)
@@ -43,5 +43,5 @@
 namespace orxonox
 {
-    RegisterAbstractClass(BaseSound).inheritsFrom(Class(Listable));
+    RegisterAbstractClass(BaseSound).inheritsFrom<Listable>();
 
     BaseSound::BaseSound()
Index: code/branches/core7/src/orxonox/weaponsystem/WeaponMode.cc
===================================================================
--- code/branches/core7/src/orxonox/weaponsystem/WeaponMode.cc	(revision 10349)
+++ code/branches/core7/src/orxonox/weaponsystem/WeaponMode.cc	(revision 10362)
@@ -45,5 +45,5 @@
 namespace orxonox
 {
-    RegisterAbstractClass(WeaponMode).inheritsFrom(Class(BaseObject));
+    RegisterAbstractClass(WeaponMode).inheritsFrom<BaseObject>();
 
     WeaponMode::WeaponMode(Context* context) : BaseObject(context)
Index: code/branches/core7/src/orxonox/worldentities/WorldEntity.cc
===================================================================
--- code/branches/core7/src/orxonox/worldentities/WorldEntity.cc	(revision 10349)
+++ code/branches/core7/src/orxonox/worldentities/WorldEntity.cc	(revision 10362)
@@ -61,5 +61,5 @@
     BOOST_STATIC_ASSERT((int)Ogre::Node::TS_WORLD  == (int)WorldEntity::World);
 
-    RegisterAbstractClass(WorldEntity).inheritsFrom(Class(BaseObject)).inheritsFrom(Class(Synchronisable));
+    RegisterAbstractClass(WorldEntity).inheritsFrom<BaseObject>().inheritsFrom<Synchronisable>();
 
     /**
