diff --git a/products/cyanogen_ace.mk b/products/cyanogen_ace.mk
index bfb826c..4326613 100644
--- a/products/cyanogen_ace.mk
+++ b/products/cyanogen_ace.mk
@@ -40,10 +40,10 @@
 else
     ifdef CYANOGEN_RELEASE
         PRODUCT_PROPERTY_OVERRIDES += \
-            ro.modversion=CyanogenMod-7.1.0-RC1-DesireHD
+            ro.modversion=CyanogenMod-7.1.0-DesireHD
     else
         PRODUCT_PROPERTY_OVERRIDES += \
-            ro.modversion=CyanogenMod-7.1.0-RC1-DesireHD-KANG
+            ro.modversion=CyanogenMod-7.1.0-DesireHD-KANG
     endif
 endif
 
diff --git a/products/cyanogen_anzu.mk b/products/cyanogen_anzu.mk
index 65e844c..6e6ba0f 100644
--- a/products/cyanogen_anzu.mk
+++ b/products/cyanogen_anzu.mk
@@ -41,10 +41,10 @@
 else
     ifdef CYANOGEN_RELEASE
         PRODUCT_PROPERTY_OVERRIDES += \
-            ro.modversion=CyanogenMod-7.1.0-RC1-XperiaArc-LT15i
+            ro.modversion=CyanogenMod-7.1.0-XperiaArc-LT15i
     else
         PRODUCT_PROPERTY_OVERRIDES += \
-            ro.modversion=CyanogenMod-7.1.0-RC1-XperiaArc-LT15i-KANG
+            ro.modversion=CyanogenMod-7.1.0-XperiaArc-LT15i-KANG
     endif
 endif
 
diff --git a/products/cyanogen_blade.mk b/products/cyanogen_blade.mk
index 3233832..935899b 100644
--- a/products/cyanogen_blade.mk
+++ b/products/cyanogen_blade.mk
@@ -26,10 +26,10 @@
 else
     ifdef CYANOGEN_RELEASE
         PRODUCT_PROPERTY_OVERRIDES += \
-            ro.modversion=CyanogenMod-7.1.0-RC1-Blade
+            ro.modversion=CyanogenMod-7.1.0-Blade
     else
         PRODUCT_PROPERTY_OVERRIDES += \
-            ro.modversion=CyanogenMod-7.1.0-RC1-Blade-KANG
+            ro.modversion=CyanogenMod-7.1.0-Blade-KANG
     endif
 endif
 
diff --git a/products/cyanogen_bravo.mk b/products/cyanogen_bravo.mk
index 3b0000f..4294901 100644
--- a/products/cyanogen_bravo.mk
+++ b/products/cyanogen_bravo.mk
@@ -46,10 +46,10 @@
 else
     ifdef CYANOGEN_RELEASE
         PRODUCT_PROPERTY_OVERRIDES += \
-            ro.modversion=CyanogenMod-7.1.0-RC1-Desire
+            ro.modversion=CyanogenMod-7.1.0-Desire
     else
         PRODUCT_PROPERTY_OVERRIDES += \
-            ro.modversion=CyanogenMod-7.1.0-RC1-Desire-KANG
+            ro.modversion=CyanogenMod-7.1.0-Desire-KANG
     endif
 endif
 
diff --git a/products/cyanogen_bravoc.mk b/products/cyanogen_bravoc.mk
index 83f3ec3..2a6d3a3 100644
--- a/products/cyanogen_bravoc.mk
+++ b/products/cyanogen_bravoc.mk
@@ -34,10 +34,10 @@
 else
     ifdef CYANOGEN_RELEASE
         PRODUCT_PROPERTY_OVERRIDES += \
-            ro.modversion=CyanogenMod-7.1.0-RC1-BravoC
+            ro.modversion=CyanogenMod-7.1.0-BravoC
     else
         PRODUCT_PROPERTY_OVERRIDES += \
-            ro.modversion=CyanogenMod-7.1.0-RC1-BravoC-KANG
+            ro.modversion=CyanogenMod-7.1.0-BravoC-KANG
     endif
 endif
 
diff --git a/products/cyanogen_buzz.mk b/products/cyanogen_buzz.mk
index 28d4b1b..1c22e8c 100644
--- a/products/cyanogen_buzz.mk
+++ b/products/cyanogen_buzz.mk
@@ -42,9 +42,9 @@
 else
     ifdef CYANOGEN_RELEASE
         PRODUCT_PROPERTY_OVERRIDES += \
-            ro.modversion=CyanogenMod-7.1.0-RC1-buzz
+            ro.modversion=CyanogenMod-7.1.0-buzz
     else
         PRODUCT_PROPERTY_OVERRIDES += \
-            ro.modversion=CyanogenMod-7.1.0-RC1-buzz-KANG
+            ro.modversion=CyanogenMod-7.1.0-buzz-KANG
     endif
 endif
diff --git a/products/cyanogen_captivatemtd.mk b/products/cyanogen_captivatemtd.mk
index 67c46de..a08f57b 100644
--- a/products/cyanogen_captivatemtd.mk
+++ b/products/cyanogen_captivatemtd.mk
@@ -45,10 +45,10 @@
 else
     ifdef CYANOGEN_RELEASE
         PRODUCT_PROPERTY_OVERRIDES += \
-            ro.modversion=CyanogenMod-7.1.0-RC1-Captivate
+            ro.modversion=CyanogenMod-7.1.0-Captivate
     else
         PRODUCT_PROPERTY_OVERRIDES += \
-            ro.modversion=CyanogenMod-7.1.0-RC1-Captivate-KANG
+            ro.modversion=CyanogenMod-7.1.0-Captivate-KANG
     endif
 endif
 
diff --git a/products/cyanogen_click.mk b/products/cyanogen_click.mk
index fc21698..2884fde 100644
--- a/products/cyanogen_click.mk
+++ b/products/cyanogen_click.mk
@@ -42,9 +42,9 @@
 else
     ifdef CYANOGEN_RELEASE
         PRODUCT_PROPERTY_OVERRIDES += \
