diff --git a/aspell-en/PKGBUILD b/aspell-en/PKGBUILD
index 18811272..c7f9cdf6 100644
--- a/aspell-en/PKGBUILD
+++ b/aspell-en/PKGBUILD
@@ -1,5 +1,6 @@
 # Maintainer: Alexey Pavlov <alexpux@gmail.com>
 
+pkgbase=aspell-en
 pkgname=aspell6-en
 pkgver=7.1
 _pkg_subver=0
diff --git a/bisoncpp/PKGBUILD b/bisoncpp/PKGBUILD
index f41847fd..542b3e0a 100644
--- a/bisoncpp/PKGBUILD
+++ b/bisoncpp/PKGBUILD
@@ -1,4 +1,5 @@
 # Maintainer: LoveSy <shana@zju.edu.cn>
+pkgbase=bisoncpp
 pkgname=bisonc++
 pkgver=6.00.00
 pkgrel=1
diff --git a/clang-svn/PKGBUILD b/clang-svn/PKGBUILD
index 13ff690d..15f2b43e 100644
--- a/clang-svn/PKGBUILD
+++ b/clang-svn/PKGBUILD
@@ -2,6 +2,7 @@
 # Contributor: Ray Donnelly <mingw.android@gmail.com>
 
 _realname=clang
