diff --git a/config.xml b/config.xml
index bdde9506f..fe8521a85 100644
--- a/config.xml
+++ b/config.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<widget id="io.ark.wallet.mobile" version="1.8.3" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
+<widget id="io.ark.wallet.mobile" version="1.8.4" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
     <name>Ark Mobile</name>
     <description>ARK</description>
     <author email="mobile@ark.io" href="http://ark.io/">Ark Ecosystem</author>
diff --git a/package.json b/package.json
index a5e28b362..117696925 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "ark-mobile",
-	"version": "1.8.3",
+	"version": "1.8.4",
 	"author": "Ark Ecosystem <mobile@ark.io>",
 	"homepage": "https://github.com/ArkEcosystem/mobile-wallet#readme",
 	"scripts": {
diff --git a/src/app/app.constants.ts b/src/app/app.constants.ts
index cb674b8d0..6af9419a2 100644
--- a/src/app/app.constants.ts
+++ b/src/app/app.constants.ts
@@ -86,16 +86,14 @@ export const TRANSACTION_TYPES = {
 export const TRANSACTION_TYPES_ENTITY = {
 	TYPE: {
 		BUSINESS: 0,
-		BRIDGECHAIN: 1, // not used anymore but type is kept
-		DEVELOPER: 2,
-		PLUGIN: 3,
+		PRODUCT: 1,
+		PLUGIN: 2,
+		MODULE: 3,
 		DELEGATE: 4,
 	},
 
 	SUBTYPE: {
 		NONE: 0,
-		PLUGIN_CORE: 1,
-		PLUGIN_DESKTOP: 2,
 	},
 
 	ACTION: {
diff --git a/src/app/models/transaction.ts b/src/app/models/transaction.ts
index 07193d4ec..b526d40dd 100644
--- a/src/app/models/transaction.ts
+++ b/src/app/models/transaction.ts
@@ -200,32 +200,32 @@ export class Transaction extends TransactionModel {
 		if (this.isBusinessEntityUpdate()) {
 			return "TRANSACTIONS_PAGE.BUSINESS_ENTITY_UPDATE";
 		}
-		if (this.isDeveloperEntityRegistration()) {
-			return "TRANSACTIONS_PAGE.DEVELOPER_ENTITY_REGISTRATION";
+		if (this.isProductEntityRegistration()) {
+			return "TRANSACTIONS_PAGE.PRODUCT_ENTITY_REGISTRATION";
 		}
-		if (this.isDeveloperEntityResignation()) {
-			return "TRANSACTIONS_PAGE.DEVELOPER_ENTITY_REGISTRATION";
+		if (this.isProductEntityResignation()) {
+			return "TRANSACTIONS_PAGE.PRODUCT_ENTITY_REGISTRATION";
 		}
-		if (this.isDeveloperEntityUpdate()) {
-			return "TRANSACTIONS_PAGE.DEVELOPER_ENTITY_UPDATE";
+		if (this.isProductEntityUpdate()) {
+			return "TRANSACTIONS_PAGE.PRODUCT_ENTITY_UPDATE";
 		}
-		if (this.isCorePluginEntityRegistration()) {
-			return "TRANSACTIONS_PAGE.CORE_PLUGIN_ENTITY_REGISTRATION";
+		if (this.isPluginEntityRegistration()) {
+			return "TRANSACTIONS_PAGE.PLUGIN_ENTITY_REGISTRATION";
 		}
-		if (this.isCorePluginEntityResignation()) {
-			return "TRANSACTIONS_PAGE.CORE_PLUGIN_ENTITY_REGISTRATION";
+		if (this.isPluginEntityResignation()) {
+			return "TRANSACTIONS_PAGE.PLUGIN_ENTITY_REGISTRATION";
 		}
-		if (this.isCorePluginEntityUpdate()) {
-			return "TRANSACTIONS_PAGE.CORE_PLUGIN_ENTITY_UPDATE";
+		if (this.isPluginEntityUpdate()) {
+			return "TRANSACTIONS_PAGE.PLUGIN_ENTITY_UPDATE";
 		}
-		if (this.isDesktopPluginEntityRegistration()) {
-			return "TRANSACTIONS_PAGE.DESKTOP_PLUGIN_ENTITY_REGISTRATION";
+		if (this.isModuleEntityRegistration()) {
+			return "TRANSACTIONS_PAGE.MODULE_ENTITY_REGISTRATION";
 		}
-		if (this.isDesktopPluginEntityResignation()) {
-			return "TRANSACTIONS_PAGE.DESKTOP_PLUGIN_ENTITY_REGISTRATION";
+		if (this.isModuleEntityResignation()) {
+			return "TRANSACTIONS_PAGE.MODULE_ENTITY_REGISTRATION";
 		}
-		if (this.isDesktopPluginEntityUpdate()) {
-			return "TRANSACTIONS_PAGE.DESKTOP_PLUGIN_ENTITY_UPDATE";
+		if (this.isModuleEntityUpdate()) {
+			return "TRANSACTIONS_PAGE.MODULE_ENTITY_UPDATE";
 		}
 		if (this.isDelegateEntityRegistration()) {
 			return "TRANSACTIONS_PAGE.DELEGATE_ENTITY_REGISTRATION";
@@ -363,123 +363,105 @@ export class Transaction extends TransactionModel {
 	isBusinessEntityRegistration() {
 		return (
 			this.isEntityRegistration() &&
-			this.asset.type === TRANSACTION_TYPES_ENTITY.TYPE.BUSINESS &&
-			this.asset.subType === TRANSACTION_TYPES_ENTITY.SUBTYPE.NONE
+			this.asset.type === TRANSACTION_TYPES_ENTITY.TYPE.BUSINESS
 		);
 	}
 
 	isBusinessEntityResignation() {
 		return (
 			this.isEntityResignation() &&
-			this.asset.type === TRANSACTION_TYPES_ENTITY.TYPE.BUSINESS &&
-			this.asset.subType === TRANSACTION_TYPES_ENTITY.SUBTYPE.NONE
+			this.asset.type === TRANSACTION_TYPES_ENTITY.TYPE.BUSINESS
 		);
 	}
 
 	isBusinessEntityUpdate() {
 		return (
 			this.isEntityUpdate() &&
-			this.asset.type === TRANSACTION_TYPES_ENTITY.TYPE.BUSINESS &&
-			this.asset.subType === TRANSACTION_TYPES_ENTITY.SUBTYPE.NONE
+			this.asset.type === TRANSACTION_TYPES_ENTITY.TYPE.BUSINESS
 		);
 	}
 
-	isDeveloperEntityRegistration() {
+	isProductEntityRegistration() {
 		return (
 			this.isEntityRegistration() &&
-			this.asset.type === TRANSACTION_TYPES_ENTITY.TYPE.DEVELOPER &&
-			this.asset.subType === TRANSACTION_TYPES_ENTITY.SUBTYPE.NONE
+			this.asset.type === TRANSACTION_TYPES_ENTITY.TYPE.PRODUCT
 		);
 	}
 
-	isDeveloperEntityResignation() {
+	isProductEntityResignation() {
 		return (
 			this.isEntityResignation() &&
-			this.asset.type === TRANSACTION_TYPES_ENTITY.TYPE.DEVELOPER &&
-			this.asset.subType === TRANSACTION_TYPES_ENTITY.SUBTYPE.NONE
+			this.asset.type === TRANSACTION_TYPES_ENTITY.TYPE.PRODUCT
 		);
 	}
 
-	isDeveloperEntityUpdate() {
+	isProductEntityUpdate() {
 		return (
 			this.isEntityUpdate() &&
-			this.asset.type === TRANSACTION_TYPES_ENTITY.TYPE.DEVELOPER &&
-			this.asset.subType === TRANSACTION_TYPES_ENTITY.SUBTYPE.NONE
+			this.asset.type === TRANSACTION_TYPES_ENTITY.TYPE.PRODUCT
 		);
 	}
 
-	isCorePluginEntityRegistration() {
+	isPluginEntityRegistration() {
 		return (
 			this.isEntityRegistration() &&
-			this.asset.type === TRANSACTION_TYPES_ENTITY.TYPE.PLUGIN &&
-			this.asset.subType === TRANSACTION_TYPES_ENTITY.SUBTYPE.PLUGIN_CORE
+			this.asset.type === TRANSACTION_TYPES_ENTITY.TYPE.PLUGIN
 		);
 	}
 
-	isCorePluginEntityResignation() {
+	isPluginEntityResignation() {
 		return (
 			this.isEntityResignation() &&
-			this.asset.type === TRANSACTION_TYPES_ENTITY.TYPE.PLUGIN &&
-			this.asset.subType === TRANSACTION_TYPES_ENTITY.SUBTYPE.PLUGIN_CORE
+			this.asset.type === TRANSACTION_TYPES_ENTITY.TYPE.PLUGIN
 		);
 	}
 
-	isCorePluginEntityUpdate() {
+	isPluginEntityUpdate() {
 		return (
 			this.isEntityUpdate() &&
-			this.asset.type === TRANSACTION_TYPES_ENTITY.TYPE.PLUGIN &&
-			this.asset.subType === TRANSACTION_TYPES_ENTITY.SUBTYPE.PLUGIN_CORE
+			this.asset.type === TRANSACTION_TYPES_ENTITY.TYPE.PLUGIN
 		);
 	}
 
-	isDesktopPluginEntityRegistration() {
+	isModuleEntityRegistration() {
 		return (
 			this.isEntityRegistration() &&
-			this.asset.type === TRANSACTION_TYPES_ENTITY.TYPE.PLUGIN &&
-			this.asset.subType ===
-				TRANSACTION_TYPES_ENTITY.SUBTYPE.PLUGIN_DESKTOP
+			this.asset.type === TRANSACTION_TYPES_ENTITY.TYPE.MODULE
 		);
 	}
 
-	isDesktopPluginEntityResignation() {
+	isModuleEntityResignation() {
 		return (
 			this.isEntityResignation() &&
-			this.asset.type === TRANSACTION_TYPES_ENTITY.TYPE.PLUGIN &&
-			this.asset.subType ===
-				TRANSACTION_TYPES_ENTITY.SUBTYPE.PLUGIN_DESKTOP
+			this.asset.type === TRANSACTION_TYPES_ENTITY.TYPE.MODULE
 		);
 	}
 
-	isDesktopPluginEntityUpdate() {
+	isModuleEntityUpdate() {
 		return (
 			this.isEntityUpdate() &&
-			this.asset.type === TRANSACTION_TYPES_ENTITY.TYPE.PLUGIN &&
-			this.asset.subType ===
-				TRANSACTION_TYPES_ENTITY.SUBTYPE.PLUGIN_DESKTOP
+			this.asset.type === TRANSACTION_TYPES_ENTITY.TYPE.MODULE
 		);
 	}
 
 	isDelegateEntityRegistration() {
 		return (
 			this.isEntityRegistration() &&
-			this.asset.type === TRANSACTION_TYPES_ENTITY.TYPE.DELEGATE &&
-			this.asset.subType === TRANSACTION_TYPES_ENTITY.SUBTYPE.NONE
+			this.asset.type === TRANSACTION_TYPES_ENTITY.TYPE.DELEGATE
 		);
 	}
 
 	isDelegateEntityResignation() {
 		return (
 			this.isEntityResignation() &&
-			this.asset.type === TRANSACTION_TYPES_ENTITY.TYPE.DELEGATE &&
-			this.asset.subType === TRANSACTION_TYPES_ENTITY.SUBTYPE.NONE
+			this.asset.type === TRANSACTION_TYPES_ENTITY.TYPE.DELEGATE
 		);
 	}
 
 	isDelegateEntityUpdate() {
 		return (
 			this.isEntityUpdate() &&
-			this.asset.type === TRANSACTION_TYPES_ENTITY.TYPE.DELEGATE &&
-			this.asset.subType === TRANSACTION_TYPES_ENTITY.SUBTYPE.NONE
+			this.asset.type === TRANSACTION_TYPES_ENTITY.TYPE.DELEGATE
 		);
 	}
 
diff --git a/src/assets/i18n/en.json b/src/assets/i18n/en.json
index 74012e82b..8ca4b5a67 100644
--- a/src/assets/i18n/en.json
+++ b/src/assets/i18n/en.json
@@ -279,15 +279,15 @@
 		"BUSINESS_ENTITY_REGISTRATION": "Business Registration",
 		"BUSINESS_ENTITY_RESIGNATION": "Business Resignation",
 		"BUSINESS_ENTITY_UPDATE": "Business Update",
-		"DEVELOPER_ENTITY_REGISTRATION": "Developer Registration",
-		"DEVELOPER_ENTITY_RESIGNATION": "Developer Resignation",
-		"DEVELOPER_ENTITY_UPDATE": "Developer Update",
-		"CORE_PLUGIN_ENTITY_REGISTRATION": "Core Plugin Registration",
-		"CORE_PLUGIN_ENTITY_RESIGNATION": "Core Plugin Resignation",
-		"CORE_PLUGIN_ENTITY_UPDATE": "Core Plugin Update",
-		"DESKTOP_PLUGIN_ENTITY_REGISTRATION": "Desktop Plugin Registration",
-		"DESKTOP_PLUGIN_ENTITY_RESIGNATION": "Desktop Plugin Resignation",
-		"DESKTOP_PLUGIN_ENTITY_UPDATE": "Desktop Plugin Update",
+		"PRODUCT_ENTITY_REGISTRATION": "Product Registration",
+		"PRODUCT_ENTITY_RESIGNATION": "Product Resignation",
+		"PRODUCT_ENTITY_UPDATE": "Product Update",
+		"PLUGIN_ENTITY_REGISTRATION": "Plugin Registration",
+		"PLUGIN_ENTITY_RESIGNATION": "Plugin Resignation",
+		"PLUGIN_ENTITY_UPDATE": "Plugin Update",
+		"MODULE_ENTITY_REGISTRATION": "Module Registration",
+		"MODULE_ENTITY_RESIGNATION": "Module Resignation",
+		"MODULE_ENTITY_UPDATE": "Module Update",
 		"DELEGATE_ENTITY_REGISTRATION": "Delegate Registration (AIP36)",
 		"DELEGATE_ENTITY_RESIGNATION": "Delegate Resignation (AIP36)",
 		"DELEGATE_ENTITY_UPDATE": "Delegate Update",
@@ -299,10 +299,9 @@
 		"LEGACY_BRIDGECHAIN_RESIGNATION": "Bridgechain Resignation (Legacy)",
 		"LEGACY_BRIDGECHAIN_UPDATE": "Bridgechain Update (Legacy)",
 
-		"UNDEFINED_REGISTRATION": "Registration (Undefined)",
-		"UNDEFINED_RESIGNATION": "Resignation (Undefined)",
-		"UNDEFINED_UPDATE": "Update (Undefined)",
-
+		"UNDEFINED_REGISTRATION": "Undefined Registration",
+		"UNDEFINED_RESIGNATION": "Undefined Resignation",
+		"UNDEFINED_UPDATE": "Undefined Update",
 		"UNDEFINED": "Undefined"
 	},
 	"TYPE": "Type",