-            ro.modversion=CyanogenMod-7.1.0-RC1-click
+            ro.modversion=CyanogenMod-7.1.0-click
     else
         PRODUCT_PROPERTY_OVERRIDES += \
-            ro.modversion=CyanogenMod-7.1.0-RC1-click-KANG
+            ro.modversion=CyanogenMod-7.1.0-click-KANG
     endif
 endif
diff --git a/products/cyanogen_crespo.mk b/products/cyanogen_crespo.mk
index 1b80c77..0d82c96 100644
--- a/products/cyanogen_crespo.mk
+++ b/products/cyanogen_crespo.mk
@@ -38,10 +38,10 @@
 else
     ifdef CYANOGEN_RELEASE
         PRODUCT_PROPERTY_OVERRIDES += \
-            ro.modversion=CyanogenMod-7.1.0-RC1-NS
+            ro.modversion=CyanogenMod-7.1.0-NS
     else
         PRODUCT_PROPERTY_OVERRIDES += \
-            ro.modversion=CyanogenMod-7.1.0-RC1-NS-KANG
+            ro.modversion=CyanogenMod-7.1.0-NS-KANG
     endif
 endif
 
diff --git a/products/cyanogen_crespo4g.mk b/products/cyanogen_crespo4g.mk
index fbcf0b1..28c5b90 100644
--- a/products/cyanogen_crespo4g.mk
+++ b/products/cyanogen_crespo4g.mk
@@ -29,10 +29,10 @@
 else
     ifdef CYANOGEN_RELEASE
         PRODUCT_PROPERTY_OVERRIDES += \
-            ro.modversion=CyanogenMod-7.1.0-RC1-NS4G
+            ro.modversion=CyanogenMod-7.1.0-NS4G
     else
         PRODUCT_PROPERTY_OVERRIDES += \
-            ro.modversion=CyanogenMod-7.1.0-RC1-NS4G-KANG
+            ro.modversion=CyanogenMod-7.1.0-NS4G-KANG
     endif
 endif
 
diff --git a/products/cyanogen_desirec.mk b/products/cyanogen_desirec.mk
index 7040658..8604cd7 100644
--- a/products/cyanogen_desirec.mk
+++ b/products/cyanogen_desirec.mk
@@ -34,10 +34,10 @@
 else
     ifdef CYANOGEN_RELEASE
         PRODUCT_PROPERTY_OVERRIDES += \
-            ro.modversion=CyanogenMod-7.1.0-RC1-Eris
+            ro.modversion=CyanogenMod-7.1.0-Eris
     else
         PRODUCT_PROPERTY_OVERRIDES += \
-            ro.modversion=CyanogenMod-7.1.0-RC1-KANG-Eris
+            ro.modversion=CyanogenMod-7.1.0-KANG-Eris
     endif
 endif
 
diff --git a/products/cyanogen_dream_sapphire.mk b/products/cyanogen_dream_sapphire.mk
index 546af8a..daddeaf 100644
--- a/products/cyanogen_dream_sapphire.mk
+++ b/products/cyanogen_dream_sapphire.mk
@@ -45,10 +45,10 @@
 else
     ifdef CYANOGEN_RELEASE
         PRODUCT_PROPERTY_OVERRIDES += \
-            ro.modversion=CyanogenMod-7.1.0-RC1-RC1-DS
+            ro.modversion=CyanogenMod-7.1.0-RC1-DS
     else
         PRODUCT_PROPERTY_OVERRIDES += \
-            ro.modversion=CyanogenMod-7.1.0-RC1-RC1-DS-KANG
+            ro.modversion=CyanogenMod-7.1.0-RC1-DS-KANG
     endif
 endif
 
diff --git a/products/cyanogen_droid2we.mk b/products/cyanogen_droid2we.mk
index 48c5883..d149020 100644
--- a/products/cyanogen_droid2we.mk
+++ b/products/cyanogen_droid2we.mk
@@ -43,10 +43,10 @@
 else
     ifdef CYANOGEN_RELEASE
         PRODUCT_PROPERTY_OVERRIDES += \
-            ro.modversion=CyanogenMod-7.1.0-RC1-DROID2WE
+            ro.modversion=CyanogenMod-7.1.0-DROID2WE
     else
         PRODUCT_PROPERTY_OVERRIDES += \
-            ro.modversion=CyanogenMod-7.1.0-RC1-DROID2WE-KANG
+            ro.modversion=CyanogenMod-7.1.0-DROID2WE-KANG
     endif
 endif
 
diff --git a/products/cyanogen_encore.mk b/products/cyanogen_encore.mk
index 14b6586..4c2ef9d 100644
--- a/products/cyanogen_encore.mk
+++ b/products/cyanogen_encore.mk
@@ -27,10 +27,10 @@
 else
     ifdef CYANOGEN_RELEASE
         PRODUCT_PROPERTY_OVERRIDES += \
-            ro.modversion=CyanogenMod-7.1.0-RC1-encore
+            ro.modversion=CyanogenMod-7.1.0-encore
     else
         PRODUCT_PROPERTY_OVERRIDES += \
-            ro.modversion=CyanogenMod-7.1.0-RC1-encore-KANG
+            ro.modversion=CyanogenMod-7.1.0-encore-KANG
     endif
 endif
 
diff --git a/products/cyanogen_es209ra.mk b/products/cyanogen_es209ra.mk
index a3bc779..d8374af 100644
--- a/products/cyanogen_es209ra.mk
+++ b/products/cyanogen_es209ra.mk
@@ -29,10 +29,10 @@
 else
     ifdef CYANOGEN_RELEASE
         PRODUCT_PROPERTY_OVERRIDES += \
-            ro.modversion=CyanogenMod-7.1.0-RC1-es209ra
+            ro.modversion=CyanogenMod-7.1.0-es209ra
     else
         PRODUCT_PROPERTY_OVERRIDES += \
-            ro.modversion=CyanogenMod-7.1.0-RC1-es209ra-KANG
+            ro.modversion=CyanogenMod-7.1.0-es209ra-KANG
     endif
 endif
 