+pkgbase=clang-svn
 pkgname=("llvm-svn"
          #"lldb-svn"
          #"compiler-rt-svn"
diff --git a/dwz/PKGBUILD b/dwz/PKGBUILD
deleted file mode 100644
index 0870823d..00000000
--- a/dwz/PKGBUILD
+++ /dev/null
@@ -1,39 +0,0 @@
-# (Arch Linux) Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
-# (Arch Linux) Contributor: Andrej Gelenberg <andrej.gelenberg@udo.edu>
-# Maintainer: Ray Donnelly <mingw.android@gmail.com>
-
-pkgname=elfutils
-pkgver=0.159
-pkgrel=1
-pkgdesc="Libraries and utilities to handle ELF object files and DWARF debugging information"
-arch=('i686' 'x86_64')
-url="https://fedorahosted.org/elfutils/"
-license=('LGPL3' 'GPL' 'GPL3')
-depends=('gcc-libs' 'zlib' 'bzip2' 'xz')
-provides=('libelf')
-replaces=('libelf')
-conflicts=('libelf')
-source=(https://fedorahosted.org/releases/e/l/elfutils/${pkgver}/elfutils-${pkgver}.tar.bz2)
-options=('staticlibs')
-sha256sums=('fffaad1ba0c4ac5c8cee56dc195746e1f1e7197ba3eba7052ad5a3635ac1242e')
-
-build() {
-  cd ${pkgname}-${pkgver}
-
-  CFLAGS+=" -g"  # required for test-suite success
-  ./configure --prefix=/usr --program-prefix="eu-"
-
-  make
-}
-
-check() {
-  cd ${pkgname}-${pkgver}
-
-  make check
-}
-
-package() {
-  cd ${pkgname}-${pkgver}
-
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/flexcpp/PKGBUILD b/flexcpp/PKGBUILD
index 5cd9406b..d92225fa 100644
--- a/flexcpp/PKGBUILD
+++ b/flexcpp/PKGBUILD
@@ -1,4 +1,5 @@
 # Maintainer: LoveSy <shana@zju.edu.cn>
+pkgbase=flexcpp
 pkgname=flexc++
 pkgver=2.06.01
 pkgrel=1
diff --git a/libcrypt/PKGBUILD b/libcrypt/PKGBUILD
index 6e7b1990..e1f3b7df 100644
--- a/libcrypt/PKGBUILD
+++ b/libcrypt/PKGBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Alexey Pavlov <alexpux@gmail.com>
 
-pkgbase=crypt
+pkgbase=libcrypt
 pkgname=('libcrypt' 'libcrypt-devel')
 pkgver=2.1
 pkgrel=1
diff --git a/yaml/PKGBUILD b/libyaml/PKGBUILD
similarity index 100%
rename from yaml/PKGBUILD
rename to libyaml/PKGBUILD
diff --git a/yaml/yaml-0.1.7-fix-undefined.patch b/libyaml/yaml-0.1.7-fix-undefined.patch
similarity index 100%
rename from yaml/yaml-0.1.7-fix-undefined.patch
rename to libyaml/yaml-0.1.7-fix-undefined.patch
diff --git a/yaml/yaml-0.1.7-msys2.patch b/libyaml/yaml-0.1.7-msys2.patch
similarity index 100%
rename from yaml/yaml-0.1.7-msys2.patch
rename to libyaml/yaml-0.1.7-msys2.patch
diff --git a/lzo2/PKGBUILD b/lzo2/PKGBUILD
index 515cfade..85eae66d 100644
--- a/lzo2/PKGBUILD
+++ b/lzo2/PKGBUILD
@@ -1,5 +1,6 @@
 # Maintainer: Alexey Pavlov <alexpux@gmail.com>
 
+pkgbase=lzo2
 pkgname=('liblzo2' 'liblzo2-devel')
 pkgver=2.10
 pkgrel=1
diff --git a/mingw-w64-cross-conemu-git/PKGBUILD b/mingw-w64-cross-conemu-git/PKGBUILD
index a9cd6662..3c0643c3 100644
--- a/mingw-w64-cross-conemu-git/PKGBUILD
+++ b/mingw-w64-cross-conemu-git/PKGBUILD
@@ -2,6 +2,7 @@
 
 _realname=conemu
 _mingw_suff=mingw-w64-cross
+pkgbase="${_mingw_suff}-${_realname}-git"
 pkgname="${_realname}-git"
 replaces=("${_realname}")
 provides=("${_realname}")
diff --git a/openbios/0001-fix-printk-to-use-FMT-cell-instead-of-x-where-it-sho.patch b/openbios-git/0001-fix-printk-to-use-FMT-cell-instead-of-x-where-it-sho.patch
similarity index 100%
rename from openbios/0001-fix-printk-to-use-FMT-cell-instead-of-x-where-it-sho.patch
rename to openbios-git/0001-fix-printk-to-use-FMT-cell-instead-of-x-where-it-sho.patch
diff --git a/openbios/PKGBUILD b/openbios-git/PKGBUILD
similarity index 100%
rename from openbios/PKGBUILD
rename to openbios-git/PKGBUILD
diff --git a/python-beaker/PKGBUILD b/python-beaker/PKGBUILD
index 3a7ed551..c774a22d 100644
--- a/python-beaker/PKGBUILD
+++ b/python-beaker/PKGBUILD
@@ -1,7 +1,8 @@
 # Maintainer: Alexey Pavlov <alexpux@gmail.com>
 
-pkgbase=beaker
-pkgname=("python3-${pkgbase}" "python2-${pkgbase}")
+_realname=beaker
+pkgbase="python-${_realname}"
+pkgname=("python3-${_realname}" "python2-${_realname}")
 pkgver=1.9.0
 pkgrel=1
 pkgdesc="Caching and sessions WSGI middleware for use with web applications and stand-alone Python scripts and applications"
@@ -9,23 +10,23 @@ arch=('i686' 'x86_64')
 license=('PSF')
 url="http://beaker.groovie.org/"
 depends=("python2-setuptools" "python3-setuptools")
-source=("${pkgbase}-${pkgver}.tar.gz"::https://github.com/bbangert/beaker/archive/${pkgver}.tar.gz)
+source=("${_realname}-${pkgver}.tar.gz"::https://github.com/bbangert/beaker/archive/${pkgver}.tar.gz)
 sha256sums=('ac8828ea391b463b0f6b844a04648ea8172fd6e9938fe6a7bea412cc6795d5c8')
 
 prepare() {
   cd "${srcdir}"
 
-  cp -a ${pkgbase}-${pkgver}{,-python2}
+  cp -a ${_realname}-${pkgver}{,-python2}
 }
 
 build() {
   # Build python 3 module
-  cd "${srcdir}"/${pkgbase}-${pkgver}
+  cd "${srcdir}"/${_realname}-${pkgver}
   sed -i "s#/usr/bin/python#/usr/bin/python3#" beaker/crypto/pbkdf2.py
   python3 setup.py build
 
   # Build python 2 module
-  cd ../${pkgbase}-${pkgver}-python2
+  cd ../${_realname}-${pkgver}-python2
   sed -i "s#/usr/bin/python#/usr/bin/python2#" beaker/crypto/pbkdf2.py
   python2 setup.py build
 }
@@ -33,7 +34,7 @@ build() {
 package_python3-beaker() {
   depends=('python>=3.3')
 
-  cd "${srcdir}/${pkgbase}-${pkgver}"
+  cd "${srcdir}/${_realname}-${pkgver}"
   python3 setup.py install --prefix=/usr --root="${pkgdir}" --optimize=1 --skip-build
   install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/python3-beaker/LICENSE"
 }
@@ -41,7 +42,7 @@ package_python3-beaker() {
 package_python2-beaker() {
   depends=('python2>=2.7')
 
-  cd "${srcdir}/${pkgbase}-${pkgver}-python2"
+  cd "${srcdir}/${_realname}-${pkgver}-python2"
   python2 setup.py install --prefix=/usr --root="${pkgdir}" --optimize=1 --skip-build
   install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/python2-beaker/LICENSE"
 }
diff --git a/python-colorama/PKGBUILD b/python-colorama/PKGBUILD
index 7b634ae6..5d810a81 100644
--- a/python-colorama/PKGBUILD
+++ b/python-colorama/PKGBUILD
@@ -4,6 +4,7 @@
 # Maintainer: Ray Donnelly <mingw.android@gmail.com>
 
 _pyname=colorama
+pkgbase="python-${_pyname}"
 pkgname=(python2-${_pyname} python3-${_pyname})
 pkgver=0.3.9
 pkgrel=1
diff --git a/python-mako/PKGBUILD b/python-mako/PKGBUILD
index 3bff64ce..8001889c 100644
--- a/python-mako/PKGBUILD
+++ b/python-mako/PKGBUILD
@@ -1,7 +1,8 @@
 # Maintainer: Alexey Pavlov <alexpux@gmail.com>
 
-pkgbase=mako
-pkgname=("python3-${pkgbase}" "python2-${pkgbase}")
+_realname=mako
+pkgbase="python-${_realname}"
+pkgname=("python3-${_realname}" "python2-${_realname}")
 pkgver=1.0.7
 pkgrel=1
 pkgdesc="A super-fast templating language that borrows the best ideas from the existing templating languages"
@@ -47,7 +48,7 @@ package_python2-mako() {
 
   mv ${pkgdir}/usr/bin/mako-render{,2}
 
-  install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/python2-${pkgbase}/COPYING"
+  install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/python2-${_realname}/COPYING"
 }
 
 package_python3-mako() {
@@ -56,5 +57,5 @@ package_python3-mako() {
   cd "$srcdir/python3-build"
   /usr/bin/python3 setup.py install --prefix=/usr --root="$pkgdir" -O1
 
-  install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/python3-${pkgbase}/COPYING"
+  install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/python3-${_realname}/COPYING"
 }
diff --git a/python-markupsafe/PKGBUILD b/python-markupsafe/PKGBUILD
index ad059281..e5664d40 100644
--- a/python-markupsafe/PKGBUILD
+++ b/python-markupsafe/PKGBUILD
@@ -1,7 +1,8 @@
 # Maintainer: Alexey Pavlov <alexpux@gmail.com>
 
-pkgbase=markupsafe
-pkgname=("python3-${pkgbase}" "python2-${pkgbase}")
+_realname=markupsafe
+pkgbase="python-${_realname}"
+pkgname=("python3-${_realname}" "python2-${_realname}")
 pkgver=1.0
 pkgrel=1
 pkgdesc="Implements a XML/HTML/XHTML Markup safe string for Python"
@@ -30,7 +31,7 @@ package_python3-markupsafe() {
   cd "$srcdir/python3-build"
   /usr/bin/python3 setup.py install --prefix=/usr --root="$pkgdir" -O1
 
-  install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/python3-${pkgbase}/LICENSE"
+  install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/python3-${_realname}/LICENSE"
 }
 
 package_python2-markupsafe() {
@@ -39,5 +40,5 @@ package_python2-markupsafe() {
   cd "$srcdir/python2-build"
   /usr/bin/python2 setup.py install --prefix=/usr --root="$pkgdir" -O1
 
-  install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/python2-${pkgbase}/LICENSE"
+  install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/python2-${_realname}/LICENSE"
 }
diff --git a/python-nose/PKGBUILD b/python-nose/PKGBUILD
index 2ffb3d98..0bc9c5d4 100644
--- a/python-nose/PKGBUILD
+++ b/python-nose/PKGBUILD
@@ -1,7 +1,8 @@
 # Maintainer: Alexey Pavlov <alexpux@gmail.com>
 
-pkgbase=nose
-pkgname=("python3-${pkgbase}" "python2-${pkgbase}")
+_realname=nose
+pkgbase="python-${_realname}"
+pkgname=("python3-${_realname}" "python2-${_realname}")
 pkgver=1.3.7
 pkgrel=2
 pkgdesc="A discovery-based unittest extension"
diff --git a/python-packaging/PKGBUILD b/python-packaging/PKGBUILD
index ed65b7fe..7a74ea7e 100644
--- a/python-packaging/PKGBUILD
+++ b/python-packaging/PKGBUILD
@@ -1,7 +1,8 @@
 # Maintainer: atom2013 <atom.long@hotmail.com>
 
-pkgbase=packaging
-pkgname=("python3-${pkgbase}" "python2-${pkgbase}")
+_realname=packaging
+pkgbase="python-${_realname}"
+pkgname=("python3-${_realname}" "python2-${_realname}")
 pkgver=16.8
 pkgrel=3
 pkgdesc="Core utilities for Python packages"
diff --git a/python-pip/PKGBUILD b/python-pip/PKGBUILD
index 9180566d..d72bae36 100644
--- a/python-pip/PKGBUILD
+++ b/python-pip/PKGBUILD
@@ -1,5 +1,6 @@
 # Maintainer: atom2013 <atom.long@hotmail.com>
 
+pkgbase=python-pip
 pkgname=('python3-pip' 'python2-pip')
 pkgver=9.0.1
 pkgrel=3
diff --git a/python-pyalpm/PKGBUILD b/python-pyalpm/PKGBUILD
index 94b5ee42..b029fbed 100644
--- a/python-pyalpm/PKGBUILD
+++ b/python-pyalpm/PKGBUILD
@@ -1,7 +1,8 @@
 # Maintainer: Ray Donnelly <mingw.android@gmail.com>
 
-pkgbase=pyalpm
-pkgname=("python2-${pkgbase}" "python3-${pkgbase}")
+_realname=pyalpm
+pkgbase="python-${_realname}"
+pkgname=("python2-${_realname}" "python3-${_realname}")
 pkgver=0.8
 pkgrel=3
 pkgdesc="Libalpm bindings for Python"
@@ -17,7 +18,7 @@ makedepends=('python2'
              'libcurl-devel'
              'libgpgme-devel'
              'pacman')
-source=("https://sources.archlinux.org/other/${pkgbase}/${pkgbase}-${pkgver}.tar.gz"
+source=("https://sources.archlinux.org/other/${_realname}/${_realname}-${pkgver}.tar.gz"
         "0001-Python2-compat-Module-initialization.patch"
         "0002-Python2-compat-Use-Py_BuildValue-s-file-name.patch"
         "0003-Python2-compat-pycman-from-__future__-import-print_f.patch"
@@ -31,7 +32,7 @@ sha256sums=('b83b50a8a03b38954c84a280ea627e7c5a750cd6451530e0418c097ab0476e22'
             '7588f18f1c8546957dc1acba1a08d1a0bf14f7a5c3a6efcb8cc8a4278928ce06')
 
 prepare() {
-  cd "${srcdir}"/${pkgbase}-${pkgver}
+  cd "${srcdir}"/${_realname}-${pkgver}
   patch -p0 -i "${srcdir}"/0001-Python2-compat-Module-initialization.patch
   patch -p0 -i "${srcdir}"/0002-Python2-compat-Use-Py_BuildValue-s-file-name.patch
   patch -p0 -i "${srcdir}"/0003-Python2-compat-pycman-from-__future__-import-print_f.patch
@@ -43,7 +44,7 @@ prepare() {
   # files created by git will therefore not contain any
   # changes to the files in scripts so copy the patched
   # ones across now.
-  pushd "${srcdir}"/${pkgbase}-${pkgver}
+  pushd "${srcdir}"/${_realname}-${pkgver}
     for _file in deptest query remove sync upgrade version; do
       cp -f pycman/action_${_file}.py scripts/pycman-${_file}
     done
@@ -54,7 +55,7 @@ build() {
   cd "$srcdir"
   rm -rf python{2,3}-build
   for builddir in python{2,3}-build; do
-    cp -r ${pkgbase}-${pkgver} ${builddir}
+    cp -r ${_realname}-${pkgver} ${builddir}
     pushd ${builddir} > /dev/null 2>&1
     LIBALPM_STATIC=1 \
       /usr/bin/${builddir%-build} setup.py build
diff --git a/python-pyparsing/PKGBUILD b/python-pyparsing/PKGBUILD
index c21f6196..d69a577d 100644
--- a/python-pyparsing/PKGBUILD
+++ b/python-pyparsing/PKGBUILD
@@ -1,7 +1,8 @@
 # Maintainer: atom2013 <atom.long@hotmail.com>
 
-pkgbase=pyparsing
-pkgname=("python3-${pkgbase}" "python2-${pkgbase}")
+_realname=pyparsing
+pkgbase="python-${_realname}"
+pkgname=("python3-${_realname}" "python2-${_realname}")
 pkgver=2.2.0
 pkgrel=2
 pkgdesc='General parsing module for Python'
diff --git a/python-setuptools-scm/PKGBUILD b/python-setuptools-scm/PKGBUILD
index 57aa3540..d1ac288f 100644
--- a/python-setuptools-scm/PKGBUILD
+++ b/python-setuptools-scm/PKGBUILD
@@ -1,7 +1,8 @@
 # Maintainer: Alexey Pavlov <alexpux@gmail.com>
 
-pkgbase=setuptools-scm
-pkgname=("python3-${pkgbase}" "python2-${pkgbase}")
+_realname=setuptools-scm
+pkgbase="python-${_realname}"
+pkgname=("python3-${_realname}" "python2-${_realname}")
 pkgver=1.15.6
 pkgrel=1
 pkgdesc="Handles managing your python package versions in scm metadata"
@@ -9,7 +10,7 @@ arch=('any')
 license=('MIT')
 url='https://github.com/pypa/setuptools_scm'
 makedepends=('python3-setuptools' 'python2-setuptools')
-source=("https://pypi.org/packages/source/${pkgbase::1}/${pkgbase}/${pkgbase/-/_}-${pkgver}.tar.gz")
+source=("https://pypi.org/packages/source/${_realname::1}/${_realname}/${_realname/-/_}-${pkgver}.tar.gz")
 sha256sums=('49ab4685589986a42da85706b3311a2f74f1af567d39fee6cb1e088d7a75fb5f')
 
 prepare() {
@@ -17,7 +18,7 @@ prepare() {
 
   for pver in {2,3}; do 
     rm -rf python${pver}-build-${CARCH} | true
-    cp -r "${pkgbase/-/_}-${pkgver}" "python${pver}-build-${CARCH}"
+    cp -r "${_realname/-/_}-${pkgver}" "python${pver}-build-${CARCH}"
   done
 }
 
@@ -27,7 +28,7 @@ package_python3-setuptools-scm() {
   cd "${srcdir}"/python3-build-${CARCH}
   python3 setup.py install --prefix=/usr --root="${pkgdir}" --optimize=1
 
-  install -Dm644 "LICENSE" "${pkgdir}/usr/share/licenses/python3-${pkgbase}/LICENSE"
+  install -Dm644 "LICENSE" "${pkgdir}/usr/share/licenses/python3-${_realname}/LICENSE"
 }
 
 package_python2-setuptools-scm() {
@@ -36,5 +37,5 @@ package_python2-setuptools-scm() {
   cd "${srcdir}"/python2-build-${CARCH}
   python2 setup.py install --prefix=/usr --root="${pkgdir}" --optimize=1
 
-  install -Dm644 "LICENSE" "${pkgdir}/usr/share/licenses/python2-${pkgbase}/LICENSE"
+  install -Dm644 "LICENSE" "${pkgdir}/usr/share/licenses/python2-${_realname}/LICENSE"
 }
diff --git a/python-setuptools/PKGBUILD b/python-setuptools/PKGBUILD
index dea15bd5..82ed9c5a 100644
--- a/python-setuptools/PKGBUILD
+++ b/python-setuptools/PKGBUILD
@@ -1,16 +1,17 @@
 # Maintainer: Alexey Pavlov <alexpux@gmail.com>
 
-pkgbase=setuptools
-pkgname=("python3-${pkgbase}" "python2-${pkgbase}")
+_realname=setuptools
+pkgbase="python-${_realname}"
+pkgname=("python3-${_realname}" "python2-${_realname}")
 pkgver=36.4.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Easily download, build, install, upgrade, and uninstall Python packages"
 arch=('any')
 license=('PSF')
 url="https://pypi.python.org/pypi/setuptools"
 makedepends=('python3-packaging' 'python2-packaging' 'python3-appdirs' 'python2-appdirs' 'python3-pip'
              'python2-pip')
-source=("$pkgbase-$pkgver.tar.gz::https://github.com/pypa/setuptools/archive/v$pkgver.tar.gz")
+source=("$_realname-$pkgver.tar.gz::https://github.com/pypa/setuptools/archive/v$pkgver.tar.gz")
 sha512sums=('86bad0c16b7bde4c0a37867db04d76a90a7c968a8926611f4ad26f3d9185b33aa040072ecd7d23540a1434d19a742db3667387d4df975de489b494103b2df0e9')
 
 prepare() {
diff --git a/python2-fastimport/PKGBUILD b/python2-fastimport/PKGBUILD
index 921f3858..8c9d2995 100644
--- a/python2-fastimport/PKGBUILD
+++ b/python2-fastimport/PKGBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Alexey Pavlov <alexpux@gmail.com>
 
-pkgbase=fastimport
+pkgbase=python2-fastimport
 pkgname=('python2-fastimport')
 pkgver=0.9.4
 pkgrel=1
diff --git a/python3/PKGBUILD b/python3/PKGBUILD
index de8bb33f..70a47c6c 100644
--- a/python3/PKGBUILD
+++ b/python3/PKGBUILD
@@ -1,6 +1,7 @@
 # Maintainer: Alexey Pavlov <Alexpux@gmail.com>
 # Contributor: Ray Donnelly <mingw.android@gmail.com>
 
+pkgbase=python3
 pkgname=python
 pkgver=3.6.2
 pkgrel=1