diff --git a/src/kits/media/DormantNodeManager.cpp b/src/kits/media/DormantNodeManager.cpp
index c163b2548e..ccfaf7e97a 100644
--- a/src/kits/media/DormantNodeManager.cpp
+++ b/src/kits/media/DormantNodeManager.cpp
@@ -63,14 +63,14 @@
 #include <DataExchange.h>
 
 
-static BPrivate::media::DormantNodeManager manager;
-BPrivate::media::DormantNodeManager* gDormantNodeManager = &manager;
-
-
 namespace BPrivate {
 namespace media {
 
 
+static DormantNodeManager sManager;
+DormantNodeManager* gDormantNodeManager = &sManager;
+
+
 DormantNodeManager::DormantNodeManager()
 	:
 	fLock("dormant node manager locker")
diff --git a/src/kits/media/TimeSourceObjectManager.cpp b/src/kits/media/TimeSourceObjectManager.cpp
index fa1333422e..c50a6ee887 100644
--- a/src/kits/media/TimeSourceObjectManager.cpp
+++ b/src/kits/media/TimeSourceObjectManager.cpp
@@ -22,14 +22,14 @@
 #include "TimeSourceObject.h"
 
 
-static BPrivate::media::TimeSourceObjectManager sManager;
-BPrivate::media::TimeSourceObjectManager* gTimeSourceObjectManager = &sManager;
-
-
 namespace BPrivate {
 namespace media {
 
 
+static TimeSourceObjectManager sManager;
+TimeSourceObjectManager* gTimeSourceObjectManager = &sManager;
+
+
 TimeSourceObjectManager::TimeSourceObjectManager()
 	:
 	BLocker("time source object manager")