diff --git a/products/cyanogen_ace.mk b/products/cyanogen_ace.mk
index 9db671c5..3735ad62 100644
--- a/products/cyanogen_ace.mk
+++ b/products/cyanogen_ace.mk
@@ -43,10 +43,10 @@ ifdef CYANOGEN_NIGHTLY
 else
     ifdef CYANOGEN_RELEASE
         PRODUCT_PROPERTY_OVERRIDES += \
-            ro.modversion=CyanogenMod-7.0.0-RC4-DesireHD
+            ro.modversion=CyanogenMod-7.0.0-DesireHD
     else
         PRODUCT_PROPERTY_OVERRIDES += \
-            ro.modversion=CyanogenMod-7.0.0-RC4-DesireHD-KANG
+            ro.modversion=CyanogenMod-7.0.0-DesireHD-KANG
     endif
 endif
 
diff --git a/products/cyanogen_blade.mk b/products/cyanogen_blade.mk
index 8b7e364e..2f0444c0 100644
--- a/products/cyanogen_blade.mk
+++ b/products/cyanogen_blade.mk
@@ -26,10 +26,10 @@ ifdef CYANOGEN_NIGHTLY
 else
     ifdef CYANOGEN_RELEASE
         PRODUCT_PROPERTY_OVERRIDES += \
-            ro.modversion=CyanogenMod-7.0.0-RC4-Blade
+            ro.modversion=CyanogenMod-7.0.0-Blade
     else
         PRODUCT_PROPERTY_OVERRIDES += \
-            ro.modversion=CyanogenMod-7.0.0-RC4-Blade-KANG
+            ro.modversion=CyanogenMod-7.0.0-Blade-KANG
     endif
 endif
 
diff --git a/products/cyanogen_bravo.mk b/products/cyanogen_bravo.mk
index 9732143a..cb34a5e9 100644
--- a/products/cyanogen_bravo.mk
+++ b/products/cyanogen_bravo.mk
@@ -46,10 +46,10 @@ ifdef CYANOGEN_NIGHTLY
 else
     ifdef CYANOGEN_RELEASE
         PRODUCT_PROPERTY_OVERRIDES += \
-            ro.modversion=CyanogenMod-7.0.0-RC4-Desire
+            ro.modversion=CyanogenMod-7.0.0-Desire
     else
         PRODUCT_PROPERTY_OVERRIDES += \
-            ro.modversion=CyanogenMod-7.0.0-RC4-Desire-KANG
+            ro.modversion=CyanogenMod-7.0.0-Desire-KANG
     endif
 endif
 
diff --git a/products/cyanogen_bravoc.mk b/products/cyanogen_bravoc.mk
index 4f3eb2fa..58aac123 100644
--- a/products/cyanogen_bravoc.mk
+++ b/products/cyanogen_bravoc.mk
@@ -34,10 +34,10 @@ ifdef CYANOGEN_NIGHTLY
 else
     ifdef CYANOGEN_RELEASE
         PRODUCT_PROPERTY_OVERRIDES += \
-            ro.modversion=CyanogenMod-7.0.0-RC4-BravoC
+            ro.modversion=CyanogenMod-7.0.0-BravoC
     else
         PRODUCT_PROPERTY_OVERRIDES += \
-            ro.modversion=CyanogenMod-7.0.0-RC4-BravoC-KANG
+            ro.modversion=CyanogenMod-7.0.0-BravoC-KANG
     endif
 endif
 
diff --git a/products/cyanogen_buzz.mk b/products/cyanogen_buzz.mk
index 032f40cd..41bf59db 100644
--- a/products/cyanogen_buzz.mk
+++ b/products/cyanogen_buzz.mk
@@ -42,9 +42,9 @@ ifdef CYANOGEN_NIGHTLY
 else
     ifdef CYANOGEN_RELEASE
         PRODUCT_PROPERTY_OVERRIDES += \
-            ro.modversion=CyanogenMod-7.0.0-RC4-buzz
+            ro.modversion=CyanogenMod-7.0.0-buzz
     else
         PRODUCT_PROPERTY_OVERRIDES += \
-            ro.modversion=CyanogenMod-7.0.0-RC4-buzz-KANG
+            ro.modversion=CyanogenMod-7.0.0-buzz-KANG
     endif
 endif
diff --git a/products/cyanogen_click.mk b/products/cyanogen_click.mk
index 473d4749..e011ddfa 100644
--- a/products/cyanogen_click.mk
+++ b/products/cyanogen_click.mk
@@ -42,9 +42,9 @@ ifdef CYANOGEN_NIGHTLY
 else
     ifdef CYANOGEN_RELEASE
         PRODUCT_PROPERTY_OVERRIDES += \
