diff --git a/src/servers/app/Desktop.cpp b/src/servers/app/Desktop.cpp
index 8c9289c114..029c90a13f 100644
--- a/src/servers/app/Desktop.cpp
+++ b/src/servers/app/Desktop.cpp
@@ -518,13 +518,13 @@ Desktop::PrintToStream(void)
 	printf("RootLayer List:\n=======\n");
 
 	for (int32 i = 0; i < fRootLayerList.CountItems(); i++) {
-		printf("\t%s\n", ((RootLayer*)fRootLayerList.ItemAt(i))->GetName());
+		printf("\t%s\n", ((RootLayer*)fRootLayerList.ItemAt(i))->Name());
 		((RootLayer*)fRootLayerList.ItemAt(i))->PrintToStream();
 		printf("-------\n");
 	}
 
 	printf("=======\nActive RootLayer: %s\n",
-		fActiveRootLayer ? fActiveRootLayer->GetName() : "NULL");
+		fActiveRootLayer ? fActiveRootLayer->Name() : "NULL");
 //	printf("Active WinBorder: %s\n", fActiveWinBorder? fActiveWinBorder->Name(): "NULL");
 
 	printf("Screen List:\n");
diff --git a/src/servers/app/Layer.cpp b/src/servers/app/Layer.cpp
index e95785b13f..ee576dc616 100644
--- a/src/servers/app/Layer.cpp
+++ b/src/servers/app/Layer.cpp
@@ -99,7 +99,7 @@ Layer::Layer(BRect frame, const char* name, int32 token,
 	fClipReg(&fVisible2),
 #endif 
 	fServerWin(NULL),
-	fName(new BString(name)),
+	fName(name),
 	fViewToken(token),
 
 	fFlags(flags),
@@ -132,15 +132,14 @@ CRITICAL(helper);
 	if (!fDriver)
 		CRITICAL("You MUST have a valid driver to init a Layer object\n");
 
-	STRACE(("Layer(%s) successfuly created\n", GetName()));
+	STRACE(("Layer(%s) successfuly created\n", Name()));
 }
 
 //! Destructor frees all allocated heap space
 Layer::~Layer()
 {
 	delete fLayerData;
-	delete fName;
-	
+
 	// TODO: uncomment!
 	//PruneTree();
 	
@@ -159,7 +158,7 @@ Layer::~Layer()
 void
 Layer::AddChild(Layer* layer, ServerWindow* serverWin)
 {
-	STRACE(("Layer(%s)::AddChild(%s) START\n", GetName(), layer->GetName()));
+	STRACE(("Layer(%s)::AddChild(%s) START\n", Name(), layer->Name()));
 	
 	if (layer->fParent != NULL) {
 		printf("ERROR: AddChild(): Layer already has a parent\n");
@@ -183,7 +182,7 @@ Layer::AddChild(Layer* layer, ServerWindow* serverWin)
 	// they will be set when the RootLayer for this tree will be added
 	// to the main tree structure.
 	if (!fRootLayer) {
-		STRACE(("Layer(%s)::AddChild(%s) END\n", GetName(), layer->GetName()));
+		STRACE(("Layer(%s)::AddChild(%s) END\n", Name(), layer->Name()));
 		return;
 	}
 
@@ -233,7 +232,7 @@ Layer::AddChild(Layer* layer, ServerWindow* serverWin)
 		}
 	}
 
-	STRACE(("Layer(%s)::AddChild(%s) END\n", GetName(), layer->GetName()));
+	STRACE(("Layer(%s)::AddChild(%s) END\n", Name(), layer->Name()));
 }
 
 /*!
@@ -246,7 +245,7 @@ Layer::AddChild(Layer* layer, ServerWindow* serverWin)
 void
 Layer::RemoveChild(Layer *layer)
 {
-	STRACE(("Layer(%s)::RemoveChild(%s) START\n", GetName(), layer->GetName()));
+	STRACE(("Layer(%s)::RemoveChild(%s) START\n", Name(), layer->Name()));
 	
 	if (!layer->fParent) {
 		printf("ERROR: RemoveChild(): Layer doesn't have a fParent\n");
@@ -330,7 +329,7 @@ Layer::RemoveChild(Layer *layer)
 			}
 		}
 	}
-	STRACE(("Layer(%s)::RemoveChild(%s) END\n", GetName(), layer->GetName()));
+	STRACE(("Layer(%s)::RemoveChild(%s) END\n", Name(), layer->Name()));
 }
 
 //! Removes the calling layer from the tree
@@ -476,7 +475,7 @@ Layer::BottomChild() const
 void
 Layer::RebuildFullRegion(void)
 {
-	STRACE(("Layer(%s)::RebuildFullRegion()\n", GetName()));
+	STRACE(("Layer(%s)::RebuildFullRegion()\n", Name()));
 	
 	if (fParent)
 		fFull.Set(fParent->ConvertToTop(fFrame ));
@@ -501,8 +500,8 @@ Layer::RebuildFullRegion(void)
 void
 Layer::StartRebuildRegions( const BRegion& reg, Layer *target, uint32 action, BPoint& pt)
 {
-	STRACE(("Layer(%s)::StartRebuildRegions() START\n", GetName()));
-	RBTRACE(("\n\nLayer(%s)::StartRebuildRegions() START\n", GetName()));
+	STRACE(("Layer(%s)::StartRebuildRegions() START\n", Name()));
+	RBTRACE(("\n\nLayer(%s)::StartRebuildRegions() START\n", Name()));
 	if (!fParent)
 		fFullVisible = fFull;
 	
@@ -519,7 +518,7 @@ Layer::StartRebuildRegions( const BRegion& reg, Layer *target, uint32 action, BP
 	}
 	
 	#ifdef DEBUG_LAYER_REBUILD
-		printf("\nSRR: Layer(%s) ALMOST done regions:\n", GetName());
+		printf("\nSRR: Layer(%s) ALMOST done regions:\n", Name());
 		printf("\tVisible Region:\n");
 		fVisible.PrintToStream();
 		printf("\tFull Visible Region:\n");
@@ -536,7 +535,7 @@ Layer::StartRebuildRegions( const BRegion& reg, Layer *target, uint32 action, BP
 		fRootLayer->fRedrawReg.Include(&redrawReg);
 	
 	#ifdef DEBUG_LAYER_REBUILD
-		printf("\nLayer(%s)::StartRebuildRegions() DONE. Results:\n", GetName());
+		printf("\nLayer(%s)::StartRebuildRegions() DONE. Results:\n", Name());
 		printf("\tRedraw Region:\n");
 		fRootLayer->fRedrawReg.PrintToStream();
 		printf("\tCopy Region:\n");
@@ -547,15 +546,15 @@ Layer::StartRebuildRegions( const BRegion& reg, Layer *target, uint32 action, BP
 		printf("\n");
 	#endif
 
-	STRACE(("Layer(%s)::StartRebuildRegions() END\n", GetName()));
-	RBTRACE(("Layer(%s)::StartRebuildRegions() END\n", GetName()));
+	STRACE(("Layer(%s)::StartRebuildRegions() END\n", Name()));
+	RBTRACE(("Layer(%s)::StartRebuildRegions() END\n", Name()));
 }
 
 // RebuildRegions
 void
 Layer::RebuildRegions( const BRegion& reg, uint32 action, BPoint pt, BPoint ptOffset)
 {
-	STRACE(("Layer(%s)::RebuildRegions() START\n", GetName()));
+	STRACE(("Layer(%s)::RebuildRegions() START\n", Name()));
 
 	// TODO:/NOTE: this method must be executed as quickly as possible.
 	
@@ -578,14 +577,14 @@ Layer::RebuildRegions( const BRegion& reg, uint32 action, BPoint pt, BPoint ptOf
 	RRLabel1:
 	switch(action) {
 		case B_LAYER_NONE: {
-			RBTRACE(("1) Layer(%s): Action B_LAYER_NONE\n", GetName()));
-			STRACE(("1) Layer(%s): Action B_LAYER_NONE\n", GetName()));
+			RBTRACE(("1) Layer(%s): Action B_LAYER_NONE\n", Name()));
+			STRACE(("1) Layer(%s): Action B_LAYER_NONE\n", Name()));
 			oldRegion = fVisible;
 			break;
 		}
 		case B_LAYER_MOVE: {
-			RBTRACE(("1) Layer(%s): Action B_LAYER_MOVE\n", GetName()));
-			STRACE(("1) Layer(%s): Action B_LAYER_MOVE\n", GetName()));
+			RBTRACE(("1) Layer(%s): Action B_LAYER_MOVE\n", Name()));
+			STRACE(("1) Layer(%s): Action B_LAYER_MOVE\n", Name()));
 			oldRegion = fFullVisible;
 			fFrame.OffsetBy(pt.x, pt.y);
 			fFull.OffsetBy(pt.x, pt.y);
@@ -598,15 +597,15 @@ Layer::RebuildRegions( const BRegion& reg, uint32 action, BPoint pt, BPoint ptOf
 			break;
 		}
 		case B_LAYER_SIMPLE_MOVE: {
-			RBTRACE(("1) Layer(%s): Action B_LAYER_SIMPLE_MOVE\n", GetName()));
-			STRACE(("1) Layer(%s): Action B_LAYER_SIMPLE_MOVE\n", GetName()));
+			RBTRACE(("1) Layer(%s): Action B_LAYER_SIMPLE_MOVE\n", Name()));
+			STRACE(("1) Layer(%s): Action B_LAYER_SIMPLE_MOVE\n", Name()));
 			fFull.OffsetBy(pt.x, pt.y);
 			
 			break;
 		}
 		case B_LAYER_RESIZE: {
-			RBTRACE(("1) Layer(%s): Action B_LAYER_RESIZE\n", GetName()));
-			STRACE(("1) Layer(%s): Action B_LAYER_RESIZE\n", GetName()));
+			RBTRACE(("1) Layer(%s): Action B_LAYER_RESIZE\n", Name()));
+			STRACE(("1) Layer(%s): Action B_LAYER_RESIZE\n", Name()));
 			oldRegion	= fVisible;
 			
 			fFrame.right	+= pt.x;
@@ -621,8 +620,8 @@ Layer::RebuildRegions( const BRegion& reg, uint32 action, BPoint pt, BPoint ptOf
 			break;
 		}
 		case B_LAYER_MASK_RESIZE: {
-			RBTRACE(("1) Layer(%s): Action B_LAYER_MASK_RESIZE\n", GetName()));
-			STRACE(("1) Layer(%s): Action B_LAYER_MASK_RESIZE\n", GetName()));
+			RBTRACE(("1) Layer(%s): Action B_LAYER_MASK_RESIZE\n", Name()));
+			STRACE(("1) Layer(%s): Action B_LAYER_MASK_RESIZE\n", Name()));
 			oldRegion = fVisible;
 			
 			BPoint offset, rSize;
@@ -665,7 +664,7 @@ Layer::RebuildRegions( const BRegion& reg, uint32 action, BPoint pt, BPoint ptOf
 
 	if (!IsHidden()) {
 		#ifdef DEBUG_LAYER_REBUILD
-			printf("Layer(%s) real action START\n", GetName());
+			printf("Layer(%s) real action START\n", Name());
 			fFull.PrintToStream();
 		#endif
 		fFullVisible.MakeEmpty();
@@ -721,7 +720,7 @@ Layer::RebuildRegions( const BRegion& reg, uint32 action, BPoint pt, BPoint ptOf
 		lay->RebuildRegions(reg, newAction, newPt, newOffset);
 
 	#ifdef DEBUG_LAYER_REBUILD
-		printf("\nLayer(%s) ALMOST done regions:\n", GetName());
+		printf("\nLayer(%s) ALMOST done regions:\n", Name());
 		printf("\tVisible Region:\n");
 		fVisible.PrintToStream();
 		printf("\tFull Visible Region:\n");
@@ -731,7 +730,7 @@ Layer::RebuildRegions( const BRegion& reg, uint32 action, BPoint pt, BPoint ptOf
 	if(!IsHidden()) {
 		switch(action) {
 			case B_LAYER_NONE: {
-				RBTRACE(("2) Layer(%s): Action B_LAYER_NONE\n", GetName()));
+				RBTRACE(("2) Layer(%s): Action B_LAYER_NONE\n", Name()));
 				BRegion r(fVisible);
 				if (oldRegion.CountRects() > 0)
 					r.Exclude(&oldRegion);
@@ -741,7 +740,7 @@ Layer::RebuildRegions( const BRegion& reg, uint32 action, BPoint pt, BPoint ptOf
 				break;
 			}
 			case B_LAYER_MOVE: {
-				RBTRACE(("2) Layer(%s): Action B_LAYER_MOVE\n", GetName()));
+				RBTRACE(("2) Layer(%s): Action B_LAYER_MOVE\n", Name()));
 				BRegion redrawReg;
 				BRegion	*copyReg = new BRegion();
 				BRegion	screenReg(fRootLayer->Bounds());
@@ -769,7 +768,7 @@ Layer::RebuildRegions( const BRegion& reg, uint32 action, BPoint pt, BPoint ptOf
 				break;
 			}
 			case B_LAYER_RESIZE: {
-				RBTRACE(("2) Layer(%s): Action B_LAYER_RESIZE\n", GetName()));
+				RBTRACE(("2) Layer(%s): Action B_LAYER_RESIZE\n", Name()));
 				BRegion redrawReg;
 				
 				redrawReg = fVisible;
@@ -780,7 +779,7 @@ Layer::RebuildRegions( const BRegion& reg, uint32 action, BPoint pt, BPoint ptOf
 				break;
 			}
 			case B_LAYER_MASK_RESIZE: {
-				RBTRACE(("2) Layer(%s): Action B_LAYER_MASK_RESIZE\n", GetName()));
+				RBTRACE(("2) Layer(%s): Action B_LAYER_MASK_RESIZE\n", Name()));
 				BRegion redrawReg;
 				BRegion	*copyReg = new BRegion();
 				
@@ -803,7 +802,7 @@ Layer::RebuildRegions( const BRegion& reg, uint32 action, BPoint pt, BPoint ptOf
 				break;
 			}
 			default:
-				RBTRACE(("2) Layer(%s): Action default\n", GetName()));
+				RBTRACE(("2) Layer(%s): Action default\n", Name()));
 				break;
 		}
 	}
@@ -813,14 +812,14 @@ Layer::RebuildRegions( const BRegion& reg, uint32 action, BPoint pt, BPoint ptOf
 	}
 */
 