diff --git a/products/cyanogen_espresso.mk b/products/cyanogen_espresso.mk
index 6498910..2a52f5c 100644
--- a/products/cyanogen_espresso.mk
+++ b/products/cyanogen_espresso.mk
@@ -37,10 +37,10 @@
 else
     ifdef CYANOGEN_RELEASE
         PRODUCT_PROPERTY_OVERRIDES += \
-            ro.modversion=CyanogenMod-7.1.0-RC1-Slide
+            ro.modversion=CyanogenMod-7.1.0-Slide
     else
         PRODUCT_PROPERTY_OVERRIDES += \
-            ro.modversion=CyanogenMod-7.1.0-RC1-Slide-KANG
+            ro.modversion=CyanogenMod-7.1.0-Slide-KANG
     endif
 endif
 
diff --git a/products/cyanogen_galaxysmtd.mk b/products/cyanogen_galaxysmtd.mk
index f3065bf..e3dd946 100644
--- a/products/cyanogen_galaxysmtd.mk
+++ b/products/cyanogen_galaxysmtd.mk
@@ -48,10 +48,10 @@
 else
     ifdef CYANOGEN_RELEASE
         PRODUCT_PROPERTY_OVERRIDES += \
-            ro.modversion=CyanogenMod-7.1.0-RC1-GalaxyS
+            ro.modversion=CyanogenMod-7.1.0-GalaxyS
     else
         PRODUCT_PROPERTY_OVERRIDES += \
-            ro.modversion=CyanogenMod-7.1.0-RC1-GalaxyS-KANG
+            ro.modversion=CyanogenMod-7.1.0-GalaxyS-KANG
     endif
 endif
 
diff --git a/products/cyanogen_glacier.mk b/products/cyanogen_glacier.mk
index 5d51f67..7f9a20c 100644
--- a/products/cyanogen_glacier.mk
+++ b/products/cyanogen_glacier.mk
@@ -43,10 +43,10 @@
 else
     ifdef CYANOGEN_RELEASE
         PRODUCT_PROPERTY_OVERRIDES += \
-            ro.modversion=CyanogenMod-7.1.0-RC1-glacier
+            ro.modversion=CyanogenMod-7.1.0-glacier
     else
         PRODUCT_PROPERTY_OVERRIDES += \
-            ro.modversion=CyanogenMod-7.1.0-RC1-glacier-KANG
+            ro.modversion=CyanogenMod-7.1.0-glacier-KANG
     endif
 endif
 
diff --git a/products/cyanogen_hallon.mk b/products/cyanogen_hallon.mk
index 817ab07..be847c9 100644
--- a/products/cyanogen_hallon.mk
+++ b/products/cyanogen_hallon.mk
@@ -41,10 +41,10 @@
 else
     ifdef CYANOGEN_RELEASE
         PRODUCT_PROPERTY_OVERRIDES += \
-            ro.modversion=CyanogenMod-7.1.0-RC1-XperiaNeo-MT15i
+            ro.modversion=CyanogenMod-7.1.0-XperiaNeo-MT15i
     else
         PRODUCT_PROPERTY_OVERRIDES += \
-            ro.modversion=CyanogenMod-7.1.0-RC1-XperiaNeo-MT15i-KANG
+            ro.modversion=CyanogenMod-7.1.0-XperiaNeo-MT15i-KANG
     endif
 endif
 
diff --git a/products/cyanogen_hero.mk b/products/cyanogen_hero.mk
index c822fce..0c1913f 100644
--- a/products/cyanogen_hero.mk
+++ b/products/cyanogen_hero.mk
@@ -32,10 +32,10 @@
 else
     ifdef CYANOGEN_RELEASE
         PRODUCT_PROPERTY_OVERRIDES += \
-            ro.modversion=CyanogenMod-7.1.0-RC1-Hero
+            ro.modversion=CyanogenMod-7.1.0-Hero
     else
         PRODUCT_PROPERTY_OVERRIDES += \
-            ro.modversion=CyanogenMod-7.1.0-RC1-Hero-KANG
+            ro.modversion=CyanogenMod-7.1.0-Hero-KANG
     endif
 endif
 
diff --git a/products/cyanogen_heroc.mk b/products/cyanogen_heroc.mk
index 8793aee..ed3760f 100644
--- a/products/cyanogen_heroc.mk
+++ b/products/cyanogen_heroc.mk
@@ -27,10 +27,10 @@
 else
     ifdef CYANOGEN_RELEASE
         PRODUCT_PROPERTY_OVERRIDES += \
-            ro.modversion=CyanogenMod-7.1.0-RC1-Heroc
+            ro.modversion=CyanogenMod-7.1.0-Heroc
     else
         PRODUCT_PROPERTY_OVERRIDES += \
-            ro.modversion=CyanogenMod-7.1.0-RC1-Heroc-KANG
+            ro.modversion=CyanogenMod-7.1.0-Heroc-KANG
     endif
 endif
 
diff --git a/products/cyanogen_inc.mk b/products/cyanogen_inc.mk
index cb92595..db6a400 100644
--- a/products/cyanogen_inc.mk
+++ b/products/cyanogen_inc.mk
@@ -33,10 +33,10 @@
 else
     ifdef CYANOGEN_RELEASE
         PRODUCT_PROPERTY_OVERRIDES += \
-            ro.modversion=CyanogenMod-7.1.0-RC1-Inc
+            ro.modversion=CyanogenMod-7.1.0-Inc
     else
         PRODUCT_PROPERTY_OVERRIDES += \
-            ro.modversion=CyanogenMod-7.1.0-RC1-Inc-KANG
+            ro.modversion=CyanogenMod-7.1.0-Inc-KANG
     endif
 endif
 
diff --git a/products/cyanogen_jordan.mk b/products/cyanogen_jordan.mk
index 0f65d28..ed4fa77 100644
--- a/products/cyanogen_jordan.mk
+++ b/products/cyanogen_jordan.mk
@@ -27,10 +27,10 @@
 else
     ifdef CYANOGEN_RELEASE
         PRODUCT_PROPERTY_OVERRIDES += \
