diff --git a/src/add-ons/input_server/methods/canna/Bitmaps.h b/src/add-ons/input_server/methods/canna/Bitmaps.h
index dd31fa7cab..090e2a8c2b 100644
--- a/src/add-ons/input_server/methods/canna/Bitmaps.h
+++ b/src/add-ons/input_server/methods/canna/Bitmaps.h
@@ -2,7 +2,7 @@
 
 const int32 kSmallIconWidth = 16;
 const int32 kSmallIconHeight = 16;
-const color_space kSmallIconColorSpace = B_COLOR_8_BIT;
+const color_space kSmallIconColorSpace = B_CMAP8;
 
 const unsigned char kCannaIcon [] = {
 	0xff,0xff,0xff,0xff,0x2b,0x2b,0x2b,0x2b,0x2b,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
diff --git a/src/bin/desklink/desklink.cpp b/src/bin/desklink/desklink.cpp
index 266fb92861..604d541d3f 100644
--- a/src/bin/desklink/desklink.cpp
+++ b/src/bin/desklink/desklink.cpp
@@ -106,8 +106,8 @@ MediaReplicant::MediaReplicant(BRect frame, const char *name,
 	:	BView(frame, name, resizeMask, flags)
 {
 	// Background Bitmap
-	segments = new BBitmap(BRect(0, 0, kSpeakerWidth - 1, kSpeakerHeight - 1), B_COLOR_8_BIT);
-	segments->SetBits(kSpeakerBits, kSpeakerWidth*kSpeakerHeight, 0, B_COLOR_8_BIT);
+	segments = new BBitmap(BRect(0, 0, kSpeakerWidth - 1, kSpeakerHeight - 1), B_CMAP8);
+	segments->SetBits(kSpeakerBits, kSpeakerWidth*kSpeakerHeight, 0, B_CMAP8);
 	// Background Color
 	SetViewColor(184,184,184);
 
@@ -127,8 +127,8 @@ MediaReplicant::MediaReplicant(BMessage *message)
 		volumeSlider(NULL)
 {
 	// Background Bitmap
-	segments = new BBitmap(BRect(0, 0, 16 - 1, 16 - 1), B_COLOR_8_BIT);
-	segments->SetBits(kSpeakerBits, 16*16, 0, B_COLOR_8_BIT);
+	segments = new BBitmap(BRect(0, 0, 16 - 1, 16 - 1), B_CMAP8);
+	segments->SetBits(kSpeakerBits, 16*16, 0, B_CMAP8);
 	LoadSettings();
 }
 
diff --git a/src/preferences/time/AnalogClock.cpp b/src/preferences/time/AnalogClock.cpp
index 7aaa02e1c1..b9a62e5e42 100644
--- a/src/preferences/time/AnalogClock.cpp
+++ b/src/preferences/time/AnalogClock.cpp
@@ -182,7 +182,7 @@ void
 TAnalogClock::_InitView(BRect rect)
 {
 	fClock = new OffscreenClock(kClockRect, "offscreen");
-	fBitmap = new BBitmap(kClockRect, B_COLOR_8_BIT, true);
+	fBitmap = new BBitmap(kClockRect, B_CMAP8, true);
 	fBitmap->Lock();
 	fBitmap->AddChild(fClock);
 	fBitmap->Unlock();