diff --git a/mingw-w64-capstone/PKGBUILD b/mingw-w64-capstone/PKGBUILD
index b2bad0b167..ebc44b3452 100644
--- a/mingw-w64-capstone/PKGBUILD
+++ b/mingw-w64-capstone/PKGBUILD
@@ -3,17 +3,17 @@
 _realname=capstone
 pkgbase=mingw-w64-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-capstone"
-         "${MINGW_PACKAGE_PREFIX}-python3-capstone")
+         "${MINGW_PACKAGE_PREFIX}-python-capstone")
 _pkgver=4.0.1
 pkgver=${_pkgver//-/}
-pkgrel=3
+pkgrel=4
 pkgdesc='Lightweight multi-platform, multi-architecture disassembly framework'
 url='https://www.capstone-engine.org/index.html'
 arch=('any')
 license=('BSD')
 depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs")
 makedepends=("${MINGW_PACKAGE_PREFIX}-cmake"
-             "${MINGW_PACKAGE_PREFIX}-python3-setuptools")
+             "${MINGW_PACKAGE_PREFIX}-python-setuptools")
 source=("${_realname}-${_pkgver}.tar.gz::https://github.com/aquynh/capstone/archive/${_pkgver}.tar.gz"
         "mingw_python.patch")
 sha512sums=('43c52024065b41b45eff9423341db3f3d5163fa7aa01b360faa30437786740c8f2c34c36faa04dced5308e09d8bd78df3bad0ab9c06f98612169edb176f83c36'
@@ -49,16 +49,20 @@ package_capstone() {
 package_mingw-w64-i686-capstone()   { package_capstone; }
 package_mingw-w64-x86_64-capstone() { package_capstone; }
 
-package_python3-capstone() {
-  depends=("${MINGW_PACKAGE_PREFIX}-capstone" "${MINGW_PACKAGE_PREFIX}-python3")
+package_python-capstone() {
+  depends=("${MINGW_PACKAGE_PREFIX}-capstone"
+           "${MINGW_PACKAGE_PREFIX}-python")
+  provides=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+  conflicts=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+  replaces=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
   cd ${_realname}-${_pkgver}/bindings/python
 
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
   LIBCAPSTONE_PATH="${srcdir}/build-${MINGW_CHOST}/libcapstone.dll" \
-  python3 setup.py install -O1 --root="${pkgdir}" --prefix="${MINGW_PREFIX}"
+  ${MINGW_PREFIX}/bin/python setup.py install -O1 --root="${pkgdir}" --prefix="${MINGW_PREFIX}"
 
-  install -Dm644 "${srcdir}/${_realname}-${_pkgver}/LICENSE.TXT" -t "${pkgdir}/${MINGW_PREFIX}/share/licenses/python3-${_realname}"
+  install -Dm644 "${srcdir}/${_realname}-${_pkgver}/LICENSE.TXT" -t "${pkgdir}/${MINGW_PREFIX}/share/licenses/python-${_realname}"
 }
 
-package_mingw-w64-i686-python3-capstone()   { package_python3-capstone; }
-package_mingw-w64-x86_64-python3-capstone() { package_python3-capstone; }
+package_mingw-w64-i686-python-capstone()   { package_python-capstone; }
+package_mingw-w64-x86_64-python-capstone() { package_python-capstone; }
diff --git a/mingw-w64-protobuf/PKGBUILD b/mingw-w64-protobuf/PKGBUILD
index 66b8f7bf6f..2ab17bf861 100644
--- a/mingw-w64-protobuf/PKGBUILD
+++ b/mingw-w64-protobuf/PKGBUILD
@@ -4,7 +4,7 @@
 _realname=protobuf
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
-pkgver=3.11.1
+pkgver=3.11.2
 _gtest_ver=1.8.1
 pkgrel=1
 pkgdesc="Protocol Buffers - Google's data interchange format (mingw-w64)"
@@ -22,7 +22,7 @@ source=(${_realname}-${pkgver}.tar.gz::https://github.com/google/protobuf/archiv
         0001-protobuf-3.1.0-gcc6.2.0-tests.patch
         0002-windres-invocation.patch)
 noextract=("${_realname}-${pkgver}.tar.gz")
-sha256sums=('4f8e805825c53bbc3c9f6b6abc009b5b5679e4702bccfca1121c42ff5ec801c7'
+sha256sums=('e8c7601439dbd4489fe5069c33d374804990a56c2f710e00227ee5d8fd650e67'
             '9bf1fe5182a604b4135edc1a425ae356c9ad15e9b23f9f12a02e80184c3a249c'
             '15c2248597356040be0111d5bfc7317d59a49552d5cd05b0fa70c76980b7ca66'
             '7c5434ca428784058d6a3bb4a14ff8ff2c4ee843c51800751bbee599d5a63288')
diff --git a/mingw-w64-python-bcrypt/PKGBUILD b/mingw-w64-python-bcrypt/PKGBUILD
index 75c80e10ea..68ef8375a6 100644
--- a/mingw-w64-python-bcrypt/PKGBUILD
+++ b/mingw-w64-python-bcrypt/PKGBUILD
@@ -2,17 +2,20 @@
 
 _realname=bcrypt
 pkgbase=mingw-w64-python-${_realname}
-pkgname=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+pkgname=("${MINGW_PACKAGE_PREFIX}-python-${_realname}")
+provides=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+conflicts=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+replaces=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
 pkgver=3.1.7
-pkgrel=3
+pkgrel=1
 pkgdesc="Modern password hashing for your software and your servers (mingw-w64)"
 arch=('any')
 url='https://github.com/pyca/bcrypt/'
 license=('Apache-2.0')
-depends=("${MINGW_PACKAGE_PREFIX}-python3"
-         "${MINGW_PACKAGE_PREFIX}-python3-cffi"
-         "${MINGW_PACKAGE_PREFIX}-python3-six"
-makedepends=("${MINGW_PACKAGE_PREFIX}-python3-setuptools")
+depends=("${MINGW_PACKAGE_PREFIX}-python"
+         "${MINGW_PACKAGE_PREFIX}-python-cffi"
+         "${MINGW_PACKAGE_PREFIX}-python-six")
+makedepends=("${MINGW_PACKAGE_PREFIX}-python-setuptools")
 options=('staticlibs' 'strip' '!debug')
 source=("${_realname}-${pkgver}.tar.gz"::"https://github.com/pyca/bcrypt/archive/${pkgver}.tar.gz")
 sha512sums=('bfe487ac43aa5081a16c7f67787c2aec777a9c42f3f0f64d4dd238e6cf135e248e806a675ecdc5240066e2b5a31773f9c5dd939479e96ec25357e27bced01409')
@@ -36,30 +39,30 @@ del_file_exists() {
 
 prepare() {
   cd "${srcdir}"
-  rm -rf python3-build-${CARCH} | true
-  cp -r "${_realname}-${pkgver}" "python3-build-${CARCH}"
+  rm -rf python-build-${CARCH} | true
+  cp -r "${_realname}-${pkgver}" "python-build-${CARCH}"
 
   # Set version for setuptools_scm
   export SETUPTOOLS_SCM_PRETEND_VERSION=${pkgver}
 }
 
 build() {
-  msg "Python 3 build for ${CARCH}"
-  cd "${srcdir}/python3-build-${CARCH}"
-  ${MINGW_PREFIX}/bin/python3 setup.py build
+  msg "Python build for ${CARCH}"
+  cd "${srcdir}/python-build-${CARCH}"
+  ${MINGW_PREFIX}/bin/python setup.py build
 }
 
 check() {
-  msg "Python 3 test for ${CARCH}"
-  cd "${srcdir}/python3-build-${CARCH}"
-  ${MINGW_PREFIX}/bin/python3 setup.py check
+  msg "Python test for ${CARCH}"
+  cd "${srcdir}/python-build-${CARCH}"
+  ${MINGW_PREFIX}/bin/python setup.py check
 }
 
 package() {
-  cd "${srcdir}/python3-build-${CARCH}"
+  cd "${srcdir}/python-build-${CARCH}"
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
-  ${MINGW_PREFIX}/bin/python3 setup.py install --prefix=${MINGW_PREFIX} \
+  ${MINGW_PREFIX}/bin/python setup.py install --prefix=${MINGW_PREFIX} \
     --root="${pkgdir}" --optimize=1 --skip-build
 
-  install -Dm644 LICENSE "${pkgdir}${MINGW_PREFIX}/share/licenses/python3-${_realname}/COPYING"
+  install -Dm644 LICENSE "${pkgdir}${MINGW_PREFIX}/share/licenses/python-${_realname}/COPYING"
 }
diff --git a/mingw-w64-python-can/PKGBUILD b/mingw-w64-python-can/PKGBUILD
index 9f55046bf5..4f04e3b7a8 100644
--- a/mingw-w64-python-can/PKGBUILD
+++ b/mingw-w64-python-can/PKGBUILD
@@ -2,44 +2,47 @@
 
 _realname=can
 pkgbase=mingw-w64-python-${_realname}
-pkgname=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+pkgname=("${MINGW_PACKAGE_PREFIX}-python-${_realname}")
+provides=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+conflicts=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+replaces=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
 pkgver=3.3.2
 pkgrel=1
 pkgdesc="Provides controller area network (CAN) support for Python developers (mingw-w64)"
 arch=('any')
 license=('LGPLv3')
 url="https://python-can.readthedocs.io/en/master/"
-depends=("${MINGW_PACKAGE_PREFIX}-python3"
-         "${MINGW_PACKAGE_PREFIX}-python3-python_ics"
-         "${MINGW_PACKAGE_PREFIX}-python3-pyserial")
-makedepends=("${MINGW_PACKAGE_PREFIX}-python3-setuptools")
-checkdepends=("${MINGW_PACKAGE_PREFIX}-python3-mock"
-              "${MINGW_PACKAGE_PREFIX}-python3-nose"
-              "${MINGW_PACKAGE_PREFIX}-python3-pytest"
-              "${MINGW_PACKAGE_PREFIX}-python3-pytest-timeout"
-              "${MINGW_PACKAGE_PREFIX}-python3-pytest-cov"
-              "${MINGW_PACKAGE_PREFIX}-python3-codecov"
-              "${MINGW_PACKAGE_PREFIX}-python3-future"
-              "${MINGW_PACKAGE_PREFIX}-python3-six")
+depends=("${MINGW_PACKAGE_PREFIX}-python"
+         "${MINGW_PACKAGE_PREFIX}-python-python_ics"
+         "${MINGW_PACKAGE_PREFIX}-python-pyserial")
+makedepends=("${MINGW_PACKAGE_PREFIX}-python-setuptools")
+checkdepends=("${MINGW_PACKAGE_PREFIX}-python-mock"
+              "${MINGW_PACKAGE_PREFIX}-python-nose"
+              "${MINGW_PACKAGE_PREFIX}-python-pytest"
+              "${MINGW_PACKAGE_PREFIX}-python-pytest-timeout"
+              "${MINGW_PACKAGE_PREFIX}-python-pytest-cov"
+              "${MINGW_PACKAGE_PREFIX}-python-codecov"
+              "${MINGW_PACKAGE_PREFIX}-python-future"
+              "${MINGW_PACKAGE_PREFIX}-python-six")
 source=(${_realname}-${pkgver}.tar.gz::https://github.com/hardbyte/python-can/archive/${pkgver}.tar.gz)
 sha256sums=('f8227ca09e4f2a003468d2edeec741dc8730b66b83b8a53079bf71fea5f80811')
 
 prepare() {
   cd "${srcdir}"
-  rm -rf python3-build-${CARCH} || true
-  cp -r "python-${_realname}-${pkgver}" "python3-build-${CARCH}"
+  rm -rf python-build-${CARCH} || true
+  cp -r "python-${_realname}-${pkgver}" "python-build-${CARCH}"
 }
 
 build() {
-  msg "Python 3 build for ${CARCH}"  
-  cd "${srcdir}/python3-build-${CARCH}"
-  ${MINGW_PREFIX}/bin/python3 setup.py build
+  msg "Python build for ${CARCH}"  
+  cd "${srcdir}/python-build-${CARCH}"
+  ${MINGW_PREFIX}/bin/python setup.py build
 }
 
 package() {
-  cd "${srcdir}/python3-build-${CARCH}"
+  cd "${srcdir}/python-build-${CARCH}"
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=;--install-purelib=;--install-data=" \
-    ${MINGW_PREFIX}/bin/python3 setup.py install --prefix=${MINGW_PREFIX} --root="${pkgdir}" --optimize=1
+    ${MINGW_PREFIX}/bin/python setup.py install --prefix=${MINGW_PREFIX} --root="${pkgdir}" --optimize=1 --skip-build
 
   local PREFIX_WIN=$(cygpath -wm ${MINGW_PREFIX})
   # fix python command in files
diff --git a/mingw-w64-python-colorspacious/PKGBUILD b/mingw-w64-python-colorspacious/PKGBUILD
index 7252b19a5c..0f0145e1c1 100644
--- a/mingw-w64-python-colorspacious/PKGBUILD
+++ b/mingw-w64-python-colorspacious/PKGBUILD
@@ -2,31 +2,38 @@
 
 _realname=colorspacious
 pkgbase=mingw-w64-python-${_realname}
-pkgname=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+pkgname=("${MINGW_PACKAGE_PREFIX}-python-${_realname}")
+provides=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+conflicts=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+replaces=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
 pkgver=1.1.2
-pkgrel=4
+pkgrel=1
 pkgdesc="Python library for doing colorspace conversions (mingw-w64)"
 arch=('any')
 license=('MIT')
 url="https://pypi.python.org/pypi/colorspacious"
-depends=("${MINGW_PACKAGE_PREFIX}-python3"
-         "${MINGW_PACKAGE_PREFIX}-python3-numpy")
-makedepends=("${MINGW_PACKAGE_PREFIX}-python3-setuptools")
+depends=("${MINGW_PACKAGE_PREFIX}-python"
+         "${MINGW_PACKAGE_PREFIX}-python-numpy")
+makedepends=("${MINGW_PACKAGE_PREFIX}-python-setuptools")
 options=('staticlibs')
 source=("${_realname}-${pkgver}.tar.gz"::"https://github.com/njsmith/colorspacious/archive/v${pkgver}.tar.gz")
 sha256sums=('d72658fe4ccedc3ab276c831e51887ee8fc8e5824eee11aeed398ec77d77d640')
 
-build() {
-  cd "${srcdir}/${_realname}-${pkgver}"
+prepare() {
+  cd "${srcdir}"
+  cp -r "${_realname}-${pkgver}" "python-build-${CARCH}"
+}
 
-  ${MINGW_PREFIX}/bin/python3 setup.py build
+build() {
+  cd "${srcdir}/python-build-${CARCH}"
+  ${MINGW_PREFIX}/bin/python setup.py build
 }
 
 package() {
-  cd "${srcdir}/${_realname}-${pkgver}"
+  cd "${srcdir}/python-build-${CARCH}"
 
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
-    ${MINGW_PREFIX}/bin/python3 setup.py install --prefix=${MINGW_PREFIX} --root="${pkgdir}" -O1
+    ${MINGW_PREFIX}/bin/python setup.py install --prefix=${MINGW_PREFIX} --root="${pkgdir}" -O1 --skip-build
 
-  install -Dm644 LICENSE.txt "${pkgdir}${MINGW_PREFIX}/share/licenses/python3-${_realname}/COPYING"
+  install -Dm644 LICENSE.txt "${pkgdir}${MINGW_PREFIX}/share/licenses/python-${_realname}/COPYING"
 }
diff --git a/mingw-w64-python-colour/PKGBUILD b/mingw-w64-python-colour/PKGBUILD
index b5a44e5f3c..006dfdda37 100644
--- a/mingw-w64-python-colour/PKGBUILD
+++ b/mingw-w64-python-colour/PKGBUILD
@@ -2,40 +2,46 @@
 
 _realname=colour
 pkgbase=mingw-w64-python-${_realname}
-pkgname=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
-pkgver=0.3.11
-pkgrel=3
+pkgname=("${MINGW_PACKAGE_PREFIX}-python-${_realname}")
+provides=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+conflicts=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+replaces=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+pkgver=0.3.13
+pkgrel=1
 pkgdesc="Python library for a multitude of colour science applications (mingw-w64)"
 arch=('any')
 license=('BSD-3-Clause')
 url="https://pypi.python.org/pypi/colour-science"
-  depends=("${MINGW_PACKAGE_PREFIX}-python3"
-           "${MINGW_PACKAGE_PREFIX}-python3-scipy"
-           "${MINGW_PACKAGE_PREFIX}-python3-six")
-makedepends=("${MINGW_PACKAGE_PREFIX}-python3-setuptools")
-checkdepends=("${MINGW_PACKAGE_PREFIX}-python3-nose")
+depends=("${MINGW_PACKAGE_PREFIX}-python"
+         "${MINGW_PACKAGE_PREFIX}-python-scipy"
+         "${MINGW_PACKAGE_PREFIX}-python-six")
+makedepends=("${MINGW_PACKAGE_PREFIX}-python-setuptools")
+checkdepends=("${MINGW_PACKAGE_PREFIX}-python-nose")
 options=('staticlibs')
 source=("${_realname}-${pkgver}.tar.gz"::"https://github.com/colour-science/colour/archive/v${pkgver}.tar.gz")
-sha256sums=('df048ca5097a44833039a0392b9f7af649a220204c2e8252fd8639dfce4add3e')
+sha256sums=('397914e44a4401594ee3cc3a317fe8620c5ceeed184dfded92e6af97cedadf55')
+
+prepare() {
+  cd "${srcdir}"
+  cp -r "${_realname}-${pkgver}" "python-build-${CARCH}"
+}
 
 build() {
-  cd "${srcdir}/${_realname}-${pkgver}"
-
-  ${MINGW_PREFIX}/bin/python3 setup.py build
+  cd "${srcdir}/python-build-${CARCH}"
+  ${MINGW_PREFIX}/bin/python setup.py build
 }
 
 check() {
-  cd "${srcdir}/${_realname}-${pkgver}"
-
-  ${MINGW_PREFIX}/bin/nosetests3
+  cd "${srcdir}/python-build-${CARCH}"
+  ${MINGW_PREFIX}/bin/nosetests
 }
 
 package() {
-  cd "${srcdir}/${_realname}-${pkgver}"
+  cd "${srcdir}/python-build-${CARCH}"
 
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
-  ${MINGW_PREFIX}/bin/python3 setup.py install --prefix=${MINGW_PREFIX} \
+  ${MINGW_PREFIX}/bin/python setup.py install --prefix=${MINGW_PREFIX} \
     --root="${pkgdir}" --optimize=1 --skip-build
 
-  install -Dm644 COPYING "${pkgdir}${MINGW_PREFIX}/share/licenses/python3-${_realname}/COPYING"
+  install -Dm644 LICENSE "${pkgdir}${MINGW_PREFIX}/share/licenses/python-${_realname}/LICENSE"
 }
diff --git a/mingw-w64-python-crcmod/PKGBUILD b/mingw-w64-python-crcmod/PKGBUILD
index b1bcd9194a..7a7abac5ce 100644
--- a/mingw-w64-python-crcmod/PKGBUILD
+++ b/mingw-w64-python-crcmod/PKGBUILD
@@ -2,29 +2,36 @@
 
 _realname=crcmod
 pkgbase=mingw-w64-python-${_realname}
-pkgname=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+pkgname=("${MINGW_PACKAGE_PREFIX}-python-${_realname}")
+provides=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+conflicts=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+replaces=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
 pkgver=1.7
-pkgrel=4
+pkgrel=1
 pkgdesc="Cyclic Redundancy Check (CRC) implementation in Python (mingw-w64)"
 arch=('any')
 url="https://pypi.python.org/pypi/crcmod/"
 license=('MIT')
-depends=("${MINGW_PACKAGE_PREFIX}-python3")
-makedepends=("${MINGW_PACKAGE_PREFIX}-python3-setuptools")
+depends=("${MINGW_PACKAGE_PREFIX}-python")
+makedepends=("${MINGW_PACKAGE_PREFIX}-python-setuptools")
 options=('staticlibs' 'strip' '!debug')
 source=("https://pypi.python.org/packages/source/c/${_realname}/${_realname}-${pkgver}.tar.gz")
 sha256sums=('dc7051a0db5f2bd48665a990d3ec1cc305a466a77358ca4492826f41f283601e')
 
-build() {
-  cd "${srcdir}/${_realname}-${pkgver}"
+prepare() {
+  cd "${srcdir}"
+  cp -r "${_realname}-${pkgver}" "python-build-${CARCH}"
+}
 
-  ${MINGW_PREFIX}/bin/python3 setup.py build
+build() {
+  cd "${srcdir}/python-build-${CARCH}"
+  ${MINGW_PREFIX}/bin/python setup.py build
 }
 
 package() {
-  cd "${srcdir}/${_realname}-${pkgver}"
+  cd "${srcdir}/python-build-${CARCH}"
 
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
-  ${MINGW_PREFIX}/bin/python3 setup.py install --prefix=${MINGW_PREFIX} \
+  ${MINGW_PREFIX}/bin/python setup.py install --prefix=${MINGW_PREFIX} \
     --root="${pkgdir}" --optimize=1 --skip-build
 }
diff --git a/mingw-w64-python-cvxopt/PKGBUILD b/mingw-w64-python-cvxopt/PKGBUILD
index 1b2898f5b7..0c071e493c 100644
--- a/mingw-w64-python-cvxopt/PKGBUILD
+++ b/mingw-w64-python-cvxopt/PKGBUILD
@@ -2,16 +2,19 @@
 
 _realname=cvxopt
 pkgbase=mingw-w64-python-${_realname}
-pkgname=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+pkgname=("${MINGW_PACKAGE_PREFIX}-python-${_realname}")
+provides=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+conflicts=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+replaces=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
 pkgver=1.2.3
-pkgrel=3
+pkgrel=1
 pkgdesc="Convex optimization based on the Python programming language (mingw-w64)"
 arch=('any')
 url='https://cvxopt.org/'
 license=('GPL v3')
 validpgpkeys=('gpg_KEY')
-makedepends=("${MINGW_PACKAGE_PREFIX}-python3-setuptools")
-depends=("${MINGW_PACKAGE_PREFIX}-python3"
+makedepends=("${MINGW_PACKAGE_PREFIX}-python-setuptools")
+depends=("${MINGW_PACKAGE_PREFIX}-python"
          "${MINGW_PACKAGE_PREFIX}-openblas"
          "${MINGW_PACKAGE_PREFIX}-suitesparse"
          "${MINGW_PACKAGE_PREFIX}-gsl"
@@ -20,10 +23,15 @@ depends=("${MINGW_PACKAGE_PREFIX}-python3"
          "${MINGW_PACKAGE_PREFIX}-glpk")
 options=('staticlibs' 'strip' '!debug')
 source=("https://pypi.org/packages/source/${_realname::1}/${_realname}/${_realname}-${pkgver}.tar.gz")
-sha256sums=('ea62a2a1b8e2db3a6ae44ac394f58e4620149af226c250c6f2b18739b48cfc21')
+sha256sums=('9a117022984586ecc86ab643da74fcab2411b9c43a26f1b9a9d0bd9ed26728ce')
+
+prepare() {
+  cd "${srcdir}"
+  cp -r "${_realname}-${pkgver}" "python-build-${CARCH}"
+}
 
 build() {
-  cd "${srcdir}/${_realname}-${pkgver}"
+  cd "${srcdir}/python-build-${CARCH}"
 
   CVXOPT_BLAS_LIB='openblas'                          \
   CVXOPT_LAPACK_LIB='openblas'                        \
@@ -45,17 +53,16 @@ build() {
 }
 
 check() {
-  cd "${srcdir}/${_realname}-${pkgver}"
-
-  ${MINGW_PREFIX}/bin/python3 setup.py check
+  cd "${srcdir}/python-build-${CARCH}"
+  ${MINGW_PREFIX}/bin/python setup.py check
 }
 
 package() {
-  cd "${srcdir}/${_realname}-${pkgver}"
+  cd "${srcdir}/python-build-${CARCH}"
 
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
-  ${MINGW_PREFIX}/bin/python3 setup.py install --prefix=${MINGW_PREFIX} \
+  ${MINGW_PREFIX}/bin/python setup.py install --prefix=${MINGW_PREFIX} \
     --root="${pkgdir}" --optimize=1 --skip-build
 
-  install -Dm644 LICENSE "${pkgdir}${MINGW_PREFIX}/share/licenses/python3-${_realname}/COPYING"
+  install -Dm644 LICENSE "${pkgdir}${MINGW_PREFIX}/share/licenses/python-${_realname}/COPYING"
 }
diff --git a/mingw-w64-python-ddt/PKGBUILD b/mingw-w64-python-ddt/PKGBUILD
index b99224f56d..af76d291cd 100644
--- a/mingw-w64-python-ddt/PKGBUILD
+++ b/mingw-w64-python-ddt/PKGBUILD
@@ -2,48 +2,49 @@
 
 _realname=ddt
 pkgbase=mingw-w64-python-${_realname}
-pkgname=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
-pkgver=1.2.1
-pkgrel=3
+pkgname=("${MINGW_PACKAGE_PREFIX}-python-${_realname}")
+provides=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+conflicts=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+replaces=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+pkgver=1.2.2
+pkgrel=1
 pkgdesc="Data-Driven/Decorated Tests (mingw-w64)"
 arch=('any')
 url='https://github.com/txels/ddt'
 license=('MIT')
-depends=("${MINGW_PACKAGE_PREFIX}-python3")
-makedepends=("${MINGW_PACKAGE_PREFIX}-python3-setuptools")
-checkdepends=("${MINGW_PACKAGE_PREFIX}-python3-nose"
-              "${MINGW_PACKAGE_PREFIX}-python3-mock"
-              "${MINGW_PACKAGE_PREFIX}-python3-yaml")
+depends=("${MINGW_PACKAGE_PREFIX}-python")
+makedepends=("${MINGW_PACKAGE_PREFIX}-python-setuptools")
+checkdepends=("${MINGW_PACKAGE_PREFIX}-python-nose"
+              "${MINGW_PACKAGE_PREFIX}-python-mock"
+              "${MINGW_PACKAGE_PREFIX}-python-yaml")
 options=('staticlibs' 'strip' '!debug')
 source=("${_realname}-${pkgver}.tar.gz"::"https://github.com/txels/ddt/archive/${pkgver}.tar.gz")
-sha512sums=('c40114109fb99577a9572157e0cec7011efb3415b80874d0038949febf6c2d31ff7977c953e7c23770bc965541f79c7015826c1c7f39c2606db39ad5f38d60ad')
+sha512sums=('9b45c4b422cab9e6858235b413b622f077bf4e5254214165c50afdea767dda7d9f39e7be7b0d583b87849a078271f4fba34ac5fe0f35bd196eb7f396bd308fe7')
 
 prepare() {
-  cd "${srcdir}/${_realname}-${pkgver}"
+  cd "${srcdir}"
+  cp -r "${_realname}-${pkgver}" "python-build-${CARCH}"
 
   # Set version for setuptools_scm
   export SETUPTOOLS_SCM_PRETEND_VERSION=$pkgver
 }
 
 build() {
-  cd "${srcdir}/${_realname}-${pkgver}"
-
-  ${MINGW_PREFIX}/bin/python3 setup.py build
+  cd "${srcdir}/python-build-${CARCH}"
+  ${MINGW_PREFIX}/bin/python setup.py build
 }
 
 check() {
-  cd "${srcdir}/${_realname}-${pkgver}"
-
-  ${MINGW_PREFIX}/bin/nosetests3
+  cd "${srcdir}/python-build-${CARCH}"
+  ${MINGW_PREFIX}/bin/nosetests
 }
 
 package() {
-  cd "${srcdir}/${_realname}-${pkgver}"
+  cd "${srcdir}/python-build-${CARCH}"
 
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
-  ${MINGW_PREFIX}/bin/python3 setup.py install --prefix=${MINGW_PREFIX} \
+  ${MINGW_PREFIX}/bin/python setup.py install --prefix=${MINGW_PREFIX} \
     --root="${pkgdir}" --optimize=1 --skip-build
 
-  install -Dm644 LICENSE.md "${pkgdir}${MINGW_PREFIX}/share/licenses/python3-${_realname}/LICENSE.md"
+  install -Dm644 LICENSE.md "${pkgdir}${MINGW_PREFIX}/share/licenses/python-${_realname}/LICENSE.md"
 }
-
diff --git a/mingw-w64-python-debtcollector/PKGBUILD b/mingw-w64-python-debtcollector/PKGBUILD
index 9919c8534b..140549038a 100644
--- a/mingw-w64-python-debtcollector/PKGBUILD
+++ b/mingw-w64-python-debtcollector/PKGBUILD
@@ -2,21 +2,24 @@
 
 _realname=debtcollector
 pkgbase=mingw-w64-python-${_realname}
-pkgname=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+pkgname=("${MINGW_PACKAGE_PREFIX}-python-${_realname}")
+provides=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+conflicts=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+replaces=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
 pkgver=1.22.0
-pkgrel=2
+pkgrel=1
 pkgdesc="A collection of Python deprecation patterns and strategies that help you collect your technical debt in a non-destructive manner (mingw-w64)"
 arch=('any')
 url='https://docs.openstack.org/developer/debtcollector'
 license=('Apache')
 options=('staticlibs' 'strip' '!debug')
-depends=("${MINGW_PACKAGE_PREFIX}-python3"
-         "${MINGW_PACKAGE_PREFIX}-python3-six"
-         "${MINGW_PACKAGE_PREFIX}-python3-pbr"
-         "${MINGW_PACKAGE_PREFIX}-python3-babel"
-         "${MINGW_PACKAGE_PREFIX}-python3-wrapt")
-makedepends=("${MINGW_PACKAGE_PREFIX}-python3-setuptools")
-#checkdepends=("${MINGW_PACKAGE_PREFIX}-python3-oslotest")
+depends=("${MINGW_PACKAGE_PREFIX}-python"
+         "${MINGW_PACKAGE_PREFIX}-python-six"
+         "${MINGW_PACKAGE_PREFIX}-python-pbr"
+         "${MINGW_PACKAGE_PREFIX}-python-babel"
+         "${MINGW_PACKAGE_PREFIX}-python-wrapt")
+makedepends=("${MINGW_PACKAGE_PREFIX}-python-setuptools")
+#checkdepends=("${MINGW_PACKAGE_PREFIX}-python-oslotest")
 source=("${_realname}-${pkgver}.tar.gz::https://github.com/openstack/debtcollector/archive/${pkgver}.tar.gz")
 sha512sums=('bbf6a6cfbf7bfac4e08181e5fd9d661f3c51d9a414ded9f6446c39589103bcddb212b1778bf2fd9bf47123df2481b4c59ef1318f106ca6a77a8c749d4f7d9169')
 
diff --git a/mingw-w64-python-distutils-extra/PKGBUILD b/mingw-w64-python-distutils-extra/PKGBUILD
index 25e36cf908..1f29f6cb36 100644
--- a/mingw-w64-python-distutils-extra/PKGBUILD
+++ b/mingw-w64-python-distutils-extra/PKGBUILD
@@ -2,39 +2,45 @@
 
 _realname=python-distutils-extra
 pkgbase=mingw-w64-${_realname}
-pkgname=("${MINGW_PACKAGE_PREFIX}-python3-distutils-extra")
+pkgname=("${MINGW_PACKAGE_PREFIX}-python-distutils-extra")
+provides=("${MINGW_PACKAGE_PREFIX}-python3-distutils-extra")
+conflicts=("${MINGW_PACKAGE_PREFIX}-python3-distutils-extra")
+replaces=("${MINGW_PACKAGE_PREFIX}-python3-distutils-extra")
 pkgver=2.39
-pkgrel=6
+pkgrel=1
 pkgdesc="Enhancements to the Python build system (mingw-w64)"
 arch=('any')
 license=('GPL')
 url="https://launchpad.net/python-distutils-extra"
-depends=("${MINGW_PACKAGE_PREFIX}-python3>=3.3"
+depends=("${MINGW_PACKAGE_PREFIX}-python>=3.3"
          "intltool")
-makedepends=("${MINGW_PACKAGE_PREFIX}-python3-setuptools")
+makedepends=("${MINGW_PACKAGE_PREFIX}-python-setuptools")
 source=("https://launchpad.net/${_realname}/trunk/${pkgver}/+download/${_realname}-${pkgver}.tar.gz"
         "https://launchpad.net/${_realname}/trunk/${pkgver}/+download/${_realname}-${pkgver}.tar.gz.asc")
 validpgpkeys=("3DB46B55EFA59D40E6232148D14EF15DAFE11347") # Martin Pitt <martinpitt@gnome.org>
 sha256sums=('723f24f4d65fc8d99b33a002fbbb3771d4cc9d664c97085bf37f3997ae8063af'
             'SKIP')
 
-build() {
-  cd "${srcdir}/${_realname}-${pkgver}"
+prepare() {
+  cd "${srcdir}"
+  rm -rf python-build-${CARCH} | true
+  cp -r "${_realname}-${pkgver}" "python-build-${CARCH}"
+}
 
+build() {
+  cd "${srcdir}/python-build-${CARCH}"
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
-  ${MINGW_PREFIX}/bin/python3 setup.py build
+  ${MINGW_PREFIX}/bin/python setup.py build
 }
 
 check() {
-  cd "${srcdir}/${_realname}-${pkgver}"
-
+  cd "${srcdir}/python-build-${CARCH}"
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
-  ${MINGW_PREFIX}/bin/python3 setup.py test
+  ${MINGW_PREFIX}/bin/python setup.py test
 }
 
 package() {
-  cd "${srcdir}/${_realname}-${pkgver}"
-
+  cd "${srcdir}/python-build-${CARCH}"
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
-  ${MINGW_PREFIX}/bin/python3 setup.py install --prefix="${MINGW_PREFIX}" --root="${pkgdir}" --skip-build
+  ${MINGW_PREFIX}/bin/python setup.py install --prefix="${MINGW_PREFIX}" --root="${pkgdir}" --skip-build
 }
diff --git a/mingw-w64-python-django/PKGBUILD b/mingw-w64-python-django/PKGBUILD
index 6d801e159c..1f04b902f5 100644
--- a/mingw-w64-python-django/PKGBUILD
+++ b/mingw-w64-python-django/PKGBUILD
@@ -4,21 +4,31 @@
 #
 _realname=django
 pkgbase=mingw-w64-python-${_realname}
-pkgname=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
-pkgver=2.2.6
+pkgname=("${MINGW_PACKAGE_PREFIX}-python-${_realname}")
+provides=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+conflicts=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+replaces=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+pkgver=3.0.1
 pkgrel=1
 pkgdesc="A high-level Python Web framework that encourages rapid development and clean design (mingw-w64)"
 arch=('any')
 url='https://www.djangoproject.com/'
 license=('BSD')
-makedepends=("${MINGW_PACKAGE_PREFIX}-python3"
-             "${MINGW_PACKAGE_PREFIX}-python3-bcrypt"
-             "${MINGW_PACKAGE_PREFIX}-python3-argon2_cffi"
-             "${MINGW_PACKAGE_PREFIX}-python3-pytz"
-             "${MINGW_PACKAGE_PREFIX}-python3-setuptools")
+depends=("${MINGW_PACKAGE_PREFIX}-python"
+         "${MINGW_PACKAGE_PREFIX}-python-pytz")
+optdepends=("${MINGW_PACKAGE_PREFIX}-python-psycopg2: for PostgreSQL backend"
+            "${MINGW_PACKAGE_PREFIX}-python-bcrypt: for bcrypt support"
+            "${MINGW_PACKAGE_PREFIX}-python-argon2_cffi: for Argon2 support")
+makedepends=("${MINGW_PACKAGE_PREFIX}-python-bcrypt"
+             "${MINGW_PACKAGE_PREFIX}-python-argon2_cffi"
+             "${MINGW_PACKAGE_PREFIX}-python-psycopg2"
+             "${MINGW_PACKAGE_PREFIX}-python-setuptools")
 options=('staticlibs' 'strip' '!debug')
-source=("Django-${pkgver}.tar.gz"::"https://www.djangoproject.com/download/${pkgver}/tarball/")
-sha512sums=('1bd44543ea06b6c412b1c15a6850c4aa68b637b360c922cc6ed06e7e0b2f22142d94c8c455f5c24b8c34fa5d431b5a3d80502928b5445bc2c36a5458bd5eb627')
+install=${_realname}3-${CARCH}.install
+source=(#"Django-${pkgver}.tar.gz"::"https://www.djangoproject.com/download/${pkgver}/tarball/"
+        "${_realname}-${pkgver}.tar.gz"::https://github.com/django/django/archive/${pkgver}.tar.gz)
+sha512sums=('129002812ceee2498ccaf430814969167ac5097b9c4b2061488202da49482658050b07cf99ab47c927d516469b9ff54226b1e9b677fac611bd77b1522cb99b04')
+noextract=(${_realname}-${pkgver}.tar.gz)
 
 # Helper macros to help make tasks easier #
 apply_patch_with_msg() {
@@ -40,61 +50,33 @@ del_file_exists() {
 # =========================================== #
 
 prepare() {
+  [[ -d ${srcdir}/${_realname}-${pkgver} ]] && rm -rf ${srcdir}/${_realname}-${pkgver}
+  tar -xzf ${srcdir}/${_realname}-${pkgver}.tar.gz -C ${srcdir} || true
+
   cd "${srcdir}"
-  rm -rf python3-build-${CARCH} | true
-  cp -r "${_realname}-${pkgver}" "python3-build-${CARCH}"
+  rm -rf python-build-${CARCH} | true
+  cp -r "${_realname}-${pkgver}" "python-build-${CARCH}"
   # Set version for setuptools_scm
-  export SETUPTOOLS_SCM_PRETEND_VERSION=$pkgver
+  export SETUPTOOLS_SCM_PRETEND_VERSION=${pkgver}
 }
 
-# Note that build() is sometimes skipped because it's done in 
-# the packages setup.py install for simplicity if you can do so.
-# but sometimes, you want to do a check before install which would
-# also trigger the build.
 build() {
-  msg "Python 3 build for ${CARCH}"  
-  cd "${srcdir}/python3-build-${CARCH}"
-  ${MINGW_PREFIX}/bin/python3 setup.py build
+  msg "Python build for ${CARCH}"  
+  cd "${srcdir}/python-build-${CARCH}"
+  ${MINGW_PREFIX}/bin/python setup.py build
 }
 
 package() {
-  depends=("${MINGW_PACKAGE_PREFIX}-python3"
-           "${MINGW_PACKAGE_PREFIX}-python3-pytz")
-  optdepends=("${MINGW_PACKAGE_PREFIX}-python3-psycopg2: for PostgreSQL backend"
-              "${MINGW_PACKAGE_PREFIX}-python3-bcrypt: for bcrypt support"
-              "${MINGW_PACKAGE_PREFIX}-python3-argon2_cffi: for Argon2 support")
-  install=${_realname}3-${CARCH}.install
-
-  cd "${srcdir}/python3-build-${CARCH}"
+  cd "${srcdir}/python-build-${CARCH}"
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
-  ${MINGW_PREFIX}/bin/python3 setup.py install --prefix=${MINGW_PREFIX} \
+  ${MINGW_PREFIX}/bin/python setup.py install --prefix=${MINGW_PREFIX} \
     --root="${pkgdir}" --optimize=1 --skip-build
 
-  install -Dm644 LICENSE "${pkgdir}${MINGW_PREFIX}/share/licenses/python3-${_realname}/LICENSE"
+  install -Dm644 LICENSE "${pkgdir}${MINGW_PREFIX}/share/licenses/python-${_realname}/LICENSE"
 
-# This entire section should be removed if the package does NOT install
-# anything in the /mingw*/bin directory.
-### begin section ###
   local PREFIX_WIN=$(cygpath -wm ${MINGW_PREFIX})
   # fix python command in files
   for _f in "${pkgdir}${MINGW_PREFIX}"/bin/*.py; do
     sed -e "s|${PREFIX_WIN}/bin/|${MINGW_PREFIX}/bin/|g" -i ${_f}
   done
-#### end section ####
-
-# for Python3 packages, you want to copy the bin files to something with 3
-# as a suffix for consistancy with Archlinux's symlink.
-#  ln -s django-admin.py "$pkgdir"/usr/bin/django-admin3.py
-#  ln -s django-admin "$pkgdir"/usr/bin/django-admin3
-
-  for f in django-admin; do
-    cp "${pkgdir}${MINGW_PREFIX}"/bin/${f}{,3}.exe
-    if [ -f "${pkgdir}${MINGW_PREFIX}"/bin/${f}.exe.manifest ]; then
-      cp "${pkgdir}${MINGW_PREFIX}"/bin/${f}{,3}.exe.manifest
-      sed -e "s|${f}|${f}2|g" -i "${pkgdir}${MINGW_PREFIX}"/bin/${f}3.exe.manifest
-    fi
-    cp "${pkgdir}${MINGW_PREFIX}"/bin/${f}{,3}.py
-    cp "${pkgdir}${MINGW_PREFIX}"/bin/${f}{,3}-script.py
-  done
-#### end section ####
 }
diff --git a/mingw-w64-python-django/django3-i686.install b/mingw-w64-python-django/django3-i686.install
index 760c98bcd0..3c93406f9c 100644
--- a/mingw-w64-python-django/django3-i686.install
+++ b/mingw-w64-python-django/django3-i686.install
@@ -3,7 +3,7 @@ post_install() {
   local _prefix=$(pwd -W)
   cd -
   local _it
-  for _it in django-admin django-admin3; do
+  for _it in django-admin; do
     sed -e "s|/mingw32|${_prefix}|g" \
         -i ${_prefix}/bin/${_it}-script.py
   done
diff --git a/mingw-w64-python-django/django3-x86_64.install b/mingw-w64-python-django/django3-x86_64.install
index 4ded0a608b..fdaf4e0924 100644
--- a/mingw-w64-python-django/django3-x86_64.install
+++ b/mingw-w64-python-django/django3-x86_64.install
@@ -3,7 +3,7 @@ post_install() {
   local _prefix=$(pwd -W)
   cd -
   local _it
-  for _it in django-admin django-admin3; do
+  for _it in django-admin; do
     sed -e "s|/mingw64|${_prefix}|g" \
         -i ${_prefix}/bin/${_it}-script.py
   done
diff --git a/mingw-w64-python-email-validator/PKGBUILD b/mingw-w64-python-email-validator/PKGBUILD
index 2ae79f61d7..7f41a91a3e 100644
--- a/mingw-w64-python-email-validator/PKGBUILD
+++ b/mingw-w64-python-email-validator/PKGBUILD
@@ -2,17 +2,20 @@
 
 _realname=email-validator
 pkgbase=mingw-w64-python-${_realname}
-pkgname=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+pkgname=("${MINGW_PACKAGE_PREFIX}-python-${_realname}")
+provides=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+conflicts=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+replaces=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
 pkgver=1.0.5
-pkgrel=2
-pkgdesc="A robust email syntax and deliverability validation library for Python 3.x (mingw-w64)"
+pkgrel=1
+pkgdesc="A robust email syntax and deliverability validation library for Python (mingw-w64)"
 arch=('any')
 url='https://github.com/JoshData/python-email-validator'
 license=('custom:CC0')
-depends=("${MINGW_PACKAGE_PREFIX}-python3"
-         "${MINGW_PACKAGE_PREFIX}-python3-dnspython"
-         "${MINGW_PACKAGE_PREFIX}-python3-idna")
-makedepends=("${MINGW_PACKAGE_PREFIX}-python3-setuptools")
+depends=("${MINGW_PACKAGE_PREFIX}-python"
+         "${MINGW_PACKAGE_PREFIX}-python-dnspython"
+         "${MINGW_PACKAGE_PREFIX}-python-idna")
+makedepends=("${MINGW_PACKAGE_PREFIX}-python-setuptools")
 install=${_realname}3-${CARCH}.install
 options=('staticlibs' 'strip' '!debug')
 source=("${_realname}-${pkgver}.tar.gz"::"https://github.com/JoshData/python-email-validator/archive/v${pkgver}.tar.gz")
@@ -39,32 +42,32 @@ del_file_exists() {
 
 prepare() {
   cd "${srcdir}"
-  rm -rf python3-build-${CARCH} | true
-  cp -r "python-${_realname}-${pkgver}" "python3-build-${CARCH}"
+  rm -rf python-build-${CARCH} | true
+  cp -r "python-${_realname}-${pkgver}" "python-build-${CARCH}"
 
   # Set version for setuptools_scm
   export SETUPTOOLS_SCM_PRETEND_VERSION=${pkgver}
 }
 
 build() {
-  msg "Python 3 build for ${CARCH}"  
-  cd "${srcdir}/python3-build-${CARCH}"
-  ${MINGW_PREFIX}/bin/python3 setup.py build
+  msg "Python build for ${CARCH}"  
+  cd "${srcdir}/python-build-${CARCH}"
+  ${MINGW_PREFIX}/bin/python setup.py build
 }
 
 check() {
-  msg "Python 3 test for ${CARCH}"
-  cd "${srcdir}/python3-build-${CARCH}"
-  ${MINGW_PREFIX}/bin/python3 email_validator/__init__.py --tests < test_pass.txt || true
+  msg "Python test for ${CARCH}"
+  cd "${srcdir}/python-build-${CARCH}"
+  ${MINGW_PREFIX}/bin/python email_validator/__init__.py --tests < test_pass.txt || true
 }
 
 package() {
-  cd "${srcdir}/python3-build-${CARCH}"
+  cd "${srcdir}/python-build-${CARCH}"
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
-  ${MINGW_PREFIX}/bin/python3 setup.py install --prefix=${MINGW_PREFIX} \
+  ${MINGW_PREFIX}/bin/python setup.py install --prefix=${MINGW_PREFIX} \
     --root="${pkgdir}" --optimize=1 --skip-build
 
-  install -Dm644 LICENSE "${pkgdir}${MINGW_PREFIX}/share/licenses/python3-${_realname}/COPYING"
+  install -Dm644 LICENSE "${pkgdir}${MINGW_PREFIX}/share/licenses/python-${_realname}/COPYING"
 
   local PREFIX_WIN=$(cygpath -wm ${MINGW_PREFIX})
   # fix python command in files
diff --git a/mingw-w64-python-eventlet/PKGBUILD b/mingw-w64-python-eventlet/PKGBUILD
index abc8e2687a..63cfdd9919 100644
--- a/mingw-w64-python-eventlet/PKGBUILD
+++ b/mingw-w64-python-eventlet/PKGBUILD
@@ -2,62 +2,66 @@
 
 _realname=eventlet
 pkgbase=mingw-w64-python-${_realname}
-pkgname=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+pkgname=("${MINGW_PACKAGE_PREFIX}-python-${_realname}")
+provides=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+conflicts=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+replaces=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
 pkgver=0.25.1
-pkgrel=2
+pkgrel=1
 pkgdesc="Highly concurrent networking library (mingw-w64)"
 arch=('any')
 url='https://eventlet.net/'
 license=('MIT')
-depends=("${MINGW_PACKAGE_PREFIX}-python3"
-         "${MINGW_PACKAGE_PREFIX}-python3-greenlet"
-         "${MINGW_PACKAGE_PREFIX}-python3-monotonic")
-optdepends=("${MINGW_PACKAGE_PREFIX}-python3-psycopg2: non-blocking PostgreSQL support"
-            "${MINGW_PACKAGE_PREFIX}-python3-pyopenssl: non-blocking SSL support"
-            "${MINGW_PACKAGE_PREFIX}-python3-httplib2: non-blocking HTTP support"
-            "${MINGW_PACKAGE_PREFIX}-python3-pyzmq: non-blocking ZeroMQ support"
-            "${MINGW_PACKAGE_PREFIX}-python3-dnspython: non-blocking DNS support")
-makedepends=("${MINGW_PACKAGE_PREFIX}-python3-setuptools"
-             "${MINGW_PACKAGE_PREFIX}-python3-sphinx")
-checkdepends=("${MINGW_PACKAGE_PREFIX}-python3-psycopg2"
-              "${MINGW_PACKAGE_PREFIX}-python3-nose"
-              "${MINGW_PACKAGE_PREFIX}-python3-pyopenssl"
-              "${MINGW_PACKAGE_PREFIX}-python3-httplib2"
-              "${MINGW_PACKAGE_PREFIX}-python3-mock"
-              "${MINGW_PACKAGE_PREFIX}-python3-pyzmq"
-              "${MINGW_PACKAGE_PREFIX}-python3-dnspython")
+depends=("${MINGW_PACKAGE_PREFIX}-python"
+         "${MINGW_PACKAGE_PREFIX}-python-greenlet"
+         "${MINGW_PACKAGE_PREFIX}-python-monotonic")
+optdepends=("${MINGW_PACKAGE_PREFIX}-python-psycopg2: non-blocking PostgreSQL support"
+            "${MINGW_PACKAGE_PREFIX}-python-pyopenssl: non-blocking SSL support"
+            "${MINGW_PACKAGE_PREFIX}-python-httplib2: non-blocking HTTP support"
+            "${MINGW_PACKAGE_PREFIX}-python-pyzmq: non-blocking ZeroMQ support"
+            "${MINGW_PACKAGE_PREFIX}-python-dnspython: non-blocking DNS support")
+makedepends=("${MINGW_PACKAGE_PREFIX}-python-setuptools"
+             "${MINGW_PACKAGE_PREFIX}-python-sphinx")
+checkdepends=("${MINGW_PACKAGE_PREFIX}-python-psycopg2"
+              "${MINGW_PACKAGE_PREFIX}-python-nose"
+              "${MINGW_PACKAGE_PREFIX}-python-pyopenssl"
+              "${MINGW_PACKAGE_PREFIX}-python-httplib2"
+              "${MINGW_PACKAGE_PREFIX}-python-mock"
+              "${MINGW_PACKAGE_PREFIX}-python-pyzmq"
+              "${MINGW_PACKAGE_PREFIX}-python-dnspython")
 options=('staticlibs' 'strip' '!debug')
 source=(${_realname}-${pkgver}.tar.gz::https://github.com/eventlet/eventlet/archive/v${pkgver}.tar.gz)
 sha512sums=('ed3c1bfc17039c17730d4a8bb8ae3a3604b0210f3e6c326764fce748d7466a090b270c5dbc713aaf023681f33a80967adbe83f6280b61f5661a309a0bd43249a')
 
 prepare() {
   cd "${srcdir}/${_realname}-${pkgver}"
-
   sed -r 's|(check_idle_cpu_usage\(.*,) .*\)|\1 0.8\)|g' \
       -i tests/*_test.py
 
+  cd "${srcdir}"
+  rm -rf python-build-${CARCH} | true
+  cp -r "${_realname}-${pkgver}" "python-build-${CARCH}"
+
   # Set version for setuptools_scm
-  export SETUPTOOLS_SCM_PRETEND_VERSION=$pkgver
+  export SETUPTOOLS_SCM_PRETEND_VERSION=${pkgver}
 }
 
 build() {
-  cd "${srcdir}/${_realname}-${pkgver}"
-
-  ${MINGW_PREFIX}/bin/python3 setup.py build 
+  cd "${srcdir}/python-build-${CARCH}"
+  ${MINGW_PREFIX}/bin/python setup.py build 
 }
 
 check() {
-  cd "${srcdir}/${_realname}-${pkgver}"
-
+  cd "${srcdir}/python-build-${CARCH}"
   ${MINGW_PREFIX}/bin/nosetests -sv tests || warning "tests failed"
 }
 
 package() {
-  cd "${srcdir}/${_realname}-${pkgver}"
+  cd "${srcdir}/python-build-${CARCH}"
 
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
-  ${MINGW_PREFIX}/bin/python3 setup.py install --prefix=${MINGW_PREFIX} \
+  ${MINGW_PREFIX}/bin/python setup.py install --prefix=${MINGW_PREFIX} \
     --root="${pkgdir}" --optimize=1 --skip-build
 
-  install -Dm644 LICENSE "${pkgdir}${MINGW_PREFIX}/share/licenses/python3-${_realname}/LICENSE"
+  install -Dm644 LICENSE "${pkgdir}${MINGW_PREFIX}/share/licenses/python-${_realname}/LICENSE"
 }
diff --git a/mingw-w64-python-faker/PKGBUILD b/mingw-w64-python-faker/PKGBUILD
index 372b9eaaf7..b508fb9c74 100644
--- a/mingw-w64-python-faker/PKGBUILD
+++ b/mingw-w64-python-faker/PKGBUILD
@@ -2,51 +2,54 @@
 
 _realname=faker
 pkgbase=mingw-w64-python-${_realname}
-pkgname=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
-pkgver=2.0.3
+pkgname=("${MINGW_PACKAGE_PREFIX}-python-${_realname}")
+provides=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+conflicts=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+replaces=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+pkgver=3.0.0
 pkgrel=1
 pkgdesc="Faker generates fake data for you (mingw-w64)"
 arch=('any')
 url="https://faker.readthedocs.io/en/master/"
 license=('MIT')
-depends=("${MINGW_PACKAGE_PREFIX}-python3"
-         "${MINGW_PACKAGE_PREFIX}-python3-dateutil"
-         "${MINGW_PACKAGE_PREFIX}-python3-six"
-         "${MINGW_PACKAGE_PREFIX}-python3-text-unidecode")
-makedepends=("${MINGW_PACKAGE_PREFIX}-python3-setuptools")
-checkdepends=("${MINGW_PACKAGE_PREFIX}-python3-ukpostcodeparser"
-              "${MINGW_PACKAGE_PREFIX}-python3-mock"
-              "${MINGW_PACKAGE_PREFIX}-python3-email-validator")
+depends=("${MINGW_PACKAGE_PREFIX}-python"
+         "${MINGW_PACKAGE_PREFIX}-python-dateutil"
+         "${MINGW_PACKAGE_PREFIX}-python-six"
+         "${MINGW_PACKAGE_PREFIX}-python-text-unidecode")
+makedepends=("${MINGW_PACKAGE_PREFIX}-python-setuptools")
+checkdepends=("${MINGW_PACKAGE_PREFIX}-python-ukpostcodeparser"
+              "${MINGW_PACKAGE_PREFIX}-python-mock"
+              "${MINGW_PACKAGE_PREFIX}-python-email-validator")
 install=${_realname}3-${CARCH}.install
 options=('staticlibs' 'strip' '!debug')
 source=("${_realname}-${pkgver}.tar.gz"::"https://github.com/joke2k/faker/archive/v${pkgver}.tar.gz")
-sha512sums=('5a9ba29cf06829e37ff8c9944a6133721d1bf2299f1c6501e8b91b42bbade8cae5dbedff88bfdaede6e90105ea94045440a035000c9bbe487b1ed7cb15cca445')
+sha512sums=('021b0b50f5431955e966be3fd9d2cc70e2521c47c129dc9ce04b19a722e60316db8d3eb446e226207ca0413d3c32af22d12e73be2c8d51ea6fdd7fb77ef057b3')
 
 prepare() {
   cd "${srcdir}"
-  rm -rf python3-build-${CARCH}" | true
-  cp -r "${_realname}-${pkgver}" "python3-build-${CARCH}""
+  rm -rf "python-build-${CARCH}" | true
+  cp -r "${_realname}-${pkgver}" "python-build-${CARCH}"
 }
 
 build() {
-  msg "Python 3 build for ${CARCH}"  
-  cd "${srcdir}/python3-build-${CARCH}"
-  ${MINGW_PREFIX}/bin/python3 setup.py build
+  msg "Python build for ${CARCH}"  
+  cd "${srcdir}/python-build-${CARCH}"
+  ${MINGW_PREFIX}/bin/python setup.py build
 }
 
 check() {
-  msg "Python 3 test for ${CARCH}"
-  cd "${srcdir}/python3-build-${CARCH}"
-  ${MINGW_PREFIX}/bin/python3 setup.py test || warning "Tests failed"
+  msg "Python test for ${CARCH}"
+  cd "${srcdir}/python-build-${CARCH}"
+  ${MINGW_PREFIX}/bin/python setup.py test || warning "Tests failed"
 }
 
 package() {
-  cd "${srcdir}/python3-build-${CARCH}"
+  cd "${srcdir}/python-build-${CARCH}"
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
-  ${MINGW_PREFIX}/bin/python3 setup.py install --prefix=${MINGW_PREFIX} \
+  ${MINGW_PREFIX}/bin/python setup.py install --prefix=${MINGW_PREFIX} \
     --root="${pkgdir}" --optimize=1 --skip-build
 
-  install -Dm644 LICENSE.txt "${pkgdir}${MINGW_PREFIX}/share/licenses/python3-${_realname}/LICENSE.txt"
+  install -Dm644 LICENSE.txt "${pkgdir}${MINGW_PREFIX}/share/licenses/python-${_realname}/LICENSE.txt"
 
   local PREFIX_WIN=$(cygpath -wm ${MINGW_PREFIX})
   # fix python command in files
diff --git a/mingw-w64-python-faker/faker3-i686.install b/mingw-w64-python-faker/faker3-i686.install
index 662a6fd763..078d337fa1 100644
--- a/mingw-w64-python-faker/faker3-i686.install
+++ b/mingw-w64-python-faker/faker3-i686.install
@@ -3,9 +3,6 @@ post_install() {
   local _prefix=$(pwd -W)
   cd -
   local _it
-# "somepackage" should be replaced with the name of your .EXE w/o 2 and .exe ext
-# Like this:
-# For "myexe.exe", it would be "myexe" .
   for _it in faker; do
     sed -e "s|/mingw32|${_prefix}|g" \
         -i ${_prefix}/bin/${_it}-script.py
diff --git a/mingw-w64-python-faker/faker3-x86_64.install b/mingw-w64-python-faker/faker3-x86_64.install
index 5bca1ece4a..4023731c3c 100644
--- a/mingw-w64-python-faker/faker3-x86_64.install
+++ b/mingw-w64-python-faker/faker3-x86_64.install
@@ -3,9 +3,6 @@ post_install() {
   local _prefix=$(pwd -W)
   cd -
   local _it
-# "somepackage" should be replaced with the name of your .EXE w/o 2 and .exe ext
-# Like this:
-# For "myexe.exe", it would be "myexe" .
   for _it in faker; do
     sed -e "s|/mingw64|${_prefix}|g" \
         -i ${_prefix}/bin/${_it}-script.py
diff --git a/mingw-w64-python-fasteners/PKGBUILD b/mingw-w64-python-fasteners/PKGBUILD
index 2a44907e44..71a00efebb 100644
--- a/mingw-w64-python-fasteners/PKGBUILD
+++ b/mingw-w64-python-fasteners/PKGBUILD
@@ -2,33 +2,41 @@
 
 _realname=fasteners
 pkgbase=mingw-w64-python-${_realname}
-pkgname=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+pkgname=("${MINGW_PACKAGE_PREFIX}-python-${_realname}")
+provides=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+conflicts=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+replaces=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
 pkgver=0.15
-pkgrel=3
+pkgrel=1
 pkgdesc="A python package that provides useful locks. (mingw-w64)"
 arch=('any')
 url='https://github.com/harlowja/fasteners'
 license=('Apache')
-depends=("${MINGW_PACKAGE_PREFIX}-python3"
-         "${MINGW_PACKAGE_PREFIX}-python3-six" 
-         "${MINGW_PACKAGE_PREFIX}-python3-monotonic")
-makedepends=("${MINGW_PACKAGE_PREFIX}-python3-setuptools")
+depends=("${MINGW_PACKAGE_PREFIX}-python"
+         "${MINGW_PACKAGE_PREFIX}-python-six" 
+         "${MINGW_PACKAGE_PREFIX}-python-monotonic")
+makedepends=("${MINGW_PACKAGE_PREFIX}-python-setuptools")
 options=('staticlibs' 'strip' '!debug')
 source=("${_realname}-${pkgver}.tar.gz"::"https://github.com/harlowja/fasteners/archive/${pkgver}.tar.gz")
 sha512sums=('0c77c7061c8b76d0d018b07a3d33fc71701842f5b686456ebf31069694baa27a6cc47196267f24bc296078e7503ab0709fa28c9f0088c3cf777ea0e133bb5832')
 
-build() {
-  cd "${srcdir}/${_realname}-${pkgver}"
+prepare() {
+  cd "${srcdir}"
+  rm -rf "python-build-${CARCH}" | true
+  cp -r "${_realname}-${pkgver}" "python-build-${CARCH}"
+}
 
-  ${MINGW_PREFIX}/bin/python3 setup.py build
+build() {
+  cd "${srcdir}/python-build-${CARCH}"
+  ${MINGW_PREFIX}/bin/python setup.py build
 }
 
 package() {
-  cd "${srcdir}/${_realname}-${pkgver}"
+  cd "${srcdir}/python-build-${CARCH}"
 
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
-  ${MINGW_PREFIX}/bin/python3 setup.py install --prefix=${MINGW_PREFIX} \
+  ${MINGW_PREFIX}/bin/python setup.py install --prefix=${MINGW_PREFIX} \
     --root="${pkgdir}" --optimize=1 --skip-build
 
-  install -Dm644 LICENSE "${pkgdir}${MINGW_PREFIX}/share/licenses/python3-${_realname}/LICENSE"
+  install -Dm644 LICENSE "${pkgdir}${MINGW_PREFIX}/share/licenses/python-${_realname}/LICENSE"
 }
diff --git a/mingw-w64-python-genty/PKGBUILD b/mingw-w64-python-genty/PKGBUILD
index 766acaeed0..2922e190b2 100644
--- a/mingw-w64-python-genty/PKGBUILD
+++ b/mingw-w64-python-genty/PKGBUILD
@@ -2,30 +2,38 @@
 
 _realname=genty
 pkgbase=mingw-w64-python-${_realname}
-pkgname=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+pkgname=("${MINGW_PACKAGE_PREFIX}-python-${_realname}")
+provides=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+conflicts=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+replaces=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
 pkgver=1.3.2
-pkgrel=4
+pkgrel=1
 pkgdesc="Allows you to run a test with multiple data sets (mingw-w64)"
 arch=('any')
 url="https://github.com/box/genty"
 license=('APACHE')
-depends=("${MINGW_PACKAGE_PREFIX}-python3"
-         "${MINGW_PACKAGE_PREFIX}-python3-six")
-makedepends=("${MINGW_PACKAGE_PREFIX}-python3-setuptools")
+depends=("${MINGW_PACKAGE_PREFIX}-python"
+         "${MINGW_PACKAGE_PREFIX}-python-six")
+makedepends=("${MINGW_PACKAGE_PREFIX}-python-setuptools")
 options=('staticlibs' 'strip' '!debug')
 source=(${_realname}-${pkgver}.tar.gz::"https://github.com/box/genty/archive/v${pkgver}.tar.gz")
 sha256sums=('34fbc16c18dd207b21f15b6dc61b8ae1197057525636ac2f8172cc52071d9f06')
 
-build() {
-  cd "${srcdir}/${_realname}-${pkgver}"
+prepare() {
+  cd "${srcdir}"
+  rm -rf "python-build-${CARCH}" | true
+  cp -r "${_realname}-${pkgver}" "python-build-${CARCH}"
+}
 
-  ${MINGW_PREFIX}/bin/python${pver} setup.py build
+build() {
+  cd "${srcdir}/python-build-${CARCH}"
+  ${MINGW_PREFIX}/bin/python setup.py build
 }
 
 package() {
-  cd "${srcdir}/${_realname}-${pkgver}"
+  cd "${srcdir}/python-build-${CARCH}"
 
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
-  ${MINGW_PREFIX}/bin/python3 setup.py install --prefix=${MINGW_PREFIX} \
+  ${MINGW_PREFIX}/bin/python setup.py install --prefix=${MINGW_PREFIX} \
     --root="${pkgdir}" --optimize=1 --skip-build
 }
diff --git a/mingw-w64-python-greenlet/PKGBUILD b/mingw-w64-python-greenlet/PKGBUILD
index 8080843d78..32d576f63f 100644
--- a/mingw-w64-python-greenlet/PKGBUILD
+++ b/mingw-w64-python-greenlet/PKGBUILD
@@ -2,31 +2,39 @@
 
 _realname=greenlet
 pkgbase=mingw-w64-python-${_realname}
-pkgname=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+pkgname=("${MINGW_PACKAGE_PREFIX}-python-${_realname}")
+provides=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+conflicts=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+replaces=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
 pkgver=0.4.15
-pkgrel=3
+pkgrel=1
 pkgdesc="Lightweight in-process concurrent programming (mingw-w64)"
 arch=('any')
 url="https://pypi.python.org/pypi/greenlet"
 license=('MIT')
-depends=("${MINGW_PACKAGE_PREFIX}-python3")
-makedepends=("${MINGW_PACKAGE_PREFIX}-python3-setuptools")
+depends=("${MINGW_PACKAGE_PREFIX}-python")
+makedepends=("${MINGW_PACKAGE_PREFIX}-python-setuptools")
 options=('staticlibs' 'strip' '!debug')
 source=("${_realname}-${pkgver}.tar.gz::https://files.pythonhosted.org/packages/source/g/greenlet/${_realname}-${pkgver}.tar.gz")
 sha256sums=('9416443e219356e3c31f1f918a91badf2e37acf297e2fa13d24d1cc2380f8fbc')
 
-build() {
-  cd "${srcdir}/${_realname}-${pkgver}"
+prepare() {
+  cd "${srcdir}"
+  rm -rf python-build-${CARCH} | true
+  cp -r "${_realname}-${pkgver}" "python-build-${CARCH}"
+}
 
-  ${MINGW_PREFIX}/bin/python3 setup.py build
+build() {
+  cd "${srcdir}/python-build-${CARCH}"
+  ${MINGW_PREFIX}/bin/python setup.py build
 }
 
 package() {
-  cd "${srcdir}/${_realname}-${pkgver}"
+  cd "${srcdir}/python-build-${CARCH}"
 
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
-  ${MINGW_PREFIX}/bin/python3 setup.py install --prefix=${MINGW_PREFIX} \
+  ${MINGW_PREFIX}/bin/python setup.py install --prefix=${MINGW_PREFIX} \
     --root="${pkgdir}" --optimize=1 --skip-build
   
-  install -Dm0644 LICENSE.PSF "${pkgdir}"${MINGW_PREFIX}/share/licenses/python3-${_realname}/LICENSE.PSF
+  install -Dm0644 LICENSE.PSF "${pkgdir}"${MINGW_PREFIX}/share/licenses/python-${_realname}/LICENSE.PSF
 }
diff --git a/mingw-w64-python-h5py/PKGBUILD b/mingw-w64-python-h5py/PKGBUILD
index cf909aff3b..d9eae99560 100644
--- a/mingw-w64-python-h5py/PKGBUILD
+++ b/mingw-w64-python-h5py/PKGBUILD
@@ -2,48 +2,53 @@
 
 _realname=h5py
 pkgbase=mingw-w64-python-${_realname}
-pkgname=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+pkgname=("${MINGW_PACKAGE_PREFIX}-python-${_realname}")
+provides=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+conflicts=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+replaces=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
 pkgver=2.10.0
-pkgrel=3
+pkgrel=1
 pkgdesc="General-purpose Python bindings for the HDF5 library (mingw-w64)"
 arch=('any')
 url="https://www.h5py.org/"
 license=('BSD')
-depends=("${MINGW_PACKAGE_PREFIX}-python3-numpy"
-         "${MINGW_PACKAGE_PREFIX}-python3-six"
+depends=("${MINGW_PACKAGE_PREFIX}-python-numpy"
+         "${MINGW_PACKAGE_PREFIX}-python-six"
          "${MINGW_PACKAGE_PREFIX}-hdf5")
 makedepends=("${MINGW_PACKAGE_PREFIX}-cython"
              "${MINGW_PACKAGE_PREFIX}-gcc"
-             "${MINGW_PACKAGE_PREFIX}-python3-pkgconfig"
+             "${MINGW_PACKAGE_PREFIX}-python-pkgconfig"
              "${MINGW_PACKAGE_PREFIX}-pkg-config")
 source=(https://github.com/h5py/h5py/releases/download/${pkgver}/h5py-${pkgver}.tar.gz
         001-mingw-python.patch
         lzf_c.c.patch)
-sha256sums=('b8fad55638f473e8011dcbce1c23e794e15e753b016fc5260fe01c3ff230c2c4'
+sha256sums=('84412798925dc870ffd7107f045d7659e60f5d46d1c70c700375248bf6bf512d'
             'cd8dff9d11117521cc7948400fa92cbc115d432c93aac181a20017d27e3f197e'
             '6d0126b881b5dcd637146d151341b72aa68eef760092272279072ec0bc4ceca9')
 
 prepare() {
   cd "${srcdir}/${_realname}-${pkgver}"
-
   patch -p1 -i ${srcdir}/001-mingw-python.patch
   patch -p1 -i ${srcdir}/lzf_c.c.patch
+
+  cd "${srcdir}"
+  rm -rf "python-build-${CARCH}" | true
+  cp -r "${_realname}-${pkgver}" "python-build-${CARCH}"
 }
 
 build() {
-  cd "${srcdir}/${_realname}-${pkgver}"
-
+  cd "${srcdir}/python-build-${CARCH}"
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
-  ${MINGW_PREFIX}/bin/python3 setup.py build
+  ${MINGW_PREFIX}/bin/python setup.py build
 }
 
 package() {
-  cd "${srcdir}/${_realname}-${pkgver}"
+  cd "${srcdir}/python-build-${CARCH}"
 
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
-  ${MINGW_PREFIX}/bin/python3 setup.py install --skip-build \
+  ${MINGW_PREFIX}/bin/python setup.py install --skip-build \
     --prefix=${MINGW_PREFIX} --root=${pkgdir} --optimize=1
 
   install -Dm644 licenses/license.txt \
-    "${pkgdir}${MINGW_PREFIX}/share/licenses/python3-${_realname}/LICENSE.txt"
+    "${pkgdir}${MINGW_PREFIX}/share/licenses/python-${_realname}/LICENSE.txt"
 }
diff --git a/mingw-w64-python-hacking/PKGBUILD b/mingw-w64-python-hacking/PKGBUILD
index 2a608bebe7..eaacbde3da 100644
--- a/mingw-w64-python-hacking/PKGBUILD
+++ b/mingw-w64-python-hacking/PKGBUILD
@@ -2,49 +2,54 @@
 
 _realname=hacking
 pkgbase=mingw-w64-python-${_realname}
-pkgname=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
-pkgver=1.1.0
-pkgrel=3
+pkgname=("${MINGW_PACKAGE_PREFIX}-python-${_realname}")
+provides=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+conflicts=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+replaces=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+pkgver=2.0.0
+pkgrel=1
 pkgdesc="OpenStack Hacking Guideline Enforcement (mingw-w64)"
 arch=('any')
 url='https://docs.openstack.org/developer/hacking'
 license=('Apache')
-depends=("${MINGW_PACKAGE_PREFIX}-python3")
-makedepends=("${MINGW_PACKAGE_PREFIX}-python3-pbr"
-             "${MINGW_PACKAGE_PREFIX}-python3-setuptools")
+depends=("${MINGW_PACKAGE_PREFIX}-python")
+makedepends=("${MINGW_PACKAGE_PREFIX}-python-pbr"
+             "${MINGW_PACKAGE_PREFIX}-python-setuptools")
 options=('staticlibs' 'strip' '!debug')
 source=("${_realname}-${pkgver}.tar.gz::https://github.com/openstack-dev/hacking/archive/${pkgver}.tar.gz")
-sha512sums=('25e8fc8585b0de2c9f746a31539d2ee0b6b18685f17cac149bf8cf372d9c31d1f10ac93087d6bcc69b4d1a15b4b3c99cecbe15fe95e903c3de72aba21af32827')
+sha512sums=('33cb147afe122fa55636122fc858704f052e469c9091fe8bc5763937f9e6150d7686c2c253fca6319ff3108dae1ae19eebfe9d425c722762599033696f9180c0')
 
 prepare() {
   cd "${srcdir}/${_realname}-${pkgver}"
 
   sed -e 's/flake8<2.7.0,/flake8/' -e 's/==/>=/' -i requirements.txt
 
+  cd "${srcdir}"
+  rm -rf "python-build-${CARCH}" | true
+  cp -r "${_realname}-${pkgver}" "python-build-${CARCH}"
+
   # Set version for setuptools_scm
-  export SETUPTOOLS_SCM_PRETEND_VERSION=$pkgver
+  export SETUPTOOLS_SCM_PRETEND_VERSION=${pkgver}
   # set version for python-pbr
-  export PBR_VERSION=$pkgver
+  export PBR_VERSION=${pkgver}
 }
 
 build() {
-  cd "${srcdir}/${_realname}-${pkgver}"
-
-  ${MINGW_PREFIX}/bin/python3 setup.py build
+  cd "${srcdir}/python-build-${CARCH}"
+  ${MINGW_PREFIX}/bin/python setup.py build
 }
 
 check() {
-  cd "${srcdir}/${_realname}-${pkgver}"
-
-  ${MINGW_PREFIX}/bin/python3 setup.py test || warning "Tests failed"
+  cd "${srcdir}/python-build-${CARCH}"
+  ${MINGW_PREFIX}/bin/python setup.py test || warning "Tests failed"
 }
 
 package() {
-  cd "${srcdir}/${_realname}-${pkgver}"
+  cd "${srcdir}/python-build-${CARCH}"
 
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
-  ${MINGW_PREFIX}/bin/python3 setup.py install --prefix=${MINGW_PREFIX} \
+  ${MINGW_PREFIX}/bin/python setup.py install --prefix=${MINGW_PREFIX} \
     --root="${pkgdir}" --optimize=1 --skip-build
 
-  install -Dm644 LICENSE "${pkgdir}${MINGW_PREFIX}/share/licenses/python3-${_realname}/LICENSE"
+  install -Dm644 LICENSE "${pkgdir}${MINGW_PREFIX}/share/licenses/python-${_realname}/LICENSE"
 }
diff --git a/mingw-w64-python-httplib2/PKGBUILD b/mingw-w64-python-httplib2/PKGBUILD
index e5bc039d96..53400ad03a 100644
--- a/mingw-w64-python-httplib2/PKGBUILD
+++ b/mingw-w64-python-httplib2/PKGBUILD
@@ -3,20 +3,23 @@
 
 _realname=httplib2
 pkgbase=mingw-w64-python-${_realname}
-pkgname=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
-pkgver=0.14.0
-pkgrel=2
+pkgname=("${MINGW_PACKAGE_PREFIX}-python-${_realname}")
+provides=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+conflicts=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+replaces=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+pkgver=0.15.0
+pkgrel=1
 pkgdesc="Comprehensive HTTP client library, supporting many features (mingw-w64)"
 arch=('any')
 license=('MIT')
 url="https://github.com/httplib2/httplib2"
-depends=("${MINGW_PACKAGE_PREFIX}-python3"
-         "${MINGW_PACKAGE_PREFIX}-python3-certifi"
+depends=("${MINGW_PACKAGE_PREFIX}-python"
+         "${MINGW_PACKAGE_PREFIX}-python-certifi"
          "${MINGW_PACKAGE_PREFIX}-ca-certificates")
-makedepends=("${MINGW_PACKAGE_PREFIX}-python3-setuptools")
+makedepends=("${MINGW_PACKAGE_PREFIX}-python-setuptools")
 source=(${_realname}-${pkgver}.tar.gz::https://github.com/httplib2/httplib2/archive/v${pkgver}.tar.gz
         cert.patch)
-sha256sums=('4b0a937532597b681917a88e47eaf6aba00d5c209e1b6524cb0779d08856d79f'
+sha256sums=('da914fa16d5e969df16350b588b555256f484f5f4f6961cb5aee52a437884d5e'
             '3503625ade773c17c9c44f4017aec634ff03db0073eb3ec11e6882a466d7aae6')
 
 prepare() {
@@ -24,20 +27,23 @@ prepare() {
 
   # Patch, ref FS#40179
   patch -p1 -i "${srcdir}/cert.patch"
+
+  cd "${srcdir}"
+  rm -rf "python-build-${CARCH}" | true
+  cp -r "${_realname}-${pkgver}" "python-build-${CARCH}"
 }
 
 build() {
-  cd "${srcdir}/${_realname}-${pkgver}"
-
-  ${MINGW_PREFIX}/bin/python3 setup.py build
+  cd "${srcdir}/python-build-${CARCH}"
+  ${MINGW_PREFIX}/bin/python setup.py build
 }
 
 package() {
-  cd "${srcdir}/${_realname}-${pkgver}"
+  cd "${srcdir}/python-build-${CARCH}"
 
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
-    ${MINGW_PREFIX}/bin/python3 setup.py install --prefix=${MINGW_PREFIX#\/} --root="${pkgdir}" --optimize=1
+    ${MINGW_PREFIX}/bin/python setup.py install --prefix=${MINGW_PREFIX#\/} --root="${pkgdir}" --optimize=1
 
   install -Dm644 LICENSE \
-    "${pkgdir}${MINGW_PREFIX}"/share/licenses/python3-${_realname}/LICENSE
+    "${pkgdir}${MINGW_PREFIX}"/share/licenses/python-${_realname}/LICENSE
 }
diff --git a/mingw-w64-python-icu/PKGBUILD b/mingw-w64-python-icu/PKGBUILD
index 872b355bba..b429b2fcf1 100644
--- a/mingw-w64-python-icu/PKGBUILD
+++ b/mingw-w64-python-icu/PKGBUILD
@@ -2,21 +2,24 @@
 
 _realname=PyICU
 pkgbase=mingw-w64-python-icu
-pkgname=("${MINGW_PACKAGE_PREFIX}-python3-icu")
-pkgver=2.3.1
-pkgrel=4
+pkgname=("${MINGW_PACKAGE_PREFIX}-python-icu")
+provides=("${MINGW_PACKAGE_PREFIX}-python3-icu")
+conflicts=("${MINGW_PACKAGE_PREFIX}-python3-icu")
+replaces=("${MINGW_PACKAGE_PREFIX}-python3-icu")
+pkgver=2.4.2
+pkgrel=1
 pkgdesc="Python extension wrapping the ICU C++ API (mingw-w64)"
 arch=('any')
 license=('BSD')
 url="https://github.com/ovalhub/pyicu"
-depends=("${MINGW_PACKAGE_PREFIX}-python3"
+depends=("${MINGW_PACKAGE_PREFIX}-python"
          "${MINGW_PACKAGE_PREFIX}-icu")
-makedepends=("${MINGW_PACKAGE_PREFIX}-python3-setuptools")
+makedepends=("${MINGW_PACKAGE_PREFIX}-python-setuptools")
 options=('staticlibs' 'strip' '!debug')
 source=("https://pypi.io/packages/source/P/${_realname}/${_realname}-${pkgver}.tar.gz"
         001-icu-config.patch
         002-fix-mingw-build.patch)
-sha256sums=('ddb2b453853b4c25db382bc5e8c4cde09b3f4696ef1e1494f8294e174f459cf4'
+sha256sums=('48c43424b67090c4028d8743132d141d8477f390f93e26c2cb67c26485622c20'
             'b12166984b7e7118c2d22934ff4370dea57635a161b7db4184e790472ec5b337'
             '95c6738d18639a2551ea42283d4a7a0d4ab675e6e9c9baa17718909c3c54aa2e')
 
@@ -34,19 +37,19 @@ build() {
   export PYICU_INCLUDES="${MINGW_PREFIX}/include"
   export PYICU_LIBRARIES="icuin;icuuc;icudt"
 
-  # Build python 3 module
+  # Build python module
   cd "${srcdir}/${_realname}-${pkgver}"
-  ${MINGW_PREFIX}/bin/python3 setup.py build
+  ${MINGW_PREFIX}/bin/python setup.py build
 }
 
 package() {
   cd "${srcdir}/${_realname}-${pkgver}"
 
-  ${MINGW_PREFIX}/bin/python3 setup.py install \
+  ${MINGW_PREFIX}/bin/python setup.py install \
       --prefix=${MINGW_PREFIX#\/} \
       --root="${pkgdir}" \
       --optimize=1 \
       --skip-build
 
-  install -Dm644 LICENSE "${pkgdir}${MINGW_PREFIX}/share/licenses/python3-icu/COPYING"
+  install -Dm644 LICENSE "${pkgdir}${MINGW_PREFIX}/share/licenses/python-icu/COPYING"
 }
diff --git a/mingw-w64-python-imbalanced-learn/PKGBUILD b/mingw-w64-python-imbalanced-learn/PKGBUILD
index 330e9d1db6..d9cf7183db 100644
--- a/mingw-w64-python-imbalanced-learn/PKGBUILD
+++ b/mingw-w64-python-imbalanced-learn/PKGBUILD
@@ -2,42 +2,45 @@
 
 _realname=imbalanced-learn
 pkgbase=mingw-w64-python3-${_realname}
-pkgname=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
-pkgver=0.5.0
-pkgrel=2
+pkgname=("${MINGW_PACKAGE_PREFIX}-python-${_realname}")
+provides=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+conflicts=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+replaces=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+pkgver=0.6.1
+pkgrel=1
 pkgdesc="A Python Package to Tackle the Curse of Imbalanced Datasets in Machine Learning (mingw-w64)"
 arch=('any')
 url='https://github.com/scikit-learn-contrib/imbalanced-learn'
 license=('MIT')
-depends=("${MINGW_PACKAGE_PREFIX}-python3"
-         "${MINGW_PACKAGE_PREFIX}-python3-joblib"
-         "${MINGW_PACKAGE_PREFIX}-python3-numpy"
-         "${MINGW_PACKAGE_PREFIX}-python3-scikit-learn"
-         "${MINGW_PACKAGE_PREFIX}-python3-scipy")
-makedepends=("${MINGW_PACKAGE_PREFIX}-python3-setuptools"
+depends=("${MINGW_PACKAGE_PREFIX}-python"
+         "${MINGW_PACKAGE_PREFIX}-python-joblib"
+         "${MINGW_PACKAGE_PREFIX}-python-numpy"
+         "${MINGW_PACKAGE_PREFIX}-python-scikit-learn"
+         "${MINGW_PACKAGE_PREFIX}-python-scipy")
+makedepends=("${MINGW_PACKAGE_PREFIX}-python-setuptools"
              "${MINGW_PACKAGE_PREFIX}-cython")
-optdepends=("${MINGW_PACKAGE_PREFIX}-python3-keras"
-            "${MINGW_PACKAGE_PREFIX}-python3-tensoflow")
+optdepends=("${MINGW_PACKAGE_PREFIX}-python-keras"
+            "${MINGW_PACKAGE_PREFIX}-python-tensoflow")
 source=("${_realname}-${pkgver}.tar.gz::https://github.com/scikit-learn-contrib/${_realname}/archive/${pkgver}.tar.gz")
-sha256sums=('3bad0144b0ecc078d29026ce785f3160d00eba1ffdcb51ffcff56e840f8c68fb')
+sha256sums=('fb8e37ba2f7ec3b338ed711b362690f31cfe2cc7202c9868602698f957304680')
 
 prepare() {
   cd "${srcdir}"
-  rm -rf python3-build-${CARCH} | true
-  cp -r "${_realname}-${pkgver}" "python3-build-${CARCH}"
+  rm -rf python-build-${CARCH} | true
+  cp -r "${_realname}-${pkgver}" "python-build-${CARCH}"
 }
 
 build() {
-  msg "Python 3 build for ${CARCH}"
-  cd "${srcdir}/python3-build-${CARCH}"
-  ${MINGW_PREFIX}/bin/python3 setup.py build
+  msg "Python build for ${CARCH}"
+  cd "${srcdir}/python-build-${CARCH}"
+  ${MINGW_PREFIX}/bin/python setup.py build
 }
 
 package() {
-  cd "${srcdir}/python3-build-${CARCH}"
+  cd "${srcdir}/python-build-${CARCH}"
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
-  ${MINGW_PREFIX}/bin/python3 setup.py install --prefix=${MINGW_PREFIX} \
+  ${MINGW_PREFIX}/bin/python setup.py install --prefix=${MINGW_PREFIX} \
     --root="${pkgdir}" --optimize=1 --skip-build
 
-  install -D LICENSE "$pkgdir"/${MINGW_PREFIX}/share/licenses/python3-${_realname}/LICENSE
+  install -D LICENSE "$pkgdir"/${MINGW_PREFIX}/share/licenses/python-${_realname}/LICENSE
 }
diff --git a/mingw-w64-python-iso8601/PKGBUILD b/mingw-w64-python-iso8601/PKGBUILD
index 773f065aa8..67290aa38b 100644
--- a/mingw-w64-python-iso8601/PKGBUILD
+++ b/mingw-w64-python-iso8601/PKGBUILD
@@ -2,39 +2,42 @@
 
 _realname=iso8601
 pkgbase=mingw-w64-python-${_realname}
-pkgname=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+pkgname=("${MINGW_PACKAGE_PREFIX}-python-${_realname}")
+provides=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+conflicts=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+replaces=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
 pkgver=0.1.12
-pkgrel=3
+pkgrel=1
 pkgdesc="Simple module to parse ISO 8601 dates (mingw-w64)"
 arch=('any')
 url="https://pyiso8601.readthedocs.io/en/latest/"
 license=('MIT')
-depends=("${MINGW_PACKAGE_PREFIX}-python3")
-makedepends=("${MINGW_PACKAGE_PREFIX}-python3-setuptools")
+depends=("${MINGW_PACKAGE_PREFIX}-python")
+makedepends=("${MINGW_PACKAGE_PREFIX}-python-setuptools")
 options=('staticlibs' 'strip' '!debug')
 source=(https://files.pythonhosted.org/packages/source/${_realname:0:1}/${_realname}/${_realname}-${pkgver}.tar.gz)
 sha256sums=('49c4b20e1f38aa5cf109ddcd39647ac419f928512c869dc01d5c7098eddede82')
 
 prepare() {
-  cd "${srcdir}/${_realname}-${pkgver}"
+  cd "${srcdir}"
+  rm -rf "python-build-${CARCH}" | true
+  cp -r "${_realname}-${pkgver}" "python-build-${CARCH}"
 
   # Set version for setuptools_scm
-  export SETUPTOOLS_SCM_PRETEND_VERSION=$pkgver
+  export SETUPTOOLS_SCM_PRETEND_VERSION=${pkgver}
 }
 
 build() {
-  cd "${srcdir}/${_realname}-${pkgver}"
-
-  ${MINGW_PREFIX}/bin/python3 setup.py build
+  cd "${srcdir}/python-build-${CARCH}"
+  ${MINGW_PREFIX}/bin/python setup.py build
 }
 
 package() {
-  cd "${srcdir}/${_realname}-${pkgver}"
+  cd "${srcdir}/python-build-${CARCH}"
 
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
-  ${MINGW_PREFIX}/bin/python3 setup.py install --prefix=${MINGW_PREFIX} \
+  ${MINGW_PREFIX}/bin/python setup.py install --prefix=${MINGW_PREFIX} \
     --root="${pkgdir}" --optimize=1 --skip-build
 
-  install -Dm644 LICENSE "${pkgdir}${MINGW_PREFIX}/share/licenses/python3-${_realname}/COPYING"
+  install -Dm644 LICENSE "${pkgdir}${MINGW_PREFIX}/share/licenses/python-${_realname}/COPYING"
 }
-
diff --git a/mingw-w64-python-joblib/PKGBUILD b/mingw-w64-python-joblib/PKGBUILD
index 7e6f117f6b..522a71cbee 100644
--- a/mingw-w64-python-joblib/PKGBUILD
+++ b/mingw-w64-python-joblib/PKGBUILD
@@ -2,32 +2,40 @@
 
 _realname=joblib
 pkgbase=mingw-w64-python-${_realname}
-pkgname=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
-pkgver=0.14.0
-pkgrel=2
+pkgname=("${MINGW_PACKAGE_PREFIX}-python-${_realname}")
+provides=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+conflicts=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+replaces=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+pkgver=0.14.1
+pkgrel=1
 pkgdesc="Set of tools to provide lightweight pipelining in Python (mingw-w64)"
 arch=('any')
 url='https://joblib.readthedocs.io/'
 license=('BSD')
-depends=("${MINGW_PACKAGE_PREFIX}-python3")
-optdepends=("${MINGW_PACKAGE_PREFIX}-python3-numpy: for array manipulation"
-            "${MINGW_PACKAGE_PREFIX}-python3-lz4: for compressed serialization")
-makedepends=("${MINGW_PACKAGE_PREFIX}-python3-setuptools")
+depends=("${MINGW_PACKAGE_PREFIX}-python")
+optdepends=("${MINGW_PACKAGE_PREFIX}-python-numpy: for array manipulation"
+            "${MINGW_PACKAGE_PREFIX}-python-lz4: for compressed serialization")
+makedepends=("${MINGW_PACKAGE_PREFIX}-python-setuptools")
 source=("${_realname}-${pkgver}.tar.gz::https://github.com/joblib/joblib/archive/${pkgver}.tar.gz")
-sha256sums=('9e66f3e31669f772fcbad95043fd05e4530e78288d60363b785d4c288a5dc707')
+sha256sums=('9cf07185bd8c778b2515f76b19a04af4979d417356e330fd90edebf8cfd29793')
+
+prepare() {
+  cd "${srcdir}"
+  rm -rf "python-build-${CARCH}" | true
+  cp -r "${_realname}-${pkgver}" "python-build-${CARCH}"
+}
 
 build() {
-  cd "${srcdir}/${_realname}-${pkgver}"
-
-  ${MINGW_PREFIX}/bin/python3 setup.py build
+  cd "${srcdir}/python-build-${CARCH}"
+  ${MINGW_PREFIX}/bin/python setup.py build
 }
 
 package() {
-  cd "${srcdir}/${_realname}-${pkgver}"
+  cd "${srcdir}/python-build-${CARCH}"
 
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
-  ${MINGW_PREFIX}/bin/python3 setup.py install --prefix=${MINGW_PREFIX} \
+  ${MINGW_PREFIX}/bin/python setup.py install --prefix=${MINGW_PREFIX} \
     --root="${pkgdir}" --optimize=1 --skip-build
 
-  install -Dm644 LICENSE.txt "${pkgdir}"${MINGW_PREFIX}/share/licenses/python3-${_realname}/LICENSE
+  install -Dm644 LICENSE.txt "${pkgdir}"${MINGW_PREFIX}/share/licenses/python-${_realname}/LICENSE
 }
diff --git a/mingw-w64-python-json-rpc/PKGBUILD b/mingw-w64-python-json-rpc/PKGBUILD
index 47daab40f5..3f90b5fa2c 100644
--- a/mingw-w64-python-json-rpc/PKGBUILD
+++ b/mingw-w64-python-json-rpc/PKGBUILD
@@ -2,29 +2,37 @@
 
 _realname=json-rpc
 pkgbase=mingw-w64-python-${_realname}
-pkgname=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
-pkgver=1.12.1
-pkgrel=3
+pkgname=("${MINGW_PACKAGE_PREFIX}-python-${_realname}")
+provides=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+conflicts=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+replaces=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+pkgver=1.12.2
+pkgrel=1
 pkgdesc="JSON-RPC transport realisation (mingw-w64)"
 arch=('any')
 url="https://github.com/pavlov99/json-rpc"
 license=('MIT')
-depends=("${MINGW_PACKAGE_PREFIX}-python3")
-makedepends=("${MINGW_PACKAGE_PREFIX}-python3-setuptools")
+depends=("${MINGW_PACKAGE_PREFIX}-python")
+makedepends=("${MINGW_PACKAGE_PREFIX}-python-setuptools")
 options=('staticlibs' 'strip' '!debug')
 source=("https://pypi.python.org/packages/source/j/${_realname}/${_realname}-${pkgver}.tar.gz")
-sha256sums=('bc84451268b48a576d3138744322a8ce673eccadf7424edf4d446b1ddb59e58c')
+sha256sums=('8a72c3b33c851cd39899cd77b4da98cf036be72b609943f59ca1b73ffe70ff28')
+
+prepare() {
+  cd "${srcdir}"
+  rm -rf "python-build-${CARCH}" | true
+  cp -r "${_realname}-${pkgver}" "python-build-${CARCH}"
+}
 
 build() {
-  cd "${srcdir}/${_realname}-${pkgver}"
-
-  ${MINGW_PREFIX}/bin/python3 setup.py build
+  cd "${srcdir}/python-build-${CARCH}"
+  ${MINGW_PREFIX}/bin/python setup.py build
 }
 
 package() {
-  cd "${srcdir}/${_realname}-${pkgver}"
+  cd "${srcdir}/python-build-${CARCH}"
 
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
-  ${MINGW_PREFIX}/bin/python3 setup.py install --prefix=${MINGW_PREFIX} \
+  ${MINGW_PREFIX}/bin/python setup.py install --prefix=${MINGW_PREFIX} \
     --root="${pkgdir}" --optimize=1 --skip-build
 }
diff --git a/mingw-w64-python-jupyter_console/PKGBUILD b/mingw-w64-python-jupyter_console/PKGBUILD
index 130cb400b4..bcdc8292f8 100644
--- a/mingw-w64-python-jupyter_console/PKGBUILD
+++ b/mingw-w64-python-jupyter_console/PKGBUILD
@@ -2,42 +2,45 @@
 
 _realname=jupyter_console
 pkgbase=mingw-w64-python3-${_realname}
-pkgname=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+pkgname=("${MINGW_PACKAGE_PREFIX}-python-${_realname}")
+provides=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+conflicts=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+replaces=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
 pkgver=6.0.0
-pkgrel=3
+pkgrel=1
 pkgdesc="A terminal-based console frontend for Jupyter kernels. (mingw-w64)"
 arch=('any')
 url="https://jupyter.org/"
 license=('BSD')
-depends=("${MINGW_PACKAGE_PREFIX}-python3"
-         "${MINGW_PACKAGE_PREFIX}-python3-jupyter_core"
-         "${MINGW_PACKAGE_PREFIX}-python3-jupyter_client"
-         "${MINGW_PACKAGE_PREFIX}-python3-colorama")
-makedepends=("${MINGW_PACKAGE_PREFIX}-python3-setuptools")
+depends=("${MINGW_PACKAGE_PREFIX}-python"
+         "${MINGW_PACKAGE_PREFIX}-python-jupyter_core"
+         "${MINGW_PACKAGE_PREFIX}-python-jupyter_client"
+         "${MINGW_PACKAGE_PREFIX}-python-colorama")
+makedepends=("${MINGW_PACKAGE_PREFIX}-python-setuptools")
 source=("${_realname}-${pkgver}.tar.gz::https://github.com/jupyter/jupyter_console/archive/v${pkgver}.tar.gz")
 install=${_realname}3-${CARCH}.install
 sha256sums=('5cafb1a3b845dbab143c182f270f66396e1ef6a322c6bee7e6f4b0bf85fcf69e')
 
 prepare() {
   cd "${srcdir}"
-  rm -rf $"python3-build-${CARCH}" | true
-  cp -r "${_realname}-${pkgver}" "python2-build-${CARCH}"
+  rm -rf "python-build-${CARCH}" | true
+  cp -r "${_realname}-${pkgver}" "python-build-${CARCH}"
+
   # Set version for setuptools_scm
-  export SETUPTOOLS_SCM_PRETEND_VERSION=$pkgver
+  export SETUPTOOLS_SCM_PRETEND_VERSION=${pkgver}
   export LC_CTYPE=en_US.UTF-8
 }
 
 build() {
-    msg "Python 3 build for ${CARCH}"  
-    cd "${srcdir}/python2-build-${CARCH}"
-    ${MINGW_PREFIX}/bin/python3 setup.py build
+  msg "Python build for ${CARCH}"  
+  cd "${srcdir}/python-build-${CARCH}"
+  ${MINGW_PREFIX}/bin/python setup.py build
 }
 
-
-all_install() {
-
+package() {
+  cd "${srcdir}/python-build-${CARCH}"
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
-  ${MINGW_PREFIX}/bin/${1} setup.py install \
+  ${MINGW_PREFIX}/bin/python setup.py install \
     --prefix=${MINGW_PREFIX} --root=${pkgdir} --optimize=0  --skip-build
 
   find "${pkgdir}/" -name "*.pyc" -delete
@@ -48,18 +51,6 @@ all_install() {
   for _f in "${pkgdir}${MINGW_PREFIX}"/bin/*; do
     sed -e "s|${PREFIX_WIN}|${MINGW_PREFIX}|g" -i ${_f}
   done
+
+  install -Dm644 "COPYING.md" "${pkgdir}${MINGW_PREFIX}/share/licenses/python-${_realname}/LICENSE"
 }
-
-package() {
-  local interpreter=python3
-  depends=("${MINGW_PACKAGE_PREFIX}-python3"
-           "${MINGW_PACKAGE_PREFIX}-python3-jupyter_core"
-           "${MINGW_PACKAGE_PREFIX}-python3-jupyter_client"
-           "${MINGW_PACKAGE_PREFIX}-python3-colorama")
-
-  cd "${srcdir}/python2-build-${CARCH}"
-  all_install ${interpreter}
-
-  install -Dm644 "COPYING.md" "${pkgdir}${MINGW_PREFIX}/share/licenses/python3-${_realname}/LICENSE"
-}
-
diff --git a/mingw-w64-python-keras/PKGBUILD b/mingw-w64-python-keras/PKGBUILD
index caea39d70e..ec3834b8ab 100644
--- a/mingw-w64-python-keras/PKGBUILD
+++ b/mingw-w64-python-keras/PKGBUILD
@@ -2,24 +2,27 @@
 
 _realname=keras
 pkgbase=mingw-w64-python-${_realname}
-pkgname=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+pkgname=("${MINGW_PACKAGE_PREFIX}-python-${_realname}")
+provides=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+conflicts=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+replaces=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
 pkgver=2.3.1
-pkgrel=2
+pkgrel=1
 pkgdesc="Keras is a high-level neural networks API, written in Python and capable of running on top of TensorFlow, CNTK, or Theano (mingw-w64)"
 arch=('any')
 url="https://keras.io/"
 license=('MIT')
-depends=("${MINGW_PACKAGE_PREFIX}-python3"
-         "${MINGW_PACKAGE_PREFIX}-python3-numpy"
-         "${MINGW_PACKAGE_PREFIX}-python3-scipy"
-         "${MINGW_PACKAGE_PREFIX}-python3-six"
-         "${MINGW_PACKAGE_PREFIX}-python3-yaml"
-         "${MINGW_PACKAGE_PREFIX}-python3-h5py"
-         "${MINGW_PACKAGE_PREFIX}-python3-keras_applications"
-         "${MINGW_PACKAGE_PREFIX}-python3-keras_preprocessing"
-         "${MINGW_PACKAGE_PREFIX}-python3-theano")
+depends=("${MINGW_PACKAGE_PREFIX}-python"
+         "${MINGW_PACKAGE_PREFIX}-python-numpy"
+         "${MINGW_PACKAGE_PREFIX}-python-scipy"
+         "${MINGW_PACKAGE_PREFIX}-python-six"
+         "${MINGW_PACKAGE_PREFIX}-python-yaml"
+         "${MINGW_PACKAGE_PREFIX}-python-h5py"
+         "${MINGW_PACKAGE_PREFIX}-python-keras_applications"
+         "${MINGW_PACKAGE_PREFIX}-python-keras_preprocessing"
+         "${MINGW_PACKAGE_PREFIX}-python-theano")
 makedepends=("patch"
-             "${MINGW_PACKAGE_PREFIX}-python3-setuptools")
+             "${MINGW_PACKAGE_PREFIX}-python-setuptools")
 source=(${_realname}-${pkgver}.tar.gz::https://github.com/keras-team/keras/archive/${pkgver}.tar.gz
         0001-change-backend-to-theano.patch)
 sha256sums=('7e8df9c5291f21a01bccffd8cbdd44abd7d2679ab2f7a892a503e88291627183'
@@ -40,19 +43,22 @@ prepare() {
 
   apply_patch_with_msg \
     0001-change-backend-to-theano.patch
+
+  cd "${srcdir}"
+  rm -rf "python-build-${CARCH}" | true
+  cp -r "${_realname}-${pkgver}" "python-build-${CARCH}"
 }
 
 build() {
-  cd "${srcdir}/${_realname}-${pkgver}"
-
-  ${MINGW_PREFIX}/bin/python3 setup.py --quiet build
+  cd "${srcdir}/python-build-${CARCH}"
+  ${MINGW_PREFIX}/bin/python setup.py --quiet build
 }
 
 package() {
-  cd "${srcdir}/${_realname}-${pkgver}"
+  cd "${srcdir}/python-build-${CARCH}"
 
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
-    ${MINGW_PREFIX}/bin/python3 setup.py --quiet install --prefix=${MINGW_PREFIX} --root="${pkgdir}" -O1
+    ${MINGW_PREFIX}/bin/python setup.py --quiet install --prefix=${MINGW_PREFIX} --root="${pkgdir}" -O1 --skip-build
 
-  install -Dm644 LICENSE "${pkgdir}${MINGW_PREFIX}/share/licenses/python3-${_realname}/LICENSE"
+  install -Dm644 LICENSE "${pkgdir}${MINGW_PREFIX}/share/licenses/python-${_realname}/LICENSE"
 }
diff --git a/mingw-w64-python-keras_applications/PKGBUILD b/mingw-w64-python-keras_applications/PKGBUILD
index cdb95cb473..e14c4099aa 100644
--- a/mingw-w64-python-keras_applications/PKGBUILD
+++ b/mingw-w64-python-keras_applications/PKGBUILD
@@ -2,32 +2,40 @@
 
 _realname=keras_applications
 pkgbase=mingw-w64-python-${_realname}
-pkgname=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+pkgname=("${MINGW_PACKAGE_PREFIX}-python-${_realname}")
+provides=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+conflicts=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+replaces=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
 pkgver=1.0.8
-pkgrel=3
+pkgrel=1
 pkgdesc="Reference implementations of popular deep learning models. (mingw-w64)"
 arch=('any')
 url="https://github.com/keras-team/keras-applications"
 license=('MIT')
-depends=("${MINGW_PACKAGE_PREFIX}-python3"
-         "${MINGW_PACKAGE_PREFIX}-python3-numpy"
-         "${MINGW_PACKAGE_PREFIX}-python3-h5py")
-makedepends=("${MINGW_PACKAGE_PREFIX}-python3-setuptools")
+depends=("${MINGW_PACKAGE_PREFIX}-python"
+         "${MINGW_PACKAGE_PREFIX}-python-numpy"
+         "${MINGW_PACKAGE_PREFIX}-python-h5py")
+makedepends=("${MINGW_PACKAGE_PREFIX}-python-setuptools")
 _archive=${_realname/_/-}-${pkgver}
 source=(${_archive}.tar.gz::https://github.com/keras-team/keras-applications/archive/${pkgver}.tar.gz)
 sha256sums=('7c37f9e9ef93efac9b4956301cb21ce46c474ce9da41fac9a46753bab6823dfc')
 
-build() {
-  cd "${srcdir}/${_archive}"
+prepare() {
+  cd "${srcdir}"
+  rm -rf "python-build-${CARCH}" | true
+  cp -r "${_archive}" "python-build-${CARCH}"
+}
 
-  ${MINGW_PREFIX}/bin/python3 setup.py --quiet build
+build() {
+  cd "${srcdir}/python-build-${CARCH}"
+  ${MINGW_PREFIX}/bin/python setup.py --quiet build
 }
 
 package() {
-  cd "${srcdir}/${_archive}"
+  cd "${srcdir}/python-build-${CARCH}"
 
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
-    ${MINGW_PREFIX}/bin/python3 setup.py --quiet install --prefix=${MINGW_PREFIX} --root="${pkgdir}" -O1
+    ${MINGW_PREFIX}/bin/python setup.py --quiet install --prefix=${MINGW_PREFIX} --root="${pkgdir}" -O1
 
-  install -Dm644 LICENSE "${pkgdir}${MINGW_PREFIX}/share/licenses/python3-${_realname}/LICENSE"
+  install -Dm644 LICENSE "${pkgdir}${MINGW_PREFIX}/share/licenses/python-${_realname}/LICENSE"
 }
diff --git a/mingw-w64-python-keras_preprocessing/PKGBUILD b/mingw-w64-python-keras_preprocessing/PKGBUILD
index 699166d2ac..ae84ebba39 100644
--- a/mingw-w64-python-keras_preprocessing/PKGBUILD
+++ b/mingw-w64-python-keras_preprocessing/PKGBUILD
@@ -2,32 +2,40 @@
 
 _realname=keras_preprocessing
 pkgbase=mingw-w64-python-${_realname}
-pkgname=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+pkgname=("${MINGW_PACKAGE_PREFIX}-python-${_realname}")
+provides=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+conflicts=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+replaces=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
 pkgver=1.1.0
-pkgrel=3
+pkgrel=1
 pkgdesc="Utilities for working with image data, text data, and sequence data. (mingw-w64)"
 arch=('any')
 url="https://github.com/keras-team/keras-preprocessing"
 license=('MIT')
-depends=("${MINGW_PACKAGE_PREFIX}-python3"
-         "${MINGW_PACKAGE_PREFIX}-python3-numpy"
-         "${MINGW_PACKAGE_PREFIX}-python3-six")
-makedepends=("${MINGW_PACKAGE_PREFIX}-python3-setuptools")
+depends=("${MINGW_PACKAGE_PREFIX}-python"
+         "${MINGW_PACKAGE_PREFIX}-python-numpy"
+         "${MINGW_PACKAGE_PREFIX}-python-six")
+makedepends=("${MINGW_PACKAGE_PREFIX}-python-setuptools")
 _archive=${_realname/_/-}-${pkgver}
 source=(${_archive}.tar.gz::https://github.com/keras-team/keras-preprocessing/archive/${pkgver}.tar.gz)
 sha256sums=('26f26354370f4a08a029137630d72870e99e924cd8f6e04c2f6fc0bd86708275')
 
-build() {
-  cd "${srcdir}/${_archive}"
+prepare() {
+  cd "${srcdir}"
+  rm -rf "python-build-${CARCH}" | true
+  cp -r "${_archive}" "python-build-${CARCH}"
+}
 
-  ${MINGW_PREFIX}/bin/python3 setup.py --quiet build
+build() {
+  cd "${srcdir}/python-build-${CARCH}"
+  ${MINGW_PREFIX}/bin/python setup.py --quiet build
 }
 
 package() {
-  cd "${srcdir}/${_archive}"
+  cd "${srcdir}/python-build-${CARCH}"
 
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
-    ${MINGW_PREFIX}/bin/python3 setup.py --quiet install --prefix=${MINGW_PREFIX} --root="${pkgdir}" -O1
+    ${MINGW_PREFIX}/bin/python setup.py --quiet install --prefix=${MINGW_PREFIX} --root="${pkgdir}" -O1
 
-  install -Dm644 LICENSE "${pkgdir}${MINGW_PREFIX}/share/licenses/python3-${_realname}/LICENSE"
+  install -Dm644 LICENSE "${pkgdir}${MINGW_PREFIX}/share/licenses/python-${_realname}/LICENSE"
 }
diff --git a/mingw-w64-python-lhafile/PKGBUILD b/mingw-w64-python-lhafile/PKGBUILD
index e04f1dd4d2..69c862c365 100644
--- a/mingw-w64-python-lhafile/PKGBUILD
+++ b/mingw-w64-python-lhafile/PKGBUILD
@@ -2,32 +2,40 @@
 
 _realname=lhafile
 pkgbase=mingw-w64-python-${_realname}
-pkgname=("${MINGW_PACKAGE_PREFIX}-python3-lhafile")
+pkgname=("${MINGW_PACKAGE_PREFIX}-python-lhafile")
+provides=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+conflicts=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+replaces=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
 pkgver=0.2.2
-pkgrel=3
+pkgrel=1
 pkgdesc="LHA module for Python (mingw-w64)"
 arch=('any')
 license=('BSD')
 url="https://fengestad.no/python-lhafile"
-depends=("${MINGW_PACKAGE_PREFIX}-python3"
-         "${MINGW_PACKAGE_PREFIX}-python3-six")
+depends=("${MINGW_PACKAGE_PREFIX}-python"
+         "${MINGW_PACKAGE_PREFIX}-python-six")
 options=('staticlibs' 'strip' '!debug')
 source=(${_realname}-${pkgver}.tar.gz::https://github.com/FrodeSolheim/python-lhafile/archive/v${pkgver}.tar.gz)
 sha256sums=('18396276b77d8c7e094f169d3b2471e60de3d412a2454a0f73c452a54817ee68')
 
-build() {
-  cd "${srcdir}/python-${_realname}-${pkgver}"
+prepare() {
+  cd "${srcdir}"
+  rm -rf "python-build-${CARCH}" | true
+  cp -r "python-${_realname}-${pkgver}" "python-build-${CARCH}"
+}
 
-  ${MINGW_PREFIX}/bin/python3 setup.py build
+build() {
+  cd "${srcdir}/python-build-${CARCH}"
+  ${MINGW_PREFIX}/bin/python setup.py build
 }
 
 package() {
-  cd "${srcdir}/python-${_realname}-${pkgver}"
+  cd "${srcdir}/python-build-${CARCH}"
 
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
     ${MINGW_PREFIX}/bin/python3 setup.py install --prefix=${MINGW_PREFIX} \
     --root="${pkgdir}" --optimize=1
 
-  install -m755 -d "${pkgdir}${MINGW_PREFIX}/share/licenses/python3-lhafile"
-  install -m644 COPYING.txt "${pkgdir}${MINGW_PREFIX}/share/licenses/python3-lhafile/"
+  install -m755 -d "${pkgdir}${MINGW_PREFIX}/share/licenses/python-lhafile"
+  install -m644 COPYING.txt "${pkgdir}${MINGW_PREFIX}/share/licenses/python-lhafile/"
 }
diff --git a/mingw-w64-python-mallard-ducktype/PKGBUILD b/mingw-w64-python-mallard-ducktype/PKGBUILD
index 29778051e8..d819ce5583 100644
--- a/mingw-w64-python-mallard-ducktype/PKGBUILD
+++ b/mingw-w64-python-mallard-ducktype/PKGBUILD
@@ -2,17 +2,21 @@
 
 _realname=mallard-ducktype
 pkgbase=mingw-w64-python-${_realname}
-pkgname="${MINGW_PACKAGE_PREFIX}-python3-${_realname}"
+pkgname="${MINGW_PACKAGE_PREFIX}-python-${_realname}"
+provides=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+conflicts=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+replaces=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
 pkgver=1.0.2
-pkgrel=2
+pkgrel=1
 pkgdesc="Parser for the lightweight Ducktype syntax for Mallard (mingw-w64)"
 arch=('any')
 url='http://projectmallard.org/'
 license=('MIT')
-depends=("${MINGW_PACKAGE_PREFIX}-python3")
-makedepends=("${MINGW_PACKAGE_PREFIX}-python3-setuptools")
+depends=("${MINGW_PACKAGE_PREFIX}-python")
+makedepends=("${MINGW_PACKAGE_PREFIX}-python-setuptools")
 options=('staticlibs' 'strip' '!debug')
-source=("${_realname}-$pkgver.tar.gz"::"https://github.com/projectmallard/mallard-ducktype/archive/$pkgver.tar.gz")
+install=${_realname}3-${CARCH}.install
+source=("${_realname}-$pkgver.tar.gz"::"https://github.com/projectmallard/mallard-ducktype/archive/${pkgver}.tar.gz")
 sha256sums=('73ac416376dd65c737594ab4b1037b0823390239f33672f1ee1e30725dcef4e9')
 
 # Helper macros to help make tasks easier #
@@ -36,52 +40,37 @@ del_file_exists() {
 
 prepare() {
   cd "${srcdir}"
-  for builddir in python{2,3}-build-${CARCH}; do
-    rm -rf ${builddir} | true
-    cp -r "${_realname}-${pkgver}" "${builddir}"
-  done
+  rm -rf "python-build-${CARCH}" | true
+  cp -r "${_realname}-${pkgver}" "python-build-${CARCH}"
+
   # Set version for setuptools_scm
-  export SETUPTOOLS_SCM_PRETEND_VERSION=$pkgver
+  export SETUPTOOLS_SCM_PRETEND_VERSION=${pkgver}
 }
 
-# Note that build() is sometimes skipped because it's done in 
-# the packages setup.py install for simplicity if you can do so.
-# but sometimes, you want to do a check before install which would
-# also trigger the build.
 build() {
-    msg "Python 3 build for ${CARCH}"  
-    cd "${srcdir}/python3-build-${CARCH}"
-    ${MINGW_PREFIX}/bin/python3 setup.py build
+    msg "Python build for ${CARCH}"  
+    cd "${srcdir}/python-build-${CARCH}"
+    ${MINGW_PREFIX}/bin/python setup.py build
 }
 
 check() {
-    msg "Python 3 test for ${CARCH}"
-    cd "${srcdir}/python3-build-${CARCH}"
-    ${MINGW_PREFIX}/bin/python3 setup.py test
+    msg "Python test for ${CARCH}"
+    cd "${srcdir}/python-build-${CARCH}"
+    ${MINGW_PREFIX}/bin/python setup.py test
 }
 
 package() {
-  depends=("${MINGW_PACKAGE_PREFIX}-python3")
-  #This package install is needed for .fixups with .EXE's 
-  #in the bit directory.  The install files "python-exe-installs"
-  #and should be renamed to your _realname .
-  install=${_realname}3-${CARCH}.install
-
-  cd "${srcdir}/python3-build-${CARCH}"
+  cd "${srcdir}/python-build-${CARCH}"
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
-  ${MINGW_PREFIX}/bin/python3 setup.py install --prefix=${MINGW_PREFIX} \
+  ${MINGW_PREFIX}/bin/python setup.py install --prefix=${MINGW_PREFIX} \
     --root="${pkgdir}" --optimize=1 --skip-build
 
-#  install -Dm644 LICENSE "${pkgdir}${MINGW_PREFIX}/share/licenses/python3-${_realname}/LICENSE"
+  # install -Dm644 LICENSE "${pkgdir}${MINGW_PREFIX}/share/licenses/python-${_realname}/LICENSE"
 
-# This entire section should be removed if the package does NOT install
-# anything in the /mingw*/bin directory.
-### begin section ###
   local PREFIX_WIN=$(cygpath -wm ${MINGW_PREFIX})
   # fix python command in files
   for _f in "${pkgdir}${MINGW_PREFIX}"/bin/*; do
     sed -e "s|/usr/bin/env |${MINGW_PREFIX}|g" \
         -e "s|${PREFIX_WIN}|${MINGW_PREFIX}|g" -i ${_f}
   done
-#### end section ####
 }
diff --git a/mingw-w64-python-markdown-math/PKGBUILD b/mingw-w64-python-markdown-math/PKGBUILD
index 805a34aa52..757faf3a1f 100644
--- a/mingw-w64-python-markdown-math/PKGBUILD
+++ b/mingw-w64-python-markdown-math/PKGBUILD
@@ -2,16 +2,19 @@
 
 _realname=markdown-math
 pkgbase=mingw-w64-python-${_realname}
-pkgname=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+pkgname=("${MINGW_PACKAGE_PREFIX}-python-${_realname}")
+provides=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+conflicts=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+replaces=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
 pkgver=0.6
-pkgrel=3
+pkgrel=1
 pkgdesc="Math extension for Python-Markdown (mingw-w64)"
 arch=('any')
 url='https://github.com/mitya57/python-markdown-math'
 license=('BSD')
-depends=("${MINGW_PACKAGE_PREFIX}-python3"
-         "${MINGW_PACKAGE_PREFIX}-python3-markdown")
-makedepends=("${MINGW_PACKAGE_PREFIX}-python3-setuptools")
+depends=("${MINGW_PACKAGE_PREFIX}-python"
+         "${MINGW_PACKAGE_PREFIX}-python-markdown")
+makedepends=("${MINGW_PACKAGE_PREFIX}-python-setuptools")
 options=('staticlibs' 'strip' '!debug')
 source=("https://files.pythonhosted.org/packages/source/p/python-${_realname}/python-${_realname}-${pkgver}.tar.gz"{,.asc}
         "fix-markdown-3.x.patch")
@@ -44,28 +47,30 @@ prepare() {
 
   apply_patch_with_msg fix-markdown-3.x.patch
 
+  cd "${srcdir}"
+  rm -rf "python-build-${CARCH}" | true
+  cp -r "python-${_realname}-${pkgver}" "python-build-${CARCH}"
+
   # Set version for setuptools_scm
-  export SETUPTOOLS_SCM_PRETEND_VERSION=$pkgver
+  export SETUPTOOLS_SCM_PRETEND_VERSION=${pkgver}
 }
 
 build() {
-  cd "${srcdir}/python-${_realname}-${pkgver}"
-
-  ${MINGW_PREFIX}/bin/python3 setup.py build
+  cd "${srcdir}/python-build-${CARCH}"
+  ${MINGW_PREFIX}/bin/python setup.py build
 }
 
 check() {
-  cd "${srcdir}/python-${_realname}-${pkgver}"
-
-  ${MINGW_PREFIX}/bin/python3 setup.py test
+  cd "${srcdir}/python-build-${CARCH}"
+  ${MINGW_PREFIX}/bin/python setup.py test
 }
 
 package() {
-  cd "${srcdir}/python-${_realname}-${pkgver}"
+  cd "${srcdir}/python-build-${CARCH}"
 
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
-  ${MINGW_PREFIX}/bin/python3 setup.py install --prefix=${MINGW_PREFIX} \
+  ${MINGW_PREFIX}/bin/python setup.py install --prefix=${MINGW_PREFIX} \
     --root="${pkgdir}" --optimize=1 --skip-build
 
-  install -Dm644 LICENSE "${pkgdir}${MINGW_PREFIX}/share/licenses/python3-${_realname}/LICENSE"
+  install -Dm644 LICENSE "${pkgdir}${MINGW_PREFIX}/share/licenses/python-${_realname}/LICENSE"
 }
diff --git a/mingw-w64-python-markdown/PKGBUILD b/mingw-w64-python-markdown/PKGBUILD
index a3c4a76a7f..03e1014926 100644
--- a/mingw-w64-python-markdown/PKGBUILD
+++ b/mingw-w64-python-markdown/PKGBUILD
@@ -3,17 +3,21 @@
 _realname=markdown
 _pyname=Markdown
 pkgbase=mingw-w64-python-${_realname}
-pkgname=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+pkgname=("${MINGW_PACKAGE_PREFIX}-python-${_realname}")
+provides=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+conflicts=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+replaces=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
 pkgver=3.1.1
-pkgrel=3
+pkgrel=1
 pkgdesc="Python implementation of John Gruber's Markdown (mingw-w64)"
 url='https://pypi.python.org/pypi/Markdown'
 license=('BSD')
 arch=('any')
-depends=("${MINGW_PACKAGE_PREFIX}-python3")
-makedepends=("${MINGW_PACKAGE_PREFIX}-python3-pbr"
-             "${MINGW_PACKAGE_PREFIX}-python3-setuptools")
-checkdepends=("${MINGW_PACKAGE_PREFIX}-python3-yaml")
+depends=("${MINGW_PACKAGE_PREFIX}-python")
+makedepends=("${MINGW_PACKAGE_PREFIX}-python-pbr"
+             "${MINGW_PACKAGE_PREFIX}-python-setuptools")
+checkdepends=("${MINGW_PACKAGE_PREFIX}-python-yaml")
+install=python3-${_realname}-${CARCH}.install
 source=("https://pypi.io/packages/source/${_pyname:0:1}/${_pyname}/${_pyname}-${pkgver}.tar.gz")
 sha256sums=('2e50876bcdd74517e7b71f3e7a76102050edec255b3983403f1a63e7c8a41e7a')
 
@@ -25,31 +29,31 @@ prepare() {
 
   # ImportError: No module named pkg_resources
   sed -i 's/^from pkg_resources.*$/import packaging.version/' "${_realname}-${pkgver}/markdown/__init__.py"
+
+  cd "${srcdir}"
+  rm -rf "python-build-${CARCH}" | true
+  cp -r "${_realname}-${pkgver}" "python-build-${CARCH}"
 }
 
 build() {
-  cd "${srcdir}/${_realname}-${pkgver}"
-
-  ${MINGW_PREFIX}/bin/python3 setup.py build
+  cd "${srcdir}/python-build-${CARCH}"
+  ${MINGW_PREFIX}/bin/python setup.py build
 }
 
 check() {
-  cd "${srcdir}/${_realname}-${pkgver}"
-
-  ${MINGW_PREFIX}/bin/python3 -m unittest discover tests
+  cd "${srcdir}/python-build-${CARCH}"
+  ${MINGW_PREFIX}/bin/python -m unittest discover tests
 }
 
 package() {
-  install=python3-${_realname}-${CARCH}.install
-
-  cd "${srcdir}/${_realname}-${pkgver}"
+  cd "${srcdir}/python-build-${CARCH}"
 
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
-  ${MINGW_PREFIX}/bin/python3 setup.py install --prefix=${MINGW_PREFIX} --root="${pkgdir}"
+  ${MINGW_PREFIX}/bin/python setup.py install --prefix=${MINGW_PREFIX} --root="${pkgdir}" --skip-build
 
   for _f in "${pkgdir}${MINGW_PREFIX}"/bin/*.py; do
     sed -e "s|$(cygpath -wm ${MINGW_PREFIX})|${MINGW_PREFIX}|g" -i "${_f}"
   done
 
-  install -D -m644 LICENSE.md "${pkgdir}${MINGW_PREFIX}"/share/licenses/python3-${_realname}/LICENSE.md
+  install -D -m644 LICENSE.md "${pkgdir}${MINGW_PREFIX}"/share/licenses/python-${_realname}/LICENSE.md
 }
diff --git a/mingw-w64-python-markups/PKGBUILD b/mingw-w64-python-markups/PKGBUILD
index 28f5fa9710..54f5513cd8 100644
--- a/mingw-w64-python-markups/PKGBUILD
+++ b/mingw-w64-python-markups/PKGBUILD
@@ -3,22 +3,25 @@
 _pyname=Markups
 _realname=markups
 pkgbase=mingw-w64-python-${_realname}
-pkgname=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+pkgname=("${MINGW_PACKAGE_PREFIX}-python-${_realname}")
+provides=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+conflicts=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+replaces=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
 pkgver=3.0.0
-pkgrel=3
+pkgrel=1
 pkgdesc="Wrapper around various text markups (mingw-w64)"
 arch=('any')
 url='https://launchpad.net/python-markups'
 license=('BSD')
-depends=("${MINGW_PACKAGE_PREFIX}-python3"
-         "${MINGW_PACKAGE_PREFIX}-python3-markdown-math"
-         "${MINGW_PACKAGE_PREFIX}-python3-setuptools")
-optdepends=("${MINGW_PACKAGE_PREFIX}-python3-docutils: for reStructuredText language support"
-            "${MINGW_PACKAGE_PREFIX}-python3-pygments: for highlighting output style")
-makedepends=("${MINGW_PACKAGE_PREFIX}-python3-docutils"
-             "${MINGW_PACKAGE_PREFIX}-python3-pygments")
+depends=("${MINGW_PACKAGE_PREFIX}-python"
+         "${MINGW_PACKAGE_PREFIX}-python-markdown-math"
+         "${MINGW_PACKAGE_PREFIX}-python-setuptools")
+optdepends=("${MINGW_PACKAGE_PREFIX}-python-docutils: for reStructuredText language support"
+            "${MINGW_PACKAGE_PREFIX}-python-pygments: for highlighting output style")
+makedepends=("${MINGW_PACKAGE_PREFIX}-python-docutils"
+             "${MINGW_PACKAGE_PREFIX}-python-pygments")
 options=('staticlibs' 'strip' '!debug')
-source=($pyname-$pkgver.tar.gz::https://github.com/retext-project/pymarkups/archive/$pkgver.tar.gz)
+source=(${pyname}-${pkgver}.tar.gz::https://github.com/retext-project/pymarkups/archive/${pkgver}.tar.gz)
 source=("https://files.pythonhosted.org/packages/source/${_pyname:0:1}/${_pyname}/${_pyname}-${pkgver}.tar.gz"{,.asc})
 sha256sums=('1ea19458dfca6a4562044e701aa8698089a0c659fc535689ed260f89a04f8d39'
             'SKIP')
@@ -44,30 +47,30 @@ del_file_exists() {
 # =========================================== #
 
 prepare() {
-  cd "${srcdir}/${_realname}-${pkgver}"
+  cd "${srcdir}"
+  rm -rf "python-build-${CARCH}" | true
+  cp -r "${_realname}-${pkgver}" "python-build-${CARCH}"
 
   # Set version for setuptools_scm
-  export SETUPTOOLS_SCM_PRETEND_VERSION=$pkgver
+  export SETUPTOOLS_SCM_PRETEND_VERSION=${pkgver}
 }
 
 build() {
-  cd "${srcdir}/${_realname}-${pkgver}"
-
-  ${MINGW_PREFIX}/bin/python3 setup.py build
+  cd "${srcdir}/python-build-${CARCH}"
+  ${MINGW_PREFIX}/bin/python setup.py build
 }
 
 check() {
-  cd "${srcdir}/${_realname}-${pkgver}"
-
-  ${MINGW_PREFIX}/bin/python3 setup.py test
+  cd "${srcdir}/python-build-${CARCH}"
+  ${MINGW_PREFIX}/bin/python setup.py test
 }
 
 package() {
-  cd "${srcdir}/${_realname}-${pkgver}"
+  cd "${srcdir}/python-build-${CARCH}"
 
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
-  ${MINGW_PREFIX}/bin/python3 setup.py install --prefix=${MINGW_PREFIX} \
+  ${MINGW_PREFIX}/bin/python setup.py install --prefix=${MINGW_PREFIX} \
     --root="${pkgdir}" --optimize=1 --skip-build
 
-  install -Dm644 LICENSE "${pkgdir}${MINGW_PREFIX}/share/licenses/python3-${_realname}/LICENSE"
+  install -Dm644 LICENSE "${pkgdir}${MINGW_PREFIX}/share/licenses/python-${_realname}/LICENSE"
 }
diff --git a/mingw-w64-python-monotonic/PKGBUILD b/mingw-w64-python-monotonic/PKGBUILD
index 243433eabb..d25001ca5c 100644
--- a/mingw-w64-python-monotonic/PKGBUILD
+++ b/mingw-w64-python-monotonic/PKGBUILD
@@ -2,42 +2,45 @@
 
 _realname=monotonic
 pkgbase=mingw-w64-python-${_realname}
-pkgname=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+pkgname=("${MINGW_PACKAGE_PREFIX}-python-${_realname}")
+provides=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+conflicts=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+replaces=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
 pkgver=1.5
-pkgrel=3
+pkgrel=1
 pkgdesc="An implementation of time.monotonic() for Python 2 & Python 3 (mingw-w64)"
 arch=('any')
 url='https://github.com/atdt/monotonic'
 license=('Apache')
-depends=("${MINGW_PACKAGE_PREFIX}-python3")
-makedepends=("${MINGW_PACKAGE_PREFIX}-python3-setuptools")
+depends=("${MINGW_PACKAGE_PREFIX}-python")
+makedepends=("${MINGW_PACKAGE_PREFIX}-python-setuptools")
 options=('staticlibs' 'strip' '!debug')
 source=("${_realname}-${pkgver}.tar.gz"::"https://github.com/atdt/monotonic/archive/${pkgver}.tar.gz")
 sha256sums=('d58dc86a7b0d714702be02df906d2712901efef6a16b3aafc95aaa9174e27771')
 
 prepare() {
-  cd "${srcdir}/${_realname}-${pkgver}"
+  cd "${srcdir}"
+  rm -rf python-build-${CARCH} | true
+  cp -r "${_realname}-${pkgver}" "python-build-${CARCH}"
 
   # Set version for setuptools_scm
-  export SETUPTOOLS_SCM_PRETEND_VERSION=$pkgver
+  export SETUPTOOLS_SCM_PRETEND_VERSION=${pkgver}
 }
 
 build() {
-  cd "${srcdir}/${_realname}-${pkgver}"
-
-  ${MINGW_PREFIX}/bin/python3 setup.py build
+  cd "${srcdir}/python-build-${CARCH}"
+  ${MINGW_PREFIX}/bin/python setup.py build
 }
 
 check() {
-  cd "${srcdir}/${_realname}-${pkgver}"
-
-  ${MINGW_PREFIX}/bin/python3 setup.py check
+  cd "${srcdir}/python-build-${CARCH}"
+  ${MINGW_PREFIX}/bin/python setup.py check
 }
 
 package() {
-  cd "${srcdir}/${_realname}-${pkgver}"
+  cd "${srcdir}/python-build-${CARCH}"
 
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
-  ${MINGW_PREFIX}/bin/python3 setup.py install --prefix=${MINGW_PREFIX} \
+  ${MINGW_PREFIX}/bin/python setup.py install --prefix=${MINGW_PREFIX} \
     --root="${pkgdir}" --optimize=1 --skip-build
 }
diff --git a/mingw-w64-python-mox3/PKGBUILD b/mingw-w64-python-mox3/PKGBUILD
index 3674db5e28..aa83eb7a79 100644
--- a/mingw-w64-python-mox3/PKGBUILD
+++ b/mingw-w64-python-mox3/PKGBUILD
@@ -2,17 +2,20 @@
 
 _realname=mox3
 pkgbase=mingw-w64-python-${_realname}
-pkgname=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+pkgname=("${MINGW_PACKAGE_PREFIX}-python-${_realname}")
+provides=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+conflicts=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+replaces=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
 pkgver=0.28.0
-pkgrel=2
+pkgrel=1
 pkgdesc="Mock object framework for Python (mingw-w64)"
 arch=('any')
 url='https://docs.openstack.org/developer/mox3'
 license=('Apache')
-depends=("${MINGW_PACKAGE_PREFIX}-python3"
-         "${MINGW_PACKAGE_PREFIX}-python3-pbr"
-         "${MINGW_PACKAGE_PREFIX}-python3-fixtures")
-makedepends=("${MINGW_PACKAGE_PREFIX}-python3-setuptools")
+depends=("${MINGW_PACKAGE_PREFIX}-python"
+         "${MINGW_PACKAGE_PREFIX}-python-pbr"
+         "${MINGW_PACKAGE_PREFIX}-python-fixtures")
+makedepends=("${MINGW_PACKAGE_PREFIX}-python-setuptools")
 checkdepends=("${MINGW_PACKAGE_PREFIX}-python-oslotest")
 options=('staticlibs' 'strip' '!debug')
 source=("${_realname}-${pkgver}.tar.gz::https://github.com/openstack/mox3/archive/${pkgver}.tar.gz")
diff --git a/mingw-w64-python-netaddr/PKGBUILD b/mingw-w64-python-netaddr/PKGBUILD
index 582ec66065..ecaaf8a768 100644
--- a/mingw-w64-python-netaddr/PKGBUILD
+++ b/mingw-w64-python-netaddr/PKGBUILD
@@ -2,19 +2,23 @@
 
 _realname=netaddr
 pkgbase=mingw-w64-python-${_realname}
-pkgname=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+pkgname=("${MINGW_PACKAGE_PREFIX}-python-${_realname}")
+provides=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+conflicts=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+replaces=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
 pkgver=0.7.19
-pkgrel=4
+pkgrel=1
 pkgdesc="Pure Python network address representation and manipulation library (mingw-w64)"
 arch=('any')
 url='https://github.com/drkjam/netaddr'
 license=('BSD')
-depends=("${MINGW_PACKAGE_PREFIX}-python3")
-optdepends=("${MINGW_PACKAGE_PREFIX}-python3-ipython: netaddr interractive command support")
-makedepends=("${MINGW_PACKAGE_PREFIX}-python3-sphinx"
-             "${MINGW_PACKAGE_PREFIX}-python3-setuptools")
-checkdepends=("${MINGW_PACKAGE_PREFIX}-python3-pytest")
+depends=("${MINGW_PACKAGE_PREFIX}-python")
+optdepends=("${MINGW_PACKAGE_PREFIX}-python-ipython: netaddr interractive command support")
+makedepends=("${MINGW_PACKAGE_PREFIX}-python-sphinx"
+             "${MINGW_PACKAGE_PREFIX}-python-setuptools")
+checkdepends=("${MINGW_PACKAGE_PREFIX}-python-pytest")
 options=('staticlibs' 'strip' '!debug')
+install=${_realname}3-${CARCH}.install
 source=(${_realname}-${pkgver}.tar.gz::https://github.com/drkjam/${_realname}/archive/${_realname}-${pkgver}.tar.gz
         fix-${pkgver}-python3.patch
         pep479-return-instead-of-raise-StopIteration.patch)
@@ -37,51 +41,44 @@ prepare() {
   apply_patch_with_msg  "fix-${pkgver}-python3.patch" \
     "pep479-return-instead-of-raise-StopIteration.patch"
 
+  cd "${srcdir}"
+  rm -rf python-build-${CARCH} | true
+  cp -r "${_realname}-${_realname}-${pkgver}" "python-build-${CARCH}"
+
   # Set version for setuptools_scm
-  export SETUPTOOLS_SCM_PRETEND_VERSION=$pkgver
+  export SETUPTOOLS_SCM_PRETEND_VERSION=${pkgver}
 }
 
 
 build() {
-  cd "${srcdir}/${_realname}-${_realname}-${pkgver}"
-
-  ${MINGW_PREFIX}/bin/python3 setup.py build
+  cd "${srcdir}/python-build-${CARCH}"
+  ${MINGW_PREFIX}/bin/python setup.py build
   cd docs
-  make  text
-# make man
+  make text
+  # make man
 }
 
 check() {
-  cd "${srcdir}/${_realname}-${_realname}-${pkgver}"
-
+  cd "${srcdir}/python-build-${CARCH}"
   LC_ALL='en_US.UTF-8' ${MINGW_PREFIX}/bin/py.test
 }
 
 package() {
-  cd "${srcdir}/${_realname}-${_realname}-${pkgver}"
-
-  #This package install is needed for .fixups with .EXE's 
-  #in the bit directory.  The install files "python-exe-installs"
-  #and should be renamed to your _realname .
-  install=${_realname}3-${CARCH}.install
+  cd "${srcdir}/python-build-${CARCH}"
 
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
-  ${MINGW_PREFIX}/bin/python3 setup.py install --prefix=${MINGW_PREFIX} \
+  ${MINGW_PREFIX}/bin/python setup.py install --prefix=${MINGW_PREFIX} \
     --root="${pkgdir}" --optimize=1 --skip-build
 
-  install -Dm 644 LICENSE "${pkgdir}${MINGW_PREFIX}/share/licenses/python3-${_realname}/LICENSE"
-  install -Dm 644 README.md "${pkgdir}${MINGW_PREFIX}/share/doc/python3-${_realname}/README.md"
-  install -Dm 644 docs/build/text/* -t "${pkgdir}${MINGW_PREFIX}/share/doc/python3-${_realname}/"
-#  install -Dm 644 docs/build/man/netaddr.1 "${pkgdir}${MINGW_PREFIX}/share/man/man1/netaddr.1"
+  install -Dm 644 LICENSE "${pkgdir}${MINGW_PREFIX}/share/licenses/python-${_realname}/LICENSE"
+  install -Dm 644 README.md "${pkgdir}${MINGW_PREFIX}/share/doc/python-${_realname}/README.md"
+  install -Dm 644 docs/build/text/* -t "${pkgdir}${MINGW_PREFIX}/share/doc/python-${_realname}/"
+  # install -Dm 644 docs/build/man/netaddr.1 "${pkgdir}${MINGW_PREFIX}/share/man/man1/netaddr.1"
 
-# This entire section should be removed if the package does NOT install
-# anything in the /mingw*/bin directory.
-### begin section ###
   local PREFIX_WIN=$(cygpath -wm ${MINGW_PREFIX})
   # fix python command in files
   for _f in "${pkgdir}${MINGW_PREFIX}"/bin/*; do
     sed -e "s|/usr/bin/env |${MINGW_PREFIX}/bin/|g" \
         -e "s|${PREFIX_WIN}|${MINGW_PREFIX}|g" -i ${_f}
   done
-#### end section ####
 }
diff --git a/mingw-w64-python-oslo-concurrency/PKGBUILD b/mingw-w64-python-oslo-concurrency/PKGBUILD
index 40f6f7e7dd..fbabdabaee 100644
--- a/mingw-w64-python-oslo-concurrency/PKGBUILD
+++ b/mingw-w64-python-oslo-concurrency/PKGBUILD
@@ -2,29 +2,33 @@
 
 _realname=oslo-concurrency
 pkgbase=mingw-w64-python-${_realname}
-pkgname=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
-pkgver=3.30.0
-pkgrel=2
+pkgname=("${MINGW_PACKAGE_PREFIX}-python-${_realname}")
+provides=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+conflicts=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+replaces=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+pkgver=3.31.0
+pkgrel=1
 pkgdesc="OpenStack library for all concurrency-related code (mingw-w64)"
 arch=('any')
 url='https://pypi.python.org/pypi/oslo.concurrency'
 license=('Apache')
-depends=("${MINGW_PACKAGE_PREFIX}-python3"
-         "${MINGW_PACKAGE_PREFIX}-python3-six"
-         "${MINGW_PACKAGE_PREFIX}-python3-pbr"
-         "${MINGW_PACKAGE_PREFIX}-python3-oslo-config"
-         "${MINGW_PACKAGE_PREFIX}-python3-oslo-i18n"
-         "${MINGW_PACKAGE_PREFIX}-python3-oslo-utils"
-         "${MINGW_PACKAGE_PREFIX}-python3-fasteners")
-makedepends=("${MINGW_PACKAGE_PREFIX}-python3-setuptools")
-checkdepends=("${MINGW_PACKAGE_PREFIX}-python3-mock"
-              "${MINGW_PACKAGE_PREFIX}-python3-oslotest"
-              "${MINGW_PACKAGE_PREFIX}-python3-oslo-config"
-              "${MINGW_PACKAGE_PREFIX}-python3-eventlet"
-              "${MINGW_PACKAGE_PREFIX}-python3-testrepository")
+depends=("${MINGW_PACKAGE_PREFIX}-python"
+         "${MINGW_PACKAGE_PREFIX}-python-six"
+         "${MINGW_PACKAGE_PREFIX}-python-pbr"
+         "${MINGW_PACKAGE_PREFIX}-python-oslo-config"
+         "${MINGW_PACKAGE_PREFIX}-python-oslo-i18n"
+         "${MINGW_PACKAGE_PREFIX}-python-oslo-utils"
+         "${MINGW_PACKAGE_PREFIX}-python-fasteners")
+makedepends=("${MINGW_PACKAGE_PREFIX}-python-setuptools")
+checkdepends=("${MINGW_PACKAGE_PREFIX}-python-mock"
+              "${MINGW_PACKAGE_PREFIX}-python-oslotest"
+              "${MINGW_PACKAGE_PREFIX}-python-oslo-config"
+              "${MINGW_PACKAGE_PREFIX}-python-eventlet"
+              "${MINGW_PACKAGE_PREFIX}-python-testrepository")
 options=('staticlibs' 'strip' '!debug')
+install=${_realname}3-${CARCH}.install
 source=("${_realname}-${pkgver}.tar.gz::https://github.com/openstack/oslo.concurrency/archive/${pkgver}.tar.gz")
-sha512sums=('28a8652c018025257fa6d13ce2ddf70154c4d22bb1e6e0af229ec876a33cfa3ab3c76283004a677c7a447d05d939a24e7d6d0a18cdb53aff6c87113dd4e25110')
+sha512sums=('dc76753dbc15dd01cdde82ede1b6efb1587b32a4da80c35d766f1da0da7497e8297204b288b84570a18134f7c59db08daea89304248f38cccfd46198be191880')
 
 # Helper macros to help make tasks easier #
 apply_patch_with_msg() {
@@ -48,46 +52,38 @@ del_file_exists() {
 prepare() {
   cd "${srcdir}/oslo.concurrency-${pkgver}"
 
-  # Set version for setuptools_scm
-  export SETUPTOOLS_SCM_PRETEND_VERSION=$pkgver
+  cd "${srcdir}"
+  rm -rf python-build-${CARCH} | true
+  cp -r "oslo.concurrency-${pkgver}" "python-build-${CARCH}"
 
-  export PBR_VERSION=$pkgver
+  # Set version for setuptools_scm
+  export SETUPTOOLS_SCM_PRETEND_VERSION=${pkgver}
+  export PBR_VERSION=${pkgver}
 }
 
 build() {
-  cd "${srcdir}/oslo.concurrency-${pkgver}"
-
-  ${MINGW_PREFIX}/bin/python3 setup.py build
+  cd "${srcdir}/python-build-${CARCH}"
+  ${MINGW_PREFIX}/bin/python setup.py build
 }
 
 check() {
-  cd "${srcdir}/oslo.concurrency-${pkgver}"
-
-  ${MINGW_PREFIX}/bin/python3 setup.py test || warning "Tests failed"
+  cd "${srcdir}/python-build-${CARCH}"
+  ${MINGW_PREFIX}/bin/python setup.py test || warning "Tests failed"
 }
 
 package() {
-  #This package install is needed for .fixups with .EXE's 
-  #in the bit directory.  The install files "python-exe-installs"
-  #and should be renamed to your _realname .
-  install=${_realname}3-${CARCH}.install
-
-  cd "${srcdir}/oslo.concurrency-${pkgver}"
+  cd "${srcdir}/python-build-${CARCH}"
 
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
-  ${MINGW_PREFIX}/bin/python3 setup.py install --prefix=${MINGW_PREFIX} \
+  ${MINGW_PREFIX}/bin/python setup.py install --prefix=${MINGW_PREFIX} \
     --root="${pkgdir}" --optimize=1 --skip-build
 
-  install -Dm644 LICENSE "${pkgdir}${MINGW_PREFIX}/share/licenses/python3-${_realname}/LICENSE"
+  install -Dm644 LICENSE "${pkgdir}${MINGW_PREFIX}/share/licenses/python-${_realname}/LICENSE"
 
-# This entire section should be removed if the package does NOT install
-# anything in the /mingw*/bin directory.
-### begin section ###
   local PREFIX_WIN=$(cygpath -wm ${MINGW_PREFIX})
   # fix python command in files
   for _f in "${pkgdir}${MINGW_PREFIX}"/bin/*.py; do
     sed -e "s|/usr/bin/env |${MINGW_PREFIX}|g" \
         -e "s|${PREFIX_WIN}|${MINGW_PREFIX}|g" -i ${_f}
   done
-#### end section ####
 }
diff --git a/mingw-w64-python-oslo-config/PKGBUILD b/mingw-w64-python-oslo-config/PKGBUILD
index a6df9eca5c..1c3bb74f1c 100644
--- a/mingw-w64-python-oslo-config/PKGBUILD
+++ b/mingw-w64-python-oslo-config/PKGBUILD
@@ -2,74 +2,65 @@
 
 _realname=oslo-config
 pkgbase=mingw-w64-python-${_realname}
-pkgname=( "${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
-pkgver=6.11.1
-pkgrel=3
+pkgname=( "${MINGW_PACKAGE_PREFIX}-python-${_realname}")
+provides=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+conflicts=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+replaces=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+pkgver=6.12.0
+pkgrel=1
 pkgdesc="parsing command line arguments and .ini style configuration files (mingw-w64)"
 arch=('any')
 url="https://pypi.python.org/pypi/oslo.config"
 license=('Apache')
-depends=("${MINGW_PACKAGE_PREFIX}-python3"
-         "${MINGW_PACKAGE_PREFIX}-python3-six"
-         "${MINGW_PACKAGE_PREFIX}-python3-netaddr"
-         "${MINGW_PACKAGE_PREFIX}-python3-stevedore"
-         "${MINGW_PACKAGE_PREFIX}-python3-debtcollector"
-         "${MINGW_PACKAGE_PREFIX}-python3-oslo-i18n"
-         "${MINGW_PACKAGE_PREFIX}-python3-rfc3986"
-         "${MINGW_PACKAGE_PREFIX}-python3-yaml")
-makedepends=("${MINGW_PACKAGE_PREFIX}-python3-setuptools")
-checkdepends=("${MINGW_PACKAGE_PREFIX}-python3-oslotest"
-              "${MINGW_PACKAGE_PREFIX}-python3-sphinx"
-              "${MINGW_PACKAGE_PREFIX}-python3-testrepository"
-              "${MINGW_PACKAGE_PREFIX}-python3-oslo-log")
+depends=("${MINGW_PACKAGE_PREFIX}-python"
+         "${MINGW_PACKAGE_PREFIX}-python-six"
+         "${MINGW_PACKAGE_PREFIX}-python-netaddr"
+         "${MINGW_PACKAGE_PREFIX}-python-stevedore"
+         "${MINGW_PACKAGE_PREFIX}-python-debtcollector"
+         "${MINGW_PACKAGE_PREFIX}-python-oslo-i18n"
+         "${MINGW_PACKAGE_PREFIX}-python-rfc3986"
+         "${MINGW_PACKAGE_PREFIX}-python-yaml")
+makedepends=("${MINGW_PACKAGE_PREFIX}-python-setuptools")
+checkdepends=("${MINGW_PACKAGE_PREFIX}-python-oslotest"
+              "${MINGW_PACKAGE_PREFIX}-python-sphinx"
+              "${MINGW_PACKAGE_PREFIX}-python-testrepository"
+              "${MINGW_PACKAGE_PREFIX}-python-oslo-log")
 options=('staticlibs' 'strip' '!debug')
+install=${_realname}3-${CARCH}.install
 source=("${_realname}-${pkgver}.tar.gz::https://github.com/openstack/oslo.config/archive/${pkgver}.tar.gz")
-sha512sums=('ea01bcd83900f368f7df29c841ed17bfd8baad1d011da83287111d36ca45d7e00647ecd68c40e34d61f5d0bb07eeb4313c6fcb41efae102110593f81a7ea7242')
+sha512sums=('8a7fd522c6535a2b5e0863a1c839dda28cecd246b1c245181b523d5ca2eff32f5e27bb3fbaac60aa415fe3572310c6357bc6bff37cd842b88ce78e563c9f5e76')
 
 prepare() {
   cd "${srcdir}/oslo.config-${pkgver}"
-
   sed -i '/argparse/d' requirements.txt
 
   # Set version for setuptools_scm
-  export SETUPTOOLS_SCM_PRETEND_VERSION=$pkgver
-
-  export PBR_VERSION=$pkgver
+  export SETUPTOOLS_SCM_PRETEND_VERSION=${pkgver}
+  export PBR_VERSION=${pkgver}
 }
 
 build() {
   cd "${srcdir}/oslo.config-${pkgver}"
-
-  ${MINGW_PREFIX}/bin/python3 setup.py build
+  ${MINGW_PREFIX}/bin/python setup.py build
 }
 
 check() {
   cd "${srcdir}/oslo.config-${pkgver}"
-
-  ${MINGW_PREFIX}/bin/python3 setup.py testr
+  ${MINGW_PREFIX}/bin/python setup.py testr
 }
 
 package() {
-  #This package install is needed for .fixups with .EXE's 
-  #in the bit directory.  The install files "python-exe-installs"
-  #and should be renamed to your _realname .
-  install=${_realname}3-${CARCH}.install
-
   cd "${srcdir}/oslo.config-${pkgver}"
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
-  ${MINGW_PREFIX}/bin/python3 setup.py install --prefix=${MINGW_PREFIX} \
+  ${MINGW_PREFIX}/bin/python setup.py install --prefix=${MINGW_PREFIX} \
     --root="${pkgdir}" --optimize=1 --skip-build
 
-  install -Dm644 LICENSE "${pkgdir}${MINGW_PREFIX}/share/licenses/python3-${_realname}/LICENSE"
+  install -Dm644 LICENSE "${pkgdir}${MINGW_PREFIX}/share/licenses/python-${_realname}/LICENSE"
 
-# This entire section should be removed if the package does NOT install
-# anything in the /mingw*/bin directory.
-### begin section ###
   local PREFIX_WIN=$(cygpath -wm ${MINGW_PREFIX})
   # fix python command in files
   for _f in "${pkgdir}${MINGW_PREFIX}"/bin/*.py; do
     sed -e "s|/usr/bin/env |${MINGW_PREFIX}|g" \
         -e "s|${PREFIX_WIN}|${MINGW_PREFIX}|g" -i ${_f}
   done
-#### end section ####
 }
diff --git a/mingw-w64-python-oslo-context/PKGBUILD b/mingw-w64-python-oslo-context/PKGBUILD
index 9130efc263..fc568cb722 100644
--- a/mingw-w64-python-oslo-context/PKGBUILD
+++ b/mingw-w64-python-oslo-context/PKGBUILD
@@ -2,21 +2,23 @@
 
 _realname=oslo-context
 pkgbase=mingw-w64-python-${_realname}
-pkgname=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+pkgname=("${MINGW_PACKAGE_PREFIX}-python-${_realname}")
+provides=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+conflicts=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+replaces=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
 pkgver=2.23.0
-pkgrel=2
+pkgrel=1
 pkgdesc="OpenStack Context library (mingw-w64)"
 arch=('any')
 url="https://pypi.python.org/pypi/oslo.context"
 license=('Apache')
-depends=("${MINGW_PACKAGE_PREFIX}-python3"
-         "${MINGW_PACKAGE_PREFIX}-python3-pbr" 
-         "${MINGW_PACKAGE_PREFIX}-python3-debtcollector")
-
-makedepends=("${MINGW_PACKAGE_PREFIX}-python3-setuptools")
-checkdepends=("${MINGW_PACKAGE_PREFIX}-python3-mock"
-              "${MINGW_PACKAGE_PREFIX}-python3-oslotest"
-              "${MINGW_PACKAGE_PREFIX}-python3-testrepository")
+depends=("${MINGW_PACKAGE_PREFIX}-python"
+         "${MINGW_PACKAGE_PREFIX}-python-pbr"
+         "${MINGW_PACKAGE_PREFIX}-python-debtcollector")
+makedepends=("${MINGW_PACKAGE_PREFIX}-python-setuptools")
+checkdepends=("${MINGW_PACKAGE_PREFIX}-python-mock"
+              "${MINGW_PACKAGE_PREFIX}-python-oslotest"
+              "${MINGW_PACKAGE_PREFIX}-python-testrepository")
 options=('staticlibs' 'strip' '!debug')
 source=("${_realname}-${pkgver}.tar.gz"::"https://github.com/openstack/oslo.context/archive/${pkgver}.tar.gz")
 sha512sums=('429ba2796ad331729f7a06bb5829912ce275948a430b0f115573da6bb53af476c4edefc46f899ba551f6e50a0ee5f13392b7f457b2698777254f43290c6035a3')
@@ -25,29 +27,27 @@ prepare() {
   cd "${srcdir}/oslo.context-${pkgver}"
 
   # Set version for setuptools_scm
-  export SETUPTOOLS_SCM_PRETEND_VERSION=$pkgver
+  export SETUPTOOLS_SCM_PRETEND_VERSION=${pkgver}
   # Set version for python-pbr
-  export PBR_VERSION=$pkgver
+  export PBR_VERSION=${pkgver}
 }
 
 build() {
   cd "${srcdir}/oslo.context-${pkgver}"
-
-  ${MINGW_PREFIX}/bin/python3 setup.py build
+  ${MINGW_PREFIX}/bin/python setup.py build
 }
 
 check() {
   cd "${srcdir}/oslo.context-${pkgver}"
-
-  PYTHON=python3 ${MINGW_PREFIX}/bin/python3 setup.py testr || warning "Tests failed"
+  PYTHON=python ${MINGW_PREFIX}/bin/python setup.py testr || warning "Tests failed"
 }
 
 package() {
   cd "${srcdir}/oslo.context-${pkgver}"
 
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
-  ${MINGW_PREFIX}/bin/python3 setup.py install --prefix=${MINGW_PREFIX} \
+  ${MINGW_PREFIX}/bin/python setup.py install --prefix=${MINGW_PREFIX} \
     --root="${pkgdir}" --optimize=1 --skip-build
 
-  install -Dm644 LICENSE "${pkgdir}${MINGW_PREFIX}/share/licenses/python3-${_realname}/LICENSE"
+  install -Dm644 LICENSE "${pkgdir}${MINGW_PREFIX}/share/licenses/python-${_realname}/LICENSE"
 }
diff --git a/mingw-w64-python-oslo-db/PKGBUILD b/mingw-w64-python-oslo-db/PKGBUILD
index 28e425c5c1..9866acc4b1 100644
--- a/mingw-w64-python-oslo-db/PKGBUILD
+++ b/mingw-w64-python-oslo-db/PKGBUILD
@@ -5,33 +5,36 @@
 
 _realname=oslo-db
 pkgbase=mingw-w64-python-${_realname}
-pkgname=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
-pkgver=5.0.2
-pkgrel=2
+pkgname=("${MINGW_PACKAGE_PREFIX}-python-${_realname}")
+provides=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+conflicts=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+replaces=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+pkgver=5.1.1
+pkgrel=1
 pkgdesc="OpenStack Database Pattern Library (mingw-w64)"
 arch=('any')
 url='https://pypi.python.org/pypi/oslo.db'
 license=('LICENSE')
-depends=("${MINGW_PACKAGE_PREFIX}-python3"
-         "${MINGW_PACKAGE_PREFIX}-python3-six"
-         "${MINGW_PACKAGE_PREFIX}-python3-pbr"
-         "${MINGW_PACKAGE_PREFIX}-python3-alembic"
-         "${MINGW_PACKAGE_PREFIX}-python3-debtcollector"
-         "${MINGW_PACKAGE_PREFIX}-python3-oslo-i18n"
-         "${MINGW_PACKAGE_PREFIX}-python3-oslo-config"
-         "${MINGW_PACKAGE_PREFIX}-python3-oslo-utils"
-         "${MINGW_PACKAGE_PREFIX}-python3-sqlalchemy"
-         "${MINGW_PACKAGE_PREFIX}-python3-sqlalchemy-migrate"
-         "${MINGW_PACKAGE_PREFIX}-python3-stevedore")
-makedepends=("${MINGW_PACKAGE_PREFIX}-python3-setuptools")
-checkdepends=("${MINGW_PACKAGE_PREFIX}-python3-mock"
-              "${MINGW_PACKAGE_PREFIX}-python3-testrepository"
-              "${MINGW_PACKAGE_PREFIX}-python3-testresources"
-              "${MINGW_PACKAGE_PREFIX}-python3-oslotest"
-              "${MINGW_PACKAGE_PREFIX}-python3-oslo-context")
+depends=("${MINGW_PACKAGE_PREFIX}-python"
+         "${MINGW_PACKAGE_PREFIX}-python-six"
+         "${MINGW_PACKAGE_PREFIX}-python-pbr"
+         "${MINGW_PACKAGE_PREFIX}-python-alembic"
+         "${MINGW_PACKAGE_PREFIX}-python-debtcollector"
+         "${MINGW_PACKAGE_PREFIX}-python-oslo-i18n"
+         "${MINGW_PACKAGE_PREFIX}-python-oslo-config"
+         "${MINGW_PACKAGE_PREFIX}-python-oslo-utils"
+         "${MINGW_PACKAGE_PREFIX}-python-sqlalchemy"
+         "${MINGW_PACKAGE_PREFIX}-python-sqlalchemy-migrate"
+         "${MINGW_PACKAGE_PREFIX}-python-stevedore")
+makedepends=("${MINGW_PACKAGE_PREFIX}-python-setuptools")
+checkdepends=("${MINGW_PACKAGE_PREFIX}-python-mock"
+              "${MINGW_PACKAGE_PREFIX}-python-testrepository"
+              "${MINGW_PACKAGE_PREFIX}-python-testresources"
+              "${MINGW_PACKAGE_PREFIX}-python-oslotest"
+              "${MINGW_PACKAGE_PREFIX}-python-oslo-context")
 options=('staticlibs' 'strip' '!debug')
 source=("${_realname}-${pkgver}.tar.gz"::"https://github.com/openstack/oslo.db/archive/${pkgver}.tar.gz")
-sha512sums=('1e6317a51241bb0c0edc790fbf6095af4e6c52c5c92f3620f60b31a84a1f44ab5976ec2665832cb2b9759619828eee32eefcbbbb5f7e9f784cca591af0067dc1')
+sha512sums=('af3c1ccb0145ff71c4afbae322d23ebc1e6f506c904e39858af5cdd7f8a083fa577c856960bd56648f0bb9d3cc257d3ff68558ba8fb2666a3317eb2e1fcee330')
 
 # Helper macros to help make tasks easier #
 apply_patch_with_msg() {
@@ -54,7 +57,6 @@ del_file_exists() {
 
 prepare() {
   cd "${srcdir}/oslo.db-${pkgver}"
-
   sed -i 's/import unittest2/import unittest as unittest2/' oslo_db/tests/sqlalchemy/test_async_eventlet.py
 
   # Set version for setuptools_scm
@@ -65,20 +67,18 @@ prepare() {
 
 build() {
   cd "${srcdir}/oslo.db-${pkgver}"
-
-  ${MINGW_PREFIX}/bin/python3 setup.py build
+  ${MINGW_PREFIX}/bin/python setup.py build
 }
 
 check() {
   cd "${srcdir}/oslo.db-${pkgver}"
-
-  PYTHON=python3 ${MINGW_PREFIX}/bin/python3 setup.py testr || warning "tests failed"
+  PYTHON=python ${MINGW_PREFIX}/bin/python setup.py testr || warning "tests failed"
 }
 
 package() {
   cd "${srcdir}/oslo.db-${pkgver}"
 
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
-  ${MINGW_PREFIX}/bin/python3 setup.py install --prefix=${MINGW_PREFIX} \
+  ${MINGW_PREFIX}/bin/python setup.py install --prefix=${MINGW_PREFIX} \
     --root="${pkgdir}" --optimize=1 --skip-build
 }
diff --git a/mingw-w64-python-oslo-i18n/PKGBUILD b/mingw-w64-python-oslo-i18n/PKGBUILD
index 37eae4d40d..5a91fe7eef 100644
--- a/mingw-w64-python-oslo-i18n/PKGBUILD
+++ b/mingw-w64-python-oslo-i18n/PKGBUILD
@@ -2,21 +2,24 @@
 
 _realname=oslo-i18n
 pkgbase=mingw-w64-python-${_realname}
-pkgname=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
-pkgver=3.24.0
-pkgrel=2
+pkgname=("${MINGW_PACKAGE_PREFIX}-python-${_realname}")
+provides=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+conflicts=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+replaces=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+pkgver=3.25.0
+pkgrel=1
 pkgdesc="Oslo i18n library (mingw-w64)"
 arch=('any')
 url='https://pypi.python.org/pypi/oslo.i18n/'
 license=('Apache')
-depends=("${MINGW_PACKAGE_PREFIX}-python3" 
-         "${MINGW_PACKAGE_PREFIX}-python3-six"
-         "${MINGW_PACKAGE_PREFIX}-python3-pbr"
-         "${MINGW_PACKAGE_PREFIX}-python3-babel")
-makedepends=("${MINGW_PACKAGE_PREFIX}-python3-setuptools")
+depends=("${MINGW_PACKAGE_PREFIX}-python" 
+         "${MINGW_PACKAGE_PREFIX}-python-six"
+         "${MINGW_PACKAGE_PREFIX}-python-pbr"
+         "${MINGW_PACKAGE_PREFIX}-python-babel")
+makedepends=("${MINGW_PACKAGE_PREFIX}-python-setuptools")
 options=('staticlibs' 'strip' '!debug')
 source=("${_realname}-${pkgver}.tar.gz"::"https://github.com/openstack/oslo.i18n/archive/${pkgver}.tar.gz")
-sha512sums=('7734a46ec186073978d804a44ac8f97f474c5873e54e5443345db583f365627b7f0756cf559086dcc5b2612a4f7871491fac1029d85d1b0a3a9a1d6ab69fa628')
+sha512sums=('db199eeee4334941e2dacae235a264507f5072c14e476fa91918a8f445e96a6ebd3981ce683f4fad5ca5cd65539492df8642db93f1e445d4af1084421417ffd7')
 
 prepare() {
   cd "${srcdir}/oslo.i18n-${pkgver}"
@@ -29,20 +32,18 @@ prepare() {
 
 build() {
   cd "${srcdir}/oslo.i18n-${pkgver}"
-
-  ${MINGW_PREFIX}/bin/python3 setup.py build
+  ${MINGW_PREFIX}/bin/python setup.py build
 }
 
 check() {
   cd "${srcdir}/oslo.i18n-${pkgver}"
-
-  ${MINGW_PREFIX}/bin/python3 setup.py check
+  ${MINGW_PREFIX}/bin/python setup.py check
 }
 
 package() {
   cd "${srcdir}/oslo.i18n-${pkgver}"
 
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
-  ${MINGW_PREFIX}/bin/python3 setup.py install --prefix=${MINGW_PREFIX} \
+  ${MINGW_PREFIX}/bin/python setup.py install --prefix=${MINGW_PREFIX} \
     --root="${pkgdir}" --optimize=1 --skip-build
 }
diff --git a/mingw-w64-python-oslo-log/PKGBUILD b/mingw-w64-python-oslo-log/PKGBUILD
index 6a080c0d69..925d0f0cf1 100644
--- a/mingw-w64-python-oslo-log/PKGBUILD
+++ b/mingw-w64-python-oslo-log/PKGBUILD
@@ -2,71 +2,67 @@
 
 _realname=oslo-log
 pkgbase=mingw-w64-python-${_realname}
-pkgname=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
-pkgver=3.44.1
-pkgrel=2
+pkgname=("${MINGW_PACKAGE_PREFIX}-python-${_realname}")
+provides=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+conflicts=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+replaces=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+pkgver=3.45.1
+pkgrel=1
 pkgdesc="Oslo Logging Library (mingw-w64)"
 arch=('any')
 url='https://pypi.python.org/pypi/oslo.log'
 license=('Apache')
-depends=("${MINGW_PACKAGE_PREFIX}-python3"
-         "${MINGW_PACKAGE_PREFIX}-python3-six"
-         "${MINGW_PACKAGE_PREFIX}-python3-pbr"
-         "${MINGW_PACKAGE_PREFIX}-python3-oslo-config"
-         "${MINGW_PACKAGE_PREFIX}-python3-oslo-context"
-         "${MINGW_PACKAGE_PREFIX}-python3-oslo-i18n"
-         "${MINGW_PACKAGE_PREFIX}-python3-oslo-utils"
-         "${MINGW_PACKAGE_PREFIX}-python3-oslo-serialization"
-         "${MINGW_PACKAGE_PREFIX}-python3-debtcollector"
-         "${MINGW_PACKAGE_PREFIX}-python3-dateutil"
-         "${MINGW_PACKAGE_PREFIX}-python3-monotonic")
-makedepends=("${MINGW_PACKAGE_PREFIX}-python3-setuptools")
-checkdepends=("${MINGW_PACKAGE_PREFIX}-python3-mock"
-              "${MINGW_PACKAGE_PREFIX}-python3-oslotest"
-              "${MINGW_PACKAGE_PREFIX}-python3-testrepository")
+depends=("${MINGW_PACKAGE_PREFIX}-python"
+         "${MINGW_PACKAGE_PREFIX}-python-six"
+         "${MINGW_PACKAGE_PREFIX}-python-pbr"
+         "${MINGW_PACKAGE_PREFIX}-python-oslo-config"
+         "${MINGW_PACKAGE_PREFIX}-python-oslo-context"
+         "${MINGW_PACKAGE_PREFIX}-python-oslo-i18n"
+         "${MINGW_PACKAGE_PREFIX}-python-oslo-utils"
+         "${MINGW_PACKAGE_PREFIX}-python-oslo-serialization"
+         "${MINGW_PACKAGE_PREFIX}-python-debtcollector"
+         "${MINGW_PACKAGE_PREFIX}-python-dateutil"
+         "${MINGW_PACKAGE_PREFIX}-python-monotonic")
+makedepends=("${MINGW_PACKAGE_PREFIX}-python-setuptools")
+checkdepends=("${MINGW_PACKAGE_PREFIX}-python-mock"
+              "${MINGW_PACKAGE_PREFIX}-python-oslotest"
+              "${MINGW_PACKAGE_PREFIX}-python-testrepository")
 options=('staticlibs' 'strip' '!debug')
+install=${_realname}3-${CARCH}.install
 source=("${_realname}-${pkgver}.tar.gz"::"https://github.com/openstack/oslo.log/archive/${pkgver}.tar.gz")
-sha512sums=('63e2ff26643f9cc37ef46f31b0ae16d0df6078e5a1431b6610dd15bcc2fb5e59b6723cfabb10117801d774c63f783f4c86a100dff611993b6f6447b78a36f3d8')
+sha512sums=('a56ee382de93f57602287ddd3574a0b01c5a400937043d4f6d2b142500680389fd4b4a24c88fe5eb00b477302f5c2fb79efccd3299cfc580cd2ae627e9c005b5')
 
 prepare() {
-  cd "${srcdir}/oslo.log-$pkgver"
+  cd "${srcdir}/oslo.log-${pkgver}"
 
   sed -i 's/unittest2/unittest/g' oslo_log/tests/unit/*.py
 
   # Set version for setuptools_scm
-  export SETUPTOOLS_SCM_PRETEND_VERSION=$pkgver
-
-  export PBR_VERSION=$pkgver
+  export SETUPTOOLS_SCM_PRETEND_VERSION=${pkgver}
+  export PBR_VERSION=${pkgver}
 }
 
 build() {
-  cd "${srcdir}/oslo.log-$pkgver"
-
-  ${MINGW_PREFIX}/bin/python3 setup.py build
+  cd "${srcdir}/oslo.log-${pkgver}"
+  ${MINGW_PREFIX}/bin/python setup.py build
 }
 
 check() {
-  cd "${srcdir}/oslo.log-$pkgver"
-
-  ${MINGW_PREFIX}/bin/python3 setup.py testr || warning "Tests failed"
+  cd "${srcdir}/oslo.log-${pkgver}"
+  ${MINGW_PREFIX}/bin/python setup.py testr || warning "Tests failed"
 }
 
 package() {
-  install=${_realname}3-${CARCH}.install
-
-  cd "${srcdir}/oslo.log-$pkgver"
+  cd "${srcdir}/oslo.log-${pkgver}"
 
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
-  ${MINGW_PREFIX}/bin/python3 setup.py install --prefix=${MINGW_PREFIX} \
+  ${MINGW_PREFIX}/bin/python setup.py install --prefix=${MINGW_PREFIX} \
     --root="${pkgdir}" --optimize=1 --skip-build
-# This entire section should be removed if the package does NOT install
-# anything in the /mingw*/bin directory.
-### begin section ###
+
   local PREFIX_WIN=$(cygpath -wm ${MINGW_PREFIX})
   # fix python command in files
   for _f in "${pkgdir}${MINGW_PREFIX}"/bin/*.py; do
     sed -e "s|/usr/bin/env |${MINGW_PREFIX}/|g" \
         -e "s|${PREFIX_WIN}|${MINGW_PREFIX}|g" -i ${_f}
   done
-#### end section ####
 }
diff --git a/mingw-w64-python-oslo-serialization/PKGBUILD b/mingw-w64-python-oslo-serialization/PKGBUILD
index 7d50d01008..641ba19338 100644
--- a/mingw-w64-python-oslo-serialization/PKGBUILD
+++ b/mingw-w64-python-oslo-serialization/PKGBUILD
@@ -2,52 +2,53 @@
 
 _realname=oslo-serialization
 pkgbase=mingw-w64-python-${_realname}
-pkgname=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+pkgname=("${MINGW_PACKAGE_PREFIX}-python-${_realname}")
+provides=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+conflicts=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+replaces=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
 pkgver=2.29.2
-pkgrel=2
+pkgrel=1
 pkgdesc="Oslo Serialization library (mingw-w64)"
 arch=('any')
 url='https://pypi.org/project/oslo.serialization/'
 license=('Apache')
-depends=("${MINGW_PACKAGE_PREFIX}-python3"
-         "${MINGW_PACKAGE_PREFIX}-python3-six" 
-         "${MINGW_PACKAGE_PREFIX}-python3-pbr"
-         "${MINGW_PACKAGE_PREFIX}-python3-babel"
-         "${MINGW_PACKAGE_PREFIX}-python3-msgpack"
-         "${MINGW_PACKAGE_PREFIX}-python3-oslo-utils"
-         "${MINGW_PACKAGE_PREFIX}-python3-pytz")
-makedepends=("${MINGW_PACKAGE_PREFIX}-python3-setuptools")
-checkdepends=("${MINGW_PACKAGE_PREFIX}-python3-oslotest"
-              "${MINGW_PACKAGE_PREFIX}-python3-testrepository")
+depends=("${MINGW_PACKAGE_PREFIX}-python"
+         "${MINGW_PACKAGE_PREFIX}-python-six" 
+         "${MINGW_PACKAGE_PREFIX}-python-pbr"
+         "${MINGW_PACKAGE_PREFIX}-python-babel"
+         "${MINGW_PACKAGE_PREFIX}-python-msgpack"
+         "${MINGW_PACKAGE_PREFIX}-python-oslo-utils"
+         "${MINGW_PACKAGE_PREFIX}-python-pytz")
+makedepends=("${MINGW_PACKAGE_PREFIX}-python-setuptools")
+checkdepends=("${MINGW_PACKAGE_PREFIX}-python-oslotest"
+              "${MINGW_PACKAGE_PREFIX}-python-testrepository")
 options=('staticlibs' 'strip' '!debug')
-source=("${_realname}-$pkgver.tar.gz"::"https://github.com/openstack/oslo.serialization/archive/$pkgver.tar.gz")
+source=("${_realname}-$pkgver.tar.gz"::"https://github.com/openstack/oslo.serialization/archive/${pkgver}.tar.gz")
 sha512sums=('62d18c582406d5e0d4c8927d0a598f819744d3ebf11065aa88689d963c7fc3ba0234897b61d714646ca908e181b5005f97acf098407aa021ea757ebb3e070082')
 
 prepare() {
   cd "${srcdir}/oslo.serialization-${pkgver}"
 
   # Set version for setuptools_scm
-  export SETUPTOOLS_SCM_PRETEND_VERSION=$pkgver
+  export SETUPTOOLS_SCM_PRETEND_VERSION=${pkgver}
   # set version for pbr
-  export PBR_VERSION=$pkgver
+  export PBR_VERSION=${pkgver}
 }
 
 build() {
   cd "${srcdir}/oslo.serialization-${pkgver}"
-
-  ${MINGW_PREFIX}/bin/python3 setup.py build
+  ${MINGW_PREFIX}/bin/python setup.py build
 }
 
 check() {
   cd "${srcdir}/oslo.serialization-${pkgver}"
-
-  ${MINGW_PREFIX}/bin/python3 setup.py testr || warning "Tests failed"
+  ${MINGW_PREFIX}/bin/python setup.py testr || warning "Tests failed"
 }
 
 package() {
   cd "${srcdir}/oslo.serialization-${pkgver}"
 
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
-  ${MINGW_PREFIX}/bin/python3 setup.py install --prefix=${MINGW_PREFIX} \
+  ${MINGW_PREFIX}/bin/python setup.py install --prefix=${MINGW_PREFIX} \
     --root="${pkgdir}" --optimize=1 --skip-build
 }
diff --git a/mingw-w64-python-oslo-utils/PKGBUILD b/mingw-w64-python-oslo-utils/PKGBUILD
index 46e021974d..8f2ad66cd7 100644
--- a/mingw-w64-python-oslo-utils/PKGBUILD
+++ b/mingw-w64-python-oslo-utils/PKGBUILD
@@ -2,27 +2,30 @@
 
 _realname=oslo-utils
 pkgbase=mingw-w64-python-${_realname}
-pkgname=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
-pkgver=3.41.2
-pkgrel=2
+pkgname=("${MINGW_PACKAGE_PREFIX}-python-${_realname}")
+provides=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+conflicts=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+replaces=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+pkgver=3.42.1
+pkgrel=1
 pkgdesc="Oslo Utility library (mingw-w64)"
 arch=('any')
 url='https://pypi.org/project/oslo.utils/'
 license=('Apache')
-depends=("${MINGW_PACKAGE_PREFIX}-python3")
-makedepends=("${MINGW_PACKAGE_PREFIX}-python3-setuptools"
-             "${MINGW_PACKAGE_PREFIX}-python3-pbr"
-             "${MINGW_PACKAGE_PREFIX}-python3-iso8601"
-             "${MINGW_PACKAGE_PREFIX}-python3-oslo-i18n"
-             "${MINGW_PACKAGE_PREFIX}-python3-pytz"
-             "${MINGW_PACKAGE_PREFIX}-python3-netaddr"
-             "${MINGW_PACKAGE_PREFIX}-python3-netifaces"
-             "${MINGW_PACKAGE_PREFIX}-python3-debtcollector")
-checkdepends=("${MINGW_PACKAGE_PREFIX}-python3-oslotest"
-              "${MINGW_PACKAGE_PREFIX}-python3-ddt"
-              "${MINGW_PACKAGE_PREFIX}-python3-testrepository")
+depends=("${MINGW_PACKAGE_PREFIX}-python")
+makedepends=("${MINGW_PACKAGE_PREFIX}-python-setuptools"
+             "${MINGW_PACKAGE_PREFIX}-python-pbr"
+             "${MINGW_PACKAGE_PREFIX}-python-iso8601"
+             "${MINGW_PACKAGE_PREFIX}-python-oslo-i18n"
+             "${MINGW_PACKAGE_PREFIX}-python-pytz"
+             "${MINGW_PACKAGE_PREFIX}-python-netaddr"
+             "${MINGW_PACKAGE_PREFIX}-python-netifaces"
+             "${MINGW_PACKAGE_PREFIX}-python-debtcollector")
+checkdepends=("${MINGW_PACKAGE_PREFIX}-python-oslotest"
+              "${MINGW_PACKAGE_PREFIX}-python-ddt"
+              "${MINGW_PACKAGE_PREFIX}-python-testrepository")
 source=("${_realname}-${pkgver}.tar.gz"::"https://github.com/openstack/oslo.utils/archive/${pkgver}.tar.gz")
-sha512sums=('cef8a9c49e60b17053960618a1bb62af4ae752b58c80403a0d17711e5d5d998b980bf00fc3c0f53180379d2edd230a666d2ce76c44ba88abf6add6355fe6f97d')
+sha512sums=('7e7161e2c65c5b722335d45fd73e6debb7d9ae0f7ff792d2d8600ee356a3a97028daf5da980e8cdfd3fbef47312f1c7c47411fea431711eebadb92c90e723dd9')
 
 prepare() {
   cd "${srcdir}/oslo.utils-${pkgver}"
@@ -38,13 +41,11 @@ prepare() {
 
 build() {
   cd "${srcdir}/oslo.utils-${pkgver}"
-
-  ${MINGW_PREFIX}/bin/python3 setup.py build
+  ${MINGW_PREFIX}/bin/python setup.py build
 }
 
 check() {
   cd "${srcdir}/oslo.utils-${pkgver}"
-
   ${MINGW_PREFIX}/bin/stestr run
 }
 
@@ -52,9 +53,8 @@ package() {
   cd "${srcdir}/oslo.utils-${pkgver}"
 
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
-  ${MINGW_PREFIX}/bin/python3 setup.py install --prefix=${MINGW_PREFIX} \
+  ${MINGW_PREFIX}/bin/python setup.py install --prefix=${MINGW_PREFIX} \
     --root="${pkgdir}" --optimize=1 --skip-build
 
-  install -Dm644 LICENSE "${pkgdir}${MINGW_PREFIX}/share/licenses/python3-${_realname}/LICENSE"
+  install -Dm644 LICENSE "${pkgdir}${MINGW_PREFIX}/share/licenses/python-${_realname}/LICENSE"
 }
-
diff --git a/mingw-w64-python-oslosphinx/PKGBUILD b/mingw-w64-python-oslosphinx/PKGBUILD
index ba1e838599..18b45f666a 100644
--- a/mingw-w64-python-oslosphinx/PKGBUILD
+++ b/mingw-w64-python-oslosphinx/PKGBUILD
@@ -5,19 +5,22 @@
 
 _realname=oslosphinx
 pkgbase=mingw-w64-python-${_realname}
-pkgname=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+pkgname=("${MINGW_PACKAGE_PREFIX}-python-${_realname}")
+provides=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+conflicts=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+replaces=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
 pkgver=4.18.0
-pkgrel=3
+pkgrel=1
 pkgdesc="OpenStack Sphinx Extensions and Theme (mingw-w64)"
 arch=('any')
 url='https://github.com/openstack/oslosphinx'
 license=('Apache')
-depends=("${MINGW_PACKAGE_PREFIX}-python3"
-         "${MINGW_PACKAGE_PREFIX}-python3-six"
-         "${MINGW_PACKAGE_PREFIX}-python3-requests")
-makedepends=("${MINGW_PACKAGE_PREFIX}-python3-setuptools"
-             "${MINGW_PACKAGE_PREFIX}-python3-pbr")
-checkdepends=("${MINGW_PACKAGE_PREFIX}-python3-sphinx")
+depends=("${MINGW_PACKAGE_PREFIX}-python"
+         "${MINGW_PACKAGE_PREFIX}-python-six"
+         "${MINGW_PACKAGE_PREFIX}-python-requests")
+makedepends=("${MINGW_PACKAGE_PREFIX}-python-setuptools"
+             "${MINGW_PACKAGE_PREFIX}-python-pbr")
+checkdepends=("${MINGW_PACKAGE_PREFIX}-python-sphinx")
 options=('staticlibs' 'strip' '!debug')
 source=("${_realname}-${pkgver}.tar.gz"::"https://github.com/openstack/oslosphinx/archive/${pkgver}.tar.gz")
 sha512sums=('47bd8912c47400538839e5b9ac0a81ecb2b7bbf30e83daade32046b3a1a70d892b53b7418ee59270fb36cddf6103214cef64d86c52602070c04ade2af29b3122')
@@ -45,28 +48,26 @@ prepare() {
   cd "${srcdir}/${_realname}-${pkgver}"
 
   # Set version for setuptools_scm
-  export SETUPTOOLS_SCM_PRETEND_VERSION=$pkgver
-  export PBR_VERSION=$pkgver
+  export SETUPTOOLS_SCM_PRETEND_VERSION=${pkgver}
+  export PBR_VERSION=${pkgver}
 }
 
 build() {
   cd "${srcdir}/${_realname}-${pkgver}"
-
-  ${MINGW_PREFIX}/bin/python3 setup.py build
+  ${MINGW_PREFIX}/bin/python setup.py build
 }
 
 check() {
   cd "${srcdir}/${_realname}-${pkgver}"
-
-  ${MINGW_PREFIX}/bin/python3 setup.py check
+  ${MINGW_PREFIX}/bin/python setup.py check
 }
 
 package() {
   cd "${srcdir}/${_realname}-${pkgver}"
 
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
-  ${MINGW_PREFIX}/bin/python3 setup.py install --prefix=${MINGW_PREFIX} \
+  ${MINGW_PREFIX}/bin/python setup.py install --prefix=${MINGW_PREFIX} \
     --root="${pkgdir}" --optimize=1 --skip-build
 
-  install -Dm644 LICENSE "${pkgdir}${MINGW_PREFIX}/share/licenses/python3-${_realname}/LICENSE"
+  install -Dm644 LICENSE "${pkgdir}${MINGW_PREFIX}/share/licenses/python-${_realname}/LICENSE"
 }
diff --git a/mingw-w64-python-oslotest/PKGBUILD b/mingw-w64-python-oslotest/PKGBUILD
index b77fb4516b..32e71d8a2b 100644
--- a/mingw-w64-python-oslotest/PKGBUILD
+++ b/mingw-w64-python-oslotest/PKGBUILD
@@ -2,26 +2,29 @@
 
 _realname=oslotest
 pkgbase=mingw-w64-python-${_realname}
-pkgname=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+pkgname=("${MINGW_PACKAGE_PREFIX}-python-${_realname}")
+provides=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+conflicts=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+replaces=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
 pkgver=3.8.1
-pkgrel=2
+pkgrel=1
 pkgdesc="Oslo test framework (mingw-w64)"
 arch=('any')
 url='https://github.com/openstack/oslotest'
 license=('Apache')
 validpgpkeys=('gpg_KEY')
-depends=("${MINGW_PACKAGE_PREFIX}-python3")
-makedepends=("${MINGW_PACKAGE_PREFIX}-python3-setuptools"
-             "${MINGW_PACKAGE_PREFIX}-python3-pbr"
-             "${MINGW_PACKAGE_PREFIX}-python3-fixtures"
-             "${MINGW_PACKAGE_PREFIX}-python3-subunit"
-             "${MINGW_PACKAGE_PREFIX}-python3-stestr"
-             "${MINGW_PACKAGE_PREFIX}-python3-testscenarios"
-             "${MINGW_PACKAGE_PREFIX}-python3-testtools"
-             "${MINGW_PACKAGE_PREFIX}-python3-mock"
-             "${MINGW_PACKAGE_PREFIX}-python3-mox3"
-#             "${MINGW_PACKAGE_PREFIX}-python3-os-client-config"
-             "${MINGW_PACKAGE_PREFIX}-python3-debtcollector")
+depends=("${MINGW_PACKAGE_PREFIX}-python")
+makedepends=("${MINGW_PACKAGE_PREFIX}-python-setuptools"
+             "${MINGW_PACKAGE_PREFIX}-python-pbr"
+             "${MINGW_PACKAGE_PREFIX}-python-fixtures"
+             "${MINGW_PACKAGE_PREFIX}-python-subunit"
+             "${MINGW_PACKAGE_PREFIX}-python-stestr"
+             "${MINGW_PACKAGE_PREFIX}-python-testscenarios"
+             "${MINGW_PACKAGE_PREFIX}-python-testtools"
+             "${MINGW_PACKAGE_PREFIX}-python-mock"
+             "${MINGW_PACKAGE_PREFIX}-python-mox3"
+#             "${MINGW_PACKAGE_PREFIX}-python-os-client-config"
+             "${MINGW_PACKAGE_PREFIX}-python-debtcollector")
 install=${_realname}-${CARCH}.install
 options=('staticlibs' 'strip' '!debug')
 source=("${_realname}-${pkgver}.tar.gz"::"https://github.com/openstack/oslotest/archive/${pkgver}.tar.gz")
@@ -77,13 +80,9 @@ package() {
 
   install -Dm644 LICENSE "${pkgdir}${MINGW_PREFIX}/share/licenses/python-${_realname}/LICENSE"
 
-  # This entire section should be removed if the package does NOT install
-  # anything in the /mingw*/bin directory.
-  ### begin section ###
   local PREFIX_WIN=$(cygpath -wm ${MINGW_PREFIX})
   # fix python command in files
   sed -e "s|/usr/bin/env |${MINGW_PREFIX}|g" \
       -e "s|${PREFIX_WIN}|${MINGW_PREFIX}|g" \
       -i "${pkgdir}${MINGW_PREFIX}/bin/oslo_run_pre_release_tests"
-  #### end section ####
 }
diff --git a/mingw-w64-python-parameterized/PKGBUILD b/mingw-w64-python-parameterized/PKGBUILD
index 082abd9599..352c542af8 100644
--- a/mingw-w64-python-parameterized/PKGBUILD
+++ b/mingw-w64-python-parameterized/PKGBUILD
@@ -2,46 +2,46 @@
 
 _realname=parameterized
 pkgbase=mingw-w64-python-${_realname}
-pkgname=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
-pkgver=0.7.0
-pkgrel=3
+pkgname=("${MINGW_PACKAGE_PREFIX}-python-${_realname}")
+provides=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+conflicts=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+replaces=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+pkgver=0.7.1
+pkgrel=1
 pkgdesc="Parameterized testing with any Python test framework (mingw-w64)"
 arch=('any')
 url='https://github.com/wolever/parameterized'
 license=('BSD')
-depends=("${MINGW_PACKAGE_PREFIX}-python3")
-makedepends=("${MINGW_PACKAGE_PREFIX}-python3-setuptools")
-checkdepends=("${MINGW_PACKAGE_PREFIX}-python3-mock"
-              "${MINGW_PACKAGE_PREFIX}-python3-nose")
+depends=("${MINGW_PACKAGE_PREFIX}-python")
+makedepends=("${MINGW_PACKAGE_PREFIX}-python-setuptools")
+checkdepends=("${MINGW_PACKAGE_PREFIX}-python-mock"
+              "${MINGW_PACKAGE_PREFIX}-python-nose")
 options=('staticlibs' 'strip' '!debug')
-source=("https://pypi.io/packages/source/p/parameterized/parameterized-$pkgver.tar.gz")
-sha512sums=('b76e18a7eee62fcab4385fd5d053253c096d4c3fc3a6300e8539afc4d8decc995e533085297c52f8a26411d2591a326033a740cc30a250d510aa1c11ee904246')
+source=("https://pypi.io/packages/source/p/parameterized/parameterized-${pkgver}.tar.gz")
+sha512sums=('331752b6bf27f88921d39567a58900c0e78f1740056d93755fc7e4528a032207f81e4938302c27cdfd82fe2ad455c01100d91da5f222a11e4bcf0210de68d9c2')
 
 prepare() {
   cd "${srcdir}/${_realname}-${pkgver}"
-
   # Set version for setuptools_scm
-  export SETUPTOOLS_SCM_PRETEND_VERSION=$pkgver
+  export SETUPTOOLS_SCM_PRETEND_VERSION=${pkgver}
 }
 
 build() {
   cd "${srcdir}/${_realname}-${pkgver}"
-
-  ${MINGW_PREFIX}/bin/python3 setup.py build
+  ${MINGW_PREFIX}/bin/python setup.py build
 }
 
 check() {
   cd "${srcdir}/${_realname}-${pkgver}"
-
-  ${MINGW_PREFIX}/bin/python3 setup.py nosetests
+  ${MINGW_PREFIX}/bin/python setup.py nosetests
 }
 
 package() {
   cd "${srcdir}/${_realname}-${pkgver}"
 
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
-  ${MINGW_PREFIX}/bin/python3 setup.py install --prefix=${MINGW_PREFIX} \
+  ${MINGW_PREFIX}/bin/python setup.py install --prefix=${MINGW_PREFIX} \
     --root="${pkgdir}" --optimize=1 --skip-build
 
-  install -Dm644 LICENSE.txt "${pkgdir}${MINGW_PREFIX}/share/licenses/python3-${_realname}/LICENSE"
+  install -Dm644 LICENSE.txt "${pkgdir}${MINGW_PREFIX}/share/licenses/python-${_realname}/LICENSE"
 }
diff --git a/mingw-w64-python-pathtools/PKGBUILD b/mingw-w64-python-pathtools/PKGBUILD
index 8db4bb3763..56fe10bcd1 100644
--- a/mingw-w64-python-pathtools/PKGBUILD
+++ b/mingw-w64-python-pathtools/PKGBUILD
@@ -2,15 +2,18 @@
 
 _realname=pathtools
 pkgbase=mingw-w64-python-${_realname}
-pkgname=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+pkgname=("${MINGW_PACKAGE_PREFIX}-python-${_realname}")
+provides=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+conflicts=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+replaces=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
 pkgver=0.1.2
-pkgrel=3
+pkgrel=1
 pkgdesc="File system general utilities (mingw-w64)"
 arch=('any')
 url='https://pypi.org/project/pathtools/'
 license=('MIT')
-depends=("${MINGW_PACKAGE_PREFIX}-python3")
-makedepends=("${MINGW_PACKAGE_PREFIX}-python3-setuptools")
+depends=("${MINGW_PACKAGE_PREFIX}-python")
+makedepends=("${MINGW_PACKAGE_PREFIX}-python-setuptools")
 options=('staticlibs' 'strip' '!debug')
 source=(https://pypi.python.org/packages/source/p/${_realname}/${_realname}-${pkgver}.tar.gz)
 sha256sums=('7c35c5421a39bb82e58018febd90e3b6e5db34c5443aaaf742b3f33d4655f1c0')
@@ -24,22 +27,20 @@ prepare() {
 
 build() {
   cd "${srcdir}/${_realname}-${pkgver}"
-
-  ${MINGW_PREFIX}/bin/python3 setup.py build
+  ${MINGW_PREFIX}/bin/python setup.py build
 }
 
 check() {
   cd "${srcdir}/${_realname}-${pkgver}"
-
-  ${MINGW_PREFIX}/bin/python3 setup.py check
+  ${MINGW_PREFIX}/bin/python setup.py check
 }
 
 package() {
   cd "${srcdir}/${_realname}-${pkgver}"
 
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
-  ${MINGW_PREFIX}/bin/python3 setup.py install --prefix=${MINGW_PREFIX} \
+  ${MINGW_PREFIX}/bin/python setup.py install --prefix=${MINGW_PREFIX} \
     --root="${pkgdir}" --optimize=1 --skip-build
 
-  install -Dm644 LICENSE "${pkgdir}${MINGW_PREFIX}/share/licenses/python3-${_realname}/LICENSE"
+  install -Dm644 LICENSE "${pkgdir}${MINGW_PREFIX}/share/licenses/python-${_realname}/LICENSE"
 }
diff --git a/mingw-w64-python-pdfrw/PKGBUILD b/mingw-w64-python-pdfrw/PKGBUILD
index e45b2af659..e0ab07b072 100644
--- a/mingw-w64-python-pdfrw/PKGBUILD
+++ b/mingw-w64-python-pdfrw/PKGBUILD
@@ -2,36 +2,44 @@
 
 _realname=pdfrw
 pkgbase=mingw-w64-python-${_realname}
-pkgname=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+pkgname=("${MINGW_PACKAGE_PREFIX}-python-${_realname}")
+provides=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+conflicts=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+replaces=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
 pkgver=0.4
-pkgrel=4
+pkgrel=1
 pkgdesc="Convert restructured text to PDF via reportlab (mingw-w64)"
 arch=('any')
 url='https://github.com/pmaupin/pdfrw'
 license=('MIT')
-depends=("${MINGW_PACKAGE_PREFIX}-python3")
-makedepends=("${MINGW_PACKAGE_PREFIX}-python3-setuptools")
+depends=("${MINGW_PACKAGE_PREFIX}-python")
+makedepends=("${MINGW_PACKAGE_PREFIX}-python-setuptools")
 options=('staticlibs' 'strip' '!debug')
 source=(${_realname}-${pkgver}.tar.gz::"https://github.com/pmaupin/${_realname}/archive/v${pkgver}.tar.gz")
 sha256sums=('f4da059213a0fdf8f63aa3f711cfbc25a5100333514b396f71bb90cb7bd4365f')
 
 
 prepare() {
-  rm -rf python3-build-${CARCH} | true
-  cp -r "${_realname}-${pkgver}" "python3-build-${CARCH}"
+  rm -rf python-build-${CARCH} | true
+  cp -r "${_realname}-${pkgver}" "python-build-${CARCH}"
 }
 
 check() {
-  msg "Python 3 test for ${CARCH}"
-  cd "${srcdir}/python3-build-${CARCH}"
-  ${MINGW_PREFIX}/bin/python3 setup.py check  
+  msg "Python test for ${CARCH}"
+  cd "${srcdir}/python-build-${CARCH}"
+  ${MINGW_PREFIX}/bin/python setup.py check  
+}
+
+build() {
+  cd ${srcdir}/python-build-${CARCH}
+  ${MINGW_PREFIX}/bin/python setup.py build
 }
 
 package() {
-  cd ${srcdir}/python3-build-${CARCH}
+  cd ${srcdir}/python-build-${CARCH}
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
-  ${MINGW_PREFIX}/bin/python3 setup.py install --prefix=${MINGW_PREFIX} \
-    --root="${pkgdir}" --optimize=1
+  ${MINGW_PREFIX}/bin/python setup.py install --prefix=${MINGW_PREFIX} \
+    --root="${pkgdir}" --optimize=1 --skip-build
 
-  install -Dm644 LICENSE.txt "${pkgdir}${MINGW_PREFIX}/share/licenses/python3-${_realname}/LICENSE.txt"
+  install -Dm644 LICENSE.txt "${pkgdir}${MINGW_PREFIX}/share/licenses/python-${_realname}/LICENSE.txt"
 }
diff --git a/mingw-w64-python-pgen2/PKGBUILD b/mingw-w64-python-pgen2/PKGBUILD
index f7737261b1..68b44443b5 100644
--- a/mingw-w64-python-pgen2/PKGBUILD
+++ b/mingw-w64-python-pgen2/PKGBUILD
@@ -5,15 +5,18 @@
 
 _realname=pgen2
 pkgbase=mingw-w64-python-${_realname}
-pkgname=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+pkgname=("${MINGW_PACKAGE_PREFIX}-python-${_realname}")
+provides=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+conflicts=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+replaces=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
 pkgver=0.1.0
-pkgrel=5
+pkgrel=1
 pkgdesc="Pure Python implementation of pgen, the Python parser generator (mingw-w64)"
 arch=('any')
 url='https://github.com/mythonlang/pgen2/'
 license=('MIT')
-depends=("${MINGW_PACKAGE_PREFIX}-python3")
-makedepends=("${MINGW_PACKAGE_PREFIX}-python3-setuptools")
+depends=("${MINGW_PACKAGE_PREFIX}-python")
+makedepends=("${MINGW_PACKAGE_PREFIX}-python-setuptools")
 options=('staticlibs' 'strip' '!debug')
 _dtoken="2f/95/c36839d594d4f58b17e01a8e6f661f96337b546b8e4fd281d166cb5dc22a"
 source=("https://pypi.python.org/packages/${_dtoken}/${_realname}-${pkgver}.tar.gz")
@@ -21,20 +24,18 @@ sha256sums=('a5057017c99eb45512f1cc772bae5953ed64104c1c705f0438aa00d06ee65804')
 
 build() {
   cd "${srcdir}/${_realname}-${pkgver}"
-
-  ${MINGW_PREFIX}/bin/python3 setup.py build
+  ${MINGW_PREFIX}/bin/python setup.py build
 }
 
 check() {
   cd "${srcdir}/${_realname}-${pkgver}"
-
-  ${MINGW_PREFIX}/bin/python3 setup.py check -v -m
+  ${MINGW_PREFIX}/bin/python setup.py check -v -m
 }
 
 package() {
   cd "${srcdir}/${_realname}-${pkgver}"
 
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
-  ${MINGW_PREFIX}/bin/python3 setup.py install --prefix=${MINGW_PREFIX} \
+  ${MINGW_PREFIX}/bin/python setup.py install --prefix=${MINGW_PREFIX} \
     --root="${pkgdir}" --optimize=1 --skip-build
 }
diff --git a/mingw-w64-python-pkginfo/PKGBUILD b/mingw-w64-python-pkginfo/PKGBUILD
index 623dbe8c57..7d53052afb 100644
--- a/mingw-w64-python-pkginfo/PKGBUILD
+++ b/mingw-w64-python-pkginfo/PKGBUILD
@@ -2,17 +2,20 @@
 
 _realname=pkginfo
 pkgbase=mingw-w64-python-${_realname}
-pkgname=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+pkgname=("${MINGW_PACKAGE_PREFIX}-python-${_realname}")
+provides=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+conflicts=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+replaces=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
 pkgver=1.5.0.1
-pkgrel=4
+pkgrel=1
 pkgdesc="Query metadatdata from sdists / bdists / installed packages (mingw-w64)"
 arch=('any')
 url='https://pypi.python.org/pypi/pkginfo'
 license=('PSF')
-depends=("${MINGW_PACKAGE_PREFIX}-python3")
-makedepends=("${MINGW_PACKAGE_PREFIX}-python3-setuptools")
-checkdepends=("${MINGW_PACKAGE_PREFIX}-python3-nose"
-              "${MINGW_PACKAGE_PREFIX}-python3-coverage")
+depends=("${MINGW_PACKAGE_PREFIX}-python")
+makedepends=("${MINGW_PACKAGE_PREFIX}-python-setuptools")
+checkdepends=("${MINGW_PACKAGE_PREFIX}-python-nose"
+              "${MINGW_PACKAGE_PREFIX}-python-coverage")
 install=${_realname}3-${CARCH}.install
 options=('staticlibs' 'strip' '!debug')
 source=("https://pypi.io/packages/source/p/pkginfo/pkginfo-${pkgver}.tar.gz")
@@ -40,41 +43,37 @@ del_file_exists() {
 prepare() {
   cd "${srcdir}"
 
-  rm -rf python3-build-${CARCH} | true
-  cp -r "${_realname}-${pkgver}" "python3-build-${CARCH}"
+  rm -rf python-build-${CARCH} | true
+  cp -r "${_realname}-${pkgver}" "python-build-${CARCH}"
 
   # Set version for setuptools_scm
   export SETUPTOOLS_SCM_PRETEND_VERSION=${pkgver}
 }
 
 build() {
-  msg "Python 3 build for ${CARCH}"  
-  cd "${srcdir}/python3-build-${CARCH}"
-  ${MINGW_PREFIX}/bin/python3 setup.py build
+  msg "Python build for ${CARCH}"  
+  cd "${srcdir}/python-build-${CARCH}"
+  ${MINGW_PREFIX}/bin/python setup.py build
 }
 
 check() {
-  msg "Python 3 test for ${CARCH}"
-  cd "${srcdir}/python3-build-${CARCH}"
+  msg "Python test for ${CARCH}"
+  cd "${srcdir}/python-build-${CARCH}"
   PYTHONPATH="$PWD/build/lib;$PYTHONPATH" ${MINGW_PREFIX}/bin/nosetests3 || warning "Tests failed"
 }
 
 package () {
-  cd "${srcdir}/python3-build-${CARCH}"
+  cd "${srcdir}/python-build-${CARCH}"
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
-  ${MINGW_PREFIX}/bin/python3 setup.py install --prefix=${MINGW_PREFIX} \
+  ${MINGW_PREFIX}/bin/python setup.py install --prefix=${MINGW_PREFIX} \
     --root="${pkgdir}" --optimize=1 --skip-build
 
-  # install -Dm644 LICENSE "${pkgdir}${MINGW_PREFIX}/share/licenses/python3-${_realname}/LICENSE"
+  # install -Dm644 LICENSE "${pkgdir}${MINGW_PREFIX}/share/licenses/python-${_realname}/LICENSE"
 
-  # This entire section should be removed if the package does NOT install
-  # anything in the /mingw*/bin directory.
-  ### begin section ###
   local PREFIX_WIN=$(cygpath -wm ${MINGW_PREFIX})
   # fix python command in files
   for _f in "${pkgdir}${MINGW_PREFIX}"/bin/*.py; do
     sed -e "s|/usr/bin/env |${MINGW_PREFIX}|g" \
         -e "s|${PREFIX_WIN}|${MINGW_PREFIX}|g" -i ${_f}
   done
-  #### end section ####
 }
diff --git a/mingw-w64-python-pptx/PKGBUILD b/mingw-w64-python-pptx/PKGBUILD
index 703d1f610b..a559fddf30 100644
--- a/mingw-w64-python-pptx/PKGBUILD
+++ b/mingw-w64-python-pptx/PKGBUILD
@@ -2,33 +2,36 @@
 
 _realname=pptx
 pkgbase=mingw-w64-python-${_realname}
-pkgname=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+pkgname=("${MINGW_PACKAGE_PREFIX}-python-${_realname}")
+provides=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+conflicts=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+replaces=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
 pkgver=0.6.18
-pkgrel=2
+pkgrel=1
 pkgdesc="Create Open XML PowerPoint documents in Python (mingw-w64)"
 url="https://github.com/scanny/python-pptx"
 arch=('any')
 license=('BSD')
-depends=("${MINGW_PACKAGE_PREFIX}-python3-lxml>=3.1.0"
-         "${MINGW_PACKAGE_PREFIX}-python3-pillow>=2.6.1"
-         "${MINGW_PACKAGE_PREFIX}-python3-xlsxwriter>=0.5.7")
-makedepends=("${MINGW_PACKAGE_PREFIX}-python3-setuptools")
-checkdepends=("${MINGW_PACKAGE_PREFIX}-python3-mock"
-              "${MINGW_PACKAGE_PREFIX}-python3-pyparsing>=2.0.1"
-              "${MINGW_PACKAGE_PREFIX}-python3-pytest")
+depends=("${MINGW_PACKAGE_PREFIX}-python-lxml>=3.1.0"
+         "${MINGW_PACKAGE_PREFIX}-python-pillow>=2.6.1"
+         "${MINGW_PACKAGE_PREFIX}-python-xlsxwriter>=0.5.7")
+makedepends=("${MINGW_PACKAGE_PREFIX}-python-setuptools")
+checkdepends=("${MINGW_PACKAGE_PREFIX}-python-mock"
+              "${MINGW_PACKAGE_PREFIX}-python-pyparsing>=2.0.1"
+              "${MINGW_PACKAGE_PREFIX}-python-pytest")
 source=(${_realname}-${pkgver}.tar.gz::"https://github.com/scanny/python-pptx/archive/v${pkgver}.tar.gz")
 sha256sums=('f427728c4f5f3a0d28f8d1fb6d2f8c56fe133acf1161cd16083c294e10071bc0')
 
 build() {
   cd "${srcdir}/python-pptx-${pkgver}"
-
-  python3 setup.py build
+  ${MINGW_PREFIX}/bin/python setup.py build
 }
 
 package() {
   cd "${srcdir}/python-pptx-${pkgver}"
 
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
-  ${MINGW_PREFIX}/bin/python3 setup.py install --root=${pkgdir} --prefix=${MINGW_PREFIX} --optimize=1
-  install -Dm644 LICENSE ${pkgdir}${MINGW_PREFIX}/share/licenses/python3-${_realname}/LICENSE
+  ${MINGW_PREFIX}/bin/python setup.py install --root=${pkgdir} --prefix=${MINGW_PREFIX} --optimize=1 --skip-build
+
+  install -Dm644 LICENSE ${pkgdir}${MINGW_PREFIX}/share/licenses/python-${_realname}/LICENSE
 }
diff --git a/mingw-w64-python-protobuf/PKGBUILD b/mingw-w64-python-protobuf/PKGBUILD
index e9c4db2d29..829988a7b3 100644
--- a/mingw-w64-python-protobuf/PKGBUILD
+++ b/mingw-w64-python-protobuf/PKGBUILD
@@ -2,21 +2,24 @@
 
 _realname=protobuf
 pkgbase=mingw-w64-python-${_realname}
-pkgname=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
-pkgver=3.10.1
-pkgrel=2
-pkgdesc="Protocol Buffers. (mingw-w64)"
+pkgname=("${MINGW_PACKAGE_PREFIX}-python-${_realname}")
+provides=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+conflicts=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+replaces=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+pkgver=3.11.2
+pkgrel=1
+pkgdesc="Protocol Buffers (mingw-w64)"
 arch=('any')
 url="https://github.com/protocolbuffers/protobuf"
 license=('3-Clause BSD License')
-depends=("${MINGW_PACKAGE_PREFIX}-python3"
-         "${MINGW_PACKAGE_PREFIX}-python3-six"
-         "${MINGW_PACKAGE_PREFIX}-python3-setuptools")
-makedepends=("${MINGW_PACKAGE_PREFIX}-python3-setuptools"
+depends=("${MINGW_PACKAGE_PREFIX}-python"
+         "${MINGW_PACKAGE_PREFIX}-python-six"
+         "${MINGW_PACKAGE_PREFIX}-python-setuptools")
+makedepends=("${MINGW_PACKAGE_PREFIX}-python-setuptools"
              "${MINGW_PACKAGE_PREFIX}-protobuf=${pkgver}")
 _archive=${_realname/_/-}-${pkgver}
 source=(${_archive}.tar.gz::https://github.com/protocolbuffers/protobuf/archive/v${pkgver}.tar.gz)
-sha256sums=('6adf73fd7f90409e479d6ac86529ade2d45f50494c5c10f539226693cb8fe4f7')
+sha256sums=('e8c7601439dbd4489fe5069c33d374804990a56c2f710e00227ee5d8fd650e67')
 noextract=(${_archive}.tar.gz)
 
 prepare() {
@@ -25,15 +28,14 @@ prepare() {
 
 build() {
   cd "${srcdir}/${_archive}/python"
-
-  ${MINGW_PREFIX}/bin/python3 setup.py --quiet build
+  ${MINGW_PREFIX}/bin/python setup.py --quiet build
 }
 
 package() {
   cd "${srcdir}/${_archive}/python"
 
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
-    ${MINGW_PREFIX}/bin/python3 setup.py --quiet install --prefix=${MINGW_PREFIX} --root="${pkgdir}" -O1
+    ${MINGW_PREFIX}/bin/python setup.py --quiet install --prefix=${MINGW_PREFIX} --root="${pkgdir}" -O1
 
-  install -Dm644 ../LICENSE "${pkgdir}${MINGW_PREFIX}/share/licenses/python3-${_realname}/LICENSE"
+  install -Dm644 ../LICENSE "${pkgdir}${MINGW_PREFIX}/share/licenses/python-${_realname}/LICENSE"
 }
diff --git a/mingw-w64-python-psycopg2/PKGBUILD b/mingw-w64-python-psycopg2/PKGBUILD
index bdd311db02..ef3053a10f 100644
--- a/mingw-w64-python-psycopg2/PKGBUILD
+++ b/mingw-w64-python-psycopg2/PKGBUILD
@@ -2,17 +2,20 @@
 
 _realname=psycopg2
 pkgbase=mingw-w64-python-${_realname}
-pkgname=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+pkgname=("${MINGW_PACKAGE_PREFIX}-python-${_realname}")
+provides=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+conflicts=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+replaces=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
 pkgver=2.8.4
-pkgrel=3
+pkgrel=1
 pkgdesc="A PostgreSQL database adapter for the Python programming language (mingw-w64)"
 arch=('any')
 url='http://initd.org/psycopg/'
 license=('LGPL3')
 validpgpkeys=('8AD609956CF1899418E19A856013BD3AFCF957DE')
-depends=("${MINGW_PACKAGE_PREFIX}-python3"
+depends=("${MINGW_PACKAGE_PREFIX}-python"
          "${MINGW_PACKAGE_PREFIX}-postgresql>=8.4.1")
-makedepends=("${MINGW_PACKAGE_PREFIX}-python3-setuptools")
+makedepends=("${MINGW_PACKAGE_PREFIX}-python-setuptools")
 options=('staticlibs' 'strip' '!debug')
 source=(http://initd.org/psycopg/tarballs/PSYCOPG-2-8/psycopg2-$pkgver.tar.gz{,.asc}
 mingw-fix.patch)
@@ -43,6 +46,7 @@ del_file_exists() {
 prepare() {
   cd "${srcdir}/${_realname}-${pkgver}"
   apply_patch_with_msg mingw-fix.patch
+
   cd ${srcdir}
   rm -rf python-build-${CARCH} | true
   cp -r "${_realname}-${pkgver}" "python-build-${CARCH}"
diff --git a/mingw-w64-python-pyamg/PKGBUILD b/mingw-w64-python-pyamg/PKGBUILD
index 5f672f3711..c1d80ab370 100644
--- a/mingw-w64-python-pyamg/PKGBUILD
+++ b/mingw-w64-python-pyamg/PKGBUILD
@@ -2,17 +2,20 @@
 
 _realname=pyamg
 pkgbase=mingw-w64-python-${_realname}
-pkgname=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+pkgname=("${MINGW_PACKAGE_PREFIX}-python-${_realname}")
+provides=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+conflicts=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+replaces=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
 pkgver=4.0.0
-pkgrel=3
+pkgrel=1
 pkgdesc="PyAMG: Algebraic Multigrid Solvers in Python (mingw-w64)"
 arch=('any')
 license=('MIT')
 url="https://github.com/pyamg/pyamg"
-depends=("${MINGW_PACKAGE_PREFIX}-python3"
-         "${MINGW_PACKAGE_PREFIX}-python3-scipy"
-         "${MINGW_PACKAGE_PREFIX}-python3-numpy")
-makedepends=("${MINGW_PACKAGE_PREFIX}-python3-setuptools"
+depends=("${MINGW_PACKAGE_PREFIX}-python"
+         "${MINGW_PACKAGE_PREFIX}-python-scipy"
+         "${MINGW_PACKAGE_PREFIX}-python-numpy")
+makedepends=("${MINGW_PACKAGE_PREFIX}-python-setuptools"
              "${MINGW_PACKAGE_PREFIX}-pybind11")
 source=("${_realname}-${pkgver}.tar.gz"::"https://github.com/pyamg/pyamg/archive/v${pkgver}.tar.gz")
 sha256sums=('2c76692b957e61551126d72e24e5fab136962d47badc8c78b6f1782a69303c40')
@@ -25,13 +28,12 @@ prepare() {
 
 build() {
   cd "${srcdir}/${_realname}-${pkgver}"
-
-  ${MINGW_PREFIX}/bin/python3 setup.py build
+  ${MINGW_PREFIX}/bin/python setup.py build
 }
 
 package() {
   cd "${srcdir}/${_realname}-${pkgver}"
 
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
-  ${MINGW_PREFIX}/bin/python3 setup.py install --prefix=${MINGW_PREFIX} --root="${pkgdir}" -O1
+  ${MINGW_PREFIX}/bin/python setup.py install --prefix=${MINGW_PREFIX} --root="${pkgdir}" -O1 --skip-build
 }
diff --git a/mingw-w64-python-pyglet/PKGBUILD b/mingw-w64-python-pyglet/PKGBUILD
index 9f984c1e61..4bb5b4133c 100644
--- a/mingw-w64-python-pyglet/PKGBUILD
+++ b/mingw-w64-python-pyglet/PKGBUILD
@@ -3,20 +3,23 @@
 
 _realname=pyglet
 pkgbase=mingw-w64-python-${_realname}
-pkgname=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
-pkgver=1.4.6
-pkgrel=2
+pkgname=("${MINGW_PACKAGE_PREFIX}-python-${_realname}")
+provides=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+conflicts=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+replaces=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+pkgver=1.4.8
+pkgrel=1
 pkgdesc="A cross-platform windowing and multimedia library for Python (mingw-w64)"
 arch=('any')
 url='https://github.com/pyglet/pyglet'
 license=('BSD')
 validpgpkeys=('gpg_KEY')
-depends=("${MINGW_PACKAGE_PREFIX}-python3"
-         "${MINGW_PACKAGE_PREFIX}-python3-future")
-makedepends=("${MINGW_PACKAGE_PREFIX}-python3-setuptools")
+depends=("${MINGW_PACKAGE_PREFIX}-python"
+         "${MINGW_PACKAGE_PREFIX}-python-future")
+makedepends=("${MINGW_PACKAGE_PREFIX}-python-setuptools")
 options=('staticlibs' 'strip' '!debug')
 source=("${_realname}-${pkgver}.tar.gz::https://github.com/pyglet/pyglet/archive/v${pkgver}.tar.gz")
-sha256sums=('60c654d8183e2e0d8538059ef0818d7157a4429405d87b71ba8c6be67dc45fcd')
+sha256sums=('8fc28bc4227bbd7d0580e4446c97f1a204b045566f831f16bfd0f0530e0dc69f')
 
 prepare() {
   cd "${srcdir}/${_realname}-${pkgver}"
@@ -27,22 +30,20 @@ prepare() {
 
 build() {
   cd "${srcdir}/${_realname}-${pkgver}"
-
-  ${MINGW_PREFIX}/bin/python3 setup.py build
+  ${MINGW_PREFIX}/bin/python setup.py build
 }
 
 check() {
   cd "${srcdir}/${_realname}-${pkgver}"
-
-  ${MINGW_PREFIX}/bin/python3 setup.py check
+  ${MINGW_PREFIX}/bin/python setup.py check
 }
 
 package() {
   cd "${srcdir}/${_realname}-${pkgver}"
 
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
-  ${MINGW_PREFIX}/bin/python3 setup.py install --prefix=${MINGW_PREFIX} \
+  ${MINGW_PREFIX}/bin/python setup.py install --prefix=${MINGW_PREFIX} \
     --root="${pkgdir}" --optimize=1 --skip-build
 
-  install -Dm644 LICENSE "${pkgdir}${MINGW_PREFIX}/share/licenses/python3-${_realname}/LICENSE"
+  install -Dm644 LICENSE "${pkgdir}${MINGW_PREFIX}/share/licenses/python-${_realname}/LICENSE"
 }
diff --git a/mingw-w64-python-pynacl/PKGBUILD b/mingw-w64-python-pynacl/PKGBUILD
index 4630afba75..5bc3fc96fb 100644
--- a/mingw-w64-python-pynacl/PKGBUILD
+++ b/mingw-w64-python-pynacl/PKGBUILD
@@ -2,16 +2,19 @@
 
 _realname=pynacl
 pkgbase=mingw-w64-python-${_realname}
-pkgname=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+pkgname=("${MINGW_PACKAGE_PREFIX}-python-${_realname}")
+provides=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+conflicts=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+replaces=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
 pkgver=1.3.0
-pkgrel=3
+pkgrel=1
 pkgdesc="Python binding to the Networking and Cryptography (NaCl) library (mingw-w64)"
 arch=('any')
 url='https://github.com/pyca/pynacl/'
 license=('Apache-2.0')
-depends=("${MINGW_PACKAGE_PREFIX}-python3")
-makedepends=("${MINGW_PACKAGE_PREFIX}-python3-setuptools"
-             "${MINGW_PACKAGE_PREFIX}-python3-cffi"
+depends=("${MINGW_PACKAGE_PREFIX}-python")
+makedepends=("${MINGW_PACKAGE_PREFIX}-python-setuptools"
+             "${MINGW_PACKAGE_PREFIX}-python-cffi"
              "${MINGW_PACKAGE_PREFIX}-libsodium")
 options=('staticlibs' 'strip' '!debug')
 source=("${_realname}-${pkgver}.tar.gz"::"https://github.com/pyca/pynacl/archive/${pkgver}.tar.gz")
@@ -28,21 +31,20 @@ build() {
   cd "${srcdir}/${_realname}-${pkgver}"
 
   #Use system libsodium here
-  SODIUM_INSTALL=system ${MINGW_PREFIX}/bin/python3 setup.py build
+  SODIUM_INSTALL=system ${MINGW_PREFIX}/bin/python setup.py build
 }
 
 check() {
   cd "${srcdir}/${_realname}-${pkgver}"
-
-  ${MINGW_PREFIX}/bin/python3 setup.py check
+  ${MINGW_PREFIX}/bin/python setup.py check
 }
 
 package() {
   cd "${srcdir}/${_realname}-${pkgver}"
 
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
-  ${MINGW_PREFIX}/bin/python3 setup.py install --prefix=${MINGW_PREFIX} \
+  ${MINGW_PREFIX}/bin/python setup.py install --prefix=${MINGW_PREFIX} \
     --root="${pkgdir}" --optimize=1 --skip-build
 
-  install -Dm644 LICENSE "${pkgdir}${MINGW_PREFIX}/share/licenses/python3-${_realname}/COPYING"
+  install -Dm644 LICENSE "${pkgdir}${MINGW_PREFIX}/share/licenses/python-${_realname}/COPYING"
 }
diff --git a/mingw-w64-python-python_ics/PKGBUILD b/mingw-w64-python-python_ics/PKGBUILD
index 3b7d3e5b37..8a00ecd784 100644
--- a/mingw-w64-python-python_ics/PKGBUILD
+++ b/mingw-w64-python-python_ics/PKGBUILD
@@ -2,16 +2,19 @@
 
 _realname=python_ics
 pkgbase=mingw-w64-python2-${_realname}
-pkgname=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+pkgname=("${MINGW_PACKAGE_PREFIX}-python-${_realname}")
+provides=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+conflicts=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+replaces=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
 pkgver=4.3
 pkgrel=1
 pkgdesc="Python C Code module for interfacing to the icsneo40 dynamic library (mingw-w64)"
 arch=('any')
 url='https://github.com/intrepidcs/python_ics/'
 license=('MIT')
-depends=("${MINGW_PACKAGE_PREFIX}-python3")
-makedepends=("${MINGW_PACKAGE_PREFIX}-python3"
-             "${MINGW_PACKAGE_PREFIX}-python3-setuptools")
+depends=("${MINGW_PACKAGE_PREFIX}-python")
+makedepends=("${MINGW_PACKAGE_PREFIX}-python"
+             "${MINGW_PACKAGE_PREFIX}-python-setuptools")
 options=('staticlibs' 'strip' '!debug')
 source=("${_realname}-${pkgver}.tar.gz"::"https://github.com/intrepidcs/python_ics/archive/v${pkgver}.tar.gz"
         mingw-build.patch)
@@ -23,19 +26,19 @@ prepare() {
   patch -p1 -i ${srcdir}/mingw-build.patch
 
   cd "${srcdir}"
-  cp -r "${_realname}-${pkgver}" "python3-build-${CARCH}"
+  cp -r "${_realname}-${pkgver}" "python-build-${CARCH}"
 }
 
 build() {
-  cd "${srcdir}/python3-build-${CARCH}"
-  ${MINGW_PREFIX}/bin/python3 setup.py build
+  cd "${srcdir}/python-build-${CARCH}"
+  ${MINGW_PREFIX}/bin/python setup.py build
 }
 
 package() {
-  cd "${srcdir}/python3-build-${CARCH}"
+  cd "${srcdir}/python-build-${CARCH}"
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
-  ${MINGW_PREFIX}/bin/python3 setup.py install --prefix=${MINGW_PREFIX} \
+  ${MINGW_PREFIX}/bin/python setup.py install --prefix=${MINGW_PREFIX} \
     --root="${pkgdir}" --optimize=1 --skip-build
 
-  #install -Dm644 LICENSE.txt "${pkgdir}${MINGW_PREFIX}/share/licenses/python3-${_realname}/LICENSE.txt"
+  #install -Dm644 LICENSE.txt "${pkgdir}${MINGW_PREFIX}/share/licenses/python-${_realname}/LICENSE.txt"
 }
diff --git a/mingw-w64-python-pywavelets/PKGBUILD b/mingw-w64-python-pywavelets/PKGBUILD
index 221664a3d8..9b3c65baeb 100644
--- a/mingw-w64-python-pywavelets/PKGBUILD
+++ b/mingw-w64-python-pywavelets/PKGBUILD
@@ -3,33 +3,39 @@
 _pyname=pywt
 _realname=pywavelets
 pkgbase=mingw-w64-python-${_realname}
-pkgname=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+pkgname=("${MINGW_PACKAGE_PREFIX}-python-${_realname}")
+provides=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+conflicts=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+replaces=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
 pkgver=1.1.1
 pkgrel=1
 pkgdesc="Discrete Wavelet Transforms in Python (mingw-w64)"
 arch=('any')
 license=('MIT')
 url="https://github.com/PyWavelets/pywt"
-depends=("${MINGW_PACKAGE_PREFIX}-python3-numpy"
-         "${MINGW_PACKAGE_PREFIX}-python3")
-makedepends=("${MINGW_PACKAGE_PREFIX}-python3-setuptools"
+depends=("${MINGW_PACKAGE_PREFIX}-python-numpy"
+         "${MINGW_PACKAGE_PREFIX}-python")
+makedepends=("${MINGW_PACKAGE_PREFIX}-python-setuptools"
              "${MINGW_PACKAGE_PREFIX}-cython")
 source=("${_realname}-${pkgver}.tar.gz"::"https://github.com/PyWavelets/${_pyname}/archive/v${pkgver}.tar.gz")
 sha256sums=('50fe2aae1b6d2462cf9e9b0dcc18dbcbd0b5ed65225abb4a272ed188dbcbceb0')
 
+prepare() {
+  rm -rf python-build-${CARCH}
+  cp -r "${_pyname}-${pkgver}" "python-build-${CARCH}"
+}
+
 build() {
-  msg "Python 3 build for ${CARCH}"
-  rm -rf python3-build-${CARCH}
-  cp -r "${_pyname}-${pkgver}" "python3-build-${CARCH}"
-  cd "${srcdir}/python3-build-${CARCH}"
-  ${MINGW_PREFIX}/bin/python3 setup.py build
+  msg "Python build for ${CARCH}"
+  cd "${srcdir}/python-build-${CARCH}"
+  ${MINGW_PREFIX}/bin/python setup.py build
 }
 
 package() {
-  cd "${srcdir}/python3-build-${CARCH}"
+  cd "${srcdir}/python-build-${CARCH}"
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
-  ${MINGW_PREFIX}/bin/python3 setup.py install --prefix=${MINGW_PREFIX} \
+  ${MINGW_PREFIX}/bin/python setup.py install --prefix=${MINGW_PREFIX} \
     --root="${pkgdir}" --optimize=1 --skip-build
 
-  install -Dm644 LICENSE "${pkgdir}${MINGW_PREFIX}/share/licenses/python3-${_realname}/LICENSE"
+  install -Dm644 LICENSE "${pkgdir}${MINGW_PREFIX}/share/licenses/python-${_realname}/LICENSE"
 }
diff --git a/mingw-w64-python-regex/PKGBUILD b/mingw-w64-python-regex/PKGBUILD
index 29caffc9ad..a1e99b94c7 100644
--- a/mingw-w64-python-regex/PKGBUILD
+++ b/mingw-w64-python-regex/PKGBUILD
@@ -2,50 +2,51 @@
 
 _realname=regex
 pkgbase=mingw-w64-python-${_realname}
-pkgname=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
-pkgver=2019.08.19
-pkgrel=2
+pkgname=("${MINGW_PACKAGE_PREFIX}-python-${_realname}")
+provides=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+conflicts=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+replaces=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+pkgver=2019.12.20
+pkgrel=1
 pkgdesc="Alternative python regular expression module. (mingw-w64)"
 arch=('any')
 url='https://www.regex.org/'
 license=('Python')
-depends=("${MINGW_PACKAGE_PREFIX}-python3")
-makedepends=("${MINGW_PACKAGE_PREFIX}-python3-setuptools")
+depends=("${MINGW_PACKAGE_PREFIX}-python")
+makedepends=("${MINGW_PACKAGE_PREFIX}-python-setuptools")
 options=('staticlibs' 'strip' '!debug')
 source=("https://files.pythonhosted.org/packages/source/r/${_realname}/${_realname}-${pkgver}.tar.gz")
-sha256sums=('587b62d48ca359d2d4f02d486f1f0aa9a20fbaf23a9d4198c4bed72ab2f6c849')
+sha256sums=('106e25a841921d8259dcef2a42786caae35bc750fb996f830065b3dfaa67b77e')
 
 prepare() {
   cd "${srcdir}/${_realname}-${pkgver}"
 
   # Set version for setuptools_scm
-  export SETUPTOOLS_SCM_PRETEND_VERSION=$pkgver
+  export SETUPTOOLS_SCM_PRETEND_VERSION=${pkgver}
 }
 
 build() {
   cd "${srcdir}/${_realname}-${pkgver}"
-
-  ${MINGW_PREFIX}/bin/python3 setup.py build
+  ${MINGW_PREFIX}/bin/python setup.py build
 }
 
 check() {
   cd "${srcdir}/${_realname}-${pkgver}"
-
-  ${MINGW_PREFIX}/bin/python3 -c 'from regex.test.test_regex import test_main; test_main()'
+  ${MINGW_PREFIX}/bin/python -c 'from regex.test.test_regex import test_main; test_main()'
 }
 
 package() {
   cd "${srcdir}/${_realname}-${pkgver}"
 
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
-  ${MINGW_PREFIX}/bin/python3 setup.py install --prefix=${MINGW_PREFIX} \
+  ${MINGW_PREFIX}/bin/python setup.py install --prefix=${MINGW_PREFIX} \
     --root="${pkgdir}" --optimize=1 --skip-build
 
-  sed -n '1,/^$/p' ./regex_2/regex/regex.py > ./LICENSE
-  install -Dm644 ./LICENSE "${pkgdir}${MINGW_PREFIX}/share/licenses/python3-${_realname}/LICENSE"
+  sed -n '1,/^$/p' regex_2/regex.py > LICENSE
+  install -Dm644 LICENSE "${pkgdir}${MINGW_PREFIX}/share/licenses/python-${_realname}/LICENSE"
 
-  install -v -m755 -d "${pkgdir}${MINGW_PREFIX}/share/doc/python3-regex"
-  install -v -m644 ./docs/Features.html "${pkgdir}${MINGW_PREFIX}/share/doc/python3-regex/"
-  install -v -m644 ./docs/Features.rst "${pkgdir}${MINGW_PREFIX}/share/doc/python3-regex/"
-  install -v -m644 ./docs/UnicodeProperties.txt "${pkgdir}${MINGW_PREFIX}/share/doc/python3-regex/"
+  install -v -m755 -d "${pkgdir}${MINGW_PREFIX}/share/doc/python-regex"
+  install -v -m644 docs/Features.html "${pkgdir}${MINGW_PREFIX}/share/doc/python-regex/"
+  install -v -m644 docs/Features.rst "${pkgdir}${MINGW_PREFIX}/share/doc/python-regex/"
+  install -v -m644 docs/UnicodeProperties.rst "${pkgdir}${MINGW_PREFIX}/share/doc/python-regex/"
 }
diff --git a/mingw-w64-python-reportlab/PKGBUILD b/mingw-w64-python-reportlab/PKGBUILD
index 6ab8e6fb82..a47f592257 100644
--- a/mingw-w64-python-reportlab/PKGBUILD
+++ b/mingw-w64-python-reportlab/PKGBUILD
@@ -3,17 +3,20 @@
 
 _realname=reportlab
 pkgbase=mingw-w64-python-${_realname}
-pkgname=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+pkgname=("${MINGW_PACKAGE_PREFIX}-python-${_realname}")
 pkgver=3.5.32
-pkgrel=2
+pkgrel=1
+provides=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}=${pkgver}")
+conflicts=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+replaces=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
 pkgdesc="A proven industry-strength PDF generating solution (mingw-w64)"
 arch=('any')
 license=('custom')
 url="https://bitbucket.org/rptlab/reportlab"
 depends=("${MINGW_PACKAGE_PREFIX}-freetype"
-         "${MINGW_PACKAGE_PREFIX}-python3-pip"
-         "${MINGW_PACKAGE_PREFIX}-python3-Pillow")
-makedepends=("${MINGW_PACKAGE_PREFIX}-python3-setuptools")
+         "${MINGW_PACKAGE_PREFIX}-python-pip"
+         "${MINGW_PACKAGE_PREFIX}-python-pillow")
+makedepends=("${MINGW_PACKAGE_PREFIX}-python-setuptools")
 source=(https://files.pythonhosted.org/packages/source/${_realname::1}/${_realname}/${_realname}-${pkgver}.tar.gz
         "0001-Do-not-specialcase-quote-LIBART_VERSION-on-Windows.patch")
 sha256sums=('83ef44936ef4e9c432d62bc2b72ec8d772b87af319d123e827a72e9b6884c851'
@@ -24,30 +27,30 @@ prepare() {
     patch -p1 < ${srcdir}/0001-Do-not-specialcase-quote-LIBART_VERSION-on-Windows.patch
   popd
 
-  rm -rf python3-build-${CARCH} | true
-  cp -r "${_realname}-${pkgver}" "python3-build-${CARCH}"
+  rm -rf python-build-${CARCH} | true
+  cp -r "${_realname}-${pkgver}" "python-build-${CARCH}"
 }
 
 build() {
   export FT_LIB=${MINGW_PREFIX}/lib/libfreetype.a
   export FT_INC=${MINGW_PREFIX}/include/freetype2
 
-  msg "Python 3 build for ${CARCH}"  
-  cd "${srcdir}/python3-build-${CARCH}"
-  ${MINGW_PREFIX}/bin/python3 setup.py build
+  msg "Python build for ${CARCH}"  
+  cd "${srcdir}/python-build-${CARCH}"
+  ${MINGW_PREFIX}/bin/python setup.py build
 }
 
 check() {
-  msg "Python 3 test for ${CARCH}"
-  # cd "${srcdir}/python3-build-${CARCH}"
-  # ${MINGW_PREFIX}/bin/python3 setup.py tests
+  msg "Python test for ${CARCH}"
+  # cd "${srcdir}/python-build-${CARCH}"
+  # ${MINGW_PREFIX}/bin/python setup.py tests
 }
 
 package() {
-  cd "${srcdir}/python3-build-${CARCH}"
+  cd "${srcdir}/python-build-${CARCH}"
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
-    ${MINGW_PREFIX}/bin/python3 setup.py install --prefix=${MINGW_PREFIX#\/} --root="${pkgdir}" --optimize=1 --skip-build
+    ${MINGW_PREFIX}/bin/python setup.py install --prefix=${MINGW_PREFIX#\/} --root="${pkgdir}" --optimize=1 --skip-build
 
   install -Dm644 src/reportlab/license.txt \
-    "${pkgdir}${MINGW_PREFIX}"/share/licenses/python3-${_realname}/LICENSE
+    "${pkgdir}${MINGW_PREFIX}"/share/licenses/python-${_realname}/LICENSE
 }
diff --git a/mingw-w64-python-rfc3986/PKGBUILD b/mingw-w64-python-rfc3986/PKGBUILD
index ad06ee77ef..2dcf4394b1 100644
--- a/mingw-w64-python-rfc3986/PKGBUILD
+++ b/mingw-w64-python-rfc3986/PKGBUILD
@@ -2,16 +2,19 @@
 
 _realname=rfc3986
 pkgbase=mingw-w64-python-${_realname}
-pkgname=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+pkgname=("${MINGW_PACKAGE_PREFIX}-python-${_realname}")
+provides=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+conflicts=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+replaces=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
 pkgver=1.3.2
-pkgrel=3
+pkgrel=1
 pkgdesc="Validating URI References per RFC 3986 (mingw-w64)"
 arch=('any')
 url='https://rfc3986.readthedocs.org/'
 license=('Apache')
-depends=("${MINGW_PACKAGE_PREFIX}-python3")
-makedepends=("${MINGW_PACKAGE_PREFIX}-python3-setuptools")
-checkdepends=("${MINGW_PACKAGE_PREFIX}-python3-pytest-runner")
+depends=("${MINGW_PACKAGE_PREFIX}-python")
+makedepends=("${MINGW_PACKAGE_PREFIX}-python-setuptools")
+checkdepends=("${MINGW_PACKAGE_PREFIX}-python-pytest-runner")
 source=("https://pypi.io/packages/source/r/rfc3986/rfc3986-${pkgver}.tar.gz")
 sha512sums=('c086c55295d80ccf33dbfeff06059303119e7a407bfc405b7f75ec30413221ec58d3061d75fd3ca696b7acf9b1be1dfcc785e01280bf659a53be43ab1f300b15')
 
@@ -24,20 +27,18 @@ prepare() {
 
 build() {
   cd "${srcdir}/${_realname}-${pkgver}"
-
-  ${MINGW_PREFIX}/bin/python3 setup.py build
+  ${MINGW_PREFIX}/bin/python setup.py build
 }
 
 check() {
   cd "${srcdir}/${_realname}-${pkgver}"
-
-  ${MINGW_PREFIX}/bin/python3 setup.py pytest
+  ${MINGW_PREFIX}/bin/python setup.py pytest
 }
 
 package() {
   cd "${srcdir}/${_realname}-${pkgver}"
 
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
-  ${MINGW_PREFIX}/bin/python3 setup.py install --prefix=${MINGW_PREFIX} \
+  ${MINGW_PREFIX}/bin/python setup.py install --prefix=${MINGW_PREFIX} \
     --root="${pkgdir}" --optimize=1 --skip-build
 }
diff --git a/mingw-w64-python-rfc3987/PKGBUILD b/mingw-w64-python-rfc3987/PKGBUILD
index 56150a728d..ca86370f88 100644
--- a/mingw-w64-python-rfc3987/PKGBUILD
+++ b/mingw-w64-python-rfc3987/PKGBUILD
@@ -2,15 +2,18 @@
 
 _realname=rfc3987
 pkgbase=mingw-w64-python-${_realname}
-pkgname=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+pkgname=("${MINGW_PACKAGE_PREFIX}-python-${_realname}")
+provides=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+conflicts=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+replaces=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
 pkgver=1.3.8
-pkgrel=3
+pkgrel=1
 pkgdesc="Parsing and validation of URIs (RFC 3986) and IRIs (RFC 3987) (mingw-w64)"
 arch=('any')
 url='https://pypi.python.org/pypi/rfc3987'
 license=('GPL')
-depends=("${MINGW_PACKAGE_PREFIX}-python3")
-makedepends=("${MINGW_PACKAGE_PREFIX}-python3-setuptools")
+depends=("${MINGW_PACKAGE_PREFIX}-python")
+makedepends=("${MINGW_PACKAGE_PREFIX}-python-setuptools")
 options=('staticlibs' 'strip' '!debug')
 source=("https://pypi.io/packages/source/r/rfc3987/rfc3987-${pkgver}.tar.gz")
 sha512sums=('0e81b8dbc8c410f08b1efa7ee1c90174ed6e70bf7622d3748f598d383583b439908e1b5da1e1a1eb22af4f214ae08680a29f00b253f37808034bae8a1808c32c')
@@ -24,15 +27,13 @@ prepare() {
 
 build() {
   cd "${srcdir}/${_realname}-${pkgver}"
-
-  ${MINGW_PREFIX}/bin/python3 setup.py build
+  ${MINGW_PREFIX}/bin/python setup.py build
 }
 
 package() {
   cd "${srcdir}/${_realname}-${pkgver}"
 
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
-  ${MINGW_PREFIX}/bin/python3 setup.py install --prefix=${MINGW_PREFIX} \
+  ${MINGW_PREFIX}/bin/python setup.py install --prefix=${MINGW_PREFIX} \
     --root="${pkgdir}" --optimize=1 --skip-build
-
 }
diff --git a/mingw-w64-python-rst2pdf/PKGBUILD b/mingw-w64-python-rst2pdf/PKGBUILD
index c672b52aa2..e7a2271cef 100644
--- a/mingw-w64-python-rst2pdf/PKGBUILD
+++ b/mingw-w64-python-rst2pdf/PKGBUILD
@@ -1,46 +1,54 @@
 _pyname=rst2pdf
 _realname=rst2pdf
 pkgbase=mingw-w64-python-${_realname}
-pkgname=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
-provides=("${MINGW_PACKAGE_PREFIX}-rst2pdf")
+pkgname=("${MINGW_PACKAGE_PREFIX}-python-${_realname}")
+provides=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}"
+          "${MINGW_PACKAGE_PREFIX}-rst2pdf")
+conflicts=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+replaces=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
 pkgver=0.93
-pkgrel=6
+pkgrel=1
 pkgdesc="Create PDFs from simple text markup, no LaTeX required (mingw-w64)"
 arch=('any')
 url='https://github.com/ralsina/rst2pdf'
 license=('MIT')
-depends=("${MINGW_PACKAGE_PREFIX}-python3"
-         "${MINGW_PACKAGE_PREFIX}-python3-docutils"
-         "${MINGW_PACKAGE_PREFIX}-python3-pdfrw"
-         "${MINGW_PACKAGE_PREFIX}-python3-pygments"
-         "${MINGW_PACKAGE_PREFIX}-python3-reportlab>=2.4"
-         "${MINGW_PACKAGE_PREFIX}-python3-setuptools")
+depends=("${MINGW_PACKAGE_PREFIX}-python"
+         "${MINGW_PACKAGE_PREFIX}-python-docutils"
+         "${MINGW_PACKAGE_PREFIX}-python-pdfrw"
+         "${MINGW_PACKAGE_PREFIX}-python-pygments"
+         "${MINGW_PACKAGE_PREFIX}-python-reportlab>=2.4"
+         "${MINGW_PACKAGE_PREFIX}-python-setuptools")
 options=('staticlibs' 'strip' '!debug')
 source=(${_realname}-${pkgver}.tar.gz::"https://github.com/${_realname}/${_realname}/archive/${pkgver}.tar.gz")
 sha256sums=('37e99ea103790321b29b6f6b0192821ba9c2990a6aec57295585ca6919932a97')
 
 prepare() {
-  rm -rf python3-build-${CARCH}| true
-  cp -r "${_pyname}-${pkgver}" "python3-build-${CARCH}"
+  rm -rf python-build-${CARCH}| true
+  cp -r "${_pyname}-${pkgver}" "python-build-${CARCH}"
 }
 
 check() {
-  msg "Python 3 test for ${CARCH}"
-  cd "${srcdir}/python3-build-${CARCH}"
-  ${MINGW_PREFIX}/bin/python3 setup.py check
+  msg "Python test for ${CARCH}"
+  cd "${srcdir}/python-build-${CARCH}"
+  ${MINGW_PREFIX}/bin/python setup.py check
 
-  ${MINGW_PREFIX}/bin/2to3 -w "${srcdir}/python3-build"
+  ${MINGW_PREFIX}/bin/2to3 -w "${srcdir}/python-build"
+}
+
+build() {
+  cd "${srcdir}/python-build-${CARCH}"
+  ${MINGW_PREFIX}/bin/python setup.py build
 }
 
 package() {
   local _mingw_prefix=$(cygpath -am ${MINGW_PREFIX})
   
-  cd "${srcdir}/python3-build-${CARCH}"
+  cd "${srcdir}/python-build-${CARCH}"
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
-  ${MINGW_PREFIX}/bin/python3 setup.py install --prefix=${MINGW_PREFIX} \
-    --root="${pkgdir}" --optimize=1
+  ${MINGW_PREFIX}/bin/python setup.py install --prefix=${MINGW_PREFIX} \
+    --root="${pkgdir}" --optimize=1 --skip-build
 
-  install -Dm644 LICENSE.txt "${pkgdir}${MINGW_PREFIX}/share/licenses/python3-${_realname}/LICENSE.txt"
+  install -Dm644 LICENSE.txt "${pkgdir}${MINGW_PREFIX}/share/licenses/python-${_realname}/LICENSE.txt"
 
   # fix python command in files
   cd "${pkgdir}${MINGW_PREFIX}/bin"
diff --git a/mingw-w64-python-scikit-learn/002-openmp-cleanup-wait.patch b/mingw-w64-python-scikit-learn/002-openmp-cleanup-wait.patch
index 6c832f7630..f248be553e 100644
--- a/mingw-w64-python-scikit-learn/002-openmp-cleanup-wait.patch
+++ b/mingw-w64-python-scikit-learn/002-openmp-cleanup-wait.patch
@@ -1,6 +1,6 @@
 To prevent rmtree() erroring out because of external file scanners
---- scikit-learn-0.21.3/sklearn/_build_utils/openmp_helpers.py.orig	2019-08-15 10:23:10.181641800 +0200
-+++ scikit-learn-0.21.3/sklearn/_build_utils/openmp_helpers.py	2019-08-15 10:30:40.014055300 +0200
+--- scikit-learn-0.21.3/sklearn/_build_utils/pre_build_helpers.py.orig	2019-08-15 10:23:10.181641800 +0200
++++ scikit-learn-0.21.3/sklearn/_build_utils/pre_build_helpers.py	2019-08-15 10:30:40.014055300 +0200
 @@ -7,6 +7,7 @@
  import os
  import sys
@@ -9,11 +9,11 @@ To prevent rmtree() erroring out because of external file scanners
  import tempfile
  import textwrap
  import subprocess
-@@ -112,6 +113,7 @@
- 
+@@ -54,6 +55,7 @@
+             raise
          finally:
              os.chdir(start_dir)
 +            time.sleep(2)
  
-     err_message = textwrap.dedent(
-         """
+     return output
+ 
diff --git a/mingw-w64-python-scikit-learn/PKGBUILD b/mingw-w64-python-scikit-learn/PKGBUILD
index 4124afc5d4..0f8ced4e3b 100644
--- a/mingw-w64-python-scikit-learn/PKGBUILD
+++ b/mingw-w64-python-scikit-learn/PKGBUILD
@@ -2,24 +2,27 @@
 
 _realname=scikit-learn
 pkgbase=mingw-w64-python-${_realname}
-pkgname=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
-pkgver=0.21.3
-pkgrel=3
+pkgname=("${MINGW_PACKAGE_PREFIX}-python-${_realname}")
+provides=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+conflicts=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+replaces=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+pkgver=0.22
+pkgrel=1
 pkgdesc="A set of python modules for machine learning and data mining (mingw-w64)"
 arch=('any')
 url='http://scikit-learn.sourceforge.net/'
 license=('BSD')
-depends=("${MINGW_PACKAGE_PREFIX}-python3"
-         "${MINGW_PACKAGE_PREFIX}-python3-scipy"
-         "${MINGW_PACKAGE_PREFIX}-python3-joblib")
-makedepends=("${MINGW_PACKAGE_PREFIX}-python3-setuptools"
+depends=("${MINGW_PACKAGE_PREFIX}-python"
+         "${MINGW_PACKAGE_PREFIX}-python-scipy"
+         "${MINGW_PACKAGE_PREFIX}-python-joblib")
+makedepends=("${MINGW_PACKAGE_PREFIX}-python-setuptools"
              "${MINGW_PACKAGE_PREFIX}-cython")
 source=("${_realname}-${pkgver}.tar.gz::https://github.com/scikit-learn/${_realname}/archive/${pkgver}.tar.gz"
         001-mingw-python-openmp-flag.patch
         002-openmp-cleanup-wait.patch)
-sha256sums=('260f66e9c643207fe8cfe0995242060fdb14137b5e69a8dd273ac463b7e9426b'
+sha256sums=('6a495dbd5aac1f89d1ed51140fc41adb1f892293492b51b667eb5c40df1bde48'
             '11c9fedec28d882c25c90087ec3ef09f022dfd83c308574d023c89d19b5520f0'
-            '33e868844768a8e3afe93056d3cb54e0e9e4fd491a1df2b29d9d925ac5b3cf93')
+            '6d4c0d35d09f87da3993634e1a1e9f89a14179fb75b1ee28e1a2a714bc70346f')
 
 prepare() {
   cd ${_realname}-${pkgver}
@@ -27,24 +30,24 @@ prepare() {
   patch -p1 -i ${srcdir}/002-openmp-cleanup-wait.patch
 
   cd ${srcdir}
-  rm -rf python3-build-${CARCH} | true
-  cp -r "${_realname}-${pkgver}" "python3-build-${CARCH}"
+  rm -rf python-build-${CARCH} | true
+  cp -r "${_realname}-${pkgver}" "python-build-${CARCH}"
 }
 
 build() {
-  msg "Python 3 build for ${CARCH}"
-  cd "${srcdir}/python3-build-${CARCH}"
-  ${MINGW_PREFIX}/bin/python3 setup.py build
+  msg "Python build for ${CARCH}"
+  cd "${srcdir}/python-build-${CARCH}"
+  ${MINGW_PREFIX}/bin/python setup.py build
 }
 
 package() {
-  cd "${srcdir}/python3-build-${CARCH}"
+  cd "${srcdir}/python-build-${CARCH}"
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
-  ${MINGW_PREFIX}/bin/python3 setup.py install --prefix=${MINGW_PREFIX} \
+  ${MINGW_PREFIX}/bin/python setup.py install --prefix=${MINGW_PREFIX} \
     --root="${pkgdir}" --optimize=1 --skip-build
 
-  install -Dm644 COPYING "${pkgdir}"${MINGW_PREFIX}/share/licenses/python3-${_realname}/COPYING
+  install -Dm644 COPYING "${pkgdir}"${MINGW_PREFIX}/share/licenses/python-${_realname}/COPYING
 
-  install -d ${pkgdir}${MINGW_PREFIX}/share/doc/python3-${_realname}
-  cp -r doc/tutorial ${pkgdir}${MINGW_PREFIX}/share/doc/python3-${_realname}/tutorial
+  install -d ${pkgdir}${MINGW_PREFIX}/share/doc/python-${_realname}
+  cp -r doc/tutorial ${pkgdir}${MINGW_PREFIX}/share/doc/python-${_realname}/tutorial
 }
diff --git a/mingw-w64-python-seaborn/PKGBUILD b/mingw-w64-python-seaborn/PKGBUILD
index ae5516b9cc..4d852b7b36 100644
--- a/mingw-w64-python-seaborn/PKGBUILD
+++ b/mingw-w64-python-seaborn/PKGBUILD
@@ -2,39 +2,38 @@
 
 _realname=seaborn
 pkgbase=mingw-w64-python-${_realname}
-pkgname=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+pkgname=("${MINGW_PACKAGE_PREFIX}-python-${_realname}")
+provides=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+conflicts=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+replaces=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
 pkgver=0.9.0
-pkgrel=3
+pkgrel=1
 pkgdesc="Statistical data visualization using matplotlib (mingw-w64)"
 arch=('any')
 url='https://stanford.edu/~mwaskom/software/seaborn/'
 license=('BSD')
-depends=("${MINGW_PACKAGE_PREFIX}-python3"
-         "${MINGW_PACKAGE_PREFIX}-python3-pandas"
-         "${MINGW_PACKAGE_PREFIX}-python3-matplotlib"
-         )
-optdepends=("${MINGW_PACKAGE_PREFIX}-python3-statsmodel: for some advanced statistical plots"
-            "${MINGW_PACKAGE_PREFIX}-python3-beautifulsoup4: for getting dataset names"
-            )
-makedepends=("${MINGW_PACKAGE_PREFIX}-python3-setuptools"
-             "${MINGW_PACKAGE_PREFIX}-python3-scipy"
-             "${MINGW_PACKAGE_PREFIX}-python3-beautifulsoup4"
-             )
+depends=("${MINGW_PACKAGE_PREFIX}-python"
+         "${MINGW_PACKAGE_PREFIX}-python-pandas"
+         "${MINGW_PACKAGE_PREFIX}-python-matplotlib")
+optdepends=("${MINGW_PACKAGE_PREFIX}-python-statsmodel: for some advanced statistical plots"
+            "${MINGW_PACKAGE_PREFIX}-python-beautifulsoup4: for getting dataset names")
+makedepends=("${MINGW_PACKAGE_PREFIX}-python-setuptools"
+             "${MINGW_PACKAGE_PREFIX}-python-scipy"
+             "${MINGW_PACKAGE_PREFIX}-python-beautifulsoup4")
 source=("${_realname}-${pkgver}.tar.gz::https://github.com/mwaskom/${_realname}/archive/v${pkgver}.tar.gz")
 sha256sums=('e2910b86f719ceecd09350071cb68e7531d236d087d04515b961363dd7208e6f')
 
 build() {
   cd "${srcdir}/${_realname}-${pkgver}"
-
-  ${MINGW_PREFIX}/bin/python3 setup.py build
+  ${MINGW_PREFIX}/bin/python setup.py build
 }
 
 package() {
   cd "${srcdir}/${_realname}-${pkgver}"
 
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
-  ${MINGW_PREFIX}/bin/python3 setup.py install --prefix=${MINGW_PREFIX} \
+  ${MINGW_PREFIX}/bin/python setup.py install --prefix=${MINGW_PREFIX} \
     --root="${pkgdir}" --optimize=1 --skip-build
 
-  install -Dm644 LICENSE "${pkgdir}${MINGW_PREFIX}/share/licenses/python3-${_realname}/LICENSE.txt"
+  install -Dm644 LICENSE "${pkgdir}${MINGW_PREFIX}/share/licenses/python-${_realname}/LICENSE.txt"
 }
diff --git a/mingw-w64-python-setuptools-git/PKGBUILD b/mingw-w64-python-setuptools-git/PKGBUILD
index dbb5e231ea..ac8b9d3687 100644
--- a/mingw-w64-python-setuptools-git/PKGBUILD
+++ b/mingw-w64-python-setuptools-git/PKGBUILD
@@ -2,15 +2,18 @@
 
 _realname=setuptools-git
 pkgbase=mingw-w64-python-${_realname}
-pkgname=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+pkgname=("${MINGW_PACKAGE_PREFIX}-python-${_realname}")
+provides=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+conflicts=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+replaces=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
 pkgver=1.2
-pkgrel=3
+pkgrel=1
 pkgdesc="Setuptools revision control system plugin for Git (mingw-w64)"
 arch=('any')
 url='https://github.com/msabramo/setuptools-git'
 license=('BSD')
-depends=("${MINGW_PACKAGE_PREFIX}-python3"
-         "${MINGW_PACKAGE_PREFIX}-python3-setuptools"
+depends=("${MINGW_PACKAGE_PREFIX}-python"
+         "${MINGW_PACKAGE_PREFIX}-python-setuptools"
          "git")
 options=('staticlibs' 'strip' '!debug')
 source=("${_realname}-${pkgver}.tar.gz"::"https://github.com/msabramo/setuptools-git/archive/${pkgver}.tar.gz")
@@ -20,13 +23,12 @@ prepare() {
   cd "${srcdir}/${_realname}-${pkgver}"
 
   # Set version for setuptools_scm
-  export SETUPTOOLS_SCM_PRETEND_VERSION=$pkgver
+  export SETUPTOOLS_SCM_PRETEND_VERSION=${pkgver}
 }
 
 build() {
   cd "${srcdir}/${_realname}-${pkgver}"
-
-  ${MINGW_PREFIX}/bin/python3 setup.py build
+  ${MINGW_PREFIX}/bin/python setup.py build
 }
 
 check() {
@@ -36,7 +38,7 @@ check() {
   else
     cd "${srcdir}/${_realname}-${pkgver}"
 
-    ${MINGW_PREFIX}/bin/python3 setup.py test || warning "Tests failed!!!"
+    ${MINGW_PREFIX}/bin/python setup.py test || warning "Tests failed!!!"
   fi
 }
 
@@ -44,8 +46,8 @@ package() {
   cd "${srcdir}/${_realname}-${pkgver}"
 
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
-  ${MINGW_PREFIX}/bin/python3 setup.py install --prefix=${MINGW_PREFIX} \
+  ${MINGW_PREFIX}/bin/python setup.py install --prefix=${MINGW_PREFIX} \
     --root="${pkgdir}" --optimize=1 --skip-build
 
-  install -Dm644 LICENSE.txt "${pkgdir}${MINGW_PREFIX}/share/licenses/python3-${_realname}/LICENSE.txt"
+  install -Dm644 LICENSE.txt "${pkgdir}${MINGW_PREFIX}/share/licenses/python-${_realname}/LICENSE.txt"
 }
diff --git a/mingw-w64-python-strict-rfc3339/PKGBUILD b/mingw-w64-python-strict-rfc3339/PKGBUILD
index 782ad70e8b..820c716cda 100644
--- a/mingw-w64-python-strict-rfc3339/PKGBUILD
+++ b/mingw-w64-python-strict-rfc3339/PKGBUILD
@@ -2,40 +2,42 @@
 
 _realname=strict-rfc3339
 pkgbase=mingw-w64-python-${_realname}
-pkgname=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+pkgname=("${MINGW_PACKAGE_PREFIX}-python-${_realname}")
+provides=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+conflicts=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+replaces=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
 pkgver=0.7
-pkgrel=3
+pkgrel=1
 pkgdesc="Strict, simple, lightweight RFC3339 functions (mingw-w64)"
 arch=('any')
 url='http://www.danielrichman.co.uk/libraries/strict-rfc3339.html'
 license=('GPL')
-depends=("${MINGW_PACKAGE_PREFIX}-python3")
-makedepends=("${MINGW_PACKAGE_PREFIX}-python3-setuptools")
+depends=("${MINGW_PACKAGE_PREFIX}-python")
+makedepends=("${MINGW_PACKAGE_PREFIX}-python-setuptools")
 options=('staticlibs' 'strip' '!debug')
-source=("https://pypi.io/packages/source/s/strict-rfc3339/strict-rfc3339-$pkgver.tar.gz")
+source=("https://pypi.io/packages/source/s/strict-rfc3339/strict-rfc3339-${pkgver}.tar.gz")
 sha512sums=('94a2992a9ea41b75527348f0f8dae1d118d57b0764122f874baa85f5e3b523beb219ed83c2d7224725e504cd3737a6bde485957135856dcde470f32675e44e77')
 
 prepare() {
   cd "${srcdir}/${_realname}-${pkgver}"
 
   # Set version for setuptools_scm
-  export SETUPTOOLS_SCM_PRETEND_VERSION=$pkgver
+  export SETUPTOOLS_SCM_PRETEND_VERSION=${pkgver}
   # Set version for python-pbr
-  export PBR_VERSION=$pkgver
+  export PBR_VERSION=${pkgver}
 }
 
 build() {
   cd "${srcdir}/${_realname}-${pkgver}"
-
-  ${MINGW_PREFIX}/bin/python3 setup.py build
+  ${MINGW_PREFIX}/bin/python setup.py build
 }
 
 package() {
   cd "${srcdir}/${_realname}-${pkgver}"
 
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
-  ${MINGW_PREFIX}/bin/python3 setup.py install --prefix=${MINGW_PREFIX} \
+  ${MINGW_PREFIX}/bin/python setup.py install --prefix=${MINGW_PREFIX} \
     --root="${pkgdir}" --optimize=1 --skip-build
 
-  install -Dm644 LICENSE "${pkgdir}${MINGW_PREFIX}/share/licenses/python3-${_realname}/LICENSE"
+  install -Dm644 LICENSE "${pkgdir}${MINGW_PREFIX}/share/licenses/python-${_realname}/LICENSE"
 }
diff --git a/mingw-w64-python-text-unidecode/PKGBUILD b/mingw-w64-python-text-unidecode/PKGBUILD
index 2167853e8b..5ab634c3da 100644
--- a/mingw-w64-python-text-unidecode/PKGBUILD
+++ b/mingw-w64-python-text-unidecode/PKGBUILD
@@ -2,16 +2,19 @@
 
 _realname=text-unidecode
 pkgbase=mingw-w64-python-${_realname}
-pkgname=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+pkgname=("${MINGW_PACKAGE_PREFIX}-python-${_realname}")
+provides=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+conflicts=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+replaces=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
 pkgver=1.3
-pkgrel=2
+pkgrel=1
 pkgdesc="The most basic Text::Unidecode port (mingw-w64)"
 arch=('any')
 url="https://github.com/kmike/text-unidecode"
 license=('PerlArtistic')
-depends=("${MINGW_PACKAGE_PREFIX}-python3")
-makedepends=("${MINGW_PACKAGE_PREFIX}-python3-setuptools")
-checkdepends=("${MINGW_PACKAGE_PREFIX}-python3-pytest-runner")
+depends=("${MINGW_PACKAGE_PREFIX}-python")
+makedepends=("${MINGW_PACKAGE_PREFIX}-python-setuptools")
+checkdepends=("${MINGW_PACKAGE_PREFIX}-python-pytest-runner")
 options=('staticlibs' 'strip' '!debug')
 source=("${_realname}-${pkgver}.tar.gz"::"https://github.com/kmike/text-unidecode/archive/${pkgver}.tar.gz")
 sha256sums=('SKIP')
@@ -40,28 +43,28 @@ prepare() {
 #  apply_patch_with_msg 0001-A-really-important-fix.patch \
 #    0002-A-less-important-fix.patch
 
-  rm -rf ${builddir} | true
-  cp -r "${_realname}-${pkgver}" "${builddir}"
+  rm -rf python-build-${CARCH} | true
+  cp -r "${_realname}-${pkgver}" "python-build-${CARCH}"
 
   # Set version for setuptools_scm
   export SETUPTOOLS_SCM_PRETEND_VERSION=${pkgver}
 }
 
 build() {
-  msg "Python 3 build for ${CARCH}"  
-  cd "${srcdir}/python3-build-${CARCH}"
-  ${MINGW_PREFIX}/bin/python3 setup.py build
+  msg "Python build for ${CARCH}"  
+  cd "${srcdir}/python-build-${CARCH}"
+  ${MINGW_PREFIX}/bin/python setup.py build
 }
 
 check() {
-  msg "Python 3 test for ${CARCH}"
-  cd "${srcdir}/python3-build-${CARCH}"
-  ${MINGW_PREFIX}/bin/python3 setup.py pytest
+  msg "Python test for ${CARCH}"
+  cd "${srcdir}/python-build-${CARCH}"
+  ${MINGW_PREFIX}/bin/python setup.py pytest
 }
 
 package() {
-  cd "${srcdir}/python3-build-${CARCH}"
+  cd "${srcdir}/python-build-${CARCH}"
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
-  ${MINGW_PREFIX}/bin/python3 setup.py install --prefix=${MINGW_PREFIX} \
+  ${MINGW_PREFIX}/bin/python setup.py install --prefix=${MINGW_PREFIX} \
     --root="${pkgdir}" --optimize=1 --skip-build
 }
diff --git a/mingw-w64-python-theano/PKGBUILD b/mingw-w64-python-theano/PKGBUILD
index 07947c1654..1634e95df4 100644
--- a/mingw-w64-python-theano/PKGBUILD
+++ b/mingw-w64-python-theano/PKGBUILD
@@ -2,20 +2,24 @@
 
 _realname=theano
 pkgbase=mingw-w64-python-${_realname}
-pkgname=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+pkgname=("${MINGW_PACKAGE_PREFIX}-python-${_realname}")
+provides=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+conflicts=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+replaces=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
 pkgver=1.0.4
-pkgrel=5
+pkgrel=1
 pkgdesc="Python library that allows you to define, optimize, and evaluate mathematical expressions involving multi-dimensional arrays efficiently (mingw-w64)"
 arch=('any')
 url="https://github.com/Theano/Theano"
 license=('BSD')
-depends=("${MINGW_PACKAGE_PREFIX}-python3"
-         "${MINGW_PACKAGE_PREFIX}-python3-numpy"
-         "${MINGW_PACKAGE_PREFIX}-python3-scipy"
-         "${MINGW_PACKAGE_PREFIX}-python3-six")
+depends=("${MINGW_PACKAGE_PREFIX}-python"
+         "${MINGW_PACKAGE_PREFIX}-python-numpy"
+         "${MINGW_PACKAGE_PREFIX}-python-scipy"
+         "${MINGW_PACKAGE_PREFIX}-python-six")
 optdepends=("${MINGW_PACKAGE_PREFIX}-gcc: Support to execute optimized C-implementations (for both CPU and GPU)")
-makedepends=("${MINGW_PACKAGE_PREFIX}-python3-setuptools")
+makedepends=("${MINGW_PACKAGE_PREFIX}-python-setuptools")
 _archive=Theano-rel-${pkgver}
+install=${_realname}3-${CARCH}.install
 source=(${_archive}.tar.gz::https://github.com/Theano/Theano/archive/rel-${pkgver}.tar.gz
         0001-cmodule-obtain-mingw-w64-python-library.patch
         0002-not-use-np.distutils.__config__.blas_opt_info.patch)
@@ -41,22 +45,23 @@ prepare() {
   apply_patch_with_msg \
     0001-cmodule-obtain-mingw-w64-python-library.patch \
     0002-not-use-np.distutils.__config__.blas_opt_info.patch
+
+  cd "${srcdir}"
+  rm -rf "python-build-${CARCH}" | true
+  cp -r "${_archive}" "python-build-${CARCH}"
 }
 
 build() {
-  cd "${srcdir}/${_archive}"
-
-  ${MINGW_PREFIX}/bin/python3 setup.py --quiet build
+  cd "${srcdir}/python-build-${CARCH}"
+  ${MINGW_PREFIX}/bin/python setup.py --quiet build
 }
 
 package() {
-  install=${_realname}3-${CARCH}.install
-
   local _mingw_prefix=$(cygpath -am ${MINGW_PREFIX})
 
-  cd "${srcdir}/${_archive}"
+  cd "${srcdir}/python-build-${CARCH}"
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
-    ${MINGW_PREFIX}/bin/python3 setup.py --quiet install --prefix=${MINGW_PREFIX} --root="${pkgdir}" -O1
+    ${MINGW_PREFIX}/bin/python setup.py --quiet install --prefix=${MINGW_PREFIX} --root="${pkgdir}" -O1 --skip-build
 
   local PREFIX_WIN=$(cygpath -wm ${MINGW_PREFIX})
   # fix python command in files
@@ -65,14 +70,5 @@ package() {
         -e "s|${PREFIX_WIN}|${MINGW_PREFIX}|g" -i ${_f}
   done
 
-  for f in theano-cache theano-nose ; do
-    mv "${pkgdir}${MINGW_PREFIX}"/bin/${f}{,3}.exe
-    if [ -f "${pkgdir}${MINGW_PREFIX}"/bin/${f}.exe.manifest ]; then
-      mv "${pkgdir}${MINGW_PREFIX}"/bin/${f}{,3}.exe.manifest
-      sed -e "s|${f}|${f}3|g" -i "${pkgdir}${MINGW_PREFIX}"/bin/${f}3.exe.manifest
-    fi
-    mv "${pkgdir}${MINGW_PREFIX}"/bin/${f}{,3}-script.py
-  done
-
-  install -Dm644 doc/LICENSE.txt "${pkgdir}${MINGW_PREFIX}/share/licenses/python3-${_realname}/LICENSE"
+  install -Dm644 doc/LICENSE.txt "${pkgdir}${MINGW_PREFIX}/share/licenses/python-${_realname}/LICENSE"
 }
diff --git a/mingw-w64-python-theano/theano3-i686.install b/mingw-w64-python-theano/theano3-i686.install
index a7f5080cdd..427c8bb8b1 100644
--- a/mingw-w64-python-theano/theano3-i686.install
+++ b/mingw-w64-python-theano/theano3-i686.install
@@ -3,7 +3,7 @@ post_install() {
   local _prefix=$(pwd -W)
   cd -
   local _it
-  for _it in theano-cache3 theano-nose3 ; do
+  for _it in theano-cache theano-nose ; do
     sed -e "s|/mingw32|${_prefix}|g" \
         -i ${_prefix}/bin/${_it}-script.py
   done
diff --git a/mingw-w64-python-theano/theano3-x86_64.install b/mingw-w64-python-theano/theano3-x86_64.install
index 8854e377cf..4c6e838fcd 100644
--- a/mingw-w64-python-theano/theano3-x86_64.install
+++ b/mingw-w64-python-theano/theano3-x86_64.install
@@ -3,7 +3,7 @@ post_install() {
   local _prefix=$(pwd -W)
   cd -
   local _it
-  for _it in theano-cache3 theano-nose3 ; do
+  for _it in theano-cache theano-nose ; do
     sed -e "s|/mingw64|${_prefix}|g" \
         -i ${_prefix}/bin/${_it}-script.py
   done
diff --git a/mingw-w64-python-udsoncan/PKGBUILD b/mingw-w64-python-udsoncan/PKGBUILD
index 0235a4ccba..a3e8406762 100644
--- a/mingw-w64-python-udsoncan/PKGBUILD
+++ b/mingw-w64-python-udsoncan/PKGBUILD
@@ -1,37 +1,40 @@
 # Maintainer: Alexey Pavlov <alexpux@gmail.com>
 
 _realname=udsoncan
-pkgbase=mingw-w64-python3-${_realname}
-pkgname=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+pkgbase=mingw-w64-python-${_realname}
+pkgname=("${MINGW_PACKAGE_PREFIX}-python-${_realname}")
+provides=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+conflicts=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+replaces=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
 pkgver=1.9
 pkgrel=1
 pkgdesc="Implementation of the Unified Diagnostic Services (UDS) protocol defined by ISO-14229 written in Python 3 (mingw-w64)"
 arch=('any')
 url='https://github.com/pylessard/python-udsoncan'
 license=('MIT')
-depends=("${MINGW_PACKAGE_PREFIX}-python3")
-makedepends=("${MINGW_PACKAGE_PREFIX}-python3"
-             "${MINGW_PACKAGE_PREFIX}-python3-setuptools")
+depends=("${MINGW_PACKAGE_PREFIX}-python")
+makedepends=("${MINGW_PACKAGE_PREFIX}-python"
+             "${MINGW_PACKAGE_PREFIX}-python-setuptools")
 options=('staticlibs' 'strip' '!debug')
 source=("${_realname}-${pkgver}.tar.gz"::"https://github.com/pylessard/python-udsoncan/archive/v${pkgver}.tar.gz")
 sha512sums=('eb0b53d696130960531a351e340ddc28ef73661c07b0d076cca8f1bbc4c639ca154514b3880ed4009ba70cf1ec395c3dfa6b35ba6c04755c55cd427a952654a7')
 
 prepare() {
-  cp -rf python-${_realname}-${pkgver} python3-build-${CARCH}
+  cp -rf python-${_realname}-${pkgver} python-build-${CARCH}
 }
 
 build() {
-  msg "Python 3 build for ${CARCH}"  
-  cd "${srcdir}/python3-build-${CARCH}"
+  msg "Python build for ${CARCH}"  
+  cd "${srcdir}/python-build-${CARCH}"
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
-    ${MINGW_PREFIX}/bin/python3 setup.py build
+    ${MINGW_PREFIX}/bin/python setup.py build
 }
 
 package() {
-  cd "${srcdir}/python3-build-${CARCH}"
+  cd "${srcdir}/python-build-${CARCH}"
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
-    ${MINGW_PREFIX}/bin/python3 setup.py install --prefix=${MINGW_PREFIX} \
+    ${MINGW_PREFIX}/bin/python setup.py install --prefix=${MINGW_PREFIX} \
     --root="${pkgdir}" --optimize=1 --skip-build
 
-  install -Dm644 LICENSE.txt "${pkgdir}${MINGW_PREFIX}/share/licenses/python3-${_realname}/LICENSE.txt"
+  install -Dm644 LICENSE.txt "${pkgdir}${MINGW_PREFIX}/share/licenses/python-${_realname}/LICENSE.txt"
 }
diff --git a/mingw-w64-python-ukpostcodeparser/PKGBUILD b/mingw-w64-python-ukpostcodeparser/PKGBUILD
index 40db5b58a4..75718c2a43 100644
--- a/mingw-w64-python-ukpostcodeparser/PKGBUILD
+++ b/mingw-w64-python-ukpostcodeparser/PKGBUILD
@@ -2,45 +2,48 @@
 
 _realname=ukpostcodeparser
 pkgbase=mingw-w64-python-${_realname}
-pkgname=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+pkgname=("${MINGW_PACKAGE_PREFIX}-python-${_realname}")
+provides=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+conflicts=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+replaces=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
 pkgver=1.1.2
-pkgrel=3
+pkgrel=1
 pkgdesc="UK Postcode parser (mingw-w64)"
 arch=('any')
 url='https://github.com/hamstah/ukpostcodeparser'
 license=('MIT')
-depends=("${MINGW_PACKAGE_PREFIX}-python3")
-makedepends=("${MINGW_PACKAGE_PREFIX}-python3-setuptools")
+depends=("${MINGW_PACKAGE_PREFIX}-python")
+makedepends=("${MINGW_PACKAGE_PREFIX}-python-setuptools")
 options=('staticlibs' 'strip' '!debug')
 source=("${_realname}-${pkgver}.tar.gz"::"https://github.com/hamstah/ukpostcodeparser/archive/v${pkgver}.tar.gz")
 sha512sums=('8113522b728c095f937a9f53f21c369130e3e63c4fc3546dbea4ad1c53648742fb0e766b1254c76ee65d69dec585f1a90caa7d39ca540de1765ff5f989a702de')
 
 prepare() {
   cd "${srcdir}"
-  rm -rf "python3-build-${CARCH}" | true
-  cp -r "${_realname}-${pkgver}" "python3-build-${CARCH}"
-  
+  rm -rf "python-build-${CARCH}" | true
+  cp -r "${_realname}-${pkgver}" "python-build-${CARCH}"
+
   # Set version for setuptools_scm
   export SETUPTOOLS_SCM_PRETEND_VERSION=${pkgver}
 }
 
 build() {
-  msg "Python 3 build for ${CARCH}"
-  cd "${srcdir}/python3-build-${CARCH}"
-  ${MINGW_PREFIX}/bin/python3 setup.py build
+  msg "Python build for ${CARCH}"
+  cd "${srcdir}/python-build-${CARCH}"
+  ${MINGW_PREFIX}/bin/python setup.py build
 }
 
 check() {
-  msg "Python 3 test for ${CARCH}"
-  cd "${srcdir}/python3-build-${CARCH}"
-  ${MINGW_PREFIX}/bin/python3} -m unittest discover -s ukpostcodeparser/test -p '*.py' || warning "Tests failed"
+  msg "Python test for ${CARCH}"
+  cd "${srcdir}/python-build-${CARCH}"
+  ${MINGW_PREFIX}/bin/python -m unittest discover -s ukpostcodeparser/test -p '*.py' || warning "Tests failed"
 }
 
 package() {
-  cd "${srcdir}/python3-build-${CARCH}"
+  cd "${srcdir}/python-build-${CARCH}"
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
-  ${MINGW_PREFIX}/bin/python3 setup.py install --prefix=${MINGW_PREFIX} \
+  ${MINGW_PREFIX}/bin/python setup.py install --prefix=${MINGW_PREFIX} \
     --root="${pkgdir}" --optimize=1 --skip-build
 
-  install -Dm644 LICENSE "${pkgdir}${MINGW_PREFIX}/share/licenses/python3-${_realname}/LICENSE"
+  install -Dm644 LICENSE "${pkgdir}${MINGW_PREFIX}/share/licenses/python-${_realname}/LICENSE"
 }
diff --git a/mingw-w64-python-watchdog/PKGBUILD b/mingw-w64-python-watchdog/PKGBUILD
index f80c66df78..c07d7b2118 100644
--- a/mingw-w64-python-watchdog/PKGBUILD
+++ b/mingw-w64-python-watchdog/PKGBUILD
@@ -2,21 +2,25 @@
 
 _realname=watchdog
 pkgbase=mingw-w64-python-${_realname}
-pkgname=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+pkgname=("${MINGW_PACKAGE_PREFIX}-python-${_realname}")
+provides=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+conflicts=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+replaces=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
 pkgver=0.9.0
-pkgrel=4
+pkgrel=1
 pkgdesc="Python API and shell utilities to monitor file system events. (mingw-w64)"
 arch=('any')
 url='https://pypi.python.org/pypi/watchdog'
 license=('Apache')
-depends=("${MINGW_PACKAGE_PREFIX}-python3"
-         "${MINGW_PACKAGE_PREFIX}-python3-argh"
-         "${MINGW_PACKAGE_PREFIX}-python3-pathtools"
-         "${MINGW_PACKAGE_PREFIX}-python3-yaml")
-makedepends=("${MINGW_PACKAGE_PREFIX}-python3-setuptools")
-checkdepends=("${MINGW_PACKAGE_PREFIX}-python3-pytest"
-              "${MINGW_PACKAGE_PREFIX}-python3-pytest-cov")
+depends=("${MINGW_PACKAGE_PREFIX}-python"
+         "${MINGW_PACKAGE_PREFIX}-python-argh"
+         "${MINGW_PACKAGE_PREFIX}-python-pathtools"
+         "${MINGW_PACKAGE_PREFIX}-python-yaml")
+makedepends=("${MINGW_PACKAGE_PREFIX}-python-setuptools")
+checkdepends=("${MINGW_PACKAGE_PREFIX}-python-pytest"
+              "${MINGW_PACKAGE_PREFIX}-python-pytest-cov")
 options=('staticlibs' 'strip' '!debug')
+install=${_realname}3-${CARCH}.install
 source=("${_realname}-${pkgver}.tar.gz"::"https://github.com/gorakhargosh/watchdog/archive/v${pkgver}.tar.gz")
 sha512sums=('97fca2642209150a611d931d6f2049a9941a3494a6c566bc18eaa45a8fc2fbd02c712b37a85cc1375eeb65715706ba6b8ecf781b99951721988c318f81eff7c6')
 
@@ -29,38 +33,27 @@ prepare() {
 
 build() {
   cd "${srcdir}/${_realname}-${pkgver}"
-
-  ${MINGW_PREFIX}/bin/python3 setup.py build
+  ${MINGW_PREFIX}/bin/python setup.py build
 }
 
 check() {
   cd "${srcdir}/${_realname}-${pkgver}"
-
-  ${MINGW_PREFIX}/bin/python3 setup.py test || warning "Tests failed"
+  ${MINGW_PREFIX}/bin/python setup.py test || warning "Tests failed"
 }
 
 package() {
-  #This package install is needed for .fixups with .EXE's 
-  #in the bit directory.  The install files "python-exe-installs"
-  #and should be renamed to your _realname .
-  install=${_realname}3-${CARCH}.install
-
   cd "${srcdir}/${_realname}-${pkgver}"
 
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
-  ${MINGW_PREFIX}/bin/python3 setup.py install --prefix=${MINGW_PREFIX} \
+  ${MINGW_PREFIX}/bin/python setup.py install --prefix=${MINGW_PREFIX} \
     --root="${pkgdir}" --optimize=1 --skip-build
 
-  install -Dm644 LICENSE "${pkgdir}${MINGW_PREFIX}/share/licenses/python3-${_realname}/LICENSE"
+  install -Dm644 LICENSE "${pkgdir}${MINGW_PREFIX}/share/licenses/python-${_realname}/LICENSE"
 
-# This entire section should be removed if the package does NOT install
-# anything in the /mingw*/bin directory.
-### begin section ###
   local PREFIX_WIN=$(cygpath -wm ${MINGW_PREFIX})
   # fix python command in files
   for _f in "${pkgdir}${MINGW_PREFIX}"/bin/*.py; do
     sed -e "s|/usr/bin/env |${MINGW_PREFIX}|g" \
         -e "s|${PREFIX_WIN}|${MINGW_PREFIX}|g" -i ${_f}
   done
-#### end section ####
 }
diff --git a/mingw-w64-python-webcolors/PKGBUILD b/mingw-w64-python-webcolors/PKGBUILD
index dd4826c4bb..4cf6c13b2d 100644
--- a/mingw-w64-python-webcolors/PKGBUILD
+++ b/mingw-w64-python-webcolors/PKGBUILD
@@ -2,16 +2,19 @@
 
 _realname=webcolors
 pkgbase=mingw-w64-python-${_realname}
-pkgname=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+pkgname=("${MINGW_PACKAGE_PREFIX}-python-${_realname}")
+provides=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+conflicts=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+replaces=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
 pkgver=1.10
-pkgrel=2
+pkgrel=1
 pkgdesc="A library for working with color names and color value formats defined by the HTML and CSS specifications for use in documents on the Web (mingw-w64)"
 arch=('any')
 url='https://github.com/ubernostrum/webcolors'
 license=('BSD')
-depends=("${MINGW_PACKAGE_PREFIX}-python3")
-makedepends=("${MINGW_PACKAGE_PREFIX}-python3-setuptools")
-checkdepends=("${MINGW_PACKAGE_PREFIX}-python3-pytest")
+depends=("${MINGW_PACKAGE_PREFIX}-python")
+makedepends=("${MINGW_PACKAGE_PREFIX}-python-setuptools")
+checkdepends=("${MINGW_PACKAGE_PREFIX}-python-pytest")
 options=('staticlibs' 'strip' '!debug')
 source=("https://pypi.io/packages/source/w/webcolors/webcolors-$pkgver.tar.gz")
 sha512sums=('db02dcfc542d1fd08fccad815a02cbe01012a942329c53d468c7f9b6e0d628dd38abf4b2633bc8992fb914932ca4455e54c7ef98e101ca86d34825edfc3c1feb')
@@ -25,20 +28,18 @@ prepare() {
 
 build() {
   cd "${srcdir}/${_realname}-${pkgver}"
-
-  ${MINGW_PREFIX}/bin/python3 setup.py build
+  ${MINGW_PREFIX}/bin/python setup.py build
 }
 
 check() {
   cd "${srcdir}/${_realname}-${pkgver}"
-
-  ${MINGW_PREFIX}/bin/python3 -m pytest
+  ${MINGW_PREFIX}/bin/python -m pytest
 }
 
 package() {
   cd "${srcdir}/${_realname}-${pkgver}"
 
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
-  ${MINGW_PREFIX}/bin/python3 setup.py install --prefix=${MINGW_PREFIX} \
+  ${MINGW_PREFIX}/bin/python setup.py install --prefix=${MINGW_PREFIX} \
     --root="${pkgdir}" --optimize=1 --skip-build
 }
diff --git a/mingw-w64-python-websocket-client/PKGBUILD b/mingw-w64-python-websocket-client/PKGBUILD
index a84cca106b..4fc2f6f2af 100644
--- a/mingw-w64-python-websocket-client/PKGBUILD
+++ b/mingw-w64-python-websocket-client/PKGBUILD
@@ -2,16 +2,19 @@
 
 _realname=websocket-client
 pkgbase=mingw-w64-python-${_realname}
-pkgname=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+pkgname=("${MINGW_PACKAGE_PREFIX}-python-${_realname}")
+provides=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+conflicts=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+replaces=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
 pkgver=0.56.0
-pkgrel=3
+pkgrel=1
 pkgdesc="websocket client for python (mingw-w64)"
 arch=('any')
 url='https://github.com/websocket-client/websocket-client'
 license=('LGPL-2.1')
-  depends=("${MINGW_PACKAGE_PREFIX}-python3"
-           "${MINGW_PACKAGE_PREFIX}-python3-six")
-makedepends=("${MINGW_PACKAGE_PREFIX}-python3-setuptools")
+  depends=("${MINGW_PACKAGE_PREFIX}-python"
+           "${MINGW_PACKAGE_PREFIX}-python-six")
+makedepends=("${MINGW_PACKAGE_PREFIX}-python-setuptools")
 options=('staticlibs' 'strip' '!debug')
 source=(#"${_realname}-${pkgver}.tar.gz"::"https://github.com/websocket-client/websocket-client/archive/v${pkgver}.tar.gz"
         "https://pypi.io/packages/source/w/${_realname}/${_realname//-/_}-${pkgver}.tar.gz")
@@ -26,24 +29,22 @@ prepare() {
 
 build() {
   cd "${srcdir}/${_realname//-/_}-${pkgver}"
-
-  ${MINGW_PREFIX}/bin/python3 setup.py build
+  ${MINGW_PREFIX}/bin/python setup.py build
 }
 
 check() {
   cd "${srcdir}/${_realname//-/_}-${pkgver}"
-
-  ${MINGW_PREFIX}/bin/python3 setup.py test
+  ${MINGW_PREFIX}/bin/python setup.py test
 }
 
 package() {
   cd "${srcdir}/${_realname//-/_}-${pkgver}"
 
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
-  ${MINGW_PREFIX}/bin/python3 setup.py install --prefix=${MINGW_PREFIX} \
+  ${MINGW_PREFIX}/bin/python setup.py install --prefix=${MINGW_PREFIX} \
     --root="${pkgdir}" --optimize=1 --skip-build
 
-  install -Dm644 LICENSE "${pkgdir}${MINGW_PREFIX}/share/licenses/python3-${_realname}/COPYING"
+  install -Dm644 LICENSE "${pkgdir}${MINGW_PREFIX}/share/licenses/python-${_realname}/COPYING"
 
   local PREFIX_WIN=$(cygpath -wm ${MINGW_PREFIX})
   # fix python command in files
diff --git a/mingw-w64-python-whoosh/PKGBUILD b/mingw-w64-python-whoosh/PKGBUILD
index a7352b4e03..4e829a0e65 100644
--- a/mingw-w64-python-whoosh/PKGBUILD
+++ b/mingw-w64-python-whoosh/PKGBUILD
@@ -2,15 +2,18 @@
 
 _realname=whoosh
 pkgbase=mingw-w64-python-${_realname}
-pkgname=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+pkgname=("${MINGW_PACKAGE_PREFIX}-python-${_realname}")
+provides=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+conflicts=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+replaces=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
 pkgver=2.7.4
-pkgrel=4
+pkgrel=1
 pkgdesc="Fast, pure-Python full text indexing, search, and spell checking library (mingw-w64)"
 url='https://bitbucket.org/mchaput/whoosh/wiki/Home'
 license=('BSD')
 arch=('any')
-depends=("${MINGW_PACKAGE_PREFIX}-python3")
-makedepends=("${MINGW_PACKAGE_PREFIX}-python3-setuptools"
+depends=("${MINGW_PACKAGE_PREFIX}-python")
+makedepends=("${MINGW_PACKAGE_PREFIX}-python-setuptools"
              'mercurial')
 checkdepends=("${MINGW_PACKAGE_PREFIX}-python3-pytest-runner")
 _dtoken="53/72/6c6f1e787d9cab2cc733cf042f125abec07209a58308831c9f292504e826"
@@ -19,20 +22,20 @@ sha256sums=('SKIP')
 
 prepare() {
   cd ${srcdir}
-  cp -r ${_realname} build-python3-${CARCH}
+  cp -r ${_realname} build-python-${CARCH}
 }
 
 build() {
-  msg "Python 3 build for ${CARCH}"  
-  cd "${srcdir}/python3-build-${CARCH}"
-  ${MINGW_PREFIX}/bin/python3 setup.py build
+  msg "Python build for ${CARCH}"  
+  cd "${srcdir}/build-python-${CARCH}"
+  ${MINGW_PREFIX}/bin/python setup.py build
 }
 
 package() {
-  cd ${srcdir}/build-python3-${CARCH}
-  ${MINGW_PREFIX}/bin/python3 setup.py build
+  cd ${srcdir}/build-python-${CARCH}
+  ${MINGW_PREFIX}/bin/python setup.py build
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
-  ${MINGW_PREFIX}/bin/python3 setup.py install --prefix=${MINGW_PREFIX} --root="${pkgdir}" --skip-build
+  ${MINGW_PREFIX}/bin/python setup.py install --prefix=${MINGW_PREFIX} --root="${pkgdir}" --skip-build
 
-  install -D -m644 LICENSE.txt "${pkgdir}${MINGW_PREFIX}"/share/licenses/python3-${_realname}/LICENSE.txt
+  install -D -m644 LICENSE.txt "${pkgdir}${MINGW_PREFIX}"/share/licenses/python-${_realname}/LICENSE.txt
 }
diff --git a/mingw-w64-python-winkerberos/PKGBUILD b/mingw-w64-python-winkerberos/PKGBUILD
index 920f413286..873526933b 100644
--- a/mingw-w64-python-winkerberos/PKGBUILD
+++ b/mingw-w64-python-winkerberos/PKGBUILD
@@ -2,17 +2,20 @@
 
 _realname=winkerberos
 pkgbase=mingw-w64-python-${_realname}
-pkgname=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+pkgname=("${MINGW_PACKAGE_PREFIX}-python-${_realname}")
+provides=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+conflicts=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+replaces=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
 pkgver=0.7.0
-pkgrel=3
+pkgrel=1
 pkgdesc="High level interface to SSPI for Kerberos client auth (mingw-w64)"
 arch=('any')
-url='https://github.com/mongodb-labs/winkerbero'
+url='https://github.com/mongodb-labs/winkerberos'
 license=('Apache')
-depends=("${MINGW_PACKAGE_PREFIX}-python3")
-makedepends=("${MINGW_PACKAGE_PREFIX}-python3-sphinx"
-             "${MINGW_PACKAGE_PREFIX}-python3-setuptools")
-#checkdepends=("${MINGW_PACKAGE_PREFIX}-python3-pymongo")
+depends=("${MINGW_PACKAGE_PREFIX}-python")
+makedepends=("${MINGW_PACKAGE_PREFIX}-python-sphinx"
+             "${MINGW_PACKAGE_PREFIX}-python-setuptools")
+#checkdepends=("${MINGW_PACKAGE_PREFIX}-python-pymongo")
 options=('staticlibs' 'strip' '!debug')
 _dtoken="85/b2/c5a66595bb477f1939596d80fa308e357c28abe22d3d6ce6cc2208c324ee"
 source=("https://files.pythonhosted.org/packages/${_dtoken}/winkerberos-${pkgver}.zip"
@@ -40,22 +43,20 @@ prepare() {
 
 build() {
   cd "${srcdir}/${_realname}-${pkgver}"
-
-  ${MINGW_PREFIX}/bin/python3 setup.py build
+  ${MINGW_PREFIX}/bin/python setup.py build
 }
 
 #check() {
 #  cd "${srcdir}/${_realname}-${pkgver}"
-#
-#  ${MINGW_PREFIX}/bin/python3 setup.py test
+#  ${MINGW_PREFIX}/bin/python setup.py test
 #}
 
 package() {
   cd "${srcdir}/${_realname}-${pkgver}"
 
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
-  ${MINGW_PREFIX}/bin/python3 setup.py install --prefix=${MINGW_PREFIX} \
+  ${MINGW_PREFIX}/bin/python setup.py install --prefix=${MINGW_PREFIX} \
     --root="${pkgdir}" --optimize=1 --skip-build
 
-  install -Dm644 LICENSE "${pkgdir}${MINGW_PREFIX}/share/licenses/python3-${_realname}/LICENSE"
+  install -Dm644 LICENSE "${pkgdir}${MINGW_PREFIX}/share/licenses/python-${_realname}/LICENSE"
 }
diff --git a/mingw-w64-python-xlrd/PKGBUILD b/mingw-w64-python-xlrd/PKGBUILD
index fa2ff06c60..19c0711e02 100644
--- a/mingw-w64-python-xlrd/PKGBUILD
+++ b/mingw-w64-python-xlrd/PKGBUILD
@@ -2,35 +2,36 @@
 
 _realname=xlrd
 pkgbase=mingw-w64-python-${_realname}
-pkgname=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+pkgname=("${MINGW_PACKAGE_PREFIX}-python-${_realname}")
+provides=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+conflicts=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+replaces=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
 pkgver=1.2.0
-pkgrel=3
+pkgrel=1
 pkgdesc="Library for developers to extract data from Microsoft Excel (tm) spreadsheet files (mingw-w64)"
 arch=('any')
 license=('custom')
 url="https://github.com/python-excel/xlrd"
-depends=("${MINGW_PACKAGE_PREFIX}-python3")
-makedepends=("${MINGW_PACKAGE_PREFIX}-python3-setuptools")
+depends=("${MINGW_PACKAGE_PREFIX}-python")
+makedepends=("${MINGW_PACKAGE_PREFIX}-python-setuptools")
 source=(${_realname}-${pkgver}.tar.gz::https://github.com/python-excel/xlrd/archive/${pkgver}.tar.gz)
 sha256sums=('F3D25B39A9BDB273B4F13B2847F555EEF029983BDCD2B6283C81F4A93F45B827')
 
 build() {
   cd "${srcdir}/${_realname}-${pkgver}"
-
-  ${MINGW_PREFIX}/bin/python3 setup.py build
+  ${MINGW_PREFIX}/bin/python setup.py build
 }
 
 package() {
   cd "${srcdir}/${_realname}-${pkgver}"
 
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
-    ${MINGW_PREFIX}/bin/python3 setup.py install --prefix=${MINGW_PREFIX} --root="${pkgdir}" -O1
+    ${MINGW_PREFIX}/bin/python setup.py install --prefix=${MINGW_PREFIX} --root="${pkgdir}" -O1 --skip-build
 
-  install -Dm644 docs/licenses.rst "${pkgdir}${MINGW_PREFIX}/share/licenses/python3-${_realname}/licenses.rst"
+  install -Dm644 docs/licenses.rst "${pkgdir}${MINGW_PREFIX}/share/licenses/python-${_realname}/licenses.rst"
 
   local _mingw_prefix=$(cygpath -am ${MINGW_PREFIX})
   for filename in runxlrd; do
     sed -e "s|${_mingw_prefix}/bin/|/usr/bin/env |g" -i "${pkgdir}${MINGW_PREFIX}"/bin/${filename}.py
-    mv "${pkgdir}${MINGW_PREFIX}"/bin/${filename}.py "${pkgdir}${MINGW_PREFIX}"/bin/${filename}-py3.py
   done
 }
diff --git a/mingw-w64-python-xlsxwriter/PKGBUILD b/mingw-w64-python-xlsxwriter/PKGBUILD
index 6cc510945d..315f0730ea 100644
--- a/mingw-w64-python-xlsxwriter/PKGBUILD
+++ b/mingw-w64-python-xlsxwriter/PKGBUILD
@@ -2,36 +2,38 @@
 
 _realname=xlsxwriter
 pkgbase=mingw-w64-python-${_realname}
-pkgname=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
-pkgver=1.2.2
-pkgrel=2
+pkgname=("${MINGW_PACKAGE_PREFIX}-python-${_realname}")
+pkgver=1.2.7
+pkgrel=1
+provides=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}=${pkgver}")
+conflicts=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+replaces=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
 pkgdesc="A Python module for creating Excel XLSL files (mingw-w64)"
 url="https://github.com/jmcnamara/XlsxWriter"
 arch=('any')
 license=('BSD')
-depends=("${MINGW_PACKAGE_PREFIX}-python3")
-makedepends=("${MINGW_PACKAGE_PREFIX}-python3-setuptools")
-checkdepends=("${MINGW_PACKAGE_PREFIX}-python3-pytest")
+depends=("${MINGW_PACKAGE_PREFIX}-python")
+makedepends=("${MINGW_PACKAGE_PREFIX}-python-setuptools")
+checkdepends=("${MINGW_PACKAGE_PREFIX}-python-pytest")
 source=(${_realname}-${pkgver}.tar.gz::"https://github.com/jmcnamara/XlsxWriter/archive/RELEASE_${pkgver}.tar.gz")
-sha256sums=('227279fa4389808b8b894830dfc4e0ae3f3055e81767677a24ee8da03527a98e')
+sha256sums=('39e9aaa6a2326f81a2d458c3cceb09e54e1c61f39a01d505c367a9faa5cc5dba')
 
 build() {
   cd "${srcdir}/XlsxWriter-RELEASE_${pkgver}"
-
-  ${MINGW_PREFIX}/bin/python3 setup.py build
+  ${MINGW_PREFIX}/bin/python setup.py build
 }
 
 package() {
   cd "${srcdir}/XlsxWriter-RELEASE_${pkgver}"
 
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
-  ${MINGW_PREFIX}/bin/python3 setup.py install --prefix=${MINGW_PREFIX} \
+  ${MINGW_PREFIX}/bin/python setup.py install --prefix=${MINGW_PREFIX} \
     --root="${pkgdir}" --optimize=1 --skip-build
-  install -Dm644 LICENSE.txt ${pkgdir}${MINGW_PREFIX}/share/licenses/python3-${_realname}/LICENSE
+
+  install -Dm644 LICENSE.txt ${pkgdir}${MINGW_PREFIX}/share/licenses/python-${_realname}/LICENSE
 
   local _mingw_prefix=$(cygpath -am ${MINGW_PREFIX})
   for filename in vba_extract; do
     sed -e "s|${_mingw_prefix}/bin/|/usr/bin/env |g" -i "${pkgdir}${MINGW_PREFIX}"/bin/${filename}.py
-    mv "${pkgdir}${MINGW_PREFIX}"/bin/${filename}.py "${pkgdir}${MINGW_PREFIX}"/bin/${filename}-py3.py
   done
 }
diff --git a/mingw-w64-python-xlwt/PKGBUILD b/mingw-w64-python-xlwt/PKGBUILD
index 0bab291190..0d08528c38 100644
--- a/mingw-w64-python-xlwt/PKGBUILD
+++ b/mingw-w64-python-xlwt/PKGBUILD
@@ -2,29 +2,31 @@
 
 _realname=xlwt
 pkgbase=mingw-w64-python-${_realname}
-pkgname=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+pkgname=("${MINGW_PACKAGE_PREFIX}-python-${_realname}")
+provides=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+conflicts=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+replaces=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
 pkgver=1.3.0
-pkgrel=2
+pkgrel=1
 pkgdesc="Library to create spreadsheet files compatible with MS Excel 97/2000/XP/2003 XLS files, on any platform (mingw-w64)"
 arch=('any')
 license=('custom')
 url="https://github.com/python-excel/xlwt"
-depends=("${MINGW_PACKAGE_PREFIX}-python3")
-makedepends=("${MINGW_PACKAGE_PREFIX}-python3-setuptools")
+depends=("${MINGW_PACKAGE_PREFIX}-python")
+makedepends=("${MINGW_PACKAGE_PREFIX}-python-setuptools")
 source=(${_realname}-${pkgver}.tar.gz::https://github.com/python-excel/xlwt/archive/${pkgver}.tar.gz)
 sha256sums=('1961682C6A3CEDB44E6A96FF6ED099D80AF8DA9A669DBBBC1D1959E8398122D6')
 
 build() {
   cd "${srcdir}/${_realname}-${pkgver}"
-
-  ${MINGW_PREFIX}/bin/python3 setup.py build
+  ${MINGW_PREFIX}/bin/python setup.py build
 }
 
 package() {
   cd "${srcdir}/${_realname}-${pkgver}"
 
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
-    ${MINGW_PREFIX}/bin/python3 setup.py install --prefix=${MINGW_PREFIX} --root="${pkgdir}" -O1
+    ${MINGW_PREFIX}/bin/python setup.py install --prefix=${MINGW_PREFIX} --root="${pkgdir}" -O1 --skip-build
 
-  install -Dm644 docs/licenses.rst "${pkgdir}${MINGW_PREFIX}/share/licenses/python3-${_realname}/licenses.rst"
+  install -Dm644 docs/licenses.rst "${pkgdir}${MINGW_PREFIX}/share/licenses/python-${_realname}/licenses.rst"
 }
diff --git a/mingw-w64-python-zope.event/PKGBUILD b/mingw-w64-python-zope.event/PKGBUILD
index 3dcd9c6513..d53b3ad016 100644
--- a/mingw-w64-python-zope.event/PKGBUILD
+++ b/mingw-w64-python-zope.event/PKGBUILD
@@ -2,30 +2,32 @@
 
 _realname=zope.event
 pkgbase=mingw-w64-python-${_realname}
-pkgname=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+pkgname=("${MINGW_PACKAGE_PREFIX}-python-${_realname}")
+provides=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+conflicts=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+replaces=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
 pkgver=4.4
-pkgrel=3
+pkgrel=1
 pkgdesc='Very basic event publishing system (mingw-w64)'
 url='https://pypi.python.org/pypi/zope.event'
 license=('ZPL 2.1')
 arch=('any')
-depends=("${MINGW_PACKAGE_PREFIX}-python3")
-makedepends=("${MINGW_PACKAGE_PREFIX}-python3-setuptools")
+depends=("${MINGW_PACKAGE_PREFIX}-python")
+makedepends=("${MINGW_PACKAGE_PREFIX}-python-setuptools")
 _dtoken="4c/b2/51c0369adcf5be2334280eed230192ab3b03f81f8efda9ddea6f65cc7b32"
 source=("https://pypi.python.org/packages/${_dtoken}/${_realname}-${pkgver}.tar.gz")
 sha256sums=('69c27debad9bdacd9ce9b735dad382142281ac770c4a432b533d6d65c4614bcf')
 
 build() {
   cd "${srcdir}/${_realname}-${pkgver}"
-
-  ${MINGW_PREFIX}/bin/python3 setup.py build
+  ${MINGW_PREFIX}/bin/python setup.py build
 }
 
 package() {
   cd "${srcdir}/${_realname}-${pkgver}"
 
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
-  ${MINGW_PREFIX}/bin/python3 setup.py install --prefix=${MINGW_PREFIX} --root="${pkgdir}"
+  ${MINGW_PREFIX}/bin/python setup.py install --prefix=${MINGW_PREFIX} --root="${pkgdir}"
 
-  install -Dm644 "${srcdir}/${_realname}-${pkgver}/LICENSE.txt" "${pkgdir}${MINGW_PREFIX}/share/licenses/python3-${_realname}/LICENSE"
+  install -Dm644 "${srcdir}/${_realname}-${pkgver}/LICENSE.txt" "${pkgdir}${MINGW_PREFIX}/share/licenses/python-${_realname}/LICENSE"
 }
diff --git a/mingw-w64-python-zope.interface/PKGBUILD b/mingw-w64-python-zope.interface/PKGBUILD
index 7ed70d09df..32f4fe05da 100644
--- a/mingw-w64-python-zope.interface/PKGBUILD
+++ b/mingw-w64-python-zope.interface/PKGBUILD
@@ -2,30 +2,32 @@
 
 _realname=zope.interface
 pkgbase=mingw-w64-python-${_realname}
-pkgname=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
-pkgver=4.6.0
-pkgrel=3
+pkgname=("${MINGW_PACKAGE_PREFIX}-python-${_realname}")
+provides=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+conflicts=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+replaces=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+pkgver=4.7.1
+pkgrel=1
 pkgdesc='Interfaces for Python (mingw-w64)'
 url=' https://github.com/zopefoundation/zope.interface'
 license=('ZPL 2.1')
 arch=('any')
-depends=("${MINGW_PACKAGE_PREFIX}-python3")
-makedepends=("${MINGW_PACKAGE_PREFIX}-python3-setuptools")
+depends=("${MINGW_PACKAGE_PREFIX}-python")
+makedepends=("${MINGW_PACKAGE_PREFIX}-python-setuptools")
 _dtoken="ac/8a/657532df378c2cd2a1fe6b12be3b4097521570769d4852ec02c24bd3594e"
 source=("${_realname}-${pkgver}.tar.gz::https://github.com/zopefoundation/zope.interface/archive/${pkgver}.tar.gz")
-sha256sums=('1b653e63fc9d2fd61eec9ef3d486a415048e4e57e8efd68828aeb244d0948298')
+sha256sums=('e9bc1ee8d9d016475d593605b6314269cfb4c2af01188b9597e9732825303718')
 
 build() {
   cd "${srcdir}/${_realname}-${pkgver}"
-
-  ${MINGW_PREFIX}/bin/python3 setup.py build
+  ${MINGW_PREFIX}/bin/python setup.py build
 }
 
 package() {
   cd "${srcdir}/${_realname}-${pkgver}"
 
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
-  ${MINGW_PREFIX}/bin/python3 setup.py install --prefix=${MINGW_PREFIX} --root="${pkgdir}"
+  ${MINGW_PREFIX}/bin/python setup.py install --prefix=${MINGW_PREFIX} --root="${pkgdir}"
 
-  install -Dm644 "${srcdir}/${_realname}-${pkgver}/LICENSE.txt" "${pkgdir}${MINGW_PREFIX}/share/licenses/python3-${_realname}/LICENSE"
+  install -Dm644 "${srcdir}/${_realname}-${pkgver}/LICENSE.txt" "${pkgdir}${MINGW_PREFIX}/share/licenses/python-${_realname}/LICENSE"
 }
diff --git a/mingw-w64-unicorn/001-mingw.patch b/mingw-w64-unicorn/001-mingw.patch
index 817c2ae2a3..15017b457d 100644
--- a/mingw-w64-unicorn/001-mingw.patch
+++ b/mingw-w64-unicorn/001-mingw.patch
@@ -76,21 +76,23 @@
          got_all = True
          for dll in ALL_WINDOWS_DLLS:
              dllpath = os.path.join(sys.prefix, 'bin', dll)
-@@ -174,15 +176,16 @@
+@@ -174,16 +176,17 @@
  
      subprocess.call(cmd, env=new_env)
  
 -    shutil.copy(LIBRARY_FILE, LIBS_DIR)
 -    try:
 -        # static library may fail to build on windows if user doesn't have visual studio installed. this is fine.
--        shutil.copy(STATIC_LIBRARY_FILE, LIBS_DIR)
+-        if STATIC_LIBRARY_FILE is not None:
+-            shutil.copy(STATIC_LIBRARY_FILE, LIBS_DIR)
 -    except:
 -        print('Warning: Could not build static library file! This build is not appropriate for a binary distribution')
 -        # enforce this
 -        if 'upload' in sys.argv:
 -            sys.exit(1)
 +    if not _POSIX_BUILD:
-+        shutil.copy(LIBRARY_FILE, LIBS_DIR)
++        if STATIC_LIBRARY_FILE is not None:
++            shutil.copy(LIBRARY_FILE, LIBS_DIR)
 +        try:
 +            # static library may fail to build on windows if user doesn't have visual studio installed. this is fine.
 +            shutil.copy(STATIC_LIBRARY_FILE, LIBS_DIR)
@@ -125,9 +127,9 @@
           'linux': 'libunicorn.so',
           'linux2': 'libunicorn.so' }
 @@ -78,6 +78,7 @@
- # - last-gasp attempt at some hardcoded paths on darwin and linux
  
- _path_list = [pkg_resources.resource_filename(__name__, 'lib'),
+ _path_list = [os.getenv('LIBUNICORN_PATH', None),
+               pkg_resources.resource_filename(__name__, 'lib'),
 +              sys.prefix + '/bin',
                os.path.join(os.path.split(__file__)[0], 'lib'),
                '',
diff --git a/mingw-w64-unicorn/PKGBUILD b/mingw-w64-unicorn/PKGBUILD
index a2f314fd92..717d672060 100644
--- a/mingw-w64-unicorn/PKGBUILD
+++ b/mingw-w64-unicorn/PKGBUILD
@@ -3,87 +3,74 @@
 _realname=unicorn
 pkgbase=mingw-w64-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-unicorn"
-         "${MINGW_PACKAGE_PREFIX}-python2-unicorn"
-         "${MINGW_PACKAGE_PREFIX}-python3-unicorn")
-pkgver=1.0.1
-pkgrel=5
+         "${MINGW_PACKAGE_PREFIX}-python-unicorn")
+_rc=-rc1
+_basever=1.0.2
+pkgver=${_basever}${_rc//-/}
+pkgrel=1
 pkgdesc="A lightweight multi-platform, multi-architecture CPU emulator framework based on QEMU (mingw-w64)"
 url='https://www.unicorn-engine.org/index.html'
 arch=('any')
 license=('GPL2')
 depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs")
-makedepends=("${MINGW_PACKAGE_PREFIX}-python2"
-             "${MINGW_PACKAGE_PREFIX}-python3"
-             "${MINGW_PACKAGE_PREFIX}-python2-setuptools"
-             "${MINGW_PACKAGE_PREFIX}-python3-setuptools")
-source=("${_realname}-${pkgver}.tar.gz::https://github.com/unicorn-engine/unicorn/archive/${pkgver}.tar.gz"
+makedepends=("${MINGW_PACKAGE_PREFIX}-python"
+             "${MINGW_PACKAGE_PREFIX}-python-setuptools")
+source=("${_realname}-${pkgver}.tar.gz::https://github.com/unicorn-engine/unicorn/archive/${_basever}${_rc}.tar.gz"
         001-mingw.patch)
-sha512sums=('edfe1f7bfbc1d20f5b62232057e194a937bc09db686ef2efadb33a54605029a53426432cdb2a29511385aacdb9343b3b3091af50a1909098d7cf6db3429eb966'
-            '842b1451888ceaf758d3f00f0eb595a3afa0fa18930666b28073d3f42641c71d18f6c45158e80f1b20f61271b86abc6b8524259ac63359a236abf5ec9c059514')
+sha512sums=('c710b4a6c24a2b51def4a732a2186dd774e111287950f80fccb01cd0a9dc9788302e15bc55146df298412a824123b862ddde3a9de3627d7912dea9bc29ee27d3'
+            'cdf7567d143ff8b6918853a4bdf2d29c7fd3724688cd69cf9a111f97e2b68eb5b21cd8ea8d3e2979fa58cad399e78a114b43dec1cec02de85a9f17d4d286b2cb')
 
 prepare() {
-  cd "${_realname}-${pkgver}"
+  cd "${_realname}-${_basever}${_rc}"
   patch -p1 -i ${srcdir}/001-mingw.patch
   
   sed 's|-O3|-O2|g' -i Makefile qemu/configure
   sed 's|-g ||g' -i qemu/configure
   sed 's|UNICORN_DEBUG ?= yes|UNICORN_DEBUG ?= no|g' -i config.mk
-  cp -ra bindings/python{,3}
-  sed -r 's|(python)$|\13|' -i bindings/python3/*.py
+  sed -r 's|(python)$|\13|' -i bindings/python/*.py
 }
 
 build() {
-  cd "${_realname}-${pkgver}"
+  cd "${_realname}-${_basever}${_rc}"
   make clean
 
-  UNICORN_QEMU_FLAGS="--python=${MINGW_PREFIX}/bin/python2" \
+  UNICORN_QEMU_FLAGS="--python=${MINGW_PREFIX}/bin/python" \
   make PREFIX="${MINGW_PREFIX}"
 
   (cd bindings
-    python2 const_generator.py python
+    ${MINGW_PREFIX}/bin/python const_generator.py python
   )
   (cd bindings/python
-    python2 setup.py build
-  )
-  (cd bindings/python3
-    python3 setup.py build
+    ${MINGW_PREFIX}/bin/python setup.py build
   )
 }
 
 package_unicorn() {
-  cd "${_realname}-${pkgver}"
+  cd "${_realname}-${_basever}${_rc}"
 
   make DESTDIR="${pkgdir}" PREFIX="${MINGW_PREFIX}" install
 
-  install -Dm644 "${srcdir}/${_realname}-${pkgver}/COPYING" "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/COPYING"
-  install -Dm644 "${srcdir}/${_realname}-${pkgver}/COPYING_GLIB" "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/COPYING_GLIB"
+  install -Dm644 "${srcdir}/${_realname}-${_basever}${_rc}/COPYING" "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/COPYING"
+  install -Dm644 "${srcdir}/${_realname}-${_basever}${_rc}/COPYING.LGPL2" "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/COPYING.LGPL2"
+  install -Dm644 "${srcdir}/${_realname}-${_basever}${_rc}/COPYING_GLIB" "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/COPYING_GLIB"
 }
 
-package_python2-unicorn() {
-  depends=("${MINGW_PACKAGE_PREFIX}-python2" "${MINGW_PACKAGE_PREFIX}-unicorn")
-  cd "${_realname}-${pkgver}/bindings/python"
+package_python-unicorn() {
+  depends=("${MINGW_PACKAGE_PREFIX}-python" "${MINGW_PACKAGE_PREFIX}-unicorn")
+  provides=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+  conflicts=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+  replaces=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+  
+  cd "${_realname}-${_basever}${_rc}/bindings/python"
 
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
-  python2 setup.py install --root="${pkgdir}" --prefix="${MINGW_PREFIX}" \
+  ${MINGW_PREFIX}/bin/python setup.py install --root="${pkgdir}" --prefix="${MINGW_PREFIX}" \
     -O1 --skip-build
 
-  install -Dm 644 sample* shellcode.py -t "${pkgdir}${MINGW_PREFIX}/share/doc/python2-${_realname}/samples"
-}
-
-package_python3-unicorn() {
-  depends=("${MINGW_PACKAGE_PREFIX}-python3" "${MINGW_PACKAGE_PREFIX}-unicorn")
-  cd "${_realname}-${pkgver}/bindings/python3"
-
-  MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
-  python3 setup.py install --root="${pkgdir}" --prefix="${MINGW_PREFIX}" \
-    -O1 --skip-build
-
-  install -Dm 644 sample* shellcode.py -t "${pkgdir}${MINGW_PREFIX}/share/doc/python3-${_realname}/samples"
+  install -Dm 644 sample* shellcode.py -t "${pkgdir}${MINGW_PREFIX}/share/doc/python-${_realname}/samples"
 }
 
 package_mingw-w64-i686-unicorn()   { package_unicorn; }
 package_mingw-w64-x86_64-unicorn() { package_unicorn; }
-package_mingw-w64-i686-python2-unicorn()   { package_python2-unicorn; }
-package_mingw-w64-x86_64-python2-unicorn() { package_python2-unicorn; }
-package_mingw-w64-i686-python3-unicorn()   { package_python3-unicorn; }
-package_mingw-w64-x86_64-python3-unicorn() { package_python3-unicorn; }
+package_mingw-w64-i686-python-unicorn()   { package_python-unicorn; }
+package_mingw-w64-x86_64-python-unicorn() { package_python-unicorn; }