-            ro.modversion=CyanogenMod-7.1.0-RC1-jordan
+            ro.modversion=CyanogenMod-7.1.0-jordan
     else
         PRODUCT_PROPERTY_OVERRIDES += \
-            ro.modversion=CyanogenMod-7.1.0-RC1-jordan
+            ro.modversion=CyanogenMod-7.1.0-jordan
     endif
 endif
 
diff --git a/products/cyanogen_legend.mk b/products/cyanogen_legend.mk
index 7bfa8ee..895b4ed 100644
--- a/products/cyanogen_legend.mk
+++ b/products/cyanogen_legend.mk
@@ -30,10 +30,10 @@
 else
     ifdef CYANOGEN_RELEASE
         PRODUCT_PROPERTY_OVERRIDES += \
-            ro.modversion=CyanogenMod-7.1.0-RC1-Legend
+            ro.modversion=CyanogenMod-7.1.0-Legend
     else
         PRODUCT_PROPERTY_OVERRIDES += \
-            ro.modversion=CyanogenMod-7.1.0-RC1-Legend-KANG
+            ro.modversion=CyanogenMod-7.1.0-Legend-KANG
     endif
 endif
 
diff --git a/products/cyanogen_leo.mk b/products/cyanogen_leo.mk
index 812c38b..2cafe0d 100644
--- a/products/cyanogen_leo.mk
+++ b/products/cyanogen_leo.mk
@@ -47,10 +47,10 @@
 else
     ifdef CYANOGEN_RELEASE
         PRODUCT_PROPERTY_OVERRIDES += \
-            ro.modversion=CyanogenMod-7.1.0-RC1-LEO
+            ro.modversion=CyanogenMod-7.1.0-LEO
     else
         PRODUCT_PROPERTY_OVERRIDES += \
-            ro.modversion=CyanogenMod-7.1.0-RC1-LEO-KANG
+            ro.modversion=CyanogenMod-7.1.0-LEO-KANG
     endif
 endif
 
diff --git a/products/cyanogen_liberty.mk b/products/cyanogen_liberty.mk
index bed6ed7..5e17f74 100644
--- a/products/cyanogen_liberty.mk
+++ b/products/cyanogen_liberty.mk
@@ -28,10 +28,10 @@
 else
     ifdef CYANOGEN_RELEASE
         PRODUCT_PROPERTY_OVERRIDES += \
-            ro.modversion=CyanogenMod-7.1.0-RC1-Liberty
+            ro.modversion=CyanogenMod-7.1.0-Liberty
     else
         PRODUCT_PROPERTY_OVERRIDES += \
-            ro.modversion=CyanogenMod-7.1.0-RC1-Liberty-KANG
+            ro.modversion=CyanogenMod-7.1.0-Liberty-KANG
     endif
 endif
 
diff --git a/products/cyanogen_mango.mk b/products/cyanogen_mango.mk
index 6920e42..7b1d296 100644
--- a/products/cyanogen_mango.mk
+++ b/products/cyanogen_mango.mk
@@ -41,10 +41,10 @@
 else
     ifdef CYANOGEN_RELEASE
         PRODUCT_PROPERTY_OVERRIDES += \
-            ro.modversion=CyanogenMod-7.1.0-RC1-XperiaMiniPro-SK17i
+            ro.modversion=CyanogenMod-7.1.0-XperiaMiniPro-SK17i
     else
         PRODUCT_PROPERTY_OVERRIDES += \
-            ro.modversion=CyanogenMod-7.1.0-RC1-XperiaMiniPro-SK17i-KANG
+            ro.modversion=CyanogenMod-7.1.0-XperiaMiniPro-SK17i-KANG
     endif
 endif
 
diff --git a/products/cyanogen_mecha.mk b/products/cyanogen_mecha.mk
index 8bbb94a..12b1567 100644
--- a/products/cyanogen_mecha.mk
+++ b/products/cyanogen_mecha.mk
@@ -35,10 +35,10 @@
 else
     ifdef CYANOGEN_RELEASE
         PRODUCT_PROPERTY_OVERRIDES += \
-            ro.modversion=CyanogenMod-7.1.0-RC1-Thunderbolt
+            ro.modversion=CyanogenMod-7.1.0-Thunderbolt
     else
         PRODUCT_PROPERTY_OVERRIDES += \
-            ro.modversion=CyanogenMod-7.1.0-RC1-Thunderbolt-KANG
+            ro.modversion=CyanogenMod-7.1.0-Thunderbolt-KANG
     endif
 endif
 
diff --git a/products/cyanogen_mimmi.mk b/products/cyanogen_mimmi.mk
index cfd3f62..3e18ebc 100644
--- a/products/cyanogen_mimmi.mk
+++ b/products/cyanogen_mimmi.mk
@@ -35,10 +35,10 @@
 else
     ifdef CYANOGEN_RELEASE
         PRODUCT_PROPERTY_OVERRIDES += \
-            ro.modversion=CyanogenMod-7.1.0-RC1-X10MiniPro
+            ro.modversion=CyanogenMod-7.1.0-X10MiniPro
     else
         PRODUCT_PROPERTY_OVERRIDES += \
-            ro.modversion=CyanogenMod-7.1.0-RC1-X10MiniPro-KANG
+            ro.modversion=CyanogenMod-7.1.0-X10MiniPro-KANG
     endif
 endif
 
diff --git a/products/cyanogen_morrison.mk b/products/cyanogen_morrison.mk
index 6baad7f..4bc69d5 100644
--- a/products/cyanogen_morrison.mk
+++ b/products/cyanogen_morrison.mk
@@ -26,10 +26,10 @@
 else
     ifdef CYANOGEN_RELEASE
         PRODUCT_PROPERTY_OVERRIDES += \
-            ro.modversion=CyanogenMod-7.1.0-RC1-CLIQ
+            ro.modversion=CyanogenMod-7.1.0-CLIQ
     else
         PRODUCT_PROPERTY_OVERRIDES += \
