diff --git a/src/servers/app/AppServer.cpp b/src/servers/app/AppServer.cpp
index 03aa67d81c..e851ed3f78 100644
--- a/src/servers/app/AppServer.cpp
+++ b/src/servers/app/AppServer.cpp
@@ -79,8 +79,17 @@ ColorSet gGUIColorSet;
 */
 AppServer::AppServer()
 	: MessageLooper("app_server"),
+	fMessagePort(-1),
+	fServerInputPort(-1),
+	fISThreadID(-1),
+	fCursorThreadID(-1),
 	fCursorSem(-1),
-	fCursorArea(-1)
+	fCursorArea(-1),
+	fCursorAddr(NULL),
+	fDesktops(),
+	fDesktopLock("AppServerDesktopLock"),
+	fISASPort(-1),
+	fISPort(-1)
 {
 	fMessagePort = create_port(DEFAULT_MONITOR_PORT_SIZE, SERVER_PORT_NAME);
 	if (fMessagePort < B_OK)
diff --git a/src/servers/app/CursorManager.cpp b/src/servers/app/CursorManager.cpp
index 819f3f9e83..d6ad655f1a 100644
--- a/src/servers/app/CursorManager.cpp
+++ b/src/servers/app/CursorManager.cpp
@@ -34,6 +34,7 @@
 
 //! Initializes the CursorManager
 CursorManager::CursorManager()
+ :	BLocker("CursorManager")
 {
 	// Error code for AddCursor
 	fTokenizer.ExcludeValue(B_ERROR);
diff --git a/src/servers/app/DecorManager.cpp b/src/servers/app/DecorManager.cpp
index 84f088a7b1..d79132a1fa 100644
--- a/src/servers/app/DecorManager.cpp
+++ b/src/servers/app/DecorManager.cpp
@@ -103,7 +103,7 @@ DecorInfo::Instantiate(Desktop* desktop, BRect rect, const char *title,
 
 
 DecorManager::DecorManager()
-	:
+ :	BLocker("DecorManager"),
 	fDecorList(0),
  	fCurrentDecor(NULL)
 {
diff --git a/src/servers/app/DesktopSettings.cpp b/src/servers/app/DesktopSettings.cpp
index 2a7789deb3..8726a0dbda 100644
--- a/src/servers/app/DesktopSettings.cpp
+++ b/src/servers/app/DesktopSettings.cpp
@@ -16,7 +16,7 @@
 
 
 DesktopSettings::Private::Private()
-	: BLocker("desktop settings")
+	: BLocker("DesktopSettings_Private")
 {
 	// if the on-disk settings are not complete, the defaults will be kept
 	_SetDefaults();
diff --git a/src/servers/app/FontFamily.cpp b/src/servers/app/FontFamily.cpp
index 7505c65f34..c9b87c33fe 100644
--- a/src/servers/app/FontFamily.cpp
+++ b/src/servers/app/FontFamily.cpp
@@ -26,7 +26,7 @@ const int32 kInvalidFamilyFlags = -1;
 	\param face FreeType handle for the font file after it is loaded - it will be kept open until the FontStyle is destroied
 */
 FontStyle::FontStyle(const char *path, FT_Face face)
-	: BLocker(face->style_name),
+	: BLocker(BString("FontStyle_").Append(face->style_name).String()),
 	fFreeTypeFace(face),
 	fName(face->style_name),
 	fPath(path),
diff --git a/src/servers/app/MultiLocker.cpp b/src/servers/app/MultiLocker.cpp
index 4028fb1a51..b232f5c9da 100644
--- a/src/servers/app/MultiLocker.cpp
+++ b/src/servers/app/MultiLocker.cpp
@@ -38,9 +38,9 @@ MultiLocker::MultiLocker(const char* semaphoreBaseName)
 		sprintf(name, "%s-%s", semaphoreBaseName, "WriterLock");
 		fWriterLock = create_sem(0, name);
 	} else {
-		fReadSem = create_sem(0, "ReadSem");
-		fWriteSem = create_sem(0, "WriteSem");
-		fWriterLock = create_sem(0, "WriterLock");
+		fReadSem = create_sem(0, "MultiLocker_ReadSem");
+		fWriteSem = create_sem(0, "MultiLocker_WriteSem");
+		fWriterLock = create_sem(0, "MultiLocker_WriterLock");
 	}
 
 	if (fReadSem >= 0 && fWriteSem >=0 && fWriterLock >= 0)
diff --git a/src/servers/app/drawing/UpdateQueue.cpp b/src/servers/app/drawing/UpdateQueue.cpp
index fdf576f95f..a9c0657e80 100644
--- a/src/servers/app/drawing/UpdateQueue.cpp
+++ b/src/servers/app/drawing/UpdateQueue.cpp
@@ -10,12 +10,12 @@
 
 // constructor
 UpdateQueue::UpdateQueue(HWInterface* interface)
-	: fInterface(interface),
-	  fUpdateRegion(),
-	  fUpdateExecutor(-1),
-	  fThreadControl(-1),
-	  fStatus(B_ERROR)
-	  
+ :	BLocker("AppServer_UpdateQueue"),
+ 	fInterface(interface),
+	fUpdateRegion(),
+	fUpdateExecutor(-1),
+	fThreadControl(-1),
+	fStatus(B_ERROR)
 {
 	fThreadControl = create_sem(0, "update queue control");
 	if (fThreadControl >= B_OK)
diff --git a/src/servers/app/drawing/UpdateQueue.h b/src/servers/app/drawing/UpdateQueue.h
index bb86edeaba..074c16ff0c 100644
--- a/src/servers/app/drawing/UpdateQueue.h
+++ b/src/servers/app/drawing/UpdateQueue.h
@@ -1,7 +1,7 @@
 // UpdateQueue.h
 
-#ifndef EVENT_QUEUE_H
-#define EVENT_QUEUE_H
+#ifndef UPDATE_QUEUE_H
+#define UPDATE_QUEUE_H
 
 #include <List.h>
 #include <Locker.h>
@@ -33,4 +33,4 @@ class UpdateQueue : public BLocker {
 			status_t			fStatus;
 };
 
-#endif	// EVENT_QUEUE_H
+#endif	// UPDATE_QUEUE_H