-            ro.modversion=CyanogenMod-7.0.0-RC4.1-click
+            ro.modversion=CyanogenMod-7.0.0-click
     else
         PRODUCT_PROPERTY_OVERRIDES += \
-            ro.modversion=CyanogenMod-RC4.1-click-KANG
+            ro.modversion=CyanogenMod-7.0.0-click-KANG
     endif
 endif
diff --git a/products/cyanogen_crespo.mk b/products/cyanogen_crespo.mk
index 070ecebb..2a9fc8f9 100644
--- a/products/cyanogen_crespo.mk
+++ b/products/cyanogen_crespo.mk
@@ -38,10 +38,10 @@ ifdef CYANOGEN_NIGHTLY
 else
     ifdef CYANOGEN_RELEASE
         PRODUCT_PROPERTY_OVERRIDES += \
-            ro.modversion=CyanogenMod-7.0.0-RC4-NS
+            ro.modversion=CyanogenMod-7.0.0-NS
     else
         PRODUCT_PROPERTY_OVERRIDES += \
-            ro.modversion=CyanogenMod-7.0.0-RC4-NS-KANG
+            ro.modversion=CyanogenMod-7.0.0-NS-KANG
     endif
 endif
 
diff --git a/products/cyanogen_desirec.mk b/products/cyanogen_desirec.mk
index 219d9346..b86529e8 100644
--- a/products/cyanogen_desirec.mk
+++ b/products/cyanogen_desirec.mk
@@ -34,10 +34,10 @@ ifdef CYANOGEN_NIGHTLY
 else
     ifdef CYANOGEN_RELEASE
         PRODUCT_PROPERTY_OVERRIDES += \
-            ro.modversion=CyanogenMod-7.0.0-RC4-Eris
+            ro.modversion=CyanogenMod-7.0.0-Eris
     else
         PRODUCT_PROPERTY_OVERRIDES += \
-            ro.modversion=CyanogenMod-7.0.0-RC4-KANG-Eris
+            ro.modversion=CyanogenMod-7.0.0-KANG-Eris
     endif
 endif
 
diff --git a/products/cyanogen_encore.mk b/products/cyanogen_encore.mk
index 28b90743..1cebf69b 100644
--- a/products/cyanogen_encore.mk
+++ b/products/cyanogen_encore.mk
@@ -25,10 +25,10 @@ ifdef CYANOGEN_NIGHTLY
 else
     ifdef CYANOGEN_RELEASE
         PRODUCT_PROPERTY_OVERRIDES += \
-            ro.modversion=CyanogenMod-7.0.0-RC4-encore
+            ro.modversion=CyanogenMod-7.0.0-encore
     else
         PRODUCT_PROPERTY_OVERRIDES += \
-            ro.modversion=CyanogenMod-7.0.0-RC4-encore-KANG
+            ro.modversion=CyanogenMod-7.0.0-encore-KANG
     endif
 endif
 
diff --git a/products/cyanogen_espresso.mk b/products/cyanogen_espresso.mk
index cb5fba1c..8dc39bf4 100644
--- a/products/cyanogen_espresso.mk
+++ b/products/cyanogen_espresso.mk
@@ -37,10 +37,10 @@ ifdef CYANOGEN_NIGHTLY
 else
     ifdef CYANOGEN_RELEASE
         PRODUCT_PROPERTY_OVERRIDES += \
-            ro.modversion=CyanogenMod-7.0.0-RC4-Slide
+            ro.modversion=CyanogenMod-7.0.0-Slide
     else
         PRODUCT_PROPERTY_OVERRIDES += \
-            ro.modversion=CyanogenMod-7.0.0-RC4-Slide-KANG
+            ro.modversion=CyanogenMod-7.0.0-Slide-KANG
     endif
 endif
 
diff --git a/products/cyanogen_glacier.mk b/products/cyanogen_glacier.mk
index 3a5200c8..4eab7e4c 100644
--- a/products/cyanogen_glacier.mk
+++ b/products/cyanogen_glacier.mk
@@ -43,10 +43,10 @@ ifdef CYANOGEN_NIGHTLY
 else
     ifdef CYANOGEN_RELEASE
         PRODUCT_PROPERTY_OVERRIDES += \
-            ro.modversion=CyanogenMod-7.0.0-RC4-glacier
+            ro.modversion=CyanogenMod-7.0.0-glacier
     else
         PRODUCT_PROPERTY_OVERRIDES += \