-            ro.modversion=CyanogenMod-7.1.0-RC1-CLIQ-KANG
+            ro.modversion=CyanogenMod-7.1.0-CLIQ-KANG
     endif
 endif
 
diff --git a/products/cyanogen_motus.mk b/products/cyanogen_motus.mk
index deb0bf8..3649568 100644
--- a/products/cyanogen_motus.mk
+++ b/products/cyanogen_motus.mk
@@ -24,10 +24,10 @@
 else
     ifdef CYANOGEN_RELEASE
         PRODUCT_PROPERTY_OVERRIDES += \
-            ro.modversion=CyanogenMod-7.1.0-RC1-BACKFLIP
+            ro.modversion=CyanogenMod-7.1.0-BACKFLIP
     else
         PRODUCT_PROPERTY_OVERRIDES += \
-            ro.modversion=CyanogenMod-7.1.0-RC1-BACKFLIP-KANG
+            ro.modversion=CyanogenMod-7.1.0-BACKFLIP-KANG
     endif
 endif
 
diff --git a/products/cyanogen_one.mk b/products/cyanogen_one.mk
index 069797c..4c8b51f 100644
--- a/products/cyanogen_one.mk
+++ b/products/cyanogen_one.mk
@@ -32,10 +32,10 @@
 else
     ifdef CYANOGEN_RELEASE
         PRODUCT_PROPERTY_OVERRIDES += \
-            ro.modversion=CyanogenMod-7.1.0-RC1-ONE
+            ro.modversion=CyanogenMod-7.1.0-ONE
     else
         PRODUCT_PROPERTY_OVERRIDES += \
-            ro.modversion=CyanogenMod-7.1.0-RC1-ONE-KANG
+            ro.modversion=CyanogenMod-7.1.0-ONE-KANG
     endif
 endif
 
diff --git a/products/cyanogen_p990.mk b/products/cyanogen_p990.mk
index 595c7e1..a934429 100644
--- a/products/cyanogen_p990.mk
+++ b/products/cyanogen_p990.mk
@@ -29,10 +29,10 @@
 else
     ifdef CYANOGEN_RELEASE
         PRODUCT_PROPERTY_OVERRIDES += \
-            ro.modversion=CyanogenMod-7.1.0-RC1-Optimus2X
+            ro.modversion=CyanogenMod-7.1.0-Optimus2X
     else
         PRODUCT_PROPERTY_OVERRIDES += \
-            ro.modversion=CyanogenMod-7.1.0-RC1-Optimus2X-KANG
+            ro.modversion=CyanogenMod-7.1.0-Optimus2X-KANG
     endif
 endif
 
diff --git a/products/cyanogen_p999.mk b/products/cyanogen_p999.mk
index 630078d..85b8d21 100644
--- a/products/cyanogen_p999.mk
+++ b/products/cyanogen_p999.mk
@@ -43,10 +43,10 @@
 else
     ifdef CYANOGEN_RELEASE
         PRODUCT_PROPERTY_OVERRIDES += \
-            ro.modversion=CyanogenMod-7.1.0-RC1-G2x
+            ro.modversion=CyanogenMod-7.1.0-G2x
     else
         PRODUCT_PROPERTY_OVERRIDES += \
-            ro.modversion=CyanogenMod-7.1.0-RC1-G2x-KANG
+            ro.modversion=CyanogenMod-7.1.0-G2x-KANG
     endif
 endif
 
diff --git a/products/cyanogen_passion.mk b/products/cyanogen_passion.mk
index 2b43532..1d42eeb 100644
--- a/products/cyanogen_passion.mk
+++ b/products/cyanogen_passion.mk
@@ -46,10 +46,10 @@
 else
     ifdef CYANOGEN_RELEASE
         PRODUCT_PROPERTY_OVERRIDES += \
-            ro.modversion=CyanogenMod-7.1.0-RC1-N1
+            ro.modversion=CyanogenMod-7.1.0-N1
     else
         PRODUCT_PROPERTY_OVERRIDES += \
-            ro.modversion=CyanogenMod-7.1.0-RC1-N1-KANG
+            ro.modversion=CyanogenMod-7.1.0-N1-KANG
     endif
 endif
 
diff --git a/products/cyanogen_robyn.mk b/products/cyanogen_robyn.mk
index 2a2cf20..1635134 100644
--- a/products/cyanogen_robyn.mk
+++ b/products/cyanogen_robyn.mk
@@ -35,10 +35,10 @@
 else
     ifdef CYANOGEN_RELEASE
         PRODUCT_PROPERTY_OVERRIDES += \
-            ro.modversion=CyanogenMod-7.1.0-RC1-X10Mini
+            ro.modversion=CyanogenMod-7.1.0-X10Mini
     else
         PRODUCT_PROPERTY_OVERRIDES += \
-            ro.modversion=CyanogenMod-7.1.0-RC1-X10Mini-KANG
+            ro.modversion=CyanogenMod-7.1.0-X10Mini-KANG
     endif
 endif
 
diff --git a/products/cyanogen_saga.mk b/products/cyanogen_saga.mk
index 6f72184..c5fe0e8 100644
--- a/products/cyanogen_saga.mk
+++ b/products/cyanogen_saga.mk
@@ -40,10 +40,10 @@
 else
     ifdef CYANOGEN_RELEASE
         PRODUCT_PROPERTY_OVERRIDES += \
-            ro.modversion=CyanogenMod-7.1.0-RC1-DesireS
+            ro.modversion=CyanogenMod-7.1.0-DesireS
     else
         PRODUCT_PROPERTY_OVERRIDES += \
-            ro.modversion=CyanogenMod-7.1.0-RC1-DesireS-KANG
+            ro.modversion=CyanogenMod-7.1.0-DesireS-KANG
     endif
 endif
 
