diff --git a/prebuilt/dream-sapphire/media/bootanimation.zip b/prebuilt/dream_sapphire/media/bootanimation.zip
similarity index 100%
rename from prebuilt/dream-sapphire/media/bootanimation.zip
rename to prebuilt/dream_sapphire/media/bootanimation.zip
Binary files differ
diff --git a/products/AndroidProducts.mk b/products/AndroidProducts.mk
index 5a47ab5..a4949ca 100644
--- a/products/AndroidProducts.mk
+++ b/products/AndroidProducts.mk
@@ -3,7 +3,6 @@
         $(LOCAL_DIR)/cyanogen_inc.mk \
         $(LOCAL_DIR)/cyanogen_heroc.mk \
         $(LOCAL_DIR)/cyanogen_sholes.mk \
-	$(LOCAL_DIR)/cyanogen_dream.mk \
-	$(LOCAL_DIR)/cyanogen_sapphire.mk \
+	$(LOCAL_DIR)/cyanogen_dream_sapphire.mk \
 	$(LOCAL_DIR)/cyanogen_bravo.mk \
 	$(LOCAL_DIR)/cyanogen_espresso.mk
diff --git a/products/cyanogen_dream.mk b/products/cyanogen_dream_sapphire.mk
similarity index 67%
rename from products/cyanogen_dream.mk
rename to products/cyanogen_dream_sapphire.mk
index 7312091..c1c9dc0 100644
--- a/products/cyanogen_dream.mk
+++ b/products/cyanogen_dream_sapphire.mk
@@ -1,5 +1,5 @@
-# Inherit AOSP device configuration for dream.
-$(call inherit-product, device/htc/dream/full_dream.mk)
+# Inherit AOSP device configuration for dream_sapphire.
+$(call inherit-product, device/htc/dream_sapphire/full_dream_sapphire.mk)
 
 # Inherit some common cyanogenmod stuff.
 $(call inherit-product, vendor/cyanogen/products/common.mk)
@@ -7,10 +7,10 @@
 #
 # Setup device specific product configuration.
 #
-PRODUCT_NAME := cyanogen_dream
+PRODUCT_NAME := cyanogen_dream_sapphire
 PRODUCT_BRAND := google
-PRODUCT_DEVICE := dream
-PRODUCT_MODEL := Dream
+PRODUCT_DEVICE := dream_sapphire
+PRODUCT_MODEL := Dream/Sapphire
 PRODUCT_MANUFACTURER := HTC
 PRODUCT_BUILD_PROP_OVERRIDES += BUILD_ID=FRF83 BUILD_DISPLAY_ID=FRF83 PRODUCT_NAME=dream BUILD_FINGERPRINT=google/passion/passion/mahimahi:2.2/FRF83/42295:user/release-keys
 PRIVATE_BUILD_DESC="dream-user 2.2 FRF83 42295 release-keys"
@@ -22,15 +22,15 @@
 #
 ifdef CYANOGEN_NIGHTLY
     PRODUCT_PROPERTY_OVERRIDES += \
-        ro.modversion=CyanogenMod-6-$(shell date +%m%d%Y)-NIGHTLY-Dream
+        ro.modversion=CyanogenMod-6-$(shell date +%m%d%Y)-NIGHTLY-DS
 else
     PRODUCT_PROPERTY_OVERRIDES += \
-        ro.modversion=CyanogenMod-6.0.0-Dream-test0
+        ro.modversion=CyanogenMod-6.0.0-DS-test0
 endif
 
 #
-# Copy dream specific prebuilt files
+# Copy DS specific prebuilt files
 #
 PRODUCT_COPY_FILES +=  \
-    vendor/cyanogen/prebuilt/dream-sapphire/media/bootanimation.zip:system/media/bootanimation.zip
+    vendor/cyanogen/prebuilt/dream_sapphire/media/bootanimation.zip:system/media/bootanimation.zip
 
diff --git a/products/cyanogen_sapphire.mk b/products/cyanogen_sapphire.mk
deleted file mode 100644
index e543f26..0000000
--- a/products/cyanogen_sapphire.mk
+++ /dev/null
@@ -1,35 +0,0 @@
-# Inherit AOSP device configuration for sapphire.
-$(call inherit-product, device/htc/sapphire/full_sapphire.mk)
-
-# Inherit some common cyanogenmod stuff.
-$(call inherit-product, vendor/cyanogen/products/common.mk)
-
-#
-# Setup device specific product configuration.
-#
-PRODUCT_NAME := cyanogen_sapphire
-PRODUCT_BRAND := google
-PRODUCT_DEVICE := sapphire
-PRODUCT_MODEL := sapphire
-PRODUCT_MANUFACTURER := HTC
-PRODUCT_BUILD_PROP_OVERRIDES += BUILD_ID=FRF83 BUILD_DISPLAY_ID=FRF83 PRODUCT_NAME=sapphire BUILD_FINGERPRINT=google/passion/passion/mahimahi:2.2/FRF83/42295:user/release-keys
-PRIVATE_BUILD_DESC="sapphire-user 2.2 FRF83 42295 release-keys"
-
-PRODUCT_SPECIFIC_DEFINES += TARGET_PRELINKER_MAP=$(TOP)/vendor/cyanogen/prelink-linux-arm-ds.map
-#
-# Set ro.modversion
-#
-ifdef CYANOGEN_NIGHTLY
-    PRODUCT_PROPERTY_OVERRIDES += \
-        ro.modversion=CyanogenMod-6-$(shell date +%m%d%Y)-NIGHTLY-Sapphire
-else
-    PRODUCT_PROPERTY_OVERRIDES += \
-        ro.modversion=CyanogenMod-6.0.0-Sapphire-test0
-endif
-
-#
-# Copy sapphire specific prebuilt files
-#
-PRODUCT_COPY_FILES +=  \
-    vendor/cyanogen/prebuilt/dream-sapphire/media/bootanimation.zip:system/media/bootanimation.zip
-
diff --git a/vendorsetup.sh b/vendorsetup.sh
index 75f4279..01edb35 100644
--- a/vendorsetup.sh
+++ b/vendorsetup.sh
@@ -2,7 +2,6 @@
 add_lunch_combo cyanogen_inc-eng
 add_lunch_combo cyanogen_heroc-eng
 add_lunch_combo cyanogen_sholes-eng
-add_lunch_combo cyanogen_dream-eng
-add_lunch_combo cyanogen_sapphire-eng
+add_lunch_combo cyanogen_dream_sapphire-eng
 add_lunch_combo cyanogen_bravo-eng
 add_lunch_combo cyanogen_espresso-eng