-	STRACE(("Layer(%s)::RebuildRegions() END\n", GetName()));
+	STRACE(("Layer(%s)::RebuildRegions() END\n", Name()));
 }
 
 // ResizeOthers
 uint32
 Layer::ResizeOthers(float x, float y, BPoint coords[], BPoint *ptOffset)
 {
-	STRACE(("Layer(%s)::ResizeOthers() START\n", GetName()));
+	STRACE(("Layer(%s)::ResizeOthers() START\n", Name()));
 	uint32 rmask = fResizeMode;
 	
 	// offset
@@ -856,7 +855,7 @@ Layer::ResizeOthers(float x, float y, BPoint coords[], BPoint *ptOffset)
 		// illegal flag. Do nothing.
 	}
 
-	STRACE(("Layer(%s)::ResizeOthers() END\n", GetName()));
+	STRACE(("Layer(%s)::ResizeOthers() END\n", Name()));
 	return 0UL;
 }
 
@@ -866,7 +865,7 @@ Layer::ResizeOthers(float x, float y, BPoint coords[], BPoint *ptOffset)
 void
 Layer::Redraw(const BRegion& reg, Layer *startFrom)
 {
-	STRACE(("Layer(%s)::Redraw();\n", GetName()));
+	STRACE(("Layer(%s)::Redraw();\n", Name()));
 	if (IsHidden())
 		// this layer has nothing visible on screen, so bail out.
 		return;
@@ -876,7 +875,7 @@ Layer::Redraw(const BRegion& reg, Layer *startFrom)
 	if (pReg->CountRects() > 0)
 		RequestDraw(reg, startFrom);
 	
-	STRACE(("Layer(%s)::Redraw() ENDED\n", GetName()));
+	STRACE(("Layer(%s)::Redraw() ENDED\n", Name()));
 }
 
 // Draw