diff --git a/products/cyanogen_shakira.mk b/products/cyanogen_shakira.mk
index 11ff00a..4c5f05f 100644
--- a/products/cyanogen_shakira.mk
+++ b/products/cyanogen_shakira.mk
@@ -32,10 +32,10 @@
 else
     ifdef CYANOGEN_RELEASE
         PRODUCT_PROPERTY_OVERRIDES += \
-            ro.modversion=CyanogenMod-7.1.0-RC1-X8
+            ro.modversion=CyanogenMod-7.1.0-X8
     else
         PRODUCT_PROPERTY_OVERRIDES += \
-            ro.modversion=CyanogenMod-7.1.0-RC1-X8-KANG
+            ro.modversion=CyanogenMod-7.1.0-X8-KANG
     endif
 endif
 
diff --git a/products/cyanogen_sholes.mk b/products/cyanogen_sholes.mk
index a8f6939..4f092f5 100644
--- a/products/cyanogen_sholes.mk
+++ b/products/cyanogen_sholes.mk
@@ -22,10 +22,10 @@
 else
     ifdef CYANOGEN_RELEASE
         PRODUCT_PROPERTY_OVERRIDES += \
-            ro.modversion=CyanogenMod-7.1.0-RC1-Droid
+            ro.modversion=CyanogenMod-7.1.0-Droid
     else
         PRODUCT_PROPERTY_OVERRIDES += \
-            ro.modversion=CyanogenMod-7.1.0-RC1-Droid-KANG
+            ro.modversion=CyanogenMod-7.1.0-Droid-KANG
     endif
 endif
 
diff --git a/products/cyanogen_smb_a1002.mk b/products/cyanogen_smb_a1002.mk
index 0acc527..caa64a8 100644
--- a/products/cyanogen_smb_a1002.mk
+++ b/products/cyanogen_smb_a1002.mk
@@ -27,10 +27,10 @@
 else
     ifdef CYANOGEN_RELEASE
         PRODUCT_PROPERTY_OVERRIDES += \
-            ro.modversion=CyanogenMod-7.1.0-RC1-smb_a1002
+            ro.modversion=CyanogenMod-7.1.0-smb_a1002
     else
         PRODUCT_PROPERTY_OVERRIDES += \
-            ro.modversion=CyanogenMod-7.1.0-RC1-smb_a1002-KANG
+            ro.modversion=CyanogenMod-7.1.0-smb_a1002-KANG
     endif
 endif
 
diff --git a/products/cyanogen_smb_a1004.mk b/products/cyanogen_smb_a1004.mk
index e9d38a6..e14601c 100644
--- a/products/cyanogen_smb_a1004.mk
+++ b/products/cyanogen_smb_a1004.mk
@@ -27,10 +27,10 @@
 else
     ifdef CYANOGEN_RELEASE
         PRODUCT_PROPERTY_OVERRIDES += \
-            ro.modversion=CyanogenMod-7.1.0-RC1-SMB-A1004
+            ro.modversion=CyanogenMod-7.1.0-SMB-A1004
     else
         PRODUCT_PROPERTY_OVERRIDES += \
-            ro.modversion=CyanogenMod-7.1.0-RC1-SMB-A1004-KANG
+            ro.modversion=CyanogenMod-7.1.0-SMB-A1004-KANG
     endif
 endif
 
diff --git a/products/cyanogen_smb_a1011.mk b/products/cyanogen_smb_a1011.mk
index 66329eb..62dd6f9 100644
--- a/products/cyanogen_smb_a1011.mk
+++ b/products/cyanogen_smb_a1011.mk
@@ -27,10 +27,10 @@
 else
     ifdef CYANOGEN_RELEASE
         PRODUCT_PROPERTY_OVERRIDES += \
-            ro.modversion=CyanogenMod-7.1.0-RC1-SMB-A1011
+            ro.modversion=CyanogenMod-7.1.0-SMB-A1011
     else
         PRODUCT_PROPERTY_OVERRIDES += \
-            ro.modversion=CyanogenMod-7.1.0-RC1-SMB-A1011-KANG
+            ro.modversion=CyanogenMod-7.1.0-SMB-A1011-KANG
     endif
 endif
 
diff --git a/products/cyanogen_smb_b9701.mk b/products/cyanogen_smb_b9701.mk
index efcfa9b..b0c2a46 100644
--- a/products/cyanogen_smb_b9701.mk
+++ b/products/cyanogen_smb_b9701.mk
@@ -27,10 +27,10 @@
 else
     ifdef CYANOGEN_RELEASE
         PRODUCT_PROPERTY_OVERRIDES += \
-            ro.modversion=CyanogenMod-7.1.0-RC1-smb_b9701
+            ro.modversion=CyanogenMod-7.1.0-smb_b9701
     else
         PRODUCT_PROPERTY_OVERRIDES += \
-            ro.modversion=CyanogenMod-7.1.0-RC1-smb_b9701-KANG
+            ro.modversion=CyanogenMod-7.1.0-smb_b9701-KANG
     endif
 endif
 
diff --git a/products/cyanogen_smultron.mk b/products/cyanogen_smultron.mk
index e8d4dd3..15c9689 100644
--- a/products/cyanogen_smultron.mk
+++ b/products/cyanogen_smultron.mk
@@ -41,10 +41,10 @@
 else
     ifdef CYANOGEN_RELEASE
         PRODUCT_PROPERTY_OVERRIDES += \
-            ro.modversion=CyanogenMod-7.1.0-RC1-XperiaMini-ST15i
+            ro.modversion=CyanogenMod-7.1.0-XperiaMini-ST15i
     else
         PRODUCT_PROPERTY_OVERRIDES += \
-            ro.modversion=CyanogenMod-7.1.0-RC1-XperiaMini-ST15i-KANG
+            ro.modversion=CyanogenMod-7.1.0-XperiaMini-ST15i-KANG
     endif
 endif
 
diff --git a/products/cyanogen_speedy.mk b/products/cyanogen_speedy.mk
index f8c8f9c..338c4c3 100644
--- a/products/cyanogen_speedy.mk
+++ b/products/cyanogen_speedy.mk
@@ -40,10 +40,10 @@
 else
     ifdef CYANOGEN_RELEASE
         PRODUCT_PROPERTY_OVERRIDES += \
