diff --git a/mingw-w64-pycairo/PKGBUILD b/mingw-w64-pycairo/PKGBUILD
index c7de589ece..f465ae2059 100644
--- a/mingw-w64-pycairo/PKGBUILD
+++ b/mingw-w64-pycairo/PKGBUILD
@@ -2,17 +2,17 @@
 
 _realname=pycairo
 pkgbase=mingw-w64-${_realname}
-pkgname=("${MINGW_PACKAGE_PREFIX}-python2-cairo" "${MINGW_PACKAGE_PREFIX}-python3-cairo")
+pkgname=("${MINGW_PACKAGE_PREFIX}-python2-cairo" "${MINGW_PACKAGE_PREFIX}-python-cairo")
 pkgver=1.18.2
-pkgrel=1
+pkgrel=2
 pkgdesc="Python bindings for the cairo graphics library (mingw-w64)"
 url="https://pycairo.readthedocs.io"
 arch=('any')
 license=('LGPL' 'MPL')
 depends=("${MINGW_PACKAGE_PREFIX}-cairo")
 makedepends=("${MINGW_PACKAGE_PREFIX}-python2"
-             "${MINGW_PACKAGE_PREFIX}-python3")
-checkdepends=("${MINGW_PACKAGE_PREFIX}-python3-pytest"
+             "${MINGW_PACKAGE_PREFIX}-python")
+checkdepends=("${MINGW_PACKAGE_PREFIX}-python-pytest"
               "${MINGW_PACKAGE_PREFIX}-python2-pytest")
 source=(https://github.com/pygobject/${_realname}/releases/download/v${pkgver}/${_realname}-${pkgver}.tar.gz)
 sha256sums=('dcb853fd020729516e8828ad364084e752327d4cff8505d20b13504b32b16531')
@@ -21,12 +21,12 @@ prepare() {
   cd "${srcdir}"
   rm -rf python2-build python3-build
   cp -r ${_realname}-${pkgver} python2-build
-  cp -r ${_realname}-${pkgver} python3-build
+  cp -r ${_realname}-${pkgver} python-build
 }
 
 build() {
   cd "${srcdir}"
-  for builddir in python{2,3}-build; do
+  for builddir in python{,2}-build; do
     pushd ${builddir}
     ${MINGW_PREFIX}/bin/${builddir%-build} setup.py build
     popd
@@ -35,7 +35,7 @@ build() {
 
 check() {
   cd "${srcdir}"
-  for builddir in python{2,3}-build; do
+  for builddir in python{,2}-build; do
     pushd ${builddir}
     ${MINGW_PREFIX}/bin/${builddir%-build} setup.py test
     popd
@@ -51,27 +51,31 @@ package_python2-cairo() {
   install -Dm644 COPYING* -t "${pkgdir}${MINGW_PREFIX}/share/licenses/python2-cairo"
 }
 
-package_python3-cairo() {
-  depends+=("${MINGW_PACKAGE_PREFIX}-python3")
-  cd "${srcdir}/python3-build"
-  MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
-    ${MINGW_PREFIX}/bin/python3 setup.py install --prefix=${MINGW_PREFIX} --root="${pkgdir}" -O1
+package_python-cairo() {
+  depends+=("${MINGW_PACKAGE_PREFIX}-python")
+  provides=("${MINGW_PACKAGE_PREFIX}-python3-cairo")
+  conflicts=("${MINGW_PACKAGE_PREFIX}-python3-cairo")
+  replaces=("${MINGW_PACKAGE_PREFIX}-python3-cairo")
 
-  install -Dm644 COPYING* -t "${pkgdir}${MINGW_PREFIX}/share/licenses/python3-cairo"
+  cd "${srcdir}/python-build"
+  MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
+    ${MINGW_PREFIX}/bin/python setup.py install --prefix=${MINGW_PREFIX} --root="${pkgdir}" -O1
+
+  install -Dm644 COPYING* -t "${pkgdir}${MINGW_PREFIX}/share/licenses/python-cairo"
 }
 
 package_mingw-w64-i686-python2-cairo() {
   package_python2-cairo
 }
 
-package_mingw-w64-i686-python3-cairo() {
-  package_python3-cairo
+package_mingw-w64-i686-python-cairo() {
+  package_python-cairo
 }
 
 package_mingw-w64-x86_64-python2-cairo() {
   package_python2-cairo
 }
 
-package_mingw-w64-x86_64-python3-cairo() {
-  package_python3-cairo
+package_mingw-w64-x86_64-python-cairo() {
+  package_python-cairo
 }
diff --git a/mingw-w64-python-apipkg/PKGBUILD b/mingw-w64-python-apipkg/PKGBUILD
index bfd0c30cd5..a95a441627 100644
--- a/mingw-w64-python-apipkg/PKGBUILD
+++ b/mingw-w64-python-apipkg/PKGBUILD
@@ -2,38 +2,40 @@
 
 _realname=apipkg
 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=4
+pkgrel=1
 pkgdesc="Namespace control and lazy-import mechanism (mingw-w64)"
 arch=('any')
 url="https://github.com/pytest-dev/apipkg"
 license=('MIT')
-depends=("${MINGW_PACKAGE_PREFIX}-python3")
-makedepends=("${MINGW_PACKAGE_PREFIX}-python3-setuptools"
-             "${MINGW_PACKAGE_PREFIX}-python3-setuptools-scm")
+depends=("${MINGW_PACKAGE_PREFIX}-python")
+makedepends=("${MINGW_PACKAGE_PREFIX}-python-setuptools"
+             "${MINGW_PACKAGE_PREFIX}-python-setuptools-scm")
 options=('staticlibs' 'strip' '!debug')
 source=("https://files.pythonhosted.org/packages/source/a/${_realname}/${_realname}-${pkgver}.tar.gz")
 sha256sums=('37228cda29411948b422fae072f57e31d3396d2ee1c9783775980ee9c9990af6')
 
 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 -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-appdirs/PKGBUILD b/mingw-w64-python-appdirs/PKGBUILD
index 6c97b45d7e..2263934482 100644
--- a/mingw-w64-python-appdirs/PKGBUILD
+++ b/mingw-w64-python-appdirs/PKGBUILD
@@ -2,15 +2,18 @@
 
 _realname=appdirs
 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.4.3
-pkgrel=5
+pkgrel=1
 pkgdesc='A small Python module for determining appropriate platform-specific dirs, e.g. a "user data dir" (mingw-w64)'
 arch=('any')
 url="https://github.com/ActiveState/appdirs"
 license=('MIT')
-depends=("${MINGW_PACKAGE_PREFIX}-python3")
-makedepends=("${MINGW_PACKAGE_PREFIX}-python3-setuptools")
+depends=("${MINGW_PACKAGE_PREFIX}-python")
+makedepends=("${MINGW_PACKAGE_PREFIX}-python-setuptools")
 source=("https://pypi.io/packages/source/a/appdirs/appdirs-${pkgver}.tar.gz")
 sha256sums=('9e5896d1372858f8dd3344faf4e5014d21849c756c8d5701f78f8a103b372d92')
 
diff --git a/mingw-w64-python-asn1crypto/PKGBUILD b/mingw-w64-python-asn1crypto/PKGBUILD
index ae0457f925..1de746508f 100644
--- a/mingw-w64-python-asn1crypto/PKGBUILD
+++ b/mingw-w64-python-asn1crypto/PKGBUILD
@@ -2,34 +2,36 @@
 
 _realname=asn1crypto
 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=1
 pkgdesc="Python ASN.1 library with a focus on performance and a pythonic API (mingw-w64)"
 url='https://github.com/wbond/asn1crypto'
 license=('MIT')
 arch=('any')
-depends=("${MINGW_PACKAGE_PREFIX}-python3-pycparser")
-makedepends=("${MINGW_PACKAGE_PREFIX}-python3-setuptools")
+depends=("${MINGW_PACKAGE_PREFIX}-python-pycparser")
+makedepends=("${MINGW_PACKAGE_PREFIX}-python-setuptools")
 source=("${_realname}-${pkgver}.tar.gz::https://github.com/wbond/asn1crypto/archive/${pkgver}.tar.gz")
 sha256sums=('9d8ac276bdeb5551313580fb4c8c50d50e2faac6862f5916802ae65c8b187468')
 
 prepare() {
   cd ${srcdir}
-  cp -r ${_realname}-${pkgver} python3-build-${CARCH}
+  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}
-  ${MINGW_PREFIX}/bin/python3 setup.py build
+  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
 
-  install -D -m644 LICENSE "${pkgdir}${MINGW_PREFIX}"/share/licenses/python3-${_realname}/LICENSE
+  install -D -m644 LICENSE "${pkgdir}${MINGW_PREFIX}"/share/licenses/python-${_realname}/LICENSE
 }
diff --git a/mingw-w64-python-atomicwrites/PKGBUILD b/mingw-w64-python-atomicwrites/PKGBUILD
index 6a8333928e..9325ad999c 100644
--- a/mingw-w64-python-atomicwrites/PKGBUILD
+++ b/mingw-w64-python-atomicwrites/PKGBUILD
@@ -2,16 +2,19 @@
 
 _realname=atomicwrites
 pkgbase=mingw-w64-python-${_realname}
-pkgname=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+pkgname=("${MINGW_PACKAGE_PREFIX}-python-${_realname}")
 pkgver=1.3.0
-pkgrel=3
+pkgrel=1
+provides=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}=${pkgver}")
+conflicts=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+replaces=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
 pkgdesc="Atomic file writes on POSIX (mingw-w64)"
 url="https://github.com/untitaker/python-atomicwrites"
 license=('MIT')
 arch=('any')
-depends=("${MINGW_PACKAGE_PREFIX}-python3")
-makedepends=("${MINGW_PACKAGE_PREFIX}-python3-setuptools")
-checkdepends=("${MINGW_PACKAGE_PREFIX}-python3-pathlib2")
+depends=("${MINGW_PACKAGE_PREFIX}-python")
+makedepends=("${MINGW_PACKAGE_PREFIX}-python-setuptools")
+checkdepends=("${MINGW_PACKAGE_PREFIX}-python-pathlib2")
 source=("${_realname}-${pkgver}.tar.gz"::"https://github.com/untitaker/python-atomicwrites/archive/${pkgver}.tar.gz")
 sha256sums=('e286509543a26777e8cb862c9373e89c31f66fe38066d0df7f678d00a97615cd')
 
@@ -36,30 +39,30 @@ 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() {
-  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 build
+      ${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=build:${PYTHONPATH} ${MINGW_PREFIX}/bin/py.test
 }
 
 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-attrs/PKGBUILD b/mingw-w64-python-attrs/PKGBUILD
index 58931ebf80..3795b85753 100644
--- a/mingw-w64-python-attrs/PKGBUILD
+++ b/mingw-w64-python-attrs/PKGBUILD
@@ -2,15 +2,18 @@
 
 _realname=attrs
 pkgbase=mingw-w64-python-${_realname}
-pkgname=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+pkgname=("${MINGW_PACKAGE_PREFIX}-python-${_realname}")
 pkgver=19.3.0
-pkgrel=2
+pkgrel=1
+provides=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}=${pkgver}")
+conflicts=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+replaces=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
 pkgdesc='Attributes without boilerplate (mingw-w64)'
 url='https://attrs.readthedocs.org/'
 license=('MIT')
 arch=('any')
-depends=("${MINGW_PACKAGE_PREFIX}-python3")
-makedepends=("${MINGW_PACKAGE_PREFIX}-python3-setuptools")
+depends=("${MINGW_PACKAGE_PREFIX}-python")
+makedepends=("${MINGW_PACKAGE_PREFIX}-python-setuptools")
 source=("https://pypi.org/packages/source/${_realname::1}/${_realname}/${_realname}-${pkgver}.tar.gz")
 sha256sums=('f7b7ce16570fe9965acd6d30101a28f62fb4a7f9e926b3bbc9b61f8b04247e72')
 
diff --git a/mingw-w64-python-babel/PKGBUILD b/mingw-w64-python-babel/PKGBUILD
index 316486aca7..7af7d62aed 100644
--- a/mingw-w64-python-babel/PKGBUILD
+++ b/mingw-w64-python-babel/PKGBUILD
@@ -3,19 +3,22 @@
 _pyname=babel
 _realname=babel
 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.0
 _core=35
-pkgrel=3
+pkgrel=1
 pkgdesc="A collection of tools for internationalizing Python applications (mingw-w64)"
 url="http://babel.pocoo.org/"
 license=("BSD")
 arch=('any')
-depends=("${MINGW_PACKAGE_PREFIX}-python3-pytz")
-makedepends=("${MINGW_PACKAGE_PREFIX}-python3-setuptools")
-checkdepends=("${MINGW_PACKAGE_PREFIX}-python3-pytest"
-              "${MINGW_PACKAGE_PREFIX}-python3-pytest-runner"
-              "${MINGW_PACKAGE_PREFIX}-python3-freezegun")
+depends=("${MINGW_PACKAGE_PREFIX}-python-pytz")
+makedepends=("${MINGW_PACKAGE_PREFIX}-python-setuptools")
+checkdepends=("${MINGW_PACKAGE_PREFIX}-python-pytest"
+              "${MINGW_PACKAGE_PREFIX}-python-pytest-runner"
+              "${MINGW_PACKAGE_PREFIX}-python-freezegun")
 source=("${_realname}-${pkgver}.tar.gz"::"https://github.com/python-babel/babel/archive/v${pkgver}.tar.gz"
            "core-${_core}.zip"::"https://unicode.org/Public/cldr/${_core}/core.zip")
 noextract=("core-${_core}.zip")
diff --git a/mingw-w64-python-beautifulsoup4/PKGBUILD b/mingw-w64-python-beautifulsoup4/PKGBUILD
index e0ed7c6851..6aeb493d5e 100644
--- a/mingw-w64-python-beautifulsoup4/PKGBUILD
+++ b/mingw-w64-python-beautifulsoup4/PKGBUILD
@@ -2,23 +2,27 @@
 
 _realname=beautifulsoup4
 pkgbase=mingw-w64-python-${_realname}
-pkgname=("${MINGW_PACKAGE_PREFIX}-python3-beautifulsoup4")
-pkgver=4.8.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=4.8.2
+pkgrel=1
 pkgdesc="A Python HTML/XML parser designed for quick turnaround projects like screen-scraping (mingw-w64)"
 arch=('any')
 url="https://www.crummy.com/software/BeautifulSoup/index.html"
 license=('PSF')
-depends=("${MINGW_PACKAGE_PREFIX}-python3"
-         "${MINGW_PACKAGE_PREFIX}-python3-soupsieve")
-optdepends=("${MINGW_PACKAGE_PREFIX}-python3-chardet: to autodetect character encodings"
-            "${MINGW_PACKAGE_PREFIX}-python3-lxml: alternative HTML parser"
-            "${MINGW_PACKAGE_PREFIX}-python3-html5lib: alternative HTML parser")
-makedepends=("${MINGW_PACKAGE_PREFIX}-python3-setuptools")
-checkdepends=("${MINGW_PACKAGE_PREFIX}-python3-pytest")
-source=(#"https://www.crummy.com/software/BeautifulSoup/bs4/download/${pkgver%.*}/${_realname#*-}-${pkgver}.tar.gz"
-        https://files.pythonhosted.org/packages/86/cd/495c68f0536dcd25f016e006731ba7be72e072280305ec52590012c1e6f2/beautifulsoup4-${pkgver}.tar.gz)
-sha256sums=('6135db2ba678168c07950f9a16c4031822c6f4aec75a65e0a97bc5ca09789931')
+depends=("${MINGW_PACKAGE_PREFIX}-python"
+         "${MINGW_PACKAGE_PREFIX}-python-soupsieve")
+optdepends=("${MINGW_PACKAGE_PREFIX}-python-chardet: to autodetect character encodings"
+            "${MINGW_PACKAGE_PREFIX}-python-lxml: alternative HTML parser"
+            "${MINGW_PACKAGE_PREFIX}-python-html5lib: alternative HTML parser")
+makedepends=("${MINGW_PACKAGE_PREFIX}-python-setuptools")
+checkdepends=("${MINGW_PACKAGE_PREFIX}-python-pytest")
+source=("https://www.crummy.com/software/BeautifulSoup/bs4/download/${pkgver%.*}/${_realname}-${pkgver}.tar.gz"
+        #https://files.pythonhosted.org/packages/86/cd/495c68f0536dcd25f016e006731ba7be72e072280305ec52590012c1e6f2/beautifulsoup4-${pkgver}.tar.gz
+        )
+sha256sums=('05fd825eb01c290877657a56df4c6e4c311b3965bda790c613a3d6fb01a5462a')
 noextract=("${_realname}-${pkgver}.tar.gz")
 
 prepare() {
@@ -26,26 +30,26 @@ prepare() {
   [[ -d ${_realname}-${pkgver} ]] && rm -rf ${_realname}-${pkgver}
   tar -xzf "${_realname}-${pkgver}.tar.gz" -C ${srcdir} || true
 
-  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}"
+  msg "Python test for ${CARCH}"
+  cd "${srcdir}/python-build-${CARCH}"
   ${MINGW_PREFIX}/bin/2to3 -w bs4
   ${MINGW_PREFIX}/bin/py.test
 }
 
 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-cachecontrol/PKGBUILD b/mingw-w64-python-cachecontrol/PKGBUILD
index a1ee315763..84242b8362 100644
--- a/mingw-w64-python-cachecontrol/PKGBUILD
+++ b/mingw-w64-python-cachecontrol/PKGBUILD
@@ -2,26 +2,29 @@
 
 _realname=cachecontrol
 pkgbase=mingw-w64-python-${_realname}
-pkgname=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
-pkgver=0.12.5
-pkgrel=4
+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.12.6
+pkgrel=1
 pkgdesc="httplib2 caching for requests (mingw-w64)"
 arch=('any')
 url="https://github.com/ionrock/${_realname}"
 license=('Apache')
-depends=("${MINGW_PACKAGE_PREFIX}-python3"
-         "${MINGW_PACKAGE_PREFIX}-python3-msgpack"
-         "${MINGW_PACKAGE_PREFIX}-python3-requests")
-optdepends=("${MINGW_PACKAGE_PREFIX}-python3-lockfile: for the FileCache")
-makedepends=("${MINGW_PACKAGE_PREFIX}-python3-setuptools")
-#checkdepends=("${MINGW_PACKAGE_PREFIX}-python3-mock"
-#              "${MINGW_PACKAGE_PREFIX}-python3-pytest"
-#              "${MINGW_PACKAGE_PREFIX}-python3-lockfile"
-#              "${MINGW_PACKAGE_PREFIX}-python3-cherrypy")
+depends=("${MINGW_PACKAGE_PREFIX}-python"
+         "${MINGW_PACKAGE_PREFIX}-python-msgpack"
+         "${MINGW_PACKAGE_PREFIX}-python-requests")
+optdepends=("${MINGW_PACKAGE_PREFIX}-python-lockfile: for the FileCache")
+makedepends=("${MINGW_PACKAGE_PREFIX}-python-setuptools")
+#checkdepends=("${MINGW_PACKAGE_PREFIX}-python-mock"
+#              "${MINGW_PACKAGE_PREFIX}-python-pytest"
+#              "${MINGW_PACKAGE_PREFIX}-python-lockfile"
+#              "${MINGW_PACKAGE_PREFIX}-python-cherrypy")
 install=${_realname}3-${CARCH}.install
 options=('staticlibs' 'strip' '!debug')
 source=("${_realname}-${pkgver}.tar.gz"::"${url}/archive/v${pkgver}.tar.gz")
-sha256sums=('d3876bbd614968e0d82c95734b380fca648661416fb14dc1a50514256e521089')
+sha256sums=('2ec120838f445bff473cd8b8206ddae3650679142976927179743fabb876f3e3')
 
 # Helper macros to help make tasks easier #
 apply_patch_with_msg() {
@@ -49,39 +52,35 @@ prepare() {
 #      0002-A-less-important-fix.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}"
 
   # 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 pytest
+  msg "Python test for ${CARCH}"
+  cd "${srcdir}/python-build-${CARCH}"
+  # ${MINGW_PREFIX}/bin/python -m 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
 
-  # 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-certifi/PKGBUILD b/mingw-w64-python-certifi/PKGBUILD
index b75b1d1825..d29bc84cba 100644
--- a/mingw-w64-python-certifi/PKGBUILD
+++ b/mingw-w64-python-certifi/PKGBUILD
@@ -2,17 +2,20 @@
 
 _realname=certifi
 pkgbase=mingw-w64-python-${_realname}
-pkgname=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
-pkgver=2019.9.11
-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.11.28
+pkgrel=1
 pkgdesc="Python package for providing Mozilla's CA Bundle (mingw-w64)"
 url='https://pypi.python.org/pypi/certifi'
 license=('GPL')
 arch=('any')
-depends=("${MINGW_PACKAGE_PREFIX}-python3")
-makedepends=("${MINGW_PACKAGE_PREFIX}-python3-setuptools")
+depends=("${MINGW_PACKAGE_PREFIX}-python")
+makedepends=("${MINGW_PACKAGE_PREFIX}-python-setuptools")
 source=("https://pypi.io/packages/source/${_realname:0:1}/${_realname}/${_realname}-${pkgver}.tar.gz")
-sha256sums=('e4f3620cfea4f83eedc95b24abd9cd56f3c4b146dd0177e83a21b4eb49e21e50')
+sha256sums=('25b64c7da4cd7479594d035c08c2d809eb4aab3a26e5a990ea98cc450c320f1f')
 
 prepare() {
   cd ${srcdir}
diff --git a/mingw-w64-python-cffi/PKGBUILD b/mingw-w64-python-cffi/PKGBUILD
index 1700318179..c48cc566a4 100644
--- a/mingw-w64-python-cffi/PKGBUILD
+++ b/mingw-w64-python-cffi/PKGBUILD
@@ -2,37 +2,40 @@
 
 _realname=cffi
 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.13.2
-pkgrel=2
+pkgrel=1
 _revision=0c9be4c0d798
 pkgdesc="Foreign Function Interface for Python calling C code (mingw-w64)"
 url='https://cffi.readthedocs.io/'
 license=('MIT')
 arch=('any')
-depends=("${MINGW_PACKAGE_PREFIX}-python3-pycparser")
-makedepends=("${MINGW_PACKAGE_PREFIX}-python3-setuptools")
-checkdepends=("${MINGW_PACKAGE_PREFIX}-python3-pytest-runner")
+depends=("${MINGW_PACKAGE_PREFIX}-python-pycparser")
+makedepends=("${MINGW_PACKAGE_PREFIX}-python-setuptools")
+checkdepends=("${MINGW_PACKAGE_PREFIX}-python-pytest-runner")
 source=("${_realname}-${pkgver}.tar.bz2::https://bitbucket.org/cffi/cffi/get/v${pkgver}.tar.bz2")
 sha256sums=('f4bc9ca955e645106c00680b4597d83d45325da21d52d101a8b7276b20a62a5a')
 
 prepare() {
   cd ${srcdir}
-  cp -r cffi-cffi-${_revision} python3-build-${CARCH}
+  cp -r cffi-cffi-${_revision} python-build-${CARCH}
 }
 
 build() {
   cd "${srcdir}"
-  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}
-  ${MINGW_PREFIX}/bin/python3 setup.py build
+  cd ${srcdir}/python-build-${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}"
+  ${MINGW_PREFIX}/bin/python setup.py install --prefix=${MINGW_PREFIX} --root="${pkgdir}" --skip-build
 
-  install -D -m644 LICENSE "${pkgdir}${MINGW_PREFIX}"/share/licenses/python3-${_realname}/LICENSE
+  install -D -m644 LICENSE "${pkgdir}${MINGW_PREFIX}"/share/licenses/python-${_realname}/LICENSE
 }
diff --git a/mingw-w64-python-chardet/PKGBUILD b/mingw-w64-python-chardet/PKGBUILD
index 19cad734b3..dd475a77af 100644
--- a/mingw-w64-python-chardet/PKGBUILD
+++ b/mingw-w64-python-chardet/PKGBUILD
@@ -2,14 +2,17 @@
 
 _realname=chardet
 pkgbase=mingw-w64-python-${_realname}
-pkgname=("${MINGW_PACKAGE_PREFIX}-python3-chardet")
+pkgname=("${MINGW_PACKAGE_PREFIX}-python-chardet")
+provides=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+conflicts=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+replaces=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
 pkgdesc="Python module for character encoding auto-detection (mingw-w64)"
 pkgver=3.0.4
-pkgrel=4
+pkgrel=1
 arch=('any')
 url="https://github.com/chardet/chardet"
 license=('LGPL')
-depends=("${MINGW_PACKAGE_PREFIX}-python3-setuptools")
+depends=("${MINGW_PACKAGE_PREFIX}-python-setuptools")
 #More comprehensive than PyPi source
 source=("${_realname}-${pkgver}.tar.gz::https://github.com/chardet/chardet/archive/${pkgver}.tar.gz")
 sha256sums=('d5620025cfca430f6c2e28ddbc87c3c66a5c82fa65570ae975c92911c2190189')
diff --git a/mingw-w64-python-colorama/PKGBUILD b/mingw-w64-python-colorama/PKGBUILD
index 60dd263db5..8d8808a3f3 100644
--- a/mingw-w64-python-colorama/PKGBUILD
+++ b/mingw-w64-python-colorama/PKGBUILD
@@ -3,21 +3,22 @@
 
 _realname=colorama
 pkgbase=mingw-w64-python-${_realname}
-pkgname=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
-pkgver=0.4.1
-pkgrel=5
+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.3
+pkgrel=1
 pkgdesc="Python API for cross-platform colored terminal text (mingw-w64)"
 arch=('any')
 license=('BSD')
 url="https://pypi.python.org/pypi/colorama"
-depends=("${MINGW_PACKAGE_PREFIX}-python3")
-makedepends=("${MINGW_PACKAGE_PREFIX}-python3-setuptools")
-checkdepends=("${MINGW_PACKAGE_PREFIX}-python3-mock")
+depends=("${MINGW_PACKAGE_PREFIX}-python")
+makedepends=("${MINGW_PACKAGE_PREFIX}-python-setuptools")
+checkdepends=("${MINGW_PACKAGE_PREFIX}-python-mock")
 options=('staticlibs')
-source=("${_realname}-${pkgver}.tar.gz::https://github.com/tartley/colorama/archive/${pkgver}.tar.gz"
-        df2ca5e9237f46d1e48b6115b87f37db6abfa908.patch)
-sha256sums=('6b2e2bb7bd96813fcafe5598886ce4f9f741450677e1ee090a119c600f04de9c'
-            '75feae882be925c472b59908bb21ac5906474836e093aef7add2a55568858ab1')
+source=("${_realname}-${pkgver}.tar.gz::https://github.com/tartley/colorama/archive/${pkgver}.tar.gz")
+sha256sums=('0d93fc83f70c926cd8437b488ea9c8741f9df2ac2d2d681c40783d5ceef98e2b')
 
 apply_patch_with_msg() {
   for _patch in "$@"
@@ -29,9 +30,6 @@ apply_patch_with_msg() {
 
 prepare() {
   cd "${srcdir}"
-  pushd "${_realname}-${pkgver}"
-    apply_patch_with_msg df2ca5e9237f46d1e48b6115b87f37db6abfa908.patch
-  popd
 
   rm -rf python-build-${CARCH} | true
   cp -r "${_realname}-${pkgver}" "python-build-${CARCH}"
@@ -56,4 +54,4 @@ package() {
     --root="${pkgdir}" --optimize=1 --skip-build
 
   install -Dm644 LICENSE.txt "${pkgdir}${MINGW_PREFIX}/share/licenses/python-${_realname}/COPYING"
-}
\ No newline at end of file
+}
diff --git a/mingw-w64-python-colorama/df2ca5e9237f46d1e48b6115b87f37db6abfa908.patch b/mingw-w64-python-colorama/df2ca5e9237f46d1e48b6115b87f37db6abfa908.patch
deleted file mode 100644
index 2888544da7..0000000000
--- a/mingw-w64-python-colorama/df2ca5e9237f46d1e48b6115b87f37db6abfa908.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From df2ca5e9237f46d1e48b6115b87f37db6abfa908 Mon Sep 17 00:00:00 2001
-From: Aadi Bajpai <me@aadibajpai.me>
-Date: Sun, 21 Apr 2019 05:04:25 +0530
-Subject: [PATCH] Fix example with ANSI sequence
-
----
- README.rst | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/README.rst b/README.rst
-index f0e8f71..fb6fb3d 100644
---- a/README.rst
-+++ b/README.rst
-@@ -121,7 +121,7 @@ constant shorthand for ANSI escape sequences:
- .. code-block:: python
- 
-     print('\033[31m' + 'some red text')
--    print('\033[30m') # and reset to default color
-+    print('\033[39m') # and reset to default color
- 
- ...or, Colorama can be used happily in conjunction with existing ANSI libraries
- such as Termcolor:
diff --git a/mingw-w64-python-comtypes/PKGBUILD b/mingw-w64-python-comtypes/PKGBUILD
index 683e30f38b..476160ab10 100644
--- a/mingw-w64-python-comtypes/PKGBUILD
+++ b/mingw-w64-python-comtypes/PKGBUILD
@@ -2,47 +2,50 @@
 
 _realname=comtypes
 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.7
-pkgrel=3
+pkgrel=1
 pkgdesc="A pure Python, lightweight COM client and server framework, based on the ctypes Python FFI package (mingw-w64)"
 arch=('any')
 url='https://github.com/enthought/comtypes'
 license=('OSI')
-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/enthought/comtypes/archive/${pkgver}.tar.gz")
 sha512sums=('be83ff1c38306c6ef7994be3fc21f3b533e3d1d26184cf536a38c15cb6435b38ec803d3e3ab08e994444030c022aeab65ec918cc91a2d24c9b25069c0384c0ae')
 
 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.txt "${pkgdir}${MINGW_PREFIX}/share/licenses/python3-${_realname}/COPYING"
+  install -Dm644 LICENSE.txt "${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-contextlib2/PKGBUILD b/mingw-w64-python-contextlib2/PKGBUILD
index fb0b02445f..5e715b50d3 100644
--- a/mingw-w64-python-contextlib2/PKGBUILD
+++ b/mingw-w64-python-contextlib2/PKGBUILD
@@ -1,37 +1,42 @@
 # Maintainer: Christoph Reiter <reiter.christoph@gmail.com>
 #
 _realname=contextlib2
-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=0.6.0
 pkgrel=1
 pkgdesc="contextlib2 is a backport of the standard library’s contextlib module to earlier Python versions (mingw-w64)"
 arch=('any')
 url="https://pypi.python.org/pypi/${_pypiname}"
 license=('PSF')
-depends=("${MINGW_PACKAGE_PREFIX}-python3")
-makedepends=("${MINGW_PACKAGE_PREFIX}-python3-setuptools")
-source=("https://pypi.io/packages/source/${_realname:0:1}/${_realname}/${_realname}-$pkgver.tar.gz")
+depends=("${MINGW_PACKAGE_PREFIX}-python")
+makedepends=("${MINGW_PACKAGE_PREFIX}-python-setuptools")
+source=("https://pypi.io/packages/source/${_realname:0:1}/${_realname}/${_realname}-${pkgver}.tar.gz")
 sha512sums=('01901ac226c7fca40add00e95cedb2535a802e0114a53ae1315c6dfee20744dbafa7d9619986ad76345ad9b9aa3e364ac01d23f51b5eb70dd2febd5af1f1fc56')
 
 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
-  export PBR_VERSION=$pkgver
+  export SETUPTOOLS_SCM_PRETEND_VERSION=${pkgver}
+  export PBR_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
 }
 
 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}"
-  install -Dm644 LICENSE.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.txt"
+  ${MINGW_PREFIX}/bin/python setup.py install --prefix=${MINGW_PREFIX} --root="${pkgdir}" --skip-build
+
+  install -Dm644 LICENSE.txt "${pkgdir}${MINGW_PREFIX}/share/licenses/python-${_realname}/LICENSE.txt"
 }
diff --git a/mingw-w64-python-coverage/PKGBUILD b/mingw-w64-python-coverage/PKGBUILD
index a7e3dfb2de..d45b7127bc 100644
--- a/mingw-w64-python-coverage/PKGBUILD
+++ b/mingw-w64-python-coverage/PKGBUILD
@@ -2,18 +2,21 @@
 
 _realname=coverage
 pkgbase=mingw-w64-python-${_realname}
-pkgname=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
-pkgver=4.5.4
-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=5.0.1
+pkgrel=1
 pkgdesc="Code coverage measurement for Python (mingw-w64)"
 arch=('any')
 url='https://coverage.readthedocs.io/'
 license=('Apache 2.0')
-depends=("${MINGW_PACKAGE_PREFIX}-python3")
-makedepends=("${MINGW_PACKAGE_PREFIX}-python3-setuptools")
+depends=("${MINGW_PACKAGE_PREFIX}-python")
+makedepends=("${MINGW_PACKAGE_PREFIX}-python-setuptools")
 install=${_realname}3-${CARCH}.install
 source=("${_realname}-${pkgver}.tar.gz::https://github.com/nedbat/coveragepy/archive/coverage-${pkgver}.tar.gz")
-sha256sums=('2234feba7b3cbfe71ed54c6b752b50fd365f4c6c49301b1fb1ad490aaaf4faad')
+sha256sums=('ea6d1b82bc758ca33483685c821ea8a75a0da63060d3a11ad12755f1965cf2dd')
 
 prepare() {  
   cd "${srcdir}"
diff --git a/mingw-w64-python-cryptography/PKGBUILD b/mingw-w64-python-cryptography/PKGBUILD
index 1096af2e01..df78d8fdb0 100644
--- a/mingw-w64-python-cryptography/PKGBUILD
+++ b/mingw-w64-python-cryptography/PKGBUILD
@@ -2,44 +2,46 @@
 
 _realname=cryptography
 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
-pkgrel=2
+pkgrel=1
 pkgdesc="A package designed to expose cryptographic recipes and primitives to Python developers (mingw-w64)"
 url='https://pypi.org/project/cryptography/'
 license=('Apache')
 arch=('any')
-depends=("${MINGW_PACKAGE_PREFIX}-python3-cffi"
-         "${MINGW_PACKAGE_PREFIX}-python3-pyasn1"
-         "${MINGW_PACKAGE_PREFIX}-python3-idna"
-         "${MINGW_PACKAGE_PREFIX}-python3-asn1crypto")
-makedepends=("${MINGW_PACKAGE_PREFIX}-python3-setuptools"
-             "${MINGW_PACKAGE_PREFIX}-python3-six")
-checkdepends=("${MINGW_PACKAGE_PREFIX}-python3-pytest-runner"
-              #"${MINGW_PACKAGE_PREFIX}-python3-iso8601"
-              "${MINGW_PACKAGE_PREFIX}-python3-pretend"
-              #"${MINGW_PACKAGE_PREFIX}-python3-cryptography-vectors"
-              #"${MINGW_PACKAGE_PREFIX}-python3-hypothesis"
-              "${MINGW_PACKAGE_PREFIX}-python3-pytz")
+depends=("${MINGW_PACKAGE_PREFIX}-python-cffi"
+         "${MINGW_PACKAGE_PREFIX}-python-pyasn1"
+         "${MINGW_PACKAGE_PREFIX}-python-idna"
+         "${MINGW_PACKAGE_PREFIX}-python-asn1crypto")
+makedepends=("${MINGW_PACKAGE_PREFIX}-python-setuptools"
+             "${MINGW_PACKAGE_PREFIX}-python-six")
+checkdepends=("${MINGW_PACKAGE_PREFIX}-python-pytest-runner"
+              #"${MINGW_PACKAGE_PREFIX}-python-iso8601"
+              "${MINGW_PACKAGE_PREFIX}-python-pretend"
+              #"${MINGW_PACKAGE_PREFIX}-python-cryptography-vectors"
+              #"${MINGW_PACKAGE_PREFIX}-python-hypothesis"
+              "${MINGW_PACKAGE_PREFIX}-python-pytz")
 source=(https://pypi.io/packages/source/c/cryptography/${_realname}-${pkgver}.tar.gz)
 sha256sums=('3cda1f0ed8747339bbdf71b9f38ca74c7b592f24f65cdb3ab3765e4b02871651')
 
 prepare() {
   cd ${srcdir}
-  cp -r ${_realname}-${pkgver} python3-build-${CARCH}
+  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}
-  ${MINGW_PREFIX}/bin/python3 setup.py build
+  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 "${srcdir}/${_realname}-${pkgver}/LICENSE" "${pkgdir}${MINGW_PREFIX}/share/licenses/python3-${_realname}/LICENSE"
+  install -Dm644 "${srcdir}/${_realname}-${pkgver}/LICENSE" "${pkgdir}${MINGW_PREFIX}/share/licenses/python-${_realname}/LICENSE"
 }
diff --git a/mingw-w64-python-cssselect/PKGBUILD b/mingw-w64-python-cssselect/PKGBUILD
index 5a49713b1f..7c12bafb40 100644
--- a/mingw-w64-python-cssselect/PKGBUILD
+++ b/mingw-w64-python-cssselect/PKGBUILD
@@ -2,15 +2,18 @@
 
 _realname=cssselect
 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}")
 pkgdesc="A Python library that parses CSS3 Selectors and translates them to XPath 1.0 (mingw-w64)"
 pkgver=1.1.0
-pkgrel=3
+pkgrel=1
 arch=('any')
 license=('BSD')
 url="https://pypi.python.org/pypi/cssselect"
-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/scrapy/cssselect/archive/v${pkgver}.tar.gz")
 sha256sums=('dde8c1d4a2c82de6889a3af1c1adbce1a6f3ec08b07a854d873f3f3da92960af')
 
diff --git a/mingw-w64-python-dateutil/PKGBUILD b/mingw-w64-python-dateutil/PKGBUILD
index 8f8ac7ee31..adbbc4710b 100644
--- a/mingw-w64-python-dateutil/PKGBUILD
+++ b/mingw-w64-python-dateutil/PKGBUILD
@@ -3,19 +3,22 @@
 _realname=dateutil
 _pyname=python-dateutil
 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.1
-pkgrel=2
+pkgrel=1
 pkgdesc="Provides powerful extensions to the standard datetime module (mingw-w64)"
 arch=('any')
 license=('BSD' 'Apache')
 url="https://github.com/dateutil/dateutil"
-depends=("${MINGW_PACKAGE_PREFIX}-python3-six")
-makedepends=("${MINGW_PACKAGE_PREFIX}-python3-setuptools"
-             "${MINGW_PACKAGE_PREFIX}-python3-setuptools-scm")
-checkdepends=("${MINGW_PACKAGE_PREFIX}-python3-pytest"
-              "${MINGW_PACKAGE_PREFIX}-python3-freezegun"
-              "${MINGW_PACKAGE_PREFIX}-python3-hypothesis")
+depends=("${MINGW_PACKAGE_PREFIX}-python-six")
+makedepends=("${MINGW_PACKAGE_PREFIX}-python-setuptools"
+             "${MINGW_PACKAGE_PREFIX}-python-setuptools-scm")
+checkdepends=("${MINGW_PACKAGE_PREFIX}-python-pytest"
+              "${MINGW_PACKAGE_PREFIX}-python-freezegun"
+              "${MINGW_PACKAGE_PREFIX}-python-hypothesis")
 source=("${_realname}-${pkgver}.tar.gz"::"https://files.pythonhosted.org/packages/source/${_pyname:0:1}/${_pyname}/${_pyname}-${pkgver}.tar.gz"{,.asc})
 validpgpkeys=("6B49ACBADCF6BD1CA20667ABCD54FCE3D964BEFB")
 sha256sums=('73ebfe9dbf22e832286dafa60473e4cd239f8592f699aa5adaf10050e6e1823c'
diff --git a/mingw-w64-python-distlib/PKGBUILD b/mingw-w64-python-distlib/PKGBUILD
index 38358e3918..f8cd6c52c9 100644
--- a/mingw-w64-python-distlib/PKGBUILD
+++ b/mingw-w64-python-distlib/PKGBUILD
@@ -2,15 +2,18 @@
 
 _realname=distlib
 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.3.0
-pkgrel=2
+pkgrel=1
 pkgdesc="Low-level components of distutils2/packaging (mingw-w64)"
 arch=('any')
 url='https://bitbucket.org/pypa/${_realname}'
 license=('FSF')
-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}.zip")
 sha256sums=('2e166e231a26b36d6dfe35a48c4464346620f8645ed0ace01ee31822b288de21')
diff --git a/mingw-w64-python-dnspython/PKGBUILD b/mingw-w64-python-dnspython/PKGBUILD
index 8be067cc0d..67aaac729b 100644
--- a/mingw-w64-python-dnspython/PKGBUILD
+++ b/mingw-w64-python-dnspython/PKGBUILD
@@ -2,15 +2,18 @@
 
 _realname=dnspython
 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.16.0
-pkgrel=3
+pkgrel=1
 pkgdesc="A DNS toolkit for Python (mingw-w64)"
 arch=('any')
 url='http://www.dnspython.org/'
 license=('BSD')
-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')
 validpgpkeys=('A580DEE052FEC78D8ACF383DF24B3AFC8CA2F5C7')
 source=(http://www.dnspython.org/kits/${pkgver}/dnspython-${pkgver}.tar.gz{,.asc})
diff --git a/mingw-w64-python-docutils/PKGBUILD b/mingw-w64-python-docutils/PKGBUILD
index a8595b38b6..8335f3f1fe 100644
--- a/mingw-w64-python-docutils/PKGBUILD
+++ b/mingw-w64-python-docutils/PKGBUILD
@@ -3,14 +3,17 @@
 
 _realname=docutils
 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.2
-pkgrel=3
+pkgrel=1
 pkgdesc="Set of tools for processing plaintext docs into formats such as HTML, XML, or LaTeX (mingw-w64)"
 arch=('any')
 license=('custom')
 url="https://docutils.sourceforge.io/"
-makedepends=("${MINGW_PACKAGE_PREFIX}-python2" "${MINGW_PACKAGE_PREFIX}-python3")
+depends=("${MINGW_PACKAGE_PREFIX}-python")
 source=(https://files.pythonhosted.org/packages/93/22/953e071b589b0b1fee420ab06a0d15e5aa0c7470eb9966d60393ce58ad61/${_realname}-${pkgver}.tar.gz)
 sha256sums=('a2aeea129088da402665e92e0b25b04b073c04b2dce4ab65caaa38b7ce2e1a99')
 noextract=(${_realname}-${pkgver}.tar.gz)
@@ -19,32 +22,32 @@ prepare() {
   [[ -d ${srcdir}/${_realname}-${pkgver} ]] && rm -rf ${srcdir}/${_realname}-${pkgver}
   tar -xzf ${srcdir}/${_realname}-${pkgver}.tar.gz -C ${srcdir} || true
 
-  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}"
+  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 --build-lib=build/python${pver}
-  find build/python${pver} -type f -exec \
-      sed -i "1s,^#! \?/usr/bin/\(env \|\)python$,#!/usr/bin/python3," {} \;
+      ${MINGW_PREFIX}/bin/python setup.py build --build-lib=build/python
+  find build/python -type f -exec \
+      sed -i "1s,^#! \?/usr/bin/\(env \|\)python$,#!${MINGW_PREFIX}/bin/python," {} \;
 }
 
 check() {
   export LANG=en_US.UTF-8
-  msg "Python 3 test for ${CARCH}"
-  cd "${srcdir}/python3-build-${CARCH}"
+  msg "Python test for ${CARCH}"
+  cd "${srcdir}/python-build-${CARCH}"
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
-       PYTHONPATH="$PWD/build/python${pver}/" ${MINGW_PREFIX}/bin/python3 test/alltests.py
+       PYTHONPATH="$PWD/build/python/" ${MINGW_PREFIX}/bin/python test/alltests.py
 }
 
 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 build --build-lib=build/python3 \
-      install --prefix=${MINGW_PREFIX} --root="${pkgdir}" --optimize=1
+  ${MINGW_PREFIX}/bin/python setup.py build --build-lib=build/python \
+      install --prefix=${MINGW_PREFIX} --root="${pkgdir}" --optimize=1 --skip-build
 
   local _mingw_prefix=$(cygpath -am ${MINGW_PREFIX})
 
@@ -57,10 +60,10 @@ package() {
     ln -s "$(basename $f)" "${pkgdir}${MINGW_PREFIX}/bin/$(basename $f .py)"
     # fix so the file is a script that can run with no issues on the command-line w/o
     # specifying an interpreter
-    sed -e "s|/usr/bin/env python3.exe|${MINGW_PREFIX}/bin/python3.exe|g" -i "${pkgdir}${MINGW_PREFIX}/bin/$(basename $f .py)"
+    sed -e "s|/usr/bin/env python3.exe|${MINGW_PREFIX}/bin/python.exe|g" -i "${pkgdir}${MINGW_PREFIX}/bin/$(basename $f .py)"
   done
 
   # setup license
-  install -D -m644 COPYING.txt "${pkgdir}${MINGW_PREFIX}/share/licenses/python3-${_realname}/COPYING.txt"
-  install -D -m644 licenses/python* "${pkgdir}${MINGW_PREFIX}/share/licenses/python3-${_realname}/"
+  install -D -m644 COPYING.txt "${pkgdir}${MINGW_PREFIX}/share/licenses/python-${_realname}/COPYING.txt"
+  install -D -m644 licenses/python* "${pkgdir}${MINGW_PREFIX}/share/licenses/python-${_realname}/"
 }
diff --git a/mingw-w64-python-execnet/PKGBUILD b/mingw-w64-python-execnet/PKGBUILD
index 4101050ca4..79f3726f12 100644
--- a/mingw-w64-python-execnet/PKGBUILD
+++ b/mingw-w64-python-execnet/PKGBUILD
@@ -2,16 +2,19 @@
 
 _realname=execnet
 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.1
-pkgrel=2
+pkgrel=1
 pkgdesc="Rapid multi-Python deployment (mingw-w64)"
 arch=('any')
 url='https://execnet.readthedocs.io/en/latest'
 license=('MIT')
-depends=("${MINGW_PACKAGE_PREFIX}-python3"
-         "${MINGW_PACKAGE_PREFIX}-python3-apipkg")
-makedepends=("${MINGW_PACKAGE_PREFIX}-python3-setuptools")
+depends=("${MINGW_PACKAGE_PREFIX}-python"
+         "${MINGW_PACKAGE_PREFIX}-python-apipkg")
+makedepends=("${MINGW_PACKAGE_PREFIX}-python-setuptools")
 options=('staticlibs' 'strip' '!debug')
 source=("${_realname}-${pkgver}.tar.gz"::"https://github.com/pytest-dev/execnet/archive/v${pkgver}.tar.gz")
 sha512sums=('65ec428ba1d1c1a67b9ed8ccbbde238d563edd6b79e5a1a824f2a74d34e303bf803a5eb2848a13bf77840d1203e09e450ca83fe5ce0a3ac8dab163553a07b069')
@@ -37,11 +40,11 @@ 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
+  export SETUPTOOLS_SCM_PRETEND_VERSION=${pkgver}
   export PBR_VERSION=${pkgver}
 }
 
@@ -50,23 +53,23 @@ prepare() {
 # 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() {
-  msg2 "Python 3 test for ${CARCH}"
-  cd "${srcdir}/python3-build-${CARCH}"
+  msg2 "Python test for ${CARCH}"
+  cd "${srcdir}/python-build-${CARCH}"
   local _cyp="$(cygpath -m $(pwd))"
   PYTHONPATH="${_cyp}/build/lib;${PYTHONPATH}" ${MINGW_PREFIX}/bin/py.test testing || 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"
 }
diff --git a/mingw-w64-python-filelock/PKGBUILD b/mingw-w64-python-filelock/PKGBUILD
index 7a1a24c75a..5f95e23573 100644
--- a/mingw-w64-python-filelock/PKGBUILD
+++ b/mingw-w64-python-filelock/PKGBUILD
@@ -2,18 +2,20 @@
 
 _realname=filelock
 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.12
-pkgrel=3
+pkgrel=1
 pkgdesc="A platform independent file lock (mingw-w64)"
 arch=('any')
 url='https://github.com/benediktschmitt/py-filelock'
 license=('custom:Unlicense')
-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')
-checkdepends=("${MINGW_PACKAGE_PREFIX}-python2-pytest"
-              "${MINGW_PACKAGE_PREFIX}-python3-pytest")
+checkdepends=("${MINGW_PACKAGE_PREFIX}-python-pytest")
 source=("${_realname}-${pkgver}.tar.gz"::"https://github.com/benediktschmitt/py-filelock/archive/v${pkgver}.tar.gz")
 sha512sums=('0f30b54b9de2540f023855effcc582b18fedcee6681f21e1733f1b60dbd39eb148e3830bc798a44c5e8c22e7ea8ca26b6d4547fae79dacc78c62b819a3d84683')
 
diff --git a/mingw-w64-python-freezegun/PKGBUILD b/mingw-w64-python-freezegun/PKGBUILD
index 135e37529c..f48dc658ef 100644
--- a/mingw-w64-python-freezegun/PKGBUILD
+++ b/mingw-w64-python-freezegun/PKGBUILD
@@ -2,19 +2,22 @@
 
 _realname=freezegun
 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.3.12
-pkgrel=3
+pkgrel=1
 pkgdesc="Let your Python tests travel through time (mingw-w64)"
 arch=('any')
 url='https://github.com/spulec/freezegun'
 license=('Apache')
-depends=("${MINGW_PACKAGE_PREFIX}-python3"
-         "${MINGW_PACKAGE_PREFIX}-python3-dateutil")
-makedepends=("${MINGW_PACKAGE_PREFIX}-python3-setuptools")
-checkdepends=("${MINGW_PACKAGE_PREFIX}-python3-nose"
-              "${MINGW_PACKAGE_PREFIX}-python3-mock"
-              "${MINGW_PACKAGE_PREFIX}-python3-coverage")
+depends=("${MINGW_PACKAGE_PREFIX}-python"
+         "${MINGW_PACKAGE_PREFIX}-python-dateutil")
+makedepends=("${MINGW_PACKAGE_PREFIX}-python-setuptools")
+checkdepends=("${MINGW_PACKAGE_PREFIX}-python-nose"
+              "${MINGW_PACKAGE_PREFIX}-python-mock"
+              "${MINGW_PACKAGE_PREFIX}-python-coverage")
 options=('staticlibs' 'strip' '!debug')
 source=("${_realname}-${pkgver}.tar.gz"::"https://github.com/spulec/freezegun/archive/${pkgver}.tar.gz")
 sha512sums=('175025bb4a58de253e5c4f896fc7f5c0b18bdb4656d7e6bc54f9fa84f88cbbc527553e36b7cac129b83222737ff81c62f7677f7f9c63cc24bd3cf03f1087497e')
diff --git a/mingw-w64-python-funcsigs/PKGBUILD b/mingw-w64-python-funcsigs/PKGBUILD
index 7c61a52f2d..4d068086bd 100644
--- a/mingw-w64-python-funcsigs/PKGBUILD
+++ b/mingw-w64-python-funcsigs/PKGBUILD
@@ -2,14 +2,17 @@
 
 _realname=funcsigs
 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=3
+pkgrel=1
 pkgdesc='Python function signatures from PEP362 for Python 2.6, 2.7 and 3.3+'
 arch=('any')
 url='https://github.com/testing-cabal/funcsigs'
 license=('ASL')
-makedepends=("${MINGW_PACKAGE_PREFIX}-python3")
+makedepends=("${MINGW_PACKAGE_PREFIX}-python")
 _dtoken="94/4a/db842e7a0545de1cdb0439bb80e6e42dfe82aaeaadd4072f2263a4fbed23"
 source=("https://pypi.python.org/packages/${_dtoken}/${_realname}-${pkgver}.tar.gz")
 sha256sums=('a7bb0f2cf3a3fd1ab2732cb49eba4252c2af4240442415b4abce3b87022a8f50')
diff --git a/mingw-w64-python-html5lib/PKGBUILD b/mingw-w64-python-html5lib/PKGBUILD
index 27b0ad223f..dabbdb5e5d 100644
--- a/mingw-w64-python-html5lib/PKGBUILD
+++ b/mingw-w64-python-html5lib/PKGBUILD
@@ -2,20 +2,23 @@
 
 _realname=html5lib
 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.1
-pkgrel=5
+pkgrel=1
 arch=('any')
 pkgdesc="A Python HTML parser/tokenizer based on the WHATWG HTML5 spec (mingw-w64)"
 url="https://github.com/html5lib"
 license=('MIT')
-depends=("${MINGW_PACKAGE_PREFIX}-python3"
-         "${MINGW_PACKAGE_PREFIX}-python3-six"
-         "${MINGW_PACKAGE_PREFIX}-python3-webencodings")
-makedepends=("${MINGW_PACKAGE_PREFIX}-python3-setuptools")
-checkdepends=("${MINGW_PACKAGE_PREFIX}-python3-pytest"
-              "${MINGW_PACKAGE_PREFIX}-python3-lxml"
-              "${MINGW_PACKAGE_PREFIX}-python3-mock")
+depends=("${MINGW_PACKAGE_PREFIX}-python"
+         "${MINGW_PACKAGE_PREFIX}-python-six"
+         "${MINGW_PACKAGE_PREFIX}-python-webencodings")
+makedepends=("${MINGW_PACKAGE_PREFIX}-python-setuptools")
+checkdepends=("${MINGW_PACKAGE_PREFIX}-python-pytest"
+              "${MINGW_PACKAGE_PREFIX}-python-lxml"
+              "${MINGW_PACKAGE_PREFIX}-python-mock")
 _test_commit=c305da74fae50fb018870de7a042da36c1a93b65
 source=("${_realname}-${pkgver}.tar.gz::https://github.com/html5lib/html5lib-python/archive/${pkgver}.tar.gz"
         "https://github.com/html5lib/html5lib-tests/archive/${_test_commit}.tar.gz")
@@ -29,8 +32,8 @@ prepare() {
     cp -r "${srcdir}/html5lib-tests-${_test_commit}" html5lib/tests/testdata
   popd
 
-  rm -rf python${pver}-build-${CARCH} | true
-  cp -r "${_realname}-python-${pkgver}" "python${pver}-build-${CARCH}"
+  rm -rf python-build-${CARCH} | true
+  cp -r "${_realname}-python-${pkgver}" "python-build-${CARCH}"
 }
 
 build() {
diff --git a/mingw-w64-python-hypothesis/PKGBUILD b/mingw-w64-python-hypothesis/PKGBUILD
index ceb8db521b..21acc39565 100644
--- a/mingw-w64-python-hypothesis/PKGBUILD
+++ b/mingw-w64-python-hypothesis/PKGBUILD
@@ -2,36 +2,39 @@
 
 _realname=hypothesis
 pkgbase=mingw-w64-python-${_realname}
-pkgname=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
-pkgver=4.43.7
+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.56.3
 pkgrel=1
 pkgdesc="Advanced Quickcheck style testing library for Python (mingw-w64)"
 arch=('any')
 url='https://hypothesis.readthedocs.org'
 license=('MIT')
-depends=("${MINGW_PACKAGE_PREFIX}-python3"
-         "${MINGW_PACKAGE_PREFIX}-python3-attrs"
-         "${MINGW_PACKAGE_PREFIX}-python3-coverage")
-optdepends=("${MINGW_PACKAGE_PREFIX}-python3-pytz: for datetime and django module"
-            "${MINGW_PACKAGE_PREFIX}-python3-faker: for fakefactory and django module"
-            "${MINGW_PACKAGE_PREFIX}-python3-django: for django module"
-            "${MINGW_PACKAGE_PREFIX}-python3-numpy: for numpy module"
-            "${MINGW_PACKAGE_PREFIX}-python3-pytest: for pytest module")
-makedepends=("${MINGW_PACKAGE_PREFIX}-python3-setuptools")
-#checkdepends=("${MINGW_PACKAGE_PREFIX}-python3-pytest-runner"
-#              "${MINGW_PACKAGE_PREFIX}-python3-flake8"
-#              "${MINGW_PACKAGE_PREFIX}-python3-pytz"
-#              "${MINGW_PACKAGE_PREFIX}-python3-numpy"
-#              "${MINGW_PACKAGE_PREFIX}-python3-faker" 
-#              "${MINGW_PACKAGE_PREFIX}-python3-flaky"
-#              "${MINGW_PACKAGE_PREFIX}-python3-pytest-benchmark"
-#              "${MINGW_PACKAGE_PREFIX}-python3-django"
-#              "${MINGW_PACKAGE_PREFIX}-python3-pytest-xdist"
-#              "${MINGW_PACKAGE_PREFIX}-python3-mock"
-#              "${MINGW_PACKAGE_PREFIX}-python3-pandas")
+depends=("${MINGW_PACKAGE_PREFIX}-python"
+         "${MINGW_PACKAGE_PREFIX}-python-attrs"
+         "${MINGW_PACKAGE_PREFIX}-python-coverage")
+optdepends=("${MINGW_PACKAGE_PREFIX}-python-pytz: for datetime and django module"
+            "${MINGW_PACKAGE_PREFIX}-python-faker: for fakefactory and django module"
+            "${MINGW_PACKAGE_PREFIX}-python-django: for django module"
+            "${MINGW_PACKAGE_PREFIX}-python-numpy: for numpy module"
+            "${MINGW_PACKAGE_PREFIX}-python-pytest: for pytest module")
+makedepends=("${MINGW_PACKAGE_PREFIX}-python-setuptools")
+#checkdepends=("${MINGW_PACKAGE_PREFIX}-python-pytest-runner"
+#              "${MINGW_PACKAGE_PREFIX}-python-flake8"
+#              "${MINGW_PACKAGE_PREFIX}-python-pytz"
+#              "${MINGW_PACKAGE_PREFIX}-python-numpy"
+#              "${MINGW_PACKAGE_PREFIX}-python-faker" 
+#              "${MINGW_PACKAGE_PREFIX}-python-flaky"
+#              "${MINGW_PACKAGE_PREFIX}-python-pytest-benchmark"
+#              "${MINGW_PACKAGE_PREFIX}-python-django"
+#              "${MINGW_PACKAGE_PREFIX}-python-pytest-xdist"
+#              "${MINGW_PACKAGE_PREFIX}-python-mock"
+#              "${MINGW_PACKAGE_PREFIX}-python-pandas")
 options=('staticlibs' 'strip' '!debug')
 source=("${_realname}-${pkgver}.tar.gz"::"https://github.com/HypothesisWorks/hypothesis/archive/hypothesis-python-${pkgver}.tar.gz")
-sha512sums=('bf074f74b1bf0d79405cb529c4e639794117a28b5e21cd6c86125dee232bb1dfa831ffda15779f46c795c0a31e896d96f0f9f197c40de89e742caca57041f8c2')
+sha512sums=('efb01d25c31f5230c802909f1c8a6a709c5fcaecd5bbdba451445b2673f7051d402a5ce919c6ab26531662163604b34cea9d3233dc83a9e6cf20dc22c47ba765')
 
 # Helper macros to help make tasks easier #
 apply_patch_with_msg() {
@@ -57,11 +60,11 @@ prepare() {
   sed -i "/FutureWarning/a \    filterwarnings('ignore', category=DeprecationWarning, module='pandas.core')" \
        ${_realname}-${_realname}-python-$pkgver/hypothesis-python/tests/common/setup.py
 
-  rm -rf python3-build-${CARCH} | true
-  cp -r "${_realname}-${_realname}-python-${pkgver}" "python3-build-${CARCH}"
+  rm -rf python-build-${CARCH} | true
+  cp -r "${_realname}-${_realname}-python-${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
 }
 
@@ -70,24 +73,24 @@ prepare() {
 # 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}/hypothesis-python"
-  ${MINGW_PREFIX}/bin/python3 setup.py build
+  msg "Python build for ${CARCH}"
+  cd "${srcdir}/python-build-${CARCH}/hypothesis-python"
+  ${MINGW_PREFIX}/bin/python setup.py build
 }
 
 # Comment out until we can get this to work.
 #check() {
-#  msg "Python 3 test for ${CARCH}"
-#  cd "${srcdir}/python3-build-${CARCH}/hypothesis-python"
+#  msg "Python test for ${CARCH}"
+#  cd "${srcdir}/python-build-${CARCH}/hypothesis-python"
 #  mv tests/django ../
-#  ${MINGW_PREFIX}/bin/python3 setup.py pytest --addopts -n16
+#  ${MINGW_PREFIX}/bin/python setup.py pytest --addopts -n16
 #  mv ../django tests/
-#  PYTHONPATH="$PWD/build/lib:$PYTHONPATH" ${MINGW_PREFIX}/bin/python3 -m tests.django.manage test tests.django || warning "Tests failed"
+#  PYTHONPATH="$PWD/build/lib:$PYTHONPATH" ${MINGW_PREFIX}/bin/python -m tests.django.manage test tests.django || warning "Tests failed"
 #}
 
 package() {
-  cd "${srcdir}/python3-build-${CARCH}/hypothesis-python"
+  cd "${srcdir}/python-build-${CARCH}/hypothesis-python"
   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-idna/PKGBUILD b/mingw-w64-python-idna/PKGBUILD
index 27e0641305..46333ded29 100644
--- a/mingw-w64-python-idna/PKGBUILD
+++ b/mingw-w64-python-idna/PKGBUILD
@@ -2,42 +2,45 @@
 
 _realname=idna
 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
-pkgrel=3
+pkgrel=1
 pkgdesc='Internationalized Domain Names in Applications (mingw-w64)'
 url='https://github.com/kjd/idna'
 license=('BSD-like')
 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="d8/82/28a51052215014efc07feac7330ed758702fc0581347098a81699b5281cb"
 source=("https://pypi.io/packages/source/${_realname::1}/${_realname}/${_realname}-${pkgver}.tar.gz")
 sha256sums=('c357b3f628cf53ae2c4c05627ecc484553142ca23264e593d327bcde5e9c3407')
 
 prepare() {
   cd ${srcdir}
-  rm -rf python${pver}-build-${CARCH}
-  cp -r ${_realname}-${pkgver} python${pver}-build-${CARCH}
+  rm -rf python-build-${CARCH}
+  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
+  msg "Python test for ${CARCH}"  
+  cd "${srcdir}/python-build-${CARCH}"
+  ${MINGW_PREFIX}/bin/python setup.py test
 }
 
 package() {
-  cd "${srcdir}/python${pver}-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 "${srcdir}/${_realname}-${pkgver}/LICENSE.rst" "${pkgdir}${MINGW_PREFIX}/share/licenses/python3-${_realname}/LICENSE"
+  install -Dm644 "${srcdir}/${_realname}-${pkgver}/LICENSE.rst" "${pkgdir}${MINGW_PREFIX}/share/licenses/python-${_realname}/LICENSE"
 }
diff --git a/mingw-w64-python-ifaddr/PKGBUILD b/mingw-w64-python-ifaddr/PKGBUILD
index 90ea937718..4a2564f227 100644
--- a/mingw-w64-python-ifaddr/PKGBUILD
+++ b/mingw-w64-python-ifaddr/PKGBUILD
@@ -2,45 +2,46 @@
 
 _realname=ifaddr
 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.6
-pkgrel=3
+pkgrel=1
 pkgdesc="Enumerates all IP addresses on all network adapters of the system. (mingw-w64)"
 arch=('any')
 url='https://github.com/pydron/ifaddr'
 license=('MIT')
-depends=("${MINGW_PACKAGE_PREFIX}-python3")
-makedepends=("${MINGW_PACKAGE_PREFIX}-python3-setuptools")
-checkdepends=("${MINGW_PACKAGE_PREFIX}-python3-nose")
+depends=("${MINGW_PACKAGE_PREFIX}-python")
+makedepends=("${MINGW_PACKAGE_PREFIX}-python-setuptools")
+checkdepends=("${MINGW_PACKAGE_PREFIX}-python-nose")
 source=("${_realname}-$pkgver.tar.gz"::"https://github.com/pydron/ifaddr/archive/$pkgver.tar.gz")
 sha256sums=('fb42188de577aa3acf14b06e9fcd770e755c7ced137db49191411956b75786ec')
 
 prepare() {
-  cd "${srcdir}/${_realname}-${pkgver}"
+  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 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
+  cd "${srcdir}/python-build-${CARCH}"
+  ${MINGW_PREFIX}/bin/python setup.py build
 }
 
 check() {
-  cd "${srcdir}/${_realname}-${pkgver}"
-
-  ${MINGW_PREFIX}/bin/nosetests3 ${_realname}/test_ifaddr.py
+  cd "${srcdir}/python-build-${CARCH}"
+  ${MINGW_PREFIX}/bin/nosetests ${_realname}/test_ifaddr.py
 }
 
 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/txt"
+  install -Dm644 LICENSE.txt "${pkgdir}${MINGW_PREFIX}/share/licenses/python-${_realname}/LICENSE/txt"
 }
diff --git a/mingw-w64-python-imagesize/PKGBUILD b/mingw-w64-python-imagesize/PKGBUILD
index 09951a25e6..56bef2823a 100644
--- a/mingw-w64-python-imagesize/PKGBUILD
+++ b/mingw-w64-python-imagesize/PKGBUILD
@@ -2,27 +2,33 @@
 
 _realname=imagesize
 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="Getting image size from png/jpeg/jpeg2000/gif file (mingw-w64)"
 url='https://github.com/shibukawa/imagesize_py'
 license=('MIT')
 arch=('any')
-depends=("${MINGW_PACKAGE_PREFIX}-python3")
-makedepends=("${MINGW_PACKAGE_PREFIX}-python2-setuptools"
-             "${MINGW_PACKAGE_PREFIX}-python3-setuptools")
+depends=("${MINGW_PACKAGE_PREFIX}-python")
+makedepends=("${MINGW_PACKAGE_PREFIX}-python-setuptools")
 source=("https://files.pythonhosted.org/packages/source/i/imagesize/${_realname}-${pkgver}.tar.gz")
 sha256sums=('f3832918bc3c66617f92e35f5d70729187676313caa60c187eb0f28b8fe5e3b5')
 
 prepare() {
   cd ${srcdir}
-  cp -r ${_realname}-${pkgver} build-python3-${CARCH}
+  cp -r ${_realname}-${pkgver} build-python-${CARCH}
 }
 
-package_python3-imagesize() {
-  cd ${srcdir}/build-python3-${CARCH}
-  ${MINGW_PREFIX}/bin/python3 setup.py build
+build() {
+  cd ${srcdir}/build-python-${CARCH}
+  ${MINGW_PREFIX}/bin/python setup.py build
+}
+
+package() {
+  cd ${srcdir}/build-python-${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
 }
\ No newline at end of file
diff --git a/mingw-w64-python-iniconfig/PKGBUILD b/mingw-w64-python-iniconfig/PKGBUILD
index 7ff5756769..74dae41265 100644
--- a/mingw-w64-python-iniconfig/PKGBUILD
+++ b/mingw-w64-python-iniconfig/PKGBUILD
@@ -2,17 +2,20 @@
 
 _realname=iniconfig
 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.0
-pkgrel=4
+pkgrel=1
 pkgdesc="brain-dead simple config-ini parsing (mingw-w64)"
 arch=('any')
 url="https://github.com/RonnyPfannschmidt/iniconfig"
 license=('MIT')
 validpgpkeys=('gpg_KEY')
-depends=("${MINGW_PACKAGE_PREFIX}-python3")
-makedepends=("${MINGW_PACKAGE_PREFIX}-python3-setuptools"
-             "${MINGW_PACKAGE_PREFIX}-python3-setuptools-scm")
+depends=("${MINGW_PACKAGE_PREFIX}-python")
+makedepends=("${MINGW_PACKAGE_PREFIX}-python-setuptools"
+             "${MINGW_PACKAGE_PREFIX}-python-setuptools-scm")
 options=('staticlibs' 'strip' '!debug')
 source=("${_realname}-${pkgver}.tar.gz::https://github.com/RonnyPfannschmidt/${_realname}/archive/v${pkgver}.tar.gz")
 sha256sums=('ae275f7f78c81dfd9a34e6d5557099d5dd10d15effd8beff0915679179ebf3cc')
diff --git a/mingw-w64-python-jinja/PKGBUILD b/mingw-w64-python-jinja/PKGBUILD
index 0f03e2827a..e0e7f5e7fb 100644
--- a/mingw-w64-python-jinja/PKGBUILD
+++ b/mingw-w64-python-jinja/PKGBUILD
@@ -2,34 +2,37 @@
 
 _realname=jinja
 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.3
-pkgrel=2
+pkgrel=1
 pkgdesc="A simple pythonic template language written in Python (mingw-w64)"
 arch=('any')
 license=('BSD')
 url="http://jinja.pocoo.org/"
-depends=("${MINGW_PACKAGE_PREFIX}-python3-setuptools"
-         "${MINGW_PACKAGE_PREFIX}-python3-markupsafe")
+depends=("${MINGW_PACKAGE_PREFIX}-python-setuptools"
+         "${MINGW_PACKAGE_PREFIX}-python-markupsafe")
 source=(${_realname}-${pkgver}.tar.gz::https://github.com/pallets/jinja/archive/${pkgver}.tar.gz)
 sha256sums=('db49236731373e4f3118af880eb91bb0aa6978bc0cf8b35760f6a026f1a9ffc4')
 
 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} --root="${pkgdir}" -O1
+    ${MINGW_PREFIX}/bin/python setup.py install --prefix=${MINGW_PREFIX} --root="${pkgdir}" -O1
 
-  install -Dm644 LICENSE.rst "${pkgdir}${MINGW_PREFIX}/share/licenses/python3-${_realname}/LICENSE.rst"
+  install -Dm644 LICENSE.rst "${pkgdir}${MINGW_PREFIX}/share/licenses/python-${_realname}/LICENSE.rst"
 }
diff --git a/mingw-w64-python-ldap/PKGBUILD b/mingw-w64-python-ldap/PKGBUILD
index 0287eb2a0b..eddf38c1e7 100644
--- a/mingw-w64-python-ldap/PKGBUILD
+++ b/mingw-w64-python-ldap/PKGBUILD
@@ -2,15 +2,18 @@
 
 _realname=ldap
 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.2.0
-pkgrel=3
+pkgrel=1
 pkgdesc="LDAP client API for Python (mingw-w64)"
 arch=('any')
 url='https://github.com/python-ldap/python-ldap'
 license=('LICENSE')
-depends=("${MINGW_PACKAGE_PREFIX}-python3")
-makedepends=("${MINGW_PACKAGE_PREFIX}-python3-setuptools"
+depends=("${MINGW_PACKAGE_PREFIX}-python")
+makedepends=("${MINGW_PACKAGE_PREFIX}-python-setuptools"
              "${MINGW_PACKAGE_PREFIX}-openldap")
 options=('staticlibs' 'strip' '!debug')
 source=("https://github.com/python-ldap/python-ldap/archive/python-${_realname}-${pkgver}.tar.gz")
@@ -35,30 +38,30 @@ del_file_exists() {
 
 prepare() {
   cd "${srcdir}"
-  rm -rf python3-build-${CARCH} | true
-  cp -r "python-${_realname}-python-${_realname}-${pkgver}" "python3-build-${CARCH}"
+  rm -rf python-build-${CARCH} | true
+  cp -r "python-${_realname}-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 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} \
     --root="${pkgdir}" --optimize=1 --skip-build
 
-  install -Dm644 LICENCE "${pkgdir}${MINGW_PREFIX}/share/licenses/python3-${_realname}/COPYING"
+  install -Dm644 LICENCE "${pkgdir}${MINGW_PREFIX}/share/licenses/python-${_realname}/COPYING"
 }
diff --git a/mingw-w64-python-ldap3/PKGBUILD b/mingw-w64-python-ldap3/PKGBUILD
index 48dc899ba4..05a25828d2 100644
--- a/mingw-w64-python-ldap3/PKGBUILD
+++ b/mingw-w64-python-ldap3/PKGBUILD
@@ -2,15 +2,18 @@
 
 _realname=ldap3
 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.6.1
-pkgrel=2
+pkgrel=1
 pkgdesc="a strictly RFC 4510 conforming LDAP V3 pure Python client (mingw-w64)"
 arch=('any')
 url='https://github.com/cannatag/ldap3'
 license=('LICENSE')
-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/cannatag/ldap3/archive/v${pkgver}.tar.gz")
 sha512sums=('ea33bc43c125d503160d6bf158adb7035d9c3916dbd77a3703a5870bb8628bc0f9d0850a6e32011a6b73beea3e129a18488ffe9e610a750812c0f1637fd36a31')
@@ -34,30 +37,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.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-lockfile/PKGBUILD b/mingw-w64-python-lockfile/PKGBUILD
index c3476b942f..0b453b68db 100644
--- a/mingw-w64-python-lockfile/PKGBUILD
+++ b/mingw-w64-python-lockfile/PKGBUILD
@@ -2,15 +2,18 @@
 
 _realname=lockfile
 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.12.2
-pkgrel=3
+pkgrel=1
 pkgdesc="Platform-independent file locking module (mingw-w64)"
 arch=('any')
 url='https://github.com/openstack/pylockfile'
 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/l/lockfile/lockfile-${pkgver}.tar.gz)
 sha256sums=('6aed02de03cba24efabcd600b30540140634fc06cfa603822d508d5361e9f799')
diff --git a/mingw-w64-python-lxml/PKGBUILD b/mingw-w64-python-lxml/PKGBUILD
index b70a69078c..6a6379424d 100644
--- a/mingw-w64-python-lxml/PKGBUILD
+++ b/mingw-w64-python-lxml/PKGBUILD
@@ -3,27 +3,35 @@
 
 _realname=lxml
 pkgbase=mingw-w64-python-${_realname}
-pkgname=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}"
-         "${MINGW_PACKAGE_PREFIX}-python-${_realname}-docs")
-pkgver=4.4.1
-pkgrel=3
+pkgname=("${MINGW_PACKAGE_PREFIX}-python-${_realname}")
+pkgver=4.4.2
+pkgrel=1
+provides=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}=${pkgver}"
+          "${MINGW_PACKAGE_PREFIX}-python-${_realname}-docs")
+conflicts=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}"
+           "${MINGW_PACKAGE_PREFIX}-python-${_realname}-docs")
+replaces=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}"
+          "${MINGW_PACKAGE_PREFIX}-python-${_realname}-docs")
+pkgdesc="Python binding for the libxml2 and libxslt libraries (mingw-w64)"
 arch=('any')
 license=('BSD' 'custom')
 url="https://lxml.de/"
+depends=("${MINGW_PACKAGE_PREFIX}-libxml2"
+         "${MINGW_PACKAGE_PREFIX}-libxslt"
+         "${MINGW_PACKAGE_PREFIX}-python")
+optdepends=("${MINGW_PACKAGE_PREFIX}-python-beautifulsoup4: support for parsing not well formed HTML"
+            "${MINGW_PACKAGE_PREFIX}-python-cssselect: support for cssselect"
+            "${MINGW_PACKAGE_PREFIX}-python-html5lib: support for html5lib parser")
 makedepends=("${MINGW_PACKAGE_PREFIX}-cython"
-             "${MINGW_PACKAGE_PREFIX}-epydoc"
-             "${MINGW_PACKAGE_PREFIX}-libxml2"
-             "${MINGW_PACKAGE_PREFIX}-libxslt"
-             "${MINGW_PACKAGE_PREFIX}-python3"
-             "${MINGW_PACKAGE_PREFIX}-python3-docutils"
-             "${MINGW_PACKAGE_PREFIX}-python3-beautifulsoup4"
-             "${MINGW_PACKAGE_PREFIX}-python3-cssselect"
-             "${MINGW_PACKAGE_PREFIX}-python3-html5lib")
+             "${MINGW_PACKAGE_PREFIX}-python-docutils"
+             "${MINGW_PACKAGE_PREFIX}-python-beautifulsoup4"
+             "${MINGW_PACKAGE_PREFIX}-python-cssselect"
+             "${MINGW_PACKAGE_PREFIX}-python-html5lib")
 source=("https://github.com/lxml/lxml/archive/${_realname}-${pkgver}.tar.gz"
         "mingw-python-fix.patch"
         "use-distutils-get_platform.patch"
         "allow-pass-path-to-rst2s5.patch")
-sha256sums=('a735879b25331bb0c8c115e8aff6250469241fbce98bba192142cd767ff23408'
+sha256sums=('8afbb5cc6562ea70e8f6428f1537c02c10d9def359136978a5fce671d6f7e40d'
             'd5811e7c0be65d7e9ce59ad925466ac7dc95bdca05439be0becf2cca7bb9602a'
             'd50fefc47295d8c6eecf1ca42d03af43dc79d3debb52caf8edbed3b56df2f672'
             'ec4de74d02cc4f0d09c029c7e36063ff833e378b36993e8bb57b852ac5648b7c')
@@ -43,8 +51,8 @@ prepare() {
               allow-pass-path-to-rst2s5.patch
 
   cd "${srcdir}"
-  rm -rf python3-build-${CARCH} | true
-  cp -r "${_realname}-${_realname}-${pkgver}" "python3-build-${CARCH}"
+  rm -rf python-build-${CARCH} | true
+  cp -r "${_realname}-${_realname}-${pkgver}" "python-build-${CARCH}"
 }
 
 build() {
@@ -66,63 +74,32 @@ build() {
   CPPFLAGS="$CPPFLAGS -I${PREFIX_WIN}\\\\include\\\\libxml2"
   LDFLAGS="$LDFLAGS -L${PREFIX_WIN}\\\\lib"
 
-  msg "Python 3 build for ${CARCH}"
-  pushd "${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 \
        --with-xslt-config=${MINGW_PREFIX}/bin/xslt-config \
        --with-xml2-config=${MINGW_PREFIX}/bin/xml2-config \
        --with-cython --with-unicode-strings
-  popd
 
-  cd "${srcdir}/python2-build-${CARCH}"
-  make PYTHON=${MINGW_PREFIX}/bin/python3 RST2S5=${MINGW_PREFIX}/bin/rst2s5.py html
+  #make PYTHON=${MINGW_PREFIX}/bin/python RST2S5=${MINGW_PREFIX}/bin/rst2s5.py html
 }
 
-package_python3-lxml() {
-  pkgdesc="Python3 binding for the libxml2 and libxslt libraries (mingw-w64)"
-  depends=("${MINGW_PACKAGE_PREFIX}-libxml2" "${MINGW_PACKAGE_PREFIX}-libxslt" "${MINGW_PACKAGE_PREFIX}-python3")
-  optdepends=("${MINGW_PACKAGE_PREFIX}-python3-beautifulsoup4: support for parsing not well formed HTML"
-              "${MINGW_PACKAGE_PREFIX}-python3-cssselect: support for cssselect"
-              "${MINGW_PACKAGE_PREFIX}-python3-html5lib: support for html5lib parser"
-              "${MINGW_PACKAGE_PREFIX}-python-lxml-docs: offline docs")
-
-  cd "${srcdir}/python3-build-${CARCH}"
+package() {
+  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 \
-         --with-xslt-config=${MINGW_PREFIX}/bin/xslt-config \
-         --with-xml2-config=${MINGW_PREFIX}/bin/xml2-config \
-         --with-cython --with-unicode-strings
+    ${MINGW_PREFIX}/bin/python setup.py install --prefix=${MINGW_PREFIX#\/} \
+        --root="${pkgdir}" --optimize=1 --skip-build \
+        --with-xslt-config=${MINGW_PREFIX}/bin/xslt-config \
+        --with-xml2-config=${MINGW_PREFIX}/bin/xml2-config \
+        --with-cython --with-unicode-strings
 
   install -Dm644 LICENSES.txt \
-    "${pkgdir}${MINGW_PREFIX}"/share/licenses/python3-${_realname}/LICENSE
+    "${pkgdir}${MINGW_PREFIX}"/share/licenses/python-${_realname}/LICENSE
   install -Dm644 doc/licenses/BSD.txt \
-    "${pkgdir}${MINGW_PREFIX}"/share/licenses/python3-${_realname}/BSD.txt
+    "${pkgdir}${MINGW_PREFIX}"/share/licenses/python-${_realname}/BSD.txt
   install -Dm644 doc/licenses/elementtree.txt \
-    "${pkgdir}${MINGW_PREFIX}"/share/licenses/python3-${_realname}/elementtree.txt
-}
+    "${pkgdir}${MINGW_PREFIX}"/share/licenses/python-${_realname}/elementtree.txt
 
-package_python-lxml-docs() {
-  pkgdesc="Python binding for the libxml2 and libxslt libraries (docs) (mingw-w64)"
-  options=('docs')
-
-  cd ${srcdir}/python3-build-${CARCH}
-  install -d "${pkgdir}${MINGW_PREFIX}"/share/doc/${_realname}
-  cp -r doc/html "${pkgdir}${MINGW_PREFIX}"/share/doc/${_realname}
-}
-
-package_mingw-w64-i686-python3-lxml() {
-  package_python3-lxml
-}
-
-package_mingw-w64-x86_64-python3-lxml() {
-  package_python3-lxml
-}
-
-package_mingw-w64-i686-python-lxml-docs() {
-  package_python-lxml-docs
-}
-
-package_mingw-w64-x86_64-python-lxml-docs() {
-  package_python-lxml-docs
+  #install -d "${pkgdir}${MINGW_PREFIX}"/share/doc/${_realname}
+  #cp -r doc/html "${pkgdir}${MINGW_PREFIX}"/share/doc/${_realname}
 }
diff --git a/mingw-w64-python-lz4/PKGBUILD b/mingw-w64-python-lz4/PKGBUILD
index a880a6d1fb..b8e9e2ca4b 100644
--- a/mingw-w64-python-lz4/PKGBUILD
+++ b/mingw-w64-python-lz4/PKGBUILD
@@ -2,20 +2,23 @@
 
 _realname=lz4
 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.2.1
 pkgrel=2
 pkgdesc="This package provides python bindings for the LZ4 compression library (mingw-w64)"
 arch=('any')
 url='https://github.com/python-lz4/python-lz4'
 license=('BSD3')
-depends=("${MINGW_PACKAGE_PREFIX}-python3")
-makedepends=("${MINGW_PACKAGE_PREFIX}-python3-setuptools-scm"
-             "${MINGW_PACKAGE_PREFIX}-python3-pkgconfig"
-             "${MINGW_PACKAGE_PREFIX}-python3-setuptools")
-checkdepends=("${MINGW_PACKAGE_PREFIX}-python3-pytest-runner"
-              "${MINGW_PACKAGE_PREFIX}-python3-pytest-cov"
-              "${MINGW_PACKAGE_PREFIX}-python3-psutil")
+depends=("${MINGW_PACKAGE_PREFIX}-python")
+makedepends=("${MINGW_PACKAGE_PREFIX}-python-setuptools-scm"
+             "${MINGW_PACKAGE_PREFIX}-python-pkgconfig"
+             "${MINGW_PACKAGE_PREFIX}-python-setuptools")
+checkdepends=("${MINGW_PACKAGE_PREFIX}-python-pytest-runner"
+              "${MINGW_PACKAGE_PREFIX}-python-pytest-cov"
+              "${MINGW_PACKAGE_PREFIX}-python-psutil")
 options=('staticlibs' 'strip' '!debug')
 source=("${_realname}-${pkgver}.tar.gz"::"https://github.com/python-lz4/python-lz4/archive/v${pkgver}.tar.gz")
 sha512sums=('84b575ddfa6252d7e061e2e562827307b712fe6d750cd2042d79c79b69d59431b17ac82f76412b689e2e12f90b7317a7c80b5602c7a34bb70aa2d586e39d8d8b')
@@ -23,30 +26,30 @@ sha512sums=('84b575ddfa6252d7e061e2e562827307b712fe6d750cd2042d79c79b69d59431b17
 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 setup.py test
+  msg "Python test for ${CARCH}"
+  cd "${srcdir}/python-build-${CARCH}"
+  ${MINGW_PREFIX}/bin/python setup.py test
 }
 
 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=2 --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-markupsafe/PKGBUILD b/mingw-w64-python-markupsafe/PKGBUILD
index 877211205a..0926f1c3d2 100644
--- a/mingw-w64-python-markupsafe/PKGBUILD
+++ b/mingw-w64-python-markupsafe/PKGBUILD
@@ -2,15 +2,18 @@
 
 _realname=markupsafe
 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=3
+pkgrel=1
 pkgdesc="Implements a XML/HTML/XHTML Markup safe string for Python (mingw-w64)"
 arch=('any')
 license=('custom')
 url="https://pypi.python.org/pypi/MarkupSafe"
-depends=("${MINGW_PACKAGE_PREFIX}-python3")
-makedepends=("${MINGW_PACKAGE_PREFIX}-python3-setuptools")
+depends=("${MINGW_PACKAGE_PREFIX}-python")
+makedepends=("${MINGW_PACKAGE_PREFIX}-python-setuptools")
 source=("https://pypi.org/packages/source/M/MarkupSafe/MarkupSafe-${pkgver}.tar.gz")
 sha256sums=('29872e92839765e546828bb7754a68c418d927cd064fd4708fab9fe9c8bb116b')
 
diff --git a/mingw-w64-python-mock/PKGBUILD b/mingw-w64-python-mock/PKGBUILD
index 00ac4b1f2b..be4c92722b 100644
--- a/mingw-w64-python-mock/PKGBUILD
+++ b/mingw-w64-python-mock/PKGBUILD
@@ -2,18 +2,21 @@
 
 _realname=mock
 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.5
-pkgrel=3
+pkgrel=1
 pkgdesc='Rolling backport of unittest.mock for all Pythons (mingw-w64)'
 arch=('any')
 url='https://github.com/testing-cabal/mock'
 license=('BSD')
-depends=("${MINGW_PACKAGE_PREFIX}-python3"
-         "${MINGW_PACKAGE_PREFIX}-python3-six"
-         "${MINGW_PACKAGE_PREFIX}-python3-pbr")
-makedepends=("${MINGW_PACKAGE_PREFIX}-python3-setuptools"
-             "${MINGW_PACKAGE_PREFIX}-python3-funcsigs")
+depends=("${MINGW_PACKAGE_PREFIX}-python"
+         "${MINGW_PACKAGE_PREFIX}-python-six"
+         "${MINGW_PACKAGE_PREFIX}-python-pbr")
+makedepends=("${MINGW_PACKAGE_PREFIX}-python-setuptools"
+             "${MINGW_PACKAGE_PREFIX}-python-funcsigs")
 source=("https://pypi.python.org/packages/source/m/${_realname}/${_realname}-${pkgver}.tar.gz")
 sha256sums=('83657d894c90d5681d62155c82bda9c1187827525880eda8ff5df4ec813437c3')
 noextract=(${_realname}-${pkgver}.tar.gz)
@@ -23,14 +26,14 @@ prepare() {
   tar -xzf ${srcdir}/${_realname}-${pkgver}.tar.gz -C ${srcdir} || true
 
   cd "${srcdir}"
-  cp -r ${_realname}-${pkgver} python3-build-${CARCH}
+  cp -r ${_realname}-${pkgver} python-build-${CARCH}
 }
 
 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
 
-  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-more-itertools/PKGBUILD b/mingw-w64-python-more-itertools/PKGBUILD
index 4c6f888927..5de1ee6bf4 100644
--- a/mingw-w64-python-more-itertools/PKGBUILD
+++ b/mingw-w64-python-more-itertools/PKGBUILD
@@ -2,40 +2,42 @@
 
 _realname=more-itertools
 pkgbase=mingw-w64-python3-${_realname}
-pkgname=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
-pkgver=7.2.0
-pkgrel=2
+pkgname=("${MINGW_PACKAGE_PREFIX}-python-${_realname}")
+pkgver=8.0.2
+pkgrel=1
+provides=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}=${pkgver}")
+conflicts=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+replaces=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
 pkgdesc="More routines for operating on iterables, beyond itertools (mingw-w64)"
 arch=('any')
 url="https://github.com/erikrose/more-itertools"
 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/erikrose/more-itertools/releases/download/v${pkgver}/${_realname}-${pkgver}.tar.gz")
-sha256sums=('409cd48d4db7052af495b09dec721011634af3753ae1ef92d2b32f73a745f832')
+sha256sums=('b84b238cce0d9adad5ed87e745778d20a3f8487d0f0cb8b8a586816c7496458d')
 
 prepare() {
   cd "${srcdir}"
-
 }
 
 build() {
   cd "${srcdir}"
 
-  rm -rf python3-build-${CARCH}
-  cp -r "${_realname}-${pkgver}" "python3-build-${CARCH}"
-  cd "${srcdir}/python3-build-${CARCH}"
+  rm -rf python-build-${CARCH}
+  cp -r "${_realname}-${pkgver}" "python-build-${CARCH}"
+  cd "${srcdir}/python-build-${CARCH}"
 
-  ${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 "${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-msgpack/PKGBUILD b/mingw-w64-python-msgpack/PKGBUILD
index dfa545b521..58d2501877 100644
--- a/mingw-w64-python-msgpack/PKGBUILD
+++ b/mingw-w64-python-msgpack/PKGBUILD
@@ -2,15 +2,18 @@
 
 _realname=msgpack
 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.2
-pkgrel=2
+pkgrel=1
 pkgdesc="MessagePack serializer implementation for Python (mingw-w64)"
 arch=('any')
 url='https://github.com/msgpack/msgpack-python'
 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}-python-$pkgver.tar.gz"::"https://github.com/msgpack/msgpack-python/archive/v${pkgver}.tar.gz")
 sha256sums=('71d5cfc97b91a04c85b4193cbb8b50b29b66393626cb00c52b30275981ddb7f8')
diff --git a/mingw-w64-python-ndg-httpsclient/PKGBUILD b/mingw-w64-python-ndg-httpsclient/PKGBUILD
index 81137c65e8..a175cf5a2d 100644
--- a/mingw-w64-python-ndg-httpsclient/PKGBUILD
+++ b/mingw-w64-python-ndg-httpsclient/PKGBUILD
@@ -3,36 +3,39 @@
 _pyname=ndg_httpsclient
 _realname=ndg-httpsclient
 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.5.1
-pkgrel=4
+pkgrel=1
 pkgdesc="Provides enhanced HTTPS support for httplib and urllib2 using PyOpenSSL (mingw-w64)"
 url='https://pypi.python.org/pypi/ndg-httpsclient'
 license=('BSD')
 arch=('any')
-depends=("${MINGW_PACKAGE_PREFIX}-python3-pyopenssl"
-         "${MINGW_PACKAGE_PREFIX}-python3-pyasn1")
-makedepends=("${MINGW_PACKAGE_PREFIX}-python3-setuptools")
+depends=("${MINGW_PACKAGE_PREFIX}-python-pyopenssl"
+         "${MINGW_PACKAGE_PREFIX}-python-pyasn1")
+makedepends=("${MINGW_PACKAGE_PREFIX}-python-setuptools")
 install=${_realname}3-${CARCH}.install
 source=("${_realname}-${pkgver}.tar.gz"::"https://files.pythonhosted.org/packages/source/n/${_realname}/${_pyname}-${pkgver}.tar.gz")
 sha256sums=('d72faed0376ab039736c2ba12e30695e2788c4aa569c9c3e3d72131de2592210')
 
 prepare() {
   cd ${srcdir}
-  cp -r ${_pyname}-${pkgver} python3-build-${CARCH}
+  cp -r ${_pyname}-${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}
-  ${MINGW_PREFIX}/bin/python3 setup.py build
+  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
+
   # fix python command in files
   local PREFIX_WIN=$(cygpath -am ${MINGW_PREFIX})
   for _f in "${pkgdir}${MINGW_PREFIX}"/bin/*.py; do
diff --git a/mingw-w64-python-netifaces/PKGBUILD b/mingw-w64-python-netifaces/PKGBUILD
index 20b8b08de7..dbacdf95d1 100644
--- a/mingw-w64-python-netifaces/PKGBUILD
+++ b/mingw-w64-python-netifaces/PKGBUILD
@@ -2,15 +2,18 @@
 
 _realname=netifaces
 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.10.9
-pkgrel=3
+pkgrel=1
 pkgdesc="Portable module to access network interface information in Python (mingw-w64)"
 arch=('any')
 url='https://alastairs-place.net/netifaces/'
 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.io/packages/source/n/netifaces/netifaces-${pkgver}.tar.gz")
 sha512sums=('8fc593de4d2cbda46a3e2430ede031360f1abfc64d47d00fbec09f3395fd83479bf29d97cb6834b1df06850c9ac2745c9344b6814f34be5975d4d5df98e05e87')
@@ -62,6 +65,5 @@ package() {
   ${MINGW_PREFIX}/bin/python setup.py install --prefix=${MINGW_PREFIX} \
     --root="${pkgdir}" --optimize=1 --skip-build
 
-# Install license, that is inside the readme file
   install -Dm644 README.rst "${pkgdir}${MINGW_PREFIX}/share/licenses/python-${_realname}/LICENSE"
 }
diff --git a/mingw-w64-python-nose/PKGBUILD b/mingw-w64-python-nose/PKGBUILD
index 3add4718a1..0b99de3b51 100644
--- a/mingw-w64-python-nose/PKGBUILD
+++ b/mingw-w64-python-nose/PKGBUILD
@@ -3,38 +3,41 @@
 
 _realname=nose
 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.7
-pkgrel=11
+pkgrel=1
 pkgdesc="A discovery-based unittest extension (mingw-w64)"
 arch=('any')
 license=('LGPL-2.1')
 url="https://nose.readthedocs.io/"
-depends=("${MINGW_PACKAGE_PREFIX}-python3-setuptools")
+depends=("${MINGW_PACKAGE_PREFIX}-python-setuptools")
 install=${_realname}3-${CARCH}.install
 source=("https://pypi.python.org/packages/source/n/nose/nose-${pkgver}.tar.gz")
 sha256sums=('f1bffef9cbc82628f6e7d7b40d7e255aefaa1adb6a1b1d26c69a8b79e6208a98')
 
 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() {
   cd "${srcdir}"
-    msg "Python 3 build for ${CARCH}"  
-    cd "${srcdir}/python3-build-${CARCH}"
+    msg "Python build for ${CARCH}"  
+    cd "${srcdir}/python-build-${CARCH}"
     sed -i -e "s:man/man1:share/man/man1:g" setup.py
-    ${MINGW_PREFIX}/bin/python3 setup.py build
+    ${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}" -O1
+    ${MINGW_PREFIX}/bin/python setup.py install --prefix=${MINGW_PREFIX} --root="${pkgdir}" -O1
 
   local PREFIX_WIN=$(cygpath -wm ${MINGW_PREFIX})
   # fix python command in files
@@ -43,14 +46,5 @@ package() {
         -e "s|${PREFIX_WIN}|${MINGW_PREFIX}|g" -i ${_f}
   done
 
-  for f in nosetests; 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
-
-  rm -rf "${pkgdir}${MINGW_PREFIX}/share"
+  #rm -rf "${pkgdir}${MINGW_PREFIX}/share"
 }
diff --git a/mingw-w64-python-nose/nose3-i686.install b/mingw-w64-python-nose/nose3-i686.install
index 346a0b912e..84e507217c 100644
--- a/mingw-w64-python-nose/nose3-i686.install
+++ b/mingw-w64-python-nose/nose3-i686.install
@@ -3,7 +3,7 @@ post_install() {
   local _prefix=$(pwd -W)
   cd -
   local _it
-  for _it in nosetests3 nosetests-3.8; do
+  for _it in nosetests nosetests-3.8; do
     sed -e "s|/mingw32|${_prefix}|g" \
         -i ${_prefix}/bin/${_it}-script.py
   done
diff --git a/mingw-w64-python-nose/nose3-x86_64.install b/mingw-w64-python-nose/nose3-x86_64.install
index 7bd2608cd9..bf0196cce3 100644
--- a/mingw-w64-python-nose/nose3-x86_64.install
+++ b/mingw-w64-python-nose/nose3-x86_64.install
@@ -3,7 +3,7 @@ post_install() {
   local _prefix=$(pwd -W)
   cd -
   local _it
-  for _it in nosetests3 nosetests-3.8; do
+  for _it in nosetests nosetests-3.8; do
     sed -e "s|/mingw64|${_prefix}|g" \
         -i ${_prefix}/bin/${_it}-script.py
   done
diff --git a/mingw-w64-python-numpy/PKGBUILD b/mingw-w64-python-numpy/PKGBUILD
index 84041c9358..119a1d4379 100644
--- a/mingw-w64-python-numpy/PKGBUILD
+++ b/mingw-w64-python-numpy/PKGBUILD
@@ -4,20 +4,23 @@
 
 _realname=numpy
 pkgbase=mingw-w64-python-${_realname}
-pkgname=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
-pkgver=1.17.4
+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.18.0
 pkgrel=1
 pkgdesc="Scientific tools for Python (mingw-w64)"
 arch=('any')
 license=('BSD')
 url="https://www.numpy.org/"
 makedepends=("${MINGW_PACKAGE_PREFIX}-openblas"
-             "${MINGW_PACKAGE_PREFIX}-python3-setuptools"
-             "${MINGW_PACKAGE_PREFIX}-python3-pytest"
+             "${MINGW_PACKAGE_PREFIX}-python-setuptools"
+             "${MINGW_PACKAGE_PREFIX}-python-pytest"
              "${MINGW_PACKAGE_PREFIX}-gcc-fortran")
 depends=("${MINGW_PACKAGE_PREFIX}-openblas"
-         "${MINGW_PACKAGE_PREFIX}-python3")
-optdepends=("${MINGW_PACKAGE_PREFIX}-python3-pytest: testsuite")
+         "${MINGW_PACKAGE_PREFIX}-python")
+optdepends=("${MINGW_PACKAGE_PREFIX}-python-pytest: testsuite")
 #options=('!strip' 'debug')
 source=(https://github.com/numpy/numpy/releases/download/v${pkgver}/${_realname}-${pkgver}.tar.gz 
         0001-detect-mingw-environment.patch
@@ -30,7 +33,7 @@ source=(https://github.com/numpy/numpy/releases/download/v${pkgver}/${_realname}
         0008-mingw-gcc-doesnt-support-visibility.patch
         0009-disable-old-mingw-stuff.patch
         0010-mingw-inline-stuff.patch)
-sha256sums=('fb0415475e673cb9a6dd816df999e0ab9f86fa3af2b1770944e7288d2bea4ac9'
+sha256sums=('e5eaf340489b76eef91352bf48b36e92ace07f6b0f1c87dcd3b5dbada97df03a'
             '173e9020eb88a9b281180024ad0f137f86f893e2099693693e42a5bf5944381a'
             '140c23c214cae880833380e8479e4ce45c8439b22b1432d73ff0cc2cd58da886'
             '3b640625b56b158465d6628f75fadce90af8825259d04af1b1af09fef53a720c'
@@ -58,7 +61,7 @@ prepare() {
   patch -Np1 -i ${srcdir}/0010-mingw-inline-stuff.patch
   cd ..
 
-  cp -a ${_realname}-${pkgver} ${_realname}-py3-${CARCH}
+  cp -a ${_realname}-${pkgver} ${_realname}-py-${CARCH}
 }
 
 build() {
@@ -67,25 +70,24 @@ build() {
   # See: https://sourceforge.net/p/mingw-w64/mailman/message/36287627/
   export CFLAGS="$CFLAGS -fno-asynchronous-unwind-tables"
 
-  cd ${_realname}-py3-${CARCH}
+  cd ${_realname}-py-${CARCH}
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
-    ${MINGW_PREFIX}/bin/python3 setup.py config_fc --fcompiler=gnu95 build
+    ${MINGW_PREFIX}/bin/python setup.py config_fc --fcompiler=gnu95 build
 }
 
 package() {
-  _pyver=$(${MINGW_PREFIX}/bin/python3 -c "import sys;sys.stdout.write('.'.join(map(str, sys.version_info[:2])))")
-  _pyinc=${_pyver}m
+  _pyver=$(${MINGW_PREFIX}/bin/python -c "import sys;sys.stdout.write('.'.join(map(str, sys.version_info[:2])))")
+  _pyinc=${_pyver}
 
   export ATLAS=None
   export LDFLAGS="$LDFLAGS -shared"
   export CFLAGS="$CFLAGS -fno-asynchronous-unwind-tables"
 
-  cd ${_realname}-py3-${CARCH}
+  cd ${_realname}-py-${CARCH}
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
-    ${MINGW_PREFIX}/bin/python3 setup.py config_fc --fcompiler=gnu95 install --prefix=${MINGW_PREFIX} --root="${pkgdir}" --optimize=1
+    ${MINGW_PREFIX}/bin/python setup.py config_fc --fcompiler=gnu95 install --prefix=${MINGW_PREFIX} --root="${pkgdir}" --optimize=1
 
-  install -m755 -d "${pkgdir}${MINGW_PREFIX}/share/licenses/python3-${_realname}"
-  install -m644 LICENSE.txt "${pkgdir}${MINGW_PREFIX}/share/licenses/python3-${_realname}/"
+  install -Dm644 LICENSE.txt ${pkgdir}${MINGW_PREFIX}/share/licenses/python-${_realname}/LICENSE.txt
 
   install -m755 -d "${pkgdir}${MINGW_PREFIX}/include/python${_pyinc}"
   cp -rf ${pkgdir}${MINGW_PREFIX}/lib/python${_pyver}/site-packages/${_realname}/core/include/${_realname} "${pkgdir}${MINGW_PREFIX}/include/python${_pyinc}/"
diff --git a/mingw-w64-python-nvidia-ml/PKGBUILD b/mingw-w64-python-nvidia-ml/PKGBUILD
index 28293301cd..aefc839a93 100644
--- a/mingw-w64-python-nvidia-ml/PKGBUILD
+++ b/mingw-w64-python-nvidia-ml/PKGBUILD
@@ -3,26 +3,29 @@
 _realname=nvidia-ml
 _srcname=nvidia-ml-py
 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=7.352.0
-pkgrel=3
+pkgrel=1
 pkgdesc="Python bindings to the NVIDIA Management Library (mingw-w64)"
 arch=('any')
 url='https://www.nvidia.com/'
 license=('BSD')
-depends=("${MINGW_PACKAGE_PREFIX}-python3")
-makedepends=("${MINGW_PACKAGE_PREFIX}-python3-setuptools")
+depends=("${MINGW_PACKAGE_PREFIX}-python")
+makedepends=("${MINGW_PACKAGE_PREFIX}-python-setuptools")
 _dtoken='72/31/378ca145e919ca415641a0f17f2669fa98c482a81f1f8fdfb72b1f9dbb37'
 source=("https://files.pythonhosted.org/packages/${_dtoken}/${_srcname}-${pkgver}.tar.gz")
 sha256sums=('b4a342ba52a51ff794af38279ce62f78b278ba5f50c13103af52c4f6113ff65e')
 
 prepare() {
   cd "${srcdir}"
-  rm -rf python3-build-${CARCH} | true
-  cp -r "${_srcname}-${pkgver}" "python3-build-${CARCH}"
+  rm -rf python-build-${CARCH} | true
+  cp -r "${_srcname}-${pkgver}" "python-build-${CARCH}"
 
   #make code python3 compatible:
-  cd "python3-build-${CARCH}"
+  cd "python-build-${CARCH}"
   for pyscript in pynvml.py nvidia_smi.py; do
     chmod 666 ${pyscript}
     PYTHONIOENCODING="utf-8" 2to3 -wn ${pyscript} > /dev/null
@@ -31,21 +34,21 @@ prepare() {
 }
 
 build() {
-  msg "Python ${pver} 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() {
-  cd "${srcdir}/python3-build-${CARCH}"
-  ${MINGW_PREFIX}/bin/python${pver} setup.py check
+  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 README.txt "${pkgdir}${MINGW_PREFIX}/share/licenses/python3-${_realname}/LICENSE"
+  install -Dm644 README.txt "${pkgdir}${MINGW_PREFIX}/share/licenses/python-${_realname}/LICENSE"
 }
diff --git a/mingw-w64-python-olefile/PKGBUILD b/mingw-w64-python-olefile/PKGBUILD
index ee960e2151..d7ec67a41f 100644
--- a/mingw-w64-python-olefile/PKGBUILD
+++ b/mingw-w64-python-olefile/PKGBUILD
@@ -2,28 +2,31 @@
 
 _realname=olefile
 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}")
 pkgdesc="Python library to parse, read and write Microsoft OLE2 files (formerly OleFileIO_PL) (mingw-w64)"
 pkgver=0.46
-pkgrel=3
+pkgrel=1
 arch=('any')
 license=('BSD')
 url="https://www.decalage.info/olefile"
-depends=("${MINGW_PACKAGE_PREFIX}-python3")
-makedepends=("${MINGW_PACKAGE_PREFIX}-python3-setuptools")
+depends=("${MINGW_PACKAGE_PREFIX}-python")
+makedepends=("${MINGW_PACKAGE_PREFIX}-python-setuptools")
 options=('staticlibs')
 source=(${_realname}-${pkgver}.tar.gz::https://github.com/decalage2/olefile/archive/v${pkgver}.tar.gz)
 sha256sums=('11d1a3810e50956c9360a4c76f1ecebf3e54f9d8406f75127bd0d296638488f4')
 
 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}"
+  msg "Python build for ${CARCH}"
+  cd "${srcdir}/python-build-${CARCH}"
   ${MINGW_PREFIX}/bin/python3 setup.py build
 }
 
@@ -31,10 +34,10 @@ package() {
   local _mingw_prefix=$(cygpath -am ${MINGW_PREFIX})
   local _py3basever=$(${MINGW_PREFIX}/bin/python3 -c "import sys;sys.stdout.write('.'.join(map(str, sys.version_info[:2])))")
   
-  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=0 --skip-build
+    ${MINGW_PREFIX}/bin/python setup.py install --prefix=${MINGW_PREFIX#\/} --root="${pkgdir}/" --optimize=0 --skip-build
 
-  install -Dm644 doc/LICENSE.rst "${pkgdir}${MINGW_PREFIX}/share/licenses/python3-${_realname}/LICENSE"
-  install -Dm644 README.md doc/* -t "${pkgdir}${MINGW_PREFIX}/share/doc/python3-${_realname}/README"
+  install -Dm644 doc/LICENSE.rst "${pkgdir}${MINGW_PREFIX}/share/licenses/python-${_realname}/LICENSE"
+  install -Dm644 README.md doc/* -t "${pkgdir}${MINGW_PREFIX}/share/doc/python-${_realname}/README"
 }
diff --git a/mingw-w64-python-ordered-set/PKGBUILD b/mingw-w64-python-ordered-set/PKGBUILD
index 330f3d1a0e..2da5628ca7 100644
--- a/mingw-w64-python-ordered-set/PKGBUILD
+++ b/mingw-w64-python-ordered-set/PKGBUILD
@@ -2,16 +2,19 @@
 
 _realname=ordered-set
 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=1
 pkgdesc='An OrderedSet is a mutable data structure that is a hybrid of a list and a set(mingw-w64)'
 arch=('any')
 url='https://github.com/LuminosoInsight/ordered-set'
 license=('MIT')
-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/LuminosoInsight/ordered-set/archive/release/${pkgver}.tar.gz"
         https://files.pythonhosted.org/packages/a3/b7/d4d69641cbe707a45c23b190f2d717466ba5accc4c70b5f7a8a450387895/ordered-set-${pkgver}.tar.gz)
 sha256sums=('a7bfa858748c73b096e43db14eb23e2bc714a503f990c89fac8fab9b0ee79724')
diff --git a/mingw-w64-python-packaging/PKGBUILD b/mingw-w64-python-packaging/PKGBUILD
index e3d9797e04..b4bf4004c0 100644
--- a/mingw-w64-python-packaging/PKGBUILD
+++ b/mingw-w64-python-packaging/PKGBUILD
@@ -2,21 +2,24 @@
 
 _realname=packaging
 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=19.2
-pkgrel=2
+pkgrel=1
 pkgdesc="Core utilities for Python packages (mingw-w64)"
 arch=('any')
 url="https://github.com/pypa/packaging"
 license=('Apache')
-depends=("${MINGW_PACKAGE_PREFIX}-python3"
-         "${MINGW_PACKAGE_PREFIX}-python3-pyparsing"
-         "${MINGW_PACKAGE_PREFIX}-python3-six"
-         "${MINGW_PACKAGE_PREFIX}-python3-attrs")
-makedepends=("${MINGW_PACKAGE_PREFIX}-python3-setuptools")
-checkdepends=("${MINGW_PACKAGE_PREFIX}-python3-pytest-runner"
-              "${MINGW_PACKAGE_PREFIX}-python3-pretend"
-              "${MINGW_PACKAGE_PREFIX}-python3-coverage")
+depends=("${MINGW_PACKAGE_PREFIX}-python"
+         "${MINGW_PACKAGE_PREFIX}-python-pyparsing"
+         "${MINGW_PACKAGE_PREFIX}-python-six"
+         "${MINGW_PACKAGE_PREFIX}-python-attrs")
+makedepends=("${MINGW_PACKAGE_PREFIX}-python-setuptools")
+checkdepends=("${MINGW_PACKAGE_PREFIX}-python-pytest-runner"
+              "${MINGW_PACKAGE_PREFIX}-python-pretend"
+              "${MINGW_PACKAGE_PREFIX}-python-coverage")
 source=(https://pypi.io/packages/source/p/packaging/${_realname}-${pkgver}.tar.gz)
 sha256sums=('28b924174df7a2fa32c1953825ff29c61e2f5e082343165438812f00d3a7fc47')
 
diff --git a/mingw-w64-python-paramiko/PKGBUILD b/mingw-w64-python-paramiko/PKGBUILD
index e35b920b5e..c1c5d63b9b 100644
--- a/mingw-w64-python-paramiko/PKGBUILD
+++ b/mingw-w64-python-paramiko/PKGBUILD
@@ -2,18 +2,21 @@
 
 _realname=paramiko
 pkgbase=mingw-w64-python-${_realname}
-pkgname=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
-pkgver=2.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=2.7.1
+pkgrel=1
 pkgdesc="The leading native Python SSHv2 protocol library (mingw-w64)"
 arch=('any')
 url='https://github.com/paramiko/paramiko/'
 license=('LGPL-2.1')
-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/paramiko/paramiko/archive/${pkgver}.tar.gz")
-sha512sums=('1ac2c3486cb786a1e4640d7b7f8628087f9b78ee247b09dbd3ac2646790da4f12cf95fc4291f27f200b63ec6c11d9ebf5a1283f88cf2de7c2eb6e6f76e892ef2')
+sha512sums=('2cebed2420cf9af77cb0d459b64a74adcffcdb15bd58c8fc9243855ae91f43e16706665b64ce2851f6e99e59ca6a47d7299a2aae35a4c9d01ab97b343569c4b2')
 
 apply_patch_with_msg() {
   for _patch in "$@"
@@ -34,30 +37,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-pathlib2/PKGBUILD b/mingw-w64-python-pathlib2/PKGBUILD
index c002401ee0..cfe1046efc 100644
--- a/mingw-w64-python-pathlib2/PKGBUILD
+++ b/mingw-w64-python-pathlib2/PKGBUILD
@@ -2,16 +2,19 @@
 
 _realname=pathlib2
 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.5
-pkgrel=2
+pkgrel=1
 pkgdesc="This module offers a set of classes featuring all the common operations on paths in an easy, object-oriented way (mingw-w64)"
 url="https://pypi.org/project/pathlib2/"
 arch=('any')
 license=('MIT')
-depends=("${MINGW_PACKAGE_PREFIX}-python3"
-         "${MINGW_PACKAGE_PREFIX}-python3-scandir")
-makedepends=("${MINGW_PACKAGE_PREFIX}-python3-setuptools")
+depends=("${MINGW_PACKAGE_PREFIX}-python"
+         "${MINGW_PACKAGE_PREFIX}-python-scandir")
+makedepends=("${MINGW_PACKAGE_PREFIX}-python-setuptools")
 source=("https://pypi.io/packages/source/p/${_realname}/${_realname}-${pkgver}.tar.gz")
 sha256sums=('6cd9a47b597b37cc57de1c05e56fb1a1c9cc9fab04fe78c29acd090418529868')
 
diff --git a/mingw-w64-python-pbr/PKGBUILD b/mingw-w64-python-pbr/PKGBUILD
index 53d7c7d000..b35773f5fd 100644
--- a/mingw-w64-python-pbr/PKGBUILD
+++ b/mingw-w64-python-pbr/PKGBUILD
@@ -2,26 +2,29 @@
 
 _realname=pbr
 pkgbase=mingw-w64-python-${_realname}
-pkgname=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
-pkgver=5.4.3
-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.4.4
+pkgrel=1
 pkgdesc="Python Build Reasonableness (mingw-w64)"
 url="https://pypi.python.org/pypi/pbr"
 license=("Apache")
 arch=('any')
-depends=("${MINGW_PACKAGE_PREFIX}-python3-setuptools")
-checkdepends=("${MINGW_PACKAGE_PREFIX}-python3-stestr"
-              "${MINGW_PACKAGE_PREFIX}-python3-testscenarios"
-              "${MINGW_PACKAGE_PREFIX}-python3-testresources"
-              "${MINGW_PACKAGE_PREFIX}-python3-testrepository"
-              "${MINGW_PACKAGE_PREFIX}-python3-mock"
-              "${MINGW_PACKAGE_PREFIX}-python3-virtualenv"
-              "${MINGW_PACKAGE_PREFIX}-python3-wheel"
-              "${MINGW_PACKAGE_PREFIX}-python3-sphinx")
+depends=("${MINGW_PACKAGE_PREFIX}-python-setuptools")
+checkdepends=("${MINGW_PACKAGE_PREFIX}-python-stestr"
+              "${MINGW_PACKAGE_PREFIX}-python-testscenarios"
+              "${MINGW_PACKAGE_PREFIX}-python-testresources"
+              "${MINGW_PACKAGE_PREFIX}-python-testrepository"
+              "${MINGW_PACKAGE_PREFIX}-python-mock"
+              "${MINGW_PACKAGE_PREFIX}-python-virtualenv"
+              "${MINGW_PACKAGE_PREFIX}-python-wheel"
+              "${MINGW_PACKAGE_PREFIX}-python-sphinx")
 install=${_realname}3-${CARCH}.install
 options=('!strip')
 source=("${_realname}-${pkgver}.tar.gz"::"https://github.com/openstack-dev/pbr/archive/${pkgver}.tar.gz")
-sha256sums=('533a774b5dc4c1fcb9712aaf248adca120800b835e64cfdf49157f7f7df82220')
+sha256sums=('da108ecb5bc3561c6b553363d0e2a357df687c409c4cd521a6b650fbc4df3a75')
 
 prepare() {
   cd ${srcdir}
diff --git a/mingw-w64-python-pep517/PKGBUILD b/mingw-w64-python-pep517/PKGBUILD
index 50e62fa46d..e521d99054 100644
--- a/mingw-w64-python-pep517/PKGBUILD
+++ b/mingw-w64-python-pep517/PKGBUILD
@@ -2,22 +2,25 @@
 
 _realname=pep517
 pkgbase=mingw-w64-python-${_realname}
-pkgname=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
-pkgver=0.7.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.8.1
+pkgrel=1
 pkgdesc="Wrappers to build Python packages using PEP 517 hooks (mingw-w64)"
 arch=('any')
 url="https://github.com/takluyver/pep517"
 license=('MIT')
 validpgpkeys=('gpg_KEY')
-depends=("${MINGW_PACKAGE_PREFIX}-python3")
-makedepends=("${MINGW_PACKAGE_PREFIX}-python3-pytoml"
-             "${MINGW_PACKAGE_PREFIX}-python3-setuptools")
-checkdepends=("${MINGW_PACKAGE_PREFIX}-python3-pytest"
-              "${MINGW_PACKAGE_PREFIX}-python3-testpath")
+depends=("${MINGW_PACKAGE_PREFIX}-python")
+makedepends=("${MINGW_PACKAGE_PREFIX}-python-pytoml"
+             "${MINGW_PACKAGE_PREFIX}-python-setuptools")
+checkdepends=("${MINGW_PACKAGE_PREFIX}-python-pytest"
+              "${MINGW_PACKAGE_PREFIX}-python-testpath")
 options=('staticlibs' 'strip' '!debug')
 source=("https://pypi.io/packages/source/p/pep517/pep517-${pkgver}.tar.gz")
-sha512sums=('6c59dd41ec05e5f3b5032ed2d262f4fc4ba51d31cd7e8115f8f128a3e56b9e8ba1ec6140f37be6370561618ab8ad9845422b144db09e6102f8178a2c52756b2a')
+sha512sums=('72227734e9216b437a618abbcc2eb1795914915c2ddad31f344465f1fb24d66a345cbdab3ee5f7c8e740ddb3a75c9217ea90a950c4b5f123cce9cf7b15e560ba')
 
 prepare() {
   cd "${srcdir}"
diff --git a/mingw-w64-python-pillow/PKGBUILD b/mingw-w64-python-pillow/PKGBUILD
index b39eda4b24..69acc8b039 100644
--- a/mingw-w64-python-pillow/PKGBUILD
+++ b/mingw-w64-python-pillow/PKGBUILD
@@ -2,26 +2,29 @@
 
 _realname=Pillow
 pkgbase=mingw-w64-python-pillow
-pkgname=("${MINGW_PACKAGE_PREFIX}-python3-pillow")
+pkgname=("${MINGW_PACKAGE_PREFIX}-python-pillow")
 pkgver=6.2.1
-pkgrel=2
+pkgrel=1
+provides=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}=${pkgver}"
+          "${MINGW_PACKAGE_PREFIX}-python3-pillow=${pkgver}")
+conflicts=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}"
+           "${MINGW_PACKAGE_PREFIX}-python3-pillow")
+replaces=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}"
+          "${MINGW_PACKAGE_PREFIX}-python3-pillow")
 arch=('any')
 license=('custom')
 url="https://github.com/python-pillow/Pillow/"
 pkgdesc="Python Imaging Library (PIL) fork Python3 version (mingw-w64)"
-provides=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
-replaces=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
-conflicts=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
 depends=("${MINGW_PACKAGE_PREFIX}-freetype"
          "${MINGW_PACKAGE_PREFIX}-lcms2"
          "${MINGW_PACKAGE_PREFIX}-libjpeg"
          "${MINGW_PACKAGE_PREFIX}-libtiff"
          "${MINGW_PACKAGE_PREFIX}-libwebp"
          "${MINGW_PACKAGE_PREFIX}-openjpeg2"
-         "${MINGW_PACKAGE_PREFIX}-python3"
-         "${MINGW_PACKAGE_PREFIX}-python3-olefile"
+         "${MINGW_PACKAGE_PREFIX}-python"
+         "${MINGW_PACKAGE_PREFIX}-python-olefile"
          "${MINGW_PACKAGE_PREFIX}-zlib")
-makedepends=("${MINGW_PACKAGE_PREFIX}-python3-setuptools"
+makedepends=("${MINGW_PACKAGE_PREFIX}-python-setuptools"
              "${MINGW_PACKAGE_PREFIX}-libraqm"
              "${MINGW_PACKAGE_PREFIX}-tk")
 optdepends=("${MINGW_PACKAGE_PREFIX}-tk: for the ImageTK module"
@@ -62,38 +65,38 @@ prepare() {
     dlopen-fix.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() {
   cd "${srcdir}"
-  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/python${pver} setup.py build
+      ${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}"
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
-      ${MINGW_PREFIX}/bin/python3 selftest.py || true
+      ${MINGW_PREFIX}/bin/python selftest.py || true
 
   #setup.py test
 }
 
 package() {
   local _mingw_prefix=$(cygpath -am ${MINGW_PREFIX})
-  local _py3basever=$(${MINGW_PREFIX}/bin/python3 -c "import sys;sys.stdout.write('.'.join(map(str, sys.version_info[:2])))")
+  local _py3basever=$(${MINGW_PREFIX}/bin/python -c "import sys;sys.stdout.write('.'.join(map(str, sys.version_info[:2])))")
   
-  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 \
+    ${MINGW_PREFIX}/bin/python setup.py install \
    --prefix=${MINGW_PREFIX#\/} --root="${pkgdir}/" \
    --optimize=0 --skip-build
 
-  install -Dm644 LICENSE "${pkgdir}${MINGW_PREFIX}/share/licenses/python3-${_realname}/LICENSE"
+  install -Dm644 LICENSE "${pkgdir}${MINGW_PREFIX}/share/licenses/python-${_realname}/LICENSE"
   install -dm755 "${pkgdir}${MINGW_PREFIX}/include/python${_py3basever}m/"
   install -m644 -t "${pkgdir}${MINGW_PREFIX}/include/python${_py3basever}m/" src/libImaging/*.h
 
diff --git a/mingw-w64-python-pip/PKGBUILD b/mingw-w64-python-pip/PKGBUILD
index a36fc1d4cb..9f9520aff1 100644
--- a/mingw-w64-python-pip/PKGBUILD
+++ b/mingw-w64-python-pip/PKGBUILD
@@ -2,32 +2,35 @@
 
 _realname=pip
 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=19.3.1
-pkgrel=4
+pkgrel=1
 pkgdesc="An easy_install replacement for installing pypi python packages (mingw-w64)"
 arch=('any')
 license=('MIT')
 url="https://pip.pypa.io/"
-depends=("${MINGW_PACKAGE_PREFIX}-python3-appdirs"
-         "${MINGW_PACKAGE_PREFIX}-python3-cachecontrol"
-         "${MINGW_PACKAGE_PREFIX}-python3-colorama"
-         "${MINGW_PACKAGE_PREFIX}-python3-contextlib2"
-         "${MINGW_PACKAGE_PREFIX}-python3-distlib"
-         "${MINGW_PACKAGE_PREFIX}-python3-html5lib"
-         "${MINGW_PACKAGE_PREFIX}-python3-lockfile"
-         "${MINGW_PACKAGE_PREFIX}-python3-msgpack"
-         "${MINGW_PACKAGE_PREFIX}-python3-packaging"
-         "${MINGW_PACKAGE_PREFIX}-python3-pep517"
-         "${MINGW_PACKAGE_PREFIX}-python3-progress"
-         "${MINGW_PACKAGE_PREFIX}-python3-pyparsing"
-         "${MINGW_PACKAGE_PREFIX}-python3-pytoml"
-         "${MINGW_PACKAGE_PREFIX}-python3-requests"
-         "${MINGW_PACKAGE_PREFIX}-python3-retrying"
-         "${MINGW_PACKAGE_PREFIX}-python3-six"
-         "${MINGW_PACKAGE_PREFIX}-python3-webencodings")
-makedepends=("${MINGW_PACKAGE_PREFIX}-python3-setuptools"
-             "${MINGW_PACKAGE_PREFIX}-python3-sphinx")
+depends=("${MINGW_PACKAGE_PREFIX}-python-appdirs"
+         "${MINGW_PACKAGE_PREFIX}-python-cachecontrol"
+         "${MINGW_PACKAGE_PREFIX}-python-colorama"
+         "${MINGW_PACKAGE_PREFIX}-python-contextlib2"
+         "${MINGW_PACKAGE_PREFIX}-python-distlib"
+         "${MINGW_PACKAGE_PREFIX}-python-html5lib"
+         "${MINGW_PACKAGE_PREFIX}-python-lockfile"
+         "${MINGW_PACKAGE_PREFIX}-python-msgpack"
+         "${MINGW_PACKAGE_PREFIX}-python-packaging"
+         "${MINGW_PACKAGE_PREFIX}-python-pep517"
+         "${MINGW_PACKAGE_PREFIX}-python-progress"
+         "${MINGW_PACKAGE_PREFIX}-python-pyparsing"
+         "${MINGW_PACKAGE_PREFIX}-python-pytoml"
+         "${MINGW_PACKAGE_PREFIX}-python-requests"
+         "${MINGW_PACKAGE_PREFIX}-python-retrying"
+         "${MINGW_PACKAGE_PREFIX}-python-six"
+         "${MINGW_PACKAGE_PREFIX}-python-webencodings")
+makedepends=("${MINGW_PACKAGE_PREFIX}-python-setuptools"
+             "${MINGW_PACKAGE_PREFIX}-python-sphinx")
 install=${_realname}3-${CARCH}.install
 source=(${_realname}-${pkgver}.tar.gz::https://github.com/pypa/pip/archive/${pkgver}.tar.gz)
 noextract=(${_realname}-${pkgver}.tar.gz)
@@ -47,22 +50,22 @@ prepare() {
          -e '/cachecontrol/a\    vendored("pep517")' \
         ${_realname}-${pkgver}/src/pip/_vendor/__init__.py
 
-  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() {
   local _mingw_prefix=$(cygpath -wm ${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 --skip-build -v
+    ${MINGW_PREFIX}/bin/python setup.py install --prefix=${MINGW_PREFIX#\/} --root="${pkgdir}" --optimize=1 --skip-build -v
 
   local PREFIX_WIN=$(cygpath -wm ${MINGW_PREFIX})
   # fix python command in files
@@ -71,5 +74,5 @@ package() {
         -e "s|${PREFIX_WIN}|${MINGW_PREFIX}|g" -i ${_f}
   done
 
-  install -D -m644 LICENSE.txt "${pkgdir}${MINGW_PREFIX}/share/licenses/python3-${_realname}/LICENSE"
+  install -D -m644 LICENSE.txt "${pkgdir}${MINGW_PREFIX}/share/licenses/python-${_realname}/LICENSE"
 }
diff --git a/mingw-w64-python-pkgconfig/PKGBUILD b/mingw-w64-python-pkgconfig/PKGBUILD
index bc11a46a79..9b3e2015ea 100644
--- a/mingw-w64-python-pkgconfig/PKGBUILD
+++ b/mingw-w64-python-pkgconfig/PKGBUILD
@@ -2,17 +2,20 @@
 
 _realname=pkgconfig
 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.1
-pkgrel=3
+pkgrel=1
 pkgdesc="A Python interface to the pkg-config command line tool"
 arch=('any')
 url='https://github.com/matze/pkgconfig'
 license=('MIT')
-depends=("${MINGW_PACKAGE_PREFIX}-python3")
-makedepends=("${MINGW_PACKAGE_PREFIX}-python3-setuptools")
-checkdepends=("${MINGW_PACKAGE_PREFIX}-python3-pytest"
-              "${MINGW_PACKAGE_PREFIX}-python3-nose")
+depends=("${MINGW_PACKAGE_PREFIX}-python")
+makedepends=("${MINGW_PACKAGE_PREFIX}-python-setuptools")
+checkdepends=("${MINGW_PACKAGE_PREFIX}-python-pytest"
+              "${MINGW_PACKAGE_PREFIX}-python-nose")
 options=('staticlibs' 'strip' '!debug')
 source=("https://pypi.io/packages/source/p/pkgconfig/${_realname}-${pkgver}.tar.gz")
 sha512sums=('1fd9aa973bd20a8fab864722598f1d19b94c23c7f2b522556b3182b19fe016bda7aa2be5e48a1b8fefa70a069611007d6d790e24defcb462e4594a382de85b00')
diff --git a/mingw-w64-python-pluggy/PKGBUILD b/mingw-w64-python-pluggy/PKGBUILD
index ebb6e662d8..2eb783ce45 100644
--- a/mingw-w64-python-pluggy/PKGBUILD
+++ b/mingw-w64-python-pluggy/PKGBUILD
@@ -2,45 +2,48 @@
 
 _realname=pluggy
 pkgbase=mingw-w64-python-${_realname}
-pkgname=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
-pkgver=0.13.0
-pkgrel=2
+pkgname=("${MINGW_PACKAGE_PREFIX}-python-${_realname}")
+pkgver=0.13.1
+pkgrel=1
+provides=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}=${pkgver}")
+conflicts=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+replaces=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
 pkgdesc='Plugin and hook calling mechanisms for python (mingw-w64)'
 url='https://github.com/pytest-dev/pluggy'
 license=('MIT')
 arch=('any')
-depends=("${MINGW_PACKAGE_PREFIX}-python3")
-makedepends=("${MINGW_PACKAGE_PREFIX}-python3-setuptools"
-             "${MINGW_PACKAGE_PREFIX}-python3-setuptools-scm")
-checkdepends=("${MINGW_PACKAGE_PREFIX}-python3-pytest-runner")
+depends=("${MINGW_PACKAGE_PREFIX}-python")
+makedepends=("${MINGW_PACKAGE_PREFIX}-python-setuptools"
+             "${MINGW_PACKAGE_PREFIX}-python-setuptools-scm")
+checkdepends=("${MINGW_PACKAGE_PREFIX}-python-pytest-runner")
 source=("${_realname}-${pkgver}.tar.gz"::"https://github.com/pytest-dev/pluggy/archive/${pkgver}.tar.gz")
-sha512sums=('cc946bf3e003e0c6fd04d113682560c6e2c84ffa790a6177f43cd5754d25248bae33af6aa77d86c938cea31bc386af9ada88d61499071a6216da1fd94bc11773')
+sha512sums=('3269f7ad7801a70ba8aa3182c568f70e2ee88a90b6f6335be631f9737dd42fac3fb1b27c5b6fe6422de128ddcc58736f0c41ed60b7c0177126dd676b98ece301')
 
 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}"
 
   export SETUPTOOLS_SCM_PRETEND_VERSION=${pkgver}
 }
 
 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
 }
 
 check() {
-  msg "Python 3 test for ${CARCH}"
+  msg "Python test for ${CARCH}"
   cd "${srcdir}/python3-build-${CARCH}"
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
-    ${MINGW_PREFIX}/bin/python3 setup.py pytest
+    ${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} -O1 --root="${pkgdir}" --skip-build
 
-  install -Dm644 "${srcdir}/${_realname}-${pkgver}/LICENSE" "${pkgdir}${MINGW_PREFIX}/share/licenses/python3-${_realname}/LICENSE"
+  install -Dm644 "${srcdir}/${_realname}-${pkgver}/LICENSE" "${pkgdir}${MINGW_PREFIX}/share/licenses/python-${_realname}/LICENSE"
 }
diff --git a/mingw-w64-python-ply/PKGBUILD b/mingw-w64-python-ply/PKGBUILD
index f77761bd8c..db34a8e928 100644
--- a/mingw-w64-python-ply/PKGBUILD
+++ b/mingw-w64-python-ply/PKGBUILD
@@ -2,15 +2,18 @@
 
 _realname=ply
 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.11
-pkgrel=4
+pkgrel=1
 pkgdesc="Implementation of lex and yacc parsing tools (mingw-w64)"
 arch=('any')
 url="https://www.dabeaz.com/ply/"
 license=('BSD')
-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://www.dabeaz.com/ply/${_realname}-${pkgver}.tar.gz"
         "LICENSE")
diff --git a/mingw-w64-python-pretend/PKGBUILD b/mingw-w64-python-pretend/PKGBUILD
index 7bdb208d7c..833e6c4983 100644
--- a/mingw-w64-python-pretend/PKGBUILD
+++ b/mingw-w64-python-pretend/PKGBUILD
@@ -2,15 +2,18 @@
 
 _realname=pretend
 pkgbase=mingw-w64-python-${_realname}
-pkgname=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+pkgname=("${MINGW_PACKAGE_PREFIX}-python-${_realname}")
 pkgver=1.0.9
-pkgrel=4
+pkgrel=1
+provides=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}=${pkgver}")
+conflicts=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+replaces=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
 pkgdesc="A library for stubbing in Python (mingw-w64)"
 arch=('any')
 license=('BSD')
 url="https://github.com/alex/pretend"
-depends=("${MINGW_PACKAGE_PREFIX}-python3")
-makedepends=("${MINGW_PACKAGE_PREFIX}-python3-setuptools")
+depends=("${MINGW_PACKAGE_PREFIX}-python")
+makedepends=("${MINGW_PACKAGE_PREFIX}-python-setuptools")
 source=("https://pypi.python.org/packages/source/p/pretend/pretend-${pkgver}.tar.gz")
 sha256sums=('c90eb810cde8ebb06dafcb8796f9a95228ce796531bc806e794c2f4649aa1b10')
 
diff --git a/mingw-w64-python-progress/PKGBUILD b/mingw-w64-python-progress/PKGBUILD
index ccfb130552..5bd4a4bde0 100644
--- a/mingw-w64-python-progress/PKGBUILD
+++ b/mingw-w64-python-progress/PKGBUILD
@@ -2,15 +2,18 @@
 
 _realname=progress
 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="Easy to use progress bars for Python (mingw-w64)"
 arch=('any')
 url="https://github.com/verigak/progress"
 license=('ISC')
-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/verigak/progress/archive/${pkgver}.tar.gz")
 sha256sums=('e90987f203a91a80550d4d68b4e74bfc901ce0e246631a1291427097cffb891b')
diff --git a/mingw-w64-python-psutil/PKGBUILD b/mingw-w64-python-psutil/PKGBUILD
index c71c072e77..915f45c40a 100644
--- a/mingw-w64-python-psutil/PKGBUILD
+++ b/mingw-w64-python-psutil/PKGBUILD
@@ -3,20 +3,23 @@
 _pyname=psutil
 _realname=${_pyname}
 pkgbase=mingw-w64-python-${_realname}
-pkgname=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
-pkgver=5.6.5
-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.6.7
+pkgrel=1
 pkgdesc="A cross-platform process and system utilities module for Python (mingw-w64)"
 arch=('any')
 url="https://github.com/giampaolo/psutil"
 license=('BSD')
-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/giampaolo/psutil/archive/release-${pkgver}.tar.gz"
         '0001-MSYS-Allow-detecting-when-running-on-MSYS.patch'
         '0002-msys-fixes-for-msys2.patch')
-sha256sums=('d57a81dd7cb0481819ea566c45fc5a60623ca263781a955d6d01f98d2258b964'
+sha256sums=('ebbed18bf912fa4981d05c5c1a0cacec2aa8c594e1608f0cf5cc7a3d4f63d4d4'
             'd3a325e2a073f23e5a6e9ce15e371e0c113af07942deb57e05b7185bc2407d4a'
             'b5dadc659509fa07b3333eb235f8a43511bd01acbb16c36f840ff61ef0ede834')
 
diff --git a/mingw-w64-python-py/PKGBUILD b/mingw-w64-python-py/PKGBUILD
index 9ba1680144..a948f61f8a 100644
--- a/mingw-w64-python-py/PKGBUILD
+++ b/mingw-w64-python-py/PKGBUILD
@@ -2,19 +2,22 @@
 
 _realname=py
 pkgbase=mingw-w64-python-${_realname}
-pkgname=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+pkgname=("${MINGW_PACKAGE_PREFIX}-python-${_realname}")
 pkgver=1.8.0
-pkgrel=3
+pkgrel=1
+provides=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}=${pkgver}")
+conflicts=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+replaces=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
 pkgdesc='library with cross-python path, ini-parsing, io, code, log facilities (mingw-w64)'
 arch=('any')
 url='https://pylib.readthedocs.io/'
 license=('MIT')
-depends=("${MINGW_PACKAGE_PREFIX}-python3"
-         "${MINGW_PACKAGE_PREFIX}-python3-iniconfig"
-         "${MINGW_PACKAGE_PREFIX}-python3-apipkg")
-makedepends=("${MINGW_PACKAGE_PREFIX}-python3-setuptools"
-             "${MINGW_PACKAGE_PREFIX}-python3-setuptools-scm")
-checkdepends=("${MINGW_PACKAGE_PREFIX}-python3-pytest")
+depends=("${MINGW_PACKAGE_PREFIX}-python"
+         "${MINGW_PACKAGE_PREFIX}-python-iniconfig"
+         "${MINGW_PACKAGE_PREFIX}-python-apipkg")
+makedepends=("${MINGW_PACKAGE_PREFIX}-python-setuptools"
+             "${MINGW_PACKAGE_PREFIX}-python-setuptools-scm")
+checkdepends=("${MINGW_PACKAGE_PREFIX}-python-pytest")
 options=('staticlibs' 'strip' '!debug')
 source=("${_realname}-${pkgver}.tar.gz::https://github.com/pytest-dev/py/archive/${pkgver}.tar.gz")
 sha256sums=('8c23b979a9823077d15d59f2d60bbc586abdecb1a4af6426fa42ccdb831dc213')
@@ -26,31 +29,31 @@ prepare() {
   cp ${_realname}-${pkgver}/LICENSE ${_realname}-${pkgver}/py/LICENSE
   rm -r py-${pkgver}/py/_vendored_packages
 
-   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}"
 
   export LC_CTYPE=en_US.UTF-8
   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 || warning "Tests failed"
+  msg "Python test for ${CARCH}"
+  cd "${srcdir}/python-build-${CARCH}"
+  ${MINGW_PREFIX}/bin/python setup.py pytest || 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-pyasn1-modules/PKGBUILD b/mingw-w64-python-pyasn1-modules/PKGBUILD
index 27d697699b..e059428c83 100644
--- a/mingw-w64-python-pyasn1-modules/PKGBUILD
+++ b/mingw-w64-python-pyasn1-modules/PKGBUILD
@@ -2,29 +2,35 @@
 
 _realname=pyasn1-modules
 pkgbase=mingw-w64-python-${_realname}
-pkgname=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
-pkgver=0.2.7
-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.2.8
+pkgrel=1
 pkgdesc='A collection of ASN.1-based protocols modules (mingw-w64)'
 url='https://github.com/etingof/pyasn1-modules/'
 license=('BSD')
 arch=('any')
-depends=("${MINGW_PACKAGE_PREFIX}-python3-pyasn1")
-makedepends=("${MINGW_PACKAGE_PREFIX}-python3-setuptools")
-source=(${_realname}-${pkgver}.tar.gz::"https://pypi.io/packages/source/p/pyasn1-modules/${_realname}-${pkgver}.tar.gz")
-sha256sums=('0c35a52e00b672f832e5846826f1fb7507907f7d52fba6faa9e3c4cbe874fe4b')
+depends=("${MINGW_PACKAGE_PREFIX}-python-pyasn1")
+makedepends=("${MINGW_PACKAGE_PREFIX}-python-setuptools")
+source=(${_realname}-${pkgver}.tar.gz::"https://github.com/etingof/pyasn1-modules/archive/v${pkgver}.tar.gz")
+sha256sums=('c562fcf94e21b19b1b01c103a4dbe24b286356237d2b453afd75882683cf0ad7')
+
+prepare() {
+  cd ${srcdir}
+  cp -r ${_realname}-${pkgver} build-python-${CARCH}
+}
 
 build() {
-  cd "${srcdir}/${_realname}-${pkgver}"
-
-  ${MINGW_PREFIX}/bin/python3 setup.py build
+  cd "${srcdir}/build-python-${CARCH}"
+  ${MINGW_PREFIX}/bin/python setup.py build
 }
 
 package() {
-  cd "${srcdir}/${_realname}-${pkgver}"
-
+  cd "${srcdir}/build-python-${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
 
-  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-pyasn1/PKGBUILD b/mingw-w64-python-pyasn1/PKGBUILD
index 7d793b78e5..8054316478 100644
--- a/mingw-w64-python-pyasn1/PKGBUILD
+++ b/mingw-w64-python-pyasn1/PKGBUILD
@@ -2,27 +2,34 @@
 
 _realname=pyasn1
 pkgbase=mingw-w64-python-${_realname}
-pkgname=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
-pkgver=0.4.7
-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.4.8
+pkgrel=1
 pkgdesc='ASN.1 types and codecs (mingw-w64)'
 url='https://github.com/etingof/pyasn1/'
 license=('BSD')
 arch=('any')
-depends=("${MINGW_PACKAGE_PREFIX}-python3")
+depends=("${MINGW_PACKAGE_PREFIX}-python")
 source=(${_realname}-${pkgver}.tar.gz::"https://github.com/etingof/pyasn1/archive/v${pkgver}.tar.gz")
-sha256sums=('f8089876a1eeabef11d4d5dfa1170f9c056f14db70b2483427620abf1fbd7f8b')
+sha256sums=('1baa319ca6e30ffed0d23198d2100742e9e8b5cae464135d69058d0d6069aafc')
 
 prepare() {
   cd ${srcdir}
-  cp -r ${_realname}-${pkgver} build-python3
+  cp -r ${_realname}-${pkgver} build-python-${CARCH}
+}
+
+build() {
+  cd ${srcdir}/build-python-${CARCH}
+  ${MINGW_PREFIX}/bin/python setup.py build
 }
 
 package() {
-  cd ${srcdir}/build-python3
-  ${MINGW_PREFIX}/bin/python3 setup.py build
+  cd ${srcdir}/build-python-${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
 
-  install -Dm644 "${srcdir}/${_realname}-${pkgver}/LICENSE.rst" "${pkgdir}${MINGW_PREFIX}/share/licenses/python3-${_realname}/LICENSE"
+  install -Dm644 "${srcdir}/${_realname}-${pkgver}/LICENSE.rst" "${pkgdir}${MINGW_PREFIX}/share/licenses/python-${_realname}/LICENSE"
 }
diff --git a/mingw-w64-python-pycparser/PKGBUILD b/mingw-w64-python-pycparser/PKGBUILD
index 815c70926f..c7121a5e93 100644
--- a/mingw-w64-python-pycparser/PKGBUILD
+++ b/mingw-w64-python-pycparser/PKGBUILD
@@ -2,16 +2,19 @@
 
 _realname=pycparser
 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.19
-pkgrel=3
+pkgrel=1
 pkgdesc='Complete parser of the C language, written in pure Python (mingw-w64)'
 arch=('any')
 url='https://github.com/eliben/pycparser'
 license=('BSD')
-depends=("${MINGW_PACKAGE_PREFIX}-python3"
-         "${MINGW_PACKAGE_PREFIX}-python3-ply")
-makedepends=("${MINGW_PACKAGE_PREFIX}-python3-setuptools")
+depends=("${MINGW_PACKAGE_PREFIX}-python"
+         "${MINGW_PACKAGE_PREFIX}-python-ply")
+makedepends=("${MINGW_PACKAGE_PREFIX}-python-setuptools")
 #_dtoken="be/64/1bb257ffb17d01f4a38d7ce686809a736837ad4371bcc5c42ba7a715c3ac"
 source=("${_realname}-${pkgver}.tar.gz::https://github.com/eliben/pycparser/archive/release_v${pkgver}.tar.gz")
 sha256sums=('893ec3d0f26c0faa7d0b992979940353a1682f86b5cd1228740637055b112379')
diff --git a/mingw-w64-python-pygments/PKGBUILD b/mingw-w64-python-pygments/PKGBUILD
index f3e74f4b30..b4a367d0de 100644
--- a/mingw-w64-python-pygments/PKGBUILD
+++ b/mingw-w64-python-pygments/PKGBUILD
@@ -4,42 +4,50 @@
 _pyname=Pygments
 _realname=pygments
 pkgbase=mingw-w64-python-${_realname}
-pkgname=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
-pkgver=2.4.2
-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.5.2
+pkgrel=1
 pkgdesc="Python syntax highlighter (mingw-w64)"
 arch=('any')
 license=('BSD')
 url="http://pygments.org/"
-makedepends=("${MINGW_PACKAGE_PREFIX}-python3-setuptools")
+makedepends=("${MINGW_PACKAGE_PREFIX}-python-setuptools")
 source=("https://pypi.org/packages/source/P/Pygments/${_pyname}-${pkgver}.tar.gz")
 install=${_realname}3-${CARCH}.install
 noextract=("${_pyname}-${pkgver}.tar.gz")
-sha256sums=('881c4c157e45f30af185c1ffe8d549d48ac9127433f2c380c24b84572ad66297')
+sha256sums=('98c8aa5a9f778fcd1026a17361ddaf7330d1b7c62ae97c3bb0ae73e0b9b6b0fe')
 
 prepare() {
   # workaround for symlink issue
   tar -xf ${_pyname}-${pkgver}.tar.gz || true
   cp ${_pyname}-${pkgver}/scripts/debug_lexer.py ${_pyname}-${pkgver}/scripts/find_error.py
 
-  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}
+}
+
+build () {
+  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() {
   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}" -O1
+  ${MINGW_PREFIX}/bin/python setup.py 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"
   
   # fix python command in files
   for _f in "${pkgdir}${MINGW_PREFIX}"/bin/*.py; do
diff --git a/mingw-w64-python-pyopengl/PKGBUILD b/mingw-w64-python-pyopengl/PKGBUILD
index 7cb49967f3..28fc90ed2b 100644
--- a/mingw-w64-python-pyopengl/PKGBUILD
+++ b/mingw-w64-python-pyopengl/PKGBUILD
@@ -1,59 +1,63 @@
 # Maintainer: Antoine Martin <totaam@xpra.org>
 
-_realname=PyOpenGL
+_realname=pyopengl
+_pyname=PyOpenGL
 pkgbase=mingw-w64-python-${_realname}
-pkgname=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+pkgname=("${MINGW_PACKAGE_PREFIX}-python-${_realname}")
+provides=("${MINGW_PACKAGE_PREFIX}-python3-${_pyname}")
+conflicts=("${MINGW_PACKAGE_PREFIX}-python3-${_pyname}")
+replaces=("${MINGW_PACKAGE_PREFIX}-python3-${_pyname}")
 pkgver=3.1.4
-pkgrel=2
+pkgrel=1
 pkgdesc="PyOpenGL is the most common cross platform Python binding to OpenGL and related APIs (mingw-w64)"
 arch=('any')
 url='http://pyopengl.sourceforge.net'
 license=('PyOpenGL')
-depends=("${MINGW_PACKAGE_PREFIX}-python3")
+depends=("${MINGW_PACKAGE_PREFIX}-python")
 makedepends=("${MINGW_PACKAGE_PREFIX}-cython"
-             "${MINGW_PACKAGE_PREFIX}-python3-setuptools")
+             "${MINGW_PACKAGE_PREFIX}-python-setuptools")
 options=('staticlibs' 'strip' '!debug')
 _dtoken='d7/8a/5db9096aa6506e405309c400bd0feb41997689cbba30683479c30dba6355'
 _acceltoken='a3/43/ab02c99786e14280ab937d0f954b1c229e29c310a5e88c7a79d5f04490f0'
-source=("https://files.pythonhosted.org/packages/${_dtoken}/${_realname}-${pkgver}.tar.gz"
-        "https://files.pythonhosted.org/packages/${_acceltoken}/${_realname}-accelerate-${pkgver}.tar.gz")
+source=("https://files.pythonhosted.org/packages/${_dtoken}/${_pyname}-${pkgver}.tar.gz"
+        "https://files.pythonhosted.org/packages/${_acceltoken}/${_pyname}-accelerate-${pkgver}.tar.gz")
 sha512sums=('daddd91d6e4e5c731cb335c2a780388fbbc6829d819275d3daedea84f4c75e94de25608e0297abc339250c6dc11431ca653777287c2ca098b3e7f64473eac16e'
             'ead92c4ac8047379e8cbde4189e04ef0e25265f472c3eac089a81ebad271fba6f646cfdd43402b21966de5ee20ccab7e27faf94771adb1a93ccad8a3eaf610e8')
 
 prepare() {
   cd "${srcdir}"
-  rm -rf python3-build-${CARCH} | true
-  cp -r "${_realname}-${pkgver}" "python3-build-${CARCH}"
-  cp -r "${_realname}-accelerate-${pkgver}" "python3-build-${CARCH}-accelerate"
-  echo "TODO" > "python3-build-${CARCH}/readme.rst"
-  echo "TODO" > "python3-build-${CARCH}-accelerate/readme.rst"
+  rm -rf python-build-${CARCH} | true
+  cp -r "${_pyname}-${pkgver}" "python-build-${CARCH}"
+  cp -r "${_pyname}-accelerate-${pkgver}" "python-build-${CARCH}-accelerate"
+  echo "TODO" > "python-build-${CARCH}/readme.rst"
+  echo "TODO" > "python-build-${CARCH}-accelerate/readme.rst"
 }
 
 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
   msg "accelerate module:"
-  cd "${srcdir}/python3-build-${CARCH}-accelerate"
-  ${MINGW_PREFIX}/bin/python3 setup.py build
+  cd "${srcdir}/python-build-${CARCH}-accelerate"
+  ${MINGW_PREFIX}/bin/python setup.py build
 }
 
 check() {
-  cd "${srcdir}/python3-build-${CARCH}"
-  ${MINGW_PREFIX}/bin/python3 setup.py check
-  cd "${srcdir}/python3-build-${CARCH}-accelerate"
-  ${MINGW_PREFIX}/bin/python3 setup.py check
+  cd "${srcdir}/python-build-${CARCH}"
+  ${MINGW_PREFIX}/bin/python setup.py check
+  cd "${srcdir}/python-build-${CARCH}-accelerate"
+  ${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.txt "${pkgdir}${MINGW_PREFIX}/share/licenses/python3-${_realname}/COPYING"
+  install -Dm644 license.txt "${pkgdir}${MINGW_PREFIX}/share/licenses/python-${_realname}/COPYING"
 
-  cd "${srcdir}/python3-build-${CARCH}-accelerate"
+  cd "${srcdir}/python-build-${CARCH}-accelerate"
   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-pyopenssl/PKGBUILD b/mingw-w64-python-pyopenssl/PKGBUILD
index eb3aa883e8..0e0322ce08 100644
--- a/mingw-w64-python-pyopenssl/PKGBUILD
+++ b/mingw-w64-python-pyopenssl/PKGBUILD
@@ -2,37 +2,39 @@
 
 _realname=pyopenssl
 pkgbase=mingw-w64-python-${_realname}
-pkgname=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
-pkgver=19.0.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=19.1.0
+pkgrel=1
 pkgdesc="Python wrapper module around the OpenSSL library (mingw-w64)"
 url='https://pypi.python.org/pypi/pyOpenSSL'
 license=('LGPL2.1')
 arch=('any')
 depends=("${MINGW_PACKAGE_PREFIX}-openssl"
-         "${MINGW_PACKAGE_PREFIX}-python3-cryptography"
-         "${MINGW_PACKAGE_PREFIX}-python3-six")
-makedepends=("${MINGW_PACKAGE_PREFIX}-python3-setuptools")
-checkdepends=("${MINGW_PACKAGE_PREFIX}-python3-pytest-runner")
+         "${MINGW_PACKAGE_PREFIX}-python-cryptography"
+         "${MINGW_PACKAGE_PREFIX}-python-six")
+makedepends=("${MINGW_PACKAGE_PREFIX}-python-setuptools")
+checkdepends=("${MINGW_PACKAGE_PREFIX}-python-pytest-runner")
 source=("https://pypi.io/packages/source/p/pyOpenSSL/pyOpenSSL-${pkgver}.tar.gz")
-sha256sums=('aeca66338f6de19d1aa46ed634c3b9ae519a64b458f8468aec688e7e3c20f200')
+sha256sums=('9a24494b2602aaf402be5c9e30a0b82d4a5c67528fe8fb475e3f3bc00dd69507')
 
 prepare() {
   cd ${srcdir}
-  cp -r pyOpenSSL-${pkgver} python3-build-${CARCH}
+  cp -r pyOpenSSL-${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}
-  ${MINGW_PREFIX}/bin/python3 setup.py build
+  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 "${srcdir}/${_realname}-${pkgver}/LICENSE" "${pkgdir}${MINGW_PREFIX}/share/licenses/python3-${_realname}/LICENSE"
+  install -Dm644 "${srcdir}/${_realname}-${pkgver}/LICENSE" "${pkgdir}${MINGW_PREFIX}/share/licenses/python-${_realname}/LICENSE"
 }
diff --git a/mingw-w64-python-pyparsing/PKGBUILD b/mingw-w64-python-pyparsing/PKGBUILD
index b6f0164aac..6679d55ff8 100644
--- a/mingw-w64-python-pyparsing/PKGBUILD
+++ b/mingw-w64-python-pyparsing/PKGBUILD
@@ -2,17 +2,20 @@
 
 _realname=pyparsing
 pkgbase=mingw-w64-python-${_realname}
-pkgname=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
-pkgver=2.4.4
-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=2.4.5
+pkgrel=1
 pkgdesc='General parsing module for Python (mingw-w64)'
 arch=('any')
 url='https://pyparsing.wikispaces.com/'
 license=('MIT')
-depends=("${MINGW_PACKAGE_PREFIX}-python3")
-makedepends=("${MINGW_PACKAGE_PREFIX}-python3-setuptools")
+depends=("${MINGW_PACKAGE_PREFIX}-python")
+makedepends=("${MINGW_PACKAGE_PREFIX}-python-setuptools")
 source=("https://github.com/pyparsing/pyparsing/archive/pyparsing_${pkgver}.tar.gz")
-sha512sums=('64c127fd3df3b09c7cbaa4819c42e00e5aea04543b0f3346fdab2c0fae6c6df449937d8ceb18ababf08ac86d8385985494dc386b412c576ecf4dac5f8d56f44e')
+sha512sums=('156cfdd28b4eadd5a29abfec8818fe4d038b220cf27aaa9d499f68ec87867c9048dfa79fd6efd85e940d47a7e7fcb21b93d527be05d27a5b58e2900fffb6b132')
 
 prepare() {
   cd "$srcdir"/
diff --git a/mingw-w64-python-pysocks/PKGBUILD b/mingw-w64-python-pysocks/PKGBUILD
index 2b7ba28604..a2deb4426d 100644
--- a/mingw-w64-python-pysocks/PKGBUILD
+++ b/mingw-w64-python-pysocks/PKGBUILD
@@ -2,37 +2,40 @@
 
 _realname=pysocks
 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.0
-pkgrel=3
+pkgrel=1
 pkgdesc="SOCKS4, SOCKS5 or HTTP proxy (Anorov fork PySocks replaces socksipy) (mingw-w64)"
 arch=('any')
 url='https://github.com/Anorov/PySocks'
 license=('BSD')
-depends=("${MINGW_PACKAGE_PREFIX}-python3"
-         "${MINGW_PACKAGE_PREFIX}-python3-win_inet_pton"
-makedepends=("${MINGW_PACKAGE_PREFIX}-python3-setuptools")
+depends=("${MINGW_PACKAGE_PREFIX}-python"
+         "${MINGW_PACKAGE_PREFIX}-python-win_inet_pton")
+makedepends=("${MINGW_PACKAGE_PREFIX}-python-setuptools")
 options=('staticlibs' 'strip' '!debug')
 source=("${_realname}-${pkgver}.tar.gz"::"https://github.com/Anorov/PySocks/archive/${pkgver}.tar.gz")
 sha512sums=('280c9d1f147cd665a9989dc143e0b1f43bbc0575dc0b6b92472bc4b8cf2315f37dba74c5e77ff0b3c3ede49ee5c1e53d6a330bcb3c8d822023378c1cfb8cac0f')
 
 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 -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-pytest-cov/PKGBUILD b/mingw-w64-python-pytest-cov/PKGBUILD
index d42a7b11d3..5b5345a5af 100644
--- a/mingw-w64-python-pytest-cov/PKGBUILD
+++ b/mingw-w64-python-pytest-cov/PKGBUILD
@@ -2,25 +2,28 @@
 
 _realname=pytest-cov
 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.1
-pkgrel=2
+pkgrel=1
 pkgdesc="py.test plugin for coverage reporting with support for both centralised and distributed testing, including subprocesses and multiprocessing (mingw-w64)"
 arch=('any')
 url='https://github.com/schlamar/pytest-cov'
 license=('MIT')
-depends=("${MINGW_PACKAGE_PREFIX}-python3"
-         "${MINGW_PACKAGE_PREFIX}-python3-coverage"
-         "${MINGW_PACKAGE_PREFIX}-python3-pytest")
-makedepends=("${MINGW_PACKAGE_PREFIX}-python3-setuptools")
-checkdepends=("${MINGW_PACKAGE_PREFIX}-python3-virtualenv"
-#              "${MINGW_PACKAGE_PREFIX}-python3-process-tests"
-#              "${MINGW_PACKAGE_PREFIX}-python3-pytest-cache"
-              "${MINGW_PACKAGE_PREFIX}-python3-pytest-xdist"
-#              "${MINGW_PACKAGE_PREFIX}-python3-fields"
+depends=("${MINGW_PACKAGE_PREFIX}-python"
+         "${MINGW_PACKAGE_PREFIX}-python-coverage"
+         "${MINGW_PACKAGE_PREFIX}-python-pytest")
+makedepends=("${MINGW_PACKAGE_PREFIX}-python-setuptools")
+checkdepends=("${MINGW_PACKAGE_PREFIX}-python-virtualenv"
+#              "${MINGW_PACKAGE_PREFIX}-python-process-tests"
+#              "${MINGW_PACKAGE_PREFIX}-python-pytest-cache"
+              "${MINGW_PACKAGE_PREFIX}-python-pytest-xdist"
+#              "${MINGW_PACKAGE_PREFIX}-python-fields"
 )
 options=('staticlibs' 'strip' '!debug')
-source=("${_realname}-$pkgver.tar.gz::https://github.com/pytest-dev/pytest-cov/archive/v$pkgver.tar.gz")
+source=("${_realname}-$pkgver.tar.gz::https://github.com/pytest-dev/pytest-cov/archive/v${pkgver}.tar.gz")
 sha512sums=('63e4180a5e64579c87aada2f5f3afb5bfe4c4d3f4d39d694abebb05c56761b758cb9a5ccc96569acea595b9333412f34be6b1a0e1cea8a9b580694bfa11df303')
 
 # Helper macros to help make tasks easier #
@@ -44,30 +47,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 test
+  msg "Python test for ${CARCH}"
+  cd "${srcdir}/python-build-${CARCH}"
+  ${MINGW_PREFIX}/bin/python setup.py test
 }
 
 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-pytest-expect/PKGBUILD b/mingw-w64-python-pytest-expect/PKGBUILD
index 1acd20e6ac..684b171616 100644
--- a/mingw-w64-python-pytest-expect/PKGBUILD
+++ b/mingw-w64-python-pytest-expect/PKGBUILD
@@ -2,46 +2,48 @@
 
 _realname=pytest-expect
 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="py.test plugin to store test expectations and mark tests based on them (mingw-w64)"
 arch=('any')
 url='https://github.com/gsnedders/pytest-expect'
 license=('MIT')
-depends=("${MINGW_PACKAGE_PREFIX}-python3"
-         "${MINGW_PACKAGE_PREFIX}-python3-pytest"
-         "${MINGW_PACKAGE_PREFIX}-python3-u-msgpack")
-makedepends=("${MINGW_PACKAGE_PREFIX}-python3-setuptools")
+depends=("${MINGW_PACKAGE_PREFIX}-python"
+         "${MINGW_PACKAGE_PREFIX}-python-pytest"
+         "${MINGW_PACKAGE_PREFIX}-python-u-msgpack")
+makedepends=("${MINGW_PACKAGE_PREFIX}-python-setuptools")
 options=('staticlibs' 'strip' '!debug')
 source=("${_realname}-${pkgver}.tar.gz"::"${url}/archive/${pkgver}.tar.gz")
 sha256sums=('8392093123dfc9807c28fee251e1d710aaed0d46ee77c7531528fb0a265eb798')
 
 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
 
-  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-pytest-forked/PKGBUILD b/mingw-w64-python-pytest-forked/PKGBUILD
index ebae427a85..45cadb9d92 100644
--- a/mingw-w64-python-pytest-forked/PKGBUILD
+++ b/mingw-w64-python-pytest-forked/PKGBUILD
@@ -2,7 +2,10 @@
 
 _realname=pytest-forked
 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.3
 pkgrel=1
 pkgdesc="run tests in isolated forked subprocesses (mingw-w64)"
@@ -10,10 +13,10 @@ arch=('any')
 url='https://github.com/pytest-dev/pytest-forked'
 license=('MIT')
 validpgpkeys=('gpg_KEY')
-depends=("${MINGW_PACKAGE_PREFIX}-python3"
-         "${MINGW_PACKAGE_PREFIX}-python3-pytest")
-makedepends=("${MINGW_PACKAGE_PREFIX}-python3-setuptools"
-             "${MINGW_PACKAGE_PREFIX}-python3-setuptools-scm")
+depends=("${MINGW_PACKAGE_PREFIX}-python"
+         "${MINGW_PACKAGE_PREFIX}-python-pytest")
+makedepends=("${MINGW_PACKAGE_PREFIX}-python-setuptools"
+             "${MINGW_PACKAGE_PREFIX}-python-setuptools-scm")
 options=('staticlibs' 'strip' '!debug')
 source=("${_realname}-${pkgver}.tar.gz"::"https://github.com/pytest-dev/pytest-forked/archive/v${pkgver}.tar.gz")
 sha256sums=('a805b82f12fa85f8a1d091065ba0137fad38ab728dce390bb7a83164b8a4c58f')
@@ -44,8 +47,8 @@ prepare() {
 #      0002-A-less-important-fix.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}"
 
   # Set version for setuptools_scm
   export SETUPTOOLS_SCM_PRETEND_VERSION=${pkgver}
@@ -56,22 +59,22 @@ prepare() {
 # 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 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}/LICENSE"
+  install -Dm644 LICENSE "${pkgdir}${MINGW_PREFIX}/share/licenses/python-${_realname}/LICENSE"
 }
diff --git a/mingw-w64-python-pytest-runner/PKGBUILD b/mingw-w64-python-pytest-runner/PKGBUILD
index 9163cb5fd7..b72f588ac9 100644
--- a/mingw-w64-python-pytest-runner/PKGBUILD
+++ b/mingw-w64-python-pytest-runner/PKGBUILD
@@ -2,20 +2,23 @@
 
 _realname=pytest-runner
 pkgbase=mingw-w64-python-${_realname}
-pkgname=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+pkgname=("${MINGW_PACKAGE_PREFIX}-python-${_realname}")
 pkgver=5.2
-pkgrel=2
+pkgrel=1
+provides=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}=${pkgver}")
+conflicts=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+replaces=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
 pkgdesc="Invoke py.test as distutils command with dependency resolution (mingw-w64)"
 arch=('any')
 url='https://github.com/pytest-dev/pytest-runner'
 license=('MIT')
-depends=("${MINGW_PACKAGE_PREFIX}-python3"
-         "${MINGW_PACKAGE_PREFIX}-python3-pytest")
-makedepends=("${MINGW_PACKAGE_PREFIX}-python3-setuptools"
-             "${MINGW_PACKAGE_PREFIX}-python3-setuptools-scm")
-#checkdepends=("${MINGW_PACKAGE_PREFIX}-python3-pytest-black"
-#              "${MINGW_PACKAGE_PREFIX}-python3-pytest-flake8"
-#              "${MINGW_PACKAGE_PREFIX}-python3-pytest-virtualenv")
+depends=("${MINGW_PACKAGE_PREFIX}-python"
+         "${MINGW_PACKAGE_PREFIX}-python-pytest")
+makedepends=("${MINGW_PACKAGE_PREFIX}-python-setuptools"
+             "${MINGW_PACKAGE_PREFIX}-python-setuptools-scm")
+#checkdepends=("${MINGW_PACKAGE_PREFIX}-python-pytest-black"
+#              "${MINGW_PACKAGE_PREFIX}-python-pytest-flake8"
+#              "${MINGW_PACKAGE_PREFIX}-python-pytest-virtualenv")
 options=('staticlibs' 'strip' '!debug')
 source=("${_realname}-$pkgver.tar.gz::https://github.com/pytest-dev/${_realname}/archive/${pkgver}.tar.gz")
 sha256sums=('d890730051292601cc8cf2c160d214c10322a4f179d3a7d2029c6d867b7db199')
@@ -42,10 +45,10 @@ 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}"
 
-  export SETUPTOOLS_SCM_PRETEND_VERSION=$pkgver
+  export SETUPTOOLS_SCM_PRETEND_VERSION=${pkgver}
 }
 
 # Note that build() is sometimes skipped because it's done in 
@@ -53,25 +56,25 @@ prepare() {
 # 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
 }
 
-# enable only when we have "${MINGW_PACKAGE_PREFIX}-python3-pytest-virtualenv"
+# enable only when we have "${MINGW_PACKAGE_PREFIX}-python-pytest-virtualenv"
 check() {
-  msg "Python 3 test for ${CARCH}"
-  cd "${srcdir}/python3-build-${CARCH}"
-  ${MINGW_PREFIX}/bin/python3 setup.py egg_info
+  msg "Python test for ${CARCH}"
+  cd "${srcdir}/python-build-${CARCH}"
+  ${MINGW_PREFIX}/bin/python setup.py egg_info
   # we need the flake8 package for this
   PYTHONPATH="$PWD" ${MINGW_PREFIX}/bin/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
 
-  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-pytest-xdist/PKGBUILD b/mingw-w64-python-pytest-xdist/PKGBUILD
index a9bb0b9d13..913da5c774 100644
--- a/mingw-w64-python-pytest-xdist/PKGBUILD
+++ b/mingw-w64-python-pytest-xdist/PKGBUILD
@@ -2,58 +2,62 @@
 
 _realname=pytest-xdist
 pkgbase=mingw-w64-python-${_realname}
-pkgname=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
-pkgver=1.30.0
+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.31.0
 pkgrel=1
 pkgdesc="py.test xdist plugin for distributed testing and loop-on-failing modes (mingw-w64)"
 arch=('any')
 license=('MIT')
 url='https://bitbucket.org/pytest-dev/pytest-xdist'
-depends=("${MINGW_PACKAGE_PREFIX}-python3"
-         "${MINGW_PACKAGE_PREFIX}-python3-pytest-forked" 
-         "${MINGW_PACKAGE_PREFIX}-python3-execnet")
-makedepends=("${MINGW_PACKAGE_PREFIX}-python3-pytest"
-             "${MINGW_PACKAGE_PREFIX}-python2-filelock"
-             "${MINGW_PACKAGE_PREFIX}-python3-setuptools"
-             "${MINGW_PACKAGE_PREFIX}-python3-setuptools-scm")
+depends=("${MINGW_PACKAGE_PREFIX}-python"
+         "${MINGW_PACKAGE_PREFIX}-python-pytest-forked"
+         "${MINGW_PACKAGE_PREFIX}-python-execnet")
+makedepends=("${MINGW_PACKAGE_PREFIX}-python-pytest"
+             "${MINGW_PACKAGE_PREFIX}-python-filelock"
+             "${MINGW_PACKAGE_PREFIX}-python-setuptools"
+             "${MINGW_PACKAGE_PREFIX}-python-setuptools-scm")
 options=('staticlibs' 'strip' '!debug')
 source=("${_realname}-${pkgver}.tar.gz"::"https://github.com/pytest-dev/pytest-xdist/archive/v${pkgver}.tar.gz")
-sha512sums=('ef1f9758884290ac1518ce7483f536ef2356c8c9e8ed2b480de14e61ebc26b4bdd09d4cecdad84e3adfb9544b51ad9fce530fedecf1bac88cbc716e083c7f681')
+sha512sums=('48c18802f5573ed4ceb061e82aea2046e3b19ad54e595ef666e095409d393cc301e729edd34eab999eae85184fc22c9d5fcda6ae334d183265e4baddcb6dfa46')
 
 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() {
   # Hack entry points by installing it
   local OLD_PYTHON_PATH=$PYTHONPATH
 
-  msg "Python 3 test for ${CARCH}"
-  cd "${srcdir}/python3-build-${CARCH}"
+  msg "Python test for ${CARCH}"
+  cd "${srcdir}/python-build-${CARCH}"
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
-    ${MINGW_PREFIX}/bin/python3 setup.py install --root="$PWD/tmp_install" --optimize=1 --skip-build
-  _PATHONPATH1="${srcdir}/python3-build-${CARCH}/tmp_install${MINGW_PREFIX}/lib/python3.7/site-packages"
-  _PATHONPATH2="${OLD_PYTHON_PATH};${srcdir}/python3-build-${CARCH}/tests"
+    ${MINGW_PREFIX}/bin/python setup.py install --root="$PWD/tmp_install" --optimize=1 --skip-build
+
+  _PATHONPATH1="${srcdir}/python-build-${CARCH}/tmp_install${MINGW_PREFIX}/lib/python3.8/site-packages"
+  _PATHONPATH2="${OLD_PYTHON_PATH};${srcdir}/python-build-${CARCH}/tests"
   PYTHONPATH="${_PATHONPATH1};${_PATHONPATH2}" py.test || 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}/LICENSE"
+  install -Dm644 LICENSE "${pkgdir}${MINGW_PREFIX}/share/licenses/python-${_realname}/LICENSE"
 }
diff --git a/mingw-w64-python-pytest/PKGBUILD b/mingw-w64-python-pytest/PKGBUILD
index c9a09c424e..4ff4ae8012 100644
--- a/mingw-w64-python-pytest/PKGBUILD
+++ b/mingw-w64-python-pytest/PKGBUILD
@@ -1,43 +1,46 @@
 # Contributor: Frederic Wang <fred.wang@free.fr>
 
 _realname=pytest
-pkgbase=mingw-w64-python3-${_realname}
-pkgname=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
-pkgver=5.2.2
+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=5.3.2
 pkgrel=1
 pkgdesc='simple powerful testing with Python (mingw-w64)'
 url='https://pytest.org/'
 license=('MIT')
 arch=('any')
 install=${_realname}3-${CARCH}.install
-depends=("${MINGW_PACKAGE_PREFIX}-python3"
-         "${MINGW_PACKAGE_PREFIX}-python3-atomicwrites>=1.0"
-         "${MINGW_PACKAGE_PREFIX}-python3-attrs>=17.4.0"
-         "${MINGW_PACKAGE_PREFIX}-python3-more-itertools>=4.0.0"
-         "${MINGW_PACKAGE_PREFIX}-python3-pluggy>=0.7"
-         "${MINGW_PACKAGE_PREFIX}-python3-py>=1.5.0"
-         "${MINGW_PACKAGE_PREFIX}-python3-setuptools"
-         "${MINGW_PACKAGE_PREFIX}-python3-six"
-         "${MINGW_PACKAGE_PREFIX}-python3-colorama"
-         "${MINGW_PACKAGE_PREFIX}-python3-wcwidth")
-makedepends=("${MINGW_PACKAGE_PREFIX}-python3-setuptools-scm")
-checkdepends=("${MINGW_PACKAGE_PREFIX}-python3-hypothesis"
-              "${MINGW_PACKAGE_PREFIX}-python3-mock"
-              "${MINGW_PACKAGE_PREFIX}-python3-nose"
-              "${MINGW_PACKAGE_PREFIX}-python3-pytest-xdist"
-              "${MINGW_PACKAGE_PREFIX}-python3-requests"
-              "${MINGW_PACKAGE_PREFIX}-python3-tox"
-              "${MINGW_PACKAGE_PREFIX}-python3-yaml")
+depends=("${MINGW_PACKAGE_PREFIX}-python"
+         "${MINGW_PACKAGE_PREFIX}-python-atomicwrites>=1.0"
+         "${MINGW_PACKAGE_PREFIX}-python-attrs>=17.4.0"
+         "${MINGW_PACKAGE_PREFIX}-python-more-itertools>=4.0.0"
+         "${MINGW_PACKAGE_PREFIX}-python-pluggy>=0.7"
+         "${MINGW_PACKAGE_PREFIX}-python-py>=1.5.0"
+         "${MINGW_PACKAGE_PREFIX}-python-setuptools"
+         "${MINGW_PACKAGE_PREFIX}-python-six"
+         "${MINGW_PACKAGE_PREFIX}-python-colorama"
+         "${MINGW_PACKAGE_PREFIX}-python-wcwidth")
+makedepends=("${MINGW_PACKAGE_PREFIX}-python-setuptools-scm")
+checkdepends=("${MINGW_PACKAGE_PREFIX}-python-hypothesis"
+              "${MINGW_PACKAGE_PREFIX}-python-mock"
+              "${MINGW_PACKAGE_PREFIX}-python-nose"
+              "${MINGW_PACKAGE_PREFIX}-python-pytest-xdist"
+              "${MINGW_PACKAGE_PREFIX}-python-requests"
+              "${MINGW_PACKAGE_PREFIX}-python-tox"
+              "${MINGW_PACKAGE_PREFIX}-python-yaml")
 source=("${_realname}-${pkgver}.tar.gz::https://github.com/pytest-dev/pytest/archive/${pkgver}.tar.gz")
-sha256sums=('90a29f993eaaf6d7d767bdf444e67e60f63434de5e7e9c986dd71c6c0f3a72e9')
+sha256sums=('70321deb81f6ffea368aed2659f0c96853785cd58f648047f52adfd402de0ebb')
 
 prepare() {
   sed -i "s/'_pytest.vendored_packages'//" ${_realname}-${pkgver}/setup.py
   sed -i 's/assert numentries == 0/assert numentries == 26/' ${_realname}-${pkgver}/testing/python/collect.py
   export SETUPTOOLS_SCM_PRETEND_VERSION=${pkgver}
 
-  rm -rf python3-build-${CARCH}
-  cp -r "${_realname}-${pkgver}" "python3-build-${CARCH}"
+  rm -rf python-build-${CARCH}
+  cp -r "${_realname}-${pkgver}" "python-build-${CARCH}"
 }
 
 # Note that build() is sometimes skipped because it's done in 
@@ -45,25 +48,25 @@ prepare() {
 # but sometimes, you want to do a check before install which would
 # also trigger the build.
 build() {  
-  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 build
+    ${MINGW_PREFIX}/bin/python setup.py build
 }
 
 check() {
   cd "${srcdir}/python3-build-${CARCH}"
   # Python3: 1 failed, 2361 passed, 88 skipped, 12 xfailed, 1 warnings
   MSYSTEM= PYTHONPATH="$(pwd)/build/lib" \
-    ${MINGW_PREFIX}/bin/python3 src/pytest.py || warning "Test failed"
+    ${MINGW_PREFIX}/bin/python src/pytest.py || warning "Test 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}/COPYING"
+  install -Dm644 LICENSE "${pkgdir}${MINGW_PREFIX}/share/licenses/python-${_realname}/COPYING"
 
   # You should OMIT this section if your package is not installing anything in the bin dir.
   local PREFIX_WIN=$(cygpath -wm ${MINGW_PREFIX})
diff --git a/mingw-w64-python-pytoml/PKGBUILD b/mingw-w64-python-pytoml/PKGBUILD
index a9c31814b7..53ed28ea54 100644
--- a/mingw-w64-python-pytoml/PKGBUILD
+++ b/mingw-w64-python-pytoml/PKGBUILD
@@ -2,16 +2,19 @@
 
 _realname=pytoml
 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.21
-pkgrel=3
+pkgrel=1
 pkgdesc="A TOML-0.4.0 parser/writer for Python (mingw-w64)"
 arch=('any')
 url='https://github.com/avakar/pytoml'
 license=('MIT')
-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://files.pythonhosted.org/packages/source/${_realname:0:1}/${_realname}/${_realname}-${pkgver}.tar.gz")
 sha256sums=('8eecf7c8d0adcff3b375b09fe403407aa9b645c499e5ab8cac670ac4a35f61e7')
diff --git a/mingw-w64-python-pytz/PKGBUILD b/mingw-w64-python-pytz/PKGBUILD
index c1a644cdce..2a40e7e8ae 100644
--- a/mingw-w64-python-pytz/PKGBUILD
+++ b/mingw-w64-python-pytz/PKGBUILD
@@ -2,14 +2,17 @@
 
 _realname=pytz
 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=2019.3
-pkgrel=2
+pkgrel=1
 pkgdesc="Cross platform time zone library for Python (mingw-w64)"
 arch=('any')
 url="https://pypi.python.org/pypi/pytz"
 license=("MIT")
-depends=("${MINGW_PACKAGE_PREFIX}-python3")
+depends=("${MINGW_PACKAGE_PREFIX}-python")
 source=(https://pypi.io/packages/source/p/pytz/pytz-${pkgver}.tar.gz{,.asc})
 sha256sums=('b02c06db6cf09c12dd25137e563b31700d3b80fcc4ad23abb7a315f2789819be'
             'SKIP')
diff --git a/mingw-w64-python-pyu2f/PKGBUILD b/mingw-w64-python-pyu2f/PKGBUILD
index 23313d3343..33f250b9db 100644
--- a/mingw-w64-python-pyu2f/PKGBUILD
+++ b/mingw-w64-python-pyu2f/PKGBUILD
@@ -2,15 +2,18 @@
 
 _realname=pyu2f
 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.4
-pkgrel=3
+pkgrel=1
 pkgdesc="pyu2f is a python based U2F host library for Linux, Windows, and MacOS. It provides functionality for interacting with a U2F device over USB (mingw-w64)"
 arch=('any')
 url='https://github.com/google/pyu2f/'
 license=('Apache-2.0')
-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/google/pyu2f/archive/${pkgver}.tar.gz")
 sha512sums=('16f948b812edd5f0e4d97350872809b7c1b52f38eea49170e4aa21e0f695935dc0d71d4fa077ee1c1a3ef2f0711d62f0cc49983a89c841aa31aadf7b76340035')
@@ -34,30 +37,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-rencode/PKGBUILD b/mingw-w64-python-rencode/PKGBUILD
index 590aabda60..17fd2e4a3e 100644
--- a/mingw-w64-python-rencode/PKGBUILD
+++ b/mingw-w64-python-rencode/PKGBUILD
@@ -2,16 +2,19 @@
 
 _realname=rencode
 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.6
-pkgrel=3
+pkgrel=1
 pkgdesc="Python module for fast (basic) object serialization similar to bencode (mingw-w64)"
 arch=('any')
 url='https://github.com/aresch/rencode'
 license=('GPLv3')
 validpgpkeys=('gpg_KEY')
-depends=("${MINGW_PACKAGE_PREFIX}-python3")
-makedepends=("${MINGW_PACKAGE_PREFIX}-python3-setuptools"
+depends=("${MINGW_PACKAGE_PREFIX}-python")
+makedepends=("${MINGW_PACKAGE_PREFIX}-python-setuptools"
              "${MINGW_PACKAGE_PREFIX}-cython")
 options=('staticlibs' 'strip' '!debug')
 source=("${_realname}-${pkgver}.tar.gz"::"https://github.com/aresch/rencode/archive/v${pkgver}.tar.gz")
@@ -19,30 +22,30 @@ sha512sums=('f04de4d3a83aed916bdc4b7a8ca772655e9324d0531ee882cb7d2a1e92b397bdcec
 
 prepare() {
   cd "${srcdir}"
-  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 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 COPYING "${pkgdir}${MINGW_PREFIX}/share/licenses/python3-${_realname}/COPYING"
+  install -Dm644 COPYING "${pkgdir}${MINGW_PREFIX}/share/licenses/python-${_realname}/COPYING"
 }
diff --git a/mingw-w64-python-requests/PKGBUILD b/mingw-w64-python-requests/PKGBUILD
index 9194c43538..6ec0a21278 100644
--- a/mingw-w64-python-requests/PKGBUILD
+++ b/mingw-w64-python-requests/PKGBUILD
@@ -2,40 +2,43 @@
 
 _realname=requests
 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.22.0
-pkgrel=3
+pkgrel=1
 pkgdesc="Requests is the only Non-GMO HTTP library for Python, safe for human consumption (mingw-w64)"
 arch=('any')
 license=('Apache')
 url="https://2.python-requests.org"
-depends=("${MINGW_PACKAGE_PREFIX}-python3-urllib3"
-         "${MINGW_PACKAGE_PREFIX}-python3-chardet"
-         "${MINGW_PACKAGE_PREFIX}-python3-idna")
-makedepends=("${MINGW_PACKAGE_PREFIX}-python3-setuptools")
-checkdepends=("${MINGW_PACKAGE_PREFIX}-python3-pytest-httpbin"
-              "${MINGW_PACKAGE_PREFIX}-python3-pytest-mock"
-              "${MINGW_PACKAGE_PREFIX}-python3-pysocks")
-optdepends=("${MINGW_PACKAGE_PREFIX}-python3-pysocks: SOCKS proxy support")
+depends=("${MINGW_PACKAGE_PREFIX}-python-urllib3"
+         "${MINGW_PACKAGE_PREFIX}-python-chardet"
+         "${MINGW_PACKAGE_PREFIX}-python-idna")
+makedepends=("${MINGW_PACKAGE_PREFIX}-python-setuptools")
+checkdepends=("${MINGW_PACKAGE_PREFIX}-python-pytest-httpbin"
+              "${MINGW_PACKAGE_PREFIX}-python-pytest-mock"
+              "${MINGW_PACKAGE_PREFIX}-python-pysocks")
+optdepends=("${MINGW_PACKAGE_PREFIX}-python-pysocks: SOCKS proxy support")
 source=("${_realname}-${pkgver}.tar.gz::https://github.com/kennethreitz/requests/archive/v${pkgver}.tar.gz")
 sha256sums=('dcacea1b6a7bfd2cbb6c6a05743606b428f2739f37825e41fbf79af3cc2fd240')
 
 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} --root="${pkgdir}" -O1
+    ${MINGW_PREFIX}/bin/python setup.py 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-retrying/PKGBUILD b/mingw-w64-python-retrying/PKGBUILD
index dcf6e72dbb..73cfd43ec6 100644
--- a/mingw-w64-python-retrying/PKGBUILD
+++ b/mingw-w64-python-retrying/PKGBUILD
@@ -2,16 +2,19 @@
 
 _realname=retrying
 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.3
-pkgrel=3
+pkgrel=1
 pkgdesc="A general purpose Python retyring library (mingw-w64)"
 arch=('any')
 url='https://github.com/rholder/retrying/releases'
 license=('Apache')
-depends=("${MINGW_PACKAGE_PREFIX}-python3")
-makedepends=("${MINGW_PACKAGE_PREFIX}-python3-six"
-             "${MINGW_PACKAGE_PREFIX}-python3-setuptools")
+depends=("${MINGW_PACKAGE_PREFIX}-python")
+makedepends=("${MINGW_PACKAGE_PREFIX}-python-six"
+             "${MINGW_PACKAGE_PREFIX}-python-setuptools")
 options=('staticlibs' 'strip' '!debug')
 source=("${_realname}-${pkgver}.tar.gz"::"https://github.com/rholder/retrying/archive/v${pkgver}.tar.gz")
 sha256sums=('6a73d0210bf515e5cc5c5eadc8f2ee9dfb805b638d8b8514086128d3f411a49a')
diff --git a/mingw-w64-python-scandir/PKGBUILD b/mingw-w64-python-scandir/PKGBUILD
index 5e248d157d..9ab7f1f927 100644
--- a/mingw-w64-python-scandir/PKGBUILD
+++ b/mingw-w64-python-scandir/PKGBUILD
@@ -2,22 +2,25 @@
 
 _realname=scandir
 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.0
-pkgrel=2
+pkgrel=1
 pkgdesc="A better directory iterator and faster os.walk() (mingw-w64)"
 url="https://github.com/benhoyt/scandir"
 arch=('any')
 license=('BSD')
-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/benhoyt/scandir/archive/v${pkgver}.tar.gz)
 sha256sums=('73a773c58432ce28f32286f2892217101f4cf61ff4bccd8829ebaa7af7c56620')
 
 prepare() {
   cd ${srcdir}
   rm -rf python-build-${CARCH} | true
-  cp -r ${_realname}-${pkgver} build-python3-${CARCH}
+  cp -r ${_realname}-${pkgver} build-python-${CARCH}
 }
 
 build() {
diff --git a/mingw-w64-python-setproctitle/PKGBUILD b/mingw-w64-python-setproctitle/PKGBUILD
index 94ffe6dc53..bd1e42af79 100644
--- a/mingw-w64-python-setproctitle/PKGBUILD
+++ b/mingw-w64-python-setproctitle/PKGBUILD
@@ -2,15 +2,18 @@
 
 _realname=setproctitle
 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.10
-pkgrel=3
+pkgrel=1
 pkgdesc="A Python module to customize the process title (mingw-w64)"
 arch=('any')
 url='https://github.com/dvarrazzo/py-setproctitle'
 license=('LICENSE')
-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/dvarrazzo/py-setproctitle/archive/version-${pkgver}.tar.gz")
 sha512sums=('987729fd4f6b1f6ca1bead0814a2917eee4a30b01cdd8c3f0d028c4f925f1d1eff2ee2fe3945a2770d9cc7a6f2e74059db21dc8cd112d66304bd481fd287da23')
@@ -34,30 +37,30 @@ del_file_exists() {
 
 prepare() {
   cd "${srcdir}"
-  rm -rf python3-build-${CARCH} | true
-  cp -r "py-${_realname}-version-${pkgver}" "python3-build-${CARCH}"
+  rm -rf python-build-${CARCH} | true
+  cp -r "py-${_realname}-version-${pkgver}" "python-build-${CARCH}"
 
   # Set version for setuptools_scm
-  export SETUPTOOLS_SCM_PRETEND_VERSION=$pkgver
+  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 COPYRIGHT "${pkgdir}${MINGW_PREFIX}/share/licenses/python3-${_realname}/COPYING"
+  install -Dm644 COPYRIGHT "${pkgdir}${MINGW_PREFIX}/share/licenses/python-${_realname}/COPYING"
 }
diff --git a/mingw-w64-python-setuptools-scm/PKGBUILD b/mingw-w64-python-setuptools-scm/PKGBUILD
index df55648870..f2f8de66b4 100644
--- a/mingw-w64-python-setuptools-scm/PKGBUILD
+++ b/mingw-w64-python-setuptools-scm/PKGBUILD
@@ -2,15 +2,18 @@
 
 _realname=setuptools-scm
 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.3
-pkgrel=3
+pkgrel=1
 pkgdesc='Handles managing your python package versions in scm metadata (mingw-w64)'
 url='https://github.com/pypa/setuptools_scm'
 license=('MIT')
 arch=('any')
-depends=("${MINGW_PACKAGE_PREFIX}-python3"
-             "${MINGW_PACKAGE_PREFIX}-python3-setuptools")
+depends=("${MINGW_PACKAGE_PREFIX}-python"
+         "${MINGW_PACKAGE_PREFIX}-python-setuptools")
 source=("https://pypi.org/packages/source/${_realname::1}/${_realname}/${_realname/-/_}-${pkgver}.tar.gz"
         "0001-python-setuptools-scm-3.1.0-fix-path-error.patch")
 sha256sums=('bd25e1fb5e4d603dcf490f1fde40fb4c595b357795674c3e5cb7f6217ab39ea5'
diff --git a/mingw-w64-python-setuptools/PKGBUILD b/mingw-w64-python-setuptools/PKGBUILD
index a0c9e99827..39ea83cc8c 100644
--- a/mingw-w64-python-setuptools/PKGBUILD
+++ b/mingw-w64-python-setuptools/PKGBUILD
@@ -3,24 +3,27 @@
 
 _realname=setuptools
 pkgbase=mingw-w64-python-${_realname}
-pkgname=("${MINGW_PACKAGE_PREFIX}-python3-setuptools")
+pkgname=("${MINGW_PACKAGE_PREFIX}-python-${_realname}")
+provides=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+conflicts=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}"
+           "${MINGW_PACKAGE_PREFIX}-python2-setuptools<42.0.2")
+replaces=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
 pkgver=42.0.2
-pkgrel=2
+pkgrel=1
 pkgdesc="Easily download, build, install, upgrade, and uninstall Python packages (mingw-w64)"
 arch=('any')
 license=('PSF')
 url="https://pypi.python.org/pypi/setuptools"
-depends=("${MINGW_PACKAGE_PREFIX}-python3>=3.3"
-         "${MINGW_PACKAGE_PREFIX}-python3-packaging"
-         "${MINGW_PACKAGE_PREFIX}-python3-pyparsing"
-         "${MINGW_PACKAGE_PREFIX}-python3-ordered-set"
-         "${MINGW_PACKAGE_PREFIX}-python3-appdirs"
-         "${MINGW_PACKAGE_PREFIX}-python3-six")
-conflicts=("${MINGW_PACKAGE_PREFIX}-python2-setuptools<42.0.2")
-optdepends=("${MINGW_PACKAGE_PREFIX}-python3-certifi: Mozilla's CA Bundle support"
-            "${MINGW_PACKAGE_PREFIX}-python3-wincertstore: Windows' cert store support")
-makedepends=("${MINGW_PACKAGE_PREFIX}-python3-certifi"
-             "${MINGW_PACKAGE_PREFIX}-python3-wincertstore"
+depends=("${MINGW_PACKAGE_PREFIX}-python>=3.3"
+         "${MINGW_PACKAGE_PREFIX}-python-packaging"
+         "${MINGW_PACKAGE_PREFIX}-python-pyparsing"
+         "${MINGW_PACKAGE_PREFIX}-python-ordered-set"
+         "${MINGW_PACKAGE_PREFIX}-python-appdirs"
+         "${MINGW_PACKAGE_PREFIX}-python-six")
+optdepends=("${MINGW_PACKAGE_PREFIX}-python-certifi: Mozilla's CA Bundle support"
+            "${MINGW_PACKAGE_PREFIX}-python-wincertstore: Windows' cert store support")
+makedepends=("${MINGW_PACKAGE_PREFIX}-python-certifi"
+             "${MINGW_PACKAGE_PREFIX}-python-wincertstore"
              'git')
 install=${_realname}3-${CARCH}.install
 source=(${_realname}-${pkgver}.tar.gz::https://github.com/pypa/setuptools/archive/v${pkgver}.tar.gz
@@ -61,7 +64,7 @@ prepare() {
   PATH=/mingw64/bin:$PATH gcc -DGUI=0           -O -s -o setuptools-${pkgver}/setuptools/cli-64.exe setuptools-${pkgver}/launcher.c
   PATH=/mingw64/bin:$PATH gcc -DGUI=1 -mwindows -O -s -o setuptools-${pkgver}/setuptools/gui-64.exe setuptools-${pkgver}/launcher.c
 
-  rm -r setuptools-$pkgver/{pkg_resources,setuptools}/{extern,_vendor}
+  rm -r setuptools-${pkgver}/{pkg_resources,setuptools}/{extern,_vendor}
 
   # Upstream devendoring logic is badly broken, see:
   # https://bugs.archlinux.org/task/58670
@@ -70,10 +73,10 @@ prepare() {
   # The simplest fix is to simply rewrite import paths to use the canonical
   # location in the first place
   for _module in setuptools pkg_resources '' ; do
-     find setuptools-$pkgver/$_module -name \*.py -exec sed -i \
-         -e 's/from '$_module.extern' import/import/' \
-         -e 's/from '$_module.extern'./from /' \
-         -e 's/import '$_module.extern'./import /' \
+     find setuptools-${pkgver}/${_module} -name \*.py -exec sed -i \
+         -e 's/from '${_module}.extern' import/import/' \
+         -e 's/from '${_module}.extern'./from /' \
+         -e 's/import '${_module}.extern'./import /' \
          -e "s/__import__('$_module.extern./__import__('/" \
          {} +
    done
diff --git a/mingw-w64-python-six/PKGBUILD b/mingw-w64-python-six/PKGBUILD
index 457d6c0e69..a0c71378a5 100644
--- a/mingw-w64-python-six/PKGBUILD
+++ b/mingw-w64-python-six/PKGBUILD
@@ -2,14 +2,17 @@
 
 _realname=six
 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.13.0
 pkgrel=1
 pkgdesc="Python 2 and 3 compatibility utilities (mingw-w64)"
 arch=('any')
 url="https://pypi.python.org/pypi/six/"
 license=('MIT')
-depends=("${MINGW_PACKAGE_PREFIX}-python3")
+depends=("${MINGW_PACKAGE_PREFIX}-python")
 source=(https://pypi.io/packages/source/${_realname:0:1}/${_realname}/${_realname}-${pkgver}.tar.gz)
 sha256sums=('30f610279e8b2578cab6db20741130331735c781b56053c59c4076da27f06b66')
 
diff --git a/mingw-w64-python-snowballstemmer/PKGBUILD b/mingw-w64-python-snowballstemmer/PKGBUILD
index 9def43882d..098327662d 100644
--- a/mingw-w64-python-snowballstemmer/PKGBUILD
+++ b/mingw-w64-python-snowballstemmer/PKGBUILD
@@ -2,38 +2,41 @@
 
 _realname=snowballstemmer
 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.0.0
-pkgrel=2
+pkgrel=1
 pkgdesc="Snowball stemming library collection for Python (mingw-w64)"
 arch=('any')
 license=('BSD')
 url='https://github.com/shibukawa/snowball_py'
-depends=("${MINGW_PACKAGE_PREFIX}-python3")
-makedepends=("${MINGW_PACKAGE_PREFIX}-python3-setuptools")
+depends=("${MINGW_PACKAGE_PREFIX}-python")
+makedepends=("${MINGW_PACKAGE_PREFIX}-python-setuptools")
 options=('staticlibs')
 source=("https://pypi.python.org/packages/source/s/${_realname}/${_realname}-${pkgver}.tar.gz")
 sha256sums=('df3bac3df4c2c01363f3dd2cfa78cce2840a79b9f1c2d2de9ce8d31683992f52')
 
 prepare() {
   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
 }
 
 check() {
-  cd "${srcdir}/python3-build-${CARCH}"
-  ${MINGW_PREFIX}/bin/python3 py.test
+  cd "${srcdir}/python-build-${CARCH}"
+  ${MINGW_PREFIX}/bin/python py.test
 }
 
 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}" -O1
+    ${MINGW_PREFIX}/bin/python setup.py install --prefix=${MINGW_PREFIX} --root="${pkgdir}" -O1 --skip-build
 
-  install -Dm644 COPYING "${pkgdir}${MINGW_PREFIX}/share/licenses/python3-${_realname}/COPYING"
+  install -Dm644 COPYING "${pkgdir}${MINGW_PREFIX}/share/licenses/python-${_realname}/COPYING"
 }
diff --git a/mingw-w64-python-soupsieve/PKGBUILD b/mingw-w64-python-soupsieve/PKGBUILD
index 0f1c68e3a0..1115ab7516 100644
--- a/mingw-w64-python-soupsieve/PKGBUILD
+++ b/mingw-w64-python-soupsieve/PKGBUILD
@@ -2,22 +2,25 @@
 
 _realname=soupsieve
 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.9.5
-pkgrel=2
-pkgdesc="A CSS4 selector implementation for Beautiful Soup. (mingw-w64)"
+pkgrel=1
+pkgdesc="A CSS4 selector implementation for Beautiful Soup (mingw-w64)"
 arch=('any')
 url='https://github.com/facelessuser/soupsieve'
 license=('MIT')
-depends=("${MINGW_PACKAGE_PREFIX}-python3")
-makedepends=("${MINGW_PACKAGE_PREFIX}-python3-setuptools")
-checkdepends=("${MINGW_PACKAGE_PREFIX}-python3-beautifulsoup4"
-              "${MINGW_PACKAGE_PREFIX}-python3-coverage"
-              "${MINGW_PACKAGE_PREFIX}-python3-html5lib"
-              "${MINGW_PACKAGE_PREFIX}-python3-pytest"
-              "${MINGW_PACKAGE_PREFIX}-python3-pytest-cov")
+depends=("${MINGW_PACKAGE_PREFIX}-python")
+makedepends=("${MINGW_PACKAGE_PREFIX}-python-setuptools")
+checkdepends=("${MINGW_PACKAGE_PREFIX}-python-beautifulsoup4"
+              "${MINGW_PACKAGE_PREFIX}-python-coverage"
+              "${MINGW_PACKAGE_PREFIX}-python-html5lib"
+              "${MINGW_PACKAGE_PREFIX}-python-pytest"
+              "${MINGW_PACKAGE_PREFIX}-python-pytest-cov")
 options=('staticlibs' 'strip' '!debug')
-source=("${_realname}-${pkgver}.tar.gz"::"https://github.com/facelessuser/soupsieve/archive/$pkgver.tar.gz")
+source=("${_realname}-${pkgver}.tar.gz"::"https://github.com/facelessuser/soupsieve/archive/${pkgver}.tar.gz")
 sha256sums=('ba6a129e3e0e8ea5928684fd720f548eec65bc53947d9ac2b264dd2412d5cf55')
 
 # Helper macros to help make tasks easier #
@@ -46,34 +49,30 @@ prepare() {
   #   0002-A-less-important-fix.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}"
 
   # 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}"
+  msg "Python test for ${CARCH}"
+  cd "${srcdir}/python-build-${CARCH}"
   ${MINGW_PREFIX}/bin/py.test
 }
 
 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.md "${pkgdir}${MINGW_PREFIX}/share/licenses/python3-${_realname}/LICENSE"
+  install -Dm644 LICENSE.md "${pkgdir}${MINGW_PREFIX}/share/licenses/python-${_realname}/LICENSE"
 }
diff --git a/mingw-w64-python-sphinx-alabaster-theme/PKGBUILD b/mingw-w64-python-sphinx-alabaster-theme/PKGBUILD
index 42d31185e6..6106ca7f27 100644
--- a/mingw-w64-python-sphinx-alabaster-theme/PKGBUILD
+++ b/mingw-w64-python-sphinx-alabaster-theme/PKGBUILD
@@ -3,40 +3,43 @@
 _realname=sphinx-alabaster-theme
 _pyname=alabaster
 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.12
-pkgrel=3
+pkgrel=1
 pkgdesc="Modified Kr Sphinx doc theme (mingw-w64)"
 arch=('any')
 license=('BSD')
 url='https://github.com/bitprophet/alabaster'
-depends=("${MINGW_PACKAGE_PREFIX}-python3")
-makedepends=("${MINGW_PACKAGE_PREFIX}-python3-setuptools")
-checkdepends=("${MINGW_PACKAGE_PREFIX}-python3-pygments")
+depends=("${MINGW_PACKAGE_PREFIX}-python")
+makedepends=("${MINGW_PACKAGE_PREFIX}-python-setuptools")
+checkdepends=("${MINGW_PACKAGE_PREFIX}-python-pygments")
 options=('staticlibs')
 source=("${_realname}-${pkgver}.tar.gz"::"https://github.com/bitprophet/alabaster/archive/${pkgver}.tar.gz")
 sha256sums=('2f413c2a7e16f6b18d38f86a236b89e50e5f6ca79094ff948e5e58828f95c430')
 
 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}"
 }
 
 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
 }
 
 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() {
-  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}" -O1
+    ${MINGW_PREFIX}/bin/python setup.py 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-sphinx/PKGBUILD b/mingw-w64-python-sphinx/PKGBUILD
index 270fa8da16..58847c498a 100644
--- a/mingw-w64-python-sphinx/PKGBUILD
+++ b/mingw-w64-python-sphinx/PKGBUILD
@@ -3,50 +3,63 @@
 
 _pyname=Sphinx
 _realname=sphinx
-pkgbase=mingw-w64-python3-${_realname}
-pkgname=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
-pkgver=2.2.1
+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=2.3.1
 pkgrel=1
 pkgdesc="Python documentation generator (mingw-w64)"
 arch=('any')
 license=('BSD')
 url="https://www.sphinx-doc.org/"
-depends=("${MINGW_PACKAGE_PREFIX}-python3-babel"
-         "${MINGW_PACKAGE_PREFIX}-python3-colorama"
-         "${MINGW_PACKAGE_PREFIX}-python3-docutils"
-         "${MINGW_PACKAGE_PREFIX}-python3-imagesize"
-         "${MINGW_PACKAGE_PREFIX}-python3-jinja"
-         "${MINGW_PACKAGE_PREFIX}-python3-pygments"
-         "${MINGW_PACKAGE_PREFIX}-python3-requests"
-         "${MINGW_PACKAGE_PREFIX}-python3-setuptools"
-         "${MINGW_PACKAGE_PREFIX}-python3-snowballstemmer"
-         "${MINGW_PACKAGE_PREFIX}-python3-sphinx-alabaster-theme"
-         "${MINGW_PACKAGE_PREFIX}-python3-sphinxcontrib-applehelp"
-         "${MINGW_PACKAGE_PREFIX}-python3-sphinxcontrib-devhelp"
-         "${MINGW_PACKAGE_PREFIX}-python3-sphinxcontrib-htmlhelp"
-         "${MINGW_PACKAGE_PREFIX}-python3-sphinxcontrib-jsmath"
-         "${MINGW_PACKAGE_PREFIX}-python3-sphinxcontrib-serializinghtml"
-         "${MINGW_PACKAGE_PREFIX}-python3-sphinxcontrib-qthelp")
+depends=("${MINGW_PACKAGE_PREFIX}-python-babel"
+         "${MINGW_PACKAGE_PREFIX}-python-colorama"
+         "${MINGW_PACKAGE_PREFIX}-python-docutils"
+         "${MINGW_PACKAGE_PREFIX}-python-imagesize"
+         "${MINGW_PACKAGE_PREFIX}-python-jinja"
+         "${MINGW_PACKAGE_PREFIX}-python-pygments"
+         "${MINGW_PACKAGE_PREFIX}-python-requests"
+         "${MINGW_PACKAGE_PREFIX}-python-setuptools"
+         "${MINGW_PACKAGE_PREFIX}-python-snowballstemmer"
+         "${MINGW_PACKAGE_PREFIX}-python-sphinx-alabaster-theme"
+         "${MINGW_PACKAGE_PREFIX}-python-sphinxcontrib-applehelp"
+         "${MINGW_PACKAGE_PREFIX}-python-sphinxcontrib-devhelp"
+         "${MINGW_PACKAGE_PREFIX}-python-sphinxcontrib-htmlhelp"
+         "${MINGW_PACKAGE_PREFIX}-python-sphinxcontrib-jsmath"
+         "${MINGW_PACKAGE_PREFIX}-python-sphinxcontrib-serializinghtml"
+         "${MINGW_PACKAGE_PREFIX}-python-sphinxcontrib-qthelp")
 optdepends=("${MINGW_PACKAGE_PREFIX}-imagemagick: ext.imageconverter")
-checkdepends=("${MINGW_PACKAGE_PREFIX}-python3-pytest")
-source=("${_realname}-${pkgver}.tar.gz"::"https://pypi.org/packages/source/S/${_pyname}/${_pyname}-${pkgver}.tar.gz")
-sha256sums=('31088dfb95359384b1005619827eaee3056243798c62724fd3fa4b84ee4d71bd')
+install=${_realname}3-${CARCH}.install
+checkdepends=("${MINGW_PACKAGE_PREFIX}-python-pytest")
+source=("${_pyname}-${pkgver}.tar.gz"::"https://pypi.org/packages/source/S/${_pyname}/${_pyname}-${pkgver}.tar.gz")
+sha256sums=('e6e766b74f85f37a5f3e0773a1e1be8db3fcb799deb58ca6d18b70b0b44542a5')
+noextract=(${_pyname}-${pkgver}.tar.gz)
+
+prepare() {
+  [[ -d ${srcdir}/${_pyname}-${pkgver} ]] && rm -rf ${srcdir}/${_pyname}-${pkgver}
+  tar -xzf ${srcdir}/${_pyname}-${pkgver}.tar.gz -C ${srcdir} || true
+
+  rm -rf python-build-${CARCH} | true
+  cp -r "${_pyname}-${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}"
+  cd "${srcdir}/python-build-${CARCH}"
   #2 failed, 1165 passed, 21 skipped, 3 xfailed, 30 xpassed, 3 warnings
   ${MINGW_PREFIX}/bin/py.test || warning "test failed"
 }
 
-package_python3-sphinx() {
-  cd "${srcdir}/${_realname}-${pkgver}"
+package() {
+  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
 
   local PREFIX_WIN=$(cygpath -wm ${MINGW_PREFIX})
   # fix python command in files
@@ -55,15 +68,5 @@ package_python3-sphinx() {
         -e "s|${PREFIX_WIN}|${MINGW_PREFIX}|g" -i ${_f}
   done
 
-  install -Dm644 LICENSE "${pkgdir}${MINGW_PREFIX}"/share/licenses/python3-sphinx/LICENSE
-}
-
-package_mingw-w64-i686-python3-sphinx() {
-  install=${_realname}3-${CARCH}.install
-  package_python3-sphinx
-}
-
-package_mingw-w64-x86_64-python3-sphinx() {
-  install=${_realname}3-${CARCH}.install
-  package_python3-sphinx
+  install -Dm644 LICENSE "${pkgdir}${MINGW_PREFIX}"/share/licenses/python-${_realname}/LICENSE
 }
diff --git a/mingw-w64-python-sphinx_rtd_theme/PKGBUILD b/mingw-w64-python-sphinx_rtd_theme/PKGBUILD
index 6184bc0092..37097483b0 100644
--- a/mingw-w64-python-sphinx_rtd_theme/PKGBUILD
+++ b/mingw-w64-python-sphinx_rtd_theme/PKGBUILD
@@ -2,38 +2,41 @@
 
 _realname=sphinx_rtd_theme
 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.3
-pkgrel=3
+pkgrel=1
 pkgdesc="Python Sphinx Read The Docs Theme (mingw-w64)"
 arch=('any')
 license=('MIT')
 url='https://github.com/snide/sphinx_rtd_theme'
-depends=("${MINGW_PACKAGE_PREFIX}-python3")
-makedepends=("${MINGW_PACKAGE_PREFIX}-python3-setuptools")
+depends=("${MINGW_PACKAGE_PREFIX}-python")
+makedepends=("${MINGW_PACKAGE_PREFIX}-python-setuptools")
 options=('staticlibs')
 source=("https://pypi.org/packages/source/s/${_realname}/${_realname}-${pkgver}.tar.gz")
 sha256sums=('728607e34d60456d736cc7991fd236afb828b21b82f956c5ea75f94c8414040a')
 
 prepare() {
   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
 }
 
 check() {
-  cd "${srcdir}/python3-build-${CARCH}"
-  ${MINGW_PREFIX}/bin/python3 setup.py test
+  cd "${srcdir}/python-build-${CARCH}"
+  ${MINGW_PREFIX}/bin/python setup.py test
 }
 
 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}" -O1
+    ${MINGW_PREFIX}/bin/python setup.py install --prefix=${MINGW_PREFIX} --root="${pkgdir}" -O1 --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-sphinxcontrib-applehelp/PKGBUILD b/mingw-w64-python-sphinxcontrib-applehelp/PKGBUILD
index 8f38e25087..62095eaea2 100644
--- a/mingw-w64-python-sphinxcontrib-applehelp/PKGBUILD
+++ b/mingw-w64-python-sphinxcontrib-applehelp/PKGBUILD
@@ -1,34 +1,42 @@
 # Maintainer: Peter Budai <peterbudai@hotmail.com>
 
 _realname=sphinxcontrib-applehelp
-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.0.1
-pkgrel=2
+pkgrel=1
 pkgdesc="Sphinx extension which outputs Apple help books (mingw-w64)"
 arch=('any')
 license=('BSD')
 url="https://github.com/sphinx-doc/sphinxcontrib-applehelp"
-makedepends=("${MINGW_PACKAGE_PREFIX}-python3-setuptools")
-checkdepends=("${MINGW_PACKAGE_PREFIX}-python3-pytest")
+makedepends=("${MINGW_PACKAGE_PREFIX}-python-setuptools")
+checkdepends=("${MINGW_PACKAGE_PREFIX}-python-pytest")
 source=("${_realname}-${pkgver}.tar.gz"::"https://files.pythonhosted.org/packages/source/${_realname::1}/${_realname}/${_realname}-${pkgver}.tar.gz")
 sha256sums=('edaa0ab2b2bc74403149cb0209d6775c96de797dfd5b5e2a71981309efab3897')
 
+prepare() {
+  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}"
+  cd "${srcdir}/python-build-${CARCH}"
   ${MINGW_PREFIX}/bin/py.test || warning "test 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 -O1 --skip-build \
+  ${MINGW_PREFIX}/bin/python setup.py install -O1 --skip-build \
       --root="${pkgdir}" --prefix=${MINGW_PREFIX}
 
-  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-sphinxcontrib-devhelp/PKGBUILD b/mingw-w64-python-sphinxcontrib-devhelp/PKGBUILD
index 1940fa3b02..db984dcc47 100644
--- a/mingw-w64-python-sphinxcontrib-devhelp/PKGBUILD
+++ b/mingw-w64-python-sphinxcontrib-devhelp/PKGBUILD
@@ -1,34 +1,42 @@
 # Maintainer: Peter Budai <peterbudai@hotmail.com>
 
 _realname=sphinxcontrib-devhelp
-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.0.1
-pkgrel=2
+pkgrel=1
 pkgdesc="Sphinx extension which outputs Devhelp document (mingw-w64)"
 arch=('any')
 license=('BSD')
 url="https://github.com/sphinx-doc/sphinxcontrib-devhelp"
-makedepends=("${MINGW_PACKAGE_PREFIX}-python3-setuptools")
-checkdepends=("${MINGW_PACKAGE_PREFIX}-python3-pytest")
+makedepends=("${MINGW_PACKAGE_PREFIX}-python-setuptools")
+checkdepends=("${MINGW_PACKAGE_PREFIX}-python-pytest")
 source=("${_realname}-${pkgver}.tar.gz"::"https://files.pythonhosted.org/packages/source/${_realname::1}/${_realname}/${_realname}-${pkgver}.tar.gz")
 sha256sums=('6c64b077937330a9128a4da74586e8c2130262f014689b4b89e2d08ee7294a34')
 
+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}"
+  cd "${srcdir}/python-build-${CARCH}"
   ${MINGW_PREFIX}/bin/py.test || warning "test 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 -O1 --skip-build \
+  ${MINGW_PREFIX}/bin/python setup.py install -O1 --skip-build \
       --root="${pkgdir}" --prefix=${MINGW_PREFIX}
 
-  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-sphinxcontrib-htmlhelp/PKGBUILD b/mingw-w64-python-sphinxcontrib-htmlhelp/PKGBUILD
index 51dafecf44..294a6b857e 100644
--- a/mingw-w64-python-sphinxcontrib-htmlhelp/PKGBUILD
+++ b/mingw-w64-python-sphinxcontrib-htmlhelp/PKGBUILD
@@ -1,34 +1,42 @@
 # Maintainer: Peter Budai <peterbudai@hotmail.com>
 
 _realname=sphinxcontrib-htmlhelp
-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.0.2
-pkgrel=2
+pkgrel=1
 pkgdesc="Sphinx extension which renders HTML help files (mingw-w64)"
 arch=('any')
 license=('BSD')
 url="https://github.com/sphinx-doc/sphinxcontrib-htmlhelp"
-makedepends=("${MINGW_PACKAGE_PREFIX}-python3-setuptools")
-checkdepends=("${MINGW_PACKAGE_PREFIX}-python3-pytest")
+makedepends=("${MINGW_PACKAGE_PREFIX}-python-setuptools")
+checkdepends=("${MINGW_PACKAGE_PREFIX}-python-pytest")
 source=("${_realname}-${pkgver}.tar.gz"::"https://files.pythonhosted.org/packages/source/${_realname::1}/${_realname}/${_realname}-${pkgver}.tar.gz")
 sha256sums=('4670f99f8951bd78cd4ad2ab962f798f5618b17675c35c5ac3b2132a14ea8422')
 
+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}"
+  cd "${srcdir}/python-build-${CARCH}"
   ${MINGW_PREFIX}/bin/py.test || warning "test 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 -O1 --skip-build \
+  ${MINGW_PREFIX}/bin/python setup.py install -O1 --skip-build \
       --root="${pkgdir}" --prefix=${MINGW_PREFIX}
 
-  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-sphinxcontrib-jsmath/PKGBUILD b/mingw-w64-python-sphinxcontrib-jsmath/PKGBUILD
index da3d7369e2..a46229ffe1 100644
--- a/mingw-w64-python-sphinxcontrib-jsmath/PKGBUILD
+++ b/mingw-w64-python-sphinxcontrib-jsmath/PKGBUILD
@@ -1,34 +1,42 @@
 # Maintainer: Peter Budai <peterbudai@hotmail.com>
 
 _realname=sphinxcontrib-jsmath
-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.0.1
-pkgrel=2
+pkgrel=1
 pkgdesc="Sphinx extension which renders display math in HTML via JavaScript (mingw-w64)"
 arch=('any')
 license=('BSD')
 url="https://github.com/sphinx-doc/sphinxcontrib-jsmath"
-makedepends=("${MINGW_PACKAGE_PREFIX}-python3-setuptools")
-checkdepends=("${MINGW_PACKAGE_PREFIX}-python3-pytest")
+makedepends=("${MINGW_PACKAGE_PREFIX}-python-setuptools")
+checkdepends=("${MINGW_PACKAGE_PREFIX}-python-pytest")
 source=("${_realname}-${pkgver}.tar.gz"::"https://files.pythonhosted.org/packages/source/${_realname::1}/${_realname}/${_realname}-${pkgver}.tar.gz")
 sha256sums=('a9925e4a4587247ed2191a22df5f6970656cb8ca2bd6284309578f2153e0c4b8')
 
+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}"
+  cd "${srcdir}/python-build-${CARCH}"
   ${MINGW_PREFIX}/bin/py.test || warning "test 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 -O1 --skip-build \
+  ${MINGW_PREFIX}/bin/python setup.py install -O1 --skip-build \
       --root="${pkgdir}" --prefix=${MINGW_PREFIX}
 
-  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-sphinxcontrib-qthelp/PKGBUILD b/mingw-w64-python-sphinxcontrib-qthelp/PKGBUILD
index c6700c725a..bb5d4bd8b5 100644
--- a/mingw-w64-python-sphinxcontrib-qthelp/PKGBUILD
+++ b/mingw-w64-python-sphinxcontrib-qthelp/PKGBUILD
@@ -1,34 +1,42 @@
 # Maintainer: Peter Budai <peterbudai@hotmail.com>
 
 _realname=sphinxcontrib-qthelp
-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.0.2
-pkgrel=2
+pkgrel=1
 pkgdesc="Sphinx extension which outputs QtHelp document (mingw-w64)"
 arch=('any')
 license=('BSD')
 url="https://github.com/sphinx-doc/sphinxcontrib-qthelp"
-makedepends=("${MINGW_PACKAGE_PREFIX}-python3-setuptools")
-checkdepends=("${MINGW_PACKAGE_PREFIX}-python3-pytest")
+makedepends=("${MINGW_PACKAGE_PREFIX}-python-setuptools")
+checkdepends=("${MINGW_PACKAGE_PREFIX}-python-pytest")
 source=("${_realname}-${pkgver}.tar.gz"::"https://files.pythonhosted.org/packages/source/${_realname::1}/${_realname}/${_realname}-${pkgver}.tar.gz")
 sha256sums=('79465ce11ae5694ff165becda529a600c754f4bc459778778c7017374d4d406f')
 
+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}"
+  cd "${srcdir}/python-build-${CARCH}"
   ${MINGW_PREFIX}/bin/py.test || warning "test 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 -O1 --skip-build \
+  ${MINGW_PREFIX}/bin/python setup.py install -O1 --skip-build \
       --root="${pkgdir}" --prefix=${MINGW_PREFIX}
 
-  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-sphinxcontrib-serializinghtml/PKGBUILD b/mingw-w64-python-sphinxcontrib-serializinghtml/PKGBUILD
index 529970c5df..89df82c905 100644
--- a/mingw-w64-python-sphinxcontrib-serializinghtml/PKGBUILD
+++ b/mingw-w64-python-sphinxcontrib-serializinghtml/PKGBUILD
@@ -1,34 +1,42 @@
 # Maintainer: Peter Budai <peterbudai@hotmail.com>
 
 _realname=sphinxcontrib-serializinghtml
-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.1.3
 pkgrel=2
 pkgdesc="Sphinx extension which outputs "serialized" HTML files (json and pickle) (mingw-w64)"
 arch=('any')
 license=('BSD')
 url="https://github.com/sphinx-doc/sphinxcontrib-serializinghtml"
-makedepends=("${MINGW_PACKAGE_PREFIX}-python3-setuptools")
-checkdepends=("${MINGW_PACKAGE_PREFIX}-python3-pytest")
+makedepends=("${MINGW_PACKAGE_PREFIX}-python-setuptools")
+checkdepends=("${MINGW_PACKAGE_PREFIX}-python-pytest")
 source=("${_realname}-${pkgver}.tar.gz"::"https://files.pythonhosted.org/packages/source/${_realname::1}/${_realname}/${_realname}-${pkgver}.tar.gz")
 sha256sums=('c0efb33f8052c04fd7a26c0a07f1678e8512e0faec19f4aa8f2473a8b81d5227')
 
+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}"
+  cd "${srcdir}/python-build-${CARCH}"
   ${MINGW_PREFIX}/bin/py.test || warning "test 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 -O1 --skip-build \
+  ${MINGW_PREFIX}/bin/python setup.py install -O1 --skip-build \
       --root="${pkgdir}" --prefix=${MINGW_PREFIX}
 
-  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-sphinxcontrib-websupport/PKGBUILD b/mingw-w64-python-sphinxcontrib-websupport/PKGBUILD
index c46d16ef3a..3940312d03 100644
--- a/mingw-w64-python-sphinxcontrib-websupport/PKGBUILD
+++ b/mingw-w64-python-sphinxcontrib-websupport/PKGBUILD
@@ -2,31 +2,34 @@
 
 _realname=sphinxcontrib-websupport
 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=2
+pkgrel=1
 arch=('any')
 pkgdesc="Sphinx API for Web Apps (mingw-w64)"
 url="https://www.sphinx-doc.org/"
 license=('BSD')
-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://pypi.org/packages/source/s/${_realname}/${_realname}-${pkgver}.tar.gz")
 sha256sums=('1501befb0fdf1d1c29a800fdbf4ef5dc5369377300ddbdd16d2cd40e54c6eefc')
 
 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}"
 }
 
 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} --root=${pkgdir} --skip-build
+  ${MINGW_PREFIX}/bin/python setup.py install --prefix=${MINGW_PREFIX} --root=${pkgdir} --skip-build
 }
diff --git a/mingw-w64-python-toml/PKGBUILD b/mingw-w64-python-toml/PKGBUILD
index 383df04f8c..6daf3f1ed0 100644
--- a/mingw-w64-python-toml/PKGBUILD
+++ b/mingw-w64-python-toml/PKGBUILD
@@ -2,16 +2,19 @@
 
 _realname=toml
 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.10.0
-pkgrel=3
+pkgrel=1
 pkgdesc="A Python library for parsing and creating TOML (mingw-w64)"
 arch=('any')
 url='https://github.com/uiri/toml'
 license=('MIT')
-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://files.pythonhosted.org/packages/source/${_realname::1}/${_realname}/${_realname}-${pkgver}.tar.gz"
         "https://raw.githubusercontent.com/uiri/toml/master/test.toml")
diff --git a/mingw-w64-python-tornado/PKGBUILD b/mingw-w64-python-tornado/PKGBUILD
index f3688c7465..01c96de452 100644
--- a/mingw-w64-python-tornado/PKGBUILD
+++ b/mingw-w64-python-tornado/PKGBUILD
@@ -2,46 +2,48 @@
 
 _realname=tornado
 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=6.0.3
-pkgrel=3
+pkgrel=1
 pkgdesc="open source version of the scalable, non-blocking web server and tools (mingw-w64)"
 arch=('any')
 url='https://www.tornadoweb.org/'
 license=('Apache')
-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/tornadoweb/tornado/archive/v${pkgver}.tar.gz")
 sha256sums=('a97ac3b8c95867e534b48cb6fbbf156f5ca5b20c423bb06894c17b240d7a18fc')
-
 noextract=("${_realname}-${pkgver}.tar.gz")
 
 prepare() {
   # work around an issue with symbolic links in the tarball.
   bsdtar zxf ${_realname}-${pkgver}.tar.gz || true
 
-  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}"
 
   export TORNADO_EXTENSION=1
 }
 
 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
 }
 
 # We probably will need various prerequisits for this
 #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
 }
diff --git a/mingw-w64-python-tox/PKGBUILD b/mingw-w64-python-tox/PKGBUILD
index d3a6649a85..80b17ba564 100644
--- a/mingw-w64-python-tox/PKGBUILD
+++ b/mingw-w64-python-tox/PKGBUILD
@@ -2,57 +2,60 @@
 
 _realname=tox
 pkgbase=mingw-w64-python-${_realname}
-pkgname=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
-pkgver=3.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=3.14.2
+pkgrel=1
 pkgdesc="Python virtualenv management and testing tool (mingw-w64)"
 arch=('any')
 url="https://tox.readthedocs.io"
 license=('GPL2')
-depends=("${MINGW_PACKAGE_PREFIX}-python3"
-         "${MINGW_PACKAGE_PREFIX}-python3-py"
-         "${MINGW_PACKAGE_PREFIX}-python2-six"
-         "${MINGW_PACKAGE_PREFIX}-python3-virtualenv"
-         "${MINGW_PACKAGE_PREFIX}-python3-setuptools"
-         "${MINGW_PACKAGE_PREFIX}-python3-setuptools-scm"
-         "${MINGW_PACKAGE_PREFIX}-python3-filelock"
-         "${MINGW_PACKAGE_PREFIX}-python3-toml"
-         "${MINGW_PACKAGE_PREFIX}-python3-pluggy")
+depends=("${MINGW_PACKAGE_PREFIX}-python"
+         "${MINGW_PACKAGE_PREFIX}-python-py"
+         "${MINGW_PACKAGE_PREFIX}-python-six"
+         #"${MINGW_PACKAGE_PREFIX}-python-virtualenv"
+         "${MINGW_PACKAGE_PREFIX}-python-setuptools"
+         "${MINGW_PACKAGE_PREFIX}-python-setuptools-scm"
+         "${MINGW_PACKAGE_PREFIX}-python-filelock"
+         "${MINGW_PACKAGE_PREFIX}-python-toml"
+         "${MINGW_PACKAGE_PREFIX}-python-pluggy")
 makedepends=("util-linux")
 install=${_realname}3-${CARCH}.install
 options=('staticlibs' 'strip' '!debug')
 source=("${_realname}-${pkgver}.tar.gz"::"https://pypi.io/packages/source/t/tox/${_realname}-${pkgver}.tar.gz")
-sha256sums=('c4f6b319c20ba4913dbfe71ebfd14ff95d1853c4231493608182f66e566ecfe1')
+sha256sums=('7efd010a98339209f3a8292f02909b51c58417bfc6838ab7eca14cf90f96117a')
 
 prepare() {
   find ${_realname}-${pkgver} -name "*.pyc" -delete
-  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() {
-  cd "${srcdir}/python3-build-${CARCH}"
-  ${MINGW_PREFIX}/bin/python3 setup.py build
+  cd "${srcdir}/python-build-${CARCH}"
+  ${MINGW_PREFIX}/bin/python setup.py build
 }
 
 #This hangs when I try this.
 #check() {
-#  cd "${srcdir}/python3-build-${CARCH}" 
-#  msg "Python 3 build for ${CARCH}" 
+#  cd "${srcdir}/python-build-${CARCH}" 
+#  msg "Python build for ${CARCH}" 
 #  ${MINGW_PREFIX}/bin/virtualenv "$srcdir/pyvenv" --system-site-packages
 #  . "$srcdir/pyvenv/bin/activate"
-#  ${MINGW_PREFIX}/bin/python3 setup.py install
-#  ${MINGW_PREFIX}/bin/python3 setup.py pytest
+#  ${MINGW_PREFIX}/bin/python setup.py install
+#  ${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
 
-  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-u-msgpack/PKGBUILD b/mingw-w64-python-u-msgpack/PKGBUILD
index bb83a3d078..42c21bc668 100644
--- a/mingw-w64-python-u-msgpack/PKGBUILD
+++ b/mingw-w64-python-u-msgpack/PKGBUILD
@@ -3,45 +3,47 @@
 _realname=u-msgpack
 pkgbase=mingw-w64-python-${_realname}
 _pkgname=${_realname}-python
-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.5.2
-pkgrel=2
+pkgrel=1
 pkgdesc="portable, lightweight MessagePack serializer and deserializer for Python (mingw-w64)"
 arch=('any')
 url='https://github.com/vsergeev/${_pkgname}'
 license=('MIT')
-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=("${_realname}-${pkgver}.tar.gz"::"https://github.com/vsergeev/u-msgpack-python/archive/v$pkgver.tar.gz")
+source=("${_realname}-${pkgver}.tar.gz"::"https://github.com/vsergeev/u-msgpack-python/archive/v${pkgver}.tar.gz")
 sha256sums=('685d9f7dfbee8c840778d866d30a6b8c335b749b7c8716290b906a22e7fd29c4')
 
 prepare() {
-  cd "${srcdir}/${_pkgname}-${pkgver}"
+  cd ${srcdir}
+  rm -rf python-build-${CARCH} | true
+  cp -r "${_pkgname}-${pkgver}" "python-build-${CARCH}"
 
   # Set version for setuptools_scm
-  export SETUPTOOLS_SCM_PRETEND_VERSION=$pkgver
+  export SETUPTOOLS_SCM_PRETEND_VERSION=${pkgver}
 }
 
 build() {
-  cd "${srcdir}/${_pkgname}-${pkgver}"
-
-  ${MINGW_PREFIX}/bin/python3 setup.py build
+  cd "${srcdir}/python-build-${CARCH}"
+  ${MINGW_PREFIX}/bin/python setup.py build
 }
 
 check() {
-  cd "${srcdir}/${_pkgname}-${pkgver}"
-
-  ${MINGW_PREFIX}/bin/python3 setup.py check
+  cd "${srcdir}/python-build-${CARCH}"
+  ${MINGW_PREFIX}/bin/python setup.py check
 }
 
 package() {
-  cd "${srcdir}/${_pkgname}-${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-urllib3/PKGBUILD b/mingw-w64-python-urllib3/PKGBUILD
index cef8726107..b9e7455a19 100644
--- a/mingw-w64-python-urllib3/PKGBUILD
+++ b/mingw-w64-python-urllib3/PKGBUILD
@@ -2,46 +2,49 @@
 
 _realname=urllib3
 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.25.6
-pkgrel=2
+pkgrel=1
 pkgdesc="HTTP library with thread-safe connection pooling and file post support (mingw-w64)"
 url='https://github.com/shazow/urllib3'
 license=('MIT')
 arch=('any')
-depends=("${MINGW_PACKAGE_PREFIX}-python3"
-         "${MINGW_PACKAGE_PREFIX}-python3-certifi"
-         "${MINGW_PACKAGE_PREFIX}-python3-idna")
-makedepends=("${MINGW_PACKAGE_PREFIX}-python3-setuptools"
-             "${MINGW_PACKAGE_PREFIX}-python3-ndg-httpsclient"
-             "${MINGW_PACKAGE_PREFIX}-python3-pyasn1"
-             "${MINGW_PACKAGE_PREFIX}-python3-pyopenssl"
-             #"${MINGW_PACKAGE_PREFIX}-python3-pysocks"
-             "${MINGW_PACKAGE_PREFIX}-python3-mock")
-checkdepends=("${MINGW_PACKAGE_PREFIX}-python3-nose"
-              "${MINGW_PACKAGE_PREFIX}-python3-tornado"
-              "${MINGW_PACKAGE_PREFIX}-python3-coverage"
-              "${MINGW_PACKAGE_PREFIX}-python3-psutil")
+depends=("${MINGW_PACKAGE_PREFIX}-python"
+         "${MINGW_PACKAGE_PREFIX}-python-certifi"
+         "${MINGW_PACKAGE_PREFIX}-python-idna")
+makedepends=("${MINGW_PACKAGE_PREFIX}-python-setuptools"
+             "${MINGW_PACKAGE_PREFIX}-python-ndg-httpsclient"
+             "${MINGW_PACKAGE_PREFIX}-python-pyasn1"
+             "${MINGW_PACKAGE_PREFIX}-python-pyopenssl"
+             #"${MINGW_PACKAGE_PREFIX}-python-pysocks"
+             "${MINGW_PACKAGE_PREFIX}-python-mock")
+checkdepends=("${MINGW_PACKAGE_PREFIX}-python-nose"
+              "${MINGW_PACKAGE_PREFIX}-python-tornado"
+              "${MINGW_PACKAGE_PREFIX}-python-coverage"
+              "${MINGW_PACKAGE_PREFIX}-python-psutil")
 source=("${_realname}-${pkgver}.tar.gz::https://github.com/shazow/urllib3/archive/${pkgver}.tar.gz")
 sha256sums=('066fa334d4b446ea2b5edf2f8b392c65993de604e18d708b0aca9e34dd2e6836')
 
 prepare() {
   cd ${srcdir}
-  cp -r ${_realname}-${pkgver} python3-build-${CARCH}
+  cp -r ${_realname}-${pkgver} python-build-${CARCH}
 }
 
 build() {
   cd "${srcdir}"
-  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}
-  ${MINGW_PREFIX}/bin/python3 setup.py build
+  cd ${srcdir}/python-build-${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}"
+  ${MINGW_PREFIX}/bin/python setup.py install --prefix=${MINGW_PREFIX} --root="${pkgdir}"
 
-  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-wcwidth/PKGBUILD b/mingw-w64-python-wcwidth/PKGBUILD
index 18a7d19daf..7a5f6d1450 100644
--- a/mingw-w64-python-wcwidth/PKGBUILD
+++ b/mingw-w64-python-wcwidth/PKGBUILD
@@ -2,18 +2,19 @@
 
 _realname=wcwidth
 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.7
-pkgrel=4
+pkgrel=1
 pkgdesc="Measures number of Terminal column cells of wide-character codes (mingw-w64)"
 url="https://github.com/jquast/wcwidth"
 arch=('any')
 license=('MIT')
-depends=("${MINGW_PACKAGE_PREFIX}-python3")
-makedepends=("${MINGW_PACKAGE_PREFIX}-python3-setuptools")
-#checkdepends=(
-#  "${MINGW_PACKAGE_PREFIX}-python3-tox"
-#)
+depends=("${MINGW_PACKAGE_PREFIX}-python")
+makedepends=("${MINGW_PACKAGE_PREFIX}-python-setuptools")
+#checkdepends=("${MINGW_PACKAGE_PREFIX}-python-tox")
 source=(${_realname}-${pkgver}.tar.gz::https://github.com/jquast/${_realname}/archive/${pkgver}.tar.gz)
 sha256sums=('c0122eb9a4ef7ab6489d0ef7c72db4143387b9466e27385cd5201950f49583b3')
 
diff --git a/mingw-w64-python-webencodings/PKGBUILD b/mingw-w64-python-webencodings/PKGBUILD
index 9e5ec2f6b0..7dd0e07e1e 100644
--- a/mingw-w64-python-webencodings/PKGBUILD
+++ b/mingw-w64-python-webencodings/PKGBUILD
@@ -2,15 +2,18 @@
 
 _realname=webencodings
 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.5.1
-pkgrel=5
+pkgrel=1
 arch=('any')
 pkgdesc="This is a Python implementation of the WHATWG Encoding standard (mingw-w64)"
 url="https://github.com/gsnedders/python-webencodings"
 license=('BSD')
-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/gsnedders/python-webencodings/archive/v${pkgver}.tar.gz")
 sha256sums=('082367f568a7812aa5f6922ffe3d9d027cd83829dc32bcaac4c874eeed618000')
 
@@ -28,7 +31,7 @@ build() {
 
 check() {
   cd "${srcdir}/python-build-${CARCH}/build/lib/webencodings/"
-  ${MINGW_PREFIX}/bin/nosetests3
+  ${MINGW_PREFIX}/bin/nosetests
 }
 
 package() {
diff --git a/mingw-w64-python-win_inet_pton/PKGBUILD b/mingw-w64-python-win_inet_pton/PKGBUILD
index 40ed15825e..df71b7cd38 100644
--- a/mingw-w64-python-win_inet_pton/PKGBUILD
+++ b/mingw-w64-python-win_inet_pton/PKGBUILD
@@ -2,15 +2,18 @@
 
 _realname=win_inet_pton
 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="Native inet_pton and inet_ntop implementation for Python on Windows (with ctypes) (mingw-w64)"
 arch=('any')
 url='https://github.com/hickeroar/win_inet_pton'
 license=('custom:public domain')
-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::1}/${_realname}/${_realname}-${pkgver}.tar.gz")
 sha256sums=('dd03d942c0d3e2b1cf8bab511844546dfa5f74cb61b241699fa379ad707dea4f')
diff --git a/mingw-w64-python-win_unicode_console/PKGBUILD b/mingw-w64-python-win_unicode_console/PKGBUILD
index 8e753cd892..61f72a0ea0 100644
--- a/mingw-w64-python-win_unicode_console/PKGBUILD
+++ b/mingw-w64-python-win_unicode_console/PKGBUILD
@@ -2,28 +2,36 @@
 
 _realname=win_unicode_console
 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.5
-pkgrel=5
+pkgrel=1
 pkgdesc="Measures number of Terminal column cells of wide-character codes"
 url="https://github.com/Drekin/win-unicode-console"
 arch=('any')
 license=('MIT')
-depends=("${MINGW_PACKAGE_PREFIX}-python3")
-makedepends=("${MINGW_PACKAGE_PREFIX}-python3-setuptools")
+depends=("${MINGW_PACKAGE_PREFIX}-python")
+makedepends=("${MINGW_PACKAGE_PREFIX}-python-setuptools")
 source=(win-unicode-console-${pkgver}.tar.gz::https://github.com/Drekin/win-unicode-console/archive/${pkgver}.tar.gz)
 sha256sums=('2eca3277096ddf88f852b667fcdd866a342500f86c6e10cce9842420290d5048')
 
-build() {
-  cd "${srcdir}/win-unicode-console-${pkgver}"
+prepare() {
+  cd "${srcdir}"
+  rm -rf python-build-${CARCH} | true
+  cp -r "win-unicode-console-${pkgver}" "python-build-${CARCH}"
+}
 
-  python3 setup.py build
+build() {
+  cd "${srcdir}/python-build-${CARCH}"
+  ${MINGW_PREFIX}/bin/python setup.py build
 }
 
 package() {
-  cd "${srcdir}/win-unicode-console-${pkgver}"
-
+  cd "${srcdir}/python-build-${CARCH}"
   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-wincertstore/PKGBUILD b/mingw-w64-python-wincertstore/PKGBUILD
index 881beb82bd..5c77d99abb 100644
--- a/mingw-w64-python-wincertstore/PKGBUILD
+++ b/mingw-w64-python-wincertstore/PKGBUILD
@@ -2,15 +2,18 @@
 
 _realname=wincertstore
 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.2
-pkgrel=3
+pkgrel=1
 pkgdesc="Python module to extract CA and CRL certs from Windows' cert store (ctypes based) (mingw-w64)"
 arch=('any')
 url='https://bitbucket.org/tiran/wincertstore'
 license=('PSFL')
-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='df/e1/765f9abdd57610b1c6251e4853edddcac60f929cf6c9029200887dde0f9e'
 source=("https://files.pythonhosted.org/packages/${_dtoken}/${_realname}-${pkgver}.zip"
diff --git a/mingw-w64-python-xpra/PKGBUILD b/mingw-w64-python-xpra/PKGBUILD
index 3f868ab338..881bd82779 100644
--- a/mingw-w64-python-xpra/PKGBUILD
+++ b/mingw-w64-python-xpra/PKGBUILD
@@ -2,9 +2,12 @@
 
 _realname=xpra
 pkgbase=mingw-w64-python-${_realname}
-pkgname=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
-conflicts=("${MINGW_PACKAGE_PREFIX}-${_realname}-common")
-replaces=("${MINGW_PACKAGE_PREFIX}-${_realname}-common")
+pkgname=("${MINGW_PACKAGE_PREFIX}-python-${_realname}")
+conflicts=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}"
+           "${MINGW_PACKAGE_PREFIX}-${_realname}-common")
+replaces=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}"
+          "${MINGW_PACKAGE_PREFIX}-${_realname}-common")
+provides=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
 pkgver=3.0.4
 pkgrel=1
 pkgdesc="Remote access client / server software"
@@ -18,57 +21,57 @@ depends=("${MINGW_PACKAGE_PREFIX}-ffmpeg"
          "${MINGW_PACKAGE_PREFIX}-x264-git"
          "${MINGW_PACKAGE_PREFIX}-libwebp"
          "${MINGW_PACKAGE_PREFIX}-libjpeg-turbo"
-         "${MINGW_PACKAGE_PREFIX}-python3"
-         "${MINGW_PACKAGE_PREFIX}-python3-lz4"
-         "${MINGW_PACKAGE_PREFIX}-python3-rencode"
-         "${MINGW_PACKAGE_PREFIX}-python3-pillow"
-         "${MINGW_PACKAGE_PREFIX}-python3-PyOpenGL"
-         "${MINGW_PACKAGE_PREFIX}-python3-comtypes"
-         "${MINGW_PACKAGE_PREFIX}-python3-setproctitle")
+         "${MINGW_PACKAGE_PREFIX}-python"
+         "${MINGW_PACKAGE_PREFIX}-python-lz4"
+         "${MINGW_PACKAGE_PREFIX}-python-rencode"
+         "${MINGW_PACKAGE_PREFIX}-python-pillow"
+         "${MINGW_PACKAGE_PREFIX}-python-pyopengl"
+         "${MINGW_PACKAGE_PREFIX}-python-comtypes"
+         "${MINGW_PACKAGE_PREFIX}-python-setproctitle")
 optdepends=("${MINGW_PACKAGE_PREFIX}-libnotify: notification support"
             "${MINGW_PACKAGE_PREFIX}-gst-plugins-bad: extra audio codecs"
             "${MINGW_PACKAGE_PREFIX}-gst-plugins-ugly: extra audio codecs"
             "${MINGW_PACKAGE_PREFIX}-gst-plugins-good: extra audio codecs"
             "${MINGW_PACKAGE_PREFIX}-gst-python: audio support"
-            "${MINGW_PACKAGE_PREFIX}-python3-paramiko: SSH client and server support"
-            "${MINGW_PACKAGE_PREFIX}-python3-dnspython: SSHFP support with paramiko"
-            "${MINGW_PACKAGE_PREFIX}-python3-netifaces: mDNS and network integration"
-            "${MINGW_PACKAGE_PREFIX}-python3-pyu2f: U2F authentication"
-            "${MINGW_PACKAGE_PREFIX}-python3-ldap: LDAP authentication via python-ldap"
-            "${MINGW_PACKAGE_PREFIX}-python3-ldap3: LDAP authentication via python-ldap3"
-            "${MINGW_PACKAGE_PREFIX}-python3-cryptography: AES packet encryption"
-            "${MINGW_PACKAGE_PREFIX}-python3-zeroconf: mDNS support"
-            "${MINGW_PACKAGE_PREFIX}-python3-nvidia-ml: nvidia GPU support")
+            "${MINGW_PACKAGE_PREFIX}-python-paramiko: SSH client and server support"
+            "${MINGW_PACKAGE_PREFIX}-python-dnspython: SSHFP support with paramiko"
+            "${MINGW_PACKAGE_PREFIX}-python-netifaces: mDNS and network integration"
+            "${MINGW_PACKAGE_PREFIX}-python-pyu2f: U2F authentication"
+            "${MINGW_PACKAGE_PREFIX}-python-ldap: LDAP authentication via python-ldap"
+            "${MINGW_PACKAGE_PREFIX}-python-ldap3: LDAP authentication via python-ldap3"
+            "${MINGW_PACKAGE_PREFIX}-python-cryptography: AES packet encryption"
+            "${MINGW_PACKAGE_PREFIX}-python-zeroconf: mDNS support"
+            "${MINGW_PACKAGE_PREFIX}-python-nvidia-ml: nvidia GPU support")
 makedepends=("${MINGW_PACKAGE_PREFIX}-gcc"
              "${MINGW_PACKAGE_PREFIX}-brotli"
-             "${MINGW_PACKAGE_PREFIX}-pkg-config"
-             "${MINGW_PACKAGE_PREFIX}-python3-setuptools"
              "${MINGW_PACKAGE_PREFIX}-cython"
-             "${MINGW_PACKAGE_PREFIX}-pygobject-devel"
-             "${MINGW_PACKAGE_PREFIX}-python3-cairo")
+             "${MINGW_PACKAGE_PREFIX}-pkg-config"
+             "${MINGW_PACKAGE_PREFIX}-python-cairo"
+             "${MINGW_PACKAGE_PREFIX}-python-setuptools"
+             "${MINGW_PACKAGE_PREFIX}-pygobject-devel")
 source=("https://xpra.org/src/xpra-${pkgver}.tar.xz")
 sha512sums=('53da5e2a07ed0ae01700ee0e18209bcd2abbf49772377d8f5d6c152e96ee44e35602772bfd9bbac04cb3419c7a97e87f1d23bbc0c72666c5005e00fb88304351')
 
 prepare() {
   cd "${srcdir}"
   rm -rf python3-build-${CARCH} | true
-  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 \
     --without-cuda_kernels --with-data --with-html5 --with-modules
 }
 
 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} \
     --without-cuda_kernels --with-data  --with-html5 --skip-build \
-    --root="${pkgdir}/${MINW_PREFIX}" --share-xpra="./share/xpra"
+    --root="${pkgdir}${MINW_PREFIX}" --share-xpra="./share/xpra"
 
-  install -Dm644 COPYING "${pkgdir}${MINGW_PREFIX}/share/licenses/python3-${_realname}/COPYING"
+  install -Dm644 COPYING "${pkgdir}${MINGW_PREFIX}/share/licenses/python-${_realname}/COPYING"
   install -Dm644 README "${pkgdir}${MINGW_PREFIX}/share/${_realname}/README"
   install -Dm644 bell.wav "${pkgdir}${MINGW_PREFIX}/share/${_realname}/bell.wav"
 
diff --git a/mingw-w64-python-yaml/PKGBUILD b/mingw-w64-python-yaml/PKGBUILD
index 9f677223f1..532cf42967 100644
--- a/mingw-w64-python-yaml/PKGBUILD
+++ b/mingw-w64-python-yaml/PKGBUILD
@@ -6,21 +6,24 @@
 _pyname=PyYAML
 _realname=yaml
 pkgbase=mingw-w64-python-${_realname}
-pkgname=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
-pkgver=5.1.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.2
+pkgrel=1
 pkgdesc="Python bindings for YAML, using fast libYAML library (mingw-w64)"
 arch=('any')
 url='https://pyyaml.org/'
 license=('MIT')
-depends=("${MINGW_PACKAGE_PREFIX}-python3"
+depends=("${MINGW_PACKAGE_PREFIX}-python"
          "${MINGW_PACKAGE_PREFIX}-libyaml")
 makedepends=("${MINGW_PACKAGE_PREFIX}-cython"
-             "${MINGW_PACKAGE_PREFIX}-python3-setuptools")
+             "${MINGW_PACKAGE_PREFIX}-python-setuptools")
 options=('staticlibs' 'strip' '!debug')
 source=("https://pyyaml.org/download/pyyaml/${_pyname}-${pkgver}.tar.gz")
 install=python-yaml.install
-sha256sums=('01adf0b6c6f61bd11af6e10ca52b7d4057dd0be0343eb9283c878cf3af56aee4')
+sha256sums=('c0ee8eca2c582d29c3c2ec6e2c4f703d1b7f1fb10bc72317355a746057e7346c')
 
 prepare() {
   # Force cython rebuild
diff --git a/mingw-w64-python-zeroconf/PKGBUILD b/mingw-w64-python-zeroconf/PKGBUILD
index 98f44b14a5..add6950b9b 100644
--- a/mingw-w64-python-zeroconf/PKGBUILD
+++ b/mingw-w64-python-zeroconf/PKGBUILD
@@ -2,41 +2,51 @@
 # Contributor: Jelle van der Waa <jelle@archlinux.org>
 # Contributor: Maxim Andersson <thesilentboatman@gmail.com>
 
-pkgname="${MINGW_PACKAGE_PREFIX}-python3-zeroconf"
+_realname=zeroconf
 _srcname=python-zeroconf
-pkgver=0.23.0
-pkgrel=2
+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=0.24.3
+pkgrel=1
 pkgdesc="A pure python implementation of multicast DNS service discovery"
 arch=('any')
 url="https://github.com/jstasiak/python-zeroconf"
 license=('LGPL')
-depends=("${MINGW_PACKAGE_PREFIX}-python3"
-         "${MINGW_PACKAGE_PREFIX}-python3-ifaddr"
-         "${MINGW_PACKAGE_PREFIX}-python3-netifaces"
-         "${MINGW_PACKAGE_PREFIX}-python3-six")
-makedepends=("${MINGW_PACKAGE_PREFIX}-python3-setuptools")
-checkdepends=("${MINGW_PACKAGE_PREFIX}-python3-pytest")
+depends=("${MINGW_PACKAGE_PREFIX}-python"
+         "${MINGW_PACKAGE_PREFIX}-python-ifaddr"
+         "${MINGW_PACKAGE_PREFIX}-python-netifaces"
+         "${MINGW_PACKAGE_PREFIX}-python-six")
+makedepends=("${MINGW_PACKAGE_PREFIX}-python-setuptools")
+checkdepends=("${MINGW_PACKAGE_PREFIX}-python-pytest")
 source=("${_srcname}-${pkgver}.tar.gz"::"https://github.com/jstasiak/${_srcname}/archive/${pkgver}.tar.gz")
-sha256sums=('e194df93ae5d5158fd62434e395fe73ef9eb9580e5d326aad06d02c56031b31a')
+sha256sums=('dd381839f6558aaf618af7dbfd7c0bb25defeb954d1187dc6e5ad11c59939bf1')
+
+prepare() {
+  rm -rf python-build-${CARCH} | true
+  cp -r "${_srcname}-${pkgver}" "python-build-${CARCH}"
+}
 
 build() {
-  cd "${srcdir}/${_srcname}-${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}/${_srcname}-${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-zeroconf/COPYING"
-  install -Dm644 README.rst "${pkgdir}${MINGW_PREFIX}/share/doc/python3-zeroconf/README"
+  install -Dm644 COPYING    "${pkgdir}${MINGW_PREFIX}/share/licenses/python-zeroconf/COPYING"
+  install -Dm644 README.rst "${pkgdir}${MINGW_PREFIX}/share/doc/python-zeroconf/README"
 }
 
 check() {
-  cd "${srcdir}/${_srcname}-${pkgver}"
+  cd "${srcdir}/python-build-${CARCH}"
   py.test .
 }