diff --git a/mingw-w64-brotli/PKGBUILD b/mingw-w64-brotli/PKGBUILD
index b7730e09fe..81d6eab019 100644
--- a/mingw-w64-brotli/PKGBUILD
+++ b/mingw-w64-brotli/PKGBUILD
@@ -3,14 +3,15 @@
 _realname=brotli
 pkgbase=mingw-w64-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}"
-         "${MINGW_PACKAGE_PREFIX}-python3-${_realname}"
+         "${MINGW_PACKAGE_PREFIX}-python-${_realname}"
          "${MINGW_PACKAGE_PREFIX}-brotli-testdata")
 pkgver=1.0.7
-pkgrel=3
+pkgrel=4
 pkgdesc="Brotli compression library (mingw-w64)"
 arch=('any')
 url='https://github.com/google/brotli'
-makedepends=("${MINGW_PACKAGE_PREFIX}-cmake" "${MINGW_PACKAGE_PREFIX}-python3")
+makedepends=("${MINGW_PACKAGE_PREFIX}-cmake"
+             "${MINGW_PACKAGE_PREFIX}-python")
 license=('MIT')
 source=("${_realname}-${pkgver}.tar.gz"::"https://github.com/google/brotli/archive/v${pkgver}.tar.gz")
 sha256sums=('4c61bfb0faca87219ea587326c467b95acb25555b53d1a421ffa3c8a9296ee2c')