-            ro.modversion=CyanogenMod-7.1.0-RC1-Speedy
+            ro.modversion=CyanogenMod-7.1.0-Speedy
     else
         PRODUCT_PROPERTY_OVERRIDES += \
-            ro.modversion=CyanogenMod-7.1.0-RC1-Speedy-KANG
+            ro.modversion=CyanogenMod-7.1.0-Speedy-KANG
     endif
 endif
 
diff --git a/products/cyanogen_supersonic.mk b/products/cyanogen_supersonic.mk
index 24c972d..fd854ea 100644
--- a/products/cyanogen_supersonic.mk
+++ b/products/cyanogen_supersonic.mk
@@ -40,10 +40,10 @@
 else
     ifdef CYANOGEN_RELEASE
         PRODUCT_PROPERTY_OVERRIDES += \
-            ro.modversion=CyanogenMod-7.1.0-RC1-Supersonic
+            ro.modversion=CyanogenMod-7.1.0-Supersonic
     else
         PRODUCT_PROPERTY_OVERRIDES += \
-            ro.modversion=CyanogenMod-7.1.0-RC1-Supersonic-KANG
+            ro.modversion=CyanogenMod-7.1.0-Supersonic-KANG
     endif
 endif
 
diff --git a/products/cyanogen_u8220.mk b/products/cyanogen_u8220.mk
index 80319a6..436e749 100644
--- a/products/cyanogen_u8220.mk
+++ b/products/cyanogen_u8220.mk
@@ -26,10 +26,10 @@
 else
     ifdef CYANOGEN_RELEASE
         PRODUCT_PROPERTY_OVERRIDES += \
-            ro.modversion=CyanogenMod-7.1.0-RC1-U8220
+            ro.modversion=CyanogenMod-7.1.0-U8220
     else
         PRODUCT_PROPERTY_OVERRIDES += \
-            ro.modversion=CyanogenMod-7.1.0-RC1-U8220-KANG
+            ro.modversion=CyanogenMod-7.1.0-U8220-KANG
     endif
 endif
 
diff --git a/products/cyanogen_urushi.mk b/products/cyanogen_urushi.mk
index 3cb1c65..3773777 100644
--- a/products/cyanogen_urushi.mk
+++ b/products/cyanogen_urushi.mk
@@ -41,10 +41,10 @@
 else
     ifdef CYANOGEN_RELEASE
         PRODUCT_PROPERTY_OVERRIDES += \
-            ro.modversion=CyanogenMod-7.1.0-RC1-XperiaArc-ST18i
+            ro.modversion=CyanogenMod-7.1.0-XperiaArc-ST18i
     else
         PRODUCT_PROPERTY_OVERRIDES += \
-            ro.modversion=CyanogenMod-7.1.0-RC1-XperiaArc-ST18i-KANG
+            ro.modversion=CyanogenMod-7.1.0-XperiaArc-ST18i-KANG
     endif
 endif
 
diff --git a/products/cyanogen_v9.mk b/products/cyanogen_v9.mk
index 00fe406..6bbae68 100644
--- a/products/cyanogen_v9.mk
+++ b/products/cyanogen_v9.mk
@@ -26,10 +26,10 @@
 else
     ifdef CYANOGEN_RELEASE
         PRODUCT_PROPERTY_OVERRIDES += \
-            ro.modversion=CyanogenMod-7.1.0-RC1-V9
+            ro.modversion=CyanogenMod-7.1.0-V9
     else
         PRODUCT_PROPERTY_OVERRIDES += \
-            ro.modversion=CyanogenMod-7.1.0-RC1-V9-KANG
+            ro.modversion=CyanogenMod-7.1.0-V9-KANG
     endif
 endif
 
diff --git a/products/cyanogen_vega.mk b/products/cyanogen_vega.mk
index b6ba0ef..e8b7809 100644
--- a/products/cyanogen_vega.mk
+++ b/products/cyanogen_vega.mk
@@ -27,10 +27,10 @@
 else
     ifdef CYANOGEN_RELEASE
         PRODUCT_PROPERTY_OVERRIDES += \
-            ro.modversion=CyanogenMod-7.1.0-RC1-Vega
+            ro.modversion=CyanogenMod-7.1.0-Vega
     else
         PRODUCT_PROPERTY_OVERRIDES += \
-            ro.modversion=CyanogenMod-7.1.0-RC1-Vega-KANG
+            ro.modversion=CyanogenMod-7.1.0-Vega-KANG
     endif
 endif
 
diff --git a/products/cyanogen_vibrantmtd.mk b/products/cyanogen_vibrantmtd.mk
index 62091eb..51c2909 100644
--- a/products/cyanogen_vibrantmtd.mk
+++ b/products/cyanogen_vibrantmtd.mk
@@ -48,10 +48,10 @@
 else
     ifdef CYANOGEN_RELEASE
         PRODUCT_PROPERTY_OVERRIDES += \
-            ro.modversion=CyanogenMod-7.1.0-RC1-Vibrant
+            ro.modversion=CyanogenMod-7.1.0-Vibrant
     else
         PRODUCT_PROPERTY_OVERRIDES += \
-            ro.modversion=CyanogenMod-7.1.0-RC1-Vibrant-KANG
+            ro.modversion=CyanogenMod-7.1.0-Vibrant-KANG
     endif
 endif
 
diff --git a/products/cyanogen_vision.mk b/products/cyanogen_vision.mk
index d21cbc1..e819ae1 100644
--- a/products/cyanogen_vision.mk
+++ b/products/cyanogen_vision.mk
@@ -45,10 +45,10 @@
 else
     ifdef CYANOGEN_RELEASE
         PRODUCT_PROPERTY_OVERRIDES += \
-            ro.modversion=CyanogenMod-7.1.0-RC1-vision
+            ro.modversion=CyanogenMod-7.1.0-vision
     else
         PRODUCT_PROPERTY_OVERRIDES += \
