diff --git a/products/cyanogen_bravo.mk b/products/cyanogen_bravo.mk
index 22b27f1..8359a93 100644
--- a/products/cyanogen_bravo.mk
+++ b/products/cyanogen_bravo.mk
@@ -40,7 +40,7 @@
         ro.modversion=CyanogenMod-6-$(shell date +%m%d%Y)-NIGHTLY-Desire
 else
     PRODUCT_PROPERTY_OVERRIDES += \
-        ro.modversion=CyanogenMod-6.0.0-Desire-RC2
+        ro.modversion=CyanogenMod-6.0.0-Desire
 endif
 
 #
diff --git a/products/cyanogen_dream_sapphire.mk b/products/cyanogen_dream_sapphire.mk
index 03072d2..d95f4d5 100644
--- a/products/cyanogen_dream_sapphire.mk
+++ b/products/cyanogen_dream_sapphire.mk
@@ -43,7 +43,7 @@
         ro.modversion=CyanogenMod-6-$(shell date +%m%d%Y)-NIGHTLY-DS
 else
     PRODUCT_PROPERTY_OVERRIDES += \
-        ro.modversion=CyanogenMod-6.0.0-DS-RC4
+        ro.modversion=CyanogenMod-6.0.0-DS
 endif
 
 # Use the audio profile hack
diff --git a/products/cyanogen_espresso.mk b/products/cyanogen_espresso.mk
index cb1fe81..cf14d37 100644
--- a/products/cyanogen_espresso.mk
+++ b/products/cyanogen_espresso.mk
@@ -34,7 +34,7 @@
         ro.modversion=CyanogenMod-6-$(shell date +%m%d%Y)-NIGHTLY-Slide
 else
     PRODUCT_PROPERTY_OVERRIDES += \
-        ro.modversion=CyanogenMod-6.0.0-Slide-RC2
+        ro.modversion=CyanogenMod-6.0.0-Slide
 endif
 
 #
diff --git a/products/cyanogen_heroc.mk b/products/cyanogen_heroc.mk
index 26cbd47..13dbf3b 100644
--- a/products/cyanogen_heroc.mk
+++ b/products/cyanogen_heroc.mk
@@ -28,7 +28,7 @@
         ro.modversion=CyanogenMod-6-$(shell date +%m%d%Y)-NIGHTLY-Heroc
 else
     PRODUCT_PROPERTY_OVERRIDES += \
-	 ro.modversion=CyanogenMod-6.0.0-Heroc-RC1
+	 ro.modversion=CyanogenMod-6.0.0-Heroc
 endif
 
 #
diff --git a/products/cyanogen_inc.mk b/products/cyanogen_inc.mk
index 5846205..af64b05 100644
--- a/products/cyanogen_inc.mk
+++ b/products/cyanogen_inc.mk
@@ -26,7 +26,7 @@
         ro.modversion=CyanogenMod-6-$(shell date +%m%d%Y)-NIGHTLY-Inc
 else
     PRODUCT_PROPERTY_OVERRIDES += \
-        ro.modversion=CyanogenMod-6.0.0-Inc-RC3
+        ro.modversion=CyanogenMod-6.0.0-Inc
 endif
 
 #
diff --git a/products/cyanogen_liberty.mk b/products/cyanogen_liberty.mk
index ec5c158..dc8c2e7 100644
--- a/products/cyanogen_liberty.mk
+++ b/products/cyanogen_liberty.mk
@@ -30,7 +30,7 @@
         ro.modversion=CyanogenMod-6-$(shell date +%m%d%Y)-NIGHTLY-liberty
 else
     PRODUCT_PROPERTY_OVERRIDES += \
-        ro.modversion=CyanogenMod-6.0.0-liberty-RC0
+        ro.modversion=CyanogenMod-6.0.0-liberty
 endif
 
 #
diff --git a/products/cyanogen_passion.mk b/products/cyanogen_passion.mk
index 152a00e..ac2e142 100644
--- a/products/cyanogen_passion.mk
+++ b/products/cyanogen_passion.mk
@@ -42,7 +42,7 @@
         ro.modversion=CyanogenMod-6-$(shell date +%m%d%Y)-NIGHTLY-N1
 else
     PRODUCT_PROPERTY_OVERRIDES += \
-        ro.modversion=CyanogenMod-6.0.0-N1-RC4
+        ro.modversion=CyanogenMod-6.0.0-N1
 endif
 
 #
diff --git a/products/cyanogen_sholes.mk b/products/cyanogen_sholes.mk
index fdff2cd..6796445 100644
--- a/products/cyanogen_sholes.mk
+++ b/products/cyanogen_sholes.mk
@@ -21,7 +21,7 @@
         ro.modversion=CyanogenMod-6-$(shell date +%m%d%Y)-NIGHTLY-Droid
 else
     PRODUCT_PROPERTY_OVERRIDES += \
-        ro.modversion=CyanogenMod-6.0.0-Droid-RC4
+        ro.modversion=CyanogenMod-6.0.0-Droid
 endif
 
 PRODUCT_BUILD_PROP_OVERRIDES := BUILD_ID=FRG01B BUILD_DISPLAY_ID=FRG01B PRODUCT_NAME=voles TARGET_DEVICE=sholes BUILD_FINGERPRINT=verizon/voles/sholes/sholes:2.2/FRG01B/45394:user/release-keys PRODUCT_BRAND=verizon PRIVATE_BUILD_DESC="voles-user 2.2 FRG01B 45394 release-keys" BUILD_NUMBER=45394 BUILD_UTC_DATE=1279140904 TARGET_BUILD_TYPE=user BUILD_VERSION_TAGS=release-keys USER=android-build
diff --git a/products/cyanogen_supersonic.mk b/products/cyanogen_supersonic.mk
index fb17bb1..b6c27c8 100644
--- a/products/cyanogen_supersonic.mk
+++ b/products/cyanogen_supersonic.mk
@@ -28,7 +28,7 @@
         ro.modversion=CyanogenMod-6-$(shell date +%m%d%Y)-NIGHTLY-N1
 else
     PRODUCT_PROPERTY_OVERRIDES += \
-        ro.modversion=CyanogenMod-6.0.0-Supersonic-RC3
+        ro.modversion=CyanogenMod-6.0.0-Supersonic
 endif
 
 #