diff --git a/CHANGELOG.mkdn b/CHANGELOG.mkdn
index cf31354..d696e9a 100644
--- a/CHANGELOG.mkdn
+++ b/CHANGELOG.mkdn
@@ -27,7 +27,7 @@
 * Geeksphone ZERO: arcee
 * Z71 (Boston, G1305, XT502, A60, Blaze, others): arcee
 * Wildfire: Jacob Crawley, Arne Coucheron
-* NVidia Harmony: bekit, pershoot
+* Harmony (Malata smb_a1002): bekit, pershoot
 * Ace (Desire HD): Kali-
 * Glacier (MT4G): Zinx, Kmobs
 * Click (Tattoo): KalimochoAz
diff --git a/overlay/harmony/packages/apps/ADWLauncher/res/values/config.xml b/overlay/smb_a1002/packages/apps/ADWLauncher/res/values/config.xml
similarity index 100%
rename from overlay/harmony/packages/apps/ADWLauncher/res/values/config.xml
rename to overlay/smb_a1002/packages/apps/ADWLauncher/res/values/config.xml
diff --git a/overlay/harmony/packages/apps/CMParts/res/values/config.xml b/overlay/smb_a1002/packages/apps/CMParts/res/values/config.xml
similarity index 100%
rename from overlay/harmony/packages/apps/CMParts/res/values/config.xml
rename to overlay/smb_a1002/packages/apps/CMParts/res/values/config.xml
diff --git a/overlay/harmony/packages/apps/Contacts/AndroidManifest.xml b/overlay/smb_a1002/packages/apps/Contacts/AndroidManifest.xml
similarity index 100%
rename from overlay/harmony/packages/apps/Contacts/AndroidManifest.xml
rename to overlay/smb_a1002/packages/apps/Contacts/AndroidManifest.xml
diff --git a/products/AndroidProducts.mk b/products/AndroidProducts.mk
index 02b547f..6dea679 100644
--- a/products/AndroidProducts.mk
+++ b/products/AndroidProducts.mk
@@ -18,7 +18,6 @@
     $(LOCAL_DIR)/cyanogen_galaxysmtd.mk \
     $(LOCAL_DIR)/cyanogen_generic.mk \
     $(LOCAL_DIR)/cyanogen_glacier.mk \
-    $(LOCAL_DIR)/cyanogen_harmony.mk \
     $(LOCAL_DIR)/cyanogen_legend.mk \
     $(LOCAL_DIR)/cyanogen_leo.mk \
     $(LOCAL_DIR)/cyanogen_liberty.mk \
@@ -28,6 +27,7 @@
     $(LOCAL_DIR)/cyanogen_p999.mk \
     $(LOCAL_DIR)/cyanogen_passion.mk \
     $(LOCAL_DIR)/cyanogen_sholes.mk \
+    $(LOCAL_DIR)/cyanogen_smb_a1002.mk \
     $(LOCAL_DIR)/cyanogen_speedy.mk \
     $(LOCAL_DIR)/cyanogen_supersonic.mk \
     $(LOCAL_DIR)/cyanogen_u8220.mk \