-            ro.modversion=CyanogenMod-7.1.0-RC1-vision-KANG
+            ro.modversion=CyanogenMod-7.1.0-vision-KANG
     endif
 endif
 
diff --git a/products/cyanogen_vivo.mk b/products/cyanogen_vivo.mk
index 25ec9ac..30ab2f3 100644
--- a/products/cyanogen_vivo.mk
+++ b/products/cyanogen_vivo.mk
@@ -40,10 +40,10 @@
 else
     ifdef CYANOGEN_RELEASE
         PRODUCT_PROPERTY_OVERRIDES += \
-            ro.modversion=CyanogenMod-7.1.0-RC1-IncS
+            ro.modversion=CyanogenMod-7.1.0-IncS
     else
         PRODUCT_PROPERTY_OVERRIDES += \
-            ro.modversion=CyanogenMod-7.1.0-RC1-IncS-KANG
+            ro.modversion=CyanogenMod-7.1.0-IncS-KANG
     endif
 endif
 
diff --git a/products/cyanogen_vivow.mk b/products/cyanogen_vivow.mk
index 7d7f823..eee13a3 100644
--- a/products/cyanogen_vivow.mk
+++ b/products/cyanogen_vivow.mk
@@ -37,10 +37,10 @@
 else
     ifdef CYANOGEN_RELEASE
         PRODUCT_PROPERTY_OVERRIDES += \
-            ro.modversion=CyanogenMod-7.1.0-Beta1-Inc2
+            ro.modversion=CyanogenMod-7.1.0-Inc2
     else
         PRODUCT_PROPERTY_OVERRIDES += \
-            ro.modversion=CyanogenMod-7.1.0-RC1-Beta1-Inc2-KANG
+            ro.modversion=CyanogenMod-7.1.0-Inc2-KANG
     endif
 endif
 
diff --git a/products/cyanogen_z71.mk b/products/cyanogen_z71.mk
index 233451d..0a2f5cf 100644
--- a/products/cyanogen_z71.mk
+++ b/products/cyanogen_z71.mk
@@ -28,10 +28,10 @@
 else
     ifdef CYANOGEN_RELEASE
         PRODUCT_PROPERTY_OVERRIDES += \
-            ro.modversion=CyanogenMod-7.1.0-RC1-Z71
+            ro.modversion=CyanogenMod-7.1.0-Z71
     else
         PRODUCT_PROPERTY_OVERRIDES += \
-            ro.modversion=CyanogenMod-7.1.0-RC1-Z71-KANG
+            ro.modversion=CyanogenMod-7.1.0-Z71-KANG
     endif
 endif
 
diff --git a/products/cyanogen_zeppelin.mk b/products/cyanogen_zeppelin.mk
index e4c6b0e..f3c9276 100644
--- a/products/cyanogen_zeppelin.mk
+++ b/products/cyanogen_zeppelin.mk
@@ -26,10 +26,10 @@
 else
     ifdef CYANOGEN_RELEASE
         PRODUCT_PROPERTY_OVERRIDES += \
-            ro.modversion=CyanogenMod-7.1.0-RC1-CLIQXT
+            ro.modversion=CyanogenMod-7.1.0-CLIQXT
     else
         PRODUCT_PROPERTY_OVERRIDES += \
-            ro.modversion=CyanogenMod-7.1.0-RC1-CLIQXT-KANG
+            ro.modversion=CyanogenMod-7.1.0-CLIQXT-KANG
     endif
 endif
 
diff --git a/products/cyanogen_zero.mk b/products/cyanogen_zero.mk
index 0b4b131..0cedb28 100644
--- a/products/cyanogen_zero.mk
+++ b/products/cyanogen_zero.mk
@@ -27,10 +27,10 @@
 else
     ifdef CYANOGEN_RELEASE
         PRODUCT_PROPERTY_OVERRIDES += \
-            ro.modversion=CyanogenMod-7.1.0-RC1-ZERO
+            ro.modversion=CyanogenMod-7.1.0-ZERO
     else
         PRODUCT_PROPERTY_OVERRIDES += \
-            ro.modversion=CyanogenMod-7.1.0-RC1-ZERO-KANG
+            ro.modversion=CyanogenMod-7.1.0-ZERO-KANG
     endif
 endif
 
diff --git a/products/cyanogen_zeus.mk b/products/cyanogen_zeus.mk
index f6c6e09..dc3ffb4 100644
--- a/products/cyanogen_zeus.mk
+++ b/products/cyanogen_zeus.mk
@@ -41,10 +41,10 @@
 else
     ifdef CYANOGEN_RELEASE
         PRODUCT_PROPERTY_OVERRIDES += \
-            ro.modversion=CyanogenMod-7.1.0-RC1-XperiaPlay-R800i
+            ro.modversion=CyanogenMod-7.1.0-XperiaPlay-R800i
     else
         PRODUCT_PROPERTY_OVERRIDES += \
-            ro.modversion=CyanogenMod-7.1.0-RC1-XperiaPlay-R800i-KANG
+            ro.modversion=CyanogenMod-7.1.0-XperiaPlay-R800i-KANG
     endif
 endif
 
diff --git a/products/cyanogen_zeusc.mk b/products/cyanogen_zeusc.mk
index 76c89ce..ff4137f 100644
--- a/products/cyanogen_zeusc.mk
+++ b/products/cyanogen_zeusc.mk
@@ -39,10 +39,10 @@
 else
     ifdef CYANOGEN_RELEASE
         PRODUCT_PROPERTY_OVERRIDES += \
-            ro.modversion=CyanogenMod-7.1.0-RC1-XperiaPlay-R800x
+            ro.modversion=CyanogenMod-7.1.0-XperiaPlay-R800x
     else
         PRODUCT_PROPERTY_OVERRIDES += \
-            ro.modversion=CyanogenMod-7.1.0-RC1-XperiaPlay-R800x-KANG
+            ro.modversion=CyanogenMod-7.1.0-XperiaPlay-R800x-KANG
     endif
 endif