-            ro.modversion=CyanogenMod-7.0.0-RC4-glacier-KANG
+            ro.modversion=CyanogenMod-7.0.0-glacier-KANG
     endif
 endif
 
diff --git a/products/cyanogen_harmony.mk b/products/cyanogen_harmony.mk
index def1ad81..b29b5838 100644
--- a/products/cyanogen_harmony.mk
+++ b/products/cyanogen_harmony.mk
@@ -25,10 +25,10 @@ ifdef CYANOGEN_NIGHTLY
 else
     ifdef CYANOGEN_RELEASE
         PRODUCT_PROPERTY_OVERRIDES += \
-            ro.modversion=CyanogenMod-7.0.0-RC4-Harmony
+            ro.modversion=CyanogenMod-7.0.0-Harmony
     else
         PRODUCT_PROPERTY_OVERRIDES += \
-            ro.modversion=CyanogenMod-7.0.0-RC4-Harmony-KANG
+            ro.modversion=CyanogenMod-7.0.0-Harmony-KANG
     endif
 endif
 
diff --git a/products/cyanogen_hero.mk b/products/cyanogen_hero.mk
index c32e9ea9..8330daf6 100644
--- a/products/cyanogen_hero.mk
+++ b/products/cyanogen_hero.mk
@@ -32,10 +32,10 @@ ifdef CYANOGEN_NIGHTLY
 else
     ifdef CYANOGEN_RELEASE
         PRODUCT_PROPERTY_OVERRIDES += \
-            ro.modversion=CyanogenMod-7.0.0-RC4-Hero
+            ro.modversion=CyanogenMod-7.0.0-Hero
     else
         PRODUCT_PROPERTY_OVERRIDES += \
-            ro.modversion=CyanogenMod-7.0.0-RC4-Hero-KANG
+            ro.modversion=CyanogenMod-7.0.0-Hero-KANG
     endif
 endif
 
diff --git a/products/cyanogen_heroc.mk b/products/cyanogen_heroc.mk
index 35ddd1cf..474b17f3 100644
--- a/products/cyanogen_heroc.mk
+++ b/products/cyanogen_heroc.mk
@@ -27,10 +27,10 @@ ifdef CYANOGEN_NIGHTLY
 else
     ifdef CYANOGEN_RELEASE
         PRODUCT_PROPERTY_OVERRIDES += \
-            ro.modversion=CyanogenMod-7.0.0-RC4-Heroc
+            ro.modversion=CyanogenMod-7.0.0-Heroc
     else
         PRODUCT_PROPERTY_OVERRIDES += \
-            ro.modversion=CyanogenMod-7.0.0-RC4-Heroc-KANG
+            ro.modversion=CyanogenMod-7.0.0-Heroc-KANG
     endif
 endif
 
diff --git a/products/cyanogen_inc.mk b/products/cyanogen_inc.mk
index ff519ca9..a7f1ebeb 100644
--- a/products/cyanogen_inc.mk
+++ b/products/cyanogen_inc.mk
@@ -33,10 +33,10 @@ ifdef CYANOGEN_NIGHTLY
 else
     ifdef CYANOGEN_RELEASE
         PRODUCT_PROPERTY_OVERRIDES += \
-            ro.modversion=CyanogenMod-7.0.0-RC4-Inc
+            ro.modversion=CyanogenMod-7.0.0-Inc
     else
         PRODUCT_PROPERTY_OVERRIDES += \
-            ro.modversion=CyanogenMod-7.0.0-RC4-Inc-KANG
+            ro.modversion=CyanogenMod-7.0.0-Inc-KANG
     endif
 endif
 
diff --git a/products/cyanogen_legend.mk b/products/cyanogen_legend.mk
index 642a58f8..b27cc595 100644
--- a/products/cyanogen_legend.mk
+++ b/products/cyanogen_legend.mk
@@ -30,10 +30,10 @@ ifdef CYANOGEN_NIGHTLY
 else
     ifdef CYANOGEN_RELEASE
         PRODUCT_PROPERTY_OVERRIDES += \
-            ro.modversion=CyanogenMod-7.0.0-RC4-Legend
+            ro.modversion=CyanogenMod-7.0.0-Legend
     else
         PRODUCT_PROPERTY_OVERRIDES += \
-            ro.modversion=CyanogenMod-7.0.0-RC4-Legend-KANG
+            ro.modversion=CyanogenMod-7.0.0-Legend-KANG
     endif
 endif
 
