diff --git a/src/modules/graphic/osggraph/OsgGraph.cpp b/src/modules/graphic/osggraph/OsgGraph.cpp
index dcd7a86d9..78d96b609 100644
--- a/src/modules/graphic/osggraph/OsgGraph.cpp
+++ b/src/modules/graphic/osggraph/OsgGraph.cpp
@@ -40,7 +40,7 @@ int closeGfModule()
 {
     // Unregister it from the GfModule module manager.
     if (OsgGraph::_pSelf)
-        GfModule::unregister(OsgGraph::_pSelf);
+        OsgGraph::unregister(OsgGraph::_pSelf);
 
     // Delete the (only) module instance.
     delete OsgGraph::_pSelf;
diff --git a/src/modules/graphic/ssggraph/ssggraph.cpp b/src/modules/graphic/ssggraph/ssggraph.cpp
index 093dc1af6..1e2658d3e 100644
--- a/src/modules/graphic/ssggraph/ssggraph.cpp
+++ b/src/modules/graphic/ssggraph/ssggraph.cpp
@@ -45,7 +45,7 @@ int closeGfModule()
 {
     // Unregister it from the GfModule module manager.
     if (SsgGraph::_pSelf)
-        GfModule::unregister(SsgGraph::_pSelf);
+        SsgGraph::unregister(SsgGraph::_pSelf);
 
     // Delete the (only) module instance.
     delete SsgGraph::_pSelf;
diff --git a/src/modules/racing/genparoptv1/genparoptv1.cpp b/src/modules/racing/genparoptv1/genparoptv1.cpp
index 9560fcc71..4da7d8016 100644
--- a/src/modules/racing/genparoptv1/genparoptv1.cpp
+++ b/src/modules/racing/genparoptv1/genparoptv1.cpp
@@ -65,7 +65,7 @@ int closeGfModule()
 {
 	// Unregister it from the GfModule module manager.
 	if (GenParOptV1::_pSelf)
-		GfModule::unregister(GenParOptV1::_pSelf);
+		GenParOptV1::unregister(GenParOptV1::_pSelf);
 
 	// Delete the (only) module instance.
 	delete GenParOptV1::_pSelf;
diff --git a/src/modules/racing/standardgame/standardgame.cpp b/src/modules/racing/standardgame/standardgame.cpp
index 7186b6a96..3130c0c03 100644
--- a/src/modules/racing/standardgame/standardgame.cpp
+++ b/src/modules/racing/standardgame/standardgame.cpp
@@ -63,7 +63,7 @@ int closeGfModule()
 {
 	// Unregister it from the GfModule module manager.
 	if (StandardGame::_pSelf)
-		GfModule::unregister(StandardGame::_pSelf);
+		StandardGame::unregister(StandardGame::_pSelf);
 
 	// Delete the (only) module instance.
 	delete StandardGame::_pSelf;
diff --git a/src/modules/simu/simuv2.1/simuv21.cpp b/src/modules/simu/simuv2.1/simuv21.cpp
index c3fd582b6..c9c8fc18d 100644
--- a/src/modules/simu/simuv2.1/simuv21.cpp
+++ b/src/modules/simu/simuv2.1/simuv21.cpp
@@ -42,7 +42,7 @@ int closeGfModule()
 {
 	// Unregister it from the GfModule module manager.
 	if (Simuv21::_pSelf)
-		GfModule::unregister(Simuv21::_pSelf);
+		Simuv21::unregister(Simuv21::_pSelf);
 	
 	// Delete the (only) module instance.
 	delete Simuv21::_pSelf;
diff --git a/src/modules/simu/simuv3/simuv30.cpp b/src/modules/simu/simuv3/simuv30.cpp
index 6cd304410..41d432b69 100644
--- a/src/modules/simu/simuv3/simuv30.cpp
+++ b/src/modules/simu/simuv3/simuv30.cpp
@@ -42,7 +42,7 @@ int closeGfModule()
 {
 	// Unregister it from the GfModule module manager.
 	if (Simuv30::_pSelf)
-		GfModule::unregister(Simuv30::_pSelf);
+		Simuv30::unregister(Simuv30::_pSelf);
 	
 	// Delete the (only) module instance.
 	delete Simuv30::_pSelf;
diff --git a/src/modules/simu/simuv4/simuv4.cpp b/src/modules/simu/simuv4/simuv4.cpp
index 79140d4e2..cc52106ec 100644
--- a/src/modules/simu/simuv4/simuv4.cpp
+++ b/src/modules/simu/simuv4/simuv4.cpp
@@ -42,7 +42,7 @@ int closeGfModule()
 {
 	// Unregister it from the GfModule module manager.
 	if (Simuv4::_pSelf)
-		GfModule::unregister(Simuv4::_pSelf);
+		Simuv4::unregister(Simuv4::_pSelf);
 	
 	// Delete the (only) module instance.
 	delete Simuv4::_pSelf;
diff --git a/src/modules/sound/snddefault/snddefault.cpp b/src/modules/sound/snddefault/snddefault.cpp
index 328266aa8..d0914c6df 100644
--- a/src/modules/sound/snddefault/snddefault.cpp
+++ b/src/modules/sound/snddefault/snddefault.cpp
@@ -40,7 +40,7 @@ int closeGfModule()
 {
 	// Unregister it from the GfModule module manager.
 	if (SndDefault::_pSelf)
-		GfModule::unregister(SndDefault::_pSelf);
+		SndDefault::unregister(SndDefault::_pSelf);
 	
 	// Delete the (only) module instance.
 	delete SndDefault::_pSelf;
diff --git a/src/modules/track/trackv1/trackitf.cpp b/src/modules/track/trackv1/trackitf.cpp
index 9fdc1db7f..a534f665c 100644
--- a/src/modules/track/trackv1/trackitf.cpp
+++ b/src/modules/track/trackv1/trackitf.cpp
@@ -41,7 +41,7 @@ int closeGfModule()
 {
 	// Unregister it from the GfModule module manager.
 	if (TrackModule::_pSelf)
-		GfModule::unregister(TrackModule::_pSelf);
+		TrackModule::unregister(TrackModule::_pSelf);
 	
 	// Delete the (only) module instance.
 	delete TrackModule::_pSelf;
diff --git a/src/modules/userinterface/legacymenu/legacymenu.cpp b/src/modules/userinterface/legacymenu/legacymenu.cpp
index 4817a6820..e88217b60 100644
--- a/src/modules/userinterface/legacymenu/legacymenu.cpp
+++ b/src/modules/userinterface/legacymenu/legacymenu.cpp
@@ -61,7 +61,7 @@ int closeGfModule()
 {
     // Unregister it from the GfModule module manager.
     if (LegacyMenu::_pSelf)
-        GfModule::unregister(LegacyMenu::_pSelf);
+        LegacyMenu::unregister(LegacyMenu::_pSelf);
 
 	DisplayMenuRelease();
 
diff --git a/src/modules/userinterface/textonly/textonly.cpp b/src/modules/userinterface/textonly/textonly.cpp
index c82b121f9..5b76e3af1 100644
--- a/src/modules/userinterface/textonly/textonly.cpp
+++ b/src/modules/userinterface/textonly/textonly.cpp
@@ -62,7 +62,7 @@ int closeGfModule()
 {
 	// Unregister it from the GfModule module manager.
 	if (TextOnlyUI::_pSelf)
-		GfModule::unregister(TextOnlyUI::_pSelf);
+		TextOnlyUI::unregister(TextOnlyUI::_pSelf);
 
 	// Delete the (only) module instance.
 	delete TextOnlyUI::_pSelf;