diff --git a/standalone/android/haskell-patches/DAV-0.3-0001-build-without-TH.patch b/standalone/android/haskell-patches/DAV_0.3-0001-build-without-TH.patch similarity index 100% rename from standalone/android/haskell-patches/DAV-0.3-0001-build-without-TH.patch rename to standalone/android/haskell-patches/DAV_0.3-0001-build-without-TH.patch diff --git a/standalone/android/haskell-patches/MissingH-1.2.0.0_0001-fix-build-not-Android-specific.patch b/standalone/android/haskell-patches/MissingH_1.2.0.0_0001-fix-build-not-Android-specific.patch similarity index 100% rename from standalone/android/haskell-patches/MissingH-1.2.0.0_0001-fix-build-not-Android-specific.patch rename to standalone/android/haskell-patches/MissingH_1.2.0.0_0001-fix-build-not-Android-specific.patch diff --git a/standalone/android/haskell-patches/aeson-0.6.1.0_0001-disable-TH.patch b/standalone/android/haskell-patches/aeson_0.6.1.0_0001-disable-TH.patch similarity index 100% rename from standalone/android/haskell-patches/aeson-0.6.1.0_0001-disable-TH.patch rename to standalone/android/haskell-patches/aeson_0.6.1.0_0001-disable-TH.patch diff --git a/standalone/android/haskell-patches/async-2.0.1.4_0001-allow-building-with-unreleased-ghc.patch b/standalone/android/haskell-patches/async_2.0.1.4_0001-allow-building-with-unreleased-ghc.patch similarity index 100% rename from standalone/android/haskell-patches/async-2.0.1.4_0001-allow-building-with-unreleased-ghc.patch rename to standalone/android/haskell-patches/async_2.0.1.4_0001-allow-building-with-unreleased-ghc.patch diff --git a/standalone/android/haskell-patches/case-insensitive-0.4.0.1_0001-allow-building-with-unreleased-ghc.patch b/standalone/android/haskell-patches/case-insensitive_0.4.0.1_0001-allow-building-with-unreleased-ghc.patch similarity index 100% rename from standalone/android/haskell-patches/case-insensitive-0.4.0.1_0001-allow-building-with-unreleased-ghc.patch rename to standalone/android/haskell-patches/case-insensitive_0.4.0.1_0001-allow-building-with-unreleased-ghc.patch diff --git a/standalone/android/haskell-patches/distributive-0.3-0001-fixes-for-cross-build.patch b/standalone/android/haskell-patches/distributive_0.3-0001-fixes-for-cross-build.patch similarity index 100% rename from standalone/android/haskell-patches/distributive-0.3-0001-fixes-for-cross-build.patch rename to standalone/android/haskell-patches/distributive_0.3-0001-fixes-for-cross-build.patch diff --git a/standalone/android/haskell-patches/file-embed-0.0.4.7-0001-remove-TH-and-export-one-symbol-used-by-TH.patch b/standalone/android/haskell-patches/file-embed_0.0.4.7-0001-remove-TH-and-export-one-symbol-used-by-TH.patch similarity index 100% rename from standalone/android/haskell-patches/file-embed-0.0.4.7-0001-remove-TH-and-export-one-symbol-used-by-TH.patch rename to standalone/android/haskell-patches/file-embed_0.0.4.7-0001-remove-TH-and-export-one-symbol-used-by-TH.patch diff --git a/standalone/android/haskell-patches/gnutls-0.1.4-0001-statically-link-with-gnutls.patch b/standalone/android/haskell-patches/gnutls_0.1.4-0001-statically-link-with-gnutls.patch similarity index 100% rename from standalone/android/haskell-patches/gnutls-0.1.4-0001-statically-link-with-gnutls.patch rename to standalone/android/haskell-patches/gnutls_0.1.4-0001-statically-link-with-gnutls.patch diff --git a/standalone/android/haskell-patches/gsasl-0.3.5-0001-link-with-libgsasl.patch b/standalone/android/haskell-patches/gsasl_0.3.5-0001-link-with-libgsasl.patch similarity index 100% rename from standalone/android/haskell-patches/gsasl-0.3.5-0001-link-with-libgsasl.patch rename to standalone/android/haskell-patches/gsasl_0.3.5-0001-link-with-libgsasl.patch diff --git a/standalone/android/haskell-patches/hS3-0.5.6_0001-fix-build.patch b/standalone/android/haskell-patches/hS3_0.5.6_0001-fix-build.patch similarity index 100% rename from standalone/android/haskell-patches/hS3-0.5.6_0001-fix-build.patch rename to standalone/android/haskell-patches/hS3_0.5.6_0001-fix-build.patch diff --git a/standalone/android/haskell-patches/hamlet-1.1.6.1_0001-remove-TH.patch b/standalone/android/haskell-patches/hamlet_1.1.6.1_0001-remove-TH.patch similarity index 100% rename from standalone/android/haskell-patches/hamlet-1.1.6.1_0001-remove-TH.patch rename to standalone/android/haskell-patches/hamlet_1.1.6.1_0001-remove-TH.patch diff --git a/standalone/android/haskell-patches/lens-3.8.5-0001-build-without-TH.patch b/standalone/android/haskell-patches/lens_3.8.5-0001-build-without-TH.patch similarity index 100% rename from standalone/android/haskell-patches/lens-3.8.5-0001-build-without-TH.patch rename to standalone/android/haskell-patches/lens_3.8.5-0001-build-without-TH.patch diff --git a/standalone/android/haskell-patches/libxml-sax-0.7.3-0001-static-link-with-libxml2.patch b/standalone/android/haskell-patches/libxml-sax_0.7.3-0001-static-link-with-libxml2.patch similarity index 100% rename from standalone/android/haskell-patches/libxml-sax-0.7.3-0001-static-link-with-libxml2.patch rename to standalone/android/haskell-patches/libxml-sax_0.7.3-0001-static-link-with-libxml2.patch diff --git a/standalone/android/haskell-patches/lifted-base-0.2.0.2_0001-hacked-for-newer-ghc.patch b/standalone/android/haskell-patches/lifted-base_0.2.0.2_0001-hacked-for-newer-ghc.patch similarity index 100% rename from standalone/android/haskell-patches/lifted-base-0.2.0.2_0001-hacked-for-newer-ghc.patch rename to standalone/android/haskell-patches/lifted-base_0.2.0.2_0001-hacked-for-newer-ghc.patch diff --git a/standalone/android/haskell-patches/monad-control-0.3.1.4_0001-build-with-newer-ghc.patch b/standalone/android/haskell-patches/monad-control_0.3.1.4_0001-build-with-newer-ghc.patch similarity index 100% rename from standalone/android/haskell-patches/monad-control-0.3.1.4_0001-build-with-newer-ghc.patch rename to standalone/android/haskell-patches/monad-control_0.3.1.4_0001-build-with-newer-ghc.patch diff --git a/standalone/android/haskell-patches/monad-logger-0.2.3.2_0001-remove-TH-logging-stuff.patch b/standalone/android/haskell-patches/monad-logger_0.2.3.2_0001-remove-TH-logging-stuff.patch similarity index 100% rename from standalone/android/haskell-patches/monad-logger-0.2.3.2_0001-remove-TH-logging-stuff.patch rename to standalone/android/haskell-patches/monad-logger_0.2.3.2_0001-remove-TH-logging-stuff.patch diff --git a/standalone/android/haskell-patches/network-conduit-0.6.2.2_0001-NoDelay-does-not-work-on-Android.patch b/standalone/android/haskell-patches/network-conduit_0.6.2.2_0001-NoDelay-does-not-work-on-Android.patch similarity index 100% rename from standalone/android/haskell-patches/network-conduit-0.6.2.2_0001-NoDelay-does-not-work-on-Android.patch rename to standalone/android/haskell-patches/network-conduit_0.6.2.2_0001-NoDelay-does-not-work-on-Android.patch diff --git a/standalone/android/haskell-patches/network-protocol-xmpp-0.4.4-0001-avoid-using-gnuidn.patch b/standalone/android/haskell-patches/network-protocol-xmpp_0.4.4-0001-avoid-using-gnuidn.patch similarity index 100% rename from standalone/android/haskell-patches/network-protocol-xmpp-0.4.4-0001-avoid-using-gnuidn.patch rename to standalone/android/haskell-patches/network-protocol-xmpp_0.4.4-0001-avoid-using-gnuidn.patch diff --git a/standalone/android/haskell-patches/network-2.4.1.0_0001-android-port-fixes.patch b/standalone/android/haskell-patches/network_2.4.1.0_0001-android-port-fixes.patch similarity index 100% rename from standalone/android/haskell-patches/network-2.4.1.0_0001-android-port-fixes.patch rename to standalone/android/haskell-patches/network_2.4.1.0_0001-android-port-fixes.patch diff --git a/standalone/android/haskell-patches/network-2.4.1.0_0002-remove-Network.BSD-symbols-not-available-in-bionic.patch b/standalone/android/haskell-patches/network_2.4.1.0_0002-remove-Network.BSD-symbols-not-available-in-bionic.patch similarity index 100% rename from standalone/android/haskell-patches/network-2.4.1.0_0002-remove-Network.BSD-symbols-not-available-in-bionic.patch rename to standalone/android/haskell-patches/network_2.4.1.0_0002-remove-Network.BSD-symbols-not-available-in-bionic.patch diff --git a/standalone/android/haskell-patches/network-2.4.1.0_0003-configure-misdetects-accept4.patch b/standalone/android/haskell-patches/network_2.4.1.0_0003-configure-misdetects-accept4.patch similarity index 100% rename from standalone/android/haskell-patches/network-2.4.1.0_0003-configure-misdetects-accept4.patch rename to standalone/android/haskell-patches/network_2.4.1.0_0003-configure-misdetects-accept4.patch diff --git a/standalone/android/haskell-patches/network-2.4.1.0_0004-getprotobyname-hack-for-tcp-and-udp.patch b/standalone/android/haskell-patches/network_2.4.1.0_0004-getprotobyname-hack-for-tcp-and-udp.patch similarity index 100% rename from standalone/android/haskell-patches/network-2.4.1.0_0004-getprotobyname-hack-for-tcp-and-udp.patch rename to standalone/android/haskell-patches/network_2.4.1.0_0004-getprotobyname-hack-for-tcp-and-udp.patch diff --git a/standalone/android/haskell-patches/persistent-1.1.5.1_0001-disable-TH.patch b/standalone/android/haskell-patches/persistent_1.1.5.1_0001-disable-TH.patch similarity index 100% rename from standalone/android/haskell-patches/persistent-1.1.5.1_0001-disable-TH.patch rename to standalone/android/haskell-patches/persistent_1.1.5.1_0001-disable-TH.patch diff --git a/standalone/android/haskell-patches/primitive-0.5.0.1_0001-disable-i386-opt-stuff-to-allow-cross-compilation.patch b/standalone/android/haskell-patches/primitive_0.5.0.1_0001-disable-i386-opt-stuff-to-allow-cross-compilation.patch similarity index 100% rename from standalone/android/haskell-patches/primitive-0.5.0.1_0001-disable-i386-opt-stuff-to-allow-cross-compilation.patch rename to standalone/android/haskell-patches/primitive_0.5.0.1_0001-disable-i386-opt-stuff-to-allow-cross-compilation.patch diff --git a/standalone/android/haskell-patches/profunctors-3.3-0001-fix-cross-build.patch b/standalone/android/haskell-patches/profunctors_3.3-0001-fix-cross-build.patch similarity index 100% rename from standalone/android/haskell-patches/profunctors-3.3-0001-fix-cross-build.patch rename to standalone/android/haskell-patches/profunctors_3.3-0001-fix-cross-build.patch diff --git a/standalone/android/haskell-patches/resourcet-0.4.4_0001-hack-to-build-with-hacked-up-lifted-base-which-is-cu.patch b/standalone/android/haskell-patches/resourcet_0.4.4_0001-hack-to-build-with-hacked-up-lifted-base-which-is-cu.patch similarity index 100% rename from standalone/android/haskell-patches/resourcet-0.4.4_0001-hack-to-build-with-hacked-up-lifted-base-which-is-cu.patch rename to standalone/android/haskell-patches/resourcet_0.4.4_0001-hack-to-build-with-hacked-up-lifted-base-which-is-cu.patch diff --git a/standalone/android/haskell-patches/shakespeare-1.0.3_0001-export-symbol-used-by-TH-splices.patch b/standalone/android/haskell-patches/shakespeare_1.0.3_0001-export-symbol-used-by-TH-splices.patch similarity index 100% rename from standalone/android/haskell-patches/shakespeare-1.0.3_0001-export-symbol-used-by-TH-splices.patch rename to standalone/android/haskell-patches/shakespeare_1.0.3_0001-export-symbol-used-by-TH-splices.patch diff --git a/standalone/android/haskell-patches/shakespeare-1.0.3_0001-remove-TH.patch b/standalone/android/haskell-patches/shakespeare_1.0.3_0001-remove-TH.patch similarity index 100% rename from standalone/android/haskell-patches/shakespeare-1.0.3_0001-remove-TH.patch rename to standalone/android/haskell-patches/shakespeare_1.0.3_0001-remove-TH.patch diff --git a/standalone/android/haskell-patches/shakespeare-css-1.0.2_0001-remove-TH.patch b/standalone/android/haskell-patches/shakespeare_css-1.0.2_0001-remove-TH.patch similarity index 100% rename from standalone/android/haskell-patches/shakespeare-css-1.0.2_0001-remove-TH.patch rename to standalone/android/haskell-patches/shakespeare_css-1.0.2_0001-remove-TH.patch diff --git a/standalone/android/haskell-patches/shakespeare-css-1.0.2_0002-expose-modules-used-by-TH.patch b/standalone/android/haskell-patches/shakespeare_css-1.0.2_0002-expose-modules-used-by-TH.patch similarity index 100% rename from standalone/android/haskell-patches/shakespeare-css-1.0.2_0002-expose-modules-used-by-TH.patch rename to standalone/android/haskell-patches/shakespeare_css-1.0.2_0002-expose-modules-used-by-TH.patch diff --git a/standalone/android/haskell-patches/shakespeare-i18n-1.0.0.2_0001-remove-TH.patch b/standalone/android/haskell-patches/shakespeare_i18n-1.0.0.2_0001-remove-TH.patch similarity index 100% rename from standalone/android/haskell-patches/shakespeare-i18n-1.0.0.2_0001-remove-TH.patch rename to standalone/android/haskell-patches/shakespeare_i18n-1.0.0.2_0001-remove-TH.patch diff --git a/standalone/android/haskell-patches/shakespeare-js-1.1.2_0001-remove-TH.patch b/standalone/android/haskell-patches/shakespeare_js-1.1.2_0001-remove-TH.patch similarity index 100% rename from standalone/android/haskell-patches/shakespeare-js-1.1.2_0001-remove-TH.patch rename to standalone/android/haskell-patches/shakespeare_js-1.1.2_0001-remove-TH.patch diff --git a/standalone/android/haskell-patches/socks-0.4.2_0001-remove-IPv6-stuff.patch b/standalone/android/haskell-patches/socks_0.4.2_0001-remove-IPv6-stuff.patch similarity index 100% rename from standalone/android/haskell-patches/socks-0.4.2_0001-remove-IPv6-stuff.patch rename to standalone/android/haskell-patches/socks_0.4.2_0001-remove-IPv6-stuff.patch diff --git a/standalone/android/haskell-patches/split-0.2.1.2_0001-modify-to-build-with-unreleased-ghc.patch b/standalone/android/haskell-patches/split_0.2.1.2_0001-modify-to-build-with-unreleased-ghc.patch similarity index 100% rename from standalone/android/haskell-patches/split-0.2.1.2_0001-modify-to-build-with-unreleased-ghc.patch rename to standalone/android/haskell-patches/split_0.2.1.2_0001-modify-to-build-with-unreleased-ghc.patch diff --git a/standalone/android/haskell-patches/syb-0.3.7_0001-hack-for-cross-compiling.patch b/standalone/android/haskell-patches/syb_0.3.7_0001-hack-for-cross-compiling.patch similarity index 100% rename from standalone/android/haskell-patches/syb-0.3.7_0001-hack-for-cross-compiling.patch rename to standalone/android/haskell-patches/syb_0.3.7_0001-hack-for-cross-compiling.patch diff --git a/standalone/android/haskell-patches/unix-time-0.1.4_0001-hacks-for-android.patch b/standalone/android/haskell-patches/unix-time_0.1.4_0001-hacks-for-android.patch similarity index 100% rename from standalone/android/haskell-patches/unix-time-0.1.4_0001-hacks-for-android.patch rename to standalone/android/haskell-patches/unix-time_0.1.4_0001-hacks-for-android.patch diff --git a/standalone/android/haskell-patches/unix-2.6.0.1_0001-remove-stuff-not-available-on-Android.patch b/standalone/android/haskell-patches/unix_2.6.0.1_0001-remove-stuff-not-available-on-Android.patch similarity index 100% rename from standalone/android/haskell-patches/unix-2.6.0.1_0001-remove-stuff-not-available-on-Android.patch rename to standalone/android/haskell-patches/unix_2.6.0.1_0001-remove-stuff-not-available-on-Android.patch diff --git a/standalone/android/haskell-patches/vector-0.10.0.1_0001-disable-optimisation-that-breaks-when-cross-compilin.patch b/standalone/android/haskell-patches/vector_0.10.0.1_0001-disable-optimisation-that-breaks-when-cross-compilin.patch similarity index 100% rename from standalone/android/haskell-patches/vector-0.10.0.1_0001-disable-optimisation-that-breaks-when-cross-compilin.patch rename to standalone/android/haskell-patches/vector_0.10.0.1_0001-disable-optimisation-that-breaks-when-cross-compilin.patch diff --git a/standalone/android/haskell-patches/wai-app-static-1.3.1-remove-TH.patch b/standalone/android/haskell-patches/wai-app-static_1.3.1-remove-TH.patch similarity index 100% rename from standalone/android/haskell-patches/wai-app-static-1.3.1-remove-TH.patch rename to standalone/android/haskell-patches/wai-app-static_1.3.1-remove-TH.patch diff --git a/standalone/android/haskell-patches/wai-extra-1.3.2.1_0001-disable-CGI-module.patch b/standalone/android/haskell-patches/wai-extra_1.3.2.1_0001-disable-CGI-module.patch similarity index 100% rename from standalone/android/haskell-patches/wai-extra-1.3.2.1_0001-disable-CGI-module.patch rename to standalone/android/haskell-patches/wai-extra_1.3.2.1_0001-disable-CGI-module.patch diff --git a/standalone/android/haskell-patches/xml-hamlet-0.4.0.3-0001-remove-TH-code.patch b/standalone/android/haskell-patches/xml-hamlet_0.4.0.3-0001-remove-TH-code.patch similarity index 100% rename from standalone/android/haskell-patches/xml-hamlet-0.4.0.3-0001-remove-TH-code.patch rename to standalone/android/haskell-patches/xml-hamlet_0.4.0.3-0001-remove-TH-code.patch diff --git a/standalone/android/haskell-patches/yesod-core-1.1.8_0001-remove-TH.patch b/standalone/android/haskell-patches/yesod-core_1.1.8_0001-remove-TH.patch similarity index 100% rename from standalone/android/haskell-patches/yesod-core-1.1.8_0001-remove-TH.patch rename to standalone/android/haskell-patches/yesod-core_1.1.8_0001-remove-TH.patch diff --git a/standalone/android/haskell-patches/yesod-core-1.1.8_0002-replaced-TH-in-Yesod.Internal.Core.patch b/standalone/android/haskell-patches/yesod-core_1.1.8_0002-replaced-TH-in-Yesod.Internal.Core.patch similarity index 100% rename from standalone/android/haskell-patches/yesod-core-1.1.8_0002-replaced-TH-in-Yesod.Internal.Core.patch rename to standalone/android/haskell-patches/yesod-core_1.1.8_0002-replaced-TH-in-Yesod.Internal.Core.patch diff --git a/standalone/android/haskell-patches/yesod-core-1.1.8_0003-exports-for-TH-splices.patch b/standalone/android/haskell-patches/yesod-core_1.1.8_0003-exports-for-TH-splices.patch similarity index 100% rename from standalone/android/haskell-patches/yesod-core-1.1.8_0003-exports-for-TH-splices.patch rename to standalone/android/haskell-patches/yesod-core_1.1.8_0003-exports-for-TH-splices.patch diff --git a/standalone/android/haskell-patches/yesod-default-1.1.3.2_0001-remove-TH.patch b/standalone/android/haskell-patches/yesod-default_1.1.3.2_0001-remove-TH.patch similarity index 100% rename from standalone/android/haskell-patches/yesod-default-1.1.3.2_0001-remove-TH.patch rename to standalone/android/haskell-patches/yesod-default_1.1.3.2_0001-remove-TH.patch diff --git a/standalone/android/haskell-patches/yesod-form-1.2.1.1-0001-prepare-for-Evil-Splicer.patch b/standalone/android/haskell-patches/yesod-form_1.2.1.1-0001-prepare-for-Evil-Splicer.patch similarity index 100% rename from standalone/android/haskell-patches/yesod-form-1.2.1.1-0001-prepare-for-Evil-Splicer.patch rename to standalone/android/haskell-patches/yesod-form_1.2.1.1-0001-prepare-for-Evil-Splicer.patch diff --git a/standalone/android/haskell-patches/yesod-form-1.2.1.1-0002-expand-TH.patch b/standalone/android/haskell-patches/yesod-form_1.2.1.1-0002-expand-TH.patch similarity index 100% rename from standalone/android/haskell-patches/yesod-form-1.2.1.1-0002-expand-TH.patch rename to standalone/android/haskell-patches/yesod-form_1.2.1.1-0002-expand-TH.patch diff --git a/standalone/android/haskell-patches/yesod-form-1.2.1.3_0001-avoid-TH-hack-job.patch b/standalone/android/haskell-patches/yesod-form_1.2.1.3_0001-avoid-TH-hack-job.patch similarity index 100% rename from standalone/android/haskell-patches/yesod-form-1.2.1.3_0001-avoid-TH-hack-job.patch rename to standalone/android/haskell-patches/yesod-form_1.2.1.3_0001-avoid-TH-hack-job.patch diff --git a/standalone/android/haskell-patches/yesod-persistent-1.1.0.1_0001-avoid-TH.patch b/standalone/android/haskell-patches/yesod-persistent_1.1.0.1_0001-avoid-TH.patch similarity index 100% rename from standalone/android/haskell-patches/yesod-persistent-1.1.0.1_0001-avoid-TH.patch rename to standalone/android/haskell-patches/yesod-persistent_1.1.0.1_0001-avoid-TH.patch diff --git a/standalone/android/haskell-patches/yesod-routes-1.1.2_0001-remove-TH-and-export-module-used-by-TH-splices.patch b/standalone/android/haskell-patches/yesod-routes_1.1.2_0001-remove-TH-and-export-module-used-by-TH-splices.patch similarity index 100% rename from standalone/android/haskell-patches/yesod-routes-1.1.2_0001-remove-TH-and-export-module-used-by-TH-splices.patch rename to standalone/android/haskell-patches/yesod-routes_1.1.2_0001-remove-TH-and-export-module-used-by-TH-splices.patch diff --git a/standalone/android/haskell-patches/yesod-static-1.1.2-remove-TH.patch b/standalone/android/haskell-patches/yesod-static_1.1.2-remove-TH.patch similarity index 100% rename from standalone/android/haskell-patches/yesod-static-1.1.2-remove-TH.patch rename to standalone/android/haskell-patches/yesod-static_1.1.2-remove-TH.patch diff --git a/standalone/android/haskell-patches/yesod-1.1.8_0001-hacked-up-to-build-on-Android.patch b/standalone/android/haskell-patches/yesod_1.1.8_0001-hacked-up-to-build-on-Android.patch similarity index 100% rename from standalone/android/haskell-patches/yesod-1.1.8_0001-hacked-up-to-build-on-Android.patch rename to standalone/android/haskell-patches/yesod_1.1.8_0001-hacked-up-to-build-on-Android.patch diff --git a/standalone/android/haskell-patches/zlib-0.5.4.0_0001-hack-to-build-on-Android.patch b/standalone/android/haskell-patches/zlib_0.5.4.0_0001-hack-to-build-on-Android.patch similarity index 100% rename from standalone/android/haskell-patches/zlib-0.5.4.0_0001-hack-to-build-on-Android.patch rename to standalone/android/haskell-patches/zlib_0.5.4.0_0001-hack-to-build-on-Android.patch