@@ -884,7 +883,7 @@ void
 Layer::Draw(const BRect &rect)
 {
 #ifdef DEBUG_LAYER
-	printf("Layer(%s)::Draw: ", GetName());
+	printf("Layer(%s)::Draw: ", Name());
 	rect.PrintToStream();
 #endif	
 
@@ -916,7 +915,7 @@ Layer::EmptyGlobals()
 void
 Layer::Show(bool invalidate)
 {
-	STRACE(("Layer(%s)::Show()\n", GetName()));
+	STRACE(("Layer(%s)::Show()\n", Name()));
 	if(!IsHidden())
 		return;
 	
@@ -942,7 +941,7 @@ SendViewCoordUpdateMsg();
 void
 Layer::Hide(bool invalidate)
 {
-	STRACE(("Layer(%s)::Hide()\n", GetName()));
+	STRACE(("Layer(%s)::Hide()\n", Name()));
 	if (IsHidden())
 		return;
 	
@@ -980,7 +979,7 @@ void
 Layer::PopState()
 {
 	if (fLayerData->prevState == NULL) {
-		fprintf(stderr, "WARNING: User called BView(%s)::PopState(), but there is NO state on stack!\n", fName->String());
+		fprintf(stderr, "WARNING: User called BView(%s)::PopState(), but there is NO state on stack!\n", Name());
 		return;
 	}
 	
@@ -1012,7 +1011,7 @@ Layer::Frame(void) const
 void
 Layer::MoveBy(float x, float y)
 {
-	STRACE(("Layer(%s)::MoveBy() START\n", GetName()));
+	STRACE(("Layer(%s)::MoveBy() START\n", Name()));
 	if (!fParent) {
 		CRITICAL("ERROR: in Layer::MoveBy()! - No parent!\n");
 		return;
@@ -1025,14 +1024,14 @@ Layer::MoveBy(float x, float y)
 	msg.Attach<float>(y);
 	GetRootLayer()->EnqueueMessage(msg);
 
-	STRACE(("Layer(%s)::MoveBy() END\n", GetName()));
+	STRACE(("Layer(%s)::MoveBy() END\n", Name()));
 }
 
 //! Resize the layer by the specified amount, complete with redraw
 void
 Layer::ResizeBy(float x, float y)
 {
-	STRACE(("Layer(%s)::ResizeBy() START\n", GetName()));
+	STRACE(("Layer(%s)::ResizeBy() START\n", Name()));
 	
 	if (!fParent) {
 		printf("ERROR: in Layer::ResizeBy()! - No parent!\n");
@@ -1046,7 +1045,7 @@ Layer::ResizeBy(float x, float y)
 	msg.Attach<float>(y);
 	GetRootLayer()->EnqueueMessage(msg);
 
-	STRACE(("Layer(%s)::ResizeBy() END\n", GetName()));
+	STRACE(("Layer(%s)::ResizeBy() END\n", Name()));
 }
 
 // BoundsOrigin
@@ -1241,22 +1240,24 @@ Layer::PruneTree(void)
 void
 Layer::PrintToStream()
 {
-	printf("\n----------- Layer %s -----------\n",fName->String());
-	printf("\t Parent: %s\n", fParent? fParent->GetName():"NULL");
+	printf("\n----------- Layer %s -----------\n", Name());
+	printf("\t Parent: %s\n", fParent ? fParent->Name() : "<no parent>");
+
 	printf("\t us: %s\t ls: %s\n",
-				fUpperSibling? fUpperSibling->GetName():"NULL",
-				fLowerSibling? fLowerSibling->GetName():"NULL");
+		fUpperSibling ? fUpperSibling->Name() : "<none>",
+		fLowerSibling ? fLowerSibling->Name() : "<none>");
+
 	printf("\t topChild: %s\t bottomChild: %s\n",
-				fTopChild? fTopChild->GetName():"NULL",
-				fBottomChild? fBottomChild->GetName():"NULL");
+		fTopChild ? fTopChild->Name() : "<none>",
+		fBottomChild ? fBottomChild->Name() : "<none>");
 	
 	printf("Frame: (%f, %f, %f, %f)", fFrame.left, fFrame.top, fFrame.right, fFrame.bottom);
-	printf("Token: %ld\n",fViewToken);
+	printf("Token: %ld\n", fViewToken);
 	printf("Hidden - direct: %s\n", fHidden?"true":"false");
 	printf("Hidden - indirect: %s\n", IsHidden()?"true":"false");
 	printf("ResizingMode: %lx\n", fResizeMode);
 	printf("Flags: %lx\n", fFlags);
-	
+
 	if (fLayerData)
 		fLayerData->PrintToStream();
 	else
@@ -1267,25 +1268,29 @@ Layer::PrintToStream()
 void
 Layer::PrintNode()
 {
-	printf("-----------\nLayer %s\n",fName->String());
-	if(fParent)
-		printf("Parent: %s (%p)\n",fParent->GetName(), fParent);
+	printf("-----------\nLayer %s\n", Name());
+	if (fParent)
+		printf("Parent: %s (%p)\n", fParent->Name(), fParent);
 	else
 		printf("Parent: NULL\n");
-	if(fUpperSibling)
-		printf("Upper sibling: %s (%p)\n",fUpperSibling->GetName(), fUpperSibling);
+
+	if (fUpperSibling)
+		printf("Upper sibling: %s (%p)\n", fUpperSibling->Name(), fUpperSibling);
 	else
 		printf("Upper sibling: NULL\n");
-	if(fLowerSibling)
-		printf("Lower sibling: %s (%p)\n",fLowerSibling->GetName(), fLowerSibling);
+
+	if (fLowerSibling)
+		printf("Lower sibling: %s (%p)\n", fLowerSibling->Name(), fLowerSibling);
 	else
 		printf("Lower sibling: NULL\n");
-	if(fTopChild)
-		printf("Top child: %s (%p)\n",fTopChild->GetName(), fTopChild);
+
+	if (fTopChild)
+		printf("Top child: %s (%p)\n", fTopChild->Name(), fTopChild);
 	else
 		printf("Top child: NULL\n");
-	if(fBottomChild)
-		printf("Bottom child: %s (%p)\n",fBottomChild->GetName(), fBottomChild);
+
+	if (fBottomChild)
+		printf("Bottom child: %s (%p)\n", fBottomChild->Name(), fBottomChild);
 	else
 		printf("Bottom child: NULL\n");
 #ifndef NEW_CLIPPING
@@ -1298,9 +1303,9 @@ void
 Layer::PrintTree()
 {
 	printf("\n Tree structure:\n");
-	printf("\t%s\t%s\n", GetName(), IsHidden()? "Hidden": "NOT hidden");
+	printf("\t%s\t%s\n", Name(), IsHidden()? "Hidden": "NOT hidden");
 	for(Layer *lay = BottomChild(); lay != NULL; lay = UpperSibling())
-		printf("\t%s\t%s\n", lay->GetName(), lay->IsHidden()? "Hidden": "NOT hidden");
+		printf("\t%s\t%s\n", lay->Name(), lay->IsHidden()? "Hidden": "NOT hidden");
 }
 
 // UpdateStart
@@ -1362,7 +1367,7 @@ Layer::move_layer(float x, float y)
 	BRect rect(fFull.Frame().OffsetByCopy(pt));
 
 if (!fParent) {
-printf("no parent in Layer::move_layer() (%s)\n", GetName());
+printf("no parent in Layer::move_layer() (%s)\n", Name());
 fFrameAction = B_LAYER_ACTION_NONE;
 return;
 }
@@ -1396,7 +1401,7 @@ Layer::resize_layer(float x, float y)
 	rect.bottom += y;
 
 if (!fParent) {
-printf("no parent in Layer::resize_layer() (%s)\n", GetName());
+printf("no parent in Layer::resize_layer() (%s)\n", Name());
 fFrameAction = B_LAYER_ACTION_NONE;
 return;
 }
@@ -1426,7 +1431,7 @@ Layer::FullInvalidate(const BRect &rect)
 void
 Layer::FullInvalidate(const BRegion& region)
 {
-	STRACE(("Layer(%s)::FullInvalidate():\n", GetName()));
+	STRACE(("Layer(%s)::FullInvalidate():\n", Name()));
 	
 #ifdef DEBUG_LAYER
 	region.PrintToStream();
@@ -1445,7 +1450,7 @@ Layer::FullInvalidate(const BRegion& region)
 void
 Layer::Invalidate(const BRegion& region)
 {
-	STRACE(("Layer(%s)::Invalidate():\n", GetName()));
+	STRACE(("Layer(%s)::Invalidate():\n", Name()));
 #ifdef DEBUG_LAYER
 	region.PrintToStream();
 	printf("\n");
@@ -1464,8 +1469,8 @@ Layer::Invalidate(const BRegion& region)
 void
 Layer::RequestDraw(const BRegion &reg, Layer *startFrom)
 {
-	STRACE(("Layer(%s)::RequestDraw()\n", GetName()));
-printf("Layer(%s)::RequestDraw()\n", GetName());
+	STRACE(("Layer(%s)::RequestDraw()\n", Name()));
+printf("Layer(%s)::RequestDraw()\n", Name());
 //if (fClassID == AS_ROOTLAYER_CLASS)
 //	debugger("z");
 	// do not redraw any child until you must
diff --git a/src/servers/app/Layer.h b/src/servers/app/Layer.h
index 8551f25e58..6eafcb9b44 100644
--- a/src/servers/app/Layer.h
+++ b/src/servers/app/Layer.h
@@ -92,8 +92,9 @@ class Layer {
 	virtual	Layer*				UpperSibling() const;
 	virtual	Layer*				BottomChild() const;
 	
-			const char*			GetName() const
-									{ return (fName) ? fName->String() : NULL; }
+			const char*			Name() const
+									{ return fName.String(); }
+
 #ifndef NEW_CLIPPING
 	virtual	void				RebuildFullRegion();
 			void				StartRebuildRegions(const BRegion& reg,
@@ -291,7 +292,7 @@ class Layer {
 			BRegion*			fClipReg;
 	
 			ServerWindow*		fServerWin;
-			BString*			fName;	
+			BString				fName;	
 			int32				fViewToken;
 			uint32				fFlags;
 			uint32				fResizeMode;
diff --git a/src/servers/app/RootLayer.cpp b/src/servers/app/RootLayer.cpp
index 8b13941f9c..d2fef1fbb0 100644
--- a/src/servers/app/RootLayer.cpp
+++ b/src/servers/app/RootLayer.cpp
@@ -239,7 +239,7 @@ RootLayer::WorkingThread(void *data)
 #endif
 	oneRootLayer->Unlock();
 	
-	STRACE(("info: RootLayer(%s)::WorkingThread listening on port %ld.\n", oneRootLayer->GetName(), oneRootLayer->fListenPort));
+	STRACE(("info: RootLayer(%s)::WorkingThread listening on port %ld.\n", oneRootLayer->Name(), oneRootLayer->fListenPort));
 	for (;;) {
 		err = messageQueue.GetNextMessage(code);
 		if (err < B_OK) {
@@ -381,7 +381,7 @@ printf("Adi: new message\n");
 				break;
 			}
 			default:
-				printf("RootLayer(%s)::WorkingThread received unexpected code %lx\n", oneRootLayer->GetName(), code);
+				printf("RootLayer(%s)::WorkingThread received unexpected code %lx\n", oneRootLayer->Name(), code);
 				break;
 		}
 
@@ -410,7 +410,7 @@ RootLayer::GoInvalidate(const Layer *layer, const BRegion &region)
 void RootLayer::invalidate_layer(Layer *layer, const BRegion &region)
 {
 	// NOTE: our thread (WorkingThread) is locked here.
-	STRACE(("RootLayer::invalidate_layer(%s)\n", layer->GetName()));
+	STRACE(("RootLayer::invalidate_layer(%s)\n", layer->Name()));
 
 	if (layer->fParent)
 		layer = layer->fParent;
@@ -641,7 +641,7 @@ void RootLayer::RemoveSubsetWinBorder(WinBorder *winBorder, WinBorder *fromWinBo
 // NOTE: This must be called by RootLayer's thread!!!!
 bool RootLayer::SetActiveWorkspace(int32 index)
 {
-	STRACE(("RootLayer(%s)::SetActiveWorkspace(%ld)\n", GetName(), index));
+	STRACE(("RootLayer(%s)::SetActiveWorkspace(%ld)\n", Name(), index));
 
 	// nice try!
 	if (index >= fWsCount || index == fActiveWksIndex || index < 0)
@@ -1900,7 +1900,7 @@ RootLayer::DragMessage(void) const
 void
 RootLayer::PrintToStream()
 {
-	printf("\nRootLayer '%s' internals:\n", GetName());
+	printf("\nRootLayer '%s' internals:\n", Name());
 	printf("Screen list:\n");
 	for(int32 i=0; i<fScreenPtrList.CountItems(); i++)
 		printf("\t%ld\n", ((Screen*)fScreenPtrList.ItemAt(i))->ScreenNumber());
diff --git a/src/servers/app/ServerApp.cpp b/src/servers/app/ServerApp.cpp
index 263820c1e1..7e8ecedaf3 100644
--- a/src/servers/app/ServerApp.cpp
+++ b/src/servers/app/ServerApp.cpp
@@ -14,11 +14,10 @@
 #include <AppDefs.h>
 #include <List.h>
 #include <String.h>
+#include <Autolock.h>
 #include <SysCursor.h>
 #include <ColorSet.h>
 #include <RGBColor.h>
-#include <stdio.h>
-#include <string.h>
 #include <ScrollBar.h>
 #include <Shape.h>
 #include <ServerProtocol.h>
@@ -45,10 +44,12 @@
 #include "LayerData.h"
 #include "Utils.h"
 
+#include <stdio.h>
+#include <string.h>
+
 //#define DEBUG_SERVERAPP
 
 #ifdef DEBUG_SERVERAPP
-#	include <stdio.h>
 #	define STRACE(x) printf x
 #else
 #	define STRACE(x) ;
@@ -57,7 +58,6 @@
 //#define DEBUG_SERVERAPP_FONT
 
 #ifdef DEBUG_SERVERAPP_FONT
-#	include <stdio.h>
 #	define FTRACE(x) printf x
 #else
 #	define FTRACE(x) ;
@@ -77,13 +77,13 @@ static const uint32 kMsgAppQuit = 'appQ';
 ServerApp::ServerApp(port_id clientReplyPort, port_id clientLooperPort,
 	team_id clientTeam, int32 handlerID, const char* signature)
 	:
-	fLockSem(-1),
 	fClientReplyPort(clientReplyPort),
 	fMessagePort(-1),
 	fClientLooperPort(clientLooperPort),
 	fSignature(signature),
 	fThread(-1),
 	fClientTeam(clientTeam),
+	fWindowListLock("window list"),
 	fAppCursor(NULL),
 	fCursorHidden(false),
 	fIsActive(false),
@@ -94,11 +94,10 @@ ServerApp::ServerApp(port_id clientReplyPort, port_id clientLooperPort,
 	if (fSignature == "")
 		fSignature = "application/no-signature";
 
-	fLockSem = create_sem(1, Signature());
-	if (fLockSem < B_OK)
-		return;
+	char name[B_OS_NAME_LENGTH];
+	snprintf(name, sizeof(name), "a<%s", Signature());
 
-	fMessagePort = create_port(DEFAULT_MONITOR_PORT_SIZE, Signature());
+	fMessagePort = create_port(DEFAULT_MONITOR_PORT_SIZE, name);
 	if (fMessagePort < B_OK)
 		return;
 
@@ -154,7 +153,6 @@ ServerApp::~ServerApp(void)
 	// there should be a way that this ServerApp be attached to a particular
 	// RootLayer to know which RootLayer's cursor to modify.
 	gDesktop->ActiveRootLayer()->GetCursorManager().RemoveAppCursors(fClientTeam);
-	delete_sem(fLockSem);
 	
 	STRACE(("#ServerApp %s:~ServerApp()\n", fSignature.String()));
 
@@ -176,8 +174,8 @@ ServerApp::InitCheck()
 	if (fClientReplyPort < B_OK)
 		return fClientReplyPort;
 
-	if (fLockSem < B_OK)
-		return fLockSem;
+	if (fWindowListLock.Sem() < B_OK)
+		return fWindowListLock.Sem();
 
 	return B_OK;
 }
@@ -390,7 +388,7 @@ ServerApp::_MessageLooper()
 				uint32 look;
 				uint32 feel;
 				uint32 flags;
-				uint32 wkspaces;
+				uint32 workspaces;
 				int32 token = B_NULL_TOKEN;
 				port_id	sendPort = -1;
 				port_id looperPort = -1;
@@ -400,24 +398,31 @@ ServerApp::_MessageLooper()
 				receiver.Read<uint32>(&look);
 				receiver.Read<uint32>(&feel);
 				receiver.Read<uint32>(&flags);
-				receiver.Read<uint32>(&wkspaces);
+				receiver.Read<uint32>(&workspaces);
 				receiver.Read<int32>(&token);
 				receiver.Read<port_id>(&sendPort);
 				receiver.Read<port_id>(&looperPort);
 				if (receiver.ReadString(&title) != B_OK)
 					break;
 
-				STRACE(("ServerApp %s: Got 'New Window' message, trying to do smething...\n", Signature()));
+				STRACE(("ServerApp %s: Got 'New Window' message, trying to do smething...\n",
+					Signature()));
 
 				// ServerWindow constructor will reply with port_id of a newly created port
-				ServerWindow *sw = new ServerWindow(title, this, sendPort, looperPort, token);
-				sw->Init(frame, look, feel, flags, wkspaces);
+				ServerWindow *window = new ServerWindow(title, this, sendPort, looperPort,
+					token);
+				window->Init(frame, look, feel, flags, workspaces);
+
+				if (fWindowListLock.Lock()) {
+					fWindowList.AddItem(window);
+					fWindowListLock.Unlock();
+				}
 
 				STRACE(("\nServerApp %s: New Window %s (%.1f,%.1f,%.1f,%.1f)\n",
 					app->fSignature.String(), title, frame.left, frame.top,
 					frame.right, frame.bottom));
 
-				free(title);
+				// We don't have to free the title, as it's owned by the ServerWindow now
 				break;
 			}
 
@@ -467,7 +472,7 @@ ServerApp::_MessageLooper()
 void
 ServerApp::_DispatchMessage(int32 code, BPrivate::LinkReceiver &link)
 {
-	LayerData ld;
+//	LayerData ld;
 
 	switch (code) {
 		case AS_UPDATE_COLORS:
@@ -1916,6 +1921,15 @@ ServerApp::_DispatchMessage(int32 code, BPrivate::LinkReceiver &link)
 }
 
 
+void
+ServerApp::RemoveWindow(ServerWindow* window)
+{
+	BAutolock locker(fWindowListLock);
+
+	fWindowList.RemoveItem(window);
+}
+
+
 int32
 ServerApp::CountBitmaps() const
 {
diff --git a/src/servers/app/ServerApp.h b/src/servers/app/ServerApp.h
index 942585d580..10202cc50c 100644
--- a/src/servers/app/ServerApp.h
+++ b/src/servers/app/ServerApp.h
@@ -43,14 +43,8 @@ public:
 
 	status_t InitCheck();
 	bool Run();
-
 	void Quit();
-	/*
-	TODO: These aren't even implemented...
-	void Lock(void);
-	void Unlock(void);
-	bool IsLocked(void);
-	*/
+
 	/*!
 		\brief Determines whether the application is the active one
 		\return true if active, false if not.
@@ -61,7 +55,7 @@ public:
 	bool PingTarget(void);
 
 	void PostMessage(int32 code);
-	void SendMessageToClient( const BMessage* msg ) const;
+	void SendMessageToClient(const BMessage* msg) const;
 
 	void SetAppCursor(void);
 
@@ -70,25 +64,24 @@ public:
 
 	const char *Signature() const { return fSignature.String(); }
 
+	void RemoveWindow(ServerWindow* window);
+
 	int32 CountBitmaps() const;
 	ServerBitmap *FindBitmap(int32 token) const;
-	
+
 	int32 CountPictures() const;
 	ServerPicture *FindPicture(int32 token) const;
 
 	AreaPool *AppAreaPool() { return fSharedMem; }
-	
+
 	SubWindowList fAppSubWindowList;
-	
+
 private:
 	void _DispatchMessage(int32 code, BPrivate::LinkReceiver &link);
 	void _MessageLooper();
 
 	static int32 _message_thread(void *data);	
 
-	// TODO: Not used.
-	sem_id fLockSem;
-
 	// our BApplication's event port
 	port_id	fClientReplyPort;	
 	// port we receive messages from our BApplication
@@ -106,10 +99,12 @@ private:
 
 	BPrivate::PortLink fLink;
 
+	BLocker fWindowListLock;
+	BList fWindowList;
+
 	// TODO:
 	// - Are really Bitmaps and Pictures stored per application and not globally ?
 	// - As we reference these stuff by token, what about putting them in hash tables ?
-	BList fWindowList;
 	BList fBitmapList;
 	BList fPictureList;
 
diff --git a/src/servers/app/ServerWindow.cpp b/src/servers/app/ServerWindow.cpp
index 251db4df61..b81c098d07 100644
--- a/src/servers/app/ServerWindow.cpp
+++ b/src/servers/app/ServerWindow.cpp
@@ -66,29 +66,27 @@
 	Does a lot of stuff to set up for the window - new decorator, new winborder, spawn a 
 	monitor thread.
 */
-ServerWindow::ServerWindow(const char *string, ServerApp *app,
+ServerWindow::ServerWindow(const char *title, ServerApp *app,
 	port_id clientPort, port_id looperPort, int32 handlerID)
-	:
+	: BLocker(*title ? title : "Unnamed Window"),
+	fTitle(title),
 	fServerApp(app),
 	fClientReplyPort(clientPort),
 	fClientLooperPort(looperPort),
 	fClientViewsWithInvalidCoords(B_VIEW_RESIZED),
 	fHandlerToken(handlerID)
 {
-	STRACE(("ServerWindow(%s)::ServerWindow()\n", string));
+	STRACE(("ServerWindow(%s)::ServerWindow()\n", title));
 
-	if (string) {
-		strncpy(fName, string, sizeof(fName) - 1);
-		fName[sizeof(fName) - 1] = '\0';
-	} else
-		strcpy(fName, "Unnamed Window");
+	if (fTitle == NULL)
+		fTitle = strdup("Unnamed Window");
 
 	fClientTeam = app->ClientTeam();
 	fWinBorder = NULL;
 	fCurrentLayer = NULL;
 
 	// fMessagePort is the port to which the app sends messages for the server
-	fMessagePort = create_port(30, fName);
+	fMessagePort = create_port(30, fTitle);
 
 	fMsgSender = new BPrivate::LinkSender(fClientReplyPort);
 	fMsgReceiver = new BPrivate::LinkReceiver(fMessagePort);
@@ -98,7 +96,7 @@ ServerWindow::ServerWindow(const char *string, ServerApp *app,
 	fMsgSender->Attach<port_id>(fMessagePort);
 	fMsgSender->Flush();
 
-	STRACE(("ServerWindow %s Created\n", fName));
+	STRACE(("ServerWindow %s Created\n", fTitle));
 }
 
 
@@ -107,13 +105,13 @@ ServerWindow::Init(BRect frame, uint32 wlook,
 	uint32 wfeel, uint32 wflags, uint32 wwksindex)
 {
 	char name[60];
-	snprintf(name, sizeof(name), "%ld: %s", fClientTeam, fName);
+	snprintf(name, sizeof(name), "%ld: %s", fClientTeam, fTitle);
 
 	fWinBorder = new WinBorder(frame, name, wlook, wfeel, wflags,
 		wwksindex, this, gDesktop->GetDisplayDriver());
 
 	// Spawn our message-monitoring thread
-	fThread = spawn_thread(MonitorWin, fName, B_NORMAL_PRIORITY, this);
+	fThread = spawn_thread(MonitorWin, fTitle, B_NORMAL_PRIORITY, this);
 	if (fThread >= B_OK)
 		resume_thread(fThread);
 }
@@ -122,13 +120,14 @@ ServerWindow::Init(BRect frame, uint32 wlook,
 //!Tears down all connections the main app_server objects, and deletes some internals.
 ServerWindow::~ServerWindow(void)
 {
-	STRACE(("*ServerWindow (%s):~ServerWindow()\n", fName));
+	STRACE(("*ServerWindow (%s):~ServerWindow()\n", fTitle));
 
 	delete fWinBorder;
 	delete fMsgSender;
 	delete fMsgReceiver;
+	free(const_cast<char *>(fTitle));
 
-	STRACE(("#ServerWindow(%s) will exit NOW\n", fName));
+	STRACE(("#ServerWindow(%s) will exit NOW\n", fTitle));
 }
 
 //! Forces the window border to update its decorator
@@ -138,7 +137,7 @@ ServerWindow::ReplaceDecorator(void)
 	if (!IsLocked())
 		debugger("you must lock a ServerWindow object before calling ::ReplaceDecorator()\n");
 
-	STRACE(("ServerWindow %s: Replace Decorator\n",fName));
+	STRACE(("ServerWindow %s: Replace Decorator\n", fTitle));
 	fWinBorder->UpdateDecorator();
 }
 
@@ -147,7 +146,7 @@ void
 ServerWindow::Quit(void)
 {
 	// NOTE: if you do something else, other than sending a port message, PLEASE lock
-	STRACE(("ServerWindow %s: Quit\n",fName));
+	STRACE(("ServerWindow %s: Quit\n", fTitle));
 
 	BMessage msg(B_QUIT_REQUESTED);
 	SendMessageToClient(&msg);
@@ -158,7 +157,7 @@ void
 ServerWindow::Show(void)
 {
 	// NOTE: if you do something else, other than sending a port message, PLEASE lock
-	STRACE(("ServerWindow %s: Show\n",fName));
+	STRACE(("ServerWindow %s: Show\n", Title()));
 
 	if (!fWinBorder->IsHidden())
 		return;
@@ -171,7 +170,7 @@ void
 ServerWindow::Hide(void)
 {
 	// NOTE: if you do something else, other than sending a port message, PLEASE lock
-	STRACE(("ServerWindow %s: Hide\n",fName));
+	STRACE(("ServerWindow %s: Hide\n", Title()));
 
 	if (fWinBorder->IsHidden())
 		return;
@@ -228,7 +227,7 @@ ServerWindow::Zoom()
 void
 ServerWindow::ScreenModeChanged(const BRect frame, const color_space colorSpace)
 {
-	STRACE(("ServerWindow %s: ScreenModeChanged\n", fName));
+	STRACE(("ServerWindow %s: ScreenModeChanged\n", fTitle));
 
 	BMessage msg(B_SCREEN_CHANGED);
 	msg.AddRect("frame", frame);
@@ -237,37 +236,6 @@ ServerWindow::ScreenModeChanged(const BRect frame, const color_space colorSpace)
 	SendMessageToClient(&msg);
 }
 
-/*!
-	\brief Locks the window
-	\return B_OK if everything is ok, B_ERROR if something went wrong
-*/
-status_t
-ServerWindow::Lock()
-{
-	STRACE(("\nServerWindow %s: Lock\n", fName));
-
-	return fLocker.Lock() ? B_OK : B_ERROR;
-}
-
-//! Unlocks the window
-void
-ServerWindow::Unlock()
-{
-	STRACE(("ServerWindow %s: Unlock\n\n", fName));
-
-	fLocker.Unlock();
-}
-
-/*!
-	\brief Determines whether or not the window is locked
-	\return True if locked, false if not.
-*/
-bool
-ServerWindow::IsLocked() const
-{
-	return fLocker.IsLocked();
-}
-
 /*!
 	\brief Sets the font state for a layer
 	\param layer The layer to set the font
@@ -276,7 +244,7 @@ inline void
 ServerWindow::SetLayerFontState(Layer *layer, BPrivate::LinkReceiver &link)
 {
 	STRACE(("ServerWindow %s: SetLayerFontStateMessage for layer %s\n",
-			fName, layer->fName->String()));
+			fTitle, layer->Name()));
 	// NOTE: no need to check for a lock. This is a private method.
 
 	layer->fLayerData->ReadFontFromLink(link);
@@ -286,8 +254,8 @@ ServerWindow::SetLayerFontState(Layer *layer, BPrivate::LinkReceiver &link)
 inline void
 ServerWindow::SetLayerState(Layer *layer, BPrivate::LinkReceiver &link)
 {
-	STRACE(("ServerWindow %s: SetLayerState for layer %s\n",fName,
-			 layer->fName->String()));
+	STRACE(("ServerWindow %s: SetLayerState for layer %s\n", Title(),
+			 layer->Name()));
 	// NOTE: no need to check for a lock. This is a private method.
 
 	layer->fLayerData->ReadFromLink(link);
@@ -323,7 +291,7 @@ ServerWindow::CreateLayerTree(BPrivate::LinkReceiver &link, Layer **_parent)
 	link.Read<int32>(&parentToken);
 
 	STRACE(("ServerWindow(%s)::CreateLayerTree()-> layer %s, token %ld\n",
-		fName, name, token));
+		fTitle, name, token));
 
 	Layer *newLayer = new Layer(frame, name, token, resizeMask, 
 			flags, gDesktop->GetDisplayDriver());
@@ -353,7 +321,7 @@ void
 ServerWindow::DispatchMessage(int32 code, BPrivate::LinkReceiver &link)
 {
 	if (fCurrentLayer == NULL && code != AS_LAYER_CREATE_ROOT && code != AS_LAYER_CREATE) {
-		printf("ServerWindow %s received unexpected code - message offset %ld before top_view attached.\n",fName, code - SERVER_TRUE);
+		printf("ServerWindow %s received unexpected code - message offset %ld before top_view attached.\n", Title(), code - SERVER_TRUE);
 		return;
 	}
 
@@ -363,7 +331,7 @@ ServerWindow::DispatchMessage(int32 code, BPrivate::LinkReceiver &link)
 		//--------- BView Messages -----------------
 		case AS_LAYER_SCROLL:
 		{
-			DTRACE(("ServerWindow %s: Message AS_LAYER_SCROLL: Layer name: %s\n", fName, fCurrentLayer->fName->String()));
+			DTRACE(("ServerWindow %s: Message AS_LAYER_SCROLL: Layer name: %s\n", fTitle, fCurrentLayer->Name()));
 			float dh;
 			float dv;
 
@@ -422,9 +390,9 @@ ServerWindow::DispatchMessage(int32 code, BPrivate::LinkReceiver &link)
 
 			Layer *current = fWinBorder->FindLayer(token);
 			if (current) {
-				DTRACE(("ServerWindow %s: Message AS_SET_CURRENT_LAYER: %s, token %ld\n", fName, current->fName->String(), token));
+				DTRACE(("ServerWindow %s: Message AS_SET_CURRENT_LAYER: %s, token %ld\n", fTitle, current->Name(), token));
 			} else {
-				DTRACE(("ServerWindow %s: Message AS_SET_CURRENT_LAYER: layer not found, token %ld\n", fName, token));
+				DTRACE(("ServerWindow %s: Message AS_SET_CURRENT_LAYER: layer not found, token %ld\n", fTitle, token));
 			}
 
 			if (current)
@@ -437,7 +405,7 @@ ServerWindow::DispatchMessage(int32 code, BPrivate::LinkReceiver &link)
 
 		case AS_LAYER_CREATE_ROOT:
 		{
-			STRACE(("ServerWindow %s: Message AS_LAYER_CREATE_ROOT\n", fName));
+			STRACE(("ServerWindow %s: Message AS_LAYER_CREATE_ROOT\n", fTitle));
 
 			// Start receiving top_view data -- pass NULL as the parent view.
 			// This should be the *only* place where this happens.
@@ -455,14 +423,14 @@ ServerWindow::DispatchMessage(int32 code, BPrivate::LinkReceiver &link)
 
 		case AS_LAYER_CREATE:
 		{
-			STRACE(("ServerWindow %s: Message AS_LAYER_CREATE: Layer name: %s\n", fName, fCurrentLayer->fName->String()));
+			STRACE(("ServerWindow %s: Message AS_LAYER_CREATE: Layer name: %s\n", fTitle, fCurrentLayer->Name()));
 
 			Layer* parent = NULL;
 			Layer* newLayer = CreateLayerTree(link, &parent);
 			if (parent != NULL)
 				parent->AddChild(newLayer, this);
 
-printf("Adi: create %s\n", fName);
+printf("Adi: create %s\n", fTitle);
 			if (!newLayer->IsHidden())
 #ifndef NEW_CLIPPING
 				myRootLayer->GoInvalidate(newLayer, newLayer->fFull);
@@ -479,7 +447,7 @@ printf("Adi: create %s\n", fName);
 			// layer, detach the layer itself, delete it, and invalidate the
 			// area assuming that the view was visible when removed
 
-			STRACE(("ServerWindow %s: AS_LAYER_DELETE(self)...\n", fName));			
+			STRACE(("ServerWindow %s: AS_LAYER_DELETE(self)...\n", fTitle));			
 			Layer *parent;
 			parent = fCurrentLayer->fParent;
 
@@ -493,7 +461,7 @@ printf("Adi: create %s\n", fName);
 			#ifdef DEBUG_SERVERWINDOW
 			parent->PrintTree();
 			#endif
-			STRACE(("DONE: ServerWindow %s: Message AS_DELETE_LAYER: Parent: %s Layer: %s\n", fName, parent->fName->String(), fCurrentLayer->fName->String()));
+			STRACE(("DONE: ServerWindow %s: Message AS_DELETE_LAYER: Parent: %s Layer: %s\n", fTitle, parent->Name(), fCurrentLayer->Name()));
 
 			delete fCurrentLayer;
 
@@ -502,7 +470,7 @@ printf("Adi: create %s\n", fName);
 		}
 		case AS_LAYER_SET_STATE:
 		{
-			DTRACE(("ServerWindow %s: Message AS_LAYER_SET_STATE: Layer name: %s\n", fName, fCurrentLayer->fName->String()));
+			DTRACE(("ServerWindow %s: Message AS_LAYER_SET_STATE: Layer name: %s\n", fTitle, fCurrentLayer->Name()));
 //			SetLayerState(fCurrentLayer);
 			SetLayerState(fCurrentLayer, link);
 			// TODO: should this be moved into SetLayerState?
@@ -514,7 +482,7 @@ printf("Adi: create %s\n", fName);
 		}
 		case AS_LAYER_SET_FONT_STATE:
 		{
-			DTRACE(("ServerWindow %s: Message AS_LAYER_SET_FONT_STATE: Layer name: %s\n", fName, fCurrentLayer->fName->String()));
+			DTRACE(("ServerWindow %s: Message AS_LAYER_SET_FONT_STATE: Layer name: %s\n", fTitle, fCurrentLayer->Name()));
 //			SetLayerFontState(fCurrentLayer);
 			SetLayerFontState(fCurrentLayer, link);
 #ifndef NEW_CLIPPING
@@ -524,7 +492,7 @@ printf("Adi: create %s\n", fName);
 		}
 		case AS_LAYER_GET_STATE:
 		{
-			DTRACE(("ServerWindow %s: Message AS_LAYER_GET_STATE: Layer name: %s\n", fName, fCurrentLayer->fName->String()));
+			DTRACE(("ServerWindow %s: Message AS_LAYER_GET_STATE: Layer name: %s\n", fTitle, fCurrentLayer->Name()));
 
 			fMsgSender->StartMessage(SERVER_TRUE);
 
@@ -540,7 +508,7 @@ printf("Adi: create %s\n", fName);
 		}
 		case AS_LAYER_SET_MOUSE_EVENT_MASK:
 		{
-			STRACE(("ServerWindow %s: Message AS_LAYER_SET_MOUSE_EVENT_MASK: Layer name: %s\n", fName, fCurrentLayer->fName->String()));			
+			STRACE(("ServerWindow %s: Message AS_LAYER_SET_MOUSE_EVENT_MASK: Layer name: %s\n", fTitle, fCurrentLayer->Name()));			
 
 			uint32		mask;
 			uint32		options;
@@ -553,7 +521,7 @@ printf("Adi: create %s\n", fName);
 		}
 		case AS_LAYER_MOVETO:
 		{
-			STRACE(("ServerWindow %s: Message AS_LAYER_MOVETO: Layer name: %s\n", fName, fCurrentLayer->fName->String()));
+			STRACE(("ServerWindow %s: Message AS_LAYER_MOVETO: Layer name: %s\n", fTitle, fCurrentLayer->Name()));
 			float x, y;
 			
 			link.Read<float>(&x);
@@ -567,7 +535,7 @@ printf("Adi: create %s\n", fName);
 		}
 		case AS_LAYER_RESIZETO:
 		{
-			STRACE(("ServerWindow %s: Message AS_LAYER_RESIZETO: Layer name: %s\n", fName, fCurrentLayer->fName->String()));
+			STRACE(("ServerWindow %s: Message AS_LAYER_RESIZETO: Layer name: %s\n", fTitle, fCurrentLayer->Name()));
 			float newWidth, newHeight;
 			
 			link.Read<float>(&newWidth);
@@ -583,7 +551,7 @@ printf("Adi: create %s\n", fName);
 		}
 		case AS_LAYER_GET_COORD:
 		{
-			STRACE(("ServerWindow %s: Message AS_LAYER_GET_COORD: Layer: %s\n",fName, fCurrentLayer->fName->String()));
+			STRACE(("ServerWindow %s: Message AS_LAYER_GET_COORD: Layer: %s\n", Title(), fCurrentLayer->Name()));
 			fMsgSender->StartMessage(SERVER_TRUE);
 			// our offset in the parent -> will be originX and originY in BView
 			fMsgSender->Attach<float>(fCurrentLayer->fFrame.left);
@@ -595,7 +563,7 @@ printf("Adi: create %s\n", fName);
 		}
 		case AS_LAYER_SET_ORIGIN:
 		{
-			STRACE(("ServerWindow %s: Message AS_LAYER_SET_ORIGIN: Layer: %s\n",fName, fCurrentLayer->fName->String()));
+			STRACE(("ServerWindow %s: Message AS_LAYER_SET_ORIGIN: Layer: %s\n", Title(), fCurrentLayer->Name()));
 			float x, y;
 			
 			link.Read<float>(&x);
@@ -606,7 +574,7 @@ printf("Adi: create %s\n", fName);
 		}
 		case AS_LAYER_GET_ORIGIN:
 		{
-			STRACE(("ServerWindow %s: Message AS_LAYER_GET_ORIGIN: Layer: %s\n",fName, fCurrentLayer->fName->String()));
+			STRACE(("ServerWindow %s: Message AS_LAYER_GET_ORIGIN: Layer: %s\n", Title(), fCurrentLayer->Name()));
 			fMsgSender->StartMessage(SERVER_TRUE);
 			fMsgSender->Attach<BPoint>(fCurrentLayer->fLayerData->Origin());
 			fMsgSender->Flush();
@@ -614,13 +582,13 @@ printf("Adi: create %s\n", fName);
 		}
 		case AS_LAYER_RESIZE_MODE:
 		{
-			STRACE(("ServerWindow %s: Message AS_LAYER_RESIZE_MODE: Layer: %s\n",fName, fCurrentLayer->fName->String()));
+			STRACE(("ServerWindow %s: Message AS_LAYER_RESIZE_MODE: Layer: %s\n", Title(), fCurrentLayer->Name()));
 			link.Read<uint32>(&(fCurrentLayer->fResizeMode));
 			break;
 		}
 		case AS_LAYER_CURSOR:
 		{
-			DTRACE(("ServerWindow %s: Message AS_LAYER_CURSOR: Layer: %s - NOT IMPLEMENTED\n",fName, fCurrentLayer->fName->String()));
+			DTRACE(("ServerWindow %s: Message AS_LAYER_CURSOR: Layer: %s - NOT IMPLEMENTED\n", Title(), fCurrentLayer->Name()));
 			int32 token;
 
 			link.Read<int32>(&token);
@@ -634,24 +602,24 @@ printf("Adi: create %s\n", fName);
 		{
 			link.Read<uint32>(&(fCurrentLayer->fFlags));
 			
-			STRACE(("ServerWindow %s: Message AS_LAYER_SET_FLAGS: Layer: %s\n",fName, fCurrentLayer->fName->String()));
+			STRACE(("ServerWindow %s: Message AS_LAYER_SET_FLAGS: Layer: %s\n", Title(), fCurrentLayer->Name()));
 			break;
 		}
 		case AS_LAYER_HIDE:
 		{
-			STRACE(("ServerWindow %s: Message AS_LAYER_HIDE: Layer: %s\n",fName, fCurrentLayer->fName->String()));
+			STRACE(("ServerWindow %s: Message AS_LAYER_HIDE: Layer: %s\n", Title(), fCurrentLayer->Name()));
 			fCurrentLayer->Hide();
 			break;
 		}
 		case AS_LAYER_SHOW:
 		{
-			STRACE(("ServerWindow %s: Message AS_LAYER_SHOW: Layer: %s\n",fName, fCurrentLayer->fName->String()));
+			STRACE(("ServerWindow %s: Message AS_LAYER_SHOW: Layer: %s\n", Title(), fCurrentLayer->Name()));
 			fCurrentLayer->Show();
 			break;
 		}
 		case AS_LAYER_SET_LINE_MODE:
 		{
-			DTRACE(("ServerWindow %s: Message AS_LAYER_SET_LINE_MODE: Layer: %s\n",fName, fCurrentLayer->fName->String()));
+			DTRACE(("ServerWindow %s: Message AS_LAYER_SET_LINE_MODE: Layer: %s\n", Title(), fCurrentLayer->Name()));
 			int8 lineCap, lineJoin;
 			float miterLimit;
 
@@ -669,7 +637,7 @@ printf("Adi: create %s\n", fName);
 		}
 		case AS_LAYER_GET_LINE_MODE:
 		{
-			DTRACE(("ServerWindow %s: Message AS_LAYER_GET_LINE_MODE: Layer: %s\n",fName, fCurrentLayer->fName->String()));
+			DTRACE(("ServerWindow %s: Message AS_LAYER_GET_LINE_MODE: Layer: %s\n", Title(), fCurrentLayer->Name()));
 			fMsgSender->StartMessage(SERVER_TRUE);
 			fMsgSender->Attach<int8>((int8)(fCurrentLayer->fLayerData->LineCapMode()));
 			fMsgSender->Attach<int8>((int8)(fCurrentLayer->fLayerData->LineJoinMode()));
@@ -680,7 +648,7 @@ printf("Adi: create %s\n", fName);
 		}
 		case AS_LAYER_PUSH_STATE:
 		{
-			DTRACE(("ServerWindow %s: Message AS_LAYER_PUSH_STATE: Layer: %s\n",fName, fCurrentLayer->fName->String()));
+			DTRACE(("ServerWindow %s: Message AS_LAYER_PUSH_STATE: Layer: %s\n", Title(), fCurrentLayer->Name()));
 			
 			fCurrentLayer->PushState();
 #ifndef NEW_CLIPPING
@@ -690,7 +658,7 @@ printf("Adi: create %s\n", fName);
 		}
 		case AS_LAYER_POP_STATE:
 		{
-			DTRACE(("ServerWindow %s: Message AS_LAYER_POP_STATE: Layer: %s\n",fName, fCurrentLayer->fName->String()));
+			DTRACE(("ServerWindow %s: Message AS_LAYER_POP_STATE: Layer: %s\n", Title(), fCurrentLayer->Name()));
 			
 			fCurrentLayer->PopState();
 #ifndef NEW_CLIPPING
@@ -700,7 +668,7 @@ printf("Adi: create %s\n", fName);
 		}
 		case AS_LAYER_SET_SCALE:
 		{
-			DTRACE(("ServerWindow %s: Message AS_LAYER_SET_SCALE: Layer: %s\n",fName, fCurrentLayer->fName->String()));
+			DTRACE(("ServerWindow %s: Message AS_LAYER_SET_SCALE: Layer: %s\n", Title(), fCurrentLayer->Name()));
 			float scale;
 			link.Read<float>(&scale);
 			// TODO: The BeBook says, if you call SetScale() it will be
@@ -710,7 +678,7 @@ printf("Adi: create %s\n", fName);
 		}
 		case AS_LAYER_GET_SCALE:
 		{
-			DTRACE(("ServerWindow %s: Message AS_LAYER_GET_SCALE: Layer: %s\n",fName, fCurrentLayer->fName->String()));		
+			DTRACE(("ServerWindow %s: Message AS_LAYER_GET_SCALE: Layer: %s\n", Title(), fCurrentLayer->Name()));		
 			LayerData		*ld = fCurrentLayer->fLayerData;
 
 			// TODO: And here, we're taking that into account, but not above
@@ -730,7 +698,7 @@ printf("Adi: create %s\n", fName);
 		}
 		case AS_LAYER_SET_PEN_LOC:
 		{
-			DTRACE(("ServerWindow %s: Message AS_LAYER_SET_PEN_LOC: Layer: %s\n",fName, fCurrentLayer->fName->String()));
+			DTRACE(("ServerWindow %s: Message AS_LAYER_SET_PEN_LOC: Layer: %s\n", Title(), fCurrentLayer->Name()));
 			float		x, y;
 			
 			link.Read<float>(&x);
@@ -742,7 +710,7 @@ printf("Adi: create %s\n", fName);
 		}
 		case AS_LAYER_GET_PEN_LOC:
 		{
-			DTRACE(("ServerWindow %s: Message AS_LAYER_GET_PEN_LOC: Layer: %s\n",fName, fCurrentLayer->fName->String()));
+			DTRACE(("ServerWindow %s: Message AS_LAYER_GET_PEN_LOC: Layer: %s\n", Title(), fCurrentLayer->Name()));
 			fMsgSender->StartMessage(SERVER_TRUE);
 			fMsgSender->Attach<BPoint>(fCurrentLayer->fLayerData->PenLocation());
 			fMsgSender->Flush();
@@ -751,7 +719,7 @@ printf("Adi: create %s\n", fName);
 		}
 		case AS_LAYER_SET_PEN_SIZE:
 		{
-			DTRACE(("ServerWindow %s: Message AS_LAYER_SET_PEN_SIZE: Layer: %s\n",fName, fCurrentLayer->fName->String()));
+			DTRACE(("ServerWindow %s: Message AS_LAYER_SET_PEN_SIZE: Layer: %s\n", Title(), fCurrentLayer->Name()));
 			float penSize;
 			link.Read<float>(&penSize);
 			fCurrentLayer->fLayerData->SetPenSize(penSize);
@@ -760,7 +728,7 @@ printf("Adi: create %s\n", fName);
 		}
 		case AS_LAYER_GET_PEN_SIZE:
 		{
-			DTRACE(("ServerWindow %s: Message AS_LAYER_GET_PEN_SIZE: Layer: %s\n",fName, fCurrentLayer->fName->String()));
+			DTRACE(("ServerWindow %s: Message AS_LAYER_GET_PEN_SIZE: Layer: %s\n", Title(), fCurrentLayer->Name()));
 			fMsgSender->StartMessage(SERVER_TRUE);
 			fMsgSender->Attach<float>(fCurrentLayer->fLayerData->PenSize());
 			fMsgSender->Flush();
@@ -769,7 +737,7 @@ printf("Adi: create %s\n", fName);
 		}
 		case AS_LAYER_SET_VIEW_COLOR:
 		{
-			DTRACE(("ServerWindow %s: Message AS_LAYER_SET_VIEW_COLOR: Layer: %s\n",fName, fCurrentLayer->fName->String()));
+			DTRACE(("ServerWindow %s: Message AS_LAYER_SET_VIEW_COLOR: Layer: %s\n", Title(), fCurrentLayer->Name()));
 			rgb_color c;
 			
 			link.Read(&c, sizeof(rgb_color));
@@ -784,7 +752,7 @@ printf("Adi: create %s\n", fName);
 		}
 		case AS_LAYER_GET_COLORS:
 		{
-			DTRACE(("ServerWindow %s: Message AS_LAYER_GET_COLORS: Layer: %s\n",fName, fCurrentLayer->fName->String()));
+			DTRACE(("ServerWindow %s: Message AS_LAYER_GET_COLORS: Layer: %s\n", Title(), fCurrentLayer->Name()));
 			rgb_color highColor, lowColor, viewColor;
 			
 			highColor = fCurrentLayer->fLayerData->HighColor().GetColor32();
@@ -801,7 +769,7 @@ printf("Adi: create %s\n", fName);
 		}
 		case AS_LAYER_SET_BLEND_MODE:
 		{
-			DTRACE(("ServerWindow %s: Message AS_LAYER_SET_BLEND_MODE: Layer: %s\n",fName, fCurrentLayer->fName->String()));
+			DTRACE(("ServerWindow %s: Message AS_LAYER_SET_BLEND_MODE: Layer: %s\n", Title(), fCurrentLayer->Name()));
 			int8 srcAlpha, alphaFunc;
 			
 			link.Read<int8>(&srcAlpha);
@@ -814,7 +782,7 @@ printf("Adi: create %s\n", fName);
 		}
 		case AS_LAYER_GET_BLEND_MODE:
 		{
-			DTRACE(("ServerWindow %s: Message AS_LAYER_GET_BLEND_MODE: Layer: %s\n",fName, fCurrentLayer->fName->String()));
+			DTRACE(("ServerWindow %s: Message AS_LAYER_GET_BLEND_MODE: Layer: %s\n", Title(), fCurrentLayer->Name()));
 			fMsgSender->StartMessage(SERVER_TRUE);
 			fMsgSender->Attach<int8>((int8)(fCurrentLayer->fLayerData->AlphaSrcMode()));
 			fMsgSender->Attach<int8>((int8)(fCurrentLayer->fLayerData->AlphaFncMode()));
@@ -824,7 +792,7 @@ printf("Adi: create %s\n", fName);
 		}
 		case AS_LAYER_SET_DRAW_MODE:
 		{
-			DTRACE(("ServerWindow %s: Message AS_LAYER_SET_DRAW_MODE: Layer: %s\n",fName, fCurrentLayer->fName->String()));
+			DTRACE(("ServerWindow %s: Message AS_LAYER_SET_DRAW_MODE: Layer: %s\n", Title(), fCurrentLayer->Name()));
 			int8 drawingMode;
 			
 			link.Read<int8>(&drawingMode);
@@ -835,7 +803,7 @@ printf("Adi: create %s\n", fName);
 		}
 		case AS_LAYER_GET_DRAW_MODE:
 		{
-			DTRACE(("ServerWindow %s: Message AS_LAYER_GET_DRAW_MODE: Layer: %s\n",fName, fCurrentLayer->fName->String()));
+			DTRACE(("ServerWindow %s: Message AS_LAYER_GET_DRAW_MODE: Layer: %s\n", Title(), fCurrentLayer->Name()));
 			fMsgSender->StartMessage(SERVER_TRUE);
 			fMsgSender->Attach<int8>((int8)(fCurrentLayer->fLayerData->GetDrawingMode()));
 			fMsgSender->Flush();
@@ -844,7 +812,7 @@ printf("Adi: create %s\n", fName);
 		}
 		case AS_LAYER_PRINT_ALIASING:
 		{
-			DTRACE(("ServerWindow %s: Message AS_LAYER_PRINT_ALIASING: Layer: %s\n",fName, fCurrentLayer->fName->String()));
+			DTRACE(("ServerWindow %s: Message AS_LAYER_PRINT_ALIASING: Layer: %s\n", Title(), fCurrentLayer->Name()));
 			bool fontAliasing;
 			link.Read<bool>(&fontAliasing);
 			fCurrentLayer->fLayerData->SetFontAntiAliasing(!fontAliasing);
@@ -853,7 +821,7 @@ printf("Adi: create %s\n", fName);
 		}
 		case AS_LAYER_CLIP_TO_PICTURE:
 		{
-			DTRACE(("ServerWindow %s: Message AS_LAYER_CLIP_TO_PICTURE: Layer: %s\n",fName, fCurrentLayer->fName->String()));
+			DTRACE(("ServerWindow %s: Message AS_LAYER_CLIP_TO_PICTURE: Layer: %s\n", Title(), fCurrentLayer->Name()));
 		// TODO: you are not allowed to use Layer regions here!!!
 		// If there is no other way, then first lock RootLayer object first.
 			
@@ -895,7 +863,7 @@ printf("Adi: create %s\n", fName);
 		
 		case AS_LAYER_GET_CLIP_REGION:
 		{
-			DTRACE(("ServerWindow %s: Message AS_LAYER_GET_CLIP_REGION: Layer: %s\n",fName, fCurrentLayer->fName->String()));
+			DTRACE(("ServerWindow %s: Message AS_LAYER_GET_CLIP_REGION: Layer: %s\n", Title(), fCurrentLayer->Name()));
 			
 			// if this Layer is hidden, it is clear that its visible region is void.
 			if (fCurrentLayer->IsHidden())
@@ -938,7 +906,7 @@ printf("Adi: create %s\n", fName);
 		}
 		case AS_LAYER_SET_CLIP_REGION:
 		{
-			DTRACE(("ServerWindow %s: Message AS_LAYER_SET_CLIP_REGION: Layer: %s\n",fName, fCurrentLayer->fName->String()));
+			DTRACE(("ServerWindow %s: Message AS_LAYER_SET_CLIP_REGION: Layer: %s\n", Title(), fCurrentLayer->Name()));
 			
 			// TODO: Watch out for the coordinate system in AS_LAYER_SET_CLIP_REGION
 			int32 noOfRects;
@@ -968,7 +936,7 @@ printf("Adi: create %s\n", fName);
 		}
 		case AS_LAYER_INVAL_RECT:
 		{
-			DTRACE(("ServerWindow %s: Message AS_LAYER_INVAL_RECT: Layer: %s\n",fName, fCurrentLayer->fName->String()));
+			DTRACE(("ServerWindow %s: Message AS_LAYER_INVAL_RECT: Layer: %s\n", Title(), fCurrentLayer->Name()));
 			
 			// TODO: handle transformation (origin and scale) prior to converting to top
 			BRect		invalRect;
@@ -985,7 +953,7 @@ printf("Adi: create %s\n", fName);
 		}
 		case AS_LAYER_INVAL_REGION:
 		{
-			DTRACE(("ServerWindow %s: Message AS_LAYER_INVAL_RECT: Layer: %s\n",fName, fCurrentLayer->fName->String()));
+			DTRACE(("ServerWindow %s: Message AS_LAYER_INVAL_RECT: Layer: %s\n", Title(), fCurrentLayer->Name()));
 			
 			// TODO: handle transformation (origin and scale) prior to converting to top
 			// TODO: Handle conversion to top
@@ -1007,7 +975,7 @@ printf("Adi: create %s\n", fName);
 		}
 		case AS_BEGIN_UPDATE:
 		{
-			DTRACE(("ServerWindowo %s: AS_BEGIN_UPDATE\n",fName));
+			DTRACE(("ServerWindowo %s: AS_BEGIN_UPDATE\n", Title()));
 			fWinBorder->GetRootLayer()->Lock();
 			fWinBorder->UpdateStart();
 			fWinBorder->GetRootLayer()->Unlock();
@@ -1015,7 +983,7 @@ printf("Adi: create %s\n", fName);
 		}
 		case AS_END_UPDATE:
 		{
-			DTRACE(("ServerWindowo %s: AS_END_UPDATE\n",fName));
+			DTRACE(("ServerWindowo %s: AS_END_UPDATE\n", Title()));
 			fWinBorder->GetRootLayer()->Lock();
 			fWinBorder->UpdateEnd();
 			fWinBorder->GetRootLayer()->Unlock();
@@ -1030,54 +998,54 @@ printf("Adi: create %s\n", fName);
 			// Received when a window deletes its internal top view
 			
 			// TODO: Implement AS_LAYER_DELETE_ROOT
-			STRACE(("ServerWindow %s: Message Delete_Layer_Root unimplemented\n",fName));
+			STRACE(("ServerWindow %s: Message Delete_Layer_Root unimplemented\n", Title()));
 			break;
 		}
 		case AS_SHOW_WINDOW:
 		{
-			STRACE(("ServerWindow %s: Message AS_SHOW_WINDOW\n",fName));
+			STRACE(("ServerWindow %s: Message AS_SHOW_WINDOW\n", Title()));
 			Show();
 			break;
 		}
 		case AS_HIDE_WINDOW:
 		{
-			STRACE(("ServerWindow %s: Message AS_HIDE_WINDOW\n",fName));		
+			STRACE(("ServerWindow %s: Message AS_HIDE_WINDOW\n", Title()));		
 			Hide();
 			break;
 		}
 		case AS_SEND_BEHIND:
 		{
 			// TODO: Implement AS_SEND_BEHIND
-			STRACE(("ServerWindow %s: Message  Send_Behind unimplemented\n",fName));
+			STRACE(("ServerWindow %s: Message  Send_Behind unimplemented\n", Title()));
 			break;
 		}
 		case AS_ENABLE_UPDATES:
 		{
 			// TODO: Implement AS_ENABLE_UPDATES
-			STRACE(("ServerWindow %s: Message Enable_Updates unimplemented\n",fName));
+			STRACE(("ServerWindow %s: Message Enable_Updates unimplemented\n", Title()));
 			break;
 		}
 		case AS_DISABLE_UPDATES:
 		{
 			// TODO: Implement AS_DISABLE_UPDATES
-			STRACE(("ServerWindow %s: Message Disable_Updates unimplemented\n",fName));
+			STRACE(("ServerWindow %s: Message Disable_Updates unimplemented\n", Title()));
 			break;
 		}
 		case AS_NEEDS_UPDATE:
 		{
 			// TODO: Implement AS_NEEDS_UPDATE
-			STRACE(("ServerWindow %s: Message Needs_Update unimplemented\n",fName));
+			STRACE(("ServerWindow %s: Message Needs_Update unimplemented\n", Title()));
 			break;
 		}
 		case AS_WINDOW_TITLE:
 		{
 			// TODO: Implement AS_WINDOW_TITLE
-			STRACE(("ServerWindow %s: Message Set_Title unimplemented\n",fName));
+			STRACE(("ServerWindow %s: Message Set_Title unimplemented\n", Title()));
 			break;
 		}
 		case AS_ADD_TO_SUBSET:
 		{
-			STRACE(("ServerWindow %s: Message AS_ADD_TO_SUBSET\n",fName));
+			STRACE(("ServerWindow %s: Message AS_ADD_TO_SUBSET\n", Title()));
 			WinBorder *wb;
 			int32 mainToken;
 			team_id	teamID;
@@ -1104,7 +1072,7 @@ printf("Adi: create %s\n", fName);
 		}
 		case AS_REM_FROM_SUBSET:
 		{
-			STRACE(("ServerWindow %s: Message AS_REM_FROM_SUBSET\n",fName));
+			STRACE(("ServerWindow %s: Message AS_REM_FROM_SUBSET\n", Title()));
 			WinBorder *wb;
 			int32 mainToken;
 			team_id teamID;
@@ -1131,18 +1099,18 @@ printf("Adi: create %s\n", fName);
 		case AS_SET_LOOK:
 		{
 			// TODO: Implement AS_SET_LOOK
-			STRACE(("ServerWindow %s: Message Set_Look unimplemented\n",fName));
+			STRACE(("ServerWindow %s: Message Set_Look unimplemented\n", Title()));
 			break;
 		}
 		case AS_SET_FLAGS:
 		{
 			// TODO: Implement AS_SET_FLAGS
-			STRACE(("ServerWindow %s: Message Set_Flags unimplemented\n",fName));
+			STRACE(("ServerWindow %s: Message Set_Flags unimplemented\n", Title()));
 			break;
 		}
 		case AS_SET_FEEL:
 		{
-			STRACE(("ServerWindow %s: Message AS_SET_FEEL\n",fName));
+			STRACE(("ServerWindow %s: Message AS_SET_FEEL\n", Title()));
 			int32 newFeel;
 			link.Read<int32>(&newFeel);
 			myRootLayer->GoChangeWinBorderFeel(fWinBorder, newFeel);
@@ -1151,18 +1119,18 @@ printf("Adi: create %s\n", fName);
 		case AS_SET_ALIGNMENT:
 		{
 			// TODO: Implement AS_SET_ALIGNMENT
-			STRACE(("ServerWindow %s: Message Set_Alignment unimplemented\n",fName));
+			STRACE(("ServerWindow %s: Message Set_Alignment unimplemented\n", Title()));
 			break;
 		}
 		case AS_GET_ALIGNMENT:
 		{
 			// TODO: Implement AS_GET_ALIGNMENT
-			STRACE(("ServerWindow %s: Message Get_Alignment unimplemented\n",fName));
+			STRACE(("ServerWindow %s: Message Get_Alignment unimplemented\n", Title()));
 			break;
 		}
 		case AS_GET_WORKSPACES:
 		{
-			STRACE(("ServerWindow %s: Message Get_Workspaces unimplemented\n",fName));
+			STRACE(("ServerWindow %s: Message Get_Workspaces unimplemented\n", Title()));
 			fMsgSender->StartMessage(SERVER_TRUE);
 			fMsgSender->Attach<uint32>(fWinBorder->Workspaces());
 			fMsgSender->Flush();
@@ -1171,7 +1139,7 @@ printf("Adi: create %s\n", fName);
 		case AS_SET_WORKSPACES:
 		{
 			// TODO: Implement AS_SET_WORKSPACES
-			STRACE(("ServerWindow %s: Message Set_Workspaces unimplemented\n",fName));
+			STRACE(("ServerWindow %s: Message Set_Workspaces unimplemented\n", Title()));
 			uint32 newWorkspaces;
 			link.Read<uint32>(&newWorkspaces);
 
@@ -1191,7 +1159,7 @@ printf("Adi: create %s\n", fName);
 			link.Read<float>(&xResizeBy);
 			link.Read<float>(&yResizeBy);
 
-			STRACE(("ServerWindow %s: Message AS_WINDOW_RESIZE %.1f, %.1f\n",fName, xResizeBy, yResizeBy));
+			STRACE(("ServerWindow %s: Message AS_WINDOW_RESIZE %.1f, %.1f\n", Title(), xResizeBy, yResizeBy));
 			
 			fWinBorder->ResizeBy(xResizeBy, yResizeBy);
 			
@@ -1205,7 +1173,7 @@ printf("Adi: create %s\n", fName);
 			link.Read<float>(&xMoveBy);
 			link.Read<float>(&yMoveBy);
 
-			STRACE(("ServerWindow %s: Message AS_WINDOW_MOVE: %.1f, %.1f\n",fName, xMoveBy, yMoveBy));
+			STRACE(("ServerWindow %s: Message AS_WINDOW_MOVE: %.1f, %.1f\n", Title(), xMoveBy, yMoveBy));
 
 			fWinBorder->MoveBy(xMoveBy, yMoveBy);
 
@@ -1247,25 +1215,25 @@ printf("Adi: create %s\n", fName);
 		case B_MINIMIZE:
 		{
 			// TODO: Implement B_MINIMIZE
-			STRACE(("ServerWindow %s: Message Minimize unimplemented\n",fName));
+			STRACE(("ServerWindow %s: Message Minimize unimplemented\n", Title()));
 			break;
 		}
 		case B_WINDOW_ACTIVATED:
 		{
 			// TODO: Implement B_WINDOW_ACTIVATED
-			STRACE(("ServerWindow %s: Message Window_Activated unimplemented\n",fName));
+			STRACE(("ServerWindow %s: Message Window_Activated unimplemented\n", Title()));
 			break;
 		}
 		case B_ZOOM:
 		{
 			// TODO: Implement B_ZOOM
-			STRACE(("ServerWindow %s: Message Zoom unimplemented\n",fName));
+			STRACE(("ServerWindow %s: Message Zoom unimplemented\n", Title()));
 			break;
 		}
 		// Some BView drawing messages, but which don't need clipping
 		case AS_LAYER_SET_HIGH_COLOR:
 		{
-			DTRACE(("ServerWindow %s: Message AS_LAYER_SET_HIGH_COLOR: Layer: %s\n",fName, fCurrentLayer->fName->String()));
+			DTRACE(("ServerWindow %s: Message AS_LAYER_SET_HIGH_COLOR: Layer: %s\n", Title(), fCurrentLayer->Name()));
 			rgb_color c;
 			
 			link.Read(&c, sizeof(rgb_color));
@@ -1276,7 +1244,7 @@ printf("Adi: create %s\n", fName);
 		}
 		case AS_LAYER_SET_LOW_COLOR:
 		{
-			DTRACE(("ServerWindow %s: Message AS_LAYER_SET_LOW_COLOR: Layer: %s\n",fName, fCurrentLayer->fName->String()));
+			DTRACE(("ServerWindow %s: Message AS_LAYER_SET_LOW_COLOR: Layer: %s\n", Title(), fCurrentLayer->Name()));
 			rgb_color c;
 			
 			link.Read(&c, sizeof(rgb_color));
@@ -1287,7 +1255,7 @@ printf("Adi: create %s\n", fName);
 		}
 		case AS_LAYER_SET_PATTERN:
 		{
-			DTRACE(("ServerWindow %s: Message AS_LAYER_SET_PATTERN: Layer: %s\n", fName, fCurrentLayer->fName->String()));
+			DTRACE(("ServerWindow %s: Message AS_LAYER_SET_PATTERN: Layer: %s\n", fTitle, fCurrentLayer->Name()));
 			pattern pat;
 			
 			link.Read(&pat, sizeof(pattern));
@@ -1298,7 +1266,7 @@ printf("Adi: create %s\n", fName);
 		}	
 		case AS_MOVEPENTO:
 		{
-			DTRACE(("ServerWindow %s: Message AS_MOVEPENTO\n",fName));
+			DTRACE(("ServerWindow %s: Message AS_MOVEPENTO\n", Title()));
 			
 			float x,y;
 			
@@ -1311,7 +1279,7 @@ printf("Adi: create %s\n", fName);
 		}
 		case AS_SETPENSIZE:
 		{
-			DTRACE(("ServerWindow %s: Message AS_SETPENSIZE\n",fName));
+			DTRACE(("ServerWindow %s: Message AS_SETPENSIZE\n", Title()));
 			float size;
 			
 			link.Read<float>(&size);
@@ -1322,20 +1290,20 @@ printf("Adi: create %s\n", fName);
 		}
 		case AS_SET_FONT:
 		{
-			DTRACE(("ServerWindow %s: Message AS_SET_FONT\n",fName));
+			DTRACE(("ServerWindow %s: Message AS_SET_FONT\n", Title()));
 			// TODO: Implement AS_SET_FONT?
 			// Confusing!! But it works already!
 			break;
 		}
 		case AS_SET_FONT_SIZE:
 		{
-			DTRACE(("ServerWindow %s: Message AS_SET_FONT_SIZE\n",fName));
+			DTRACE(("ServerWindow %s: Message AS_SET_FONT_SIZE\n", Title()));
 			// TODO: Implement AS_SET_FONT_SIZE?
 			break;
 		}
 		case AS_AREA_MESSAGE:
 		{
-			STRACE(("ServerWindow %s: Message AS_AREA_MESSAGE\n",fName));
+			STRACE(("ServerWindow %s: Message AS_AREA_MESSAGE\n", Title()));
 			// This occurs in only one kind of case: a message is too big to send over a port. This
 			// is really an edge case, so this shouldn't happen *too* often
 			
@@ -1380,20 +1348,20 @@ printf("Adi: create %s\n", fName);
 		case AS_LAYER_DRAG_IMAGE:
 		{
 			// TODO: Implement AS_LAYER_DRAG_IMAGE
-			STRACE(("ServerWindow %s: Message AS_DRAG_IMAGE unimplemented\n",fName));
-			DTRACE(("ServerWindow %s: Message AS_DRAG_IMAGE unimplemented\n",fName));
+			STRACE(("ServerWindow %s: Message AS_DRAG_IMAGE unimplemented\n", Title()));
+			DTRACE(("ServerWindow %s: Message AS_DRAG_IMAGE unimplemented\n", Title()));
 			break;
 		}
 		case AS_LAYER_DRAG_RECT:
 		{
 			// TODO: Implement AS_LAYER_DRAG_RECT
-			STRACE(("ServerWindow %s: Message AS_DRAG_RECT unimplemented\n",fName));
-			DTRACE(("ServerWindow %s: Message AS_DRAG_RECT unimplemented\n",fName));
+			STRACE(("ServerWindow %s: Message AS_DRAG_RECT unimplemented\n", Title()));
+			DTRACE(("ServerWindow %s: Message AS_DRAG_RECT unimplemented\n", Title()));
 			break;
 		}
 		case AS_LAYER_GET_MOUSE_COORDS:
 		{
-			DTRACE(("ServerWindow %s: Message AS_GET_MOUSE_COORDS\n", fName));
+			DTRACE(("ServerWindow %s: Message AS_GET_MOUSE_COORDS\n", fTitle));
 
 			fMsgSender->StartMessage(SERVER_TRUE);
 
@@ -1437,7 +1405,7 @@ ServerWindow::DispatchGraphicsMessage(int32 code, BPrivate::LinkReceiver &link)
 	switch (code) {
 		case AS_STROKE_LINE:
 		{
-			DTRACE(("ServerWindow %s: Message AS_STROKE_LINE\n",fName));
+			DTRACE(("ServerWindow %s: Message AS_STROKE_LINE\n", Title()));
 
 			float x1, y1, x2, y2;
 
@@ -1465,7 +1433,7 @@ ServerWindow::DispatchGraphicsMessage(int32 code, BPrivate::LinkReceiver &link)
 		}
 		case AS_LAYER_INVERT_RECT:
 		{
-			DTRACE(("ServerWindow %s: Message AS_INVERT_RECT\n",fName));
+			DTRACE(("ServerWindow %s: Message AS_INVERT_RECT\n", Title()));
 			
 			BRect rect;
 			link.Read<BRect>(&rect);
@@ -1476,7 +1444,7 @@ ServerWindow::DispatchGraphicsMessage(int32 code, BPrivate::LinkReceiver &link)
 		}
 		case AS_STROKE_RECT:
 		{
-			DTRACE(("ServerWindow %s: Message AS_STROKE_RECT\n",fName));
+			DTRACE(("ServerWindow %s: Message AS_STROKE_RECT\n", Title()));
 			
 			float left, top, right, bottom;
 			link.Read<float>(&left);
@@ -1486,22 +1454,22 @@ ServerWindow::DispatchGraphicsMessage(int32 code, BPrivate::LinkReceiver &link)
 			BRect rect(left,top,right,bottom);
 			
 			if (fCurrentLayer && fCurrentLayer->fLayerData)
-				gDesktop->GetDisplayDriver()->StrokeRect(fCurrentLayer->ConvertToTop(rect),fCurrentLayer->fLayerData);
+				gDesktop->GetDisplayDriver()->StrokeRect(fCurrentLayer->ConvertToTop(rect), fCurrentLayer->fLayerData);
 			break;
 		}
 		case AS_FILL_RECT:
 		{
-			DTRACE(("ServerWindow %s: Message AS_FILL_RECT\n",fName));
+			DTRACE(("ServerWindow %s: Message AS_FILL_RECT\n", Title()));
 			
 			BRect rect;
 			link.Read<BRect>(&rect);
 			if (fCurrentLayer && fCurrentLayer->fLayerData)
-				gDesktop->GetDisplayDriver()->FillRect(fCurrentLayer->ConvertToTop(rect),fCurrentLayer->fLayerData);
+				gDesktop->GetDisplayDriver()->FillRect(fCurrentLayer->ConvertToTop(rect), fCurrentLayer->fLayerData);
 			break;
 		}
 		case AS_LAYER_DRAW_BITMAP_SYNC_AT_POINT:
 		{
-			DTRACE(("ServerWindow %s: Message AS_LAYER_DRAW_BITMAP_SYNC_AT_POINT: Layer name: %s\n", fName, fCurrentLayer->fName->String()));
+			DTRACE(("ServerWindow %s: Message AS_LAYER_DRAW_BITMAP_SYNC_AT_POINT: Layer name: %s\n", fTitle, fCurrentLayer->Name()));
 			int32		bitmapToken;
 			BPoint 		point;
 			
@@ -1522,7 +1490,7 @@ ServerWindow::DispatchGraphicsMessage(int32 code, BPrivate::LinkReceiver &link)
 		}
 		case AS_LAYER_DRAW_BITMAP_ASYNC_AT_POINT:
 		{
-			DTRACE(("ServerWindow %s: Message AS_LAYER_DRAW_BITMAP_ASYNC_AT_POINT: Layer name: %s\n", fName, fCurrentLayer->fName->String()));
+			DTRACE(("ServerWindow %s: Message AS_LAYER_DRAW_BITMAP_ASYNC_AT_POINT: Layer name: %s\n", fTitle, fCurrentLayer->Name()));
 			int32		bitmapToken;
 			BPoint 		point;
 			
@@ -1541,7 +1509,7 @@ ServerWindow::DispatchGraphicsMessage(int32 code, BPrivate::LinkReceiver &link)
 		}
 		case AS_LAYER_DRAW_BITMAP_SYNC_IN_RECT:
 		{
-			DTRACE(("ServerWindow %s: Message AS_LAYER_DRAW_BITMAP_SYNC_IN_RECT: Layer name: %s\n", fName, fCurrentLayer->fName->String()));
+			DTRACE(("ServerWindow %s: Message AS_LAYER_DRAW_BITMAP_SYNC_IN_RECT: Layer name: %s\n", fTitle, fCurrentLayer->Name()));
 			int32 bitmapToken;
 			BRect srcRect, dstRect;
 			
@@ -1561,7 +1529,7 @@ ServerWindow::DispatchGraphicsMessage(int32 code, BPrivate::LinkReceiver &link)
 		}
 		case AS_LAYER_DRAW_BITMAP_ASYNC_IN_RECT:
 		{
-			DTRACE(("ServerWindow %s: Message AS_LAYER_DRAW_BITMAP_ASYNC_IN_RECT: Layer name: %s\n", fName, fCurrentLayer->fName->String()));
+			DTRACE(("ServerWindow %s: Message AS_LAYER_DRAW_BITMAP_ASYNC_IN_RECT: Layer name: %s\n", fTitle, fCurrentLayer->Name()));
 			int32 bitmapToken;
 			BRect srcRect, dstRect;
 			
@@ -1579,7 +1547,7 @@ ServerWindow::DispatchGraphicsMessage(int32 code, BPrivate::LinkReceiver &link)
 		}
 		case AS_STROKE_ARC:
 		{
-			DTRACE(("ServerWindow %s: Message AS_STROKE_ARC\n",fName));
+			DTRACE(("ServerWindow %s: Message AS_STROKE_ARC\n", Title()));
 			
 			float angle, span;
 			BRect r;
@@ -1588,12 +1556,12 @@ ServerWindow::DispatchGraphicsMessage(int32 code, BPrivate::LinkReceiver &link)
 			link.Read<float>(&angle);
 			link.Read<float>(&span);
 			if (fCurrentLayer && fCurrentLayer->fLayerData)
-				gDesktop->GetDisplayDriver()->StrokeArc(fCurrentLayer->ConvertToTop(r),angle,span,fCurrentLayer->fLayerData);
+				gDesktop->GetDisplayDriver()->StrokeArc(fCurrentLayer->ConvertToTop(r),angle,span, fCurrentLayer->fLayerData);
 			break;
 		}
 		case AS_FILL_ARC:
 		{
-			DTRACE(("ServerWindow %s: Message AS_FILL_ARC\n",fName));
+			DTRACE(("ServerWindow %s: Message AS_FILL_ARC\n", Title()));
 			
 			float angle, span;
 			BRect r;
@@ -1602,12 +1570,12 @@ ServerWindow::DispatchGraphicsMessage(int32 code, BPrivate::LinkReceiver &link)
 			link.Read<float>(&angle);
 			link.Read<float>(&span);
 			if (fCurrentLayer && fCurrentLayer->fLayerData)
-				gDesktop->GetDisplayDriver()->FillArc(fCurrentLayer->ConvertToTop(r),angle,span,fCurrentLayer->fLayerData);
+				gDesktop->GetDisplayDriver()->FillArc(fCurrentLayer->ConvertToTop(r),angle,span, fCurrentLayer->fLayerData);
 			break;
 		}
 		case AS_STROKE_BEZIER:
 		{
-			DTRACE(("ServerWindow %s: Message AS_STROKE_BEZIER\n",fName));
+			DTRACE(("ServerWindow %s: Message AS_STROKE_BEZIER\n", Title()));
 			
 			BPoint *pts;
 			int i;
@@ -1621,14 +1589,14 @@ ServerWindow::DispatchGraphicsMessage(int32 code, BPrivate::LinkReceiver &link)
 				for (i=0; i<4; i++)
 					pts[i]=fCurrentLayer->ConvertToTop(pts[i]);
 				
-				gDesktop->GetDisplayDriver()->StrokeBezier(pts,fCurrentLayer->fLayerData);
+				gDesktop->GetDisplayDriver()->StrokeBezier(pts, fCurrentLayer->fLayerData);
 			}
 			delete [] pts;
 			break;
 		}
 		case AS_FILL_BEZIER:
 		{
-			DTRACE(("ServerWindow %s: Message AS_FILL_BEZIER\n",fName));
+			DTRACE(("ServerWindow %s: Message AS_FILL_BEZIER\n", Title()));
 			
 			BPoint *pts;
 			int i;
@@ -1642,34 +1610,34 @@ ServerWindow::DispatchGraphicsMessage(int32 code, BPrivate::LinkReceiver &link)
 				for (i=0; i<4; i++)
 					pts[i]=fCurrentLayer->ConvertToTop(pts[i]);
 				
-				gDesktop->GetDisplayDriver()->FillBezier(pts,fCurrentLayer->fLayerData);
+				gDesktop->GetDisplayDriver()->FillBezier(pts, fCurrentLayer->fLayerData);
 			}
 			delete [] pts;
 			break;
 		}
 		case AS_STROKE_ELLIPSE:
 		{
-			DTRACE(("ServerWindow %s: Message AS_STROKE_ELLIPSE\n",fName));
+			DTRACE(("ServerWindow %s: Message AS_STROKE_ELLIPSE\n", Title()));
 			
 			BRect rect;
 			link.Read<BRect>(&rect);
 			if (fCurrentLayer && fCurrentLayer->fLayerData)
-				gDesktop->GetDisplayDriver()->StrokeEllipse(fCurrentLayer->ConvertToTop(rect),fCurrentLayer->fLayerData);
+				gDesktop->GetDisplayDriver()->StrokeEllipse(fCurrentLayer->ConvertToTop(rect), fCurrentLayer->fLayerData);
 			break;
 		}
 		case AS_FILL_ELLIPSE:
 		{
-			DTRACE(("ServerWindow %s: Message AS_FILL_ELLIPSE\n",fName));
+			DTRACE(("ServerWindow %s: Message AS_FILL_ELLIPSE\n", Title()));
 			
 			BRect rect;
 			link.Read<BRect>(&rect);
 			if (fCurrentLayer && fCurrentLayer->fLayerData)
-				gDesktop->GetDisplayDriver()->FillEllipse(fCurrentLayer->ConvertToTop(rect),fCurrentLayer->fLayerData);
+				gDesktop->GetDisplayDriver()->FillEllipse(fCurrentLayer->ConvertToTop(rect), fCurrentLayer->fLayerData);
 			break;
 		}
 		case AS_STROKE_ROUNDRECT:
 		{
-			DTRACE(("ServerWindow %s: Message AS_STROKE_ROUNDRECT\n",fName));
+			DTRACE(("ServerWindow %s: Message AS_STROKE_ROUNDRECT\n", Title()));
 			
 			BRect rect;
 			float xrad,yrad;
@@ -1678,12 +1646,12 @@ ServerWindow::DispatchGraphicsMessage(int32 code, BPrivate::LinkReceiver &link)
 			link.Read<float>(&yrad);
 			
 			if (fCurrentLayer && fCurrentLayer->fLayerData)
-				gDesktop->GetDisplayDriver()->StrokeRoundRect(fCurrentLayer->ConvertToTop(rect),xrad,yrad,fCurrentLayer->fLayerData);
+				gDesktop->GetDisplayDriver()->StrokeRoundRect(fCurrentLayer->ConvertToTop(rect),xrad,yrad, fCurrentLayer->fLayerData);
 			break;
 		}
 		case AS_FILL_ROUNDRECT:
 		{
-			DTRACE(("ServerWindow %s: Message AS_FILL_ROUNDRECT\n",fName));
+			DTRACE(("ServerWindow %s: Message AS_FILL_ROUNDRECT\n", Title()));
 			
 			BRect rect;
 			float xrad,yrad;
@@ -1692,12 +1660,12 @@ ServerWindow::DispatchGraphicsMessage(int32 code, BPrivate::LinkReceiver &link)
 			link.Read<float>(&yrad);
 			
 			if (fCurrentLayer && fCurrentLayer->fLayerData)
-				gDesktop->GetDisplayDriver()->FillRoundRect(fCurrentLayer->ConvertToTop(rect),xrad,yrad,fCurrentLayer->fLayerData);
+				gDesktop->GetDisplayDriver()->FillRoundRect(fCurrentLayer->ConvertToTop(rect),xrad,yrad, fCurrentLayer->fLayerData);
 			break;
 		}
 		case AS_STROKE_TRIANGLE:
 		{
-			DTRACE(("ServerWindow %s: Message AS_STROKE_TRIANGLE\n",fName));
+			DTRACE(("ServerWindow %s: Message AS_STROKE_TRIANGLE\n", Title()));
 			
 			BPoint pts[3];
 			BRect rect;
@@ -1712,13 +1680,13 @@ ServerWindow::DispatchGraphicsMessage(int32 code, BPrivate::LinkReceiver &link)
 				for(int i=0;i<3;i++)
 					pts[i]=fCurrentLayer->ConvertToTop(pts[i]);
 				
-				gDesktop->GetDisplayDriver()->StrokeTriangle(pts,fCurrentLayer->ConvertToTop(rect),fCurrentLayer->fLayerData);
+				gDesktop->GetDisplayDriver()->StrokeTriangle(pts, fCurrentLayer->ConvertToTop(rect), fCurrentLayer->fLayerData);
 			}
 			break;
 		}
 		case AS_FILL_TRIANGLE:
 		{
-			DTRACE(("ServerWindow %s: Message AS_FILL_TRIANGLE\n",fName));
+			DTRACE(("ServerWindow %s: Message AS_FILL_TRIANGLE\n", Title()));
 			
 			BPoint pts[3];
 			BRect rect;
@@ -1733,14 +1701,14 @@ ServerWindow::DispatchGraphicsMessage(int32 code, BPrivate::LinkReceiver &link)
 				for(int i=0;i<3;i++)
 					pts[i]=fCurrentLayer->ConvertToTop(pts[i]);
 				
-				gDesktop->GetDisplayDriver()->FillTriangle(pts,fCurrentLayer->ConvertToTop(rect),fCurrentLayer->fLayerData);
+				gDesktop->GetDisplayDriver()->FillTriangle(pts, fCurrentLayer->ConvertToTop(rect), fCurrentLayer->fLayerData);
 			}
 			break;
 		}
 // TODO: get rid of all this code duplication!!
 		case AS_STROKE_POLYGON:
 		{
-			DTRACE(("ServerWindow %s: Message AS_STROKE_POLYGON\n",fName));
+			DTRACE(("ServerWindow %s: Message AS_STROKE_POLYGON\n", Title()));
 			
 			BRect polyframe;
 			bool isclosed;
@@ -1760,14 +1728,13 @@ ServerWindow::DispatchGraphicsMessage(int32 code, BPrivate::LinkReceiver &link)
 			
 			gDesktop->GetDisplayDriver()->StrokePolygon(pointlist,pointcount,polyframe,
 					fCurrentLayer->fLayerData,isclosed);
-			
+
 			delete [] pointlist;
-			
 			break;
 		}
 		case AS_FILL_POLYGON:
 		{
-			DTRACE(("ServerWindow %s: Message AS_FILL_POLYGON\n",fName));
+			DTRACE(("ServerWindow %s: Message AS_FILL_POLYGON\n", Title()));
 			
 			BRect polyframe;
 			int32 pointcount;
@@ -1783,7 +1750,7 @@ ServerWindow::DispatchGraphicsMessage(int32 code, BPrivate::LinkReceiver &link)
 			for(int32 i=0; i<pointcount; i++)
 				pointlist[i]=fCurrentLayer->ConvertToTop(pointlist[i]);
 			
-			gDesktop->GetDisplayDriver()->FillPolygon(pointlist,pointcount,polyframe,fCurrentLayer->fLayerData);
+			gDesktop->GetDisplayDriver()->FillPolygon(pointlist,pointcount,polyframe, fCurrentLayer->fLayerData);
 			
 			delete [] pointlist;
 			
@@ -1791,7 +1758,7 @@ ServerWindow::DispatchGraphicsMessage(int32 code, BPrivate::LinkReceiver &link)
 		}
 		case AS_STROKE_SHAPE:
 		{
-			DTRACE(("ServerWindow %s: Message AS_STROKE_SHAPE\n",fName));
+			DTRACE(("ServerWindow %s: Message AS_STROKE_SHAPE\n", Title()));
 			
 			BRect shaperect;
 			int32 opcount;
@@ -1820,7 +1787,7 @@ ServerWindow::DispatchGraphicsMessage(int32 code, BPrivate::LinkReceiver &link)
 		}
 		case AS_FILL_SHAPE:
 		{
-			DTRACE(("ServerWindow %s: Message AS_FILL_SHAPE\n",fName));
+			DTRACE(("ServerWindow %s: Message AS_FILL_SHAPE\n", Title()));
 			
 			BRect shaperect;
 			int32 opcount;
@@ -1850,33 +1817,34 @@ ServerWindow::DispatchGraphicsMessage(int32 code, BPrivate::LinkReceiver &link)
 		}
 		case AS_FILL_REGION:
 		{
-			DTRACE(("ServerWindow %s: Message AS_FILL_REGION\n",fName));
-			
-			int32 rectcount;
-			BRect *rectlist;
-			
-			link.Read<int32>(&rectcount);
-			
-			rectlist=new BRect[rectcount];
-			
-			link.Read(rectlist, sizeof(BRect)*rectcount);
+			DTRACE(("ServerWindow %s: Message AS_FILL_REGION\n", Title()));
 			
+			int32 count;
+			link.Read<int32>(&count);
+
+			BRect *rects = new BRect[count];
+			if (link.Read(rects, sizeof(BRect) * count) != B_OK) {
+				delete[] rects;
+				break;
+			}
+
 			// Between the client-side conversion to BRects from clipping_rects to the overhead
 			// in repeatedly calling FillRect(), this is definitely in need of optimization. At
 			// least it works for now. :)
-			for(int32 i=0; i<rectcount; i++)
-				gDesktop->GetDisplayDriver()->FillRect(fCurrentLayer->ConvertToTop(rectlist[i]),fCurrentLayer->fLayerData);
-			
-			delete [] rectlist;
-			
+			for (int32 i = 0; i < count; i++) {
+				gDesktop->GetDisplayDriver()->FillRect(fCurrentLayer->ConvertToTop(rects[i]), 
+					fCurrentLayer->fLayerData);
+			}
+
+			delete[] rects;
+
 			// TODO: create support for clipping_rect usage for faster BRegion display.
 			// Tweaks to DisplayDriver are necessary along with conversion routines in Layer
-			
 			break;
 		}
 		case AS_STROKE_LINEARRAY:
 		{
-			DTRACE(("ServerWindow %s: Message AS_STROKE_LINEARRAY\n",fName));
+			DTRACE(("ServerWindow %s: Message AS_STROKE_LINEARRAY\n", Title()));
 			
 			// Attached Data:
 			// 1) int32 Number of lines in the array
@@ -1908,7 +1876,7 @@ ServerWindow::DispatchGraphicsMessage(int32 code, BPrivate::LinkReceiver &link)
 		}
 		case AS_DRAW_STRING:
 		{
-			DTRACE(("ServerWindow %s: Message AS_DRAW_STRING\n",fName));
+			DTRACE(("ServerWindow %s: Message AS_DRAW_STRING\n", Title()));
 			char *string;
 			int32 length;
 			BPoint location;
@@ -1929,7 +1897,7 @@ ServerWindow::DispatchGraphicsMessage(int32 code, BPrivate::LinkReceiver &link)
 		}
 		default:
 		{
-			printf("ServerWindow %s received unexpected code - message offset %ld\n",fName, code - SERVER_TRUE);
+			printf("ServerWindow %s received unexpected code - message offset %ld\n", Title(), code - SERVER_TRUE);
 			break;
 		}
 	}
@@ -1956,8 +1924,9 @@ ServerWindow::MonitorWin(void *data)
 	status_t err = B_OK;
 
 	while (!quitting) {
-//		printf("info: ServerWindow::MonitorWin listening on port %ld.\n", win->fMessagePort);
-		code = AS_CLIENT_DEAD;
+		STRACE(("info: ServerWindow::MonitorWin listening on port %ld.\n",
+			win->fMessagePort));
+
 		err = ses->GetNextMessage(code);
 		if (err < B_OK)
 			return err;
@@ -1966,10 +1935,10 @@ ServerWindow::MonitorWin(void *data)
 
 		switch (code) {
 			case AS_DELETE_WINDOW:
-			case AS_CLIENT_DEAD:
 			{
 				// this means the client has been killed
-				STRACE(("ServerWindow %s received 'AS_CLIENT_DEAD/AS_DELETE_WINDOW' message code\n",win->Title()));
+				STRACE(("ServerWindow %s received 'AS_DELETE_WINDOW' message code\n",
+					win->Title()));
 
 				//RootLayer *rootLayer = fWinBorder->GetRootLayer();
 
@@ -1988,15 +1957,16 @@ ServerWindow::MonitorWin(void *data)
 				if (!win->fWinBorder->IsHidden())
 					CRITICAL("ServerWindow: a window must be hidden before it's deleted\n");
 
+				win->App()->RemoveWindow(win);
 				delete win;
-				//	rootLayer->Unlock();
-				
+
+				//rootLayer->Unlock();
 				exit_thread(0);
 				break;
 			}
 			case B_QUIT_REQUESTED:
 			{
-				STRACE(("ServerWindow %s received Quit request\n",win->Title()));
+				STRACE(("ServerWindow %s received Quit request\n", win->Title()));
 				win->Quit();
 				break;
 			}
@@ -2078,7 +2048,7 @@ ServerWindow::SendMessageToClient(const BMessage* msg, int32 target, bool usePre
 		if (ret < B_OK)
 			fprintf(stderr, "ServerWindow::SendMessageToClient(): %s\n", strerror(ret));
 	} else
-		printf("PANIC: ServerWindow %s: can't flatten message in 'SendMessageToClient()'\n", fName);
+		printf("PANIC: ServerWindow %s: can't flatten message in 'SendMessageToClient()'\n", fTitle);
 
 	delete[] buffer;
 }
diff --git a/src/servers/app/ServerWindow.h b/src/servers/app/ServerWindow.h
index 4bbf499b40..990123d1ff 100644
--- a/src/servers/app/ServerWindow.h
+++ b/src/servers/app/ServerWindow.h
@@ -51,7 +51,7 @@ class ServerPicture;
 	coordinating and linking a window's WinBorder half with its messaging half, dispatching 
 	mouse and key events from the server to its window, and other such things.
 */
-class ServerWindow {
+class ServerWindow : public BLocker {
 public:
 								ServerWindow(	const char *string,
 												ServerApp *winapp,
@@ -68,10 +68,6 @@ public:
 			void				Show(void);
 			void				Hide(void);
 
-			status_t			Lock(void);
-			void				Unlock(void);
-			bool				IsLocked(void) const;
-
 			// methods for sending various messages to client.
 			void				Quit(void);
 			void				Minimize(bool status);
@@ -90,7 +86,7 @@ public:
 			// to who we belong. who do we own. our title.
 	inline	ServerApp*			App() const { return fServerApp; }
 	inline	const WinBorder*	GetWinBorder() const { return fWinBorder; }
-	inline	const char*			Title() const { return fName; }
+	inline	const char*			Title() const { return fTitle; }
 
 			// related thread/team_id(s).
 	inline	team_id				ClientTeam() const { return fClientTeam; }
@@ -127,7 +123,9 @@ private:
 												BRegion &,
 												bool inverse,
 												BPoint where);
-			char				fName[50];
+
+private:
+			const char*			fTitle;
 
 			ServerApp*			fServerApp;
 			WinBorder*			fWinBorder;
@@ -144,8 +142,6 @@ private:
 
 			BMessage			fClientViewsWithInvalidCoords;
 
-			BLocker				fLocker;
-
 			int32				fHandlerToken;
 
 			Layer*				fCurrentLayer;
diff --git a/src/servers/app/SubWindowList.cpp b/src/servers/app/SubWindowList.cpp
index 89d114c1f2..e27fe3877d 100644
--- a/src/servers/app/SubWindowList.cpp
+++ b/src/servers/app/SubWindowList.cpp
@@ -89,7 +89,7 @@ SubWindowList::PrintToStream() const
 	for (int32 i=0; i<CountItems(); i++) {
 		wb = (WinBorder*)ItemAt(i);
 
-		printf("\t%s", wb->GetName());
+		printf("\t%s", wb->Name());
 
 		if (wb->Feel() == B_FLOATING_SUBSET_WINDOW_FEEL)
 			printf("\t%s\n", "B_FLOATING_SUBSET_WINDOW_FEEL");
diff --git a/src/servers/app/Workspace.cpp b/src/servers/app/Workspace.cpp
index 0bc3c16a07..114cbca926 100644
--- a/src/servers/app/Workspace.cpp
+++ b/src/servers/app/Workspace.cpp
@@ -151,7 +151,7 @@ STRACE(("~Workspace(%ld) - say bye bye\n", fID));
 */
 void Workspace::AddWinBorder(WinBorder *winBorder)
 {
-STRACE(("W(%ld)::AddWinBorder(%s)\n", fID, winBorder?winBorder->GetName():"NULL"));
+STRACE(("W(%ld)::AddWinBorder(%s)\n", fID, winBorder?winBorder->Name():"NULL"));
 	if (winBorder->Level() == B_FLOATING_APP)
 	{
 		// floating windows are automaticaly added when needed
@@ -180,7 +180,7 @@ STRACE(("W(%ld)::AddWinBorder(%s)\n", fID, winBorder?winBorder->GetName():"NULL"
 */
 void Workspace::RemoveWinBorder(WinBorder *winBorder)
 {
-STRACE(("W(%ld)::RemoveWinBorder(%s)\n", fID, winBorder?winBorder->GetName():"NULL"));
+STRACE(("W(%ld)::RemoveWinBorder(%s)\n", fID, winBorder?winBorder->Name():"NULL"));
 	ListData	*item = HasItem(winBorder);
 	if (item)
 	{
@@ -272,7 +272,7 @@ window will be shown in front.
 */
 bool Workspace::MoveToFront(WinBorder *newFront, bool doNotDisturb)
 {
-STRACE(("\nWks(%ld)::MoveToFront ~%s~ \n", fID, newFront?newFront->GetName():"NULL"));
+STRACE(("\nWks(%ld)::MoveToFront ~%s~ \n", fID, newFront?newFront->Name():"NULL"));
 	if (!newFront)
 		return false;
 
@@ -313,7 +313,7 @@ B_NORMAL window in front of which they appear.
 */
 bool Workspace::MoveToBack(WinBorder *newLast)
 {
-STRACE(("Wks(%ld)::MoveToBack(%s) \n", fID, newLast? newLast->GetName(): "NULL"));
+STRACE(("Wks(%ld)::MoveToBack(%s) \n", fID, newLast? newLast->Name(): "NULL"));
 	if (newLast->IsHidden())
 		return false;
 
@@ -478,7 +478,7 @@ chosen. Same goes for focus.
 */
 bool Workspace::HideWinBorder(WinBorder *winBorder)
 {
-STRACE(("W(%ld)::HideWinBorder(%s) \n", fID, winBorder? winBorder->GetName(): "NULL"));
+STRACE(("W(%ld)::HideWinBorder(%s) \n", fID, winBorder? winBorder->Name(): "NULL"));
 	bool	returnValue = false;
 	int32	level = winBorder->Level();
 	bool	changeFront = false;
@@ -641,7 +641,7 @@ unless a modal windows steals both.
 */
 bool Workspace::ShowWinBorder(WinBorder *winBorder, bool userBusy)
 {
-STRACE(("W(%ld)::ShowWinBorder(%s) \n", fID, winBorder? winBorder->GetName(): "NULL"));
+STRACE(("W(%ld)::ShowWinBorder(%s) \n", fID, winBorder? winBorder->Name(): "NULL"));
 	bool	returnValue = false;
 	int32	level = winBorder->Level();
 	if (level > B_SYSTEM_FIRST)
@@ -1151,7 +1151,7 @@ void Workspace::PutDefaultSettings(BMessage *msg, const uint8 &index)
 	// Just in case...
 	msg->RemoveName(fieldname);
 	
-	msg->AddMessage(fieldname,&container);
+	msg->AddMessage(fieldname, &container);
 }
 
 //----------------------------------------------------------------------------------
@@ -1162,7 +1162,7 @@ void Workspace::PrintToStream() const
 	for (ListData *item = fTopItem; item != NULL; item = item->lowerItem)
 	{
 		WinBorder		*wb = (WinBorder*)item->layerPtr;
-		printf("\tName: %s\t%s", wb->GetName(), wb->IsHidden()?"Hidden\t": "Visible\t");
+		printf("\tName: %s\t%s", wb->Name(), wb->IsHidden()?"Hidden\t": "Visible\t");
 		if(wb->Feel() == B_FLOATING_SUBSET_WINDOW_FEEL)
 			printf("\t%s\n", "B_FLOATING_SUBSET_WINDOW_FEEL");
 		if(wb->Feel() == B_FLOATING_APP_WINDOW_FEEL)
@@ -1183,8 +1183,8 @@ void Workspace::PrintToStream() const
 			printf("\t%s\n", "B_SYSTEM_FIRST");
 			
 	}
-	printf("Focus Layer:\t%s\n", fFocusItem? fFocusItem->layerPtr->GetName(): "NULL");
-	printf("Front Layer:\t%s\n\n", fFrontItem? fFrontItem->layerPtr->GetName(): "NULL");
+	printf("Focus Layer:\t%s\n", fFocusItem? fFocusItem->layerPtr->Name(): "NULL");
+	printf("Front Layer:\t%s\n\n", fFrontItem? fFrontItem->layerPtr->Name(): "NULL");
 }
 
 //----------------------------------------------------------------------------------
@@ -1194,9 +1194,9 @@ void Workspace::PrintItem(ListData *item) const
 	printf("ListData members:\n");
 	if(item)
 	{
-		printf("WinBorder:\t%s\n", item->layerPtr? item->layerPtr->GetName(): "NULL");
-		printf("UpperItem:\t%s\n", item->upperItem? item->upperItem->layerPtr->GetName(): "NULL");
-		printf("LowerItem:\t%s\n", item->lowerItem? item->lowerItem->layerPtr->GetName(): "NULL");
+		printf("WinBorder:\t%s\n", item->layerPtr? item->layerPtr->Name(): "NULL");
+		printf("UpperItem:\t%s\n", item->upperItem? item->upperItem->layerPtr->Name(): "NULL");
+		printf("LowerItem:\t%s\n", item->lowerItem? item->lowerItem->layerPtr->Name(): "NULL");
 	}
 	else
 	{