diff --git a/BlissLauncher/app-apiNougat-release-unsigned.apk b/BlissLauncher/app-apiNougat-release-unsigned.apk
index 00dcdbf58ecb05a2011198fe2137564bdaef0de8..4cc336ad73168b294b2279f70bea1bea3daebad6 100644
Binary files a/BlissLauncher/app-apiNougat-release-unsigned.apk and b/BlissLauncher/app-apiNougat-release-unsigned.apk differ
diff --git a/BlissLauncher/app-apiOreo-release-unsigned.apk b/BlissLauncher/app-apiOreo-release-unsigned.apk
index 13ed8e98d97a6cee090f254c8ffb33f01a136228..299ee5939a884ddaa686aa880fc5cb2924f03cc6 100644
Binary files a/BlissLauncher/app-apiOreo-release-unsigned.apk and b/BlissLauncher/app-apiOreo-release-unsigned.apk differ
diff --git a/Browser/Android.mk b/Browser/Android.mk
index 7bb508ccc71d0b97d3bbad6b83fd49135848d997..92fd0919c80e24d147eecafa597f808ac0e213ce 100644
--- a/Browser/Android.mk
+++ b/Browser/Android.mk
@@ -7,9 +7,9 @@ LOCAL_MULTILIB := both
 LOCAL_OVERRIDES_PACKAGES := Jelly
 
 ifeq ($(TARGET_CPU_ABI), arm64-v8a)
-	LOCAL_SRC_FILES := arm64_ChromeModernPublic.apk
+	LOCAL_SRC_FILES := ChromeModernPublic_arm64.apk
 else
-	LOCAL_SRC_FILES := arm_ChromeModernPublic.apk
+	LOCAL_SRC_FILES := ChromeModernPublic_arm.apk
 endif
 
 LOCAL_MODULE_CLASS := APPS
diff --git a/Browser/arm_ChromeModernPublic.apk b/Browser/ChromeModernPublic_arm.apk
similarity index 81%
rename from Browser/arm_ChromeModernPublic.apk
rename to Browser/ChromeModernPublic_arm.apk
index 9063e85a5bb57e0cbdfc4f17ea542f0c3e10011c..8cbf0517b1807ff2b0ca8f036227904e24d29d65 100644
Binary files a/Browser/arm_ChromeModernPublic.apk and b/Browser/ChromeModernPublic_arm.apk differ
diff --git a/Browser/arm64_ChromeModernPublic.apk b/Browser/ChromeModernPublic_arm64.apk
similarity index 83%
rename from Browser/arm64_ChromeModernPublic.apk
rename to Browser/ChromeModernPublic_arm64.apk
index 9327485c916274479ea96c772b979ce5d7edc1db..55d0ec2cf3866babe028e7e78471a5e15b781e88 100644
Binary files a/Browser/arm64_ChromeModernPublic.apk and b/Browser/ChromeModernPublic_arm64.apk differ
diff --git a/BrowserWebView/Android.mk b/BrowserWebView/Android.mk
index 176d611fc47db95d56d771b8703f2866aa87953f..eabb3cff79084ede9d108234f8a8c9fabc38af3e 100644
--- a/BrowserWebView/Android.mk
+++ b/BrowserWebView/Android.mk
@@ -10,9 +10,9 @@ LOCAL_REQUIRED_MODULES := \
         libwebviewchromium_plat_support
 
 ifeq ($(TARGET_CPU_ABI), arm64-v8a)
-	LOCAL_SRC_FILES := arm64_SystemWebView.apk
+	LOCAL_SRC_FILES := SystemWebView_arm64.apk
 else
-	LOCAL_SRC_FILES := arm_SystemWebView.apk
+	LOCAL_SRC_FILES := SystemWebView_arm.apk
 endif
 
 LOCAL_MODULE_CLASS := APPS
diff --git a/BrowserWebView/arm_SystemWebView.apk b/BrowserWebView/SystemWebView_arm.apk
similarity index 79%
rename from BrowserWebView/arm_SystemWebView.apk
rename to BrowserWebView/SystemWebView_arm.apk
index a48d098ae080fa3d05829fc7726b85d24e2717e0..c52c68a229daffcd9e6975601ecf13b35fa22cc4 100644
Binary files a/BrowserWebView/arm_SystemWebView.apk and b/BrowserWebView/SystemWebView_arm.apk differ
diff --git a/BrowserWebView/arm64_SystemWebView.apk b/BrowserWebView/SystemWebView_arm64.apk
similarity index 83%
rename from BrowserWebView/arm64_SystemWebView.apk
rename to BrowserWebView/SystemWebView_arm64.apk
index 56991be1cd62218c3d6b6f6ade57b96b0d129fbf..87312ad61e518fc88ada105ece70fbfdde5735be 100644
Binary files a/BrowserWebView/arm64_SystemWebView.apk and b/BrowserWebView/SystemWebView_arm64.apk differ
diff --git a/Message/presentation-noAnalytics-universal-release-unsigned.apk b/Message/presentation-noAnalytics-universal-release-unsigned.apk
index 035ce8dbe0122aca716138663f57af8efc97a39c..a6352a41a5a28b4e2bdc8c40cc66086d3fa3371b 100644
Binary files a/Message/presentation-noAnalytics-universal-release-unsigned.apk and b/Message/presentation-noAnalytics-universal-release-unsigned.apk differ
diff --git a/OpenCamera/Android.mk b/OpenCamera/Android.mk
index 4a39e6a992adcc6e2539cf917b0e008adaf974d8..e173aa52657937a5f258bae0ae492f57fa63a92a 100644
--- a/OpenCamera/Android.mk
+++ b/OpenCamera/Android.mk
@@ -2,9 +2,9 @@ LOCAL_PATH := $(call my-dir)
 include $(CLEAR_VARS)
 LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE := OpenCamera
-LOCAL_SRC_FILES := net.sourceforge.opencamera_70.apk
+LOCAL_SRC_FILES := app-release-unsigned.apk
 LOCAL_MODULE_CLASS := APPS
 LOCAL_MODULE_SUFFIX := $(COMMON_ANDROID_PACKAGE_SUFFIX)
-LOCAL_CERTIFICATE := PRESIGNED
+LOCAL_CERTIFICATE := platform
 LOCAL_OVERRIDES_PACKAGES := Camera2 Snap
 include $(BUILD_PREBUILT)
diff --git a/OpenCamera/net.sourceforge.opencamera_70.apk b/OpenCamera/app-release-unsigned.apk
similarity index 50%
rename from OpenCamera/net.sourceforge.opencamera_70.apk
rename to OpenCamera/app-release-unsigned.apk
index db203d1c32e357465180cb88675bf6eb92126132..723de2682dad41944489bfd3f22a4653115b0dd8 100644
Binary files a/OpenCamera/net.sourceforge.opencamera_70.apk and b/OpenCamera/app-release-unsigned.apk differ