diff --git a/products/cyanogen_harmony.mk b/products/cyanogen_harmony.mk
deleted file mode 100644
index 247fad7..0000000
--- a/products/cyanogen_harmony.mk
+++ /dev/null
@@ -1,40 +0,0 @@
-$(call inherit-product, device/nvidia/harmony/device_harmony.mk)
-
-# Inherit some common cyanogenmod stuff.
-$(call inherit-product, vendor/cyanogen/products/common_full.mk)
-
-#
-# Setup device specific product configuration.
-#
-PRODUCT_NAME := cyanogen_harmony
-PRODUCT_BRAND := nvidia
-PRODUCT_DEVICE := harmony
-PRODUCT_MODEL := GTablet
-PRODUCT_MANUFACTURER := malata
-PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=harmony BUILD_ID=GRI40 BUILD_DISPLAY_ID=GRJ22 BUILD_FINGERPRINT=google/passion/passion:2.3.3/GRI40/102588:user/release-keys PRIVATE_BUILD_DESC="passion-user 2.3.3 GRI40 102588 release-keys"
-
-# Extra overlay
-PRODUCT_PACKAGE_OVERLAYS += \
-    vendor/cyanogen/overlay/tablet \
-    vendor/cyanogen/overlay/harmony
-#
-# Set ro.modversion
-#
-ifdef CYANOGEN_NIGHTLY
-    PRODUCT_PROPERTY_OVERRIDES += \
-        ro.modversion=CyanogenMod-7-$(shell date +%m%d%Y)-NIGHTLY-Harmony
-else
-    ifdef CYANOGEN_RELEASE
-        PRODUCT_PROPERTY_OVERRIDES += \
-            ro.modversion=CyanogenMod-7.1.0-RC0-Harmony
-    else
-        PRODUCT_PROPERTY_OVERRIDES += \
-            ro.modversion=CyanogenMod-7.1.0-RC0-Harmony-KANG
-    endif
-endif
-
-#
-# Copy passion specific prebuilt files
-#
-PRODUCT_COPY_FILES +=  \
-    vendor/cyanogen/prebuilt/mdpi/media/bootanimation.zip:system/media/bootanimation.zip
diff --git a/products/cyanogen_smb_a1002.mk b/products/cyanogen_smb_a1002.mk
new file mode 100644
index 0000000..76e5cbe
--- /dev/null
+++ b/products/cyanogen_smb_a1002.mk
@@ -0,0 +1,41 @@
+$(call inherit-product, device/malata/smb_a1002/smb_a1002.mk)
+
+# Inherit some common cyanogenmod stuff.
+$(call inherit-product, vendor/cyanogen/products/common_full.mk)
+
+#
+# Setup device specific product configuration.
+#
+PRODUCT_NAME := cyanogen_smb_a1002
+PRODUCT_BRAND := nvidia
+PRODUCT_DEVICE := smb_a1002
+PRODUCT_MODEL := GTablet
+PRODUCT_MANUFACTURER := malata
+PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=smb_a1002 BUILD_ID=GRJ22 BUILD_DISPLAY_ID=GRJ22 BUILD_FINGERPRINT=google/passion/passion:2.3.4/GRJ22/121341:user/release-keys PRIVATE_BUILD_DESC="passion-user 2.3.4 GRJ22 121341 release-keys"
+
+# Extra overlay
+PRODUCT_PACKAGE_OVERLAYS += \
+    vendor/cyanogen/overlay/tablet \
+    vendor/cyanogen/overlay/smb_a1002
+
+#
+# Set ro.modversion
+#
+ifdef CYANOGEN_NIGHTLY
+    PRODUCT_PROPERTY_OVERRIDES += \
+        ro.modversion=CyanogenMod-7-$(shell date +%m%d%Y)-NIGHTLY-smb_a1002
+else
+    ifdef CYANOGEN_RELEASE
+        PRODUCT_PROPERTY_OVERRIDES += \
+            ro.modversion=CyanogenMod-7.1.0-RC0-smb_a1002
+    else
+        PRODUCT_PROPERTY_OVERRIDES += \
+            ro.modversion=CyanogenMod-7.1.0-RC0-smb_a1002-KANG
+    endif
+endif
+
+#
+# Copy passion specific prebuilt files
+#
+PRODUCT_COPY_FILES +=  \
+    vendor/cyanogen/prebuilt/mdpi/media/bootanimation.zip:system/media/bootanimation.zip
diff --git a/vendorsetup.sh b/vendorsetup.sh
index acfb602..8f78479 100644
--- a/vendorsetup.sh
+++ b/vendorsetup.sh
@@ -14,7 +14,6 @@
 add_lunch_combo cyanogen_galaxysmtd-eng
 add_lunch_combo cyanogen_generic-eng
 add_lunch_combo cyanogen_glacier-eng
-add_lunch_combo cyanogen_harmony-eng
 add_lunch_combo cyanogen_hero-eng
 add_lunch_combo cyanogen_heroc-eng
 add_lunch_combo cyanogen_inc-eng
@@ -27,6 +26,7 @@
 add_lunch_combo cyanogen_p999-eng
 add_lunch_combo cyanogen_passion-eng
 add_lunch_combo cyanogen_sholes-eng
+add_lunch_combo cyanogen_smb_a1002-eng
 add_lunch_combo cyanogen_speedy-eng
 add_lunch_combo cyanogen_supersonic-eng
 add_lunch_combo cyanogen_u8220-eng