Keep names of apk files constant
diff --git a/FDroid/Android.mk b/FDroid/Android.mk
index 9240092..2fe22a8 100644
--- a/FDroid/Android.mk
+++ b/FDroid/Android.mk
@@ -2,7 +2,7 @@
include $(CLEAR_VARS)
LOCAL_MODULE_TAGS := optional
LOCAL_MODULE := FDroid
-LOCAL_SRC_FILES := org.fdroid.fdroid_1014050.apk
+LOCAL_SRC_FILES := FDroid.apk
LOCAL_MODULE_CLASS := APPS
LOCAL_MODULE_SUFFIX := $(COMMON_ANDROID_PACKAGE_SUFFIX)
LOCAL_CERTIFICATE := PRESIGNED
diff --git a/FDroid/org.fdroid.fdroid_1014050.apk b/FDroid/FDroid.apk
similarity index 100%
rename from FDroid/org.fdroid.fdroid_1014050.apk
rename to FDroid/FDroid.apk
Binary files differ
diff --git a/FDroidPrivilegedExtension/Android.mk b/FDroidPrivilegedExtension/Android.mk
index 683f2f9..b6e8279 100644
--- a/FDroidPrivilegedExtension/Android.mk
+++ b/FDroidPrivilegedExtension/Android.mk
@@ -11,7 +11,7 @@
include $(CLEAR_VARS)
LOCAL_MODULE_TAGS := optional
LOCAL_MODULE := FDroidPrivilegedExtension
-LOCAL_SRC_FILES := org.fdroid.fdroid.privileged_2130.apk
+LOCAL_SRC_FILES := FDroidPrivilegedExtension.apk
LOCAL_MODULE_CLASS := APPS
LOCAL_PRIVILEGED_MODULE := true
LOCAL_MODULE_SUFFIX := $(COMMON_ANDROID_PACKAGE_SUFFIX)
diff --git a/FDroidPrivilegedExtension/org.fdroid.fdroid.privileged_2130.apk b/FDroidPrivilegedExtension/FDroidPrivilegedExtension.apk
similarity index 100%
rename from FDroidPrivilegedExtension/org.fdroid.fdroid.privileged_2130.apk
rename to FDroidPrivilegedExtension/FDroidPrivilegedExtension.apk
Binary files differ
diff --git a/FakeStore/Android.mk b/FakeStore/Android.mk
index 32e5ee7..74c8f26 100644
--- a/FakeStore/Android.mk
+++ b/FakeStore/Android.mk
@@ -11,7 +11,7 @@
include $(CLEAR_VARS)
LOCAL_MODULE_TAGS := optional
LOCAL_MODULE := FakeStore
-LOCAL_SRC_FILES := com.android.vending-22.apk
+LOCAL_SRC_FILES := FakeStore.apk
LOCAL_MODULE_CLASS := APPS
LOCAL_PRIVILEGED_MODULE := true
LOCAL_MODULE_SUFFIX := $(COMMON_ANDROID_PACKAGE_SUFFIX)
diff --git a/FakeStore/com.android.vending-22.apk b/FakeStore/FakeStore.apk
similarity index 100%
rename from FakeStore/com.android.vending-22.apk
rename to FakeStore/FakeStore.apk
Binary files differ
diff --git a/GmsCore/Android.mk b/GmsCore/Android.mk
index 997e7ae..a8b5985 100644
--- a/GmsCore/Android.mk
+++ b/GmsCore/Android.mk
@@ -19,7 +19,7 @@
include $(CLEAR_VARS)
LOCAL_MODULE_TAGS := optional
LOCAL_MODULE := GmsCore
-LOCAL_SRC_FILES := com.google.android.gms-214816048.apk
+LOCAL_SRC_FILES := GmsCore.apk
LOCAL_MODULE_CLASS := APPS
LOCAL_PRIVILEGED_MODULE := true
LOCAL_MODULE_SUFFIX := $(COMMON_ANDROID_PACKAGE_SUFFIX)
diff --git a/GmsCore/com.google.android.gms-214816048.apk b/GmsCore/GmsCore.apk
similarity index 100%
rename from GmsCore/com.google.android.gms-214816048.apk
rename to GmsCore/GmsCore.apk
Binary files differ
diff --git a/GsfProxy/Android.mk b/GsfProxy/Android.mk
index c200fc4..a284908 100644
--- a/GsfProxy/Android.mk
+++ b/GsfProxy/Android.mk
@@ -2,7 +2,7 @@
include $(CLEAR_VARS)
LOCAL_MODULE_TAGS := optional
LOCAL_MODULE := GsfProxy
-LOCAL_SRC_FILES := com.google.android.gsf-8.apk
+LOCAL_SRC_FILES := GsfProxy.apk
LOCAL_MODULE_CLASS := APPS
LOCAL_MODULE_SUFFIX := $(COMMON_ANDROID_PACKAGE_SUFFIX)
LOCAL_CERTIFICATE := PRESIGNED
diff --git a/GsfProxy/com.google.android.gsf-8.apk b/GsfProxy/GsfProxy.apk
similarity index 100%
rename from GsfProxy/com.google.android.gsf-8.apk
rename to GsfProxy/GsfProxy.apk
Binary files differ
diff --git a/IchnaeaNlpBackend/Android.mk b/IchnaeaNlpBackend/Android.mk
index c14372a..c63ce3a 100644
--- a/IchnaeaNlpBackend/Android.mk
+++ b/IchnaeaNlpBackend/Android.mk
@@ -2,7 +2,7 @@
include $(CLEAR_VARS)
LOCAL_MODULE_TAGS := optional
LOCAL_MODULE := IchnaeaNlpBackend
-LOCAL_SRC_FILES := org.microg.nlp.backend.ichnaea_20033.apk
+LOCAL_SRC_FILES := IchnaeaNlpBackend.apk
LOCAL_MODULE_CLASS := APPS
LOCAL_MODULE_SUFFIX := $(COMMON_ANDROID_PACKAGE_SUFFIX)
LOCAL_CERTIFICATE := PRESIGNED
diff --git a/IchnaeaNlpBackend/org.microg.nlp.backend.ichnaea_20033.apk b/IchnaeaNlpBackend/IchnaeaNlpBackend.apk
similarity index 100%
rename from IchnaeaNlpBackend/org.microg.nlp.backend.ichnaea_20033.apk
rename to IchnaeaNlpBackend/IchnaeaNlpBackend.apk
Binary files differ
diff --git a/NominatimGeocoderBackend/Android.mk b/NominatimGeocoderBackend/Android.mk
index 47b67b8..47838e8 100644
--- a/NominatimGeocoderBackend/Android.mk
+++ b/NominatimGeocoderBackend/Android.mk
@@ -2,7 +2,7 @@
include $(CLEAR_VARS)
LOCAL_MODULE_TAGS := optional
LOCAL_MODULE := NominatimGeocoderBackend
-LOCAL_SRC_FILES := org.microg.nlp.backend.nominatim_20042.apk
+LOCAL_SRC_FILES := NominatimGeocoderBackend.apk
LOCAL_MODULE_CLASS := APPS
LOCAL_MODULE_SUFFIX := $(COMMON_ANDROID_PACKAGE_SUFFIX)
LOCAL_CERTIFICATE := PRESIGNED
diff --git a/NominatimGeocoderBackend/org.microg.nlp.backend.nominatim_20042.apk b/NominatimGeocoderBackend/NominatimGeocoderBackend.apk
similarity index 100%
rename from NominatimGeocoderBackend/org.microg.nlp.backend.nominatim_20042.apk
rename to NominatimGeocoderBackend/NominatimGeocoderBackend.apk
Binary files differ