diff --git a/products/cyanogen_leo.mk b/products/cyanogen_leo.mk
index 1e57b97b..34331400 100644
--- a/products/cyanogen_leo.mk
+++ b/products/cyanogen_leo.mk
@@ -41,10 +41,10 @@ ifdef CYANOGEN_NIGHTLY
 else
     ifdef CYANOGEN_RELEASE
         PRODUCT_PROPERTY_OVERRIDES += \
-            ro.modversion=CyanogenMod-7.0.0-RC4-LEO
+            ro.modversion=CyanogenMod-7.0.0-LEO
     else
         PRODUCT_PROPERTY_OVERRIDES += \
-            ro.modversion=CyanogenMod-7.0.0-RC4-LEO-KANG
+            ro.modversion=CyanogenMod-7.0.0-LEO-KANG
     endif
 endif
 
diff --git a/products/cyanogen_liberty.mk b/products/cyanogen_liberty.mk
index 3105b2a3..497c8cfe 100644
--- a/products/cyanogen_liberty.mk
+++ b/products/cyanogen_liberty.mk
@@ -28,10 +28,10 @@ ifdef CYANOGEN_NIGHTLY
 else
     ifdef CYANOGEN_RELEASE
         PRODUCT_PROPERTY_OVERRIDES += \
-            ro.modversion=CyanogenMod-7.0.0-RC4-Liberty
+            ro.modversion=CyanogenMod-7.0.0-Liberty
     else
         PRODUCT_PROPERTY_OVERRIDES += \
-            ro.modversion=CyanogenMod-7.0.0-RC4-Liberty-KANG
+            ro.modversion=CyanogenMod-7.0.0-Liberty-KANG
     endif
 endif
 
diff --git a/products/cyanogen_one.mk b/products/cyanogen_one.mk
index 012be9d2..0709c90d 100644
--- a/products/cyanogen_one.mk
+++ b/products/cyanogen_one.mk
@@ -29,10 +29,10 @@ ifdef CYANOGEN_NIGHTLY
 else
     ifdef CYANOGEN_RELEASE
         PRODUCT_PROPERTY_OVERRIDES += \
-            ro.modversion=CyanogenMod-7.0.0-RC4-ONE
+            ro.modversion=CyanogenMod-7.0.0-ONE
     else
         PRODUCT_PROPERTY_OVERRIDES += \
-            ro.modversion=CyanogenMod-7.0.0-RC4-ONE-KANG
+            ro.modversion=CyanogenMod-7.0.0-ONE-KANG
     endif
 endif
 
diff --git a/products/cyanogen_passion.mk b/products/cyanogen_passion.mk
index 7ac3f365..1a6fa5c2 100644
--- a/products/cyanogen_passion.mk
+++ b/products/cyanogen_passion.mk
@@ -46,10 +46,10 @@ ifdef CYANOGEN_NIGHTLY
 else
     ifdef CYANOGEN_RELEASE
         PRODUCT_PROPERTY_OVERRIDES += \
-            ro.modversion=CyanogenMod-7.0.0-RC4-N1
+            ro.modversion=CyanogenMod-7.0.0-N1
     else
         PRODUCT_PROPERTY_OVERRIDES += \
-            ro.modversion=CyanogenMod-7.0.0-RC4-N1-KANG
+            ro.modversion=CyanogenMod-7.0.0-N1-KANG
     endif
 endif
 
diff --git a/products/cyanogen_sholes.mk b/products/cyanogen_sholes.mk
index 64b43a94..5425da27 100644
--- a/products/cyanogen_sholes.mk
+++ b/products/cyanogen_sholes.mk
@@ -22,10 +22,10 @@ ifdef CYANOGEN_NIGHTLY
 else
     ifdef CYANOGEN_RELEASE
         PRODUCT_PROPERTY_OVERRIDES += \
-            ro.modversion=CyanogenMod-7.0.0-RC4-Droid
+            ro.modversion=CyanogenMod-7.0.0-Droid
     else
         PRODUCT_PROPERTY_OVERRIDES += \
-            ro.modversion=CyanogenMod-7.0.0-RC4-Droid-KANG
+            ro.modversion=CyanogenMod-7.0.0-Droid-KANG
     endif
 endif
 
diff --git a/products/cyanogen_speedy.mk b/products/cyanogen_speedy.mk
index ee36679b..48f04bb5 100644
--- a/products/cyanogen_speedy.mk
+++ b/products/cyanogen_speedy.mk
@@ -37,10 +37,10 @@ ifdef CYANOGEN_NIGHTLY
 else
     ifdef CYANOGEN_RELEASE
         PRODUCT_PROPERTY_OVERRIDES += \
