diff --git a/graphics/drawables/material-launcher/Feature Graphic.psd b/graphics/drawables/material-launcher/Feature-Graphic.psd
similarity index 100%
rename from graphics/drawables/material-launcher/Feature Graphic.psd
rename to graphics/drawables/material-launcher/Feature-Graphic.psd
diff --git a/graphics/drawables/material-launcher/vector-src blue.ai b/graphics/drawables/material-launcher/vector-src-blue.ai
similarity index 100%
rename from graphics/drawables/material-launcher/vector-src blue.ai
rename to graphics/drawables/material-launcher/vector-src-blue.ai
diff --git a/graphics/drawables/material-launcher/vector-src purple.ai b/graphics/drawables/material-launcher/vector-src-purple.ai
similarity index 100%
rename from graphics/drawables/material-launcher/vector-src purple.ai
rename to graphics/drawables/material-launcher/vector-src-purple.ai
diff --git a/graphics/drawables/material-launcher/vector-src purple.psd b/graphics/drawables/material-launcher/vector-src-purple.psd
similarity index 100%
rename from graphics/drawables/material-launcher/vector-src purple.psd
rename to graphics/drawables/material-launcher/vector-src-purple.psd
diff --git a/graphics/drawables/originals/tango or oxygen/1270234450.svg b/graphics/drawables/originals/tango-or-oxygen/1270234450.svg
similarity index 100%
rename from graphics/drawables/originals/tango or oxygen/1270234450.svg
rename to graphics/drawables/originals/tango-or-oxygen/1270234450.svg
diff --git a/graphics/drawables/originals/tango or oxygen/application-pgp-signature.svg b/graphics/drawables/originals/tango-or-oxygen/application-pgp-signature.svg
similarity index 100%
rename from graphics/drawables/originals/tango or oxygen/application-pgp-signature.svg
rename to graphics/drawables/originals/tango-or-oxygen/application-pgp-signature.svg
diff --git a/graphics/drawables/originals/tango or oxygen/application-pkcs7-signature.svg b/graphics/drawables/originals/tango-or-oxygen/application-pkcs7-signature.svg
similarity index 100%
rename from graphics/drawables/originals/tango or oxygen/application-pkcs7-signature.svg
rename to graphics/drawables/originals/tango-or-oxygen/application-pkcs7-signature.svg
diff --git a/graphics/drawables/originals/tango or oxygen/osa_id_card.svg b/graphics/drawables/originals/tango-or-oxygen/osa_id_card.svg
similarity index 100%
rename from graphics/drawables/originals/tango or oxygen/osa_id_card.svg
rename to graphics/drawables/originals/tango-or-oxygen/osa_id_card.svg
diff --git a/graphics/drawables/originals/tango or oxygen/osa_padlock.svg b/graphics/drawables/originals/tango-or-oxygen/osa_padlock.svg
similarity index 100%
rename from graphics/drawables/originals/tango or oxygen/osa_padlock.svg
rename to graphics/drawables/originals/tango-or-oxygen/osa_padlock.svg
diff --git a/graphics/drawables/originals/tango or oxygen/tango-style-pen.svg b/graphics/drawables/originals/tango-or-oxygen/tango-style-pen.svg
similarity index 100%
rename from graphics/drawables/originals/tango or oxygen/tango-style-pen.svg
rename to graphics/drawables/originals/tango-or-oxygen/tango-style-pen.svg
diff --git a/resources/old extended service/src/main/aidl/org/sufficientlysecure/keychain/service/remote/IExtendedApiCallback.aidl b/resources/x509-service/src/main/aidl/org/sufficientlysecure/keychain/service/remote/IExtendedApiCallback.aidl
similarity index 100%
rename from resources/old extended service/src/main/aidl/org/sufficientlysecure/keychain/service/remote/IExtendedApiCallback.aidl
rename to resources/x509-service/src/main/aidl/org/sufficientlysecure/keychain/service/remote/IExtendedApiCallback.aidl
diff --git a/resources/old extended service/src/main/aidl/org/sufficientlysecure/keychain/service/remote/IExtendedApiService.aidl b/resources/x509-service/src/main/aidl/org/sufficientlysecure/keychain/service/remote/IExtendedApiService.aidl
similarity index 100%
rename from resources/old extended service/src/main/aidl/org/sufficientlysecure/keychain/service/remote/IExtendedApiService.aidl
rename to resources/x509-service/src/main/aidl/org/sufficientlysecure/keychain/service/remote/IExtendedApiService.aidl
diff --git a/resources/old extended service/src/main/java/ExtendedApiService.java b/resources/x509-service/src/main/java/ExtendedApiService.java
similarity index 100%
rename from resources/old extended service/src/main/java/ExtendedApiService.java
rename to resources/x509-service/src/main/java/ExtendedApiService.java
diff --git a/resources/old extended service/src/main/java/PgpToX509.java b/resources/x509-service/src/main/java/PgpToX509.java
similarity index 100%
rename from resources/old extended service/src/main/java/PgpToX509.java
rename to resources/x509-service/src/main/java/PgpToX509.java