diff --git a/build/core/main_version.mk b/build/core/main_version.mk
index ef912a2..1ab209c 100644
--- a/build/core/main_version.mk
+++ b/build/core/main_version.mk
@@ -6,11 +6,11 @@
 
 ADDITIONAL_SYSTEM_PROPERTIES += \
   ro.bliss.codename=$(BLISS_CODENAME) \
-  ro.bliss.version=$(BLISS_DISPLAY_VERSION) \
+  ro.bliss.version=$(BLISS_VERSION) \
   ro.bliss.build.status=$(BLISS_BUILDTYPE) \
   ro.bliss.changelog.version=Changelog-$(BLISS_VERSION) \
   ro.bliss.fingerprint=$(BLISS_FINGERPRINT) \
   ro.bliss.static.version=$(BLISS_VERSION_STATIC) \
   ro.bliss.build.variant=$(BLISS_BUILD_VARIANT) \
   ro.bliss.build.timestamp=$(BLISS_BUILD_TIMESTAMP) \
-  ro.bliss.build=$(BLISS_VERSION)
+  ro.bliss.build=$(BLISS_BUILD_ZIP)
diff --git a/build/tasks/blissify.mk b/build/tasks/blissify.mk
index 5359f96..af7f2c5 100644
--- a/build/tasks/blissify.mk
+++ b/build/tasks/blissify.mk
@@ -13,7 +13,7 @@
 # limitations under the License.
 
 # Bliss Target Zip
-BLISS_TARGET_PACKAGE := $(PRODUCT_OUT)/$(BLISS_VERSION).zip
+BLISS_TARGET_PACKAGE := $(PRODUCT_OUT)/$(BLISS_BUILD_ZIP).zip
 
 MD5 := prebuilts/build-tools/path/$(HOST_OS)-x86/md5sum
 
diff --git a/config/versions.mk b/config/versions.mk
index 8e51bb6..479fe4a 100644
--- a/config/versions.mk
+++ b/config/versions.mk
@@ -16,7 +16,7 @@
 BLISS_BUILD_VARIANT ?= vanilla
 
 #ifdef BLISS_VERSION_MAINTENANCE
-    VERSION := $(BLISS_VERSION_MAJOR).$(BLISS_VERSION_MINOR)-$(BLISS_CODENAME)-$(BLISS_VERSION_MAINTENANCE)
+    VERSION := $(BLISS_VERSION_MAJOR).$(BLISS_VERSION_MINOR)-$(BLISS_VERSION_MAINTENANCE)
 #else
 #    VERSION := $(BLISS_VERSION_MAJOR).$(BLISS_VERSION_MINOR)
 #endif
@@ -41,12 +41,13 @@
 
 # Set BLISS version
 ifdef BLISS_RELEASE
-    BLISS_VERSION := Bliss-v$(VERSION)
+    BLISS_BUILD_ZIP := Bliss-v$(VERSION)
 else
-    BLISS_VERSION := Bliss-v$(VERSION)-$(BLISS_BUILD)-$(BLISS_BUILDTYPE)-$(BLISS_BUILD_VARIANT)-$(shell date +%Y%m%d)
+    BLISS_BUILD_ZIP := Bliss-v$(VERSION)-$(BLISS_CODENAME)-$(BLISS_BUILD)-$(BLISS_BUILDTYPE)-$(BLISS_BUILD_VARIANT)-$(shell date +%Y%m%d)
 endif
 
-BLISS_DISPLAY_VERSION := $(VERSION)
+BLISS_DEVICE := $(BLISS_BUILD)
+BLISS_VERSION := $(VERSION)
 BLISS_DISPLAY_BUILDTYPE := $(BLISS_BUILDTYPE)
 BLISS_FINGERPRINT := Bliss/$(VERSION)/$(TARGET_PRODUCT_SHORT)/$(shell date +%Y%m%d)
 BLISS_BUILD_TIMESTAMP := $(shell date +%Y%m%d)