-            ro.modversion=CyanogenMod-7.0.0-RC4.1-Speedy
+            ro.modversion=CyanogenMod-7.0.0-Speedy
     else
         PRODUCT_PROPERTY_OVERRIDES += \
-            ro.modversion=CyanogenMod-7.0.0-RC4.1-Speedy-KANG
+            ro.modversion=CyanogenMod-7.0.0-Speedy-KANG
     endif
 endif
 
diff --git a/products/cyanogen_supersonic.mk b/products/cyanogen_supersonic.mk
index 775f66bc..80fcd6a3 100644
--- a/products/cyanogen_supersonic.mk
+++ b/products/cyanogen_supersonic.mk
@@ -37,10 +37,10 @@ ifdef CYANOGEN_NIGHTLY
 else
     ifdef CYANOGEN_RELEASE
         PRODUCT_PROPERTY_OVERRIDES += \
-            ro.modversion=CyanogenMod-7.0.0-RC4-Supersonic
+            ro.modversion=CyanogenMod-7.0.0-Supersonic
     else
         PRODUCT_PROPERTY_OVERRIDES += \
-            ro.modversion=CyanogenMod-7.0.0-RC4-Supersonic-KANG
+            ro.modversion=CyanogenMod-7.0.0-Supersonic-KANG
     endif
 endif
 
diff --git a/products/cyanogen_vega.mk b/products/cyanogen_vega.mk
index 943b0cb5..01ac93a4 100644
--- a/products/cyanogen_vega.mk
+++ b/products/cyanogen_vega.mk
@@ -25,10 +25,10 @@ ifdef CYANOGEN_NIGHTLY
 else
     ifdef CYANOGEN_RELEASE
         PRODUCT_PROPERTY_OVERRIDES += \
-            ro.modversion=CyanogenMod-7.0.0-RC4-Vega
+            ro.modversion=CyanogenMod-7.0.0-Vega
     else
         PRODUCT_PROPERTY_OVERRIDES += \
-            ro.modversion=CyanogenMod-7.0.0-RC4-Vega-KANG
+            ro.modversion=CyanogenMod-7.0.0-Vega-KANG
     endif
 endif
 
diff --git a/products/cyanogen_vision.mk b/products/cyanogen_vision.mk
index 6cc2ce14..1a4cb707 100644
--- a/products/cyanogen_vision.mk
+++ b/products/cyanogen_vision.mk
@@ -43,10 +43,10 @@ ifdef CYANOGEN_NIGHTLY
 else
     ifdef CYANOGEN_RELEASE
         PRODUCT_PROPERTY_OVERRIDES += \
-            ro.modversion=CyanogenMod-7.0.0-RC4-vision
+            ro.modversion=CyanogenMod-7.0.0-vision
     else
         PRODUCT_PROPERTY_OVERRIDES += \
-            ro.modversion=CyanogenMod-7.0.0-RC4-vision-KANG
+            ro.modversion=CyanogenMod-7.0.0-vision-KANG
     endif
 endif
 
diff --git a/products/cyanogen_z71.mk b/products/cyanogen_z71.mk
index e6c2d551..02ea8170 100644
--- a/products/cyanogen_z71.mk
+++ b/products/cyanogen_z71.mk
@@ -28,10 +28,10 @@ ifdef CYANOGEN_NIGHTLY
 else
     ifdef CYANOGEN_RELEASE
         PRODUCT_PROPERTY_OVERRIDES += \
-            ro.modversion=CyanogenMod-7.0.0-RC4-Z71
+            ro.modversion=CyanogenMod-7.0.0-Z71
     else
         PRODUCT_PROPERTY_OVERRIDES += \
-            ro.modversion=CyanogenMod-7.0.0-RC4-Z71-KANG
+            ro.modversion=CyanogenMod-7.0.0-Z71-KANG
     endif
 endif
 
diff --git a/products/cyanogen_zero.mk b/products/cyanogen_zero.mk
index 86d4ca41..4b38ca40 100644
--- a/products/cyanogen_zero.mk
+++ b/products/cyanogen_zero.mk
@@ -27,10 +27,10 @@ ifdef CYANOGEN_NIGHTLY
 else
     ifdef CYANOGEN_RELEASE
         PRODUCT_PROPERTY_OVERRIDES += \
-            ro.modversion=CyanogenMod-7.0.0-RC4-ZERO
+            ro.modversion=CyanogenMod-7.0.0-ZERO
     else
         PRODUCT_PROPERTY_OVERRIDES += \
-            ro.modversion=CyanogenMod-7.0.0-RC4-ZERO-KANG
+            ro.modversion=CyanogenMod-7.0.0-ZERO-KANG
     endif
 endif