@@ -19,7 +20,7 @@ build() {
   cd "${srcdir}/${_realname}-${pkgver}"
 
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
-    ${MINGW_PREFIX}/bin/python3 setup.py build
+    ${MINGW_PREFIX}/bin/python setup.py build
 
   [[ -d "${srcdir}"/build-${CARCH} ]] && rm -rf "${srcdir}"/build-${CARCH}
   mkdir -p "${srcdir}"/build-${CARCH} && cd "${srcdir}"/build-${CARCH}
@@ -53,16 +54,19 @@ package_brotli() {
   install -D -m644 "${srcdir}"/brotli-${pkgver}/LICENSE "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/LICENSE"
 }
 
-package_python3-brotli() {
-  depends=("${MINGW_PACKAGE_PREFIX}-python3" "${MINGW_PACKAGE_PREFIX}-libwinpthread-git")
+package_python-brotli() {
+  depends=("${MINGW_PACKAGE_PREFIX}-python" "${MINGW_PACKAGE_PREFIX}-libwinpthread-git")
+  provides=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+  conflicts=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+  replaces=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
 
   cd "${srcdir}/${_realname}-${pkgver}"
 
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
-  ${MINGW_PREFIX}/bin/python3 setup.py install --prefix=${MINGW_PREFIX} \
+  ${MINGW_PREFIX}/bin/python setup.py install --prefix=${MINGW_PREFIX} \
     --root="${pkgdir}" --optimize=1 --skip-build
 
-  install -Dm644 LICENSE "${pkgdir}${MINGW_PREFIX}/share/licenses/python3-${_realname}/COPYING"
+  install -Dm644 LICENSE "${pkgdir}${MINGW_PREFIX}/share/licenses/python-${_realname}/COPYING"
 
 }
 
@@ -83,8 +87,8 @@ package_mingw-w64-i686-brotli-testdata() {
   package_brotli-testdata
 }
 
-package_mingw-w64-i686-python3-brotli() {
-  package_python3-brotli
+package_mingw-w64-i686-python-brotli() {
+  package_python-brotli
 }
 
 package_mingw-w64-x86_64-brotli() {
@@ -95,6 +99,6 @@ package_mingw-w64-x86_64-brotli-testdata() {
   package_brotli-testdata
 }
 
-package_mingw-w64-x86_64-python3-brotli() {
-  package_python3-brotli
+package_mingw-w64-x86_64-python-brotli() {
+  package_python-brotli
 }
diff --git a/mingw-w64-pygobject/PKGBUILD b/mingw-w64-pygobject/PKGBUILD
index d7263571c4..8e4c8acfd9 100644
--- a/mingw-w64-pygobject/PKGBUILD
+++ b/mingw-w64-pygobject/PKGBUILD
@@ -3,20 +3,20 @@
 _realname=pygobject
 pkgbase=mingw-w64-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-python2-gobject"
-         "${MINGW_PACKAGE_PREFIX}-python3-gobject"
+         "${MINGW_PACKAGE_PREFIX}-python-gobject"
          "${MINGW_PACKAGE_PREFIX}-pygobject-devel")
 pkgver=3.34.0
-pkgrel=2
+pkgrel=3
 pkgdesc="Python Bindings for GLib/GObject/GIO/GTK+ (mingw-w64)"
 arch=(any)
 url="https://pygobject.readthedocs.io"
 license=('LGPL')
 makedepends=("${MINGW_PACKAGE_PREFIX}-python2"
-             "${MINGW_PACKAGE_PREFIX}-python3"
+             "${MINGW_PACKAGE_PREFIX}-python"
              "${MINGW_PACKAGE_PREFIX}-python2-setuptools"
-             "${MINGW_PACKAGE_PREFIX}-python3-setuptools"
+             "${MINGW_PACKAGE_PREFIX}-python-setuptools"
              "${MINGW_PACKAGE_PREFIX}-gobject-introspection"
-             "${MINGW_PACKAGE_PREFIX}-python3-cairo"
+             "${MINGW_PACKAGE_PREFIX}-python-cairo"
              "${MINGW_PACKAGE_PREFIX}-python2-cairo")
 source=(https://download.gnome.org/sources/pygobject/${pkgver%.*}/${_realname}-${pkgver}.tar.xz)
 sha256sums=('87e2c9aa785f352ef111dcc5f63df9b85cf6e05e52ff04f803ffbebdacf5271a')
@@ -28,10 +28,10 @@ prepare() {
 build() {
   cd "${srcdir}"
 
-  rm -rf python{2,3}-build devel || true
+  rm -rf python{2,}-build devel || true
   mkdir devel
 
-  for builddir in python{2,3}-build; do
+  for builddir in python{2,}-build; do
     cp -r ${_realname}-${pkgver} ${builddir}
     pushd ${builddir}
     ${MINGW_PREFIX}/bin/${builddir%-build} setup.py build
@@ -55,19 +55,23 @@ package_python2-gobject() {
   mv "${pkgdir}${MINGW_PREFIX}"/{include,lib/pkgconfig} "${srcdir}/devel"
 }
 
-package_python3-gobject() {
-  pkgdesc="Python 3 bindings for GLib/GObject/GIO/GTK+ (mingw-w64)"
+package_python-gobject() {
+  pkgdesc="Python bindings for GLib/GObject/GIO/GTK+ (mingw-w64)"
   depends=("${MINGW_PACKAGE_PREFIX}-glib2"
-           "${MINGW_PACKAGE_PREFIX}-python3-cairo"
+           "${MINGW_PACKAGE_PREFIX}-python-cairo"
            "${MINGW_PACKAGE_PREFIX}-libffi"
            "${MINGW_PACKAGE_PREFIX}-gobject-introspection-runtime"
            "${MINGW_PACKAGE_PREFIX}-pygobject-devel=${pkgver}")
 
-  cd python3-build
+  provides=("${MINGW_PACKAGE_PREFIX}-python3-gobject=${pkgver}")
+  conflicts=("${MINGW_PACKAGE_PREFIX}-python3-gobject")
+  replaces=("${MINGW_PACKAGE_PREFIX}-python3-gobject")
+
+  cd python-build
   # --no-compile because older packages didn't install .pyc and adding them
   # would lead to upgrade conflicts
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
-    ${MINGW_PREFIX}/bin/python3 setup.py install --prefix=${MINGW_PREFIX} --root="${pkgdir}" --no-compile
+    ${MINGW_PREFIX}/bin/python setup.py install --prefix=${MINGW_PREFIX} --root="${pkgdir}" --no-compile
   rm -r "${pkgdir}${MINGW_PREFIX}"/{include,lib/pkgconfig}
 }
 
@@ -92,14 +96,14 @@ package_mingw-w64-i686-python2-gobject() {
   package_python2-gobject
 }
 
-package_mingw-w64-i686-python3-gobject() {
-  package_python3-gobject
+package_mingw-w64-i686-python-gobject() {
+  package_python-gobject
 }
 
 package_mingw-w64-x86_64-python2-gobject() {
   package_python2-gobject
 }
 
-package_mingw-w64-x86_64-python3-gobject() {
-  package_python3-gobject
+package_mingw-w64-x86_64-python-gobject() {
+  package_python-gobject
 }
diff --git a/mingw-w64-pyqt5/PKGBUILD b/mingw-w64-pyqt5/PKGBUILD
index 789595d5ea..783ff5e39d 100644
--- a/mingw-w64-pyqt5/PKGBUILD
+++ b/mingw-w64-pyqt5/PKGBUILD
@@ -2,17 +2,20 @@
 
 _realname=pyqt5
 pkgbase=mingw-w64-${_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}")
+provides=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+conflicts=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}"
+           "${MINGW_PACKAGE_PREFIX}-${_realname}-common")
+replaces=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}"
+          "${MINGW_PACKAGE_PREFIX}-${_realname}-common")
 pkgver=5.13.2
-pkgrel=2
+pkgrel=1
 pkgdesc="Qt5 bindings for Python (mingw-w64)"
 arch=('any')
 license=('GPL')
 url="https://riverbankcomputing.com/software/pyqt"
-depends=("${MINGW_PACKAGE_PREFIX}-python3-sip"
-         "${MINGW_PACKAGE_PREFIX}-python3"
+depends=("${MINGW_PACKAGE_PREFIX}-python-sip"
+         "${MINGW_PACKAGE_PREFIX}-python"
          "${MINGW_PACKAGE_PREFIX}-qt5"
          "${MINGW_PACKAGE_PREFIX}-qtwebkit")
 makedepends=("${MINGW_PACKAGE_PREFIX}-gcc")
@@ -30,11 +33,11 @@ prepare() {
 }
 
 build() {
-  [[ -d python3-${MINGW_CHOST} ]] && rm -rf python3-${MINGW_CHOST}
-  cp -r PyQt5-${pkgver} python3-${MINGW_CHOST}
-  pushd python3-${MINGW_CHOST} > /dev/null
+  [[ -d python-${MINGW_CHOST} ]] && rm -rf python-${MINGW_CHOST}
+  cp -r PyQt5-${pkgver} python-${MINGW_CHOST}
+  pushd python-${MINGW_CHOST} > /dev/null
 
-    ${MINGW_PREFIX}/bin/python3 configure.py \
+    ${MINGW_PREFIX}/bin/python configure.py \
       --confirm-license \
       --qsci-api \
       --no-dist-info \
@@ -46,7 +49,7 @@ build() {
 }
 
 package(){
-  cd python3-${MINGW_CHOST}
+  cd python-${MINGW_CHOST}
   # INSTALL_ROOT is needed for the QtDesigner module, the other Makefiles use DESTDIR
   make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install
 }
diff --git a/mingw-w64-python-absl-py/PKGBUILD b/mingw-w64-python-absl-py/PKGBUILD
index d10db26b32..f6643a7b34 100644
--- a/mingw-w64-python-absl-py/PKGBUILD
+++ b/mingw-w64-python-absl-py/PKGBUILD
@@ -2,31 +2,38 @@
 
 _realname=absl-py
 pkgbase=mingw-w64-python-${_realname}
-pkgname=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
-pkgver=0.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=0.9.0
+pkgrel=1
 pkgdesc="Abseil Common Libraries (Python) (mingw-w64)"
 arch=('any')
 url="https://github.com/abseil/abseil-py"
 license=('Apache 2.0')
-depends=("${MINGW_PACKAGE_PREFIX}-python3"
-         "${MINGW_PACKAGE_PREFIX}-python3-six")
-makedepends=("${MINGW_PACKAGE_PREFIX}-python3-setuptools")
+depends=("${MINGW_PACKAGE_PREFIX}-python"
+         "${MINGW_PACKAGE_PREFIX}-python-six")
+makedepends=("${MINGW_PACKAGE_PREFIX}-python-setuptools")
 _archive=abseil-py-pypi-v${pkgver}
 source=(${_archive}.tar.gz::https://github.com/abseil/abseil-py/archive/pypi-v${pkgver}.tar.gz)
-sha256sums=('0a145cb81101d1add8b87eaae58c5d51521084bf7cc4e4654928b326a864c6c3')
+sha256sums=('603febc9b95a8f2979a7bdb77d2f5e4d9b30d4e0d59579f88eba67d4e4cc5462')
+
+prepare() {
+  cd "${srcdir}"
+  rm -rf "python-build-${CARCH}" | true
+  cp -r "${_archive}" "python-build-${CARCH}"
+}
 
 build() {
-  cd "${srcdir}/${_archive}"
-
-  ${MINGW_PREFIX}/bin/python3 setup.py --quiet build
+  cd "${srcdir}/python-build-${CARCH}"
+  ${MINGW_PREFIX}/bin/python setup.py --quiet build
 }
 
 package() {
-  cd "${srcdir}/${_archive}"
-
+  cd "${srcdir}/python-build-${CARCH}"
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
-    ${MINGW_PREFIX}/bin/python3 setup.py --quiet install --prefix=${MINGW_PREFIX} --root="${pkgdir}" -O1
+    ${MINGW_PREFIX}/bin/python setup.py --quiet install --prefix=${MINGW_PREFIX} --root="${pkgdir}" -O1 --skip-build
 
-  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-alembic/PKGBUILD b/mingw-w64-python-alembic/PKGBUILD
index b14b864d29..ab866d983f 100644
--- a/mingw-w64-python-alembic/PKGBUILD
+++ b/mingw-w64-python-alembic/PKGBUILD
@@ -2,65 +2,63 @@
 
 _realname=alembic
 pkgbase=mingw-w64-python-${_realname}
-pkgname=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
-pkgver=1.2.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=1.3.2
+pkgrel=1
 pkgdesc="Lightweight database migration tool for usage with SQLAlchemy (mingw-w64)"
 arch=('any')
 url='https://bitbucket.org/zzzeek/alembic'
 license=('MIT')
-depends=("${MINGW_PACKAGE_PREFIX}-python3"
-         "${MINGW_PACKAGE_PREFIX}-python3-mako"
-         "${MINGW_PACKAGE_PREFIX}-python3-sqlalchemy"
-         "${MINGW_PACKAGE_PREFIX}-python3-editor"
-         "${MINGW_PACKAGE_PREFIX}-python3-dateutil")
-makedepends=("${MINGW_PACKAGE_PREFIX}-python3-setuptools")
-checkdepends=("${MINGW_PACKAGE_PREFIX}-python3-pytest"
-              "${MINGW_PACKAGE_PREFIX}-python3-mock")
+depends=("${MINGW_PACKAGE_PREFIX}-python"
+         "${MINGW_PACKAGE_PREFIX}-python-mako"
+         "${MINGW_PACKAGE_PREFIX}-python-sqlalchemy"
+         "${MINGW_PACKAGE_PREFIX}-python-editor"
+         "${MINGW_PACKAGE_PREFIX}-python-dateutil")
+makedepends=("${MINGW_PACKAGE_PREFIX}-python-setuptools")
+checkdepends=("${MINGW_PACKAGE_PREFIX}-python-pytest"
+              "${MINGW_PACKAGE_PREFIX}-python-mock")
 options=('staticlibs' 'strip' '!debug')
+install=${_realname}3-${CARCH}.install
 source=(https://pypi.org/packages/source/a/alembic/alembic-${pkgver}.tar.gz{,.asc})
-sha512sums=('13e0d3bce34dc54fa1f5ce6a734e89884f76438fbfb14cfe343280803f12424e37052bf3ade911c69170d308b2446bbce7bd92b83696fb02ed9a98231fdb05b2'
+sha512sums=('bbd5f013ef532b3e5d4bcb49990c3416f2c3bec33631fc15d99ee2ddb0d06ca5bf83e7fc3355e93145df4811c2d00fedb034753aea7af5f72ed9c9fd13b98f17'
             'SKIP')
 validpgpkeys=('83AF7ACE251C13E6BB7DEFBD330239C1C4DAFEE1') # Michael Bayer <classic@zzzcomputing.com>
 
 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}"
-
+  cd "${srcdir}/python-build-${CARCH}"
   ${MINGW_PREFIX}/bin/py.test || warning "Test failed"
 }
 
 package() {
-  install=${_realname}3-${CARCH}.install
-
-  cd "${srcdir}/${_realname}-${pkgver}"
+  cd "${srcdir}/python-build-${CARCH}"
 
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
-  ${MINGW_PREFIX}/bin/python3 setup.py install --prefix=${MINGW_PREFIX} \
+  ${MINGW_PREFIX}/bin/python setup.py install --prefix=${MINGW_PREFIX} \
     --root="${pkgdir}" --optimize=1 --skip-build
 
-  install -Dm644 LICENSE "${pkgdir}${MINGW_PREFIX}/share/licenses/python3-${_realname}/LICENSE"
+  install -Dm644 LICENSE "${pkgdir}${MINGW_PREFIX}/share/licenses/python-${_realname}/LICENSE"
 
-# This entire section should be removed if the package does NOT install
-# anything in the /mingw*/bin directory.
-### begin section ###
   local PREFIX_WIN=$(cygpath -wm ${MINGW_PREFIX})
   # fix python command in files
   for _f in "${pkgdir}${MINGW_PREFIX}"/bin/*.py; do
     sed -e "s|/usr/bin/env |${MINGW_PREFIX}|g" \
         -e "s|${PREFIX_WIN}|${MINGW_PREFIX}|g" -i ${_f}
   done
-#### end section ####
 }
diff --git a/mingw-w64-python-argh/PKGBUILD b/mingw-w64-python-argh/PKGBUILD
index d22e8bbf62..f9f80c39a4 100644
--- a/mingw-w64-python-argh/PKGBUILD
+++ b/mingw-w64-python-argh/PKGBUILD
@@ -2,45 +2,48 @@
 
 _realname=argh
 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.26.2
-pkgrel=3
+pkgrel=1
 pkgdesc="An unobtrusive argparse wrapper with natural syntax (mingw-w64)"
 arch=('any')
 url='https://pypi.python.org/pypi/argh'
 license=('LGPL3')
-depends=("${MINGW_PACKAGE_PREFIX}-python3")
-makedepends=("${MINGW_PACKAGE_PREFIX}-python3-setuptools")
-checkdepends=("${MINGW_PACKAGE_PREFIX}-python3-pytest"
-              "${MINGW_PACKAGE_PREFIX}-python3-mock"
-              "${MINGW_PACKAGE_PREFIX}-python3-iocapture")
+depends=("${MINGW_PACKAGE_PREFIX}-python")
+makedepends=("${MINGW_PACKAGE_PREFIX}-python-setuptools")
+checkdepends=("${MINGW_PACKAGE_PREFIX}-python-pytest"
+              "${MINGW_PACKAGE_PREFIX}-python-mock"
+              "${MINGW_PACKAGE_PREFIX}-python-iocapture")
 options=('staticlibs' 'strip' '!debug')
-source=("${_realname}-$pkgver.tar.gz"::"https://github.com/neithere/argh/archive/v$pkgver.tar.gz")
+source=("${_realname}-${pkgver}.tar.gz"::"https://github.com/neithere/argh/archive/v${pkgver}.tar.gz")
 sha256sums=('SKIP')
 
 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}"
-
+  cd "${srcdir}/python-build-${CARCH}"
   ${MINGW_PREFIX}/bin/py.test || warning "Tests failed"
 }
 
 package() {
-  cd "${srcdir}/${_realname}-${pkgver}"
+  cd "${srcdir}/python-build-${CARCH}"
 
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
-  ${MINGW_PREFIX}/bin/python3 setup.py install --prefix=${MINGW_PREFIX} \
+  ${MINGW_PREFIX}/bin/python setup.py install --prefix=${MINGW_PREFIX} \
     --root="${pkgdir}" --optimize=1 --skip-build
 }
diff --git a/mingw-w64-python-argon2_cffi/PKGBUILD b/mingw-w64-python-argon2_cffi/PKGBUILD
index 0546c72943..88ab1b4528 100644
--- a/mingw-w64-python-argon2_cffi/PKGBUILD
+++ b/mingw-w64-python-argon2_cffi/PKGBUILD
@@ -2,26 +2,29 @@
 
 _realname=argon2_cffi
 pkgbase=mingw-w64-python-${_realname}
-pkgname=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
-pkgver=19.1.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=19.2.0
 _argom2_relname=argon2
-_argon2_pkgver=20171227
+_argon2_pkgver=20190702
 pkgrel=2
 pkgdesc="CFFI-based Argon2 Bindings for Python (mingw-w64)"
 arch=('any')
 url='https://github.com/hynek/argon2_cffi'
 license=('MIT')
-depends=("${MINGW_PACKAGE_PREFIX}-python3"
-         "${MINGW_PACKAGE_PREFIX}-python3-cffi"
-         "${MINGW_PACKAGE_PREFIX}-python3-setuptools"
-         "${MINGW_PACKAGE_PREFIX}-python3-six")
+depends=("${MINGW_PACKAGE_PREFIX}-python"
+         "${MINGW_PACKAGE_PREFIX}-python-cffi"
+         "${MINGW_PACKAGE_PREFIX}-python-setuptools"
+         "${MINGW_PACKAGE_PREFIX}-python-six")
 options=('staticlibs' 'strip' '!debug')
 source=("${_realname}-${pkgver}.tar.gz"::"https://github.com/hynek/argon2_cffi/archive/${pkgver}.tar.gz"
-        "${_argom2_relname}-${_argon2_pkgver}.tar.gz"::"https://github.com/P-H-C/phc-winner-argon2/archive/${_argon2_pkgver}/${_argon2_pkgver}-${argon2_pkgver}.tar.gz"
+        "${_argom2_relname}-${_argon2_pkgver}.tar.gz"::"https://github.com/P-H-C/phc-winner-argon2/archive/${_argon2_pkgver}.tar.gz"
         mingw-fixes.patch
         002-mingw-fix-src.patch)
-sha256sums=('b2bccb3433469625d6551a2a1f8203db8e6ffdb0a0bc9ac6621b600b3e34b056'
-            'eaea0172c1f4ee4550d1b6c9ce01aab8d1ab66b4207776aa67991eb5872fdcd8'
+sha256sums=('b7ad06a32aba8e795830c0248f8e6c464b7f3037442322937552a5e8b6013b7a'
+            'daf972a89577f8772602bf2eb38b6a3dd3d922bf5724d45e7f9589b5e830442c'
             '5e06a2af6e3da607419b1e1897847f154794d6319683ce190d34d7af7f1be480'
             '5f0566bb2a1d9a039f667cc35bc0afa803e65863c01765a37c574165f1d8eac1')
 
@@ -50,35 +53,35 @@ prepare() {
   pushd "$srcdir/phc-winner-${_argom2_relname}-${_argon2_pkgver}"
     apply_patch_with_msg 002-mingw-fix-src.patch
   popd
-  pushd "$srcdir/${_realname}-${pkgver}"
-    cp -r $srcdir/phc-winner-${_argom2_relname}-${_argon2_pkgver}/* extras/libargon2/  
+  pushd "${srcdir}/argon2-cffi-${pkgver}"
+    cp -r ${srcdir}/phc-winner-${_argom2_relname}-${_argon2_pkgver}/* extras/libargon2/
     apply_patch_with_msg mingw-fixes.patch
   popd
 
-  rm -rf python3-build-${CARCH} | true
-  cp -r "${_realname}-${pkgver}" "python3-build-${CARCH}"
+  rm -rf python-build-${CARCH} | true
+  cp -r "argon2-cffi-${pkgver}" "python-build-${CARCH}"
 
   # Set version for setuptools_scm
   export SETUPTOOLS_SCM_PRETEND_VERSION=${pkgver}
 }
 
 build() {
-  msg "Python 3 build for ${CARCH}"  
-  cd "${srcdir}/python3-build-${CARCH}"
-  ${MINGW_PREFIX}/bin/python3 setup.py build
+  msg "Python build for ${CARCH}"  
+  cd "${srcdir}/python-build-${CARCH}"
+  ${MINGW_PREFIX}/bin/python setup.py build
 }
 
 check() {
-  msg "Python 3 test for ${CARCH}"
-  cd "${srcdir}/python3-build-${CARCH}"
-  ${MINGW_PREFIX}/bin/python3 setup.py pytest
+  msg "Python test for ${CARCH}"
+  cd "${srcdir}/python-build-${CARCH}"
+  ${MINGW_PREFIX}/bin/python setup.py pytest
 }
 
 package() {
-  cd "${srcdir}/python3-build-${CARCH}"
+  cd "${srcdir}/python-build-${CARCH}"
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
-  ${MINGW_PREFIX}/bin/python3 setup.py install --prefix=${MINGW_PREFIX} \
+  ${MINGW_PREFIX}/bin/python setup.py install --prefix=${MINGW_PREFIX} \
     --root="${pkgdir}" --optimize=1 --skip-build
 
-  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-astroid/PKGBUILD b/mingw-w64-python-astroid/PKGBUILD
index 20ab807a0d..3a0214b350 100644
--- a/mingw-w64-python-astroid/PKGBUILD
+++ b/mingw-w64-python-astroid/PKGBUILD
@@ -1,51 +1,53 @@
 # Maintainer: J. Peter Mugaas <jpmugaas@suddenlink.net>
 
 _realname=astroid
-pkgbase=mingw-w64-python3-${_realname}
-pkgname=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
-pkgver=2.3.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=2.3.3
 pkgrel=1
 pkgdesc="Useful miscellaneous modules used by Logilab projects (mingw-w64)"
 arch=('any')
 url="https://github.com/PyCQA/astroid"
 license=('LGPL')
-depends=("${MINGW_PACKAGE_PREFIX}-python3-six"
-         "${MINGW_PACKAGE_PREFIX}-python3-lazy-object-proxy"
-         "${MINGW_PACKAGE_PREFIX}-python3-wrapt"
-         "${MINGW_PACKAGE_PREFIX}-python3-typed_ast")
-makedepends=("${MINGW_PACKAGE_PREFIX}-python3-setuptools")
-checkdepends=("${MINGW_PACKAGE_PREFIX}-python3-dateutil"
-              "${MINGW_PACKAGE_PREFIX}-python3-pytest"
-              "${MINGW_PACKAGE_PREFIX}-python3-numpy"
-              "${MINGW_PACKAGE_PREFIX}-python3-nose"
-              "${MINGW_PACKAGE_PREFIX}-python3-pytest-runner")
+depends=("${MINGW_PACKAGE_PREFIX}-python-six"
+         "${MINGW_PACKAGE_PREFIX}-python-lazy-object-proxy"
+         "${MINGW_PACKAGE_PREFIX}-python-wrapt"
+         "${MINGW_PACKAGE_PREFIX}-python-typed_ast")
+makedepends=("${MINGW_PACKAGE_PREFIX}-python-setuptools")
+checkdepends=("${MINGW_PACKAGE_PREFIX}-python-dateutil"
+              "${MINGW_PACKAGE_PREFIX}-python-pytest"
+              "${MINGW_PACKAGE_PREFIX}-python-numpy"
+              "${MINGW_PACKAGE_PREFIX}-python-nose"
+              "${MINGW_PACKAGE_PREFIX}-python-pytest-runner")
 source=(https://github.com/PyCQA/astroid/archive/astroid-${pkgver}.tar.gz)
-sha512sums=('73ed8213f25a76aa60703320aaf290db33ac005e0ded26fe50c7f36bd934f98c3a58e928becc4e601d3879c19a0f0f16bf20764e3a24e227e0fb64179e468732')
+sha512sums=('cdca9eb7be5619a9bb9bda88c2519bb2708f37ebe51eb4a89966369b722a8fafc18ba860ae565c39ff6afa2dfd2a20395b2f0b762932073c37b249570f86abe5')
 
 prepare() {
   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}"
   # 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}"
+  msg "Python test for ${CARCH}"
+  cd "${srcdir}/python-build-${CARCH}"
   ${MINGW_PREFIX}/bin/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
-
 }
diff --git a/mingw-w64-python-backcall/PKGBUILD b/mingw-w64-python-backcall/PKGBUILD
index 95a63999cc..b0fb98f2fe 100644
--- a/mingw-w64-python-backcall/PKGBUILD
+++ b/mingw-w64-python-backcall/PKGBUILD
@@ -2,35 +2,41 @@
 
 _realname=backcall
 pkgbase=mingw-w64-python-${_realname}
-pkgname=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+pkgname=("${MINGW_PACKAGE_PREFIX}-python-${_realname}")
+provides=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+conflicts=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+replaces=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
 pkgver=0.1.0
-pkgrel=4
+pkgrel=1
 pkgdesc="Backwards compatible callback APIs (mingw-w64)"
 arch=('any')
 url='https://github.com/takluyver/backcall'
 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="84/71/c8ca4f5bb1e08401b916c68003acf0a0655df935d74d93bf3f3364b310e0"
 source=("${_realname}-${pkgver}.tar.gz::https://files.pythonhosted.org/packages/${_dtoken}/${_realname}-${pkgver}.tar.gz")
 sha256sums=('38ecd85be2c1e78f77fd91700c76e14667dc21e2713b63876c0eb901196e01e4')
 
-build() {
-  cd "${srcdir}/${_realname}-${pkgver}"
+prepare() {
+  cd "${srcdir}"
+  rm -rf python-build-${CARCH} | true
+  cp -r "${_realname}-${pkgver}" "python-build-${CARCH}"
+}
 
-  ${MINGW_PREFIX}/bin/python3 setup.py build
+build() {
+  cd "${srcdir}/python-build-${CARCH}"
+  ${MINGW_PREFIX}/bin/python setup.py build
 }
 
 check() {
-  cd "${srcdir}/${_realname}-${pkgver}"
-
-  ${MINGW_PREFIX}/bin/python3 setup.py check
+  cd "${srcdir}/python-build-${CARCH}"
+  ${MINGW_PREFIX}/bin/python setup.py check
 }
 
 package() {
-  cd "${srcdir}/${_realname}-${pkgver}"
-
+  cd "${srcdir}/python-build-${CARCH}"
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
-  ${MINGW_PREFIX}/bin/python3 setup.py install --prefix=${MINGW_PREFIX} \
+  ${MINGW_PREFIX}/bin/python setup.py install --prefix=${MINGW_PREFIX} \
     --root="${pkgdir}" --optimize=1 --skip-build
 }
diff --git a/mingw-w64-python-beaker/PKGBUILD b/mingw-w64-python-beaker/PKGBUILD
index 66f7052070..dd61366829 100644
--- a/mingw-w64-python-beaker/PKGBUILD
+++ b/mingw-w64-python-beaker/PKGBUILD
@@ -3,15 +3,18 @@
 
 _realname=beaker
 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.11.0
-pkgrel=2
+pkgrel=1
 pkgdesc="Caching and sessions WSGI middleware for use with web applications and stand-alone Python scripts and applications (mingw-w64)"
 arch=('any')
 license=('custom')
 url="https://beaker.readthedocs.org/"
-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/bbangert/beaker/archive/${pkgver}.tar.gz)
 sha256sums=('5298f2d3be7b3ad8f299c9cc69b57907613412f397feb8c322896dbc857f5218')
 
diff --git a/mingw-w64-python-binwalk/PKGBUILD b/mingw-w64-python-binwalk/PKGBUILD
index c931866365..92d25a3d16 100644
--- a/mingw-w64-python-binwalk/PKGBUILD
+++ b/mingw-w64-python-binwalk/PKGBUILD
@@ -2,7 +2,10 @@
 
 _realname=binwalk
 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.0
 pkgrel=1
 pkgdesc="A tool for searching a given binary image for embedded files (mingw-w64)"
@@ -11,22 +14,30 @@ url="https://github.com/ReFirmLabs/binwalk/"
 license=('MIT')
 depends=("${MINGW_PACKAGE_PREFIX}-bzip2"
          "${MINGW_PACKAGE_PREFIX}-libsystre"
+         "${MINGW_PACKAGE_PREFIX}-python"
          "${MINGW_PACKAGE_PREFIX}-xz"
          "${MINGW_PACKAGE_PREFIX}-zlib")
 source=(${_realname}-${pkgver}.tar.gz::https://github.com/ReFirmLabs/${_realname}/archive/v${pkgver}.tar.gz)
 sha256sums=('f5495f0e4c5575023d593f7c087c367675df6aeb7f4d9a2966e49763924daa27')
 
+prepare() {
+  cd "${srcdir}"
+  rm -rf "python-build-${CARCH}" | true
+  cp -r "${_realname}-${pkgver}" "python-build-${CARCH}"
+}
+
 build() {
-  cd "${srcdir}/${_realname}-${pkgver}"
+  cd "${srcdir}/python-build-${CARCH}"
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=;--install-purelib=;--install-data=" \
-  ${MINGW_PREFIX}/bin/python3 setup.py build
+  ${MINGW_PREFIX}/bin/python setup.py build
 }
 
 package() {
-  cd "${srcdir}/${_realname}-${pkgver}"
+  cd "${srcdir}/python-build-${CARCH}"
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=;--install-purelib=;--install-data=" \
-  ${MINGW_PREFIX}/bin/python3 setup.py install --prefix=${MINGW_PREFIX#\/} --root="${pkgdir}" --optimize=1 --skip-build
-  install -m 644 -D "${srcdir}/${_realname}-${pkgver}/LICENSE" "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/LICENSE"
+  ${MINGW_PREFIX}/bin/python setup.py install --prefix=${MINGW_PREFIX#\/} --root="${pkgdir}" --optimize=1 --skip-build
+
+  install -m 644 -D "LICENSE" "${pkgdir}${MINGW_PREFIX}/share/licenses/python-${_realname}/LICENSE"
 
   local PREFIX_WIN=$(cygpath -wm ${MINGW_PREFIX})
   # fix python command in files
diff --git a/mingw-w64-python-biopython/PKGBUILD b/mingw-w64-python-biopython/PKGBUILD
index 1d1d5ef893..0f021075b4 100644
--- a/mingw-w64-python-biopython/PKGBUILD
+++ b/mingw-w64-python-biopython/PKGBUILD
@@ -2,30 +2,38 @@
 
 _realname=biopython
 pkgbase=mingw-w64-python-${_realname}
-pkgname=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
-pkgver=1.74
-pkgrel=3
+pkgname=("${MINGW_PACKAGE_PREFIX}-python-${_realname}")
+provides=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+conflicts=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+replaces=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+pkgver=1.76
+pkgrel=1
 pkgdesc="A set of freely available tools for biological computation written in Python (mingw-w64)"
 arch=('any')
 license=('Biopython')
 url="https://biopython.org/"
-depends=("${MINGW_PACKAGE_PREFIX}-python3"
-         "${MINGW_PACKAGE_PREFIX}-python3-numpy")
-makedepends=("${MINGW_PACKAGE_PREFIX}-python3-setuptools")
+depends=("${MINGW_PACKAGE_PREFIX}-python"
+         "${MINGW_PACKAGE_PREFIX}-python-numpy")
+makedepends=("${MINGW_PACKAGE_PREFIX}-python-setuptools")
 source=(${_realname}-${pkgver}.tar.gz::https://biopython.org/DIST/${_realname}-${pkgver}.tar.gz)
-sha256sums=('25152c1be2c9205bf80901fc49adf2c2efff49f0dddbcf6e6b2ce31dfa6590c0')
+sha256sums=('3873cb98dad5e28d5e3f2215a012565345a398d3d2c4eebf7cd701757b828c72')
+
+prepare() {
+  cd "${srcdir}"
+  rm -rf "python-build-${CARCH}" | true
+  cp -r "${_realname}-${pkgver}" "python-build-${CARCH}"
+}
 
 build() {
-  cd "${srcdir}/${_realname}-${pkgver}"
-
-  ${MINGW_PREFIX}/bin/python3 setup.py build
+  cd "${srcdir}/python-build-${CARCH}"
+  ${MINGW_PREFIX}/bin/python setup.py build
 }
 
 package() {
-  cd "${srcdir}/${_realname}-${pkgver}"
+  cd "${srcdir}/python-build-${CARCH}"
 
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
-    ${MINGW_PREFIX}/bin/python3 setup.py install --prefix=${MINGW_PREFIX} --root="${pkgdir}" -O1
+    ${MINGW_PREFIX}/bin/python setup.py install --prefix=${MINGW_PREFIX} --root="${pkgdir}" -O1 --skip-build
 
-  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-bleach/PKGBUILD b/mingw-w64-python-bleach/PKGBUILD
index 66b46b4e8a..ac39f55acf 100644
--- a/mingw-w64-python-bleach/PKGBUILD
+++ b/mingw-w64-python-bleach/PKGBUILD
@@ -2,28 +2,35 @@
 
 _realname=bleach
 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.0
-pkgrel=3
+pkgrel=1
 pkgdesc="An easy whitelist-based HTML-sanitizing tool (mingw-w64)"
 url="https://pypi.python.org/pypi/bleach"
 arch=('any')
 license=('Apache')
-depends=("${MINGW_PACKAGE_PREFIX}-python3"
-         "${MINGW_PACKAGE_PREFIX}-python3-html5lib")
-makedepends=("${MINGW_PACKAGE_PREFIX}-python3-setuptools")
-source=(${_realname}-${pkgver}.tar.gz::https://pypi.org/packages/source/b/${_realname}/${_realname}-$pkgver.tar.gz)
+depends=("${MINGW_PACKAGE_PREFIX}-python"
+         "${MINGW_PACKAGE_PREFIX}-python-html5lib")
+makedepends=("${MINGW_PACKAGE_PREFIX}-python-setuptools")
+source=(${_realname}-${pkgver}.tar.gz::https://pypi.org/packages/source/b/${_realname}/${_realname}-${pkgver}.tar.gz)
 sha256sums=('3fdf7f77adcf649c9911387df51254b813185e32b2c6619f690b593a617e19fa')
 
-build() {
-  cd "${srcdir}/${_realname}-${pkgver}"
+prepare() {
+  rm -rf python-build-${CARCH} | true
+  cp -r "${_realname}-${pkgver}" "python-build-${CARCH}"
+}
 
-  ${MINGW_PREFIX}/bin/python3 setup.py build
+build() {
+  cd "${srcdir}/python-build-${CARCH}"
+  ${MINGW_PREFIX}/bin/python setup.py build
 }
 
 package() {
-  cd "${srcdir}/${_realname}-${pkgver}"
+  cd "${srcdir}/python-build-${CARCH}"
 
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
-  ${MINGW_PREFIX}/bin/python3 setup.py install --root=${pkgdir} --prefix=${MINGW_PREFIX} --optimize=1
+  ${MINGW_PREFIX}/bin/python setup.py install --root=${pkgdir} --prefix=${MINGW_PREFIX} --optimize=1 --skip-build
 }
diff --git a/mingw-w64-python-breathe/PKGBUILD b/mingw-w64-python-breathe/PKGBUILD
index 7b0dff4351..79936f9bff 100644
--- a/mingw-w64-python-breathe/PKGBUILD
+++ b/mingw-w64-python-breathe/PKGBUILD
@@ -2,34 +2,40 @@
 
 _realname=breathe
 pkgbase=mingw-w64-python-${_realname}
-pkgname=( "${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
-pkgver=4.13.1
+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.14.0
 pkgrel=1
 pkgdesc="An extension to reStructuredText and Sphinx to be able to read and render Doxygen xml output (mingw-w64)"
 arch=('any')
 url="https://breathe.readthedocs.org/en/latest/"
 license=('BSD')
-depends=("${MINGW_PACKAGE_PREFIX}-python3"
-         "${MINGW_PACKAGE_PREFIX}-python3-sphinx")
-makedepends=("${MINGW_PACKAGE_PREFIX}-python3-setuptools"
-             "${MINGW_PACKAGE_PREFIX}-python3-six")
+depends=("${MINGW_PACKAGE_PREFIX}-python"
+         "${MINGW_PACKAGE_PREFIX}-python-sphinx")
+makedepends=("${MINGW_PACKAGE_PREFIX}-python-setuptools"
+             "${MINGW_PACKAGE_PREFIX}-python-six")
 options=('staticlibs' 'strip' '!debug')
 source=("${_realname}-${pkgver}.tar.gz"::"https://github.com/michaeljones/breathe/archive/v${pkgver}.tar.gz")
-sha256sums=('deab023f02fe63cd779d7065762de99c79f475c5c58cf16bccc2562e8f710239')
+sha256sums=('67d70bd58f5eca074fed0335f238edea0e164d069fc21abd25bfea11a03d40a0')
+
+prepare() {
+  cd "${srcdir}"
+  rm -rf "python-build-${CARCH}" | true
+  cp -r "${_realname}-${pkgver}" "python-build-${CARCH}"
+}
 
 build() {
-  rm -rf "python3-build-${CARCH}" | true
-  cp -r "${_realname}-${pkgver}" "python3-build-${CARCH}"
-
-  msg "Python ${pver} build for ${CARCH}"  
-  cd "${srcdir}/python3-build-${CARCH}"
-  ${MINGW_PREFIX}/bin/python${pver} 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
 
   local PREFIX_WIN=$(cygpath -wm ${MINGW_PREFIX})
diff --git a/mingw-w64-python-bsddb3/PKGBUILD b/mingw-w64-python-bsddb3/PKGBUILD
index b9b394449f..7a74904401 100644
--- a/mingw-w64-python-bsddb3/PKGBUILD
+++ b/mingw-w64-python-bsddb3/PKGBUILD
@@ -2,14 +2,17 @@
 
 _realname=bsddb3
 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.2.6
-pkgrel=3
+pkgrel=1
 pkgdesc="Python bindings for Oracle Berkeley DB (mingw-w64)"
 arch=('any')
 license=('BSD')
 url="https://www.jcea.es/programacion/pybsddb.htm"
-depends=("${MINGW_PACKAGE_PREFIX}-python3"
+depends=("${MINGW_PACKAGE_PREFIX}-python"
          "${MINGW_PACKAGE_PREFIX}-db")
 makedepends=("${MINGW_PACKAGE_PREFIX}-python3-setuptools")
 options=('staticlibs' 'strip' '!debug')
@@ -25,10 +28,14 @@ prepare() {
 
   sed -i -e "s|if os.name == 'posix':|if os.name == 'nt':|g" setup{2,3}.py
   sed -i -e "s|elif os.name == 'nt':|elif os.name == 'FOO':|g" setup{2,3}.py
+
+  cd "${srcdir}"
+  rm -rf "python-build-${CARCH}" | true
+  cp -r "${_realname}-${pkgver}" "python-build-${CARCH}"
 }
 
 build() {
-  cd "${srcdir}/${_realname}-${pkgver}"
+  cd "${srcdir}/python-build-${CARCH}"
 
   CFLAGS+=" -DUNICODE -D_UNICODE"
 
@@ -36,12 +43,12 @@ build() {
   export BERKELEYDB_DIR="${MINGW_PREFIX}"
 
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=;--install-purelib=;--install-data=" \
-  ${MINGW_PREFIX}/bin/python3 setup.py build
+  ${MINGW_PREFIX}/bin/python setup.py build
 }
 
 package() {
-  cd "${srcdir}/${_realname}-${pkgver}"
+  cd "${srcdir}/python-build-${CARCH}"
 
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=;--install-purelib=;--install-data=" \
-  ${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
 }
diff --git a/mingw-w64-python-characteristic/PKGBUILD b/mingw-w64-python-characteristic/PKGBUILD
index d7a17fce6e..815a94d968 100644
--- a/mingw-w64-python-characteristic/PKGBUILD
+++ b/mingw-w64-python-characteristic/PKGBUILD
@@ -2,29 +2,37 @@
 
 _realname=characteristic
 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=14.3.0
-pkgrel=5
+pkgrel=1
 pkgdesc='Python attributes without boilerplate (mingw-w64)'
 url='https://characteristic.readthedocs.io/'
 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.python.org/packages/source/c/${_realname}/${_realname}-${pkgver}.tar.gz")
 sha256sums=('ded68d4e424115ed44e5c83c2a901a0b6157a959079d7591d92106ffd3ada380')
 
-build() {
-  cd "${srcdir}/${_realname}-${pkgver}"
+prepare() {
+  cd "${srcdir}"
+  rm -rf "python-build-${CARCH}" | true
+  cp -r "${_realname}-${pkgver}" "python-build-${CARCH}"
+}
 
-  ${MINGW_PREFIX}/bin/python3 setup.py build
+build() {
+  cd "${srcdir}/python-build-${CARCH}"
+  ${MINGW_PREFIX}/bin/python setup.py build
 }
 
 package() {
-  cd "${srcdir}/${_realname}-${pkgver}"
+  cd "${srcdir}/python-build-${CARCH}"
 
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
-  ${MINGW_PREFIX}/bin/python3 setup.py install --prefix=${MINGW_PREFIX} --root="${pkgdir}"
+  ${MINGW_PREFIX}/bin/python setup.py install --prefix=${MINGW_PREFIX} --root="${pkgdir}" --skip-build
 
-  install -Dm644 "${srcdir}/${_realname}-${pkgver}/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-cliff/PKGBUILD b/mingw-w64-python-cliff/PKGBUILD
index c986fb4f86..e427cf5914 100644
--- a/mingw-w64-python-cliff/PKGBUILD
+++ b/mingw-w64-python-cliff/PKGBUILD
@@ -2,30 +2,33 @@
 
 _realname=cliff
 pkgbase=mingw-w64-python-${_realname}
-pkgname=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
-pkgver=2.16.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=2.17.0
+pkgrel=1
 pkgdesc="Command Line Interface Formulation Framewor (mingw-w64)"
 arch=('any')
 url='https://docs.openstack.org/cliff/latest/'
 license=('Apache')
-depends=("${MINGW_PACKAGE_PREFIX}-python3-six"
-         "${MINGW_PACKAGE_PREFIX}-python3-pbr"
-         "${MINGW_PACKAGE_PREFIX}-python3-cmd2"
-         "${MINGW_PACKAGE_PREFIX}-python3-prettytable"
-         "${MINGW_PACKAGE_PREFIX}-python3-pyparsing"
-         "${MINGW_PACKAGE_PREFIX}-python3-stevedore"
-         "${MINGW_PACKAGE_PREFIX}-python3-yaml")
+depends=("${MINGW_PACKAGE_PREFIX}-python-six"
+         "${MINGW_PACKAGE_PREFIX}-python-pbr"
+         "${MINGW_PACKAGE_PREFIX}-python-cmd2"
+         "${MINGW_PACKAGE_PREFIX}-python-prettytable"
+         "${MINGW_PACKAGE_PREFIX}-python-pyparsing"
+         "${MINGW_PACKAGE_PREFIX}-python-stevedore"
+         "${MINGW_PACKAGE_PREFIX}-python-yaml")
 makedepends=('git'
-             "${MINGW_PACKAGE_PREFIX}-python3-setuptools")
-#checkdepends=("${MINGW_PACKAGE_PREFIX}-python3-testrepository"
-#              "${MINGW_PACKAGE_PREFIX}-python3-mock"
-#              "${MINGW_PACKAGE_PREFIX}-python3-sphinx"
-#              "${MINGW_PACKAGE_PREFIX}-python3-oslosphinx"
-#              "${MINGW_PACKAGE_PREFIX}-python3-testscenarios")
+             "${MINGW_PACKAGE_PREFIX}-python-setuptools")
+#checkdepends=("${MINGW_PACKAGE_PREFIX}-python-testrepository"
+#              "${MINGW_PACKAGE_PREFIX}-python-mock"
+#              "${MINGW_PACKAGE_PREFIX}-python-sphinx"
+#              "${MINGW_PACKAGE_PREFIX}-python-oslosphinx"
+#              "${MINGW_PACKAGE_PREFIX}-python-testscenarios")
 options=('staticlibs' 'strip' '!debug')
 source=("${_realname}-${pkgver}.tar.gz::https://github.com/openstack/cliff/archive/${pkgver}.tar.gz")
-sha512sums=('4d789c683bd23a624beb0cbcb2cae2a31858b7da3625b5c15d274a25195d27f41ea0dc949e00dc381457d6a31ba5221160c23e347767edfd0babb4bd41c373f6')
+sha512sums=('4abe0b486e2575167d5ab00e435a897e7fa32e07578e5cbe2b1d1e412a24cbc79975dbae0096820f004840e74a701e1c80761ad24ec1e92d1faab057d14f9d28')
 
 # Helper macros to help make tasks easier #
 apply_patch_with_msg() {
@@ -53,36 +56,32 @@ 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 PBR_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}"
 #  PYTHON=${MINGW_PREFIX}/bin/python3 \
-#     ${MINGW_PREFIX}/bin/python3 setup.py testr
+#     ${MINGW_PREFIX}/bin/python setup.py testr
 #}
 
 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-cmd2/PKGBUILD b/mingw-w64-python-cmd2/PKGBUILD
index 72ee9dda89..884b9e1a61 100644
--- a/mingw-w64-python-cmd2/PKGBUILD
+++ b/mingw-w64-python-cmd2/PKGBUILD
@@ -1,31 +1,31 @@
 # Maintainer: J. Peter Mugaas <jpmugaas@suddenlink.net>
 
-#Python 2 support was discontinued in this series
-
 _realname=cmd2
 pkgbase=mingw-w64-python-${_realname}
-pkgname="${MINGW_PACKAGE_PREFIX}-python3-${_realname}"
-pkgver=0.9.19
+pkgname=("${MINGW_PACKAGE_PREFIX}-python-${_realname}")
+provides=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+conflicts=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+replaces=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+pkgver=0.9.22
 pkgrel=1
 pkgdesc="Extra features for standard library's cmd module (mingw-w64)"
 arch=('any')
 url='https://github.com/python-cmd2/cmd2'
 license=('MIT')
-depends=("${MINGW_PACKAGE_PREFIX}-python3-attrs"
-             "${MINGW_PACKAGE_PREFIX}-python3-pyparsing" 
-             "${MINGW_PACKAGE_PREFIX}-python3-pyperclip" 
-             "${MINGW_PACKAGE_PREFIX}-python3-pyreadline"
-             "${MINGW_PACKAGE_PREFIX}-python3-colorama" 
-             "${MINGW_PACKAGE_PREFIX}-python3-wcwidth")
-makedepends=("${MINGW_PACKAGE_PREFIX}-python3-setuptools"
-             "${MINGW_PACKAGE_PREFIX}-python3-setuptools-scm") 
-checkdepends=("${MINGW_PACKAGE_PREFIX}-python3-pytest-runner"
-              "${MINGW_PACKAGE_PREFIX}-python3-pytest-xdist"
-              "${MINGW_PACKAGE_PREFIX}-python3-mock")
-# 'vi')
+depends=("${MINGW_PACKAGE_PREFIX}-python-attrs"
+             "${MINGW_PACKAGE_PREFIX}-python-pyparsing"
+             "${MINGW_PACKAGE_PREFIX}-python-pyperclip"
+             "${MINGW_PACKAGE_PREFIX}-python-pyreadline"
+             "${MINGW_PACKAGE_PREFIX}-python-colorama"
+             "${MINGW_PACKAGE_PREFIX}-python-wcwidth")
+makedepends=("${MINGW_PACKAGE_PREFIX}-python-setuptools"
+             "${MINGW_PACKAGE_PREFIX}-python-setuptools-scm")
+checkdepends=("${MINGW_PACKAGE_PREFIX}-python-pytest-runner"
+              "${MINGW_PACKAGE_PREFIX}-python-pytest-xdist"
+              "${MINGW_PACKAGE_PREFIX}-python-mock")
 options=('staticlibs' 'strip' '!debug')
 source=("${_realname}-${pkgver}.tar.gz::https://github.com/python-cmd2/cmd2/archive/${pkgver}.tar.gz")
-sha512sums=('fdde91087684f5e807edecc18c724033acf4da861c1b3c80b69ee648e3f9eba31e0db1d5989566f297e82d6eb674171885cf33431444e449d59e143e276afae5')
+sha512sums=('22835daa565b52683010fe8d5e8cce7c5edeef51ff876b3f737dabe0d271af2c355eef57f078331dccb50fd8c46675cc6eba51d29e284dc869db0f89f72a4f9b')
 
 # Helper macros to help make tasks easier #
 apply_patch_with_msg() {
@@ -48,35 +48,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
-  export PBR_VERSION=$pkgver
+  export SETUPTOOLS_SCM_PRETEND_VERSION=${pkgver}
+  export PBR_VERSION=${pkgver}
 }
 
-# Note that build() is sometimes skipped because it's done in 
-# the packages setup.py install for simplicity if you can do so.
-# but sometimes, you want to do a check before install which would
-# also trigger the build.
 build() {
-    msg "Python 3 build for ${CARCH}"  
-    cd "${srcdir}/python3-build-${CARCH}"
-    ${MINGW_PREFIX}/bin/python3 setup.py build
+  msg "Python build for ${CARCH}"  
+  cd "${srcdir}/python-build-${CARCH}"
+  ${MINGW_PREFIX}/bin/python setup.py build
 }
 
 check() {
-  msg "Python 3 test for ${CARCH}"
-  cd "${srcdir}/python3-build-${CARCH}"
-  ${MINGW_PREFIX}/bin/python3 setup.py pytest || true
+  msg "Python test for ${CARCH}"
+  cd "${srcdir}/python-build-${CARCH}"
+  ${MINGW_PREFIX}/bin/python setup.py pytest || 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-cx_Freeze/PKGBUILD b/mingw-w64-python-cx_Freeze/PKGBUILD
index 469f6f6163..7bdc34881c 100644
--- a/mingw-w64-python-cx_Freeze/PKGBUILD
+++ b/mingw-w64-python-cx_Freeze/PKGBUILD
@@ -4,37 +4,40 @@
 
 _realname=cx_Freeze
 pkgbase=mingw-w64-python-${_realname}
-pkgname=("${MINGW_PACKAGE_PREFIX}-python3-cx_Freeze")
+pkgname=("${MINGW_PACKAGE_PREFIX}-python-cx_Freeze")
+provides=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+conflicts=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+replaces=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
 pkgver=6.0
 pkgrel=1
 pkgdesc="Python package for freezing scripts into executables (mingw-w64)"
 arch=('any')
 license=('PSF')
 url="https://cx-freeze.sourceforge.io/"
-depends=("${MINGW_PACKAGE_PREFIX}-python3"
-         "${MINGW_PACKAGE_PREFIX}-python3-six")
-makedepends=("${MINGW_PACKAGE_PREFIX}-python3-setuptools")
+depends=("${MINGW_PACKAGE_PREFIX}-python"
+         "${MINGW_PACKAGE_PREFIX}-python-six")
+makedepends=("${MINGW_PACKAGE_PREFIX}-python-setuptools")
 options=('staticlibs' 'strip' '!debug')
 source=(cx_Freeze-${pkgver}.tar.gz::https://github.com/anthony-tuininga/cx_Freeze/archive/${pkgver}.tar.gz)
 sha256sums=('35185441a388032dc3ecc59e697a16ae00929316d0043aed846dd2e434222580')
 
 prepare() {
-  rm -Rf python3-cx_Freeze-${pkgver}-${CARCH}
-  cp -a cx_Freeze-${pkgver} python3-cx_Freeze-${pkgver}-${CARCH}
+  rm -Rf python-cx_Freeze-${CARCH}
+  cp -a cx_Freeze-${pkgver} python-cx_Freeze-${CARCH}
 }
 
 build() {
-  echo "Building for Python 3"
-  cd python3-cx_Freeze-${pkgver}-${CARCH}
-  ${MINGW_PREFIX}/bin/python3 setup.py build
+  echo "Building for Python"
+  cd python-cx_Freeze-${CARCH}
+  ${MINGW_PREFIX}/bin/python setup.py build
 }
 
 package() {
   local _mingw_prefix=$(cygpath -am ${MINGW_PREFIX})
-  cd python3-cx_Freeze-${pkgver}-${CARCH}
+  cd python-cx_Freeze-${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
   pushd "${pkgdir}${MINGW_PREFIX}"/bin > /dev/null
diff --git a/mingw-w64-python-cycler/PKGBUILD b/mingw-w64-python-cycler/PKGBUILD
index 9b5a7c7d21..f420d12728 100644
--- a/mingw-w64-python-cycler/PKGBUILD
+++ b/mingw-w64-python-cycler/PKGBUILD
@@ -2,37 +2,45 @@
 
 _realname=cycler
 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=5
+pkgrel=1
 pkgdesc="Composable style cycles"
 arch=('any')
 license=('BSD')
 url="https://github.com/matplotlib/cycler"
-depends=("${MINGW_PACKAGE_PREFIX}-python3"
-         "${MINGW_PACKAGE_PREFIX}-python3-six")
-makedepends=("${MINGW_PACKAGE_PREFIX}-python3-setuptools")
-checkdepends=("${MINGW_PACKAGE_PREFIX}-python3-nose"
-              "${MINGW_PACKAGE_PREFIX}-python3-coverage")
+depends=("${MINGW_PACKAGE_PREFIX}-python"
+         "${MINGW_PACKAGE_PREFIX}-python-six")
+makedepends=("${MINGW_PACKAGE_PREFIX}-python-setuptools")
+checkdepends=("${MINGW_PACKAGE_PREFIX}-python-nose"
+              "${MINGW_PACKAGE_PREFIX}-python-coverage")
 source=(${_realname}-${pkgver}.tar.gz::"https://github.com/matplotlib/${_realname}/archive/v${pkgver}.tar.gz")
 sha256sums=('b6d217635e03024196225367b1a438996dbbf0271bec488f00584f0e7dc15cfa')
 
-build() {
-  cd "${srcdir}/${_realname}-${pkgver}"
+prepare() {
+  cd "${srcdir}"
+  rm -rf python-build-${CARCH} | true
+  cp -r "${_realname}-${pkgver}" "python-build-${CARCH}"
+}
 
-  ${MINGW_PREFIX}/bin/python3 setup.py build
+build() {
+  cd "${srcdir}/python-build-${CARCH}"
+  ${MINGW_PREFIX}/bin/python setup.py build
 }
 
 check() {
-  cd "${srcdir}/${_realname}-${pkgver}"
-
-  ${MINGW_PREFIX}/bin/python3 run_tests.py
+  cd "${srcdir}/python-build-${CARCH}"
+  ${MINGW_PREFIX}/bin/python run_tests.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 --root="${pkgdir}" --prefix=$MINGW_PREFIX --optimize=1
-  install -D -m644 LICENSE "${pkgdir}/$MINGW_PREFIX/share/licenses/python3-cycler/LICENSE"
+  ${MINGW_PREFIX}/bin/python setup.py install --root="${pkgdir}" --prefix=$MINGW_PREFIX --optimize=1 --skip-build
+
+  install -D -m644 LICENSE "${pkgdir}/$MINGW_PREFIX/share/licenses/python-cycler/LICENSE"
 }
diff --git a/mingw-w64-python-decorator/PKGBUILD b/mingw-w64-python-decorator/PKGBUILD
index 8f4c76af49..820e9f3c02 100644
--- a/mingw-w64-python-decorator/PKGBUILD
+++ b/mingw-w64-python-decorator/PKGBUILD
@@ -2,43 +2,46 @@
 
 _realname=decorator
 pkgbase=mingw-w64-python-${_realname}
-pkgname=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+pkgname=("${MINGW_PACKAGE_PREFIX}-python-${_realname}")
+provides=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+conflicts=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+replaces=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
 pkgver=4.4.1
-pkgrel=2
+pkgrel=1
 pkgdesc="Python Decorator module (mingw-w64)"
 arch=('any')
-url='https://github.com/micheles/decorator'
+url='https://pypi.python.org/pypi/decorator'
 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/micheles/decorator/archive/${pkgver}.tar.gz"
-        https://files.pythonhosted.org/packages/dc/c3/9d378af09f5737cfd524b844cd2fbb0d2263a35c11d712043daab290144d/decorator-${pkgver}.tar.gz)
+        "https://pypi.python.org/packages/source/${_realname:0:1}/${_realname}/${_realname}-${pkgver}.tar.gz")
 sha512sums=('12378702246b212d5fe0153dc97cafdb2afd4779c51fd224385e3c3562e1a1e3439574aa7c37c8521fe5f86a5f0b4d4b3075e0407cc249f8fa4b341e1ebe06e0')
 
 prepare() {
-  cd "${srcdir}/${_realname}-${pkgver}"
+  cd "${srcdir}"
+  rm -rf python-build-${CARCH} | true
+  cp -r "${_realname}-${pkgver}" "python-build-${CARCH}"
 
   # Set version for setuptools_scm
-  export SETUPTOOLS_SCM_PRETEND_VERSION=$pkgver
+  export SETUPTOOLS_SCM_PRETEND_VERSION=${pkgver}
 }
 
 build() {
-  cd "${srcdir}/${_realname}-${pkgver}"
-
-  ${MINGW_PREFIX}/bin/python3 setup.py build
+  cd "${srcdir}/python-build-${CARCH}"
+  ${MINGW_PREFIX}/bin/python setup.py build
 }
 
 check() {
-  cd "${srcdir}/${_realname}-${pkgver}"
-
-  ${MINGW_PREFIX}/bin/python3 setup.py test
+  cd "${srcdir}/python-build-${CARCH}"
+  ${MINGW_PREFIX}/bin/python setup.py test
 }
 
 package() {
-  cd "${srcdir}/${_realname}-${pkgver}"
+  cd "${srcdir}/python-build-${CARCH}"
 
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
-  ${MINGW_PREFIX}/bin/python3 setup.py install --prefix=${MINGW_PREFIX} \
+  ${MINGW_PREFIX}/bin/python setup.py install --prefix=${MINGW_PREFIX} \
     --root="${pkgdir}" --optimize=1 --skip-build
 }
diff --git a/mingw-w64-python-defusexml/PKGBUILD b/mingw-w64-python-defusexml/PKGBUILD
index 5c5f72dabf..1835319f1c 100644
--- a/mingw-w64-python-defusexml/PKGBUILD
+++ b/mingw-w64-python-defusexml/PKGBUILD
@@ -2,44 +2,46 @@
 
 _realname=defusedxml
 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.0
-pkgrel=3
+pkgrel=1
 pkgdesc="XML bomb protection for Python stdlib modules (mingw-w64)"
 arch=('any')
 url='https://bitbucket.org/tiran/defusedxml'
 license=('PSF')
-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/d/defusedxml/${_realname}-$pkgver.tar.gz")
+source=("https://pypi.io/packages/source/d/defusedxml/${_realname}-${pkgver}.tar.gz")
 sha256sums=('f684034d135af4c6cbb949b8a4d2ed61634515257a67299e5f940fbaa34377f5')
 
 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 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 tests.py
+  cd "${srcdir}/python-build-${CARCH}"
+  ${MINGW_PREFIX}/bin/python tests.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 "${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-editor/PKGBUILD b/mingw-w64-python-editor/PKGBUILD
index 0bc04df5fe..208d799b1d 100644
--- a/mingw-w64-python-editor/PKGBUILD
+++ b/mingw-w64-python-editor/PKGBUILD
@@ -5,46 +5,48 @@
 
 _realname=editor
 pkgbase=mingw-w64-python-${_realname}
-pkgname=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+pkgname=("${MINGW_PACKAGE_PREFIX}-python-${_realname}")
+provides=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+conflicts=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+replaces=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
 pkgver=1.0.4
-pkgrel=3
+pkgrel=1
 pkgdesc="Programmatically open an editor, capture the result (mingw-w64)"
 arch=('any')
 url='https://github.com/fmoo/python-editor'
 license=('Apache')
-depends=("${MINGW_PACKAGE_PREFIX}-python3")
-makedepends=("${MINGW_PACKAGE_PREFIX}-python3-setuptools")
+depends=("${MINGW_PACKAGE_PREFIX}-python")
+makedepends=("${MINGW_PACKAGE_PREFIX}-python-setuptools")
 options=('staticlibs' 'strip' '!debug')
 source=(${_realname}-${pkgver}.tar.gz::https://github.com/fmoo/python-editor/archive/${pkgver}.tar.gz)
 sha256sums=('61a4758919668b8ffe5eb389a86a4c2e8c2f789c02b9c6aee0ddf3c4ebfe3fd3')
 
 prepare() {
-  cd "${srcdir}/python-${_realname}-${pkgver}"
+  cd "${srcdir}"
+  rm -rf python-build-${CARCH} | true
+  cp -r "python-${_realname}-${pkgver}" "python-build-${CARCH}"
 
-  sed 's|python|python3|' -i editor.py
   # Set version for setuptools_scm
-  export SETUPTOOLS_SCM_PRETEND_VERSION=$pkgver
+  export SETUPTOOLS_SCM_PRETEND_VERSION=${pkgver}
 }
 
 
 build() {
-  cd "${srcdir}/python-${_realname}-${pkgver}"
-
-  ${MINGW_PREFIX}/bin/python3 setup.py build
+  cd "${srcdir}/python-build-${CARCH}"
+  ${MINGW_PREFIX}/bin/python setup.py build
 }
 
 check() {
-  cd "${srcdir}/python-${_realname}-${pkgver}"
-
-  ${MINGW_PREFIX}/bin/python3 setup.py check
+  cd "${srcdir}/python-build-${CARCH}"
+  ${MINGW_PREFIX}/bin/python setup.py check
 }
 
 package() {
-  cd "${srcdir}/python-${_realname}-${pkgver}"
+  cd "${srcdir}/python-build-${CARCH}"
 
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
-  ${MINGW_PREFIX}/bin/python3 setup.py install --prefix=${MINGW_PREFIX} \
+  ${MINGW_PREFIX}/bin/python setup.py install --prefix=${MINGW_PREFIX} \
     --root="${pkgdir}" --optimize=1 --skip-build
 
-  install -Dm644 README.md "${pkgdir}${MINGW_PREFIX}/share/doc/python3-${_realname}/README.md"
+  install -Dm644 README.md "${pkgdir}${MINGW_PREFIX}/share/doc/python-${_realname}/README.md"
 }
diff --git a/mingw-w64-python-entrypoints/PKGBUILD b/mingw-w64-python-entrypoints/PKGBUILD
index 20cbc1a8f8..d396f59f67 100644
--- a/mingw-w64-python-entrypoints/PKGBUILD
+++ b/mingw-w64-python-entrypoints/PKGBUILD
@@ -2,14 +2,17 @@
 
 _realname=entrypoints
 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
-pkgrel=3
+pkgrel=1
 pkgdesc="Discover and load entry points from installed packages (mingw-w64)"
 url="https://github.com/takluyver/entrypoints"
 arch=('any')
 license=('MIT')
-makedepends=("${MINGW_PACKAGE_PREFIX}-python3-setuptools")
+makedepends=("${MINGW_PACKAGE_PREFIX}-python-setuptools")
 source=(${_realname}-${pkgver}.tar.gz::https://github.com/takluyver/${_realname}/archive/${pkgver}.tar.gz
         ${_realname}-${pkgver}-whl.tar.gz::https://files.pythonhosted.org/packages/py2.py3/e/${_realname}/${_realname}-${pkgver}-py2.py3-none-any.whl)
 sha256sums=('f26eddc371e37d8e9f6663b77524d6731567f005bd1e4ac950c0e33c48fbc065'
@@ -18,7 +21,7 @@ sha256sums=('f26eddc371e37d8e9f6663b77524d6731567f005bd1e4ac950c0e33c48fbc065'
 package() {
   cd "${srcdir}"
 
-  local _py3ver=$(${MINGW_PREFIX}/bin/python3 -c "import sys;sys.stdout.write('.'.join(map(str, sys.version_info[:2])))")
+  local _py3ver=$(${MINGW_PREFIX}/bin/python -c "import sys;sys.stdout.write('.'.join(map(str, sys.version_info[:2])))")
   install -Dm644 entrypoints.py "${pkgdir}${MINGW_PREFIX}/lib/python${_py3ver}/site-packages/entrypoints.py"
 
   local _dist="entrypoints-${pkgver}.dist-info"
@@ -28,5 +31,5 @@ package() {
   done
 
   cd "${srcdir}/${_realname}-$pkgver"
-  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-et-xmlfile/PKGBUILD b/mingw-w64-python-et-xmlfile/PKGBUILD
index d16f55d056..4480b40fc5 100644
--- a/mingw-w64-python-et-xmlfile/PKGBUILD
+++ b/mingw-w64-python-et-xmlfile/PKGBUILD
@@ -2,29 +2,39 @@
 
 _realname=et-xmlfile
 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
 pkgdesc="A low memory library for creating large XML files (mingw-w64)"
 url="https://et-xmlfile.readthedocs.io/"
 arch=('any')
 license=('MIT')
-depends=("${MINGW_PACKAGE_PREFIX}-python3-lxml")
-makedepends=("${MINGW_PACKAGE_PREFIX}-python3-setuptools")
+depends=("${MINGW_PACKAGE_PREFIX}-python-lxml")
+makedepends=("${MINGW_PACKAGE_PREFIX}-python-setuptools")
 source=("https://pypi.python.org/packages/source/e/et_xmlfile/et_xmlfile-${pkgver}.tar.gz"
         "LICENSE")
 sha256sums=('614d9722d572f6246302c4491846d2c393c199cfa4edc9af593437691683335b'
             '69a810ce7342b9198bd2e44d0098e30b4ce31078019e6cf990a5cd6ce2c3f7ce')
 
+prepare() {
+  cd "${srcdir}"
+  rm -rf python-build-${CARCH} | true
+  cp -r "et_xmlfile-${pkgver}" "python-build-${CARCH}"
+}
+
 build() {
-  cd "${srcdir}/et_xmlfile-${pkgver}"
-  python3 setup.py build
+  cd "${srcdir}/python-build-${CARCH}"
+  ${MINGW_PREFIX}/bin/python setup.py build
 }
 
 package() {
-  cd "${srcdir}/et_xmlfile-${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 ${srcdir}/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 ${srcdir}/LICENSE ${pkgdir}${MINGW_PREFIX}/share/licenses/python-${_realname}/LICENSE
 }
diff --git a/mingw-w64-python-extras/PKGBUILD b/mingw-w64-python-extras/PKGBUILD
index f62ed43df1..003d61c796 100644
--- a/mingw-w64-python-extras/PKGBUILD
+++ b/mingw-w64-python-extras/PKGBUILD
@@ -2,17 +2,20 @@
 
 _realname=extras
 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=3
+pkgrel=1
 pkgdesc="Useful extra bits for Python - things that should be in the standard library (mingw-w64)"
 arch=('any')
 url='https://github.com/testing-cabal/extras'
 license=('MIT')
-depends=("${MINGW_PACKAGE_PREFIX}-python3")
-makedepends=("${MINGW_PACKAGE_PREFIX}-python3"
-             "${MINGW_PACKAGE_PREFIX}-python3-setuptools")
-checkdepends=("${MINGW_PACKAGE_PREFIX}-python3-testtools")
+depends=("${MINGW_PACKAGE_PREFIX}-python")
+makedepends=("${MINGW_PACKAGE_PREFIX}-python"
+             "${MINGW_PACKAGE_PREFIX}-python-setuptools")
+checkdepends=("${MINGW_PACKAGE_PREFIX}-python-testtools")
 options=('staticlibs' 'strip' '!debug')
 source=("${_realname}-$pkgver.tar.gz"::"https://github.com/testing-cabal/extras/archive/${pkgver}.tar.gz")
 sha256sums=('fe6c15e75040b8825d5677df2aaed7105182ece4db3b402b02371b98e7a5b518')
diff --git a/mingw-w64-python-fixtures/PKGBUILD b/mingw-w64-python-fixtures/PKGBUILD
index 2a2bd5260a..4c793ea3ff 100644
--- a/mingw-w64-python-fixtures/PKGBUILD
+++ b/mingw-w64-python-fixtures/PKGBUILD
@@ -2,19 +2,22 @@
 
 _realname=fixtures
 pkgbase=mingw-w64-python-${_realname}
-pkgname=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+pkgname=("${MINGW_PACKAGE_PREFIX}-python-${_realname}")
+provides=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+conflicts=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+replaces=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
 pkgver=3.0.0
-pkgrel=4
+pkgrel=1
 pkgdesc="Fixtures, reusable state for writing clean tests and more (mingw-w64)"
 arch=('any')
 url="https://launchpad.net/python-fixtures"
 license=('Apache')
-depends=("${MINGW_PACKAGE_PREFIX}-python3"
-         "${MINGW_PACKAGE_PREFIX}-python3-pbr"
-         "${MINGW_PACKAGE_PREFIX}-python3-six")
-makedepends=("${MINGW_PACKAGE_PREFIX}-python3-setuptools")
-checkdepends=("${MINGW_PACKAGE_PREFIX}-python3-subunit"
-              "${MINGW_PACKAGE_PREFIX}-python3-mock")
+depends=("${MINGW_PACKAGE_PREFIX}-python"
+         "${MINGW_PACKAGE_PREFIX}-python-pbr"
+         "${MINGW_PACKAGE_PREFIX}-python-six")
+makedepends=("${MINGW_PACKAGE_PREFIX}-python-setuptools")
+checkdepends=("${MINGW_PACKAGE_PREFIX}-python-subunit"
+              "${MINGW_PACKAGE_PREFIX}-python-mock")
 options=('staticlibs' 'strip' '!debug')
 source=("https://pypi.io/packages/source/f/fixtures/fixtures-${pkgver}.tar.gz")
 sha512sums=('e52ba864c42d15a8baa60583761006b2dd78e3cd5f3f043f5702346aef428b933d62e8fa5889b7cb4196e4072acc5df3b7ffa39702a1b782887bdc109299b695')
diff --git a/mingw-w64-python-flake8/PKGBUILD b/mingw-w64-python-flake8/PKGBUILD
index b023906011..628f88ffd1 100644
--- a/mingw-w64-python-flake8/PKGBUILD
+++ b/mingw-w64-python-flake8/PKGBUILD
@@ -3,19 +3,22 @@
 
 _realname=flake8
 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.7.9
-pkgrel=2
+pkgrel=1
 pkgdesc="The modular source code checker: pep8, pyflakes and co"
 arch=('any')
 url="http://flake8.pycqa.org"
 license=('MIT')
-depends=("${MINGW_PACKAGE_PREFIX}-python3-pyflakes"
-         "${MINGW_PACKAGE_PREFIX}-python3-mccabe"
-         "${MINGW_PACKAGE_PREFIX}-python3-pycodestyle")
-makedepends=("${MINGW_PACKAGE_PREFIX}-python3-setuptools"
-             "${MINGW_PACKAGE_PREFIX}-python3-pytest-runner")
-checkdepends=("${MINGW_PACKAGE_PREFIX}-python3-mock")
+depends=("${MINGW_PACKAGE_PREFIX}-python-pyflakes"
+         "${MINGW_PACKAGE_PREFIX}-python-mccabe"
+         "${MINGW_PACKAGE_PREFIX}-python-pycodestyle")
+makedepends=("${MINGW_PACKAGE_PREFIX}-python-setuptools"
+             "${MINGW_PACKAGE_PREFIX}-python-pytest-runner")
+checkdepends=("${MINGW_PACKAGE_PREFIX}-python-mock")
 install=${_realname}3-${CARCH}.install
 source=("${_realname}-$pkgver.tar.gz"::"https://github.com/PyCQA/flake8/archive/${pkgver}.tar.gz")
 sha512sums=('cd91759f8f22a98d70ff04238e399de23981cbab9656958b36390b792f75b49645f0ce5df849f3675dab04355f4daef4e89deae5c56193fd2c78029833b1acf6')
@@ -24,42 +27,38 @@ prepare() {
   # disable overly restrictive dependency pinning
   sed -i -e 's/, *< *[0-9=.]*//' flake8-${pkgver}/setup.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}"
 
   # 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 pytest
+  msg "Python test for ${CARCH}"
+  cd "${srcdir}/python-build-${CARCH}"
+  ${MINGW_PREFIX}/bin/python setup.py pytest
 }
 
 package() {
-  cd "${srcdir}/python3-build-${CARCH}"
+  cd "${srcdir}/python-build-${CARCH}"
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
-  ${MINGW_PREFIX}/bin/python3 setup.py install --prefix=${MINGW_PREFIX} \
+  ${MINGW_PREFIX}/bin/python setup.py install --prefix=${MINGW_PREFIX} \
     --root="${pkgdir}" --optimize=1 --skip-build
 
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
-    ${MINGW_PREFIX}/bin/python3 setup.py install --root="$pkgdir" --prefix=${MINGW_PREFIX} --optimize=1
-  install -D -m644 LICENSE "$pkgdir${MINGW_PREFIX}"/share/licenses/$pkgname/LICENSE
+    ${MINGW_PREFIX}/bin/python setup.py install --root="${pkgdir}" --prefix=${MINGW_PREFIX} --optimize=1
+  install -D -m644 LICENSE "${pkgdir}${MINGW_PREFIX}"/share/licenses/python-${_realname}/LICENSE
 
-  # This entire section should be removed if the package does NOT install
-  # anything in the /mingw*/bin directory.
-  ### begin section ###
   local PREFIX_WIN=$(cygpath -wm ${MINGW_PREFIX})
   # fix python command in files
   for _f in "${pkgdir}${MINGW_PREFIX}"/bin/*.py; do
     sed -e "s|${PREFIX_WIN}|${MINGW_PREFIX}|g" -i ${_f}
   done
-  #### end section ####
 }
diff --git a/mingw-w64-python-flaky/PKGBUILD b/mingw-w64-python-flaky/PKGBUILD
index 1f2f63f432..1260140317 100644
--- a/mingw-w64-python-flaky/PKGBUILD
+++ b/mingw-w64-python-flaky/PKGBUILD
@@ -2,29 +2,36 @@
 
 _realname=flaky
 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.6.1
-pkgrel=3
+pkgrel=1
 pkgdesc="Plugin for nose or py.test that automatically reruns flaky tests (mingw-w64)"
 arch=('any')
 url="https://github.com/box/flaky"
 license=('APACHE')
-depends=("${MINGW_PACKAGE_PREFIX}-python3")
-makedepends=("${MINGW_PACKAGE_PREFIX}-python3-setuptools")
+depends=("${MINGW_PACKAGE_PREFIX}-python")
+makedepends=("${MINGW_PACKAGE_PREFIX}-python-setuptools")
 options=('staticlibs' 'strip' '!debug')
 source=("${_realname}-${pkgver}.tar.gz"::"https://github.com/box/flaky/archive/v${pkgver}.tar.gz")
 sha256sums=('9a3dd0f33dc38c9aec1e82f16777857788ef595636004609b1bdcc14f497d1e7')
 
-build() {
-  cd "${srcdir}/${_realname}-${pkgver}"
+prepare() {
+  rm -rf python-build-${CARCH} | true
+  cp -r "${_realname}-${pkgver}" "python-build-${CARCH}"
+}
 
-  ${MINGW_PREFIX}/bin/python3 setup.py build
+build() {
+  cd "${srcdir}/python-build-${CARCH}"
+  ${MINGW_PREFIX}/bin/python setup.py build
 }
 
 package() {
-  cd "${srcdir}/${_realname}-${pkgver}"
+  cd "${srcdir}/python-build-${CARCH}"
 
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
-  ${MINGW_PREFIX}/bin/python3 setup.py install --prefix=${MINGW_PREFIX} \
+  ${MINGW_PREFIX}/bin/python setup.py install --prefix=${MINGW_PREFIX} \
     --root="${pkgdir}" --optimize=1 --skip-build
 }
diff --git a/mingw-w64-python-flexmock/PKGBUILD b/mingw-w64-python-flexmock/PKGBUILD
index 3077356520..94c151bb17 100644
--- a/mingw-w64-python-flexmock/PKGBUILD
+++ b/mingw-w64-python-flexmock/PKGBUILD
@@ -2,45 +2,48 @@
 
 _realname=flexmock
 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.4
-pkgrel=3
+pkgrel=1
 pkgdesc="Mock/Stub/Spy library for Python (mingw-w64)"
 arch=('any')
 url='https://has207.github.com/flexmock'
 license=('BSD')
-depends=("${MINGW_PACKAGE_PREFIX}-python3")
-makedepends=("${MINGW_PACKAGE_PREFIX}-python3-setuptools")
-checkdepends=("${MINGW_PACKAGE_PREFIX}-python3-pytest-runner")
+depends=("${MINGW_PACKAGE_PREFIX}-python")
+makedepends=("${MINGW_PACKAGE_PREFIX}-python-setuptools")
+checkdepends=("${MINGW_PACKAGE_PREFIX}-python-pytest-runner")
 options=('staticlibs' 'strip' '!debug')
-source=("${_realname}-$pkgver.tar.gz"::"https://github.com/bkabrda/flexmock/archive/$pkgver.tar.gz")
+source=("${_realname}-${pkgver}.tar.gz"::"https://github.com/bkabrda/flexmock/archive/${pkgver}.tar.gz")
 sha512sums=('96d3af9625b1dbd987b291c7ed26a77476f54fe4548d16ad70adeefc0093f51a3b47d8b3fb4339611dfadd8b2d55a1bc734e70bc093683192f1f351badf08553')
 
 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 pytest || warning "Tests failed"
+  cd "${srcdir}/python-build-${CARCH}"
+  ${MINGW_PREFIX}/bin/python setup.py pytest || warning "Tests failed"
 }
 
 package() {
-  cd "${srcdir}/${_realname}-${pkgver}"
+  cd "${srcdir}/python-build-${CARCH}"
 
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
-  ${MINGW_PREFIX}/bin/python3 setup.py install --prefix=${MINGW_PREFIX} \
+  ${MINGW_PREFIX}/bin/python setup.py install --prefix=${MINGW_PREFIX} \
     --root="${pkgdir}" --optimize=1 --skip-build
 
-  install -Dm644 LICENSE "${pkgdir}${MINGW_PREFIX}/share/licenses/python3-${_realname}/LICENSE"
+  install -Dm644 LICENSE "${pkgdir}${MINGW_PREFIX}/share/licenses/python-${_realname}/LICENSE"
 }
diff --git a/mingw-w64-python-fonttools/PKGBUILD b/mingw-w64-python-fonttools/PKGBUILD
index 6f6f840644..f27ae28768 100644
--- a/mingw-w64-python-fonttools/PKGBUILD
+++ b/mingw-w64-python-fonttools/PKGBUILD
@@ -2,47 +2,53 @@
 
 _realname=fonttools
 pkgbase=mingw-w64-python-${_realname}
-pkgname=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+pkgname=("${MINGW_PACKAGE_PREFIX}-python-${_realname}")
+provides=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+conflicts=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+replaces=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
 pkgver=4.0.2
 pkgrel=1
 pkgdesc="Converts OpenType and TrueType fonts to and from XML (mingw-w64)"
 arch=('any')
 url='https://github.com/fonttools/fonttools'
 license=('MIT')
-depends=("${MINGW_PACKAGE_PREFIX}-python3"
-         "${MINGW_PACKAGE_PREFIX}-python3-numpy")
-optdepends=("${MINGW_PACKAGE_PREFIX}-python3-brotli: WOFF 1.0 and WOFF 2.0 webfonts"
-            "${MINGW_PACKAGE_PREFIX}-python3-pyfilesystem2: for fontTools.ufoLib: to read/write UFO fonts"
-            "${MINGW_PACKAGE_PREFIX}-python3-pyzopfli: WOFF 1.0 and WOFF 2.0 webfonts"
-            "${MINGW_PACKAGE_PREFIX}-python3-sympy: for fontTools.misc.symfont, module for symbolic font statistics analysis")
+depends=("${MINGW_PACKAGE_PREFIX}-python"
+         "${MINGW_PACKAGE_PREFIX}-python-numpy")
+optdepends=("${MINGW_PACKAGE_PREFIX}-python-brotli: WOFF 1.0 and WOFF 2.0 webfonts"
+            "${MINGW_PACKAGE_PREFIX}-python-pyfilesystem2: for fontTools.ufoLib: to read/write UFO fonts"
+            "${MINGW_PACKAGE_PREFIX}-python-pyzopfli: WOFF 1.0 and WOFF 2.0 webfonts"
+            "${MINGW_PACKAGE_PREFIX}-python-sympy: for fontTools.misc.symfont, module for symbolic font statistics analysis")
 install=${_realname}3-${CARCH}.install
-makedepends=("${MINGW_PACKAGE_PREFIX}-python3-matplotlib"
-             "${MINGW_PACKAGE_PREFIX}-python3-setuptools")
-checkdepends=("${MINGW_PACKAGE_PREFIX}-python3-pytest-runner")
+makedepends=("${MINGW_PACKAGE_PREFIX}-python-matplotlib"
+             "${MINGW_PACKAGE_PREFIX}-python-setuptools")
+checkdepends=("${MINGW_PACKAGE_PREFIX}-python-pytest-runner")
 options=('staticlibs' 'strip' '!debug')
 source=("https://github.com/fonttools/fonttools/releases/download/${pkgver}/fonttools-${pkgver}.zip")
 sha256sums=('bb9bf6b5b4ded33e0d9f823e5ae2e1fa643af4d614915660abe3853a9a6931cd')
 
+prepare() {
+  rm -rf python-build-${CARCH}
+  cp -r "${_realname}-${pkgver}" "python-build-${CARCH}"
+}
+
 build() {
-  msg "Python 3 build for ${CARCH}"
-  rm -rf python3-build-${CARCH}
-  cp -r "${_realname}-${pkgver}" "python3-build-${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
 }
 
 #Enable tests when the dependencies are solved
 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
 
   local PREFIX_WIN=$(cygpath -wm ${MINGW_PREFIX})
@@ -51,6 +57,6 @@ package() {
     sed -e "s|${PREFIX_WIN}|${MINGW_PREFIX}|g" -i ${_ff}
   done
 
-  install -D -m755 LICENSE "${pkgdir}${MINGW_PREFIX}"/share/licenses/python3-${_realname}/LICENSE
+  install -D -m755 LICENSE "${pkgdir}${MINGW_PREFIX}"/share/licenses/python-${_realname}/LICENSE
   chmod oga+r "${pkgdir}${MINGW_PREFIX}"/share/man/man1/ttx.1
 }
diff --git a/mingw-w64-python-future/PKGBUILD b/mingw-w64-python-future/PKGBUILD
index 0e13976fb5..b9a73be9f9 100644
--- a/mingw-w64-python-future/PKGBUILD
+++ b/mingw-w64-python-future/PKGBUILD
@@ -2,17 +2,20 @@
 
 _realname=future
 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.18.2
-pkgrel=2
+pkgrel=1
 pkgdesc="Clean single-source support for Python 3 and 2 (mingw-w64)"
 arch=('any')
 url='https://python-future.org/'
 license=('MIT')
-depends=("${MINGW_PACKAGE_PREFIX}-python3")
-makedepends=("${MINGW_PACKAGE_PREFIX}-python3-setuptools")
-optdepends=("${MINGW_PACKAGE_PREFIX}-python3-setuptools: futurize2 and pasteurize2 scripts")
-checkdepends=("${MINGW_PACKAGE_PREFIX}-python3-requests")
+depends=("${MINGW_PACKAGE_PREFIX}-python")
+makedepends=("${MINGW_PACKAGE_PREFIX}-python-setuptools")
+optdepends=("${MINGW_PACKAGE_PREFIX}-python-setuptools: futurize2 and pasteurize2 scripts")
+checkdepends=("${MINGW_PACKAGE_PREFIX}-python-requests")
 install=${_realname}3-${CARCH}.install
 options=('staticlibs' 'strip' '!debug')
 source=("https://pypi.io/packages/source/f/future/future-${pkgver}.tar.gz")
@@ -66,13 +69,9 @@ package() {
 
   install -Dm644 LICENSE.txt "${pkgdir}${MINGW_PREFIX}/share/licenses/python-${_realname}/LICENSE.txt"
 
-  # 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 _ff in ${pkgdir}${MINGW_PREFIX}/bin/*.py; do
     sed -e "s|${PREFIX_WIN}|${MINGW_PREFIX}|g" -i ${_ff}
   done
-  #### end section ####
 }
diff --git a/mingw-w64-python-gmpy2/PKGBUILD b/mingw-w64-python-gmpy2/PKGBUILD
index d28d953af3..44208cc24a 100644
--- a/mingw-w64-python-gmpy2/PKGBUILD
+++ b/mingw-w64-python-gmpy2/PKGBUILD
@@ -2,16 +2,19 @@
 
 _realname=gmpy2
 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.1.0b1
-pkgrel=3
+pkgrel=1
 pkgdesc="Provides C-coded Python modules for fast multiple-precision arithmetic (mingw-w64)"
 arch=('any')
 url='https://github.com/aleaxit/gmpy'
 license=('LGPL2.1')
-depends=("${MINGW_PACKAGE_PREFIX}-python3"
+depends=("${MINGW_PACKAGE_PREFIX}-python"
          "${MINGW_PACKAGE_PREFIX}-mpc")
-makedepends=("${MINGW_PACKAGE_PREFIX}-python3-setuptools")
+makedepends=("${MINGW_PACKAGE_PREFIX}-python-setuptools")
 options=('staticlibs' 'strip' '!debug')
 source=("${_realname}-${pkgver}.tar.gz"::"https://github.com/aleaxit/gmpy/archive/${_realname}-${pkgver}.tar.gz")
 noextract=("${_realname}-${pkgver}.tar.gz")
@@ -45,6 +48,7 @@ prepare() {
   pushd "gmpy-${_realname}-${pkgver}"
   cp src/gmpy2.h gmpy2/gmpy2.h
   cp src/gmpy2.pxd gmpy2/gmpy2.pxd
+  popd
 
   rm -rf python-build-${CARCH} | true
   cp -r "gmpy-${_realname}-${pkgver}" "python-build-${CARCH}"
diff --git a/mingw-w64-python-importlib-metadata/PKGBUILD b/mingw-w64-python-importlib-metadata/PKGBUILD
index 51a1f6a96d..62f6711b58 100644
--- a/mingw-w64-python-importlib-metadata/PKGBUILD
+++ b/mingw-w64-python-importlib-metadata/PKGBUILD
@@ -2,23 +2,26 @@
 
 _realname=importlib-metadata
 pkgbase=mingw-w64-python-${_realname}
-pkgname=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
-pkgver=0.23
-pkgrel=2
+pkgname=("${MINGW_PACKAGE_PREFIX}-python-${_realname}")
+pkgver=1.3.0
+pkgrel=1
+provides=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}=${pkgver}")
+conflicts=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+replaces=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
 pkgdesc="Read metadata from Python packages (mingw-w64)"
 arch=('any')
 url='https://importlib-metadata.readthedocs.io/'
 license=('Apache')
-depends=("${MINGW_PACKAGE_PREFIX}-python3"
-         "${MINGW_PACKAGE_PREFIX}-python3-contextlib2"
-         "${MINGW_PACKAGE_PREFIX}-python3-pathlib2"
-         "${MINGW_PACKAGE_PREFIX}-python3-zipp")
-makedepends=("${MINGW_PACKAGE_PREFIX}-python3-setuptools")
-checkdepends=("${MINGW_PACKAGE_PREFIX}-python3-pip"
-              "${MINGW_PACKAGE_PREFIX}-python3-pytest-runner"
-              "${MINGW_PACKAGE_PREFIX}-python3-wheel")
+depends=("${MINGW_PACKAGE_PREFIX}-python"
+         "${MINGW_PACKAGE_PREFIX}-python-contextlib2"
+         "${MINGW_PACKAGE_PREFIX}-python-pathlib2"
+         "${MINGW_PACKAGE_PREFIX}-python-zipp")
+makedepends=("${MINGW_PACKAGE_PREFIX}-python-setuptools")
+checkdepends=("${MINGW_PACKAGE_PREFIX}-python-pip"
+              "${MINGW_PACKAGE_PREFIX}-python-pytest-runner"
+              "${MINGW_PACKAGE_PREFIX}-python-wheel")
 source=("${_realname}-${pkgver}.tar.gz"::"https://files.pythonhosted.org/packages/source/${_realname::1}/${_realname//-/_}/${_realname//-/_}-${pkgver}.tar.gz")
-sha512sums=('56594dfd67733842d83547770a09e12b4e4e3c000b7c9743206e13e4629906bb7271065e03c387f5114bac7f673fc17594d2ef90af23cd34b7ededecaf3fd47a')
+sha512sums=('45d09cbbbceee80a4769f2d374a3c4b511fda56a100ad1a6fc7cedf9a0cd251600c960430c608c7bcd60bdd9a0117f83025ed7b05f9f6a53edc791d128e8b0d7')
 
 # Helper macros to help make tasks easier #
 apply_patch_with_msg() {
@@ -41,35 +44,29 @@ del_file_exists() {
 
 prepare() {
   cd "${srcdir}"
-  for builddir in python3-build-${CARCH}; do
-    rm -rf ${builddir} | true
-    cp -r "importlib_metadata-${pkgver}" "${builddir}"
-  done
+  rm -rfpython-build-${CARCH} | true
+  cp -r "importlib_metadata-${pkgver}" "python-build-${CARCH}"
   # Set version for setuptools_scm
   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 2 test for ${CARCH}"
-  cd "${srcdir}/python2-build-${CARCH}"
-  ${MINGW_PREFIX}/bin/python2 setup.py pytest
+  msg "Python test for ${CARCH}"
+  cd "${srcdir}/python-build-${CARCH}"
+  ${MINGW_PREFIX}/bin/python setup.py pytest
 }
 
 package() {
- cd "${srcdir}/python3-build-${CARCH}"
+ cd "${srcdir}/python-build-${CARCH}"
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
-  ${MINGW_PREFIX}/bin/python3 setup.py install --prefix=${MINGW_PREFIX} \
+  ${MINGW_PREFIX}/bin/python setup.py install --prefix=${MINGW_PREFIX} \
     --root="${pkgdir}" --optimize=1 --skip-build
 
-  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-iocapture/PKGBUILD b/mingw-w64-python-iocapture/PKGBUILD
index c7e9e74ba5..2018b370f0 100644
--- a/mingw-w64-python-iocapture/PKGBUILD
+++ b/mingw-w64-python-iocapture/PKGBUILD
@@ -2,48 +2,51 @@
 
 _realname=iocapture
 pkgbase=mingw-w64-python-${_realname}
-pkgname=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+pkgname=("${MINGW_PACKAGE_PREFIX}-python-${_realname}")
+provides=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+conflicts=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+replaces=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
 pkgver=0.1.2
-pkgrel=3
+pkgrel=1
 pkgdesc="Capture stdout, stderr easily (mingw-w64)"
 arch=('any')
 url='https://github.com/oinume/iocapture'
 license=('MIT')
-depends=("${MINGW_PACKAGE_PREFIX}-python3")
-makedepends=("${MINGW_PACKAGE_PREFIX}-python3-setuptools")
-checkdepends=("${MINGW_PACKAGE_PREFIX}-python3-pytest-runner"
-              "${MINGW_PACKAGE_PREFIX}-python3-flexmock"
-              "${MINGW_PACKAGE_PREFIX}-python3-pytest-cov"
-              "${MINGW_PACKAGE_PREFIX}-python3-six")
+depends=("${MINGW_PACKAGE_PREFIX}-python")
+makedepends=("${MINGW_PACKAGE_PREFIX}-python-setuptools")
+checkdepends=("${MINGW_PACKAGE_PREFIX}-python-pytest-runner"
+              "${MINGW_PACKAGE_PREFIX}-python-flexmock"
+              "${MINGW_PACKAGE_PREFIX}-python-pytest-cov"
+              "${MINGW_PACKAGE_PREFIX}-python-six")
 options=('staticlibs' 'strip' '!debug')
 source=("${_realname}-$pkgver.tar.gz"::"https://github.com/oinume/iocapture/archive/$pkgver.tar.gz")
 sha256sums=('57056d1a99a9c584ae2bb23a1aa855292fd2bcc01a8a6ad5467d7ca2e739d31b')
 
 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 pytest
+  cd "${srcdir}/python-build-${CARCH}"
+  ${MINGW_PREFIX}/bin/python setup.py pytest
 }
 
 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-ipykernel/PKGBUILD b/mingw-w64-python-ipykernel/PKGBUILD
index f6d63dfa5b..23f33f7f81 100644
--- a/mingw-w64-python-ipykernel/PKGBUILD
+++ b/mingw-w64-python-ipykernel/PKGBUILD
@@ -2,54 +2,53 @@
 
 _realname=ipykernel
 pkgbase=mingw-w64-python3-${_realname}
-pkgname=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+pkgname=("${MINGW_PACKAGE_PREFIX}-python-${_realname}")
+provides=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+conflicts=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+replaces=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
 pkgver=5.1.3
 pkgrel=1
 pkgdesc="The ipython kernel for Jupyter (mingw-w64)"
 arch=('any')
 url="https://ipython.org/"
 license=('BSD')
-depends=("${MINGW_PACKAGE_PREFIX}-python3-ipython"
-         "${MINGW_PACKAGE_PREFIX}-python3-ipython_genutils"
-         "${MINGW_PACKAGE_PREFIX}-python3-pathlib2"
-         "${MINGW_PACKAGE_PREFIX}-python3-pyzmq"
-         "${MINGW_PACKAGE_PREFIX}-python3-jupyter_client"
-         "${MINGW_PACKAGE_PREFIX}-python3-jupyter_core")
-makedepends=("${MINGW_PACKAGE_PREFIX}-python3-setuptools")
-checkdepends=("${MINGW_PACKAGE_PREFIX}-python3-pytest"
-              "${MINGW_PACKAGE_PREFIX}-python3-mock"
-              "${MINGW_PACKAGE_PREFIX}-python3-nose")
+depends=("${MINGW_PACKAGE_PREFIX}-python-ipython"
+         "${MINGW_PACKAGE_PREFIX}-python-ipython_genutils"
+         "${MINGW_PACKAGE_PREFIX}-python-pathlib2"
+         "${MINGW_PACKAGE_PREFIX}-python-pyzmq"
+         "${MINGW_PACKAGE_PREFIX}-python-tornado"
+         "${MINGW_PACKAGE_PREFIX}-python-traitlets"
+         "${MINGW_PACKAGE_PREFIX}-python-jupyter_client")
+makedepends=("${MINGW_PACKAGE_PREFIX}-python-setuptools")
+checkdepends=("${MINGW_PACKAGE_PREFIX}-python-pytest"
+              "${MINGW_PACKAGE_PREFIX}-python-mock"
+              "${MINGW_PACKAGE_PREFIX}-python-nose")
+#install=ipython3-${CARCH}.install
 source=("${_realname}-${pkgver}.tar.gz::https://github.com/ipython/${_realname}/archive/v${pkgver}.tar.gz")
 sha256sums=('6dfcf5006bd97e4d5f28f7d37b7d5b630a38dd483fd369a61d4b3d68a6e1769b')
 
 prepare() {
   cd "${srcdir}"
-  rm -rf python3-build-${CARCH} | true
-  cp -r "${_realname}-${pkgver}" "python3-build-${CARCH}"
+  rm -rf python-build-${CARCH} | true
+  cp -r "${_realname}-${pkgver}" "python-build-${CARCH}"
 }
 
 build() {
-  msg "Python 3 build for ${CARCH}"  
-  cd "${srcdir}/python3-build-${CARCH}"
-  ${MINGW_PREFIX}/bin/python3 setup.py build
+  msg "Python build for ${CARCH}"
+  cd "${srcdir}/python-build-${CARCH}"
+  ${MINGW_PREFIX}/bin/python setup.py build
 }
 
 check() {
-  msg "Python 3 test for ${CARCH}"
-  cd "${srcdir}/python3-build-${CARCH}"
-  ${MINGW_PREFIX}/bin/python3 -m pytest || warning "Tests failed"
+  msg "Python test for ${CARCH}"
+  cd "${srcdir}/python-build-${CARCH}"
+  ${MINGW_PREFIX}/bin/python -m pytest || warning "Tests failed"
 }
 
 package() {
-  #install=ipython3-${CARCH}.install
-  depends=("${MINGW_PACKAGE_PREFIX}-python3"
-           "${MINGW_PACKAGE_PREFIX}-python3-pathlib2"
-           "${MINGW_PACKAGE_PREFIX}-python3-pyzmq"
-           "${MINGW_PACKAGE_PREFIX}-python3-ipython")
-
-  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
 
   find "${pkgdir}/" -name "*.pyc" -delete
@@ -58,6 +57,6 @@ package() {
   # setuptools doesnt see mingw-w64-python's readline
   find "${pkgdir}/" -name 'requires.txt' -delete
 
-  install -Dm644 COPYING.md "$pkgdir${MINGW_PREFIX}/share/licenses/python3-${_realname}/LICENSE"
+  install -Dm644 COPYING.md "${pkgdir}${MINGW_PREFIX}/share/licenses/python-${_realname}/LICENSE"
 }
 
diff --git a/mingw-w64-python-ipython/PKGBUILD b/mingw-w64-python-ipython/PKGBUILD
index 7e038b9c4e..8bec4c72a9 100644
--- a/mingw-w64-python-ipython/PKGBUILD
+++ b/mingw-w64-python-ipython/PKGBUILD
@@ -2,68 +2,70 @@
 
 _realname=ipython
 pkgbase=mingw-w64-python3-${_realname}
-pkgname=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+pkgname=("${MINGW_PACKAGE_PREFIX}-python-${_realname}")
+provides=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+conflicts=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+replaces=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
 pkgver=7.9.0
 pkgrel=1
 pkgdesc="An enhanced Interactive Python shell (mingw-w64)"
 arch=('any')
 url="https://ipython.org/"
 license=('BSD')
-# Mote: prompt_toolkit 2.0 is required for this series.  There
-# is some breakage between prompt_toolkit 1.0 and 2.0.
+# Note: prompt_toolkit 2.0 is required for this series.
+# There is some breakage between prompt_toolkit 1.0 and 2.0.
 depends=('winpty'
          "${MINGW_PACKAGE_PREFIX}-sqlite3"
-         "${MINGW_PACKAGE_PREFIX}-python3-jedi"
-         "${MINGW_PACKAGE_PREFIX}-python3-decorator"
-         "${MINGW_PACKAGE_PREFIX}-python3-pickleshare"
-         "${MINGW_PACKAGE_PREFIX}-python3-simplegeneric"
-         "${MINGW_PACKAGE_PREFIX}-python3-traitlets"
-         "${MINGW_PACKAGE_PREFIX}-python3-prompt_toolkit>=2.0"
-         "${MINGW_PACKAGE_PREFIX}-python3-pygments"
-         "${MINGW_PACKAGE_PREFIX}-python3-simplegeneric"
-         "${MINGW_PACKAGE_PREFIX}-python3-backcall"
-         "${MINGW_PACKAGE_PREFIX}-python3-pexpect"
-         "${MINGW_PACKAGE_PREFIX}-python3-colorama"
-         "${MINGW_PACKAGE_PREFIX}-python3-win_unicode_console")
+         "${MINGW_PACKAGE_PREFIX}-python-jedi"
+         "${MINGW_PACKAGE_PREFIX}-python-decorator"
+         "${MINGW_PACKAGE_PREFIX}-python-pickleshare"
+         "${MINGW_PACKAGE_PREFIX}-python-simplegeneric"
+         "${MINGW_PACKAGE_PREFIX}-python-traitlets"
+         "${MINGW_PACKAGE_PREFIX}-python-prompt_toolkit>=2.0"
+         "${MINGW_PACKAGE_PREFIX}-python-pygments"
+         "${MINGW_PACKAGE_PREFIX}-python-backcall"
+         "${MINGW_PACKAGE_PREFIX}-python-pexpect"
+         "${MINGW_PACKAGE_PREFIX}-python-colorama"
+         "${MINGW_PACKAGE_PREFIX}-python-win_unicode_console")
 # new optional thing: ipyparallel
-optdepends=("${MINGW_PACKAGE_PREFIX}-python3-nose: for IPython's test suite"
-            "${MINGW_PACKAGE_PREFIX}-python3-qtconsole: for ipython qtconsole"
-            "${MINGW_PACKAGE_PREFIX}-python3-ipython-ipyparallel: for IPython.parallel")
-makedepends=("${MINGW_PACKAGE_PREFIX}-python3-setuptools")
-checkdepends=("${MINGW_PACKAGE_PREFIX}-python3-requests"
-              "${MINGW_PACKAGE_PREFIX}-python3-testpath"
-              "${MINGW_PACKAGE_PREFIX}-python3-pygments" 
-              "${MINGW_PACKAGE_PREFIX}-python3-jupyter-nbformat"
-              "${MINGW_PACKAGE_PREFIX}-python3-ipykernel"
-              "${MINGW_PACKAGE_PREFIX}-python3-numpy")
+optdepends=("${MINGW_PACKAGE_PREFIX}-python-nose: for IPython's test suite"
+            "${MINGW_PACKAGE_PREFIX}-python-qtconsole: for ipython qtconsole"
+            "${MINGW_PACKAGE_PREFIX}-python-ipython-ipyparallel: for IPython.parallel")
+makedepends=("${MINGW_PACKAGE_PREFIX}-python-setuptools")
+checkdepends=("${MINGW_PACKAGE_PREFIX}-python-requests"
+              "${MINGW_PACKAGE_PREFIX}-python-testpath"
+              "${MINGW_PACKAGE_PREFIX}-python-pygments" 
+              "${MINGW_PACKAGE_PREFIX}-python-jupyter-nbformat"
+              "${MINGW_PACKAGE_PREFIX}-python-ipykernel"
+              "${MINGW_PACKAGE_PREFIX}-python-numpy")
 install=${_realname}3-${CARCH}.install
 source=("${_realname}-${pkgver}.tar.gz::https://github.com/ipython/ipython/archive/${pkgver}.tar.gz")
 sha256sums=('bfb1237d1556c9a09ac2914e41bc3561dde12a643e5921eadc920324a1630b7f')
 
 prepare() {
   cd "${srcdir}"
-  rm -rf python3-build-${CARCH} | true
-  cp -r "${_realname}-${pkgver}" "python3-build-${CARCH}"
+  rm -rf python-build-${CARCH} | true
+  cp -r "${_realname}-${pkgver}" "python-build-${CARCH}"
 }
 
 build() {
-    msg "Python 3 build for ${CARCH}"  
-    cd "${srcdir}/python3-build-${CARCH}"
-    ${MINGW_PREFIX}/bin/python3 setup.py build
+  msg "Python build for ${CARCH}"  
+  cd "${srcdir}/python-build-${CARCH}"
+  ${MINGW_PREFIX}/bin/python setup.py build
 }
 
 check() {
-    msg "Python 3 test for ${CARCH}"
-    cd "${srcdir}/python3-build-${CARCH}"
-    ${MINGW_PREFIX}/bin/python3 -m test || warning "Tests fail"
+  msg "Python test for ${CARCH}"
+  cd "${srcdir}/python-build-${CARCH}"
+  ${MINGW_PREFIX}/bin/python -m test || warning "Tests fail"
 }
 
 package() {
-  cd "${srcdir}/python3-build-${CARCH}"
+  cd "${srcdir}/python-build-${CARCH}"
   # see https://github.com/ipython/ipython/issues/2057
   #export LC_ALL=en_US.UTF-8
   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=1 --skip-build
 
   find "${pkgdir}/" -name "*.pyc" -delete
@@ -77,15 +79,14 @@ package() {
      sed -e "s|${PREFIX_WIN}/bin/||g" -i ${_f}
   done
 
-# For the command to work on the bash prompt, you must use
-# winpty so include that in the Shebang before the python command.
-# I don't like this but what I like really doesn't matter.
+  # For the command to work on the bash prompt, you must use
+  # winpty so include that in the Shebang before the python command.
+  # I don't like this but what I like really doesn't matter.
   for _f in iptest iptest3 ipython ipython3; do
      sed -e "s|/usr/bin/env |${MINGW_PREFIX}/|g" \
          -e "s|${PREFIX_WIN}|${MINGW_PREFIX}|g" \
          -e "s|#!|#!winpty |" -i "${pkgdir}${MINGW_PREFIX}/bin/${_f}"
   done
 
-  install -Dm644 docs/source/about/license_and_copyright.rst "${pkgdir}${MINGW_PREFIX}/share/licenses/ipython/LICENSE"
-
+  install -Dm644 docs/source/about/license_and_copyright.rst "${pkgdir}${MINGW_PREFIX}/share/licenses/python-ipython/LICENSE"
 }
diff --git a/mingw-w64-python-ipython_genutils/PKGBUILD b/mingw-w64-python-ipython_genutils/PKGBUILD
index b3da689a8e..f59480c283 100644
--- a/mingw-w64-python-ipython_genutils/PKGBUILD
+++ b/mingw-w64-python-ipython_genutils/PKGBUILD
@@ -2,27 +2,34 @@
 
 _realname=ipython_genutils
 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.0
-pkgrel=4
+pkgrel=1
 pkgdesc="IPython vestigial utilities (mingw-w64)"
 url="https://github.com/ipython/ipython_genutils"
 arch=('any')
 license=('Modified 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/ipython/${_realname}/archive/${pkgver}.tar.gz)
 sha256sums=('424a6ecb33b8c9a8320f8601c533067ed75b491e4bc31621d6278f288497cb1a')
 
-build() {
-  cd "${srcdir}/${_realname}-${pkgver}"
+prepare() {
+  cd "${srcdir}"
+  rm -rf python-build-${CARCH} | true
+  cp -r "${_realname}-${pkgver}" "python-build-${CARCH}"
+}
 
-  python3 setup.py build
+build() {
+  cd "${srcdir}/python-build-${CARCH}"
+  ${MINGW_PREFIX}/bin/python setup.py build
 }
 
 package() {
-  cd "${srcdir}/${_realname}-${pkgver}"
-
+  cd "${srcdir}/python-build-${CARCH}"
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
-  ${MINGW_PREFIX}/bin/python3 setup.py install --root=${pkgdir} --prefix=${MINGW_PREFIX} --optimize=1
+  ${MINGW_PREFIX}/bin/python setup.py install --root=${pkgdir} --prefix=${MINGW_PREFIX} --optimize=1 --skip-build
 }
diff --git a/mingw-w64-python-ipywidgets/PKGBUILD b/mingw-w64-python-ipywidgets/PKGBUILD
index c75d3b432d..5dbe88b09c 100644
--- a/mingw-w64-python-ipywidgets/PKGBUILD
+++ b/mingw-w64-python-ipywidgets/PKGBUILD
@@ -2,27 +2,33 @@
 
 _realname=ipywidgets
 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.5.1
-pkgrel=2
+pkgrel=1
 pkgdesc="IPython widgets for the Jupyter Notebook (mingw-w64)"
 url="https://github.com/ipython/ipywidgets"
 arch=('any')
 license=('BSD')
-depends=("${MINGW_PACKAGE_PREFIX}-python3")
-makedepends=("${MINGW_PACKAGE_PREFIX}-python3-setuptools")
-source=(${_realname}-${pkgver}.tar.gz::https://github.com/ipython/${_realname}/archive/$pkgver.tar.gz)
+depends=("${MINGW_PACKAGE_PREFIX}-python")
+makedepends=("${MINGW_PACKAGE_PREFIX}-python-setuptools")
+source=(${_realname}-${pkgver}.tar.gz::https://github.com/ipython/${_realname}/archive/${pkgver}.tar.gz)
 sha256sums=('e4253384886aabbaf10966916a2cf9ffa72551bd045d536fa2a379f14b50cec3')
 
-build() {
-  cd "${srcdir}/${_realname}-${pkgver}"
+prepare() {
+  rm -rf python-build-${CARCH} | true
+  cp -r "${_realname}-${pkgver}" "python-build-${CARCH}"
+}
 
-  ${MINGW_PREFIX}/bin/python3 setup.py build
+build() {
+  cd "${srcdir}/python-build-${CARCH}"
+  ${MINGW_PREFIX}/bin/python setup.py build
 }
 
 package() {
-  cd "${srcdir}/${_realname}-${pkgver}"
-
+  cd "${srcdir}/python-build-${CARCH}"
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
-  ${MINGW_PREFIX}/bin/python3 setup.py install --root=${pkgdir} --prefix=${MINGW_PREFIX} --optimize=1
+  ${MINGW_PREFIX}/bin/python setup.py install --root=${pkgdir} --prefix=${MINGW_PREFIX} --optimize=1 --skip-build
 }
diff --git a/mingw-w64-python-isort/PKGBUILD b/mingw-w64-python-isort/PKGBUILD
index 3649c11113..db73f4183d 100644
--- a/mingw-w64-python-isort/PKGBUILD
+++ b/mingw-w64-python-isort/PKGBUILD
@@ -2,17 +2,20 @@
 
 _realname=isort
 pkgbase=mingw-w64-python-${_realname}
-pkgname=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+pkgname=("${MINGW_PACKAGE_PREFIX}-python-${_realname}")
+provides=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+conflicts=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+replaces=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
 pkgver=4.3.21
-pkgrel=2
+pkgrel=1
 pkgdesc="A Python utility / library to sort Python imports (mingw-w64)"
 arch=('any')
 url='https://github.com/timothycrosley/isort'
 license=('MIT')
-depends=("${MINGW_PACKAGE_PREFIX}-python3")
-makedepends=("${MINGW_PACKAGE_PREFIX}-python3-setuptools")
-checkdepends=("${MINGW_PACKAGE_PREFIX}-python3-pytest"
-              "${MINGW_PACKAGE_PREFIX}-python3-mock")
+depends=("${MINGW_PACKAGE_PREFIX}-python")
+makedepends=("${MINGW_PACKAGE_PREFIX}-python-setuptools")
+checkdepends=("${MINGW_PACKAGE_PREFIX}-python-pytest"
+              "${MINGW_PACKAGE_PREFIX}-python-mock")
 install=${_realname}3-${CARCH}.install
 options=('staticlibs' 'strip' '!debug')
 source=("${_realname}-${pkgver}.tar.gz"::"https://github.com/timothycrosley/isort/archive/${pkgver}-2.tar.gz")
@@ -45,47 +48,39 @@ prepare() {
 #      0002-A-less-important-fix.patch
 #  popd 
 
-  rm -rf python3-build-${CARCH} | true
-  cp -r "${_realname}-${pkgver}-2" "python3-build-${CARCH}"
+  rm -rf python-build-${CARCH} | true
+  cp -r "${_realname}-${pkgver}-2" "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}"
+  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}"
-  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 test || true
+    ${MINGW_PREFIX}/bin/python setup.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"
 
-  # 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-jdcal/PKGBUILD b/mingw-w64-python-jdcal/PKGBUILD
index e22ffcb453..393da7a570 100644
--- a/mingw-w64-python-jdcal/PKGBUILD
+++ b/mingw-w64-python-jdcal/PKGBUILD
@@ -2,30 +2,37 @@
 
 _realname=jdcal
 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.1
-pkgrel=3
+pkgrel=1
 pkgdesc="Julian dates, from proleptic Gregorian and Julian calendars (mingw-w64)"
 url="https://github.com/phn/jdcal"
 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=("https://pypi.python.org/packages/source/j/jdcal/${_realname}-${pkgver}.tar.gz")
 sha256sums=('472872e096eb8df219c23f2689fc336668bdb43d194094b5cc1707e1640acfc8')
 
-build() {
-  cd "${srcdir}/${_realname}-${pkgver}"
+prepare() {
+  cd "${srcdir}"
+  rm -rf python-build-${CARCH} | true
+  cp -r "${_realname}-${pkgver}" "python-build-${CARCH}"
+}
 
-  ${MINGW_PREFIX}/bin/python3 setup.py build
+build() {
+  cd "${srcdir}/python-build-${CARCH}"
+  ${MINGW_PREFIX}/bin/python setup.py build
 }
 
 package() {
-  cd "${srcdir}/${_realname}-${pkgver}"
-
+  cd "${srcdir}/python-build-${CARCH}"
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
-  ${MINGW_PREFIX}/bin/python3 setup.py install --prefix=${MINGW_PREFIX} \
+  ${MINGW_PREFIX}/bin/python setup.py install --prefix=${MINGW_PREFIX} \
     --root="${pkgdir}" --optimize=1 --skip-build
 
-  install -Dm644 LICENSE.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-jedi/PKGBUILD b/mingw-w64-python-jedi/PKGBUILD
index 374dfdc2f8..d34b1c2d59 100644
--- a/mingw-w64-python-jedi/PKGBUILD
+++ b/mingw-w64-python-jedi/PKGBUILD
@@ -2,47 +2,50 @@
 
 _realname=jedi
 pkgbase=mingw-w64-python-${_realname}
-pkgname=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
-pkgver=0.15.1
-pkgrel=3
+pkgname=("${MINGW_PACKAGE_PREFIX}-python-${_realname}")
+provides=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+conflicts=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+replaces=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+pkgver=0.15.2
+pkgrel=1
 pkgdesc="Awesome autocompletion for python (mingw-w64)"
 arch=('any')
 url='https://github.com/davidhalter/jedi'
 license=('MIT')
-depends=("${MINGW_PACKAGE_PREFIX}-python3"
-         "${MINGW_PACKAGE_PREFIX}-python3-parso" )
-makedepends=("${MINGW_PACKAGE_PREFIX}-python3-setuptools"
+depends=("${MINGW_PACKAGE_PREFIX}-python"
+         "${MINGW_PACKAGE_PREFIX}-python-parso")
+makedepends=("${MINGW_PACKAGE_PREFIX}-python-setuptools"
              "git")
-checkdepends=("${MINGW_PACKAGE_PREFIX}-python3-pytest")
+checkdepends=("${MINGW_PACKAGE_PREFIX}-python-pytest")
 options=('staticlibs' 'strip' '!debug')
 source=("https://pypi.python.org/packages/source/${_realname:0:1}/${_realname}/${_realname}-${pkgver}.tar.gz")
-sha256sums=('ba859c74fa3c966a22f2aeebe1b74ee27e2a462f56d3f5f7ca4a59af61bfe42e')
+sha256sums=('e909527104a903606dd63bea6e8e888833f0ef087057829b89a18364a856f807')
 
 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}"
-
+  cd "${srcdir}/python-build-${CARCH}"
   ${MINGW_PREFIX}/bin/pytest test || warning 'Ignoring test_pyc failure'
 }
 
 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-jsonschema/PKGBUILD b/mingw-w64-python-jsonschema/PKGBUILD
index 0e15241d58..b8d8ef6b99 100644
--- a/mingw-w64-python-jsonschema/PKGBUILD
+++ b/mingw-w64-python-jsonschema/PKGBUILD
@@ -2,46 +2,49 @@
 
 _realname=jsonschema
 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=1
 pkgdesc="An implementation of JSON Schema validation for Python (mingw-w64)"
 arch=('any')
 url="https://pypi.python.org/pypi/jsonschema"
 license=('MIT')
-depends=("${MINGW_PACKAGE_PREFIX}-python3"
-         "${MINGW_PACKAGE_PREFIX}-python3-setuptools"
-         "${MINGW_PACKAGE_PREFIX}-python3-attrs"
-         "${MINGW_PACKAGE_PREFIX}-python3-pyrsistent"
-         "${MINGW_PACKAGE_PREFIX}-python3-importlib-metadata")
-makedepends=("${MINGW_PACKAGE_PREFIX}-python3-setuptools-scm")
-_dtoken="58/b9/171dbb07e18c6346090a37f03c7e74410a1a56123f847efed59af260a298"
+depends=("${MINGW_PACKAGE_PREFIX}-python"
+         "${MINGW_PACKAGE_PREFIX}-python-setuptools"
+         "${MINGW_PACKAGE_PREFIX}-python-attrs"
+         "${MINGW_PACKAGE_PREFIX}-python-pyrsistent"
+         "${MINGW_PACKAGE_PREFIX}-python-importlib-metadata")
+makedepends=("${MINGW_PACKAGE_PREFIX}-python-setuptools-scm")
+install=${_realname}3-${CARCH}.install
 source=("${_realname}-${pkgver}.tar.gz::https://github.com/Julian/jsonschema/archive/v${pkgver}.tar.gz")
 sha256sums=('026ffa0674256c9b0fda123ea84774d6650a949bb71eebf5d87f90ec255b7c9e')
 
 prepare() {
+  rm -rf python-build-${CARCH} | true
+  cp -r "${_realname}-${pkgver}" "python-build-${CARCH}"
+
   export SETUPTOOLS_SCM_PRETEND_VERSION=${pkgver}
 }
 
 build() {
-  cd "${srcdir}/${_realname}-${pkgver}"
-
-  ${MINGW_PREFIX}/bin/python3 setup.py build
+  cd "${srcdir}/python-build-${CARCH}"
+  ${MINGW_PREFIX}/bin/python setup.py build
 }
 
 package() {
-  install=${_realname}3-${CARCH}.install
-
-  cd "${srcdir}/${_realname}-${pkgver}"
+  cd "${srcdir}/python-build-${CARCH}"
 
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
-  ${MINGW_PREFIX}/bin/python3 setup.py install \
-    --prefix=${MINGW_PREFIX} --root=${pkgdir} --optimize=1
+  ${MINGW_PREFIX}/bin/python setup.py install \
+    --prefix=${MINGW_PREFIX} --root=${pkgdir} --optimize=1 --skip-build
 
   find "${pkgdir}/" -name "*.pyc" -delete
   find "${pkgdir}/" -type d -empty -delete
 
-  install -D -m644 json/LICENSE ${pkgdir}${MINGW_PREFIX}/share/licenses/python3-${_realname}/LICENSE
+  install -D -m644 json/LICENSE ${pkgdir}${MINGW_PREFIX}/share/licenses/python-${_realname}/LICENSE
   
   local _mingw_prefix=$(cygpath -am ${MINGW_PREFIX})
   for _ff in ${pkgdir}${MINGW_PREFIX}/bin/*.py; do
diff --git a/mingw-w64-python-jupyter-nbconvert/PKGBUILD b/mingw-w64-python-jupyter-nbconvert/PKGBUILD
index a0a28a2cf3..687252af67 100644
--- a/mingw-w64-python-jupyter-nbconvert/PKGBUILD
+++ b/mingw-w64-python-jupyter-nbconvert/PKGBUILD
@@ -2,55 +2,58 @@
 
 _realname=nbconvert
 pkgbase=mingw-w64-python-${_realname}
-pkgname=("${MINGW_PACKAGE_PREFIX}-python3-jupyter-${_realname}")
+pkgname=("${MINGW_PACKAGE_PREFIX}-python-jupyter-${_realname}")
+provides=("${MINGW_PACKAGE_PREFIX}-python3-jupyter-${_realname}")
+conflicts=("${MINGW_PACKAGE_PREFIX}-python3-jupyter-${_realname}")
+replaces=("${MINGW_PACKAGE_PREFIX}-python3-jupyter-${_realname}")
 pkgver=5.6.1
 pkgrel=1
 pkgdesc="Convert Jupyter notebooks to other formats (mingw-w64)"
 arch=('any')
 url='https://pypi.python.org/pypi/nbconvert'
 license=('BSD')
-depends=("${MINGW_PACKAGE_PREFIX}-python3"
-         "${MINGW_PACKAGE_PREFIX}-python3-defusedxml"
-         "${MINGW_PACKAGE_PREFIX}-python3-jupyter_client"
-         "${MINGW_PACKAGE_PREFIX}-python3-jupyter-nbformat"
-         "${MINGW_PACKAGE_PREFIX}-python3-pygments"
-         "${MINGW_PACKAGE_PREFIX}-python3-mistune"
-         "${MINGW_PACKAGE_PREFIX}-python3-jinja"
-         "${MINGW_PACKAGE_PREFIX}-python3-entrypoints"
-         "${MINGW_PACKAGE_PREFIX}-python3-traitlets"
-         "${MINGW_PACKAGE_PREFIX}-python3-pandocfilters"
-         "${MINGW_PACKAGE_PREFIX}-python3-bleach"
-         "${MINGW_PACKAGE_PREFIX}-python3-testpath"
+depends=("${MINGW_PACKAGE_PREFIX}-python"
+         "${MINGW_PACKAGE_PREFIX}-python-defusedxml"
+         "${MINGW_PACKAGE_PREFIX}-python-jupyter_client"
+         "${MINGW_PACKAGE_PREFIX}-python-jupyter-nbformat"
+         "${MINGW_PACKAGE_PREFIX}-python-pygments"
+         "${MINGW_PACKAGE_PREFIX}-python-mistune"
+         "${MINGW_PACKAGE_PREFIX}-python-jinja"
+         "${MINGW_PACKAGE_PREFIX}-python-entrypoints"
+         "${MINGW_PACKAGE_PREFIX}-python-traitlets"
+         "${MINGW_PACKAGE_PREFIX}-python-pandocfilters"
+         "${MINGW_PACKAGE_PREFIX}-python-bleach"
+         "${MINGW_PACKAGE_PREFIX}-python-testpath"
          )
 install=${_realname}3-${CARCH}.install
-makedepends=("${MINGW_PACKAGE_PREFIX}-python3-setuptools")
+makedepends=("${MINGW_PACKAGE_PREFIX}-python-setuptools")
 source=("${_realname}-${pkgver}.tar.gz::https://github.com/jupyter/${_realname}/archive/${pkgver}.tar.gz")
 sha256sums=('444adfbedfe1f63da86fc74f1f2f317e2555a679b81676b08bf1508142d8010b')
 
 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
 }
 
 check() {
-  msg "Python 3 test for ${CARCH}"
-  cd "${srcdir}/python3-build-${CARCH}"
-#Todo: Fix a test and possibly nbconvert.  The problem is that it attempts
-#to use inkscape but it locates it using the Windows registry and the MINGW
-#version from these doesn't set the registry.
+  msg "Python test for ${CARCH}"
+  cd "${srcdir}/python-build-${CARCH}"
+  #Todo: Fix a test and possibly nbconvert. The problem is that it attempts
+  #to use inkscape but it locates it using the Windows registry and the MINGW
+  #version from these doesn't set the registry.
   ${MINGW_PREFIX}/bin/py.test --pyargs nbconvert || 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
 
   local PREFIX_WIN=$(cygpath -wm ${MINGW_PREFIX})
@@ -59,6 +62,5 @@ package() {
     sed -e "s|${PREFIX_WIN}|${MINGW_PREFIX}|g" -i ${_f}
   done
 
-  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-jupyter-nbformat/PKGBUILD b/mingw-w64-python-jupyter-nbformat/PKGBUILD
index 764ed8a220..4cf9b63c8b 100644
--- a/mingw-w64-python-jupyter-nbformat/PKGBUILD
+++ b/mingw-w64-python-jupyter-nbformat/PKGBUILD
@@ -2,41 +2,43 @@
 
 _realname=nbformat
 pkgbase=mingw-w64-python-${_realname}
-pkgname=("${MINGW_PACKAGE_PREFIX}-python3-jupyter-${_realname}")
+pkgname=("${MINGW_PACKAGE_PREFIX}-python-jupyter-${_realname}")
+provides=("${MINGW_PACKAGE_PREFIX}-python3-jupyter-${_realname}")
+conflicts=("${MINGW_PACKAGE_PREFIX}-python3-jupyter-${_realname}")
+replaces=("${MINGW_PACKAGE_PREFIX}-python3-jupyter-${_realname}")
 pkgver=4.4.0
-pkgrel=3
+pkgrel=1
 pkgdesc="The base implementation of the Jupyter Notebook format and Python APIs for working with notebooks (mingw-w64)"
 url="https://pypi.python.org/pypi/nbformat"
 arch=('any')
 license=('BSD')
-makedepends=("${MINGW_PACKAGE_PREFIX}-python3-setuptools")
+depends=("${MINGW_PACKAGE_PREFIX}-python"
+         "${MINGW_PACKAGE_PREFIX}-python-traitlets"
+         "${MINGW_PACKAGE_PREFIX}-python-jsonschema"
+         "${MINGW_PACKAGE_PREFIX}-python-jupyter_core")
+makedepends=("${MINGW_PACKAGE_PREFIX}-python-setuptools")
 source=(${_realname}-${pkgver}.tar.gz::https://github.com/jupyter/nbformat/archive/${pkgver}.tar.gz)
 sha256sums=('cfa7b2dbb81ab7a64492f09f2cb65d69a1d009fe5d6e18ee7bb94446b114ede3')
 
 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() {
-  depends=("${MINGW_PACKAGE_PREFIX}-python3"
-           "${MINGW_PACKAGE_PREFIX}-python3-traitlets"
-           "${MINGW_PACKAGE_PREFIX}-python3-jsonschema"
-           "${MINGW_PACKAGE_PREFIX}-python3-jupyter_core")
-
-  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 --root=${pkgdir} --prefix=${MINGW_PREFIX} --optimize=1
+  ${MINGW_PREFIX}/bin/python setup.py install --root=${pkgdir} --prefix=${MINGW_PREFIX} --optimize=1 --skip-build
 
-  install -D -m644 COPYING.md ${pkgdir}${MINGW_PREFIX}/share/licenses/python3-${_realname}/LICENSE
+  install -D -m644 COPYING.md ${pkgdir}${MINGW_PREFIX}/share/licenses/python-${_realname}/LICENSE
 
   local PREFIX_WIN=$(cygpath -wm ${MINGW_PREFIX})
   # fix python command in files
diff --git a/mingw-w64-python-jupyter-notebook/PKGBUILD b/mingw-w64-python-jupyter-notebook/PKGBUILD
index e300b65a1a..c676475b3b 100644
--- a/mingw-w64-python-jupyter-notebook/PKGBUILD
+++ b/mingw-w64-python-jupyter-notebook/PKGBUILD
@@ -7,37 +7,39 @@
 
 _realname=notebook
 pkgbase=mingw-w64-python-${_realname}
-pkgname=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
-pkgver=6.0.1
+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.2
 pkgrel=1
 pkgdesc="The language-agnostic HTML notebook application for Project Jupyter"
 arch=('any')
 url="https://github.com/jupyter/notebook"
 license=('BSD')
 install=jupyter_notebook3-${CARCH}.install
-depends=("${MINGW_PACKAGE_PREFIX}-python3"
-         "${MINGW_PACKAGE_PREFIX}-python3-jupyter_core"
-         "${MINGW_PACKAGE_PREFIX}-python3-jupyter_client"
-         "${MINGW_PACKAGE_PREFIX}-python3-jupyter-nbformat"
-         "${MINGW_PACKAGE_PREFIX}-python3-jupyter-nbconvert"
-         "${MINGW_PACKAGE_PREFIX}-python3-ipywidgets"
-         "${MINGW_PACKAGE_PREFIX}-python3-jinja"
-         "${MINGW_PACKAGE_PREFIX}-python3-traitlets"
-         "${MINGW_PACKAGE_PREFIX}-python3-tornado"
-         "${MINGW_PACKAGE_PREFIX}-python3-terminado"
-         "${MINGW_PACKAGE_PREFIX}-python3-send2trash"
-         "${MINGW_PACKAGE_PREFIX}-python3-prometheus-client"
+depends=("${MINGW_PACKAGE_PREFIX}-python"
+         "${MINGW_PACKAGE_PREFIX}-python-jupyter_core"
+         "${MINGW_PACKAGE_PREFIX}-python-jupyter_client"
+         "${MINGW_PACKAGE_PREFIX}-python-jupyter-nbformat"
+         "${MINGW_PACKAGE_PREFIX}-python-jupyter-nbconvert"
+         "${MINGW_PACKAGE_PREFIX}-python-ipywidgets"
+         "${MINGW_PACKAGE_PREFIX}-python-jinja"
+         "${MINGW_PACKAGE_PREFIX}-python-traitlets"
+         "${MINGW_PACKAGE_PREFIX}-python-tornado"
+         "${MINGW_PACKAGE_PREFIX}-python-terminado"
+         "${MINGW_PACKAGE_PREFIX}-python-send2trash"
+         "${MINGW_PACKAGE_PREFIX}-python-prometheus-client"
 #         "${MINGW_PACKAGE_PREFIX}-mathjax"
          )
-makedepends=("${MINGW_PACKAGE_PREFIX}-python3-setuptools"
-             "${MINGW_PACKAGE_PREFIX}-python3-setuptools"
+makedepends=("${MINGW_PACKAGE_PREFIX}-python-setuptools"
              "${MINGW_PACKAGE_PREFIX}-nodejs"
              "${MINGW_PACKAGE_PREFIX}-yarn"
              "${MINGW_PACKAGE_PREFIX}-bower"
-             )
+            )
 source=("${_realname}-${pkgver}.tgz::https://github.com/jupyter/notebook/archive/${pkgver}.tar.gz"
         "001-jupyter-notebook-MINGW.patch")
-sha256sums=('fb9bff7913c9e4b148e0a4df41aa527a7c4fd5f01fc7ec3cab03aa07eb6a19d4'
+sha256sums=('c87b63b7bcdc9404478940b23b652135ef61d0feea1c8cf1cf00cb34190a6774'
             '0362ef7944792188d8202bdedd7b51b9a0a06867ea43f480bf8318b163d3b616')
 
 prepare(){
@@ -48,21 +50,22 @@ prepare(){
 build() {
   cd "${srcdir}/${_realname}-${pkgver}"
   start //wait ${MINGW_PREFIX}/bin/npm install
-  ${MINGW_PREFIX}/bin/python3 setup.py build
+  ${MINGW_PREFIX}/bin/python setup.py build
 }
 
 package() {
   cd "${srcdir}/${_realname}-${pkgver}"
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
-  ${MINGW_PREFIX}/bin/python3 setup.py install --prefix=${MINGW_PREFIX} \
+  ${MINGW_PREFIX}/bin/python setup.py install --prefix=${MINGW_PREFIX} \
     --root="${pkgdir}" --optimize=1 --skip-build
 
-  install -Dm644 COPYING.md "${pkgdir}${MINGW_PREFIX}/share/licenses/python3-${_realname}/LICENSE"
+  install -Dm644 COPYING.md "${pkgdir}${MINGW_PREFIX}/share/licenses/python-${_realname}/LICENSE"
 
   # Remove hard coded library paths in css map files
   local TOKEN_TOREPLACE=$(cygpath -am ${srcdir}/${_realname}-${pkgver}/${_realname}/static)
 
-  pushd "${pkgdir}${MINGW_PREFIX}/lib/python3.7/site-packages/notebook/static/style/" > /dev/null
+  local _py3ver=$(${MINGW_PREFIX}/bin/python -c "import sys;sys.stdout.write('.'.join(map(str, sys.version_info[:2])))")
+  pushd "${pkgdir}${MINGW_PREFIX}/lib/python${_py3ver}/site-packages/notebook/static/style/" > /dev/null
   sed -s "s|${TOKEN_TOREPLACE}|..|g" -i ./ipython.min.css.map
   sed -s "s|${TOKEN_TOREPLACE}|..|g" -i ./style.min.css.map
   popd > /dev/null
diff --git a/mingw-w64-python-jupyter_client/PKGBUILD b/mingw-w64-python-jupyter_client/PKGBUILD
index 393bf62d38..f776752999 100644
--- a/mingw-w64-python-jupyter_client/PKGBUILD
+++ b/mingw-w64-python-jupyter_client/PKGBUILD
@@ -2,42 +2,48 @@
 
 _realname=jupyter_client
 pkgbase=mingw-w64-python-jupyter_client
-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=5.3.4
 pkgrel=2
 pkgdesc="The reference implementation of the Jupyter protocol (mingw-w64)"
 arch=('any')
 url="https://jupyter.org/"
 license=('BSD')
-depends=("${MINGW_PACKAGE_PREFIX}-python3"
-         "${MINGW_PACKAGE_PREFIX}-python3-ipykernel"
-         "${MINGW_PACKAGE_PREFIX}-python3-jupyter_core"
-         "${MINGW_PACKAGE_PREFIX}-python3-pyzmq")
-makedepends=("${MINGW_PACKAGE_PREFIX}-python3-setuptools")
+depends=("${MINGW_PACKAGE_PREFIX}-python"
+         "${MINGW_PACKAGE_PREFIX}-python-dateutil"
+         "${MINGW_PACKAGE_PREFIX}-python-entrypoints"
+         "${MINGW_PACKAGE_PREFIX}-python-jupyter_core"
+         "${MINGW_PACKAGE_PREFIX}-python-pyzmq"
+         "${MINGW_PACKAGE_PREFIX}-python-tornado"
+         "${MINGW_PACKAGE_PREFIX}-python-traitlets")
+makedepends=("${MINGW_PACKAGE_PREFIX}-python-setuptools")
+install=${_realname}3-${CARCH}.install
 source=("${_realname}-${pkgver}.tar.gz::https://github.com/jupyter/jupyter_client/archive/${pkgver}.tar.gz")
 sha256sums=('2af6f0e0e4d88009b11103490bea0bfb405c1c470e226c2b7b17c10e5dda9734')
 
 prepare() {
-  cd "${srcdir}/${_realname}-${pkgver}"
+  cd "${srcdir}"
+  rm -rf python-build-${CARCH} | true
+  cp -r "${_realname}-${pkgver}" "python-build-${CARCH}"
 
   # Set version for setuptools_scm
-  export SETUPTOOLS_SCM_PRETEND_VERSION=$pkgver
+  export SETUPTOOLS_SCM_PRETEND_VERSION=${pkgver}
 }
 
 build() {
-  cd "${srcdir}/${_realname}-${pkgver}"
-
-  ${MINGW_PREFIX}/bin/python3 setup.py build
+  cd "${srcdir}/python-build-${CARCH}"
+  ${MINGW_PREFIX}/bin/python setup.py build
 }
 
 package() {
-  install=${_realname}3-${CARCH}.install
-
-  cd "${srcdir}/${_realname}-${pkgver}"
+  cd "${srcdir}/python-build-${CARCH}"
 
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
-  ${MINGW_PREFIX}/bin/python3 setup.py install \
-    --prefix=${MINGW_PREFIX} --root=${pkgdir} --optimize=0
+  ${MINGW_PREFIX}/bin/python setup.py install \
+    --prefix=${MINGW_PREFIX} --root=${pkgdir} --optimize=0 --skip-build
 
   find "${pkgdir}/" -name "*.pyc" -delete
   find "${pkgdir}/" -type d -empty -delete
@@ -48,5 +54,5 @@ package() {
     sed -e "s|${PREFIX_WIN}|${MINGW_PREFIX}|g" -i ${_f}
   done
 
-  install -Dm644 "COPYING.md" "${pkgdir}${MINGW_PREFIX}/share/licenses/python3-${_realname}/LICENSE"
+  install -Dm644 "COPYING.md" "${pkgdir}${MINGW_PREFIX}/share/licenses/python-${_realname}/LICENSE"
 }
diff --git a/mingw-w64-python-jupyter_core/PKGBUILD b/mingw-w64-python-jupyter_core/PKGBUILD
index 72a3c67da8..8548bf7f16 100644
--- a/mingw-w64-python-jupyter_core/PKGBUILD
+++ b/mingw-w64-python-jupyter_core/PKGBUILD
@@ -2,40 +2,42 @@
 
 _realname=jupyter_core
 pkgbase=mingw-w64-python-${_realname}
-pkgname=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+pkgname=("${MINGW_PACKAGE_PREFIX}-python-${_realname}")
+provides=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+conflicts=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+replaces=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
 pkgver=4.6.1
-pkgrel=3
+pkgrel=1
 pkgdesc="Core common functionality of Jupyter projects (mingw-w64)"
 arch=('any')
 url="https://jupyter.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")
+install=${_realname}3-${CARCH}.install
 source=("${_realname}-${pkgver}.tar.gz"::"https://github.com/jupyter/jupyter_core/archive/${pkgver}.tar.gz")
 sha256sums=('f08266c2ff4fa7bdb9c0a9b1f22305b9a5a92f991df246e2c3ec65664627f1f4')
 
 prepare() {
-  cd "${srcdir}/${_realname}-${pkgver}"
+  cd "${srcdir}"
+  rm -rf python-build-${CARCH} | true
+  cp -r "${_realname}-${pkgver}" "python-build-${CARCH}"
 
   # Set version for setuptools_scm
-  export SETUPTOOLS_SCM_PRETEND_VERSION=$pkgver
+  export SETUPTOOLS_SCM_PRETEND_VERSION=${pkgver}
 }
 
 build() {
-  cd "${srcdir}/${_realname}-${pkgver}"
-
-  ${MINGW_PREFIX}/bin/python3 setup.py build
+  cd "${srcdir}/python-build-${CARCH}"
+  ${MINGW_PREFIX}/bin/python setup.py build
 }
 
 package() {
-  install=${_realname}3-${CARCH}.install
-
-  cd "${srcdir}/${_realname}-${pkgver}"
+  cd "${srcdir}/python-build-${CARCH}"
 
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
-  ${MINGW_PREFIX}/bin/python3 setup.py install \
-    --prefix=${MINGW_PREFIX} \
-    --root="${pkgdir}" --optimize=1 --skip-build
+  ${MINGW_PREFIX}/bin/python setup.py install \
+    --prefix=${MINGW_PREFIX} --root="${pkgdir}" --optimize=1 --skip-build
 
   find "${pkgdir}/" -name "*.pyc" -delete
   find "${pkgdir}/" -type d -empty -delete
@@ -46,5 +48,5 @@ package() {
     sed -e "s|${PREFIX_WIN}|${MINGW_PREFIX}|g" -i ${_f}
   done
 
-  install -Dm644 "COPYING.md" "${pkgdir}${MINGW_PREFIX}/share/licenses/python3-${_realname}/LICENSE"
+  install -Dm644 "COPYING.md" "${pkgdir}${MINGW_PREFIX}/share/licenses/python-${_realname}/LICENSE"
 }
diff --git a/mingw-w64-python-kiwisolver/PKGBUILD b/mingw-w64-python-kiwisolver/PKGBUILD
index 151cf5f560..6a8bba8b09 100644
--- a/mingw-w64-python-kiwisolver/PKGBUILD
+++ b/mingw-w64-python-kiwisolver/PKGBUILD
@@ -2,28 +2,35 @@
 
 _realname=kiwisolver
 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="A fast implementation of the Cassowary constraint solver (mingw-w64)"
 arch=('any')
 url='https://github.com/nucleic/kiwi'
 license=('PerlArtistic')
-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/nucleic/kiwi/archive/${pkgver}.tar.gz")
 sha256sums=('48168c0ace18319c649e31907f6d8586f648e503560f506f128798b99393bcdb')
 
-build() {
-  cd "$srcdir/kiwi-${pkgver}"
+prepare() {
+  cd "${srcdir}"
+  rm -rf python-build-${CARCH} | true
+  cp -r "kiwi-${pkgver}" "python-build-${CARCH}"
+}
 
-  ${MINGW_PREFIX}/bin/python3 setup.py build
+build() {
+  cd "${srcdir}/python-build-${CARCH}"
+  ${MINGW_PREFIX}/bin/python setup.py build
 }
 
 package() {
-  cd "$srcdir/kiwi-${pkgver}"
-
+  cd "${srcdir}/python-build-${CARCH}"
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
-  ${MINGW_PREFIX}/bin/python3 setup.py install --prefix=${MINGW_PREFIX} \
+  ${MINGW_PREFIX}/bin/python setup.py install --prefix=${MINGW_PREFIX} \
     --root="${pkgdir}" --optimize=1 --skip-build
 }
diff --git a/mingw-w64-python-lazy-object-proxy/PKGBUILD b/mingw-w64-python-lazy-object-proxy/PKGBUILD
index d3ecb23fe7..393a379e94 100644
--- a/mingw-w64-python-lazy-object-proxy/PKGBUILD
+++ b/mingw-w64-python-lazy-object-proxy/PKGBUILD
@@ -2,36 +2,39 @@
 
 _realname=lazy-object-proxy
 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=2
+pkgrel=1
 pkgdesc="A fast and thorough lazy object proxy (mingw-w64)"
 arch=('any')
 url="https://github.com/ionelmc/python-lazy-object-proxy"
 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/ionelmc/python-lazy-object-proxy/archive/v${pkgver}.tar.gz")
 sha256sums=('ce4c9872869331d509ff2b7be19fdddb1dc4b922d14aa62675770e3caebd92e2')
 
 prepare() {
   cd "${srcdir}"
-  rm -rf python3-build-${CARCH} | true
-  cp -r "python-${_realname}-${pkgver}" "python3-build-${CARCH}"
+  rm -rf python-build-${CARCH} | true
+  cp -r "python-${_realname}-${pkgver}" "python-build-${CARCH}"
 }
 
 build() {
-    msg "Python 3 build for ${CARCH}"  
-    cd "${srcdir}/python3-build-${CARCH}"
-    ${MINGW_PREFIX}/bin/python3 setup.py build
+    msg "Python build for ${CARCH}"  
+    cd "${srcdir}/python-build-${CARCH}"
+    ${MINGW_PREFIX}/bin/python setup.py build
 }
 
 package() {
-  cd "${srcdir}/python3-build-${CARCH}"
+  cd "${srcdir}/python-build-${CARCH}"
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
-  ${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-mako/PKGBUILD b/mingw-w64-python-mako/PKGBUILD
index cc8460bd3b..c3624ab166 100644
--- a/mingw-w64-python-mako/PKGBUILD
+++ b/mingw-w64-python-mako/PKGBUILD
@@ -3,40 +3,46 @@
 
 _realname=mako
 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=2
+pkgrel=1
 pkgdesc="A super-fast templating language that borrows the best ideas from the existing templating languages (mingw-w64)"
 arch=('any')
 license=('custom')
 url="https://pypi.python.org/pypi/Mako"
-depends=("${MINGW_PACKAGE_PREFIX}-python3-markupsafe"
-         "${MINGW_PACKAGE_PREFIX}-python3-beaker")
-makedepends=("${MINGW_PACKAGE_PREFIX}-python3-setuptools")
-checkdepends=("${MINGW_PACKAGE_PREFIX}-python3-nose")
+depends=("${MINGW_PACKAGE_PREFIX}-python-markupsafe"
+         "${MINGW_PACKAGE_PREFIX}-python-beaker")
+makedepends=("${MINGW_PACKAGE_PREFIX}-python-setuptools")
+checkdepends=("${MINGW_PACKAGE_PREFIX}-python-nose")
 options=('staticlibs')
+install=${_realname}3-${CARCH}.install
 source=("https://pypi.org/packages/source/M/Mako/Mako-${pkgver}.tar.gz")
 sha256sums=('a36919599a9b7dc5d86a7a8988f23a9a3a3d083070023bab23d64f7f1d1e0a4b')
 
-build() {
-  cd "${srcdir}/${_realname}-${pkgver}"
+prepare() {  
+  cd "${srcdir}"
+  rm -rf python-build-${CARCH} | true
+  cp -r "${_realname}-${pkgver}" "python-build-${CARCH}"
+}
 
-  ${MINGW_PREFIX}/bin/python3 setup.py build
+build() {
+  cd "${srcdir}/python-build-${CARCH}"
+  ${MINGW_PREFIX}/bin/python setup.py build
 }
 
 check() {
-  cd "${srcdir}/${_realname}-${pkgver}"
-
-  ${MINGW_PREFIX}/bin/python3 setup.py test || true
+  cd "${srcdir}/python-build-${CARCH}"
+  ${MINGW_PREFIX}/bin/python setup.py test || true
 }
 
 package() {
-  install=${_realname}3-${CARCH}.install
-
-  cd "${srcdir}/${_realname}-${pkgver}"
+  cd "${srcdir}/python-build-${CARCH}"
 
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
-    ${MINGW_PREFIX}/bin/python3 setup.py install --prefix=${MINGW_PREFIX} --root="${pkgdir}" -O1
+    ${MINGW_PREFIX}/bin/python setup.py install --prefix=${MINGW_PREFIX} --root="${pkgdir}" -O1
 
   # fix python command in files
   local _mingw_prefix=$(cygpath -am ${MINGW_PREFIX})
@@ -44,5 +50,5 @@ package() {
     sed -e "s|${_mingw_prefix}|${MINGW_PREFIX}|g" -i ${_f}
   done
 
-  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-matplotlib/PKGBUILD b/mingw-w64-python-matplotlib/PKGBUILD
index 1c87ac4ee0..e84f07ac39 100644
--- a/mingw-w64-python-matplotlib/PKGBUILD
+++ b/mingw-w64-python-matplotlib/PKGBUILD
@@ -2,29 +2,31 @@
 
 _realname=matplotlib
 pkgbase=mingw-w64-python3-${_realname}
-pkgname=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+pkgname=("${MINGW_PACKAGE_PREFIX}-python-${_realname}")
+provides=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+conflicts=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+replaces=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
 pkgver=3.1.2
 pkgrel=1
 pkgdesc="A python plotting library, making publication quality plots (mingw-w64)"
 arch=('any')
 url='https://matplotlib.org/'
 license=('custom')
-depends=("${MINGW_PACKAGE_PREFIX}-python3-pytz"
-         "${MINGW_PACKAGE_PREFIX}-python3-numpy"
-         "${MINGW_PACKAGE_PREFIX}-python3-cycler"
-         "${MINGW_PACKAGE_PREFIX}-python3-dateutil"
-         "${MINGW_PACKAGE_PREFIX}-python3-pyparsing"
-         "${MINGW_PACKAGE_PREFIX}-python3-kiwisolver"
+depends=("${MINGW_PACKAGE_PREFIX}-python-pytz"
+         "${MINGW_PACKAGE_PREFIX}-python-numpy"
+         "${MINGW_PACKAGE_PREFIX}-python-cycler"
+         "${MINGW_PACKAGE_PREFIX}-python-dateutil"
+         "${MINGW_PACKAGE_PREFIX}-python-pyparsing"
+         "${MINGW_PACKAGE_PREFIX}-python-kiwisolver"
          "${MINGW_PACKAGE_PREFIX}-freetype"
          "${MINGW_PACKAGE_PREFIX}-libpng")
-makedepends=("${MINGW_PACKAGE_PREFIX}-python3"
-             "${MINGW_PACKAGE_PREFIX}-python3-setuptools")
-optdepends=("${MINGW_PACKAGE_PREFIX}-python3-pyqt5: Qt5Agg/Qt5Cairo backend"
+makedepends=("${MINGW_PACKAGE_PREFIX}-python"
+             "${MINGW_PACKAGE_PREFIX}-python-setuptools")
+optdepends=("${MINGW_PACKAGE_PREFIX}-python-pyqt5: Qt5Agg/Qt5Cairo backend"
             "${MINGW_PACKAGE_PREFIX}-gtk3: GTK3Agg/GTK3Cairo backend"
-            "${MINGW_PACKAGE_PREFIX}-python3-gobject: GTK3Agg/GTK3Cairo backend"
-            "${MINGW_PACKAGE_PREFIX}-python3-cairo: cairo/GTK3Cairo/Qt5Cairo backend"
-            "${MINGW_PACKAGE_PREFIX}-python3-tornado: WebAgg backend")
-
+            "${MINGW_PACKAGE_PREFIX}-python-gobject: GTK3Agg/GTK3Cairo backend"
+            "${MINGW_PACKAGE_PREFIX}-python-cairo: cairo/GTK3Cairo/Qt5Cairo backend"
+            "${MINGW_PACKAGE_PREFIX}-python-tornado: WebAgg backend")
 source=("${_realname}-${pkgver}.tar.gz"::"https://github.com/matplotlib/matplotlib/archive/v${pkgver}.tar.gz"
         "https://jqueryui.com/resources/download/jquery-ui-1.12.1.zip"
         setupext.py.patch)
@@ -34,28 +36,31 @@ sha256sums=('a48803e79013d01f22454fd718a575c6f9dadced211722637487fc2f7803620e'
 
 prepare() {
   cd "${srcdir}/${_realname}-${pkgver}"
-
   patch -p1 -i ${srcdir}/setupext.py.patch
+
+  cd ${srcdir}
+  rm -rf python-build-${CARCH} | true
+  cp -r "${_realname}-${pkgver}" "python-build-${CARCH}"
 }
 
 build() {
-  cd "${srcdir}/${_realname}-${pkgver}"
+  cd "${srcdir}/python-build-${CARCH}"
 
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
-    ${MINGW_PREFIX}/bin/python3 setup.py build
+    ${MINGW_PREFIX}/bin/python setup.py build
 }
 
 package() {
-  cd "${srcdir}/${_realname}-${pkgver}"
+  cd "${srcdir}/python-build-${CARCH}"
 
-  local pyver=$(${MINGW_PREFIX}/bin/python3 -c "import sys;sys.stdout.write('.'.join(map(str, sys.version_info[:2])))")
+  local pyver=$(${MINGW_PREFIX}/bin/python -c "import sys;sys.stdout.write('.'.join(map(str, sys.version_info[:2])))")
   local query_dest="${pkgdir}${MINGW_PREFIX}/lib/python${pyver}/site-packages/matplotlib/backends/web_backend"
   mkdir -p "${query_dest}"
   cp -R "${srcdir}/jquery-ui-1.12.1" "${query_dest}"
 
   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 doc/users/license.rst "${pkgdir}${MINGW_PREFIX}"/share/licenses/python3-matplotlib/LICENSE
+  install -Dm644 doc/users/license.rst "${pkgdir}${MINGW_PREFIX}"/share/licenses/python-matplotlib/LICENSE
 }
diff --git a/mingw-w64-python-mccabe/PKGBUILD b/mingw-w64-python-mccabe/PKGBUILD
index ac20285b9e..ec88bdced7 100644
--- a/mingw-w64-python-mccabe/PKGBUILD
+++ b/mingw-w64-python-mccabe/PKGBUILD
@@ -2,17 +2,20 @@
 
 _realname=mccabe
 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.1
-pkgrel=3
+pkgrel=1
 pkgdesc="McCabe complexity checker for Python (mingw-w64)"
 arch=('any')
 url='https://github.com/flintwork/mccabe'
 license=('custom:Expat')
 validpgpkeys=('gpg_KEY')
-depends=("${MINGW_PACKAGE_PREFIX}-python3")
-makedepends=("${MINGW_PACKAGE_PREFIX}-python3-pytest-runner"
-             "${MINGW_PACKAGE_PREFIX}-python3-setuptools")
+depends=("${MINGW_PACKAGE_PREFIX}-python")
+makedepends=("${MINGW_PACKAGE_PREFIX}-python-pytest-runner"
+             "${MINGW_PACKAGE_PREFIX}-python-setuptools")
 options=('staticlibs' 'strip' '!debug')
 source=("${_realname}-${pkgver}.tar.gz::https://github.com/flintwork/mccabe/archive/${pkgver}.tar.gz"
         fix-metadata.patch)
diff --git a/mingw-w64-python-mimeparse/PKGBUILD b/mingw-w64-python-mimeparse/PKGBUILD
index 49a28dbdcb..ca704a1218 100644
--- a/mingw-w64-python-mimeparse/PKGBUILD
+++ b/mingw-w64-python-mimeparse/PKGBUILD
@@ -2,15 +2,18 @@
 
 _realname=mimeparse
 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.6.0
-pkgrel=3
+pkgrel=1
 pkgdesc="Module of basic functions for parsing mime-type names and matching them against a list of media-ranges (mingw-w64)"
 arch=('any')
 url="https://github.com/dbtsai/python-mimeparse"
 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/dbtsai/python-mimeparse/archive/${pkgver}.tar.gz")
 sha256sums=('515b964bbcf0d7b6bf2a148a7d53c72ff64402e276f6202b95810545a1576b9d')
diff --git a/mingw-w64-python-mistune/PKGBUILD b/mingw-w64-python-mistune/PKGBUILD
index 195933e308..6c24cdc48a 100644
--- a/mingw-w64-python-mistune/PKGBUILD
+++ b/mingw-w64-python-mistune/PKGBUILD
@@ -2,35 +2,41 @@
 
 _realname=mistune
 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.8.4
-pkgrel=3
+pkgrel=1
 pkgdesc="The fastest markdown parser in pure Python with renderer feature (mingw-w64)"
 arch=('any')
 url="https://github.com/lepture/mistune"
 license=('BSD')
-epends=("${MINGW_PACKAGE_PREFIX}-python3")
-makedepends=("${MINGW_PACKAGE_PREFIX}-python3-setuptools")
+epends=("${MINGW_PACKAGE_PREFIX}-python")
+makedepends=("${MINGW_PACKAGE_PREFIX}-python-setuptools")
 source=("${_realname}-${pkgver}.tar.gz::https://github.com/lepture/mistune/archive/v${pkgver}.tar.gz")
 sha256sums=('a1443771ea9ed7268a0cb3cf31462604ae148938ba32070bd5c54545f8f36a5d')
 
+prepare() {
+  rm -rf python-build-${CARCH} | true
+  cp -r "${_realname}-${pkgver}" "python-build-${CARCH}"
+}
+
 build() {
-  cd "${srcdir}/${_realname}-${pkgver}"
-
+  cd "${srcdir}/python-build-${CARCH}"
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
-  ${MINGW_PREFIX}/bin/python3 setup.py build
-
+  ${MINGW_PREFIX}/bin/python setup.py build
 }
 
 package() {
-  cd "${srcdir}/${_realname}-${pkgver}"
+  cd "${srcdir}/python-build-${CARCH}"
 
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
-  ${MINGW_PREFIX}/bin/python3 setup.py install \
-    --prefix=${MINGW_PREFIX} --root=${pkgdir} --optimize=1
+  ${MINGW_PREFIX}/bin/python setup.py install \
+    --prefix=${MINGW_PREFIX} --root=${pkgdir} --optimize=1 --skip-build
 
   find "${pkgdir}/" -name "*.pyc" -delete
   find "${pkgdir}/" -type d -empty -delete
 
-  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-mpmath/PKGBUILD b/mingw-w64-python-mpmath/PKGBUILD
index 24ff4cc115..596b3a2358 100644
--- a/mingw-w64-python-mpmath/PKGBUILD
+++ b/mingw-w64-python-mpmath/PKGBUILD
@@ -2,16 +2,19 @@
 
 _realname=mpmath
 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="Python library for arbitrary-precision floating-point arithmetic (mingw-w64)"
 arch=('any')
 url='http://www.mpmath.org/'
 license=('BSD')
-depends=("${MINGW_PACKAGE_PREFIX}-python3"
-         "${MINGW_PACKAGE_PREFIX}-python3-gmpy2")
-makedepends=("${MINGW_PACKAGE_PREFIX}-python3-setuptools")
+depends=("${MINGW_PACKAGE_PREFIX}-python"
+         "${MINGW_PACKAGE_PREFIX}-python-gmpy2")
+makedepends=("${MINGW_PACKAGE_PREFIX}-python-setuptools")
 options=('staticlibs' 'strip' '!debug')
 source=(${_realname}-${pkgver}.tar.gz::"https://github.com/fredrik-johansson/mpmath/archive/${pkgver}.tar.gz")
 sha256sums=('16c01d589bcb1be5cab3a07de2855b578e5fc4a7882fb61a15f2aaf118fdd06e')
diff --git a/mingw-w64-python-networkx/PKGBUILD b/mingw-w64-python-networkx/PKGBUILD
index c445dd313a..1946a26da3 100644
--- a/mingw-w64-python-networkx/PKGBUILD
+++ b/mingw-w64-python-networkx/PKGBUILD
@@ -2,40 +2,47 @@
 
 _realname=networkx
 pkgbase=mingw-w64-python3-${_realname}
-pkgname=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+pkgname=("${MINGW_PACKAGE_PREFIX}-python-${_realname}")
+provides=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+conflicts=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+replaces=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
 pkgver=2.4
 pkgrel=1
 pkgdesc="High-productivity software for complex networks (mingw-w64)"
 arch=('any')
 license=('BSD')
 url="https://github.com/networkx/networkx"
-depends=("${MINGW_PACKAGE_PREFIX}-python3"
-         "${MINGW_PACKAGE_PREFIX}-python3-decorator")
-optdepends=("${MINGW_PACKAGE_PREFIX}-python3-numpy"
-            "${MINGW_PACKAGE_PREFIX}-python3-scipy"
-            "${MINGW_PACKAGE_PREFIX}-python3-pyparsing"
-            "${MINGW_PACKAGE_PREFIX}-python3-yaml")
-makedepends=("${MINGW_PACKAGE_PREFIX}-python3-setuptools")
-checkdepends=("${MINGW_PACKAGE_PREFIX}-python3-nose")
+depends=("${MINGW_PACKAGE_PREFIX}-python"
+         "${MINGW_PACKAGE_PREFIX}-python-decorator")
+optdepends=("${MINGW_PACKAGE_PREFIX}-python-numpy"
+            "${MINGW_PACKAGE_PREFIX}-python-scipy"
+            "${MINGW_PACKAGE_PREFIX}-python-pyparsing"
+            "${MINGW_PACKAGE_PREFIX}-python-yaml")
+makedepends=("${MINGW_PACKAGE_PREFIX}-python-setuptools")
+checkdepends=("${MINGW_PACKAGE_PREFIX}-python-nose")
 source=(${_realname}-${pkgver}.tar.gz::"https://github.com/networkx/networkx/archive/${_realname}-${pkgver}.tar.gz")
 sha256sums=('1ecd52964d0923932ac7ebbb1d414c27aadac0414f424203b38d633f7faa1f2c')
 
+prepare() {
+  cd "${srcdir}"
+  rm -rf python-build-${CARCH} | true
+  cp -r "${_realname}-${_realname}-${pkgver}" "python-build-${CARCH}"
+}
 
 build() {
-  cd ${srcdir}/${_realname}-${_realname}-${pkgver}
-  ${MINGW_PREFIX}/bin/python3 setup.py build
+  cd ${srcdir}/python-build-${CARCH}
+  ${MINGW_PREFIX}/bin/python setup.py build
 }
 
 check() {
-  cd ${srcdir}/${_realname}-${_realname}-${pkgver}
-  ${MINGW_PREFIX}/bin/nosetests3
+  cd ${srcdir}/python-build-${CARCH}
+  ${MINGW_PREFIX}/bin/nosetests
 }
 
 package() {
-  cd ${srcdir}/${_realname}-${_realname}-${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 --skip-build
-  install -D -m644 LICENSE.txt ${pkgdir}${MINGW_PREFIX}/share/licenses/python3-${_realname}/LICENSE
-}
+  ${MINGW_PREFIX}/bin/python setup.py install --root=${pkgdir} --prefix=${MINGW_PREFIX} --optimize=1 --skip-build
 
-# vim:set ts=2 sw=2 et:
+  install -D -m644 LICENSE.txt ${pkgdir}${MINGW_PREFIX}/share/licenses/python-${_realname}/LICENSE
+}
diff --git a/mingw-w64-python-nuitka/PKGBUILD b/mingw-w64-python-nuitka/PKGBUILD
index c16508dcff..a816c32a62 100644
--- a/mingw-w64-python-nuitka/PKGBUILD
+++ b/mingw-w64-python-nuitka/PKGBUILD
@@ -2,14 +2,17 @@
 
 _realname=nuitka
 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.5
-pkgrel=2
+pkgrel=1
 pkgdesc="Python to native compiler (mingw-w64)"
 arch=('any')
 license=('APACHE')
 url="https://www.nuitka.net/"
-depends=("${MINGW_PACKAGE_PREFIX}-python3-setuptools")
+depends=("${MINGW_PACKAGE_PREFIX}-python-setuptools")
 source=("http://nuitka.net/releases/Nuitka-${pkgver}.tar.gz")
 noextract=(Nuitka-$pkgver.tar.gz)
 sha256sums=('c38dce3eb2b98a703c7e587b3c847c3ea87c434b36783eb5e26c7e613da88d9b')
@@ -18,21 +21,23 @@ prepare() {
   [[ -d $srcdir/${_realname}-${pkgver} ]] && rm -rf ${srcdir}/${_realname}-${pkgver}
   tar -xzvf ${srcdir}/${_realname}-${pkgver}.tar.gz -C ${srcdir} || \
   tar -xzvf ${srcdir}/${_realname}-${pkgver}.tar.gz -C ${srcdir}
+
+  rm -rf python-build-${CARCH} | true
+  cp -r "Nuitka-${pkgver}" "python-build-${CARCH}"
 }
 
 build() {
-  cd "${srcdir}/Nuitka-${pkgver}"
-
-  ${MINGW_PREFIX}/bin/python3 setup.py build
+  cd "${srcdir}/python-build-${CARCH}"
+  ${MINGW_PREFIX}/bin/python setup.py build
 }
 
 package() {
-  cd "${srcdir}/Nuitka-${pkgver}"
+  cd "${srcdir}/python-build-${CARCH}"
 
   local _mingw_prefix=$(cygpath -am ${MINGW_PREFIX})
 
   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
 
   mv "${pkgdir}${MINGW_PREFIX}"/bin/nuitka.bat "${pkgdir}${MINGW_PREFIX}"/bin/nuitka3.bat
   mv "${pkgdir}${MINGW_PREFIX}"/bin/nuitka-run.bat "${pkgdir}${MINGW_PREFIX}"/bin/nuitka3-run.bat
diff --git a/mingw-w64-python-numexpr/PKGBUILD b/mingw-w64-python-numexpr/PKGBUILD
index fed8aaaf60..8a42bc2178 100644
--- a/mingw-w64-python-numexpr/PKGBUILD
+++ b/mingw-w64-python-numexpr/PKGBUILD
@@ -2,33 +2,42 @@
 
 _realname=numexpr
 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
-pkgrel=2
+pkgrel=1
 pkgdesc="Fast numerical array expression evaluator for Python, NumPy, PyTables, pandas (mingw-w64)"
 arch=('any')
 url="https://github.com/pydata/numexpr"
 license=('MIT')
-depends=("${MINGW_PACKAGE_PREFIX}-python3-numpy")
-makedepends=("${MINGW_PACKAGE_PREFIX}-python3-setuptools"
+depends=("${MINGW_PACKAGE_PREFIX}-python-numpy")
+makedepends=("${MINGW_PACKAGE_PREFIX}-python-setuptools"
              "${MINGW_PACKAGE_PREFIX}-gcc")
 source=("${_realname}-${pkgver}.tar.gz"::https://github.com/pydata/numexpr/archive/v${pkgver}.tar.gz)
 sha256sums=('1923f038b90cc69635871968ed742be7775c879451c612f173c2547c823c9561')
 
+prepare() {
+  cd "${srcdir}"
+  rm -rf python-build-${CARCH} | true
+  cp -r "${_realname}-${pkgver}" "python-build-${CARCH}"
+}
+
 build() {
-  cd "${srcdir}/${_realname}-${pkgver}"
+  cd "${srcdir}/python-build-${CARCH}"
 
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
-  ${MINGW_PREFIX}/bin/python3 setup.py build
+  ${MINGW_PREFIX}/bin/python setup.py build
 }
 
 package() {
-  cd "${srcdir}/${_realname}-${pkgver}"
+  cd "${srcdir}/python-build-${CARCH}"
 
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
-  ${MINGW_PREFIX}/bin/python3 setup.py install --skip-build \
+  ${MINGW_PREFIX}/bin/python setup.py install --skip-build \
   --prefix=${MINGW_PREFIX} --root=${pkgdir} --optimize=1
 
   install -Dm644 LICENSE.txt \
-    "${pkgdir}${MINGW_PREFIX}/share/licenses/python3-${_realname}/LICENSE.txt"
+    "${pkgdir}${MINGW_PREFIX}/share/licenses/python-${_realname}/LICENSE.txt"
 }
diff --git a/mingw-w64-python-openmdao/PKGBUILD b/mingw-w64-python-openmdao/PKGBUILD
index 3c1a0c5166..544159f4fd 100644
--- a/mingw-w64-python-openmdao/PKGBUILD
+++ b/mingw-w64-python-openmdao/PKGBUILD
@@ -2,20 +2,23 @@
 
 _realname=openmdao
 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.9.1
-pkgrel=2
+pkgrel=1
 pkgdesc="An open-source MDAO framework written in Python (mingw-w64)"
 arch=('any')
 license=('apache')
 url="https://openmdao.org/"
-depends=("${MINGW_PACKAGE_PREFIX}-python3-numpy"
-         "${MINGW_PACKAGE_PREFIX}-python3-scipy"
-         "${MINGW_PACKAGE_PREFIX}-python3-networkx"
-         "${MINGW_PACKAGE_PREFIX}-python3-sqlitedict"
-         "${MINGW_PACKAGE_PREFIX}-python3-pyparsing"
-         "${MINGW_PACKAGE_PREFIX}-python3-six")
-makedepends=("${MINGW_PACKAGE_PREFIX}-python3-setuptools")
+depends=("${MINGW_PACKAGE_PREFIX}-python-numpy"
+         "${MINGW_PACKAGE_PREFIX}-python-scipy"
+         "${MINGW_PACKAGE_PREFIX}-python-networkx"
+         "${MINGW_PACKAGE_PREFIX}-python-sqlitedict"
+         "${MINGW_PACKAGE_PREFIX}-python-pyparsing"
+         "${MINGW_PACKAGE_PREFIX}-python-six")
+makedepends=("${MINGW_PACKAGE_PREFIX}-python-setuptools")
 source=("OpenMDAO-${pkgver}.tar.gz::https://github.com/OpenMDAO/OpenMDAO/archive/${pkgver}.tar.gz")
 sha256sums=('f9023ebfc78d69246cf258542194eea38b9bb4f6768a4ea85dc4b7e1d4577126')
 
@@ -23,20 +26,24 @@ prepare() {
   cd "${srcdir}/OpenMDAO-${pkgver}"
 
   sed -i "s|from distutils.core import setup|from setuptools import setup|" setup.py
+
+  cd "${srcdir}"
+  rm -rf "python-build-${CARCH}" | true
+  cp -r "OpenMDAO-${pkgver}" "python-build-${CARCH}"
 }
 
 build() {
-  cd "${srcdir}/OpenMDAO-${pkgver}"
-
-  python3 setup.py build
+  cd "${srcdir}/python-build-${CARCH}"
+  ${MINGW_PREFIX}/bin/python setup.py build
 }
 
 package() {
-  cd "${srcdir}/OpenMDAO-${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 -D -m644 LICENSE.txt "${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 -D -m644 LICENSE.txt "${pkgdir}${MINGW_PREFIX}/share/licenses/python-${_realname}/LICENSE"
 
   local PREFIX_WIN=$(cygpath -wm ${MINGW_PREFIX})
   # fix python command in files
diff --git a/mingw-w64-python-openpyxl/PKGBUILD b/mingw-w64-python-openpyxl/PKGBUILD
index de38651b21..e6bf555440 100644
--- a/mingw-w64-python-openpyxl/PKGBUILD
+++ b/mingw-w64-python-openpyxl/PKGBUILD
@@ -2,43 +2,46 @@
 
 _realname=openpyxl
 pkgbase=mingw-w64-python-${_realname}
-pkgname=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
-pkgver=3.0.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=3.0.2
 pkgrel=1
 pkgdesc="A python library to read/write Excel 2007 xlsx/xlsm file (mingw-w64)"
 url="https://openpyxl.readthedocs.io/"
 arch=('any')
 license=('MIT')
-depends=("${MINGW_PACKAGE_PREFIX}-python3-jdcal"
-         "${MINGW_PACKAGE_PREFIX}-python3-et-xmlfile"
-         "${MINGW_PACKAGE_PREFIX}-python3-defusedxml"
-         "${MINGW_PACKAGE_PREFIX}-python3-pandas"
-         "${MINGW_PACKAGE_PREFIX}-python3-pillow")
-makedepends=("${MINGW_PACKAGE_PREFIX}-python3-setuptools"
-             "${MINGW_PACKAGE_PREFIX}-python3-pip"
-             "${MINGW_PACKAGE_PREFIX}-python3-pytest")
-_pkgtag='5eaaf27880d0'
+depends=("${MINGW_PACKAGE_PREFIX}-python-jdcal"
+         "${MINGW_PACKAGE_PREFIX}-python-et-xmlfile"
+         "${MINGW_PACKAGE_PREFIX}-python-defusedxml"
+         "${MINGW_PACKAGE_PREFIX}-python-pandas"
+         "${MINGW_PACKAGE_PREFIX}-python-pillow")
+makedepends=("${MINGW_PACKAGE_PREFIX}-python-setuptools"
+             "${MINGW_PACKAGE_PREFIX}-python-pip"
+             "${MINGW_PACKAGE_PREFIX}-python-pytest")
+_pkgtag='8ef423aef738'
 source=(openpyxl-${pkgver}.tar.gz::"https://bitbucket.org/openpyxl/openpyxl/get/${pkgver}.tar.gz"
         "LICENSE")
-sha256sums=('1883a3c28830fb753392dc260a3f495b40fe78364cc274da902d66f18e70ad92'
+sha256sums=('187a73e955e5c21390f4f503e61770414f120206767bdae57d2004336ca1faa1'
             '717016f755510c08d8752a7d2cf0a355624d380b68b88e9d92ea153ea896daaa')
 
 prepare() {
-  rm -rf python3-build-${CARCH}
-  cp -r "openpyxl-openpyxl-${_pkgtag}" "python3-build-${CARCH}"
+  rm -rf python-build-${CARCH}
+  cp -r "openpyxl-openpyxl-${_pkgtag}" "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 ${srcdir}/LICENSE ${pkgdir}${MINGW_PREFIX}/share/licenses/python3-${_realname}/LICENSE
+  install -Dm644 ${srcdir}/LICENSE ${pkgdir}${MINGW_PREFIX}/share/licenses/python-${_realname}/LICENSE
 }
diff --git a/mingw-w64-python-pandas/PKGBUILD b/mingw-w64-python-pandas/PKGBUILD
index eaa4e26749..5cb0e5efab 100644
--- a/mingw-w64-python-pandas/PKGBUILD
+++ b/mingw-w64-python-pandas/PKGBUILD
@@ -2,51 +2,47 @@
 
 _realname=pandas
 pkgbase=mingw-w64-python-${_realname}
-pkgname="${MINGW_PACKAGE_PREFIX}-python3-${_realname}"
-pkgver=0.25.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.25.3
 pkgrel=1
 pkgdesc="Cross-section and time series data analysis toolkit (mingw-w64)"
 arch=('any')
 url="https://pandas.pydata.org/"
 license=('BSD')
-makedepends=("${MINGW_PACKAGE_PREFIX}-python3-numpy"
-             "${MINGW_PACKAGE_PREFIX}-python3-pytz"
-             "${MINGW_PACKAGE_PREFIX}-python3-dateutil"
-             "${MINGW_PACKAGE_PREFIX}-python3-setuptools"
+depends=("${MINGW_PACKAGE_PREFIX}-python-numpy"
+         "${MINGW_PACKAGE_PREFIX}-python-pytz"
+         "${MINGW_PACKAGE_PREFIX}-python-dateutil")
+optdepends=("${MINGW_PACKAGE_PREFIX}-python-scipy: needed for miscellaneous statistical functions"
+            "${MINGW_PACKAGE_PREFIX}-python-matplotlib: needed for plotting"
+            "${MINGW_PACKAGE_PREFIX}-python-numexpr: needed for accelerating certain numerical operations (recommended)"
+            "${MINGW_PACKAGE_PREFIX}-python-openpyxl: needed for reading/writing Excel file")
+makedepends=("${MINGW_PACKAGE_PREFIX}-python-setuptools"
              "${MINGW_PACKAGE_PREFIX}-gcc")
 source=(${_realname}-${pkgver}.tar.gz::"https://github.com/pandas-dev/${_realname}/releases/download/v${pkgver}/${_realname}-${pkgver}.tar.gz")
-sha256sums=('ca91a19d1f0a280874a24dca44aadce42da7f3a7edb7e9ab7c7baad8febee2be')
-
+sha256sums=('52da74df8a9c9a103af0a72c9d5fdc8e0183a90884278db7f386b5692a2220a4')
 
 prepare() {
-  cp -a ${_realname}-${pkgver} ${_realname}-py3-${pkgver}
+  cp -a ${_realname}-${pkgver} ${_realname}-py-${pkgver}
 }
 
 build() {
-  # build for python3
-  cd ${srcdir}/${_realname}-py3-${pkgver}
+  cd ${srcdir}/${_realname}-py-${pkgver}
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
-  ${MINGW_PREFIX}/bin/python3 setup.py build_ext --inplace
+  ${MINGW_PREFIX}/bin/python setup.py build_ext --inplace
 
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
-  ${MINGW_PREFIX}/bin/python3 setup.py build
+  ${MINGW_PREFIX}/bin/python setup.py build
 }
 
 package() {
-  depends=("${MINGW_PACKAGE_PREFIX}-python3-numpy"
-           "${MINGW_PACKAGE_PREFIX}-python3-pytz"
-           "${MINGW_PACKAGE_PREFIX}-python3-dateutil"
-           "${MINGW_PACKAGE_PREFIX}-python3-setuptools")
-  optdepends=("${MINGW_PACKAGE_PREFIX}-python3-scipy: needed for miscellaneous statistical functions"
-              "${MINGW_PACKAGE_PREFIX}-python3-matplotlib: needed for plotting"
-              "${MINGW_PACKAGE_PREFIX}-python3-numexpr: needed for accelerating certain numerical operations (recommended)"
-              "${MINGW_PACKAGE_PREFIX}-python3-openpyxl: needed for reading/writing Excel file")
-
-  cd ${_realname}-py3-${pkgver}
+  cd ${_realname}-py-${pkgver}
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
-  ${MINGW_PREFIX}/bin/python3 setup.py install --skip-build \
+  ${MINGW_PREFIX}/bin/python setup.py install --skip-build \
     --prefix=${MINGW_PREFIX} --root=${pkgdir} --optimize=1
 
   install -Dm644 LICENSE \
-    "${pkgdir}${MINGW_PREFIX}/share/licenses/python3-${_realname}/LICENSE"
+    "${pkgdir}${MINGW_PREFIX}/share/licenses/python-${_realname}/LICENSE"
 }
diff --git a/mingw-w64-python-pandocfilters/PKGBUILD b/mingw-w64-python-pandocfilters/PKGBUILD
index f557c807f9..aa14488cab 100644
--- a/mingw-w64-python-pandocfilters/PKGBUILD
+++ b/mingw-w64-python-pandocfilters/PKGBUILD
@@ -2,28 +2,35 @@
 
 _realname=pandocfilters
 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.2
-pkgrel=4
+pkgrel=1
 pkgdesc="A python module for writing pandoc filters (mingw-w64)"
 arch=('any')
 url='https://pypi.python.org/pypi/pandocfilters'
 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.io/packages/source/p/pandocfilters/pandocfilters-${pkgver}.tar.gz")
 sha256sums=('b3dd70e169bb5449e6bc6ff96aea89c5eea8c5f6ab5e207fc2f521a2cf4a0da9')
 
-build() {
-  cd "${srcdir}/${_realname}-${pkgver}"
+prepare() {
+  rm -rf python-build-${CARCH} | true
+  cp -r "${_realname}-${pkgver}" "python-build-${CARCH}"
+}
 
-  ${MINGW_PREFIX}/bin/python3 setup.py build
+build() {
+  cd "${srcdir}/python-build-${CARCH}"
+  ${MINGW_PREFIX}/bin/python setup.py build
 }
 
 package() {
-  cd "${srcdir}/${_realname}-${pkgver}"
+  cd "${srcdir}/python-build-${CARCH}"
 
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
-  ${MINGW_PREFIX}/bin/python3 setup.py install --prefix=${MINGW_PREFIX} \
+  ${MINGW_PREFIX}/bin/python setup.py install --prefix=${MINGW_PREFIX} \
     --root="${pkgdir}" --optimize=1 --skip-build
 }
diff --git a/mingw-w64-python-parso/PKGBUILD b/mingw-w64-python-parso/PKGBUILD
index 8400bbaa91..913e81d5cd 100644
--- a/mingw-w64-python-parso/PKGBUILD
+++ b/mingw-w64-python-parso/PKGBUILD
@@ -2,19 +2,22 @@
 
 _realname=parso
 pkgbase=mingw-w64-python-${_realname}
-pkgname=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
-pkgver=0.5.1
-pkgrel=3
+pkgname=("${MINGW_PACKAGE_PREFIX}-python-${_realname}")
+provides=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+conflicts=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+replaces=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+pkgver=0.5.2
+pkgrel=1
 pkgdesc="Python parser that supports error recovery and round-trip parsing for different Python versions (mingw-w64)"
 arch=('any')
 url='https://www.parso.org/'
 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/davidhalter/parso/archive/v$pkgver.tar.gz")
-sha256sums=('7fbdc177a40a16858fef77cd86efb5b1c50c0789a59642d7d0d05ac92c0dae10')
+source=("${_realname}-${pkgver}.tar.gz"::"https://github.com/davidhalter/parso/archive/v${pkgver}.tar.gz")
+sha256sums=('1988394af56876cdcd400b6c4ae58171b1fab46358bc8634cefab729eac1305d')
 
 # Helper macros to help make tasks easier #
 apply_patch_with_msg() {
@@ -41,11 +44,11 @@ prepare() {
   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() {
-  msg "Python build for ${CARCH}"  
+  msg "Python build for ${CARCH}"
   cd "${srcdir}/python-build-${CARCH}"
   ${MINGW_PREFIX}/bin/python setup.py build
 }
diff --git a/mingw-w64-python-path/PKGBUILD b/mingw-w64-python-path/PKGBUILD
index 39e0c9a639..730a838e60 100644
--- a/mingw-w64-python-path/PKGBUILD
+++ b/mingw-w64-python-path/PKGBUILD
@@ -1,43 +1,47 @@
 # Maintainer: Ryuta Suzuki <oroppas@gmail.com>
 
 _realname=path.py
-pkgbase=mingw-w64-python3-path
-pkgname=("${MINGW_PACKAGE_PREFIX}-python3-path")
-pkgver=12.0.2
+pkgbase=mingw-w64-python-path
+pkgname=("${MINGW_PACKAGE_PREFIX}-python-path")
+pkgver=13.1.0
 pkgrel=1
+provides=("${MINGW_PACKAGE_PREFIX}-python3-path=${pkgver}")
+conflicts=("${MINGW_PACKAGE_PREFIX}-python3-path")
+replaces=("${MINGW_PACKAGE_PREFIX}-python3-path")
 pkgdesc="File system based database that uses python pickles (mingw-w64)"
 url="https://pypi.org/project/path.py/"
 arch=('any')
 license=('MIT')
-depends=("${MINGW_PACKAGE_PREFIX}-python3"
-         "${MINGW_PACKAGE_PREFIX}-python3-importlib-metadata")
-makedepends=("${MINGW_PACKAGE_PREFIX}-python3-setuptools"
-             "${MINGW_PACKAGE_PREFIX}-python3-setuptools-scm")
-checkdepends=("${MINGW_PACKAGE_PREFIX}-python3-pytest-runner"
-              "${MINGW_PACKAGE_PREFIX}-python3-pytest-flake8")
+depends=("${MINGW_PACKAGE_PREFIX}-python"
+         "${MINGW_PACKAGE_PREFIX}-python-importlib-metadata")
+makedepends=("${MINGW_PACKAGE_PREFIX}-python-setuptools"
+             "${MINGW_PACKAGE_PREFIX}-python-setuptools-scm")
+checkdepends=("${MINGW_PACKAGE_PREFIX}-python-pytest-runner"
+              "${MINGW_PACKAGE_PREFIX}-python-pytest-flake8")
 source=("${_realname}-${pkgver}.tar.gz"::"https://github.com/jaraco/path.py/archive/v${pkgver}.tar.gz")
-sha512sums=('8eb0f3046e8c642356dca9c51e3670475680d641d4d4252cfada48a2b179dbe22d05fa6c15782cd7913e30cb8d522cc681c47cf50e13fe8095f18f047bbf68ac')
+sha512sums=('db27420ad117f36bf42e54284e931f92b18a6db71fab3a66cba65bb2c78c02747db637e5ea7f69d9fc2864c0dfc0aa4dede0c7183b49699ffc4416d6662f9185')
 
 prepare() {
-  rm -rf python3-build-${CARCH}
-  cp -r "${_realname}-${pkgver}" "python3-build-${CARCH}"
+  rm -rf python-build-${CARCH}
+  cp -r "path-${pkgver}" "python-build-${CARCH}"
   # Set version for setuptools_scm
   export SETUPTOOLS_SCM_PRETEND_VERSION=${pkgver}
 }
 
 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 pytest || true
+  cd "${srcdir}/python-build-${CARCH}"
+  ${MINGW_PREFIX}/bin/python setup.py pytest || 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 --root=${pkgdir} --prefix=${MINGW_PREFIX} --optimize=1 --skip-build
-  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-patsy/PKGBUILD b/mingw-w64-python-patsy/PKGBUILD
index 9e01b38993..8924206306 100644
--- a/mingw-w64-python-patsy/PKGBUILD
+++ b/mingw-w64-python-patsy/PKGBUILD
@@ -2,33 +2,41 @@
 
 _realname=patsy
 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=3
+pkgrel=1
 pkgdesc="A Python package for describing statistical models and for building design matrices (mingw-w64)"
 arch=('any')
 url="https://github.com/pydata/patsy"
 license=('BSD')
-depends=("${MINGW_PACKAGE_PREFIX}-python3-numpy")
-optdepends=("${MINGW_PACKAGE_PREFIX}-python3-nose: needed for integrated test suite"
-            "${MINGW_PACKAGE_PREFIX}-python3-scipy: needed for spline-related functions")
-makedepends=("${MINGW_PACKAGE_PREFIX}-python3-setuptools")
+depends=("${MINGW_PACKAGE_PREFIX}-python-numpy")
+optdepends=("${MINGW_PACKAGE_PREFIX}-python-nose: needed for integrated test suite"
+            "${MINGW_PACKAGE_PREFIX}-python-scipy: needed for spline-related functions")
+makedepends=("${MINGW_PACKAGE_PREFIX}-python-setuptools")
 source=("https://pypi.python.org/packages/source/p/patsy/${_realname}-${pkgver}.tar.gz")
 sha256sums=('f115cec4201e1465cd58b9866b0b0e7b941caafec129869057405bfe5b5e3991')
 
-build() {
-  cd "${srcdir}/${_realname}-${pkgver}"
+prepare() {
+  cd "${srcdir}"
+  rm -rf "python-build-${CARCH}" | true
+  cp -r "${_realname}-${pkgver}" "python-build-${CARCH}"
+}
 
-  ${MINGW_PREFIX}/bin/python3 setup.py build
+build() {
+  cd "${srcdir}/python-build-${CARCH}"
+  ${MINGW_PREFIX}/bin/python setup.py build
 }
 
 package() {
-  cd "${srcdir}/${_realname}-${pkgver}"
+  cd "${srcdir}/python-build-${CARCH}"
 
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
-  ${MINGW_PREFIX}/bin/python3 setup.py install --prefix=${MINGW_PREFIX} \
-    --root "${pkgdir}" --optimize=1
+  ${MINGW_PREFIX}/bin/python setup.py install --prefix=${MINGW_PREFIX} \
+    --root "${pkgdir}" --optimize=1 --skip-build
 
   install -Dm644 "LICENSE.txt" \
-  "${pkgdir}${MINGW_PREFIX}/share/licenses/python3-${_realname}/LICENSE"
+  "${pkgdir}${MINGW_PREFIX}/share/licenses/python-${_realname}/LICENSE"
 }
diff --git a/mingw-w64-python-pexpect/PKGBUILD b/mingw-w64-python-pexpect/PKGBUILD
index 7010c44b42..568d2bacce 100644
--- a/mingw-w64-python-pexpect/PKGBUILD
+++ b/mingw-w64-python-pexpect/PKGBUILD
@@ -2,46 +2,48 @@
 
 _realname=pexpect
 pkgbase=mingw-w64-python-${_realname}
-pkgname=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+pkgname=("${MINGW_PACKAGE_PREFIX}-python-${_realname}")
+provides=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+conflicts=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+replaces=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
 pkgver=4.7.0
-pkgrel=3
+pkgrel=1
 pkgdesc="For controlling and automating applications (mingw-w64)"
 arch=('any')
 url='https://pexpect.readthedocs.org/en/stable/'
 license=('MIT')
-depends=("${MINGW_PACKAGE_PREFIX}-python3"
-         "${MINGW_PACKAGE_PREFIX}-python3-ptyprocess")
-makedepends=("${MINGW_PACKAGE_PREFIX}-python3-setuptools")
+depends=("${MINGW_PACKAGE_PREFIX}-python"
+         "${MINGW_PACKAGE_PREFIX}-python-ptyprocess")
+makedepends=("${MINGW_PACKAGE_PREFIX}-python-setuptools")
 options=('staticlibs' 'strip' '!debug')
 source=(${_realname}-${pkgver}.tar.gz::"https://github.com/pexpect/pexpect/archive/${pkgver}.tar.gz")
 sha256sums=('38b68a6463b8ce308bed637c1658e67e7f2cdb53d47babc528707296fc324c2e')
 
 prepare() {
-  cd "${srcdir}/${_realname}-${pkgver}"
+  cd "${srcdir}"
+  rm -rf python-build-${CARCH} | true
+  cp -r "${_realname}-${pkgver}" "python-build-${CARCH}"
 
-  sed -i 's,env python,env python3,' pexpect/FSM.py
   # 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-pickleshare/PKGBUILD b/mingw-w64-python-pickleshare/PKGBUILD
index cc5300488a..26ccf119aa 100644
--- a/mingw-w64-python-pickleshare/PKGBUILD
+++ b/mingw-w64-python-pickleshare/PKGBUILD
@@ -2,36 +2,44 @@
 
 _realname=pickleshare
 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.5
-pkgrel=3
+pkgrel=1
 pkgdesc="File system based database that uses python pickles (mingw-w64)"
 url="https://github.com/pickleshare/pickleshare"
 arch=('any')
 license=('MIT')
-depends=("${MINGW_PACKAGE_PREFIX}-python3-path>=8.1")
-makedepends=("${MINGW_PACKAGE_PREFIX}-python3-setuptools")
-checkdepends=("${MINGW_PACKAGE_PREFIX}-python3-nose")
+depends=("${MINGW_PACKAGE_PREFIX}-python-path>=8.1")
+makedepends=("${MINGW_PACKAGE_PREFIX}-python-setuptools")
+checkdepends=("${MINGW_PACKAGE_PREFIX}-python-nose")
 source=("${_realname}-${pkgver}.tar.gz::https://github.com/${_realname}/${_realname}/archive/${pkgver}.tar.gz")
 sha256sums=('7a691d57650dbfb1f101c52d65743f87175cea98bd85cd2a0e92c0407faf3d1c')
 
-build() {
-  cd "${srcdir}/${_realname}-${pkgver}"
+prepare() {
+  cd "${srcdir}"
+  rm -rf python-build-${CARCH} | true
+  cp -r "${_realname}-${pkgver}" "python-build-${CARCH}"
+}
 
-  python3 setup.py build
+build() {
+  cd "${srcdir}/python-build-${CARCH}"
+  ${MINGW_PREFIX}/bin/python setup.py build
 
 }
 
 check() {
-  cd "${srcdir}/${_realname}-${pkgver}"
-
-  nosetests3 || true
+  cd "${srcdir}/python-build-${CARCH}"
+  ${MINGW_PREFIX}/bin/nosetests || true
 }
 
 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 --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-prettytable/PKGBUILD b/mingw-w64-python-prettytable/PKGBUILD
index 8149b71539..e88b84d525 100644
--- a/mingw-w64-python-prettytable/PKGBUILD
+++ b/mingw-w64-python-prettytable/PKGBUILD
@@ -2,15 +2,18 @@
 
 _realname=prettytable
 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.2
-pkgrel=4
+pkgrel=1
 pkgdesc="A simple Python library for easily displaying tabular data (mingw-w64)"
 arch=('any')
 url="https://pypi.python.org/pypi/PrettyTable"
 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')
 _dtoken=dc2e9370bf3be766302dbd6cd9729e258e875d31a7a21c9f760aaa5b5b5e
 source=("${_realname}-${pkgver}.tar.gz::https://files.pythonhosted.org/packages/source/P/PrettyTable/${_realname}-${pkgver}.tar.gz"
diff --git a/mingw-w64-python-prometheus-client/PKGBUILD b/mingw-w64-python-prometheus-client/PKGBUILD
index e60e5753cd..fea9572b77 100644
--- a/mingw-w64-python-prometheus-client/PKGBUILD
+++ b/mingw-w64-python-prometheus-client/PKGBUILD
@@ -2,28 +2,35 @@
 
 _realname=prometheus-client
 pkgbase=mingw-w64-python-${_realname}
-pkgname=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+pkgname=("${MINGW_PACKAGE_PREFIX}-python-${_realname}")
+provides=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+conflicts=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+replaces=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
 pkgver=0.7.1
-pkgrel=3
+pkgrel=1
 pkgdesc="Prometheus instrumentation library for Python applications (mingw-w64)"
 arch=('any')
 url="https://github.com/prometheus/client_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")
 source=("${_realname}-${pkgver}.tar.gz::https://github.com/prometheus/client_python/archive/v${pkgver}.tar.gz")
 sha256sums=('6bfe4192c03f81c36c86a2dd7cd1fa151e470cd3d9fd24fe15e63abb85383aa0')
 
-build() {
-  cd "${srcdir}/client_python-${pkgver}"
+prepare() {
+  rm -rf python-build-${CARCH} | true
+  cp -r "client_python-${pkgver}" "python-build-${CARCH}"
+}
 
-  ${MINGW_PREFIX}/bin/python3 setup.py build
+build() {
+  cd "${srcdir}/python-build-${CARCH}"
+  ${MINGW_PREFIX}/bin/python setup.py build
 }
 
 package() {
-  cd "${srcdir}/client_python-${pkgver}"
+  cd "${srcdir}/python-build-${CARCH}"
 
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
-  ${MINGW_PREFIX}/bin/python3 setup.py install --prefix=${MINGW_PREFIX} \
+  ${MINGW_PREFIX}/bin/python setup.py install --prefix=${MINGW_PREFIX} \
     --root="${pkgdir}" --optimize=1 --skip-build
 }
diff --git a/mingw-w64-python-prompt_toolkit/PKGBUILD b/mingw-w64-python-prompt_toolkit/PKGBUILD
index 4e0e36070d..1a27479fca 100644
--- a/mingw-w64-python-prompt_toolkit/PKGBUILD
+++ b/mingw-w64-python-prompt_toolkit/PKGBUILD
@@ -2,45 +2,49 @@
 
 _realname=prompt_toolkit
 pkgbase=mingw-w64-python-${_realname}
-pkgname=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
-pkgver=2.0.10
-pkgrel=2
+pkgname=("${MINGW_PACKAGE_PREFIX}-python-${_realname}")
+pkgver=3.0.2
+pkgrel=1
+provides=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}=${pkgver}")
+conflicts=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+replaces=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
 pkgdesc="Library for building powerful interactive command lines in Python (mingw-w64)"
 url="https://github.com/jonathanslenders/python-prompt-toolkit"
 arch=('any')
 license=('BSD')
-depends=("${MINGW_PACKAGE_PREFIX}-python3-pygments"
-         "${MINGW_PACKAGE_PREFIX}-python3-six"
-         "${MINGW_PACKAGE_PREFIX}-python3-wcwidth")
-makedepends=("${MINGW_PACKAGE_PREFIX}-python3-setuptools")
-checkdepends=("${MINGW_PACKAGE_PREFIX}-python3-pytest")
+depends=("${MINGW_PACKAGE_PREFIX}-python-pygments"
+         "${MINGW_PACKAGE_PREFIX}-python-six"
+         "${MINGW_PACKAGE_PREFIX}-python-wcwidth")
+makedepends=("${MINGW_PACKAGE_PREFIX}-python-setuptools")
+checkdepends=("${MINGW_PACKAGE_PREFIX}-python-pytest")
 source=(python-prompt-toolkit-${pkgver}.tar.gz::https://github.com/jonathanslenders/python-prompt-toolkit/archive/${pkgver}.tar.gz)
-sha256sums=('4877317746abf9040459fc6326a123bcf8e68ffa2c9c3bb901102ad7bc3016d3')
+sha256sums=('932f5632aee841d5fffed18f3e6d0f286e804141a868039f5f21aedaadbc00df')
 
 prepare() {
-  cd "${srcdir}/python-prompt-toolkit-${pkgver}"
+  cd "${srcdir}"
+  rm -rf python-build-${CARCH} | true
+  cp -r "python-prompt-toolkit-${pkgver}" "python-build-${CARCH}"
 
   # Set version for setuptools_scm
-  export SETUPTOOLS_SCM_PRETEND_VERSION=$pkgver
+  export SETUPTOOLS_SCM_PRETEND_VERSION=${pkgver}
 }
 
 build() {
-  cd "${srcdir}/python-prompt-toolkit-${pkgver}"
-
-  ${MINGW_PREFIX}/bin/python3 setup.py build
+  cd "${srcdir}/python-build-${CARCH}"
+  ${MINGW_PREFIX}/bin/python setup.py build
 }
 
 check() {
-  cd "${srcdir}/python-prompt-toolkit-${pkgver}"
-
+  cd "${srcdir}/python-build-${CARCH}"
   ${MINGW_PREFIX}/bin/py.test || warning "Tests failed"
 }
 
 package() {
-  cd "${srcdir}/python-prompt-toolkit-${pkgver}"
+  cd "${srcdir}/python-build-${CARCH}"
 
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
-    ${MINGW_PREFIX}/bin/python3 setup.py install --root=${pkgdir} \
+    ${MINGW_PREFIX}/bin/python setup.py install --root=${pkgdir} \
    --prefix=${MINGW_PREFIX} --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-ptyprocess/PKGBUILD b/mingw-w64-python-ptyprocess/PKGBUILD
index 9b293f325d..fdef2673ba 100644
--- a/mingw-w64-python-ptyprocess/PKGBUILD
+++ b/mingw-w64-python-ptyprocess/PKGBUILD
@@ -2,15 +2,18 @@
 
 _realname=ptyprocess
 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.0
-pkgrel=3
+pkgrel=1
 pkgdesc="Run a subprocess in a pseudo terminal (mingw-w64)"
 url="https://github.com/pexpect/ptyprocess"
 arch=('any')
 license=('ISC')
-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.io/packages/source/p/${_realname}/${_realname}-${pkgver}.tar.gz
             'https://raw.githubusercontent.com/pexpect/ptyprocess/master/LICENSE')
 sha256sums=('923f299cc5ad920c68f2bc0bc98b75b9f838b93b599941a6b63ddbc2476394c0'
@@ -32,5 +35,5 @@ package() {
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
   ${MINGW_PREFIX}/bin/python setup.py install --root=${pkgdir} --prefix=${MINGW_PREFIX} --optimize=1 --skip-build
 
-  install -D -m644 "$srcdir/LICENSE" ${pkgdir}${MINGW_PREFIX}/share/licenses/python-${_realname}/LICENSE
+  install -D -m644 "${srcdir}/LICENSE" ${pkgdir}${MINGW_PREFIX}/share/licenses/python-${_realname}/LICENSE
 }
diff --git a/mingw-w64-python-py-cpuinfo/PKGBUILD b/mingw-w64-python-py-cpuinfo/PKGBUILD
index a049726c41..9c6309c72c 100644
--- a/mingw-w64-python-py-cpuinfo/PKGBUILD
+++ b/mingw-w64-python-py-cpuinfo/PKGBUILD
@@ -2,55 +2,52 @@
 
 _realname=py-cpuinfo
 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=5.0.0
-pkgrel=3
+pkgrel=1
 pkgdesc="Get CPU info with pure Python 2 & 3 (mingw-w64)"
 arch=('any')
 url='https://github.com/workhorsy/py-cpuinfo'
 license=('MIT')
-depends=("${MINGW_PACKAGE_PREFIX}-python3")
-makedepends=("${MINGW_PACKAGE_PREFIX}-python3-setuptools")
-checkdepends=("${MINGW_PACKAGE_PREFIX}-python3-pytest-runner")
+depends=("${MINGW_PACKAGE_PREFIX}-python")
+makedepends=("${MINGW_PACKAGE_PREFIX}-python-setuptools")
+checkdepends=("${MINGW_PACKAGE_PREFIX}-python-pytest-runner")
+install=${_realname}3-${CARCH}.install
 source=("${_realname}-${pkgver}.tar.gz"::"https://github.com/workhorsy/py-cpuinfo/archive/v${pkgver}.tar.gz")
 sha256sums=('838c9480f416c3052897b6c4645cf12c6f0604deef8c1860bb9153112ceb96aa')
 
 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 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 pytest
+  cd "${srcdir}/python-build-${CARCH}"
+  ${MINGW_PREFIX}/bin/python setup.py pytest
 }
 
 package() {
-  install=${_realname}3-${CARCH}.install
-
-  cd "${srcdir}/${_realname}-${pkgver}"
+  cd "${srcdir}/python-build-${CARCH}"
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
-  ${MINGW_PREFIX}/bin/python3 setup.py install --prefix=${MINGW_PREFIX} \
+  ${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"
 
-# This entire section should be removed if the package does NOT install
-# anything in the /mingw*/bin directory.
-### begin section ###
   local PREFIX_WIN=$(cygpath -wm ${MINGW_PREFIX})
   # fix python command in files
   for _f in "${pkgdir}${MINGW_PREFIX}"/bin/*.py; do
     sed -e "s|${PREFIX_WIN}|${MINGW_PREFIX}|g" -i  ${_f}
   done
-#### end section ####
 }
diff --git a/mingw-w64-python-pycodestyle/PKGBUILD b/mingw-w64-python-pycodestyle/PKGBUILD
index 61993e51ce..3b3215ed21 100644
--- a/mingw-w64-python-pycodestyle/PKGBUILD
+++ b/mingw-w64-python-pycodestyle/PKGBUILD
@@ -5,16 +5,19 @@
 
 _realname=pycodestyle
 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}"
+          "${MINGW_PACKAGE_PREFIX}-pep8-python3"
+          "${MINGW_PACKAGE_PREFIX}-python3-pep8")
 pkgver=2.5.0
-pkgrel=4
+pkgrel=1
 pkgdesc="Python style guide checker (mingw-w64)"
 arch=('any')
 url='https://github.com/PyCQA/pycodestyle'
 license=('custom:Expat')
-depends=("${MINGW_PACKAGE_PREFIX}-python3")
-replaces=("${MINGW_PACKAGE_PREFIX}-pep8-python3"
-          "${MINGW_PACKAGE_PREFIX}-python3-pep8")
+depends=("${MINGW_PACKAGE_PREFIX}-python")
 makedepends=("${MINGW_PACKAGE_PREFIX}-python3-setuptools")
 install=${_realname}3-${CARCH}.install
 options=('staticlibs' 'strip' '!debug')
diff --git a/mingw-w64-python-pyfilesystem2/PKGBUILD b/mingw-w64-python-pyfilesystem2/PKGBUILD
index 1a81bc68e7..a2ad0c2655 100644
--- a/mingw-w64-python-pyfilesystem2/PKGBUILD
+++ b/mingw-w64-python-pyfilesystem2/PKGBUILD
@@ -2,51 +2,53 @@
 
 _realname=pyfilesystem2
 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.4.11
-pkgrel=2
+pkgrel=1
 pkgdesc="Python's filesystem abstraction layer (mingw-w64)"
 arch=('any')
 url='https://github.com/PyFilesystem/pyfilesystem2'
 license=('MIT')
-depends=("${MINGW_PACKAGE_PREFIX}-python3"
-         "${MINGW_PACKAGE_PREFIX}-python3-appdirs"
-         "${MINGW_PACKAGE_PREFIX}-python3-pytz"
-         "${MINGW_PACKAGE_PREFIX}-python3-six")
-makedepends=("${MINGW_PACKAGE_PREFIX}-python3-setuptools")
-# We would require "${MINGW_PACKAGE_PREFIX}-python3-pyftpdlib"
-#checkdepends=("${MINGW_PACKAGE_PREFIX}-python3-mock"
-#              "${MINGW_PACKAGE_PREFIX}-python3-pyftpdlib")
+depends=("${MINGW_PACKAGE_PREFIX}-python"
+         "${MINGW_PACKAGE_PREFIX}-python-appdirs"
+         "${MINGW_PACKAGE_PREFIX}-python-pytz"
+         "${MINGW_PACKAGE_PREFIX}-python-six")
+makedepends=("${MINGW_PACKAGE_PREFIX}-python-setuptools")
+# We would require "${MINGW_PACKAGE_PREFIX}-python-pyftpdlib"
+#checkdepends=("${MINGW_PACKAGE_PREFIX}-python-mock"
+#              "${MINGW_PACKAGE_PREFIX}-python-pyftpdlib")
 options=('staticlibs' 'strip' '!debug')
 source=("${_realname}-${pkgver}.tar.gz"::"https://github.com/PyFilesystem/pyfilesystem2/archive/v${pkgver}.tar.gz")
 sha256sums=('246424187f5a509b6dc1573c66fb203e375eab79f540dbd829dd058082be98b1')
 
 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 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
 }
 
-# We would require "${MINGW_PACKAGE_PREFIX}-python3-pyftpdlib"
+# We would require "${MINGW_PACKAGE_PREFIX}-python-pyftpdlib"
 #check() {
-#  cd "${srcdir}/${_realname}-${pkgver}"
-#
-#  ${MINGW_PREFIX}/bin/python3 setup.py test
+#  cd "${srcdir}/python-build-${CARCH}"
+#  ${MINGW_PREFIX}/bin/python setup.py test
 #}
 
 package() {
-  cd "${srcdir}/${_realname}-${pkgver}"
+  cd "${srcdir}/python-build-${CARCH}"
 
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
-  ${MINGW_PREFIX}/bin/python3 setup.py install --prefix=${MINGW_PREFIX} \
+  ${MINGW_PREFIX}/bin/python setup.py install --prefix=${MINGW_PREFIX} \
     --root="${pkgdir}" --optimize=1 --skip-build
 
-  install -Dm644 LICENSE "${pkgdir}${MINGW_PREFIX}/share/licenses/python3-${_realname}/LICENSE"
+  install -Dm644 LICENSE "${pkgdir}${MINGW_PREFIX}/share/licenses/python-${_realname}/LICENSE"
 }
diff --git a/mingw-w64-python-pyflakes/PKGBUILD b/mingw-w64-python-pyflakes/PKGBUILD
index da54b6f2cb..dd0b98cb3d 100644
--- a/mingw-w64-python-pyflakes/PKGBUILD
+++ b/mingw-w64-python-pyflakes/PKGBUILD
@@ -5,15 +5,18 @@
 
 _realname=pyflakes
 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.1.1
-pkgrel=3
+pkgrel=1
 pkgdesc="A lint-like tool for Python to identify common errors quickly without executing code (mingw-w64)"
 arch=('any')
 url='https://pypi.python.org/pypi/pyflakes'
 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/p/pyflakes/pyflakes-${pkgver}.tar.gz")
 sha256sums=('d976835886f8c5b31d47970ed689944a0262b5f3afa00a5a7b4dc81e5449f8a2')
diff --git a/mingw-w64-python-pylint/PKGBUILD b/mingw-w64-python-pylint/PKGBUILD
index d8e4be19e9..d4afed77e8 100644
--- a/mingw-w64-python-pylint/PKGBUILD
+++ b/mingw-w64-python-pylint/PKGBUILD
@@ -2,28 +2,32 @@
 
 _realname=pylint
 pkgbase=mingw-w64-python3-${_realname}
-pkgname=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
-pkgver=2.4.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.4.4
 pkgrel=1
 pkgdesc="Analyzes Python code looking for bugs and signs of poor quality (mingw-w64)"
 arch=('any')
 url='https://pylint.org/'
 license=('GPL')
-depends=("${MINGW_PACKAGE_PREFIX}-python3-astroid"
-         "${MINGW_PACKAGE_PREFIX}-python3-colorama"
-         "${MINGW_PACKAGE_PREFIX}-python3-mccabe" 
-         "${MINGW_PACKAGE_PREFIX}-python3-isort")
-makedepends=("${MINGW_PACKAGE_PREFIX}-python3"
-             "${MINGW_PACKAGE_PREFIX}-python3-astroid"
-             "${MINGW_PACKAGE_PREFIX}-python3-setuptools"
-             "${MINGW_PACKAGE_PREFIX}-python3-six")
+depends=("${MINGW_PACKAGE_PREFIX}-python-astroid"
+         "${MINGW_PACKAGE_PREFIX}-python-colorama"
+         "${MINGW_PACKAGE_PREFIX}-python-mccabe"
+         "${MINGW_PACKAGE_PREFIX}-python-isort")
+makedepends=("${MINGW_PACKAGE_PREFIX}-python"
+             "${MINGW_PACKAGE_PREFIX}-python-astroid"
+             "${MINGW_PACKAGE_PREFIX}-python-setuptools"
+             "${MINGW_PACKAGE_PREFIX}-python-six")
 checkdepends=("${MINGW_PACKAGE_PREFIX}-mpdecimal"
-              "${MINGW_PACKAGE_PREFIX}-python3-pytest-runner")
+              "${MINGW_PACKAGE_PREFIX}-python-pytest-runner")
 optdepends=("${MINGW_PACKAGE_PREFIX}-tk: Pylint GUI"
             "${MINGW_PACKAGE_PREFIX}-graphviz: To have other output formats than dot or vcg")
 options=('staticlibs' 'strip' '!debug')
+install=${_realname}3-${CARCH}.install
 source=("${_realname}-${pkgver}.tar.gz"::"https://github.com/PyCQA/pylint/archive/pylint-${pkgver}.tar.gz")
-sha512sums=('ab1bcb7e51d0e6afd9f20e928bc93f75464b3b370e5dadb17f52090a4cab6639c904d063617bc076ce5e65143432cd7e41e36075a8df213237bfea7ac8a67b0a')
+sha512sums=('026cf1a4fb3a4fa017914647a945e2228bf8bcf1f7eb914a21e82fc47c545a37f981ed71ba879d5b261ccd51a7d70b7ed7cde3a033e84ddb4a64b73d2a896c18')
 
 # Helper macros to help make tasks easier #
 apply_patch_with_msg() {
@@ -47,51 +51,38 @@ del_file_exists() {
 prepare() {
   cd "${srcdir}"
  
-  sed -i 's/pytest<3.3/pytest/' pylint-pylint-$pkgver/setup.py
+  sed -i 's/pytest<3.3/pytest/' pylint-pylint-${pkgver}/setup.py
   pushd "${_realname}-${_realname}-${pkgver}"
-    sed -e "s|/usr/bin/env python|/usr/bin/env python3|" -e "s|/usr/bin/python$|/usr/bin/python3|" -i pylint/epylint.py pylint/__main__.py tests/input/noext tests/data/ascript
+    sed -e "s|/usr/bin/python$|${MINGW_PREFIX}/bin/python|" -i pylint/epylint.py pylint/__main__.py tests/input/noext tests/data/ascript
   popd
-  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}"
   # 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}"
+  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}"
-  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 pytest || warning "tests failed"
+    ${MINGW_PREFIX}/bin/python setup.py pytest || warning "tests failed"
 }
 
-
 package() {
-  #This package install is needed for .fixups with .EXE's 
-  #in the bit directory.  The install files "python-exe-installs"
-  #and should be renamed to your _realname
-  install=${_realname}3-${CARCH}.install
-
-  cd "${srcdir}/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"
 
-# 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
diff --git a/mingw-w64-python-pyperclip/PKGBUILD b/mingw-w64-python-pyperclip/PKGBUILD
index 6bc1285c22..be604a261e 100644
--- a/mingw-w64-python-pyperclip/PKGBUILD
+++ b/mingw-w64-python-pyperclip/PKGBUILD
@@ -2,17 +2,20 @@
 
 _realname=pyperclip
 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
 _dtoken="2d/0f/4eda562dffd085945d57c2d9a5da745cfb5228c02bc90f2c74bbac746243"
-pkgrel=3
+pkgrel=1
 pkgdesc="A cross-platform clipboard module for Python (mingw-w64)"
 arch=('any')
 url='https://github.com/asweigart/pyperclip'
 license=('BSD')
-depends=("${MINGW_PACKAGE_PREFIX}-python3")
-makedepends=("${MINGW_PACKAGE_PREFIX}-python3-setuptools")
-checkdepends=("${MINGW_PACKAGE_PREFIX}-python3-pytest")
+depends=("${MINGW_PACKAGE_PREFIX}-python")
+makedepends=("${MINGW_PACKAGE_PREFIX}-python-setuptools")
+checkdepends=("${MINGW_PACKAGE_PREFIX}-python-pytest")
 source=("https://files.pythonhosted.org/packages/${_dtoken}/${_realname}-${pkgver}.tar.gz")
 sha512sums=('7f22227ea894a236703f61ab950e198fab969fac5713ca8eac6df213183a47a244add88a462b9ddf63ed5bec36af5bc2578949f01ed31e0b63316d1761a935bd')
 
@@ -37,8 +40,8 @@ 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}
@@ -46,22 +49,22 @@ prepare() {
 }
 
 build() {
-  msg "Python 3 build for ${CARCH}"
-  cd "${srcdir}/python3-build-${CARCH}"
-  ${MINGW_PREFIX}/bin/python3 setup.py build
+  msg "Python build for ${CARCH}"
+  cd "${srcdir}/python-build-${CARCH}"
+  ${MINGW_PREFIX}/bin/python setup.py build
 }
 
 check() {
-  msg "Python 3 test for ${CARCH}"
-  cd "${srcdir}/python3-build-${CARCH}"
+  msg "Python test for ${CARCH}"
+  cd "${srcdir}/python-build-${CARCH}"
   PYTHONPATH="$PWD/build/lib;$PYTHONPATH" 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.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-pyreadline/PKGBUILD b/mingw-w64-python-pyreadline/PKGBUILD
index dbcf1c0588..10a2ea2792 100644
--- a/mingw-w64-python-pyreadline/PKGBUILD
+++ b/mingw-w64-python-pyreadline/PKGBUILD
@@ -2,43 +2,46 @@
 
 _realname=pyreadline
 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.1
-pkgrel=3
-pkgdesc="A python implementation of GNU readline. (mingw-w64)"
+pkgrel=1
+pkgdesc="A python implementation of GNU readline (mingw-w64)"
 arch=('any')
 url='https://ipython.org/pyreadline.html'
 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://files.pythonhosted.org/packages/bc/7c/d724ef1ec3ab2125f38a1d53285745445ec4a8f19b9bb0761b4064316679/pyreadline-2.1.zip')
 sha256sums=('4530592fc2e85b25b1a9f79664433da09237c1a270e4d78ea5aa3a2c7229e2d1')
 
 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 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/python3 setup.py check
+  cd "${srcdir}/python-build-${CARCH}"
+  ${MINGW_PREFIX}/bin/python setup.py check
 }
 
 package() {
-  cd "${srcdir}/${_realname}-${pkgver}"
+  cd "${srcdir}/python-build-${CARCH}"
 
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
-  ${MINGW_PREFIX}/bin/python3 setup.py install --prefix=${MINGW_PREFIX} \
+  ${MINGW_PREFIX}/bin/python setup.py install --prefix=${MINGW_PREFIX} \
     --root="${pkgdir}" --optimize=1 --skip-build
 }
diff --git a/mingw-w64-python-pyrsistent/PKGBUILD b/mingw-w64-python-pyrsistent/PKGBUILD
index bfdfc9df58..64eaf850f6 100644
--- a/mingw-w64-python-pyrsistent/PKGBUILD
+++ b/mingw-w64-python-pyrsistent/PKGBUILD
@@ -2,23 +2,26 @@
 
 _realname=pyrsistent
 pkgbase=mingw-w64-python-${_realname}
-pkgname=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
-pkgver=0.15.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=0.15.6
+pkgrel=1
 pkgdesc="Persistent/Functional/Immutable data structures (mingw-w64)"
 arch=('any')
 url='https://github.com/tobgu/pyrsistent'
 license=('MIT')
-depends=("${MINGW_PACKAGE_PREFIX}-python3"
-         "${MINGW_PACKAGE_PREFIX}-python3-six")
-makedepends=("${MINGW_PACKAGE_PREFIX}-python3-setuptools")
-checkdepends=("${MINGW_PACKAGE_PREFIX}-python3-pytest-runner"
-              "${MINGW_PACKAGE_PREFIX}-python3-flake8"
-              "${MINGW_PACKAGE_PREFIX}-python3-hypothesis")
+depends=("${MINGW_PACKAGE_PREFIX}-python"
+         "${MINGW_PACKAGE_PREFIX}-python-six")
+makedepends=("${MINGW_PACKAGE_PREFIX}-python-setuptools")
+checkdepends=("${MINGW_PACKAGE_PREFIX}-python-pytest-runner"
+              "${MINGW_PACKAGE_PREFIX}-python-flake8"
+              "${MINGW_PACKAGE_PREFIX}-python-hypothesis")
 options=('staticlibs' 'strip' '!debug')
 source=("https://pypi.io/packages/source/p/pyrsistent/pyrsistent-${pkgver}.tar.gz"
         LICENCE.mit)
-sha512sums=('6cdf561be95d6379138c5b7c09c47eb2fa52571e4bfefb2c09ebb302d15f04e2aca88f26fe24977de48ac27eff76f0731a12ac5d669f0d4cdcf44a997969dafa'
+sha512sums=('42b259c66e118d5b09bcc64e57441729146ed9b40e9fd18cda83c4aa0523d5bc3acde3177113e1f2a1b5c1e3a14d15b369df9701a9218a88a656ba0359b5ff10'
             '036bd5cc2a62b004576ecc50a84dc7d187d8108f52cb886f7e32bed324327af2dc132100e1c8f1dd2ce35b774f74898020f04a315e5137319deda18a449e791a')
 
 prepare() {
diff --git a/mingw-w64-python-pyserial/PKGBUILD b/mingw-w64-python-pyserial/PKGBUILD
index 396468d67c..f74e55bb5e 100644
--- a/mingw-w64-python-pyserial/PKGBUILD
+++ b/mingw-w64-python-pyserial/PKGBUILD
@@ -2,39 +2,45 @@
 
 _realname=pyserial
 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.4
 pkgrel=3
 pkgdesc="Multiplatform Serial Port Module for Python (mingw-w64)"
 arch=('any')
 url='https://github.com/pyserial/pyserial/'
 license=('custom:PYTHON')
-depends=("${MINGW_PACKAGE_PREFIX}-python3")
-makedepends=("${MINGW_PACKAGE_PREFIX}-python3-setuptools")
+depends=("${MINGW_PACKAGE_PREFIX}-python")
+makedepends=("${MINGW_PACKAGE_PREFIX}-python-setuptools")
 options=('staticlibs' 'strip' '!debug')
 source=("${_realname}-${pkgver}.tar.gz"::"https://github.com/pyserial/pyserial/archive/v${pkgver}.tar.gz")
 sha512sums=('d144897b7b86a6af1f0961fc2b2e71c28419e9afba50245d85c2cb3f1697c2a9d1a4c08576ca8cfb22c5a0adf34e50a62e8c54f903758eece1926d1cb6e83949')
 
-build() {
-  cd "${srcdir}/${_realname}-${pkgver}"
+prepare() {
+  rm -rf python-build-${CARCH} | true
+  cp -r "${_realname}-${pkgver}" "python-build-${CARCH}"
+}
 
-  ${MINGW_PREFIX}/bin/python3 setup.py build
+build() {
+  cd "${srcdir}/python-build-${CARCH}"
+  ${MINGW_PREFIX}/bin/python setup.py build
 }
 
 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.txt "${pkgdir}${MINGW_PREFIX}/share/licenses/python3-${_realname}/LICENSE.txt"
+  install -Dm644 LICENSE.txt "${pkgdir}${MINGW_PREFIX}/share/licenses/python-${_realname}/LICENSE.txt"
 
   local PREFIX_WIN=$(cygpath -wm ${MINGW_PREFIX})
   # fix python command in files
diff --git a/mingw-w64-python-pystemmer/PKGBUILD b/mingw-w64-python-pystemmer/PKGBUILD
index e57c1bc165..863bec138e 100644
--- a/mingw-w64-python-pystemmer/PKGBUILD
+++ b/mingw-w64-python-pystemmer/PKGBUILD
@@ -3,16 +3,19 @@
 _pyname=PyStemmer
 _realname=pystemmer
 pkgbase=mingw-w64-python-${_realname}
-pkgname=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+pkgname=("${MINGW_PACKAGE_PREFIX}-python-${_realname}")
+provides=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+conflicts=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+replaces=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
 pkgver=1.3.0
-pkgrel=4
+pkgrel=1
 pkgdesc="Snowball stemming algorithms, for information retrieval (mingw-w64)"
 arch=('any')
 url="http://snowball.tartarus.org"
 license=('MIT' 'BSD')
-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')
 source=("${_realname}-${pkgver}.tar.gz"::"http://snowball.tartarus.org/wrappers/${_pyname}-${pkgver}.tar.gz")
 sha256sums=('d1ac14eb64978c1697fcfba76e3ac7ebe24357c9428e775390f634648947cb91')
@@ -22,20 +25,23 @@ prepare() {
 
   # Force cython rebuild
   rm "src/Stemmer.c"
+
+  cd ${srcdir}
+  rm -rf python-build-${CARCH} | true
+  cp -r "${_pyname}-${pkgver}" "python-build-${CARCH}"
 }
   
 build() {
-  cd "${srcdir}/${_pyname}-${pkgver}"
-
-  ${MINGW_PREFIX}/bin/python3 setup.py build
+  cd "${srcdir}/python-build-${CARCH}"
+  ${MINGW_PREFIX}/bin/python setup.py build
 }
 
 package() {
-  cd "${srcdir}/${_pyname}-${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 -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-pytest-benchmark/PKGBUILD b/mingw-w64-python-pytest-benchmark/PKGBUILD
index c401c82ba8..6130b2e68b 100644
--- a/mingw-w64-python-pytest-benchmark/PKGBUILD
+++ b/mingw-w64-python-pytest-benchmark/PKGBUILD
@@ -2,52 +2,49 @@
 
 _realname=pytest-benchmark
 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.2
-pkgrel=4
+pkgrel=1
 pkgdesc="A py.test fixture for benchmarking code (mingw-w64)"
 arch=('any')
 url='https://github.com/ionelmc/pytest-benchmark'
 license=('BSD')
-depends=("${MINGW_PACKAGE_PREFIX}-python3"
-         "${MINGW_PACKAGE_PREFIX}-python3-py-cpuinfo"
-         "${MINGW_PACKAGE_PREFIX}-python3-pytest")
-makedepends=("${MINGW_PACKAGE_PREFIX}-python3-setuptools")
+depends=("${MINGW_PACKAGE_PREFIX}-python"
+         "${MINGW_PACKAGE_PREFIX}-python-py-cpuinfo"
+         "${MINGW_PACKAGE_PREFIX}-python-pytest")
+makedepends=("${MINGW_PACKAGE_PREFIX}-python-setuptools")
 options=('staticlibs' 'strip' '!debug')
-source=("${_realname}-$pkgver.tar.gz"::"https://github.com/ionelmc/pytest-benchmark/archive/v$pkgver.tar.gz")
+install=${_realname}3-${CARCH}.install
+source=("${_realname}-${pkgver}.tar.gz"::"https://github.com/ionelmc/pytest-benchmark/archive/v${pkgver}.tar.gz")
 sha256sums=('969e115612590b314765d6a96d17514f8b3a669abe6b5d062a0f054ce413a66c')
 
 prepare() {
-  cd "${srcdir}/${_realname}-${pkgver}"
+  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}
 }
 
 build() {
-  cd "${srcdir}/${_realname}-${pkgver}"
-
-  ${MINGW_PREFIX}/bin/python3 setup.py build
+  cd "${srcdir}/python-build-${CARCH}"
+  ${MINGW_PREFIX}/bin/python setup.py build
 }
 
 package() {
-  install=${_realname}3-${CARCH}.install
-
-  cd "${srcdir}/${_realname}-${pkgver}"
+  cd "${srcdir}/python-build-${CARCH}"
 
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
-  ${MINGW_PREFIX}/bin/python3 setup.py install --prefix=${MINGW_PREFIX} \
+  ${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"
 
-# This entire section should be removed if the package does NOT install
-# anything in the /mingw*/bin directory.
-### begin section ###
   local PREFIX_WIN=$(cygpath -wm ${MINGW_PREFIX})
   # fix python command in files
   for _f in "${pkgdir}${MINGW_PREFIX}"/bin/*.py; do
     sed -e "s|${PREFIX_WIN}|${MINGW_PREFIX}|g" -i ${_f}
   done
-#### end section ####
 }
-
diff --git a/mingw-w64-python-pyzmq/PKGBUILD b/mingw-w64-python-pyzmq/PKGBUILD
index da4b3248ee..689615c8c3 100644
--- a/mingw-w64-python-pyzmq/PKGBUILD
+++ b/mingw-w64-python-pyzmq/PKGBUILD
@@ -2,42 +2,47 @@
 
 _realname=pyzmq
 pkgbase=mingw-w64-python-${_realname}
-pkgname=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
-pkgver=18.1.0
-pkgrel=3
+pkgname=("${MINGW_PACKAGE_PREFIX}-python-${_realname}")
+provides=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+conflicts=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+replaces=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+pkgver=18.1.1
+pkgrel=1
 pkgdesc="Python bindings for zeromq, written in Cython (mingw-w64)"
 arch=('any')
 url="https://www.zeromq.org/languages/python"
 license=('LGPL')
-depends=("${MINGW_PACKAGE_PREFIX}-python3"
+depends=("${MINGW_PACKAGE_PREFIX}-python"
          "${MINGW_PACKAGE_PREFIX}-zeromq")
-makedepends=("${MINGW_PACKAGE_PREFIX}-python3-setuptools"
+makedepends=("${MINGW_PACKAGE_PREFIX}-python-setuptools"
              "${MINGW_PACKAGE_PREFIX}-cython")
 source=("${_realname}-${pkgver}.tar.gz"::"https://github.com/zeromq/${_realname}/archive/v${pkgver}.tar.gz"
         "001-mingw-python.patch")
-sha256sums=('32f7618b8104021bc96cbd60be4330bdf37b929e8061dbce362c9f3478a08e21'
+sha256sums=('b79afea8701970f0da15218abf9c2c6a39ab3dd8daaef25b868f55f9d9304687'
             '3106e8f70443154aa978b3fe1928774624f1ec21574dd7df9aa4699199afd43a')
 
 prepare() {
   cd "${srcdir}/${_realname}-${pkgver}"
-
   patch -p1 -i ${srcdir}/001-mingw-python.patch
+
+  cd "${srcdir}"
+  rm -rf python-build-${CARCH} | true
+  cp -r "${_realname}-${pkgver}" "python-build-${CARCH}"
 }
 
 build() {
-  cd "${srcdir}/${_realname}-${pkgver}"
-
-  ${MINGW_PREFIX}/bin/python3 setup.py build --zmq=${MINGW_PREFIX}
+  cd "${srcdir}/python-build-${CARCH}"
+  ${MINGW_PREFIX}/bin/python setup.py build --zmq=${MINGW_PREFIX}
 }
 
 package() {
-  cd "${srcdir}/${_realname}-${pkgver}"
+  cd "${srcdir}/python-build-${CARCH}"
 
   sed -i 's|except socket.error, e:|except socket.error as e:|' zmq/eventloop/ioloop.py
   sed -i 's|except gevent.Timeout, t:|except gevent.Timeout as t:|' zmq/green/core.py
 
   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=1 --skip-build
 
   find "${pkgdir}/" -name "*.pyc" -delete
diff --git a/mingw-w64-python-pyzopfli/PKGBUILD b/mingw-w64-python-pyzopfli/PKGBUILD
index 5f608992be..16b50b1119 100644
--- a/mingw-w64-python-pyzopfli/PKGBUILD
+++ b/mingw-w64-python-pyzopfli/PKGBUILD
@@ -2,30 +2,33 @@
 
 _realname=pyzopfli
 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
-_zopfliver=1.0.2
-pkgrel=3
+_zopfliver=1.0.3
+pkgrel=1
 pkgdesc="Python bindings for the Zopfli compressor (mingw-w64)"
 arch=('any')
 url='https://github.com/obp/py-zopfli/'
 license=('Apache')
-depends=("${MINGW_PACKAGE_PREFIX}-python3")
-makedepends=("${MINGW_PACKAGE_PREFIX}-python3-setuptools")
+depends=("${MINGW_PACKAGE_PREFIX}-python")
+makedepends=("${MINGW_PACKAGE_PREFIX}-python-setuptools")
 options=('staticlibs' 'strip' '!debug')
 source=("${_realname}-${pkgver}.tar.gz"::"https://github.com/obp/py-zopfli/archive/v${pkgver}.tar.gz"
         "zopfli-${_zopfliver}.tar.gz"::"https://github.com/google/zopfli/archive/zopfli-${_zopfliver}.tar.gz"
         win32-fixes.patch)
 sha256sums=('29e2327a2f698d05cb361e517179d6e2cacf84228894d92b9d90539c4bc383c0'
-            '4a570307c37172d894ec4ef93b6e8e3aacc401e78cbcc51cf85b212dbc379a55'
-            '25c2734059f3c794a8dddd5e9c7c176d96ff6f8d0ac0dada8d750951a995b41e')
+            'e955a7739f71af37ef3349c4fa141c648e8775bceb2195be07e86f8e638814bd'
+            '3adb302978fb0c47adf0eeb641b6674add71fd6af9a22497fbeffb991e78dddd')
 
 # Helper macros to help make tasks easier #
 apply_patch_with_msg() {
   for _patch in "$@"
   do
     msg2 "Applying $_patch"
-    patch -Nbp0 -i "${srcdir}/$_patch"
+    patch -Nbp1 -i "${srcdir}/${_patch}"
   done
 }
 
@@ -41,33 +44,36 @@ del_file_exists() {
 
 prepare() {
   cd "${srcdir}"
- #for this, you have to something weird, extract zopfli into a dir
- #named zopfli py-zopfli dir.  We also have to patch zopfli to match what
-#is in the mingw-w64-zopfli because that gives a serious warning about Win32.
+  # for this, you have to something weird, extract zopfli into a dir
+  # named zopfli py-zopfli dir.  We also have to patch zopfli to match what
+  # is in the mingw-w64-zopfli because that gives a serious warning about Win32.
   rm -rf py-zopfli-${pkgver}/zopfli
+  pushd zopfli-zopfli-${_zopfliver}
   apply_patch_with_msg win32-fixes.patch
+  popd
   cp -r "zopfli-zopfli-${_zopfliver}" "py-zopfli-${pkgver}/zopfli/"
 
+  rm -rf python-build-${CARCH} | true
+  cp -r "py-zopfli-${pkgver}" "python-build-${CARCH}"
+
   # Set version for setuptools_scm
-  export SETUPTOOLS_SCM_PRETEND_VERSION=$pkgver
+  export SETUPTOOLS_SCM_PRETEND_VERSION=${pkgver}
 }
 
 build() {
-  cd "${srcdir}/py-zopfli-${pkgver}"
-
-  ${MINGW_PREFIX}/bin/python${pver} setup.py build
+  cd "${srcdir}/python-build-${CARCH}"
+  ${MINGW_PREFIX}/bin/python setup.py build
 }
 
 check() {
-  cd "${srcdir}/py-zopfli-${pkgver}"
-
-  ${MINGW_PREFIX}/bin/python3 setup.py check
+  cd "${srcdir}/python-build-${CARCH}"
+  ${MINGW_PREFIX}/bin/python setup.py check
 }
 
 package() {
-  cd "${srcdir}/py-zopfli-${pkgver}"
+  cd "${srcdir}/python-build-${CARCH}"
 
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
-  ${MINGW_PREFIX}/bin/python3 setup.py install --prefix=${MINGW_PREFIX} \
+  ${MINGW_PREFIX}/bin/python setup.py install --prefix=${MINGW_PREFIX} \
     --root="${pkgdir}" --optimize=1 --skip-build
 }
diff --git a/mingw-w64-python-pyzopfli/win32-fixes.patch b/mingw-w64-python-pyzopfli/win32-fixes.patch
index 0a775066bc..25c293d61e 100644
--- a/mingw-w64-python-pyzopfli/win32-fixes.patch
+++ b/mingw-w64-python-pyzopfli/win32-fixes.patch
@@ -23,9 +23,9 @@
    /* 2) Let's mark all population counts that already can be encoded
    with an rle code.*/
 +#ifdef _WIN32
-+  good_for_rle = (size_t*)malloc(length * sizeof(size_t));
++  good_for_rle = (size_t*)malloc((unsigned)length * sizeof(size_t));
 +#else
-   good_for_rle = (int*)malloc(length * sizeof(int));
+   good_for_rle = (int*)malloc((unsigned)length * sizeof(int));
 +#endif
    for (i = 0; i < length; ++i) good_for_rle[i] = 0;
  
diff --git a/mingw-w64-python-qtconsole/PKGBUILD b/mingw-w64-python-qtconsole/PKGBUILD
index 59ba013679..36277907d7 100644
--- a/mingw-w64-python-qtconsole/PKGBUILD
+++ b/mingw-w64-python-qtconsole/PKGBUILD
@@ -2,33 +2,41 @@
 
 _realname=qtconsole
 pkgbase=mingw-w64-python-${_realname}
-pkgname=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
-pkgver=4.5.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=4.6.0
+pkgrel=1
 pkgdesc="A rich Qt-based console for working with Jupyter kernels, supporting rich media output, session export, and more (mingw-w64)"
 arch=('any')
 url="https://jupyter.org/"
 license=('BSD')
-depends=("${MINGW_PACKAGE_PREFIX}-python3"
-         "${MINGW_PACKAGE_PREFIX}-python3-jupyter_core"
-         "${MINGW_PACKAGE_PREFIX}-python3-jupyter_client"
-         "${MINGW_PACKAGE_PREFIX}-python3-pyqt5")
-makedepends=("${MINGW_PACKAGE_PREFIX}-python3-setuptools")
+depends=("${MINGW_PACKAGE_PREFIX}-python"
+         "${MINGW_PACKAGE_PREFIX}-python-jupyter_core"
+         "${MINGW_PACKAGE_PREFIX}-python-jupyter_client"
+         "${MINGW_PACKAGE_PREFIX}-python-pyqt5")
+makedepends=("${MINGW_PACKAGE_PREFIX}-python-setuptools")
 source=("${_realname}-${pkgver}.tar.gz::https://github.com/jupyter/qtconsole/archive/${pkgver}.tar.gz")
-sha256sums=('a6fb1200ac421d5c3eb15c1e51461654de65c4a81f0bc871a1a90f256378bded')
+sha256sums=('e1b58db749d34d39d5d7a025d976f4eddf78401f33ed2bc4292be4736b29622d')
+
+prepare() {
+  cd "${srcdir}"
+  rm -rf python-build-${CARCH} | true
+  cp -r "${_realname}-${pkgver}" "python-build-${CARCH}"
+}
 
 build() {
-  cd "${srcdir}/${_realname}-${pkgver}"
-
-  ${MINGW_PREFIX}/bin/python3 setup.py build
+  cd "${srcdir}/python-build-${CARCH}"
+  ${MINGW_PREFIX}/bin/python setup.py build
 }
 
 package() {
-  cd "${srcdir}/${_realname}-${pkgver}"
+  cd "${srcdir}/python-build-${CARCH}"
 
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
-  ${MINGW_PREFIX}/bin/python3 setup.py install \
-    --prefix=${MINGW_PREFIX} --root=${pkgdir} --optimize=0
+  ${MINGW_PREFIX}/bin/python setup.py install \
+    --prefix=${MINGW_PREFIX} --root=${pkgdir} --optimize=0 --skip-build
 
   find "${pkgdir}/" -name "*.pyc" -delete
   find "${pkgdir}/" -type d -empty -delete
@@ -39,6 +47,5 @@ package() {
     sed -e "s|${PREFIX_WIN}/bin/|/usr/bin/env |g" -i ${_f}
   done
 
-  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-scipy/001-build-fix.patch b/mingw-w64-python-scipy/001-build-fix.patch
new file mode 100644
index 0000000000..ee7f4cf3f0
--- /dev/null
+++ b/mingw-w64-python-scipy/001-build-fix.patch
@@ -0,0 +1,11 @@
+--- scipy-1.4.1/scipy/optimize/rectangular_lsap/rectangular_lsap.cpp.orig	2019-12-25 15:32:42.768123200 +0300
++++ scipy-1.4.1/scipy/optimize/rectangular_lsap/rectangular_lsap.cpp	2019-12-25 15:33:06.667365200 +0300
+@@ -40,6 +40,8 @@
+ Author: PM Larsen
+ */
+ 
++#include "rectangular_lsap.h"
++
+ #include <algorithm>
+ #include <cmath>
+ #include <vector>
diff --git a/mingw-w64-python-scipy/PKGBUILD b/mingw-w64-python-scipy/PKGBUILD
index 0682b0ef5c..bc229104d0 100644
--- a/mingw-w64-python-scipy/PKGBUILD
+++ b/mingw-w64-python-scipy/PKGBUILD
@@ -2,49 +2,54 @@
 
 _realname=scipy
 pkgbase=mingw-w64-python3-${_realname}
-pkgname=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
-pkgver=1.3.2
+pkgname=("${MINGW_PACKAGE_PREFIX}-python-${_realname}")
+provides=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+conflicts=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+replaces=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+pkgver=1.4.1
 pkgrel=1
 pkgdesc="SciPy is open-source software for mathematics, science, and engineering (mingw-w64)"
 arch=('any')
 url="https://www.scipy.org/"
 license=('BSD')
+depends=("${MINGW_PACKAGE_PREFIX}-gcc-libgfortran"
+         "${MINGW_PACKAGE_PREFIX}-openblas"
+         "${MINGW_PACKAGE_PREFIX}-python-numpy")
+optdepends=("${MINGW_PACKAGE_PREFIX}-python-nose: testsuite")
 makedepends=("${MINGW_PACKAGE_PREFIX}-gcc-fortran"
-             "${MINGW_PACKAGE_PREFIX}-openblas"
-             "${MINGW_PACKAGE_PREFIX}-python3-numpy"
-             "${MINGW_PACKAGE_PREFIX}-python3-setuptools")
-source=(${_realname}-${pkgver}.tar.gz::https://github.com/scipy/scipy/releases/download/v${pkgver}/${_realname}-${pkgver}.tar.gz)
-sha256sums=('a03939b431994289f39373c57bbe452974a7da724ae7f9620a1beee575434da4')
+             "${MINGW_PACKAGE_PREFIX}-python-setuptools")
+source=(${_realname}-${pkgver}.tar.gz::https://github.com/scipy/scipy/releases/download/v${pkgver}/${_realname}-${pkgver}.tar.gz
+        001-build-fix.patch)
+sha256sums=('dee1bbf3a6c8f73b6b218cb28eed8dd13347ea2f87d572ce19b289d6fd3fbc59'
+            '6753ce337da82b660bd4bfc11119e9f79b25ac337c5c146ae1171e795aaca417')
 
 prepare() {
-  cp -a ${_realname}-${pkgver} ${MINGW_CHOST}-py3
+  cd ${_realname}-${pkgver}
+  patch -p1 -i ${srcdir}/001-build-fix.patch
+
+  cd "${srcdir}"
+  rm -rf python-build-${CARCH} | true
+  cp -r "${_realname}-${pkgver}" "python-build-${CARCH}"
 }
 
 build() {
+  cd ${srcdir}/python-build-${CARCH}
   LDFLAGS="${LDFLAGS} -Wall -shared"
-
-  # build for python3
-  cd ${srcdir}/${MINGW_CHOST}-py3
   result="fail"
   while [ "$result" = "fail" ]; do
     MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
-    ${MINGW_PREFIX}/bin/python3 setup.py config_fc --fcompiler=gnu95 build && result="success"
+    ${MINGW_PREFIX}/bin/python setup.py config_fc --fcompiler=gnu95 build && result="success"
   done
 }
 
 package() {
-  depends=("${MINGW_PACKAGE_PREFIX}-gcc-libgfortran"
-           "${MINGW_PACKAGE_PREFIX}-openblas"
-           "${MINGW_PACKAGE_PREFIX}-python3-numpy")
-  optdepends=("${MINGW_PACKAGE_PREFIX}-python3-nose: testsuite")
-
-  cd ${MINGW_CHOST}-py3
+  cd python-build-${CARCH}
   LDFLAGS="${LDFLAGS} -Wall -shared"
 
   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  --skip-build
 
   install -Dm644 LICENSE.txt \
-    "${pkgdir}${MINGW_PREFIX}/share/licenses/python3-${_realname}/LICENSE"
+    "${pkgdir}${MINGW_PREFIX}/share/licenses/python-${_realname}/LICENSE"
 }
diff --git a/mingw-w64-python-send2trash/PKGBUILD b/mingw-w64-python-send2trash/PKGBUILD
index 7352928211..f86e7b0950 100644
--- a/mingw-w64-python-send2trash/PKGBUILD
+++ b/mingw-w64-python-send2trash/PKGBUILD
@@ -2,29 +2,36 @@
 
 _realname=send2trash
 pkgbase=mingw-w64-python-${_realname}
-pkgname=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+pkgname=("${MINGW_PACKAGE_PREFIX}-python-${_realname}")
+provides=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+conflicts=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+replaces=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
 pkgver=1.5.0
-pkgrel=4
+pkgrel=1
 pkgdesc="Send file to trash natively (mingw-w64)"
 url="https://github.com/hsoft/send2trash"
 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/hsoft/${_realname}/archive/${pkgver}.tar.gz)
 sha256sums=('7cebc0ffc8b6d6e553bce9c6bb915614610ba2dec17c2f0643b1b97251da2a41')
 
-build() {
-  cd "${srcdir}/${_realname}-${pkgver}"
+prepare() {
+  rm -rf python-build-${CARCH} | true
+  cp -r "${_realname}-${pkgver}" "python-build-${CARCH}"
+}
 
-  ${MINGW_PREFIX}/bin/python3 setup.py build
+build() {
+  cd "${srcdir}/python-build-${CARCH}"
+  ${MINGW_PREFIX}/bin/python setup.py build
 }
 
 package() {
-  cd "${srcdir}/${_realname}-${pkgver}"
+  cd "${srcdir}/python-build-${CARCH}"
 
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
-  ${MINGW_PREFIX}/bin/python3 setup.py install --root=${pkgdir} --prefix=${MINGW_PREFIX} --optimize=1
+  ${MINGW_PREFIX}/bin/python setup.py install --root=${pkgdir} --prefix=${MINGW_PREFIX} --optimize=1 --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-simplegeneric/PKGBUILD b/mingw-w64-python-simplegeneric/PKGBUILD
index 1b66f3c07f..17938870cb 100644
--- a/mingw-w64-python-simplegeneric/PKGBUILD
+++ b/mingw-w64-python-simplegeneric/PKGBUILD
@@ -2,40 +2,43 @@
 
 _realname=simplegeneric
 pkgbase=mingw-w64-python-${_realname}
-pkgname=("${MINGW_PACKAGE_PREFIX}-python3-simplegeneric")
+pkgname=("${MINGW_PACKAGE_PREFIX}-python-simplegeneric")
+provides=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+conflicts=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+replaces=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
 pkgver=0.8.1
-pkgrel=6
+pkgrel=1
 pkgdesc="File system based database that uses python pickles (mingw-w64)"
 url="https://pypi.org/project/simplegeneric/"
 arch=('any')
 license=('Zope Public License')
-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/s/${_realname}/${_realname}-${pkgver}.zip")
 sha256sums=('dc972e06094b9af5b855b3df4a646395e43d1c9d0d39ed345b7393560d0b9173')
 
 prepare() {
-  cd "${srcdir}/${_realname}-${pkgver}"
+  cd "${srcdir}"
+  rm -rf python-build-${CARCH} | true
+  cp -r "${_realname}-${pkgver}" "python-build-${CARCH}"
 
   # Set version for setuptools_scm
-  export SETUPTOOLS_SCM_PRETEND_VERSION=$pkgver
+  export SETUPTOOLS_SCM_PRETEND_VERSION=${pkgver}
 }
 
 build() {
-  cd "${srcdir}/${_realname}-${pkgver}"
-
-  ${MINGW_PREFIX}/bin/python3 setup.py build
+  cd "${srcdir}/python-build-${CARCH}"
+  ${MINGW_PREFIX}/bin/python setup.py build
 }
 
 check() {
-  cd "${srcdir}/${_realname}-${pkgver}"
-
-  ${MINGW_PREFIX}/bin/python3 setup.py test
+  cd "${srcdir}/python-build-${CARCH}"
+  ${MINGW_PREFIX}/bin/python setup.py test
 }
 
 package() {
-  cd "${srcdir}/${_realname}-${pkgver}"
+  cd "${srcdir}/python-build-${CARCH}"
 
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
-    ${MINGW_PREFIX}/bin/python3 setup.py install --root=${pkgdir} --prefix=${MINGW_PREFIX} --optimize=1 --skip-build
+    ${MINGW_PREFIX}/bin/python setup.py install --root=${pkgdir} --prefix=${MINGW_PREFIX} --optimize=1 --skip-build
 }
diff --git a/mingw-w64-python-sqlalchemy-migrate/PKGBUILD b/mingw-w64-python-sqlalchemy-migrate/PKGBUILD
index 94dc2a3410..20ebc60ef3 100644
--- a/mingw-w64-python-sqlalchemy-migrate/PKGBUILD
+++ b/mingw-w64-python-sqlalchemy-migrate/PKGBUILD
@@ -2,72 +2,66 @@
 
 _realname=sqlalchemy-migrate
 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.13.0
-pkgrel=2
+pkgrel=1
 pkgdesc="Database schema migration for SQLAlchemy (mingw-w64)"
 arch=('any')
 url='https://pypi.python.org/pypi/sqlalchemy-migrate'
 license=('Apache')
-depends=("${MINGW_PACKAGE_PREFIX}-python3"
-         "${MINGW_PACKAGE_PREFIX}-python3-six"
-         "${MINGW_PACKAGE_PREFIX}-python3-pbr"
-         "${MINGW_PACKAGE_PREFIX}-python3-sqlalchemy"
-         "${MINGW_PACKAGE_PREFIX}-python3-decorator"
-         "${MINGW_PACKAGE_PREFIX}-python3-sqlparse"
-         "${MINGW_PACKAGE_PREFIX}-python3-tempita")
-makedepends=("${MINGW_PACKAGE_PREFIX}-python3-setuptools")
-#checkdepends=("${MINGW_PACKAGE_PREFIX}-python3-mock"
-#             "${MINGW_PACKAGE_PREFIX}-python3-testrepository"
-#             "${MINGW_PACKAGE_PREFIX}-python3-scripttest"
-#             "${MINGW_PACKAGE_PREFIX}-python3-ibm-db-sa"
+depends=("${MINGW_PACKAGE_PREFIX}-python"
+         "${MINGW_PACKAGE_PREFIX}-python-six"
+         "${MINGW_PACKAGE_PREFIX}-python-pbr"
+         "${MINGW_PACKAGE_PREFIX}-python-sqlalchemy"
+         "${MINGW_PACKAGE_PREFIX}-python-decorator"
+         "${MINGW_PACKAGE_PREFIX}-python-sqlparse"
+         "${MINGW_PACKAGE_PREFIX}-python-tempita")
+makedepends=("${MINGW_PACKAGE_PREFIX}-python-setuptools")
+#checkdepends=("${MINGW_PACKAGE_PREFIX}-python-mock"
+#             "${MINGW_PACKAGE_PREFIX}-python-testrepository"
+#             "${MINGW_PACKAGE_PREFIX}-python-scripttest"
+#             "${MINGW_PACKAGE_PREFIX}-python-ibm-db-sa"
 #             "${MINGW_PACKAGE_PREFIX}-mysql-python")
 options=('staticlibs' 'strip' '!debug')
+install=${_realname}3-${CARCH}.install
 source=(#"${_realname}-${pkgver}.tar.gz"::"https://github.com/openstack/sqlalchemy-migrate/archive/${pkgver}.tar.gz"
         https://files.pythonhosted.org/packages/36/bb/40f66b12b18fb03da76dcee31df75cca9e54b71d9d8a784bb95bfbadee2c/${_realname}-${pkgver}.tar.gz)
 sha512sums=('1ca826a5d80c1373ffc4b2366dfb6d5dd24204964462873451c97d8ff4d75fc6c63f663c4769b7f6cc00002f6a98d425f41d759e5c010b4b81a8b74ffbb102b6')
 
 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 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/python3 setup.py testr || warning "Tests failed"
+#  cd "${srcdir}/python-build-${CARCH}"
+#  ${MINGW_PREFIX}/bin/python setup.py testr || warning "Tests failed"
 #}
 
 package() {
-  #This package install is needed for .fixups with .EXE's 
-  #in the bit directory.  The install files "python-exe-installs"
-  #and should be renamed to your _realname .
-  install=${_realname}3-${CARCH}.install
-
-  cd "${srcdir}/${_realname}-${pkgver}"
+  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-sqlalchemy/PKGBUILD b/mingw-w64-python-sqlalchemy/PKGBUILD
index dba669c6ef..2bab90eb4c 100644
--- a/mingw-w64-python-sqlalchemy/PKGBUILD
+++ b/mingw-w64-python-sqlalchemy/PKGBUILD
@@ -2,22 +2,25 @@
 
 _realname=sqlalchemy
 pkgbase=mingw-w64-python-${_realname}
-pkgname=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
-pkgver=1.3.10
-pkgrel=2
+pkgname=("${MINGW_PACKAGE_PREFIX}-python-${_realname}")
+provides=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+conflicts=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+replaces=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+pkgver=1.3.12
+pkgrel=1
 pkgdesc="Python SQL toolkit and Object Relational Mapper (mingw-w64)"
 arch=('any')
 url='https://www.sqlalchemy.org/'
 license=('MIT')
-depends=("${MINGW_PACKAGE_PREFIX}-python3")
-makedepends=("${MINGW_PACKAGE_PREFIX}-python3-setuptools")
-checkdepends=("${MINGW_PACKAGE_PREFIX}-python3-pytest-runner"
-              "${MINGW_PACKAGE_PREFIX}-python3-pytest-xdist"
-              "${MINGW_PACKAGE_PREFIX}-python3-mock")
+depends=("${MINGW_PACKAGE_PREFIX}-python")
+makedepends=("${MINGW_PACKAGE_PREFIX}-python-setuptools")
+checkdepends=("${MINGW_PACKAGE_PREFIX}-python-pytest-runner"
+              "${MINGW_PACKAGE_PREFIX}-python-pytest-xdist"
+              "${MINGW_PACKAGE_PREFIX}-python-mock")
 options=('staticlibs' 'strip' '!debug')
 source=("https://pypi.io/packages/source/S/SQLAlchemy/SQLAlchemy-${pkgver}.tar.gz"{,.asc})
 validpgpkeys=('83AF7ACE251C13E6BB7DEFBD330239C1C4DAFEE1')
-sha512sums=('d4ea7c56b1a2e487f596db2d0968e2312cee2a7a0b68a9a98b5d9439974e79fcd21b7dda4cbdffd5013172ad4bdadf7283cade62b2c26875905fbeb318d0e83b'
+sha512sums=('2748d945f0cabdb35fe1277045a32ef6e030f07c761715b6c02228af35ec470b829b29ade481d3b96a6da54329575d6e79c62539420800b4f5e3f56dcb2f7326'
             'SKIP')
 
 # Helper macros to help make tasks easier #
diff --git a/mingw-w64-python-sqlitedict/PKGBUILD b/mingw-w64-python-sqlitedict/PKGBUILD
index b8fe8350e8..10393eb250 100644
--- a/mingw-w64-python-sqlitedict/PKGBUILD
+++ b/mingw-w64-python-sqlitedict/PKGBUILD
@@ -2,38 +2,45 @@
 
 _realname=sqlitedict
 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.6.0
-pkgrel=3
+pkgrel=1
 pkgdesc="Persistent dict, backed by sqlite3 and pickle, multithread-safe (mingw-w64)"
 arch=('any')
 license=('BSD')
 url="https://github.com/RaRe-Technologies/sqlitedict"
-depends=("${MINGW_PACKAGE_PREFIX}-python3"
+depends=("${MINGW_PACKAGE_PREFIX}-python"
          "${MINGW_PACKAGE_PREFIX}-sqlite3")
-makedepends=("${MINGW_PACKAGE_PREFIX}-python3-setuptools")
-checkdepends=("${MINGW_PACKAGE_PREFIX}-python3-nose"
-              "${MINGW_PACKAGE_PREFIX}-python3-coverage")
+makedepends=("${MINGW_PACKAGE_PREFIX}-python-setuptools")
+checkdepends=("${MINGW_PACKAGE_PREFIX}-python-nose"
+              "${MINGW_PACKAGE_PREFIX}-python-coverage")
 source=("${_realname}-${pkgver}.tar.gz::https://github.com/RaRe-Technologies/sqlitedict/archive/${pkgver}.tar.gz")
 sha256sums=('8ab2e0cc361629f8eab8997930bb608b37bb22050b0304dbfa3b40ad7b278634')
 
-build() {
-  cd "${srcdir}/${_realname}-${pkgver}"
+prepare() {
+  cd "${srcdir}"
+  rm -rf "python-build-${CARCH}" | true
+  cp -r "${_realname}-${pkgver}" "python-build-${CARCH}"
+}
 
-  python3 setup.py build
+build() {
+  cd "${srcdir}/python-build-${CARCH}"
+  ${MINGW_PREFIX}/bin/python setup.py build
 }
 
 check() {
-  cd "${srcdir}/${_realname}-${pkgver}"
-
-  nosetests3
+  cd "${srcdir}/python-build-${CARCH}"
+  ${MINGW_PREFIX}/bin/nosetests
 }
 
 package() {
-  cd "${srcdir}/${_realname}-${pkgver}"
+  cd "${srcdir}/python-build-${CARCH}"
 
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
-  ${MINGW_PREFIX}/bin/python3 setup.py install --root=${pkgdir} --prefix=${MINGW_PREFIX} --optimize=1
+  ${MINGW_PREFIX}/bin/python setup.py install --root=${pkgdir} --prefix=${MINGW_PREFIX} --optimize=1 --skip-build
 
-  install -D -m644 LICENSE.rst "${pkgdir}${MINGW_PREFIX}/share/licenses/python3-sqlitedict/LICENSE"
+  install -D -m644 LICENSE.rst "${pkgdir}${MINGW_PREFIX}/share/licenses/python-sqlitedict/LICENSE"
 }
diff --git a/mingw-w64-python-sqlparse/PKGBUILD b/mingw-w64-python-sqlparse/PKGBUILD
index 24eba9a864..cd80a085f9 100644
--- a/mingw-w64-python-sqlparse/PKGBUILD
+++ b/mingw-w64-python-sqlparse/PKGBUILD
@@ -2,59 +2,54 @@
 
 _realname=sqlparse
 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="Non-validating SQL parser for Python (mingw-w64)"
 arch=('any')
 url='https://github.com/andialbrecht/sqlparse'
 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')
+install=${_realname}3-${CARCH}.install
 source=("${_realname}-$pkgver.tar.gz::https://github.com/andialbrecht/sqlparse/archive/${pkgver}.tar.gz")
 sha256sums=('a75fddae009fba1d66786203c9dd3a842aa4415475c466d15484139117108474')
 
 prepare() {
-  cd "${srcdir}/${_realname}-${pkgver}"
+  cd "${srcdir}"
+  rm -rf "python-build-${CARCH}" | true
+  cp -r "${_realname}-${pkgver}" "python-build-${CARCH}"
 
   # Set version for setuptools_scm
-  export SETUPTOOLS_SCM_PRETEND_VERSION=$pkgver
+  export SETUPTOOLS_SCM_PRETEND_VERSION=${pkgver}
 }
 
 build() {
-  cd "${srcdir}/${_realname}-${pkgver}"
-
-  ${MINGW_PREFIX}/bin/python3 setup.py build
+  cd "${srcdir}/python-build-${CARCH}"
+  ${MINGW_PREFIX}/bin/python setup.py build
 }
 
 check() {
-  cd "${srcdir}/${_realname}-${pkgver}"
-
-  ${MINGW_PREFIX}/bin/python3 setup.py test
+  cd "${srcdir}/python-build-${CARCH}"
+  ${MINGW_PREFIX}/bin/python setup.py test
 }
 
 package() {
-  #This package install is needed for .fixups with .EXE's 
-  #in the bit directory.  The install files "python-exe-installs"
-  #and should be renamed to your _realname .
-  install=${_realname}3-${CARCH}.install
-
-  cd "${srcdir}/${_realname}-${pkgver}"
+  cd "${srcdir}/python-build-${CARCH}"
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
-  ${MINGW_PREFIX}/bin/python3 setup.py install --prefix=${MINGW_PREFIX} \
+  ${MINGW_PREFIX}/bin/python setup.py install --prefix=${MINGW_PREFIX} \
     --root="${pkgdir}" --optimize=1 --skip-build
 
-  install -Dm644 LICENSE "${pkgdir}${MINGW_PREFIX}/share/licenses/python3-${_realname}/LICENSE"
+  install -Dm644 LICENSE "${pkgdir}${MINGW_PREFIX}/share/licenses/python-${_realname}/LICENSE"
 
-# This entire section should be removed if the package does NOT install
-# anything in the /mingw*/bin directory.
-### begin section ###
   local PREFIX_WIN=$(cygpath -wm ${MINGW_PREFIX})
   # fix python command in files
   for _f in "${pkgdir}${MINGW_PREFIX}"/bin/*.py; do
     sed -e "s|/usr/bin/env |${MINGW_PREFIX}|g" \
         -e "s|${PREFIX_WIN}|${MINGW_PREFIX}|g" -i ${_f}
   done
-#### end section ####
 }
diff --git a/mingw-w64-python-statsmodels/001-dont-include-extra-files.patch b/mingw-w64-python-statsmodels/001-dont-include-extra-files.patch
index b3d40a67b3..4d307668a4 100644
--- a/mingw-w64-python-statsmodels/001-dont-include-extra-files.patch
+++ b/mingw-w64-python-statsmodels/001-dont-include-extra-files.patch
@@ -9,12 +9,3 @@
  
  FILES_COPIED_TO_PACKAGE = []
  for filename in FILES_TO_INCLUDE_IN_PACKAGE:
-@@ -343,7 +343,7 @@
-       install_requires=INSTALL_REQUIRES,
-       extras_require=EXTRAS_REQUIRE,
-       zip_safe=False,
--      data_files=[('', ['LICENSE.txt', 'setup.cfg'])]
-+      data_files=[('', [])]
-       )
- 
- # Clean-up copied files
diff --git a/mingw-w64-python-statsmodels/PKGBUILD b/mingw-w64-python-statsmodels/PKGBUILD
index cae789bf65..3e1b34955d 100644
--- a/mingw-w64-python-statsmodels/PKGBUILD
+++ b/mingw-w64-python-statsmodels/PKGBUILD
@@ -2,46 +2,51 @@
 
 _realname=statsmodels
 pkgbase=mingw-w64-python-${_realname}
-pkgname=("${MINGW_PACKAGE_PREFIX}-python3-$_realname")
-pkgver=0.10.1
-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.10.2
+pkgrel=1
 pkgdesc="Statistical computations and models for use with SciPy (mingw-w64)"
 arch=('any')
 url="https://statsmodels.sourceforge.io/"
 license=('BSD')
-depends=("${MINGW_PACKAGE_PREFIX}-python3-scipy"
-         "${MINGW_PACKAGE_PREFIX}-python3-pandas"
-         "${MINGW_PACKAGE_PREFIX}-python3-patsy")
-optdepends=("${MINGW_PACKAGE_PREFIX}-python3-nose: needed for integrated test suite"
-            "${MINGW_PACKAGE_PREFIX}-python3-matplotlib: needed for plotting functions")
+depends=("${MINGW_PACKAGE_PREFIX}-python-scipy"
+         "${MINGW_PACKAGE_PREFIX}-python-pandas"
+         "${MINGW_PACKAGE_PREFIX}-python-patsy")
+optdepends=("${MINGW_PACKAGE_PREFIX}-python-nose: needed for integrated test suite"
+            "${MINGW_PACKAGE_PREFIX}-python-matplotlib: needed for plotting functions")
 makedepends=("${MINGW_PACKAGE_PREFIX}-cython"
-             "${MINGW_PACKAGE_PREFIX}-python3-setuptools"
+             "${MINGW_PACKAGE_PREFIX}-python-setuptools"
              "${MINGW_PACKAGE_PREFIX}-gcc")
 source=("https://pypi.org/packages/source/${_realname::1}/${_realname}/${_realname}-${pkgver}.tar.gz"
         001-dont-include-extra-files.patch)
-sha256sums=('320659a80f916c2edf9dfbe83512d9004bb562b72eedb7d9374562038697fa10'
-            'd6ca9de4dbf5a8a578b582ddab7b0931ed037470b04b5a3c0ed8056ace94e257')
+sha256sums=('9cd2194c6642a8754e85f9a6e6912cdf996bebf6ff715d3cc67f65dadfd37cc9'
+            '4d027a41038fc211ae37c64c6a019616feef8e36164c2f269410b4b38f682e91')
 
 prepare() {
-  cd "${srcdir}/${_realname}-${pkgver}"
-
+  cd "${_realname}-${pkgver}"
   patch -p1 -i ${srcdir}/001-dont-include-extra-files.patch
+
+  cd "${srcdir}"
+  rm -rf "python-build-${CARCH}" | true
+  cp -r "${_realname}-${pkgver}" "python-build-${CARCH}"
 }
 
 build() {
-  cd "${srcdir}/${_realname}-${pkgver}"
-
+  cd "${srcdir}/python-build-${CARCH}"
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
-  ${MINGW_PREFIX}/bin/python3 setup.py build
+  ${MINGW_PREFIX}/bin/python setup.py build
 }
 
 package() {
-  cd "${srcdir}/${_realname}-${pkgver}"
+  cd "${srcdir}/python-build-${CARCH}"
 
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
-  ${MINGW_PREFIX}/bin/python3 setup.py install --skip-build \
+  ${MINGW_PREFIX}/bin/python setup.py install --skip-build \
     --prefix=${MINGW_PREFIX} --root=${pkgdir} --optimize=1
 
   install -Dm644 LICENSE.txt \
-    "${pkgdir}${MINGW_PREFIX}/share/licenses/python3-${_realname}/LICENSE.txt"
+    "${pkgdir}${MINGW_PREFIX}/share/licenses/python-${_realname}/LICENSE.txt"
 }
diff --git a/mingw-w64-python-stestr/PKGBUILD b/mingw-w64-python-stestr/PKGBUILD
index a992edfc3f..63f7b303f1 100644
--- a/mingw-w64-python-stestr/PKGBUILD
+++ b/mingw-w64-python-stestr/PKGBUILD
@@ -2,30 +2,33 @@
 
 _realname=stestr
 pkgbase=mingw-w64-python-${_realname}
-pkgname=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
-pkgver=2.5.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=2.6.0
+pkgrel=1
 pkgdesc="A test runner runner similar to testrepository (mingw-w64)"
 arch=('any')
 url='https://stestr.readthedocs.io/en/latest/'
 license=('Apache')
-depends=("${MINGW_PACKAGE_PREFIX}-python3"
-         "${MINGW_PACKAGE_PREFIX}-python3-cliff"
-         "${MINGW_PACKAGE_PREFIX}-python3-fixtures"
-         "${MINGW_PACKAGE_PREFIX}-python3-future"
-         "${MINGW_PACKAGE_PREFIX}-python3-pbr"
-         "${MINGW_PACKAGE_PREFIX}-python3-six"
-         "${MINGW_PACKAGE_PREFIX}-python3-subunit"
-         "${MINGW_PACKAGE_PREFIX}-python3-testtools"
-         "${MINGW_PACKAGE_PREFIX}-python3-voluptuous"
-         "${MINGW_PACKAGE_PREFIX}-python3-yaml")
-makedepends=("${MINGW_PACKAGE_PREFIX}-python3-setuptools")
+depends=("${MINGW_PACKAGE_PREFIX}-python"
+         "${MINGW_PACKAGE_PREFIX}-python-cliff"
+         "${MINGW_PACKAGE_PREFIX}-python-fixtures"
+         "${MINGW_PACKAGE_PREFIX}-python-future"
+         "${MINGW_PACKAGE_PREFIX}-python-pbr"
+         "${MINGW_PACKAGE_PREFIX}-python-six"
+         "${MINGW_PACKAGE_PREFIX}-python-subunit"
+         "${MINGW_PACKAGE_PREFIX}-python-testtools"
+         "${MINGW_PACKAGE_PREFIX}-python-voluptuous"
+         "${MINGW_PACKAGE_PREFIX}-python-yaml")
+makedepends=("${MINGW_PACKAGE_PREFIX}-python-setuptools")
 #checkdepends=('python-hacking' 'python-sphinx' 'python-mock'
 #              'python-subunit2sql' 'python-coverage' 'python-ddt')
 install=${_realname}3-${CARCH}.install
 options=('staticlibs' 'strip' '!debug')
 source=("https://pypi.io/packages/source/s/stestr/stestr-${pkgver}.tar.gz")
-sha512sums=('f3f64448bd6782ab125e7d1094992bf1f9416cab8656c9f0bc800d00839b898000a04ffcf6010002f7c247ec06ca236389688ea67be6f3c1c979916455a03e28')
+sha512sums=('687e8fb7bcf011e3d84d012cd7389accb8e81633ec069df4fb501d0457cdf6147b9820bf24cb49c63e6698d1b8494f50576a8f0dc9e99c36fc175cd9ce88b7bd')
 
 # Helper macros to help make tasks easier #
 apply_patch_with_msg() {
@@ -53,47 +56,39 @@ 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}
 }
 
-# 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}"
 #  export PYTHONPATH="$PWD/tmp_install/usr/lib/python3.8/site-packages"
 #  export PATH="$PWD/tmp_install/usr/bin:$PATH"
 #  stestr run || warning "Tests failed"
 #}
 
 package() {
-  cd "${srcdir}/python3-build-${CARCH}"
+  cd "${srcdir}/python-build-${CARCH}"
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
-  ${MINGW_PREFIX}/bin/python3 setup.py install --prefix=${MINGW_PREFIX} \
+  ${MINGW_PREFIX}/bin/python setup.py install --prefix=${MINGW_PREFIX} \
     --root="${pkgdir}" --optimize=1 --skip-build
 
-  install -Dm644 LICENSE "${pkgdir}${MINGW_PREFIX}/share/licenses/python3-${_realname}/LICENSE"
+  install -Dm644 LICENSE "${pkgdir}${MINGW_PREFIX}/share/licenses/python-${_realname}/LICENSE"
 
-  # This entire section should be removed if the package does NOT install
-  # anything in the /mingw*/bin directory.
-  ### begin section ###
   local PREFIX_WIN=$(cygpath -wm ${MINGW_PREFIX})
   # fix python command in files
   for _f in "${pkgdir}${MINGW_PREFIX}"/bin/*.py; do
     sed -e "s|/usr/bin/env |${MINGW_PREFIX}|g" \
         -e "s|${PREFIX_WIN}|${MINGW_PREFIX}|g" -i ${_f}
   done
-  #### end section ####
 }
diff --git a/mingw-w64-python-stevedore/PKGBUILD b/mingw-w64-python-stevedore/PKGBUILD
index 73364a7440..c56aa0d11c 100644
--- a/mingw-w64-python-stevedore/PKGBUILD
+++ b/mingw-w64-python-stevedore/PKGBUILD
@@ -2,16 +2,19 @@
 
 _realname=stevedore
 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.31.0
-pkgrel=2
+pkgrel=1
 pkgdesc="Manage dynamic plugins for Python applications (mingw-w64)"
 arch=('any')
 url='https://github.com/openstack/stevedore'
 license=('Apache')
-depends=("${MINGW_PACKAGE_PREFIX}-python3"
-         "${MINGW_PACKAGE_PREFIX}-python3-six")
-makedepends=("${MINGW_PACKAGE_PREFIX}-python3-setuptools")
+depends=("${MINGW_PACKAGE_PREFIX}-python"
+         "${MINGW_PACKAGE_PREFIX}-python-six")
+makedepends=("${MINGW_PACKAGE_PREFIX}-python-setuptools")
 options=('staticlibs' 'strip' '!debug')
 source=(https://pypi.org/packages/source/s/stevedore/stevedore-${pkgver}.tar.gz)
 sha256sums=('e0739f9739a681c7a1fda76a102b65295e96a144ccdb552f2ae03c5f0abe8a14')
diff --git a/mingw-w64-python-subunit/PKGBUILD b/mingw-w64-python-subunit/PKGBUILD
index f056120bdd..d90e8c38dc 100644
--- a/mingw-w64-python-subunit/PKGBUILD
+++ b/mingw-w64-python-subunit/PKGBUILD
@@ -2,20 +2,23 @@
 
 _realname=subunit
 pkgbase=mingw-w64-python-${_realname}
-pkgname=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+pkgname=("${MINGW_PACKAGE_PREFIX}-python-${_realname}")
+provides=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+conflicts=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+replaces=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
 pkgver=1.3.0
-pkgrel=4
+pkgrel=1
 pkgdesc="Python implementation of subunit test streaming protocol (mingw-w64)"
 arch=('any')
 url='https://launchpad.net/subunit'
 license=('Apache')
-depends=("${MINGW_PACKAGE_PREFIX}-python3"
-         "${MINGW_PACKAGE_PREFIX}-python3-extras"
-         "${MINGW_PACKAGE_PREFIX}-python3-testtools")
-makedepends=("${MINGW_PACKAGE_PREFIX}-python3-setuptools")
-checkdepends=("${MINGW_PACKAGE_PREFIX}-python3-fixtures"
-              "${MINGW_PACKAGE_PREFIX}-python3-hypothesis" 
-              "${MINGW_PACKAGE_PREFIX}-python3-testscenarios")
+depends=("${MINGW_PACKAGE_PREFIX}-python"
+         "${MINGW_PACKAGE_PREFIX}-python-extras"
+         "${MINGW_PACKAGE_PREFIX}-python-testtools")
+makedepends=("${MINGW_PACKAGE_PREFIX}-python-setuptools")
+checkdepends=("${MINGW_PACKAGE_PREFIX}-python-fixtures"
+              "${MINGW_PACKAGE_PREFIX}-python-hypothesis" 
+              "${MINGW_PACKAGE_PREFIX}-python-testscenarios")
 options=('staticlibs' 'strip' '!debug')
 source=("https://pypi.io/packages/source/p/python-subunit/python-subunit-${pkgver}.tar.gz")
 sha512sums=('387c9ce8ed679d8998d33c7a295412e4f9de46b8dccdfab92eb82d8c4290958760b6c9bd99d50abd0836e4556c1b0c0132fc01e16801a3113844ab1bf28cf962')
@@ -26,33 +29,33 @@ prepare() {
   cd "${srcdir}"
   sed -i 's|import unittest2 as unittest|import unittest|' python-subunit-${pkgver}/python/subunit/tests/test_test_protocol.py
 
-  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}"
-  PYTHONPATH="$PWD/build/lib:$PYTHONPATH" ${MINGW_PREFIX}/bin/python3 -m testtools.run subunit.test_suite || warning "Tests failed"
+  msg "Python test for ${CARCH}"
+  cd "${srcdir}/python-build-${CARCH}"
+  PYTHONPATH="$PWD/build/lib:$PYTHONPATH" ${MINGW_PREFIX}/bin/python -m testtools.run subunit.test_suite || 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
   #fix so the correct interpretter is used
   local PREFIX_WIN=$(cygpath -wm ${MINGW_PREFIX})
   for name in subunit-1to2 subunit-2to1 subunit-filter subunit-ls subunit-notify subunit-output subunit-stats subunit-tags subunit2csv subunit2gtk subunit2junitxml subunit2pyunit tap2subunit subunit2disk; do
-    sed -e "s|${PREFIX_WIN}/bin/python3.exe|${MINGW_PREFIX}/bin/python3.exe|g" -i "${pkgdir}${MINGW_PREFIX}"/bin/$name
+    sed -e "s|${PREFIX_WIN}/bin/python.exe|${MINGW_PREFIX}/bin/python.exe|g" -i "${pkgdir}${MINGW_PREFIX}"/bin/$name
   done
 }
diff --git a/mingw-w64-python-sympy/PKGBUILD b/mingw-w64-python-sympy/PKGBUILD
index 45645986c0..52fedf53c2 100644
--- a/mingw-w64-python-sympy/PKGBUILD
+++ b/mingw-w64-python-sympy/PKGBUILD
@@ -2,58 +2,55 @@
 
 _realname=sympy
 pkgbase=mingw-w64-python-${_realname}
-pkgname=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
-pkgver=1.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=1.5
+pkgrel=1
 pkgdesc="Symbolic manipulation package (Computer Algebra System), written in pure Python (mingw-w64)"
 arch=('any')
 url='https://www.sympy.org/en/index.html'
 license=('BSD')
-depends=("${MINGW_PACKAGE_PREFIX}-python3"
-         "${MINGW_PACKAGE_PREFIX}-python3-mpmath")
-optdepends=("${MINGW_PACKAGE_PREFIX}-python3-ipython: user friendly interface for isympy")
-makedepends=("${MINGW_PACKAGE_PREFIX}-python3-setuptools")
+depends=("${MINGW_PACKAGE_PREFIX}-python"
+         "${MINGW_PACKAGE_PREFIX}-python-mpmath")
+optdepends=("${MINGW_PACKAGE_PREFIX}-python-ipython: user friendly interface for isympy")
+makedepends=("${MINGW_PACKAGE_PREFIX}-python-setuptools")
+install=${_realname}3-${CARCH}.install
 options=('staticlibs' 'strip' '!debug')
-source=("${_realname}-$pkgver.tar.gz::https://github.com/sympy/sympy/archive/sympy-$pkgver.tar.gz")
-sha512sums=('fdf2113478393ac71c08a440c97ded1d11e2cb630da237a4e32d03a54fda1bb51c6317a757e5d51683fc1ff7ed865cf3b4c02927bec5974eb68bacc5b88f865a')
+source=("${_realname}-${pkgver}.tar.gz::https://github.com/sympy/sympy/archive/sympy-${pkgver}.tar.gz")
+sha512sums=('6d205c61e3ee651c46408746c32af30336ae26b6bbbf49a304f1228149d0de0cbe6ec41b5cc55b0edc163b0e0e6e4db88d19216d29ad5c8e366e6f45ba81b45e')
 
 prepare() {
-  cd "${srcdir}/${_realname}-${_realname}-${pkgver}"
+  rm -rf python-build-${CARCH} | true
+  cp -r "${_realname}-${_realname}-${pkgver}" "python-build-${CARCH}"
 
   # Set version for setuptools_scm
-  export SETUPTOOLS_SCM_PRETEND_VERSION=$pkgver
+  export SETUPTOOLS_SCM_PRETEND_VERSION=${pkgver}
 }
 
 build() {
-  cd "${srcdir}/${_realname}-${_realname}-${pkgver}"
-
-  ${MINGW_PREFIX}/bin/python3 setup.py build
+  cd "${srcdir}/python-build-${CARCH}"
+  ${MINGW_PREFIX}/bin/python setup.py build
 }
 
 check() {
-  cd "${srcdir}/${_realname}-${_realname}-${pkgver}"
-
-  ${MINGW_PREFIX}/bin/python3 setup.py test || warning "Tests failed"
+  cd "${srcdir}/python-build-${CARCH}"
+  ${MINGW_PREFIX}/bin/python setup.py test || warning "Tests failed"
 }
 
 package() {
-  install=${_realname}3-${CARCH}.install
-
-  cd "${srcdir}/${_realname}-${_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"
 
-# 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 _ff in ${pkgdir}${MINGW_PREFIX}/bin/*.py; do
     sed -e "s|${PREFIX_WIN}|${MINGW_PREFIX}|g" -i ${_ff}
   done
-#### end section ####
 }
diff --git a/mingw-w64-python-tempita/PKGBUILD b/mingw-w64-python-tempita/PKGBUILD
index a7e0a9d822..94415f37fd 100644
--- a/mingw-w64-python-tempita/PKGBUILD
+++ b/mingw-w64-python-tempita/PKGBUILD
@@ -5,45 +5,48 @@
 
 _realname=tempita
 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.3dev20170202
 _commit=47414a7c6e46a9a9afe78f0bce2ea299fa84d10d
-pkgrel=3
+pkgrel=1
 pkgdesc="A lightweight unicode templating language (mingw-w64)"
 arch=('any')
 url='https://github.com/gjhiggins/tempita'
 license=('custom:MIT')
 validpgpkeys=('gpg_KEY')
-depends=("${MINGW_PACKAGE_PREFIX}-python3")
+depends=("${MINGW_PACKAGE_PREFIX}-python")
 makedepends=('git'
-             "${MINGW_PACKAGE_PREFIX}-python3-setuptools")
+             "${MINGW_PACKAGE_PREFIX}-python-setuptools")
 options=('staticlibs' 'strip' '!debug')
 source=("${_realname}::git://github.com/gjhiggins/tempita.git#commit=${_commit}")
 sha256sums=('SKIP')
 
 prepare() {
-  cd "${srcdir}/${_realname}"
+  cd "${srcdir}"
+  rm -rf "python-build-${CARCH}" | true
+  cp -r "${_realname}" "python-build-${CARCH}"
 
   # Set version for setuptools_scm
-  export SETUPTOOLS_SCM_PRETEND_VERSION=$pkgver
+  export SETUPTOOLS_SCM_PRETEND_VERSION=${pkgver}
 }
 
 build() {
-  cd "${srcdir}/${_realname}"
-
-  ${MINGW_PREFIX}/bin/python3 setup.py build
+  cd "${srcdir}/python-build-${CARCH}"
+  ${MINGW_PREFIX}/bin/python setup.py build
 }
 
 check() {
-  cd "${srcdir}/${_realname}"
-
-  ${MINGW_PREFIX}/bin/python3 setup.py test
+  cd "${srcdir}/python-build-${CARCH}"
+  ${MINGW_PREFIX}/bin/python setup.py test
 }
 
 package() {
-  cd "${srcdir}/${_realname}"
+  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-terminado/PKGBUILD b/mingw-w64-python-terminado/PKGBUILD
index bed8014932..1d2e6601c4 100644
--- a/mingw-w64-python-terminado/PKGBUILD
+++ b/mingw-w64-python-terminado/PKGBUILD
@@ -2,32 +2,40 @@
 
 _realname=terminado
 pkgbase=mingw-w64-python-${_realname}
-pkgname=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
-pkgver=0.8.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=0.8.3
+pkgrel=1
 pkgdesc="Terminals served to term.js using Tornado websockets (mingw-w64)"
 arch=('any')
 url='https://github.com/takluyver/terminado'
 license=('Apache')
-depends=("${MINGW_PACKAGE_PREFIX}-python3"
-         "${MINGW_PACKAGE_PREFIX}-python3-tornado"
-         "${MINGW_PACKAGE_PREFIX}-python3-ptyprocess")
-makedepends=("${MINGW_PACKAGE_PREFIX}-python3-setuptools")
+depends=("${MINGW_PACKAGE_PREFIX}-python"
+         "${MINGW_PACKAGE_PREFIX}-python-tornado"
+         "${MINGW_PACKAGE_PREFIX}-python-ptyprocess")
+makedepends=("${MINGW_PACKAGE_PREFIX}-python-setuptools")
 source=("${_realname}-${pkgver}.tar.gz::https://files.pythonhosted.org/packages/source/t/terminado/terminado-${pkgver}.tar.gz")
-sha256sums=('de08e141f83c3a0798b050ecb097ab6259c3f0331b2f7b7750c9075ced2c20c2')
+sha256sums=('4804a774f802306a7d9af7322193c5390f1da0abb429e082a10ef1d46e6fb2c2')
+
+prepare() {
+  rm -rf python-build-${CARCH} | true
+  cp -r "${_realname}-${pkgver}" "python-build-${CARCH}"
+}
 
 build() {
-  cd "${srcdir}/${_realname}-${pkgver}"
+  cd "${srcdir}/python-build-${CARCH}"
 
-  ${MINGW_PREFIX}/bin/python3 setup.py build
+  ${MINGW_PREFIX}/bin/python setup.py build
 }
 
 package() {
-  cd "${srcdir}/${_realname}-${pkgver}"
+  cd "${srcdir}/python-build-${CARCH}"
 
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
-  ${MINGW_PREFIX}/bin/python3 setup.py install --prefix=${MINGW_PREFIX} \
+  ${MINGW_PREFIX}/bin/python setup.py install --prefix=${MINGW_PREFIX} \
     --root="${pkgdir}" --optimize=1 --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-testpath/PKGBUILD b/mingw-w64-python-testpath/PKGBUILD
index 92d1f8966b..bc90fe53a9 100644
--- a/mingw-w64-python-testpath/PKGBUILD
+++ b/mingw-w64-python-testpath/PKGBUILD
@@ -2,19 +2,22 @@
 
 _realname=testpath
 pkgbase=mingw-w64-python-${_realname}
-pkgname=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
-pkgver=0.4.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=0.4.4
+pkgrel=1
 pkgdesc="Test utilities for code working with files and commands (mingw-w64)"
 url="https://pypi.python.org/pypi/testpath"
 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=(${_realname}-${pkgver}.tar.gz::https://github.com/jupyter/${_realname}/archive/${pkgver}.tar.gz
         "https://files.pythonhosted.org/packages/py2.py3/t/${_realname}/${_realname}-${pkgver}-py2.py3-none-any.whl")
-sha256sums=('d4f60c121c548e9864dbb8f6f21a5404b0edbebe2a7e63b4b5154a8fa70a23f9'
-            '46c89ebb683f473ffe2aab0ed9f12581d4d078308a3cb3765d79c6b2317b0109')
+sha256sums=('c52bf1a935e6283d30673f042915709ebc11d1e8a50d63f0c3305b6a8ee47933'
+            'bfcf9411ef4bf3db7579063e0546938b1edda3d69f4e1fb8756991f5951f85d4')
 
 prepare() {
   rm testpath/cli*.exe
@@ -24,7 +27,7 @@ prepare() {
 }
 
 package() {
-  local _py3_base=$(${MINGW_PREFIX}/bin/python3 -c "import sys;sys.stdout.write('.'.join(map(str, sys.version_info[:2])))")
+  local _py3_base=$(${MINGW_PREFIX}/bin/python -c "import sys;sys.stdout.write('.'.join(map(str, sys.version_info[:2])))")
 
   cd "${srcdir}/${_realname}"
   for _i in ./*; do
@@ -38,5 +41,5 @@ package() {
   done
 
   cd "${srcdir}/${_realname}-${pkgver}"
-  install -Dm644 LICENSE "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}-python3/LICENSE"
+  install -Dm644 LICENSE "${pkgdir}${MINGW_PREFIX}/share/licenses/python-${_realname}/LICENSE"
 }
diff --git a/mingw-w64-python-testrepository/PKGBUILD b/mingw-w64-python-testrepository/PKGBUILD
index 4a5590cd6f..2179c06904 100644
--- a/mingw-w64-python-testrepository/PKGBUILD
+++ b/mingw-w64-python-testrepository/PKGBUILD
@@ -2,21 +2,24 @@
 
 _realname=testrepository
 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.0.20
-pkgrel=4
+pkgrel=1
 pkgdesc="A repository of test results. (mingw-w64)"
 arch=('any')
 license=('Apache' 'BSD')
 url="https://launchpad.net/testrepository"
-depends=("${MINGW_PACKAGE_PREFIX}-python3")
-makedepends=("${MINGW_PACKAGE_PREFIX}-python3-fixtures"
-             "${MINGW_PACKAGE_PREFIX}-python3-setuptools"
-             "${MINGW_PACKAGE_PREFIX}-python3-subunit"
-             "${MINGW_PACKAGE_PREFIX}-python3-testtools")
-checkdepends=("${MINGW_PACKAGE_PREFIX}-python3-testresources"
-              "${MINGW_PACKAGE_PREFIX}-python3-pytz"
-              "${MINGW_PACKAGE_PREFIX}-python3-testscenarios")
+depends=("${MINGW_PACKAGE_PREFIX}-python")
+makedepends=("${MINGW_PACKAGE_PREFIX}-python-fixtures"
+             "${MINGW_PACKAGE_PREFIX}-python-setuptools"
+             "${MINGW_PACKAGE_PREFIX}-python-subunit"
+             "${MINGW_PACKAGE_PREFIX}-python-testtools")
+checkdepends=("${MINGW_PACKAGE_PREFIX}-python-testresources"
+              "${MINGW_PACKAGE_PREFIX}-python-pytz"
+              "${MINGW_PACKAGE_PREFIX}-python-testscenarios")
 install=${_realname}3-${CARCH}.install
 options=('staticlibs' 'strip' '!debug')
 source=("https://pypi.python.org/packages/source/t/testrepository/testrepository-${pkgver}.tar.gz")
@@ -75,13 +78,9 @@ package() {
 
   #  install -Dm644 LICENSE "${pkgdir}${MINGW_PREFIX}/share/licenses/python-${_realname}/COPYING"
 
-  # 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})
   for _f in "${pkgdir}${MINGW_PREFIX}"/bin/*; do
     sed -e "s|/usr/bin/env |${MINGW_PREFIX}|g" \
         -e "s|${PREFIX_WIN}|${MINGW_PREFIX}|g" -i ${_f}
   done
-  #### end section ####
 }
diff --git a/mingw-w64-python-testresources/PKGBUILD b/mingw-w64-python-testresources/PKGBUILD
index 3398e5db6c..6546fc9ea3 100644
--- a/mingw-w64-python-testresources/PKGBUILD
+++ b/mingw-w64-python-testresources/PKGBUILD
@@ -2,17 +2,20 @@
 
 _realname=testresources
 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.1
-pkgrel=3
+pkgrel=1
 pkgdesc="Testresources, a pyunit extension for managing expensive test resources (mingw-w64)"
 arch=('any')
 url='https://launchpad.net/testresources'
 license=('Apache' 'BSD')
-depends=("${MINGW_PACKAGE_PREFIX}-python3")
-makedepends=("${MINGW_PACKAGE_PREFIX}-python3-pbr"
-             "${MINGW_PACKAGE_PREFIX}-python3-setuptools"
-             "${MINGW_PACKAGE_PREFIX}-python3-testtools")
+depends=("${MINGW_PACKAGE_PREFIX}-python")
+makedepends=("${MINGW_PACKAGE_PREFIX}-python-pbr"
+             "${MINGW_PACKAGE_PREFIX}-python-setuptools"
+             "${MINGW_PACKAGE_PREFIX}-python-testtools")
 options=('staticlibs' 'strip' '!debug')
 source=("https://pypi.io/packages/source/t/testresources/testresources-${pkgver}.tar.gz")
 sha512sums=('0b23432b019400fe378e957d14a91083eef7fe1130a494b567a5274d69e4e8e09ab75861e5453c3f217507e144cf179c908f84dd1a807992d4bee0b8d32cb0f4')
diff --git a/mingw-w64-python-testscenarios/PKGBUILD b/mingw-w64-python-testscenarios/PKGBUILD
index 357c35ab5e..bfbeab0ce7 100644
--- a/mingw-w64-python-testscenarios/PKGBUILD
+++ b/mingw-w64-python-testscenarios/PKGBUILD
@@ -2,17 +2,20 @@
 
 _realname=testscenarios
 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.0
-pkgrel=3
+pkgrel=1
 pkgdesc="estscenarios, a pyunit extension for dependency injection (mingw-w64)"
 arch=('any')
 url="https://launchpad.net/testscenarios"
 license=('Apache')
 validpgpkeys=('gpg_KEY')
-depends=("${MINGW_PACKAGE_PREFIX}-python3")
-makedepends=("${MINGW_PACKAGE_PREFIX}-python3-pbr"
-             "${MINGW_PACKAGE_PREFIX}-python3-setuptools")
+depends=("${MINGW_PACKAGE_PREFIX}-python")
+makedepends=("${MINGW_PACKAGE_PREFIX}-python-pbr"
+             "${MINGW_PACKAGE_PREFIX}-python-setuptools")
 options=('staticlibs' 'strip' '!debug')
 source=("https://pypi.python.org/packages/source/t/testscenarios/testscenarios-${pkgver}.tar.gz")
 sha512sums=('f08b868babf504482369c5cb945d3e95bca1cc00f92d5013f6898c488051be0c26dc49aaabcef362aea45450a8d041d9826fb6b5c848beec013fb102d6935521')
diff --git a/mingw-w64-python-testtools/PKGBUILD b/mingw-w64-python-testtools/PKGBUILD
index 10f65d5bcc..93b134333b 100644
--- a/mingw-w64-python-testtools/PKGBUILD
+++ b/mingw-w64-python-testtools/PKGBUILD
@@ -2,19 +2,22 @@
 
 _realname=testtools
 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.0
-pkgrel=3
+pkgrel=1
 pkgdesc="Extensions to the Python standard library unit testing framework (mingw-w64)"
 arch=('any')
 url='https://github.com/testing-cabal/testtools'
 license=('MIT')
-depends=("${MINGW_PACKAGE_PREFIX}-python3"
-         "${MINGW_PACKAGE_PREFIX}-python3-pbr"
-         "${MINGW_PACKAGE_PREFIX}-python3-extras"
-         "${MINGW_PACKAGE_PREFIX}-python3-fixtures"
-         "${MINGW_PACKAGE_PREFIX}-python3-pyrsistent"
-         "${MINGW_PACKAGE_PREFIX}-python3-mimeparse")
+depends=("${MINGW_PACKAGE_PREFIX}-python"
+         "${MINGW_PACKAGE_PREFIX}-python-pbr"
+         "${MINGW_PACKAGE_PREFIX}-python-extras"
+         "${MINGW_PACKAGE_PREFIX}-python-fixtures"
+         "${MINGW_PACKAGE_PREFIX}-python-pyrsistent"
+         "${MINGW_PACKAGE_PREFIX}-python-mimeparse")
 makedepends=('git' 
              "${MINGW_PACKAGE_PREFIX}-python3-setuptools")
 options=('staticlibs' 'strip' '!debug')
@@ -71,46 +74,42 @@ prepare() {
     f865cfefae73e540aedb16ebb19f813cc648f2b6.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}"
 
   # These are for python 2.x and old python 3.x only
-  sed -i 's|unittest2|unittest|' python3-build-${CARCH}/testtools/tests/test_run.py \
-                                 python3-build-${CARCH}/testtools/tests/test_testsuite.py \
-                                 python3-build-${CARCH}/testtools/tests/twistedsupport/test_matchers.py \
-                                 python3-build-${CARCH}/testtools/tests/twistedsupport/test_deferred.py \
-                                 python3-build-${CARCH}/testtools/tests/twistedsupport/test_runtest.py
-  sed -i '/unittest2>=1.0.0/d' python3-build-${CARCH}/requirements.txt
-  sed -i 's|import linecache2 as linecache|import linecache|' python3-build-${CARCH}/testtools/tests/test_compat.py
-  sed -i "s|traceback = try_import('traceback2')|import traceback|" python3-build-${CARCH}/testtools/content.py
-  sed -i '/traceback2/d' python3-build-${CARCH}/requirements.txt
+  sed -i 's|unittest2|unittest|' python-build-${CARCH}/testtools/tests/test_run.py \
+                                 python-build-${CARCH}/testtools/tests/test_testsuite.py \
+                                 python-build-${CARCH}/testtools/tests/twistedsupport/test_matchers.py \
+                                 python-build-${CARCH}/testtools/tests/twistedsupport/test_deferred.py \
+                                 python-build-${CARCH}/testtools/tests/twistedsupport/test_runtest.py
+  sed -i '/unittest2>=1.0.0/d' python-build-${CARCH}/requirements.txt
+  sed -i 's|import linecache2 as linecache|import linecache|' python-build-${CARCH}/testtools/tests/test_compat.py
+  sed -i "s|traceback = try_import('traceback2')|import traceback|" python-build-${CARCH}/testtools/content.py
+  sed -i '/traceback2/d' python-build-${CARCH}/requirements.txt
 
   # Set version for setuptools_scm
   export SETUPTOOLS_SCM_PRETEND_VERSION=${pkgver}
   export PBR_VERSION=${pkgver}
 }
 
-# Note that build() is sometimes skipped because it's done in 
-# the packages setup.py install for simplicity if you can do so.
-# but sometimes, you want to do a check before install which would
-# also trigger the build.
 build() {
-  msg "Python 3 build for ${CARCH}"  
-  cd "${srcdir}/python3-build-${CARCH}"
-  ${MINGW_PREFIX}/bin/python3 setup.py build
+  msg "Python build for ${CARCH}"  
+  cd "${srcdir}/python-build-${CARCH}"
+  ${MINGW_PREFIX}/bin/python setup.py build
 }
 
 check() {
-  msg "Python 3 test for ${CARCH}"
-  cd "${srcdir}/python3-build-${CARCH}"
-  ${MINGW_PREFIX}/bin/python3 -m testtools.run testtools.tests.test_suite
+  msg "Python test for ${CARCH}"
+  cd "${srcdir}/python-build-${CARCH}"
+  ${MINGW_PREFIX}/bin/python -m testtools.run testtools.tests.test_suite
 }
 
 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-traitlets/PKGBUILD b/mingw-w64-python-traitlets/PKGBUILD
index db2d2b3b23..bedaaf0680 100644
--- a/mingw-w64-python-traitlets/PKGBUILD
+++ b/mingw-w64-python-traitlets/PKGBUILD
@@ -2,35 +2,44 @@
 
 _realname=traitlets
 pkgbase=mingw-w64-python-${_realname}
-pkgname=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+pkgname=("${MINGW_PACKAGE_PREFIX}-python-${_realname}")
+provides=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+conflicts=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+replaces=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
 pkgver=4.3.3
-pkgrel=2
+pkgrel=1
 pkgdesc="A lightweight Traits like module (mingw-w64)"
 url="https://github.com/ipython/traitlets"
 arch=('any')
 license=('Modified BSD')
-depends=("${MINGW_PACKAGE_PREFIX}-python3-ipython_genutils"
-         "${MINGW_PACKAGE_PREFIX}-python3-decorator")
-makedepends=("${MINGW_PACKAGE_PREFIX}-python3-setuptools")
-checkdepends=("${MINGW_PACKAGE_PREFIX}-python3-pytest")
+depends=("${MINGW_PACKAGE_PREFIX}-python-ipython_genutils"
+         "${MINGW_PACKAGE_PREFIX}-python-decorator")
+makedepends=("${MINGW_PACKAGE_PREFIX}-python-setuptools")
+checkdepends=("${MINGW_PACKAGE_PREFIX}-python-pytest")
 source=("${_realname}-${pkgver}.tar.gz::https://github.com/ipython/${_realname}/archive/${pkgver}.tar.gz")
 sha256sums=('b686c1aadf6ee5a9ee4c22df23bc5cd5bb7b5cfa18afe092e0a139cc2f05fe2e')
 
+prepare() {
+  cd "${srcdir}"
+  rm -rf python-build-${CARCH} | true
+  cp -r "${_realname}-${pkgver}" "python-build-${CARCH}"
+}
+
 build() {
-  cd "${srcdir}/${_realname}-${pkgver}"
-  python3 setup.py build
+  cd "${srcdir}/python-build-${CARCH}"
+  ${MINGW_PREFIX}/bin/python setup.py build
 }
 
 check() {
-  cd "${srcdir}/${_realname}-${pkgver}"
-
-  python3 -m pytest "${_realname}/tests"
+  cd "${srcdir}/python-build-${CARCH}"
+  ${MINGW_PREFIX}/bin/python -m pytest "${_realname}/tests"
 }
 
 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 --root=${pkgdir} --prefix=${MINGW_PREFIX} --optimize=1
-  install -Dm644 COPYING.md ${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 COPYING.md ${pkgdir}${MINGW_PREFIX}/share/licenses/python-${_realname}/LICENSE
 }
diff --git a/mingw-w64-python-typed_ast/PKGBUILD b/mingw-w64-python-typed_ast/PKGBUILD
index ceb92da96f..d532a54fb4 100644
--- a/mingw-w64-python-typed_ast/PKGBUILD
+++ b/mingw-w64-python-typed_ast/PKGBUILD
@@ -2,15 +2,18 @@
 
 _realname=typed_ast
 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.0
-pkgrel=2
+pkgrel=1
 pkgdesc="Modified fork of CPython's ast module that parses `# type:` comments (mingw-w64)"
 arch=('any')
 url='https://github.com/python/typed_ast'
 license=('Apache')
-makedepends=("${MINGW_PACKAGE_PREFIX}-python3"
-             "${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/python/typed_ast/archive/${pkgver}.tar.gz")
 sha256sums=('bd02998404953db788e9d09c1030c4f0eb9d87986b08bd30e9fc00a8e30d6dd8')
@@ -36,36 +39,29 @@ 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}
 }
 
-# Note that build() is sometimes skipped because it's done in 
-# the packages setup.py install for simplicity if you can do so.
-# but sometimes, you want to do a check before install which would
-# also trigger the build.
 build() {
-    msg "Python 3 build for ${CARCH}"  
-    cd "${srcdir}/python3-build-${CARCH}"
-    ${MINGW_PREFIX}/bin/python3 setup.py build
+    msg "Python build for ${CARCH}"  
+    cd "${srcdir}/python-build-${CARCH}"
+    ${MINGW_PREFIX}/bin/python setup.py build
 }
 
 check() {
-  msg "Python 3 test for ${CARCH}"
-  cd "${srcdir}/python3-build-${CARCH}"
-  ${MINGW_PREFIX}/bin/python3 setup.py test
+  msg "Python test for ${CARCH}"
+  cd "${srcdir}/python-build-${CARCH}"
+  ${MINGW_PREFIX}/bin/python setup.py test
 }
 
 package() {
-  depends=("${MINGW_PACKAGE_PREFIX}-python3")
-
-  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-voluptuous/PKGBUILD b/mingw-w64-python-voluptuous/PKGBUILD
index 21bd60f682..85e68913ba 100644
--- a/mingw-w64-python-voluptuous/PKGBUILD
+++ b/mingw-w64-python-voluptuous/PKGBUILD
@@ -2,16 +2,19 @@
 
 _realname=voluptuous
 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.11.7
 pkgrel=1
 pkgdesc="A Python data validation library (mingw-w64)"
 arch=('any')
 url='https://pypi.python.org/pypi/voluptuous'
 license=('BSD')
-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")
 options=('staticlibs' 'strip' '!debug')
 source=("https://pypi.io/packages/source/v/voluptuous/voluptuous-${pkgver}.tar.gz")
 sha512sums=('bf0ad4684a4da59b3eccb54f6edfa643eb894076fc50d1bfd4c953de15cfd711a70e8aee685497197eaef24897ae55fb5fb2aec5e2fc9dcf344a6f7c6f569b88')
@@ -43,7 +46,7 @@ prepare() {
   sed -e "s/'w'/'wb'/" -e "s/.encode('utf-8')//" -e "s/f.write(long_description)/f.write(long_description.encode('utf-8'))/" -i voluptuous-${pkgver}/setup.py
 
   # Python 3
-  sed -i '/raise StopIteration/d' voluptuous-${pkgver/}voluptuous/schema_builder.py
+  sed -i '/raise StopIteration/d' voluptuous-${pkgver}/voluptuous/schema_builder.py
 
   rm -rf python-build-${CARCH} | true
   cp -r "${_realname}-${pkgver}" "python-build-${CARCH}"
@@ -53,7 +56,7 @@ prepare() {
 }
 
 build() {
-  msg "Python build for ${CARCH}"  
+  msg "Python build for ${CARCH}"
   cd "${srcdir}/python-build-${CARCH}"
   ${MINGW_PREFIX}/bin/python setup.py build
 }
diff --git a/mingw-w64-python-wheel/PKGBUILD b/mingw-w64-python-wheel/PKGBUILD
index 151c429574..d1510d82c6 100644
--- a/mingw-w64-python-wheel/PKGBUILD
+++ b/mingw-w64-python-wheel/PKGBUILD
@@ -6,17 +6,20 @@
 _pyname=wheel
 _realname=${_pyname}
 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.33.6
-pkgrel=2
+pkgrel=1
 pkgdesc="A built-package format for Python (mingw-w64)"
 arch=('any')
 url="https://pypi.python.org/pypi/wheel"
 license=('MIT')
-depends=("${MINGW_PACKAGE_PREFIX}-python3")
-optdepends=("${MINGW_PACKAGE_PREFIX}-python3-keyring: for wheel.signatures"
-            "${MINGW_PACKAGE_PREFIX}-python3-xdg: for wheel.signatures")
-makedepends=("${MINGW_PACKAGE_PREFIX}-python3-setuptools")
+depends=("${MINGW_PACKAGE_PREFIX}-python")
+optdepends=("${MINGW_PACKAGE_PREFIX}-python-keyring: for wheel.signatures"
+            "${MINGW_PACKAGE_PREFIX}-python-xdg: for wheel.signatures")
+makedepends=("${MINGW_PACKAGE_PREFIX}-python-setuptools")
 install=${_realname}3-${CARCH}.install
 options=('staticlibs' 'strip' '!debug')
 source=("https://pypi.io/packages/source/w/wheel/${_pyname}-${pkgver}.tar.gz")
diff --git a/mingw-w64-python-wrapt/PKGBUILD b/mingw-w64-python-wrapt/PKGBUILD
index 0d3fd18a68..4d1c44760c 100644
--- a/mingw-w64-python-wrapt/PKGBUILD
+++ b/mingw-w64-python-wrapt/PKGBUILD
@@ -2,15 +2,18 @@
 
 _realname=wrapt
 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.11.2
-pkgrel=3
+pkgrel=1
 pkgdesc="A Python module for decorators, wrappers and monkey patching (mingw-w64)"
 arch=('any')
 url="https://pypi.python.org/pypi/wrapt"
 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/GrahamDumpleton/wrapt/archive/${pkgver}.tar.gz")
 sha256sums=('a91e2f31d71c2fcaaa1dc116ce37901aad18a554cdcc69db1dca0743d790ba72')
diff --git a/mingw-w64-python-xdg/PKGBUILD b/mingw-w64-python-xdg/PKGBUILD
index 54074813c1..43ca4f9fb7 100644
--- a/mingw-w64-python-xdg/PKGBUILD
+++ b/mingw-w64-python-xdg/PKGBUILD
@@ -4,17 +4,20 @@
 #MSYS packages.
 
 _pyname=pyxdg
-_realname=xdg #This should be lowercase
+_realname=xdg
 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.26
-pkgrel=4
+pkgrel=1
 pkgdesc="Python library to access freedesktop.org standards (mingw-w64)"
 arch=('any')
 url='https://freedesktop.org/Software/pyxdg'
 license=('LGPL')
-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=("${_pyname}-${pkgver}.tar.gz"::"https://github.com/takluyver/pyxdg/archive/rel-${pkgver}.tar.gz")
 sha256sums=('2bd7f0b30bdeeaa15ed7d5651b3e266b2f40a37d3170dc37646e27deb7966dce')
diff --git a/mingw-w64-python-zipp/PKGBUILD b/mingw-w64-python-zipp/PKGBUILD
index bdb5f44757..a4246f09fc 100644
--- a/mingw-w64-python-zipp/PKGBUILD
+++ b/mingw-w64-python-zipp/PKGBUILD
@@ -2,21 +2,24 @@
 
 _realname=zipp
 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.0
-pkgrel=3
+pkgrel=1
 pkgdesc="Pathlib-compatible object wrapper for zip files (mingw-w64)"
 arch=('any')
 url='https://github.com/jaraco/zipp'
 license=('MIT')
 validpgpkeys=('gpg_KEY')
-depends=("${MINGW_PACKAGE_PREFIX}-python3"
-         "${MINGW_PACKAGE_PREFIX}-python3-more-itertools")
-makedepends=("${MINGW_PACKAGE_PREFIX}-python3-setuptools"
-             "${MINGW_PACKAGE_PREFIX}-python3-setuptools-scm")
-checkdepends=("${MINGW_PACKAGE_PREFIX}-python3-pathlib2"
-              "${MINGW_PACKAGE_PREFIX}-python3-contextlib2"
-              "${MINGW_PACKAGE_PREFIX}-python3-unittest2")
+depends=("${MINGW_PACKAGE_PREFIX}-python"
+         "${MINGW_PACKAGE_PREFIX}-python-more-itertools")
+makedepends=("${MINGW_PACKAGE_PREFIX}-python-setuptools"
+             "${MINGW_PACKAGE_PREFIX}-python-setuptools-scm")
+checkdepends=("${MINGW_PACKAGE_PREFIX}-python-pathlib2"
+              "${MINGW_PACKAGE_PREFIX}-python-contextlib2"
+              "${MINGW_PACKAGE_PREFIX}-python-unittest2")
 options=('staticlibs' 'strip' '!debug')
 source=("${_realname}-${pkgver}.tar.gz"::"https://github.com/jaraco/zipp/archive/v${pkgver}.tar.gz")
 sha512sums=('9aef3b03a19d76cb72e1510d62a4edd536cbb176a4593154d6f98ecf020438249307ee5f8205f29e7f121acd61c105ca79a1ed48c66c6ba8799e2dbb3eecd75e')
@@ -47,30 +50,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}
 }
 
 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-qscintilla/PKGBUILD b/mingw-w64-qscintilla/PKGBUILD
index 9abf06046e..989d6b8f4f 100644
--- a/mingw-w64-qscintilla/PKGBUILD
+++ b/mingw-w64-qscintilla/PKGBUILD
@@ -3,9 +3,9 @@
 _realname=qscintilla
 pkgbase=mingw-w64-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}"
-         "${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+         "${MINGW_PACKAGE_PREFIX}-python-${_realname}")
 pkgver=2.11.4
-pkgrel=1
+pkgrel=2
 pkgdesc="A port to Qt5 of Neil Hodgson's Scintilla C++ editor class (mingw-w64)"
 arch=('any')
 license=("GPL")
@@ -52,15 +52,18 @@ package_qscintilla() {
   mv ${pkgdir}${MINGW_PREFIX}/lib/*.dll ${pkgdir}${MINGW_PREFIX}/bin/
 }
 
-package_python3-qscintilla() {
+package_python-qscintilla() {
   pkgdesc="Python 3.x bindings for QScintilla2"
-  depends=("${MINGW_PACKAGE_PREFIX}-python3-pyqt5")
-  provides=("${MINGW_PACKAGE_PREFIX}-python-qscintilla-common")
-  conflicts=("${MINGW_PACKAGE_PREFIX}-python-qscintilla-common")
-  replaces=("${MINGW_PACKAGE_PREFIX}-python-qscintilla-common")
+  depends=("${MINGW_PACKAGE_PREFIX}-python-pyqt5")
+  provides=("${MINGW_PACKAGE_PREFIX}-python-qscintilla-common"
+            "${MINGW_PACKAGE_PREFIX}-python3-qscintilla")
+  conflicts=("${MINGW_PACKAGE_PREFIX}-python-qscintilla-common"
+             "${MINGW_PACKAGE_PREFIX}-python3-qscintilla")
+  replaces=("${MINGW_PACKAGE_PREFIX}-python-qscintilla-common"
+            "${MINGW_PACKAGE_PREFIX}-python3-qscintilla")
 
   cd QScintilla-${pkgver}/Python
-  ${MINGW_PREFIX}/bin/python3 configure.py \
+  ${MINGW_PREFIX}/bin/python configure.py \
     --pyqt=PyQt5 \
     --qsci-featuresdir=../Qt4Qt5/features \
     --qsci-incdir=../Qt4Qt5 \
@@ -77,14 +80,14 @@ package_mingw-w64-i686-qscintilla() {
   package_qscintilla
 }
 
-package_mingw-w64-i686-python3-qscintilla() {
-  package_python3-qscintilla
+package_mingw-w64-i686-python-qscintilla() {
+  package_python-qscintilla
 }
 
 package_mingw-w64-x86_64-qscintilla() {
   package_qscintilla
 }
 
-package_mingw-w64-x86_64-python3-qscintilla() {
-  package_python3-qscintilla
+package_mingw-w64-x86_64-python-qscintilla() {
+  package_python-qscintilla
 }
diff --git a/mingw-w64-sip/PKGBUILD b/mingw-w64-sip/PKGBUILD
index f9b80cb3f2..04898591b8 100644
--- a/mingw-w64-sip/PKGBUILD
+++ b/mingw-w64-sip/PKGBUILD
@@ -3,15 +3,15 @@
 
 _realname=sip
 pkgbase=mingw-w64-${_realname}
-pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}" "${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}" "${MINGW_PACKAGE_PREFIX}-python-${_realname}")
 pkgver=4.19.20
-pkgrel=1
+pkgrel=2
 pkgdesc="Tool to create Python bindings for C and C++ libraries (mingw-w64)"
 arch=('any')
 license=('GPL')
 url="https://riverbankcomputing.com/software/sip"
 makedepends=("${MINGW_PACKAGE_PREFIX}-gcc"
-             "${MINGW_PACKAGE_PREFIX}-python3")
+             "${MINGW_PACKAGE_PREFIX}-python")
 source=(#"https://downloads.sourceforge.net/project/pyqt/${_realname}/${_realname}-${pkgver}/${_realname}-${pkgver}.tar.gz"
         https://www.riverbankcomputing.com/static/Downloads/sip/${pkgver}/sip-${pkgver}.tar.gz
         "0001-mingw-python.patch"
@@ -29,10 +29,10 @@ prepare() {
 }
 
 build() {
-  [[ -d python3-${MINGW_CHOST} ]] && rm -rf python3-${MINGW_CHOST}
-  cp -r ${_realname}-${pkgver} python3-${MINGW_CHOST}
-  pushd python3-${MINGW_CHOST}
-    ${MINGW_PREFIX}/bin/python3 configure.py \
+  [[ -d python-${MINGW_CHOST} ]] && rm -rf python-${MINGW_CHOST}
+  cp -r ${_realname}-${pkgver} python-${MINGW_CHOST}
+  pushd python-${MINGW_CHOST}
+    ${MINGW_PREFIX}/bin/python configure.py \
         --sip-module PyQt5.sip CFLAGS="${CFLAGS}" LFLAGS="${LDFLAGS}"
     make
   popd
@@ -42,17 +42,20 @@ package_sip() {
   pkgdesc="A tool that makes it easy to create Python bindings for C and C++ libraries (mingw-w64)"
   depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs")
 
-  cd "${srcdir}"/python3-${MINGW_CHOST}
+  cd "${srcdir}"/python-${MINGW_CHOST}
   make DESTDIR="${pkgdir}" install -C sipgen
 
   install -Dm644 LICENSE "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/LICENSE"
 }
 
-package_python3-sip() {
+package_python-sip() {
   pkgdesc="Python 3.x SIP bindings for C and C++ libraries (mingw-w64)"
-  depends=("${MINGW_PACKAGE_PREFIX}-sip" "${MINGW_PACKAGE_PREFIX}-python3")
+  depends=("${MINGW_PACKAGE_PREFIX}-sip" "${MINGW_PACKAGE_PREFIX}-python")
+  provides=("${MINGW_PACKAGE_PREFIX}-python3-sip=${pkgver}")
+  conflicts=("${MINGW_PACKAGE_PREFIX}-python3-sip")
+  replaces=("${MINGW_PACKAGE_PREFIX}-python3-sip")
 
-  cd python3-${MINGW_CHOST}
+  cd python-${MINGW_CHOST}
   make DESTDIR="${pkgdir}" install -C siplib
 
   local _py3basever=$(${MINGW_PREFIX}/bin/python3 -c "import sys;sys.stdout.write('.'.join(map(str, sys.version_info[:2])))")
@@ -68,14 +71,14 @@ package_mingw-w64-i686-sip() {
   package_sip
 }
 
-package_mingw-w64-i686-python3-sip() {
-  package_python3-sip
+package_mingw-w64-i686-python-sip() {
+  package_python-sip
 }
 
 package_mingw-w64-x86_64-sip() {
   package_sip
 }
 
-package_mingw-w64-x86_64-python3-sip() {
-  package_python3-sip
+package_mingw-w64-x86_64-python-sip() {
+  package_python-sip
 }