diff --git a/mingw-w64-openscenegraph-git/PKGBUILD b/mingw-w64-OpenSceneGraph-git/PKGBUILD
similarity index 100%
rename from mingw-w64-openscenegraph-git/PKGBUILD
rename to mingw-w64-OpenSceneGraph-git/PKGBUILD
diff --git a/mingw-w64-openscenegraph-git/additional-gl-header.patch b/mingw-w64-OpenSceneGraph-git/additional-gl-header.patch
similarity index 100%
rename from mingw-w64-openscenegraph-git/additional-gl-header.patch
rename to mingw-w64-OpenSceneGraph-git/additional-gl-header.patch
diff --git a/mingw-w64-openscenegraph-git/find-collada.patch b/mingw-w64-OpenSceneGraph-git/find-collada.patch
similarity index 100%
rename from mingw-w64-openscenegraph-git/find-collada.patch
rename to mingw-w64-OpenSceneGraph-git/find-collada.patch
diff --git a/mingw-w64-openscenegraph/PKGBUILD b/mingw-w64-OpenSceneGraph/PKGBUILD
similarity index 100%
rename from mingw-w64-openscenegraph/PKGBUILD
rename to mingw-w64-OpenSceneGraph/PKGBUILD
diff --git a/mingw-w64-openscenegraph/add-gstreamer-cflags.patch b/mingw-w64-OpenSceneGraph/add-gstreamer-cflags.patch
similarity index 100%
rename from mingw-w64-openscenegraph/add-gstreamer-cflags.patch
rename to mingw-w64-OpenSceneGraph/add-gstreamer-cflags.patch
diff --git a/mingw-w64-openscenegraph/additional-gl-header.patch b/mingw-w64-OpenSceneGraph/additional-gl-header.patch
similarity index 100%
rename from mingw-w64-openscenegraph/additional-gl-header.patch
rename to mingw-w64-OpenSceneGraph/additional-gl-header.patch
diff --git a/mingw-w64-openscenegraph/find-collada.patch b/mingw-w64-OpenSceneGraph/find-collada.patch
similarity index 100%
rename from mingw-w64-openscenegraph/find-collada.patch
rename to mingw-w64-OpenSceneGraph/find-collada.patch
diff --git a/mingw-w64-openscenegraph/find-freetype.patch b/mingw-w64-OpenSceneGraph/find-freetype.patch
similarity index 100%
rename from mingw-w64-openscenegraph/find-freetype.patch
rename to mingw-w64-OpenSceneGraph/find-freetype.patch
diff --git a/mingw-w64-openscenegraph/fix-3ds-plugin.patch b/mingw-w64-OpenSceneGraph/fix-3ds-plugin.patch
similarity index 100%
rename from mingw-w64-openscenegraph/fix-3ds-plugin.patch
rename to mingw-w64-OpenSceneGraph/fix-3ds-plugin.patch
diff --git a/mingw-w64-arm-none-eabi-binutils/PKGBUILD b/mingw-w64-arm-none-eabi-binutils/PKGBUILD
index 1fc53e6a64..a018ad95bf 100644
--- a/mingw-w64-arm-none-eabi-binutils/PKGBUILD
+++ b/mingw-w64-arm-none-eabi-binutils/PKGBUILD
@@ -4,7 +4,7 @@
 _realname=binutils
 _target=arm-none-eabi
 
-pkgbase=mingw-w64-${_realname}
+pkgbase=mingw-w64-${_target}-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-${_target}-${_realname}")
 pkgver=2.24
 pkgrel=1
diff --git a/mingw-w64-arm-none-eabi-gcc/PKGBUILD b/mingw-w64-arm-none-eabi-gcc/PKGBUILD
index baf480d362..65820383d7 100644
--- a/mingw-w64-arm-none-eabi-gcc/PKGBUILD
+++ b/mingw-w64-arm-none-eabi-gcc/PKGBUILD
@@ -4,7 +4,7 @@
 _realname=gcc
 _target=arm-none-eabi
 
-pkgbase=mingw-w64-${_realname}
+pkgbase=mingw-w64-${_target}-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-${_target}-${_realname}")
 pkgver=4.8.4
 pkgrel=1
diff --git a/mingw-w64-arm-none-eabi-gdb/PKGBUILD b/mingw-w64-arm-none-eabi-gdb/PKGBUILD
index 08dfc2ee92..611db1cd9f 100644
--- a/mingw-w64-arm-none-eabi-gdb/PKGBUILD
+++ b/mingw-w64-arm-none-eabi-gdb/PKGBUILD
@@ -4,7 +4,7 @@
 _realname=gdb
 _target=arm-none-eabi
 
-pkgbase=mingw-w64-${_realname}
+pkgbase=mingw-w64-${_target}-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-${_target}-${_realname}")
 pkgver=7.6.0
 pkgrel=1
diff --git a/mingw-w64-arm-none-eabi-newlib/PKGBUILD b/mingw-w64-arm-none-eabi-newlib/PKGBUILD
index 0a79684791..32efe36fec 100644
--- a/mingw-w64-arm-none-eabi-newlib/PKGBUILD
+++ b/mingw-w64-arm-none-eabi-newlib/PKGBUILD
@@ -4,7 +4,7 @@
 _realname=newlib
 _target=arm-none-eabi
 
-pkgbase=mingw-w64-${_realname}
+pkgbase=mingw-w64-${_target}-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-${_target}-${_realname}")
 pkgver=2.1.0
 pkgrel=1
diff --git a/mingw-w64-atom-editor/PKGBUILD b/mingw-w64-atom-editor-git/PKGBUILD
similarity index 100%
rename from mingw-w64-atom-editor/PKGBUILD
rename to mingw-w64-atom-editor-git/PKGBUILD
diff --git a/mingw-w64-atom-shell/0001-python-python2.patch b/mingw-w64-atom-shell-git/0001-python-python2.patch
similarity index 100%
rename from mingw-w64-atom-shell/0001-python-python2.patch
rename to mingw-w64-atom-shell-git/0001-python-python2.patch
diff --git a/mingw-w64-atom-shell/0002-Add-ninja-option.patch b/mingw-w64-atom-shell-git/0002-Add-ninja-option.patch
similarity index 100%
rename from mingw-w64-atom-shell/0002-Add-ninja-option.patch
rename to mingw-w64-atom-shell-git/0002-Add-ninja-option.patch
diff --git a/mingw-w64-atom-shell/0002-debugging.patch b/mingw-w64-atom-shell-git/0002-debugging.patch
similarity index 100%
rename from mingw-w64-atom-shell/0002-debugging.patch
rename to mingw-w64-atom-shell-git/0002-debugging.patch
diff --git a/mingw-w64-atom-shell/PKGBUILD b/mingw-w64-atom-shell-git/PKGBUILD
similarity index 100%
rename from mingw-w64-atom-shell/PKGBUILD
rename to mingw-w64-atom-shell-git/PKGBUILD
diff --git a/mingw-w64-c99-to-c89/0001-Less-of-the-silly-nonsense.patch b/mingw-w64-c99-to-c89-git/0001-Less-of-the-silly-nonsense.patch
similarity index 100%
rename from mingw-w64-c99-to-c89/0001-Less-of-the-silly-nonsense.patch
rename to mingw-w64-c99-to-c89-git/0001-Less-of-the-silly-nonsense.patch
diff --git a/mingw-w64-c99-to-c89/0002-Ignore-trailing-cr-and-spaces-in-tests.patch b/mingw-w64-c99-to-c89-git/0002-Ignore-trailing-cr-and-spaces-in-tests.patch
similarity index 100%
rename from mingw-w64-c99-to-c89/0002-Ignore-trailing-cr-and-spaces-in-tests.patch
rename to mingw-w64-c99-to-c89-git/0002-Ignore-trailing-cr-and-spaces-in-tests.patch
diff --git a/mingw-w64-c99-to-c89/PKGBUILD b/mingw-w64-c99-to-c89-git/PKGBUILD
similarity index 100%
rename from mingw-w64-c99-to-c89/PKGBUILD
rename to mingw-w64-c99-to-c89-git/PKGBUILD
diff --git a/mingw-w64-clang35/PKGBUILD b/mingw-w64-clang35/PKGBUILD
index f71b8c4d70..23fc01acfe 100644
--- a/mingw-w64-clang35/PKGBUILD
+++ b/mingw-w64-clang35/PKGBUILD
@@ -1,6 +1,7 @@
 # Maintainer: Alexey Pavlov <alexpux@gmail.com>
 
 _realname=clang
+pkgbase="mingw-w64-${_realname}35"
 pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}35"
          "${MINGW_PACKAGE_PREFIX}-clang-analyzer35"
          "${MINGW_PACKAGE_PREFIX}-clang-tools-extra35"
diff --git a/mingw-w64-cocos2dx-console-git/PKGBUILD b/mingw-w64-cocos2d-x-console-git/PKGBUILD
similarity index 100%
rename from mingw-w64-cocos2dx-console-git/PKGBUILD
rename to mingw-w64-cocos2d-x-console-git/PKGBUILD
diff --git a/mingw-w64-cocos2dx-git/PKGBUILD b/mingw-w64-cocos2d-x-git/PKGBUILD
similarity index 100%
rename from mingw-w64-cocos2dx-git/PKGBUILD
rename to mingw-w64-cocos2d-x-git/PKGBUILD
diff --git a/mingw-w64-cocos2dx/001-bullet-find.patch b/mingw-w64-cocos2d-x/001-bullet-find.patch
similarity index 100%
rename from mingw-w64-cocos2dx/001-bullet-find.patch
rename to mingw-w64-cocos2d-x/001-bullet-find.patch
diff --git a/mingw-w64-cocos2dx/PKGBUILD b/mingw-w64-cocos2d-x/PKGBUILD
similarity index 100%
rename from mingw-w64-cocos2dx/PKGBUILD
rename to mingw-w64-cocos2d-x/PKGBUILD
diff --git a/mingw-w64-FreeImage/FreeImage-3.17.0_CVE-2015-0852.patch b/mingw-w64-freeimage/FreeImage-3.17.0_CVE-2015-0852.patch
similarity index 100%
rename from mingw-w64-FreeImage/FreeImage-3.17.0_CVE-2015-0852.patch
rename to mingw-w64-freeimage/FreeImage-3.17.0_CVE-2015-0852.patch
diff --git a/mingw-w64-FreeImage/FreeImage-3.17.0_mingw-makefiles.patch b/mingw-w64-freeimage/FreeImage-3.17.0_mingw-makefiles.patch
similarity index 100%
rename from mingw-w64-FreeImage/FreeImage-3.17.0_mingw-makefiles.patch
rename to mingw-w64-freeimage/FreeImage-3.17.0_mingw-makefiles.patch
diff --git a/mingw-w64-FreeImage/FreeImage-3.17.0_unbundle.patch b/mingw-w64-freeimage/FreeImage-3.17.0_unbundle.patch
similarity index 100%
rename from mingw-w64-FreeImage/FreeImage-3.17.0_unbundle.patch
rename to mingw-w64-freeimage/FreeImage-3.17.0_unbundle.patch
diff --git a/mingw-w64-FreeImage/PKGBUILD b/mingw-w64-freeimage/PKGBUILD
similarity index 100%
rename from mingw-w64-FreeImage/PKGBUILD
rename to mingw-w64-freeimage/PKGBUILD
diff --git a/mingw-w64-gdb-git/PKGBUILD b/mingw-w64-gdb-git/PKGBUILD
index 1feaea5fc3..b9ee5612cf 100644
--- a/mingw-w64-gdb-git/PKGBUILD
+++ b/mingw-w64-gdb-git/PKGBUILD
@@ -3,7 +3,7 @@
 
 _realname=gdb
 _gcc_ver=$(gcc -v 2>&1 | grep "^gcc version" | head -n1 | cut -c 13- | sed -r "s/\\s.*$//")
-pkgbase=mingw-w64-${_realname}
+pkgbase=mingw-w64-${_realname}-git
 pkgver=r91505.63345acf64
 pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}-git")
 replaces=("${MINGW_PACKAGE_PREFIX}-${_realname}")
diff --git a/mingw-w64-geany-plugins/PKGBUILD b/mingw-w64-geany-plugins/PKGBUILD
index 78150319d6..9098f7a4da 100644
--- a/mingw-w64-geany-plugins/PKGBUILD
+++ b/mingw-w64-geany-plugins/PKGBUILD
@@ -5,6 +5,7 @@
 # Contributor (Arch Linux): Patrick Melo <patrick@patrickmelo.eti.br>
 
 _realname=geany-plugins
+pkgbase="mingw-w64-${_realname}"
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 pkgver=1.29
 pkgrel=1
diff --git a/mingw-w64-gimp-ufraw/PKGBUILD b/mingw-w64-gimp-ufraw/PKGBUILD
index b04979f46d..1bb644bc9a 100644
--- a/mingw-w64-gimp-ufraw/PKGBUILD
+++ b/mingw-w64-gimp-ufraw/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Alexey Pavlov <alexpux@gmail.com>
 
 _realname=ufraw
-pkgbase=mingw-w64-${_realname}
+pkgbase=mingw-w64-gimp-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-gimp-${_realname}"
 groups=("${MINGW_PACKAGE_PREFIX}-gimp-plugins")
 pkgver=0.22
diff --git a/mingw-w64-glsl-optimizer/0001-GYP-Add-missing-files.patch b/mingw-w64-glsl-optimizer-git/0001-GYP-Add-missing-files.patch
similarity index 100%
rename from mingw-w64-glsl-optimizer/0001-GYP-Add-missing-files.patch
rename to mingw-w64-glsl-optimizer-git/0001-GYP-Add-missing-files.patch
diff --git a/mingw-w64-glsl-optimizer/0002-tests-MinGW-w64-Fix-build.patch b/mingw-w64-glsl-optimizer-git/0002-tests-MinGW-w64-Fix-build.patch
similarity index 100%
rename from mingw-w64-glsl-optimizer/0002-tests-MinGW-w64-Fix-build.patch
rename to mingw-w64-glsl-optimizer-git/0002-tests-MinGW-w64-Fix-build.patch
diff --git a/mingw-w64-glsl-optimizer/0003-Win64-long-is-32-bit-use-intptr_t-instead.patch b/mingw-w64-glsl-optimizer-git/0003-Win64-long-is-32-bit-use-intptr_t-instead.patch
similarity index 100%
rename from mingw-w64-glsl-optimizer/0003-Win64-long-is-32-bit-use-intptr_t-instead.patch
rename to mingw-w64-glsl-optimizer-git/0003-Win64-long-is-32-bit-use-intptr_t-instead.patch
diff --git a/mingw-w64-glsl-optimizer/0004-tests-MinGW-w64-Use-find_package-OpenGL-in-CMakeList.patch b/mingw-w64-glsl-optimizer-git/0004-tests-MinGW-w64-Use-find_package-OpenGL-in-CMakeList.patch
similarity index 100%
rename from mingw-w64-glsl-optimizer/0004-tests-MinGW-w64-Use-find_package-OpenGL-in-CMakeList.patch
rename to mingw-w64-glsl-optimizer-git/0004-tests-MinGW-w64-Use-find_package-OpenGL-in-CMakeList.patch
diff --git a/mingw-w64-glsl-optimizer/0006-CMake-Handle-installation.patch b/mingw-w64-glsl-optimizer-git/0006-CMake-Handle-installation.patch
similarity index 100%
rename from mingw-w64-glsl-optimizer/0006-CMake-Handle-installation.patch
rename to mingw-w64-glsl-optimizer-git/0006-CMake-Handle-installation.patch
diff --git a/mingw-w64-glsl-optimizer/PKGBUILD b/mingw-w64-glsl-optimizer-git/PKGBUILD
similarity index 100%
rename from mingw-w64-glsl-optimizer/PKGBUILD
rename to mingw-w64-glsl-optimizer-git/PKGBUILD
diff --git a/mingw-w64-gtkhtml3/PKGBUILD b/mingw-w64-gtkhtml3/PKGBUILD
index f1128346c9..020c66431a 100644
--- a/mingw-w64-gtkhtml3/PKGBUILD
+++ b/mingw-w64-gtkhtml3/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Alexey Pavlov <alexpux@gmail.com>
 
 _realname=gtkhtml
-pkgbase=mingw-w64-${_realname}
+pkgbase=mingw-w64-${_realname}3
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}3"
 pkgver=4.8.5
 pkgrel=1
diff --git a/mingw-w64-gtksourceview2/PKGBUILD b/mingw-w64-gtksourceview2/PKGBUILD
index 1754079989..74483ba4e0 100644
--- a/mingw-w64-gtksourceview2/PKGBUILD
+++ b/mingw-w64-gtksourceview2/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Alexey Pavlov <alexpux@gmail.com>
 
 _realname=gtksourceview
-pkgbase=mingw-w64-${_realname}
+pkgbase=mingw-w64-${_realname}2
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}2"
 pkgver=2.10.5
 pkgrel=3
diff --git a/mingw-w64-gtksourceview3/PKGBUILD b/mingw-w64-gtksourceview3/PKGBUILD
index 3f50fb3855..0d374f9e35 100644
--- a/mingw-w64-gtksourceview3/PKGBUILD
+++ b/mingw-w64-gtksourceview3/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Alexey Pavlov <alexpux@gmail.com>
 
 _realname=gtksourceview
-pkgbase=mingw-w64-${_realname}
+pkgbase=mingw-w64-${_realname}3
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}3"
 pkgver=3.24.3
 pkgrel=1
diff --git a/mingw-w64-gtksourceviewmm3/PKGBUILD b/mingw-w64-gtksourceviewmm3/PKGBUILD
index 84849bd138..f1e0a330fd 100644
--- a/mingw-w64-gtksourceviewmm3/PKGBUILD
+++ b/mingw-w64-gtksourceviewmm3/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Alexey Pavlov <alexpux@gmail.com>
 
 _realname=gtksourceviewmm
-pkgbase=mingw-w64-${_realname}
+pkgbase=mingw-w64-${_realname}3
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}3"
 pkgver=3.18.0
 pkgrel=2
diff --git a/mingw-w64-hlsl2glsl/0001-CMakeLists.txt-Fixes-and-improvements.patch b/mingw-w64-hlsl2glsl-git/0001-CMakeLists.txt-Fixes-and-improvements.patch
similarity index 100%
rename from mingw-w64-hlsl2glsl/0001-CMakeLists.txt-Fixes-and-improvements.patch
rename to mingw-w64-hlsl2glsl-git/0001-CMakeLists.txt-Fixes-and-improvements.patch
diff --git a/mingw-w64-hlsl2glsl/0002-Fix-pool_allocator-compile-guards.patch b/mingw-w64-hlsl2glsl-git/0002-Fix-pool_allocator-compile-guards.patch
similarity index 100%
rename from mingw-w64-hlsl2glsl/0002-Fix-pool_allocator-compile-guards.patch
rename to mingw-w64-hlsl2glsl-git/0002-Fix-pool_allocator-compile-guards.patch
diff --git a/mingw-w64-hlsl2glsl/0003-hlsl2glsltest-Change-_MSC_VER-to-_WIN32.patch b/mingw-w64-hlsl2glsl-git/0003-hlsl2glsltest-Change-_MSC_VER-to-_WIN32.patch
similarity index 100%
rename from mingw-w64-hlsl2glsl/0003-hlsl2glsltest-Change-_MSC_VER-to-_WIN32.patch
rename to mingw-w64-hlsl2glsl-git/0003-hlsl2glsltest-Change-_MSC_VER-to-_WIN32.patch
diff --git a/mingw-w64-hlsl2glsl/0004-CMake-Handle-installation.patch b/mingw-w64-hlsl2glsl-git/0004-CMake-Handle-installation.patch
similarity index 100%
rename from mingw-w64-hlsl2glsl/0004-CMake-Handle-installation.patch
rename to mingw-w64-hlsl2glsl-git/0004-CMake-Handle-installation.patch
diff --git a/mingw-w64-hlsl2glsl/PKGBUILD b/mingw-w64-hlsl2glsl-git/PKGBUILD
similarity index 100%
rename from mingw-w64-hlsl2glsl/PKGBUILD
rename to mingw-w64-hlsl2glsl-git/PKGBUILD
diff --git a/mingw-w64-kcwsh-qt5-git/PKGBUILD b/mingw-w64-kcwsh-qt5-git/PKGBUILD
index ad03af9e2e..1e7a3d494a 100644
--- a/mingw-w64-kcwsh-qt5-git/PKGBUILD
+++ b/mingw-w64-kcwsh-qt5-git/PKGBUILD
@@ -5,6 +5,7 @@ _variant=-static
 source "$(dirname ${BASH_SOURCE[0]})"/../mingw-w64-PKGBUILD-common/kde-frameworks5
 _kde_f5_init_package "${_variant}" "kcwsh"
 _ver_base=0.1.0
+pkgbase=mingw-w64-kcwsh-qt5-git
 pkgver=0.1.0.236.be0e645
 pkgrel=1
 arch=('any')
diff --git a/mingw-w64-LASzip/LASzip-2.2.0.patch b/mingw-w64-laszip/LASzip-2.2.0.patch
similarity index 100%
rename from mingw-w64-LASzip/LASzip-2.2.0.patch
rename to mingw-w64-laszip/LASzip-2.2.0.patch
diff --git a/mingw-w64-LASzip/PKGBUILD b/mingw-w64-laszip/PKGBUILD
similarity index 100%
rename from mingw-w64-LASzip/PKGBUILD
rename to mingw-w64-laszip/PKGBUILD
diff --git a/mingw-w64-libcello-git/PKGBUILD b/mingw-w64-libcello-git/PKGBUILD
index a6a3c4d4c1..d4c0464067 100644
--- a/mingw-w64-libcello-git/PKGBUILD
+++ b/mingw-w64-libcello-git/PKGBUILD
@@ -1,7 +1,7 @@
 # Contributor: Kazuki Shigemichi <shigemichik@gmail.com>
 
 _realname=libcello
-pkgbase="${MINGW_PACKAGE_PREFIX}-${_realname}"
+pkgbase="mingw-w64-${_realname}-git"
 pkgname="${pkgbase}-git"
 pkgver=2.0.3.293.a6a7354
 pkgrel=1
diff --git a/mingw-w64-libkcw-qt5-git/PKGBUILD b/mingw-w64-libkcw-qt5-git/PKGBUILD
index 1127a7a260..6360fd4edf 100644
--- a/mingw-w64-libkcw-qt5-git/PKGBUILD
+++ b/mingw-w64-libkcw-qt5-git/PKGBUILD
@@ -5,6 +5,7 @@ _variant=-static
 source "$(dirname ${BASH_SOURCE[0]})"/../mingw-w64-PKGBUILD-common/kde-frameworks5
 _kde_f5_init_package "${_variant}" "libkcw"
 _ver_base=0.1.0
+pkgbase=mingw-w64-libkcw-qt5-git
 pkgver=0.1.0.70.810b71c
 pkgrel=1
 arch=('any')
diff --git a/mingw-w64-libLAS/PKGBUILD b/mingw-w64-liblas/PKGBUILD
similarity index 100%
rename from mingw-w64-libLAS/PKGBUILD
rename to mingw-w64-liblas/PKGBUILD
diff --git a/mingw-w64-libLAS/libLAS-1.8.0.patch b/mingw-w64-liblas/libLAS-1.8.0.patch
similarity index 100%
rename from mingw-w64-libLAS/libLAS-1.8.0.patch
rename to mingw-w64-liblas/libLAS-1.8.0.patch
diff --git a/mingw-w64-LibRaw/LibRaw_obsolete-macros.patch b/mingw-w64-libraw/LibRaw_obsolete-macros.patch
similarity index 100%
rename from mingw-w64-LibRaw/LibRaw_obsolete-macros.patch
rename to mingw-w64-libraw/LibRaw_obsolete-macros.patch
diff --git a/mingw-w64-LibRaw/LibRaw_wsock32.patch b/mingw-w64-libraw/LibRaw_wsock32.patch
similarity index 100%
rename from mingw-w64-LibRaw/LibRaw_wsock32.patch
rename to mingw-w64-libraw/LibRaw_wsock32.patch
diff --git a/mingw-w64-LibRaw/PKGBUILD b/mingw-w64-libraw/PKGBUILD
similarity index 100%
rename from mingw-w64-LibRaw/PKGBUILD
rename to mingw-w64-libraw/PKGBUILD
diff --git a/mingw-w64-librest/PKGBUILD b/mingw-w64-librest/PKGBUILD
index 7f1ed274dd..b7105bbfd9 100644
--- a/mingw-w64-librest/PKGBUILD
+++ b/mingw-w64-librest/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Andrea Zagli <andrea.zagli.free@gmail.com>
 
 _realname=rest
-pkgbase=mingw-w64-${_realname}
+pkgbase=mingw-w64-lib${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-lib${_realname}"
 pkgver=0.8.0
 pkgrel=1
diff --git a/mingw-w64-mingw-w64-libsigsegv-git/PKGBUILD b/mingw-w64-libsigsegv-git/PKGBUILD
similarity index 100%
rename from mingw-w64-mingw-w64-libsigsegv-git/PKGBUILD
rename to mingw-w64-libsigsegv-git/PKGBUILD
diff --git a/mingw-w64-mingw-w64-libsigsegv-git/fix-win64.patch b/mingw-w64-libsigsegv-git/fix-win64.patch
similarity index 100%
rename from mingw-w64-mingw-w64-libsigsegv-git/fix-win64.patch
rename to mingw-w64-libsigsegv-git/fix-win64.patch
diff --git a/mingw-w64-libsmallchange-hg/PKGBUILD b/mingw-w64-libsmallchange-hg/PKGBUILD
index ce7ca0cb60..a3f2545139 100644
--- a/mingw-w64-libsmallchange-hg/PKGBUILD
+++ b/mingw-w64-libsmallchange-hg/PKGBUILD
@@ -2,7 +2,7 @@
 
 _realname=smallchange
 
-pkgbase=mingw-w64-${_realname}-hg
+pkgbase=mingw-w64-lib${_realname}-hg
 pkgname="${MINGW_PACKAGE_PREFIX}-lib${_realname}-hg"
 pkgver=r1055.b646e0d1ccc1
 pkgrel=1
diff --git a/mingw-w64-libvterm-bzr/PKGBUILD b/mingw-w64-libvterm-bzr/PKGBUILD
index 209b640abd..19a1d04336 100644
--- a/mingw-w64-libvterm-bzr/PKGBUILD
+++ b/mingw-w64-libvterm-bzr/PKGBUILD
@@ -1,6 +1,7 @@
 # Maintainer: Rui Abreu Ferreira <raf-ep@gmx.com>
 
 _realname=libvterm
+pkgbase="mingw-w64-${_realname}-bzr"
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}-bzr"
 pkgver=r681
 pkgrel=1
diff --git a/mingw-w64-lua-bitop/PKGBUILD b/mingw-w64-lua-bitop/PKGBUILD
index a8de2d5a1f..904bd63f84 100644
--- a/mingw-w64-lua-bitop/PKGBUILD
+++ b/mingw-w64-lua-bitop/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Rui Abreu Ferreira <raf-ep@gmx.com>
 
 _realname=bitop
-pkgbase=mingw-w64-${_realname}
+pkgbase=mingw-w64-lua-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-lua51-${_realname}")
 pkgver=1.0.2
 pkgrel=1
diff --git a/mingw-w64-lua-lpeg/PKGBUILD b/mingw-w64-lua-lpeg/PKGBUILD
index a2cd9e8d9b..add2a29707 100644
--- a/mingw-w64-lua-lpeg/PKGBUILD
+++ b/mingw-w64-lua-lpeg/PKGBUILD
@@ -3,7 +3,7 @@
 # Contributor: Felix Huettner <huettner94@gmx.de>
 
 _realname=lpeg
-pkgbase=mingw-w64-${_realname}
+pkgbase=mingw-w64-lua-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-lua-${_realname}"
          "${MINGW_PACKAGE_PREFIX}-lua51-${_realname}")
 pkgver=0.12
diff --git a/mingw-w64-lua-lsqlite3/PKGBUILD b/mingw-w64-lua-lsqlite3/PKGBUILD
index e6d740eddc..9a55ee483e 100644
--- a/mingw-w64-lua-lsqlite3/PKGBUILD
+++ b/mingw-w64-lua-lsqlite3/PKGBUILD
@@ -1,7 +1,7 @@
 # Contributor (Fluke): Ricky Wu <rickleaf.wu@gmail.com>
 
 _realname=lsqlite3
-pkgbase=mingw-w64-${_realname}
+pkgbase=mingw-w64-lua-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-lua51-${_realname}")
 pkgver=0.9.3
 pkgrel=1
diff --git a/mingw-w64-lua-luacom-git/PKGBUILD b/mingw-w64-lua-luacom-git/PKGBUILD
index f9c59e0eec..89713d7405 100644
--- a/mingw-w64-lua-luacom-git/PKGBUILD
+++ b/mingw-w64-lua-luacom-git/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Ricky Wu <rickleaf.wu@gmail.com>
 
 _realname=luacom
-pkgbase=mingw-w64-${_realname}-git
+pkgbase=mingw-w64-lua-${_realname}-git
 pkgname="${MINGW_PACKAGE_PREFIX}-lua51-${_realname}-git"
 pkgver=v1.4.1.4.g8f818f5
 pkgrel=1
diff --git a/mingw-w64-lua-luarocks/PKGBUILD b/mingw-w64-lua-luarocks/PKGBUILD
index af36c2b928..3ae96ceccb 100644
--- a/mingw-w64-lua-luarocks/PKGBUILD
+++ b/mingw-w64-lua-luarocks/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Ricky Wu <rickleaf.wu@gmail.com>
 
 _realname=luarocks
-pkgbase=mingw-w64-${_realname}
+pkgbase=mingw-w64-lua-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-lua51-${_realname}")
 pkgver=2.4.1
 pkgrel=1
diff --git a/mingw-w64-lua-mpack/PKGBUILD b/mingw-w64-lua-mpack/PKGBUILD
index 8b3ac3fd43..6219cb8201 100644
--- a/mingw-w64-lua-mpack/PKGBUILD
+++ b/mingw-w64-lua-mpack/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Rui Abreu Ferreira <raf-ep@gmx.com>
 
 _realname=mpack
-pkgbase=mingw-w64-${_realname}
+pkgbase=mingw-w64-lua-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-lua51-${_realname}"
          "${MINGW_PACKAGE_PREFIX}-lua-${_realname}")
 pkgver=1.0.4
diff --git a/mingw-w64-luatex-svn/PKGBUILD b/mingw-w64-luatex-svn/PKGBUILD
index dc18e5317c..2a637cf04e 100644
--- a/mingw-w64-luatex-svn/PKGBUILD
+++ b/mingw-w64-luatex-svn/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Ray Donnelly <mingw.android@gmail.com>
 
 _realname=luatex
-pkgbase=mingw-w64-${_realname}
+pkgbase=mingw-w64-${_realname}-svn
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 pkgver=1.0
 pkgrel=1
diff --git a/mingw-w64-mcfgthread-git/PKGBUILD b/mingw-w64-mcfgthread-git/PKGBUILD
index 8db034d67c..cc15a556c4 100644
--- a/mingw-w64-mcfgthread-git/PKGBUILD
+++ b/mingw-w64-mcfgthread-git/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: LH_Mouse <lh_mouse@126.com>
 
 _realname=mcfgthread
-pkgbase=mingw-w64-${_realname}
+pkgbase=mingw-w64-${_realname}-git
 pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}"
          "${MINGW_PACKAGE_PREFIX}-${_realname}"-libs)
 pkgver=r250.9aa34c3
diff --git a/mingw-w64-meld3/PKGBUILD b/mingw-w64-meld3/PKGBUILD
index 6c51b2544e..2bd1b83ed7 100644
--- a/mingw-w64-meld3/PKGBUILD
+++ b/mingw-w64-meld3/PKGBUILD
@@ -2,7 +2,7 @@
 # Contributor: Ray Donnelly <mingw.android@gmail.com>
 
 _realname=meld
-pkgbase=mingw-w64-${_realname}
+pkgbase=mingw-w64-${_realname}3
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}3"
 pkgver=3.16.4
 pkgrel=1
diff --git a/mingw-w64-oce/PKGBUILD b/mingw-w64-oce/PKGBUILD
index 0fc010e4a7..83fbd77fdb 100644
--- a/mingw-w64-oce/PKGBUILD
+++ b/mingw-w64-oce/PKGBUILD
@@ -1,6 +1,7 @@
 # Maintainer: Nick Østergaard <oe.nick at gmail dot com>
 
 _realname=oce
+pkgbase=mingw-w64-${_realname}
 pkgname=${MINGW_PACKAGE_PREFIX}-${_realname}
 pkgver=0.17.2
 pkgrel=4
diff --git a/mingw-w64-ogre/PKGBUILD b/mingw-w64-ogre3d/PKGBUILD
similarity index 100%
rename from mingw-w64-ogre/PKGBUILD
rename to mingw-w64-ogre3d/PKGBUILD
diff --git a/mingw-w64-ogre/mingw-w64-fix.patch b/mingw-w64-ogre3d/mingw-w64-fix.patch
similarity index 100%
rename from mingw-w64-ogre/mingw-w64-fix.patch
rename to mingw-w64-ogre3d/mingw-w64-fix.patch
diff --git a/mingw-w64-ogre/ogre-1.9.0-fix-cflags.patch b/mingw-w64-ogre3d/ogre-1.9.0-fix-cflags.patch
similarity index 100%
rename from mingw-w64-ogre/ogre-1.9.0-fix-cflags.patch
rename to mingw-w64-ogre3d/ogre-1.9.0-fix-cflags.patch
diff --git a/mingw-w64-ogre/ogre-endlessworld-fix.patch b/mingw-w64-ogre3d/ogre-endlessworld-fix.patch
similarity index 100%
rename from mingw-w64-ogre/ogre-endlessworld-fix.patch
rename to mingw-w64-ogre3d/ogre-endlessworld-fix.patch
diff --git a/mingw-w64-ogre/ogre-freeimage-fix.patch b/mingw-w64-ogre3d/ogre-freeimage-fix.patch
similarity index 100%
rename from mingw-w64-ogre/ogre-freeimage-fix.patch
rename to mingw-w64-ogre3d/ogre-freeimage-fix.patch
diff --git a/mingw-w64-ogre/use-mingw-w64-directx.patch b/mingw-w64-ogre3d/use-mingw-w64-directx.patch
similarity index 100%
rename from mingw-w64-ogre/use-mingw-w64-directx.patch
rename to mingw-w64-ogre3d/use-mingw-w64-directx.patch
diff --git a/mingw-w64-openblas/PKGBUILD b/mingw-w64-openblas/PKGBUILD
index 5450c2752c..4b9f9d70d2 100644
--- a/mingw-w64-openblas/PKGBUILD
+++ b/mingw-w64-openblas/PKGBUILD
@@ -2,7 +2,7 @@
 # Contributor: Jürgen Pfeifer <juergen@familiepfeifer.de>
 
 _realname=OpenBLAS
-pkgbase=mingw-w64-${_realname}
+pkgbase=mingw-w64-openblas
 pkgname="${MINGW_PACKAGE_PREFIX}-openblas"
 pkgver=0.2.20
 pkgrel=1
diff --git a/mingw-w64-openjpeg2/PKGBUILD b/mingw-w64-openjpeg2/PKGBUILD
index bae1b94927..a0a6b80829 100644
--- a/mingw-w64-openjpeg2/PKGBUILD
+++ b/mingw-w64-openjpeg2/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Alexey Pavlov <alexpux@gmail.com>
 
 _realname=openjpeg
-pkgbase=mingw-w64-${_realname}
+pkgbase=mingw-w64-${_realname}2
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}2"
 pkgver=2.2.0
 pkgrel=1
diff --git a/mingw-w64-osgqt/0001-remove-missing-macros.patch b/mingw-w64-osgQt/0001-remove-missing-macros.patch
similarity index 100%
rename from mingw-w64-osgqt/0001-remove-missing-macros.patch
rename to mingw-w64-osgQt/0001-remove-missing-macros.patch
diff --git a/mingw-w64-osgqt/PKGBUILD b/mingw-w64-osgQt/PKGBUILD
similarity index 100%
rename from mingw-w64-osgqt/PKGBUILD
rename to mingw-w64-osgQt/PKGBUILD
diff --git a/mingw-w64-osgqtquick/PKGBUILD b/mingw-w64-osgQtQuick/PKGBUILD
similarity index 100%
rename from mingw-w64-osgqtquick/PKGBUILD
rename to mingw-w64-osgQtQuick/PKGBUILD
diff --git a/mingw-w64-osgearth-git/PKGBUILD b/mingw-w64-osgearth-git/PKGBUILD
index 86b53f8a01..a3d6509ea5 100644
--- a/mingw-w64-osgearth-git/PKGBUILD
+++ b/mingw-w64-osgearth-git/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: James Duley <jagduley gmail>
 
 _realname=osgearth
-pkgbase=mingw-w64-${_realname}
+pkgbase=mingw-w64-${_realname}-git
 pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}-git" "${MINGW_PACKAGE_PREFIX}-${_realname}-debug-git")
 pkgver=r7923.978cc0b
 pkgrel=1
diff --git a/mingw-w64-osmgpsmap-git/PKGBUILD b/mingw-w64-osmgpsmap-git/PKGBUILD
index ae378009da..15203cc47a 100644
--- a/mingw-w64-osmgpsmap-git/PKGBUILD
+++ b/mingw-w64-osmgpsmap-git/PKGBUILD
@@ -1,7 +1,7 @@
 # Contributor: Josip <bpisoj@gmail.com>
 
 _realname=osm-gps-map
-pkgbase=mingw-w64-${_realname}-git
+pkgbase=mingw-w64-osmgpsmap-git
 pkgname="${MINGW_PACKAGE_PREFIX}-osmgpsmap-git"
 provides=("${MINGW_PACKAGE_PREFIX}-osmgpsmap")
 conflicts=("${MINGW_PACKAGE_PREFIX}-osmgpsmap")
diff --git a/mingw-w64-pdftex-svn/PKGBUILD b/mingw-w64-pdftex-svn/PKGBUILD
index dca55e20b5..8c0979c8ff 100644
--- a/mingw-w64-pdftex-svn/PKGBUILD
+++ b/mingw-w64-pdftex-svn/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Ray Donnelly <mingw.android@gmail.com>
 
 _realname=pdftex
-pkgbase=mingw-w64-${_realname}
+pkgbase=mingw-w64-${_realname}-svn
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 pkgver=1.0
 pkgrel=1
diff --git a/mingw-w64-pygobject2/PKGBUILD b/mingw-w64-pygobject2/PKGBUILD
index 593fb2536f..e05b1b3e58 100644
--- a/mingw-w64-pygobject2/PKGBUILD
+++ b/mingw-w64-pygobject2/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Alexey Pavlov <alexpux@gmail.com>
 
 _realname=pygobject
-pkgbase=mingw-w64-${_realname}
+pkgbase=mingw-w64-${_realname}2
 pkgname=("${MINGW_PACKAGE_PREFIX}-python2-gobject2" "${MINGW_PACKAGE_PREFIX}-python3-gobject2" "${MINGW_PACKAGE_PREFIX}-pygobject2-devel")
 pkgver=2.28.6
 pkgrel=6
diff --git a/mingw-w64-pygtksourceview2/PKGBUILD b/mingw-w64-pygtksourceview2/PKGBUILD
index e587deddc2..bfc9e4ece3 100644
--- a/mingw-w64-pygtksourceview2/PKGBUILD
+++ b/mingw-w64-pygtksourceview2/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Alexey Pavlov <alexpux@gmail.com>
 
 _realname=pygtksourceview
-pkgbase=mingw-w64-${_realname}
+pkgbase=mingw-w64-${_realname}2
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}2"
 pkgver=2.10.1
 pkgrel=1
diff --git a/mingw-w64-python-binwalk/PKGBUILD b/mingw-w64-python-binwalk/PKGBUILD
index 28a6f64fe9..c81cb15381 100644
--- a/mingw-w64-python-binwalk/PKGBUILD
+++ b/mingw-w64-python-binwalk/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Martell Malone <martellmalone@gmail.com>
 
 _realname=binwalk
-pkgbase=mingw-w64-${_realname}
+pkgbase=mingw-w64-python-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}") #"${MINGW_PACKAGE_PREFIX}-python2-${_realname}"
 pkgver=2.1.1
 pkgrel=1
diff --git a/mingw-w64-python-csssselect/PKGBUILD b/mingw-w64-python-cssselect/PKGBUILD
similarity index 100%
rename from mingw-w64-python-csssselect/PKGBUILD
rename to mingw-w64-python-cssselect/PKGBUILD
diff --git a/mingw-w64-python-h5py/PKGBUILD b/mingw-w64-python-h5py/PKGBUILD
index ff85b08371..db3955a65a 100644
--- a/mingw-w64-python-h5py/PKGBUILD
+++ b/mingw-w64-python-h5py/PKGBUILD
@@ -1,7 +1,7 @@
 # Contributor: Runar Tenfjord < runar dot tenfjord at gmail dot com >
 
 _realname=h5py
-pkgbase=mingw-w64-${_realname}
+pkgbase=mingw-w64-python-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-python2-${_realname}"
          "${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
 pkgver=2.7.0
diff --git a/mingw-w64-python-icu/PKGBUILD b/mingw-w64-python-icu/PKGBUILD
index eb0a454ef6..545416bc98 100644
--- a/mingw-w64-python-icu/PKGBUILD
+++ b/mingw-w64-python-icu/PKGBUILD
@@ -1,7 +1,7 @@
 # Contributor: Josip <bpisoj@gmail.com>
 
 _realname=PyICU
-pkgbase=mingw-w64-python-${_realname}
+pkgbase=mingw-w64-python-icu
 pkgname=("${MINGW_PACKAGE_PREFIX}-python2-icu" "${MINGW_PACKAGE_PREFIX}-python3-icu")
 pkgver=1.9.7
 pkgrel=2
diff --git a/mingw-w64-python-lhafile/PKGBUILD b/mingw-w64-python-lhafile/PKGBUILD
index 0db8b4db9e..0f16c65c9f 100644
--- a/mingw-w64-python-lhafile/PKGBUILD
+++ b/mingw-w64-python-lhafile/PKGBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Frode Solheim <frode@fs-uae.net>
 
-_realname=python-lhafile
+_realname=lhafile
 pkgbase=mingw-w64-python-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-python2-lhafile"
          "${MINGW_PACKAGE_PREFIX}-python3-lhafile")
diff --git a/mingw-w64-python-path/PKGBUILD b/mingw-w64-python-path/PKGBUILD
index c864a260e1..fc26f16b5b 100644
--- a/mingw-w64-python-path/PKGBUILD
+++ b/mingw-w64-python-path/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Ryuta Suzuki <oroppas@gmail.com>
 
 _realname=path.py
-pkgbase=mingw-w64-python-${_realname}
+pkgbase=mingw-w64-python-path
 pkgname=("${MINGW_PACKAGE_PREFIX}-python3-path"
          "${MINGW_PACKAGE_PREFIX}-python2-path")
 pkgver=10.3.1
diff --git a/mingw-w64-python-pillow/PKGBUILD b/mingw-w64-python-pillow/PKGBUILD
index f224d7b6ea..9557b4a01c 100644
--- a/mingw-w64-python-pillow/PKGBUILD
+++ b/mingw-w64-python-pillow/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Alexey Pavlov <Alexpux@gmail.com>
 
 _realname=Pillow
-pkgbase=mingw-w64-python-${_realname}
+pkgbase=mingw-w64-python-pillow
 pkgname=("${MINGW_PACKAGE_PREFIX}-python2-pillow" "${MINGW_PACKAGE_PREFIX}-python3-pillow")
 pkgver=4.2.1
 pkgrel=2
diff --git a/mingw-w64-python-pywin32/PKGBUILD b/mingw-w64-python-pywin32/PKGBUILD
index ad7aec91bf..81229e6bd3 100644
--- a/mingw-w64-python-pywin32/PKGBUILD
+++ b/mingw-w64-python-pywin32/PKGBUILD
@@ -9,7 +9,7 @@ arch=('any')
 pkgver=219
 pkgrel=1
 makedepends=(${MINGW_PACKAGE_PREFIX}-python2 ${MINGW_PACKAGE_PREFIX}-python3 rsync)
-pkgbase=mingw-w64-${_realname}
+pkgbase=mingw-w64-python-${_realname}
 pkgname=(${MINGW_PACKAGE_PREFIX}-python2-${_realname} ${MINGW_PACKAGE_PREFIX}-python3-${_realname})
 source=("https://prdownloads.sourceforge.net/${_realname}/${_realname}-${pkgver}.zip"
         001-compile-and-setup-fixes.patch)
diff --git a/mingw-w64-python-rst2pdf/PKGBUILD b/mingw-w64-python-rst2pdf/PKGBUILD
index 28498766b0..b53c0ad33b 100644
--- a/mingw-w64-python-rst2pdf/PKGBUILD
+++ b/mingw-w64-python-rst2pdf/PKGBUILD
@@ -1,6 +1,6 @@
 _pyname=rst2pdf
 _realname=rst2pdf
-pkgbase=mingw-w64-python2-${_realname}
+pkgbase=mingw-w64-python-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-python2-${_realname}"  "${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
 pkgver=0.93
 pkgrel=3
diff --git a/mingw-w64-python2-beautifulsoup3/PKGBUILD b/mingw-w64-python2-beautifulsoup3/PKGBUILD
index 9f6207112c..490674f8cd 100644
--- a/mingw-w64-python2-beautifulsoup3/PKGBUILD
+++ b/mingw-w64-python2-beautifulsoup3/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Alexey Pavlov <alexpux@gmail.com>
 
 _realname=beautifulsoup3
-pkgbase=mingw-w64-${_realname}
+pkgbase=mingw-w64-python2-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-python2-${_realname}")
 pkgver=3.2.1
 pkgrel=2
diff --git a/mingw-w64-python2-enum34/PKGBUILD b/mingw-w64-python2-enum34/PKGBUILD
index 6691c80ac5..029f20b445 100644
--- a/mingw-w64-python2-enum34/PKGBUILD
+++ b/mingw-w64-python2-enum34/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Frederic Wang <fred.wang@free.fr>
 
 _realname=enum34
-pkgbase=mingw-w64-python-${_realname}
+pkgbase=mingw-w64-python2-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-python2-${_realname}")
 pkgver=1.1.6
 pkgrel=1
diff --git a/mingw-w64-python2-ipaddress/PKGBUILD b/mingw-w64-python2-ipaddress/PKGBUILD
index bbdbe49cfe..2bb28f4215 100644
--- a/mingw-w64-python2-ipaddress/PKGBUILD
+++ b/mingw-w64-python2-ipaddress/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Frederic Wang <fred.wang@free.fr>
 
 _realname=ipaddress
-pkgbase=mingw-w64-python-${_realname}
+pkgbase=mingw-w64-python2-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-python2-${_realname}")
 pkgver=1.0.18
 pkgrel=1
diff --git a/mingw-w64-python2-ipython/PKGBUILD b/mingw-w64-python2-ipython/PKGBUILD
index c0ba60d520..15cc01466e 100644
--- a/mingw-w64-python2-ipython/PKGBUILD
+++ b/mingw-w64-python2-ipython/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Kyle Kauffman <kyle.j.kauffman@gmail.com>
 
 _realname=ipython
-pkgbase=mingw-w64-python-${_realname}
+pkgbase=mingw-w64-python2-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-python2-${_realname}")
 pkgver=5.3.0
 pkgrel=6
diff --git a/mingw-w64-python2-pygtk/PKGBUILD b/mingw-w64-python2-pygtk/PKGBUILD
index e22ca50651..9b34131b35 100644
--- a/mingw-w64-python2-pygtk/PKGBUILD
+++ b/mingw-w64-python2-pygtk/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Alexey Pavlov <alexpux@gmail.com>
 
 _realname=pygtk
-pkgbase=mingw-w64-${_realname}
+pkgbase=mingw-w64-python2-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-python2-${_realname}"
 pkgver=2.24.0
 pkgrel=6
diff --git a/mingw-w64-python2-typing/PKGBUILD b/mingw-w64-python2-typing/PKGBUILD
index c7d401f07d..700bd0124d 100644
--- a/mingw-w64-python2-typing/PKGBUILD
+++ b/mingw-w64-python2-typing/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Alexey Pavlov <alexpux@gmail.com>
 
 _realname=typing
-pkgbase=mingw-w64-python-${_realname}
+pkgbase=mingw-w64-python2-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-python2-${_realname}")
 pkgver=3.6.1
 pkgrel=1
diff --git a/mingw-w64-qtcreator/0001-autotools-Set-a-default-buildDir.patch b/mingw-w64-qt-creator/0001-autotools-Set-a-default-buildDir.patch
similarity index 100%
rename from mingw-w64-qtcreator/0001-autotools-Set-a-default-buildDir.patch
rename to mingw-w64-qt-creator/0001-autotools-Set-a-default-buildDir.patch
diff --git a/mingw-w64-qtcreator/PKGBUILD b/mingw-w64-qt-creator/PKGBUILD
similarity index 100%
rename from mingw-w64-qtcreator/PKGBUILD
rename to mingw-w64-qt-creator/PKGBUILD
diff --git a/mingw-w64-qtcreator/qt-creator-3.0.0-path-quote.patch b/mingw-w64-qt-creator/qt-creator-3.0.0-path-quote.patch
similarity index 100%
rename from mingw-w64-qtcreator/qt-creator-3.0.0-path-quote.patch
rename to mingw-w64-qt-creator/qt-creator-3.0.0-path-quote.patch
diff --git a/mingw-w64-qtcreator/qt-creator-3.2.0-Allow-iOS-plugin-on-any-platform.patch b/mingw-w64-qt-creator/qt-creator-3.2.0-Allow-iOS-plugin-on-any-platform.patch
similarity index 100%
rename from mingw-w64-qtcreator/qt-creator-3.2.0-Allow-iOS-plugin-on-any-platform.patch
rename to mingw-w64-qt-creator/qt-creator-3.2.0-Allow-iOS-plugin-on-any-platform.patch
diff --git a/mingw-w64-qtcreator/qt-creator-3.2.0-Allow-static-clang-via-LLVM_STATIC-env-var.patch b/mingw-w64-qt-creator/qt-creator-3.2.0-Allow-static-clang-via-LLVM_STATIC-env-var.patch
similarity index 100%
rename from mingw-w64-qtcreator/qt-creator-3.2.0-Allow-static-clang-via-LLVM_STATIC-env-var.patch
rename to mingw-w64-qt-creator/qt-creator-3.2.0-Allow-static-clang-via-LLVM_STATIC-env-var.patch
diff --git a/mingw-w64-qtcreator/qt-creator-3.2.0-Define-QBS_INSTALL_DIR-as-relative-path.patch b/mingw-w64-qt-creator/qt-creator-3.2.0-Define-QBS_INSTALL_DIR-as-relative-path.patch
similarity index 100%
rename from mingw-w64-qtcreator/qt-creator-3.2.0-Define-QBS_INSTALL_DIR-as-relative-path.patch
rename to mingw-w64-qt-creator/qt-creator-3.2.0-Define-QBS_INSTALL_DIR-as-relative-path.patch
diff --git a/mingw-w64-qtcreator/qt-creator-3.2.0-MSYS2-autotools-run-shell-scripts-via-sh.patch b/mingw-w64-qt-creator/qt-creator-3.2.0-MSYS2-autotools-run-shell-scripts-via-sh.patch
similarity index 100%
rename from mingw-w64-qtcreator/qt-creator-3.2.0-MSYS2-autotools-run-shell-scripts-via-sh.patch
rename to mingw-w64-qt-creator/qt-creator-3.2.0-MSYS2-autotools-run-shell-scripts-via-sh.patch
diff --git a/mingw-w64-qtcreator/qt-creator-3.2.0-autotools-allow-non-Automake-Makefile-in-projects.patch b/mingw-w64-qt-creator/qt-creator-3.2.0-autotools-allow-non-Automake-Makefile-in-projects.patch
similarity index 100%
rename from mingw-w64-qtcreator/qt-creator-3.2.0-autotools-allow-non-Automake-Makefile-in-projects.patch
rename to mingw-w64-qt-creator/qt-creator-3.2.0-autotools-allow-non-Automake-Makefile-in-projects.patch
diff --git a/mingw-w64-qtcreator/qt-creator-3.5.0-Hacky-fix-for-__GNUC_PREREQ-usage.patch b/mingw-w64-qt-creator/qt-creator-3.5.0-Hacky-fix-for-__GNUC_PREREQ-usage.patch
similarity index 100%
rename from mingw-w64-qtcreator/qt-creator-3.5.0-Hacky-fix-for-__GNUC_PREREQ-usage.patch
rename to mingw-w64-qt-creator/qt-creator-3.5.0-Hacky-fix-for-__GNUC_PREREQ-usage.patch
diff --git a/mingw-w64-qtcreator/qt-creator-3.5.0-shellquote-declspec-dllexport-for-unix-shell.patch b/mingw-w64-qt-creator/qt-creator-3.5.0-shellquote-declspec-dllexport-for-unix-shell.patch
similarity index 100%
rename from mingw-w64-qtcreator/qt-creator-3.5.0-shellquote-declspec-dllexport-for-unix-shell.patch
rename to mingw-w64-qt-creator/qt-creator-3.5.0-shellquote-declspec-dllexport-for-unix-shell.patch
diff --git a/mingw-w64-qtcreator/qt-creator-3.5.1-Use-systemEnvironment-For-Start-and-Debug-External-Application.patch b/mingw-w64-qt-creator/qt-creator-3.5.1-Use-systemEnvironment-For-Start-and-Debug-External-Application.patch
similarity index 100%
rename from mingw-w64-qtcreator/qt-creator-3.5.1-Use-systemEnvironment-For-Start-and-Debug-External-Application.patch
rename to mingw-w64-qt-creator/qt-creator-3.5.1-Use-systemEnvironment-For-Start-and-Debug-External-Application.patch
diff --git a/mingw-w64-qtcreator/qt-creator-4.3.0-qbs-CONFIG-add-qbs_enable_project_file_updates.patch b/mingw-w64-qt-creator/qt-creator-4.3.0-qbs-CONFIG-add-qbs_enable_project_file_updates.patch
similarity index 100%
rename from mingw-w64-qtcreator/qt-creator-4.3.0-qbs-CONFIG-add-qbs_enable_project_file_updates.patch
rename to mingw-w64-qt-creator/qt-creator-4.3.0-qbs-CONFIG-add-qbs_enable_project_file_updates.patch
diff --git a/mingw-w64-qtcreator/qt-creator-i686.install b/mingw-w64-qt-creator/qt-creator-i686.install
similarity index 100%
rename from mingw-w64-qtcreator/qt-creator-i686.install
rename to mingw-w64-qt-creator/qt-creator-i686.install
diff --git a/mingw-w64-qtcreator/qt-creator-x86_64.install b/mingw-w64-qt-creator/qt-creator-x86_64.install
similarity index 100%
rename from mingw-w64-qtcreator/qt-creator-x86_64.install
rename to mingw-w64-qt-creator/qt-creator-x86_64.install
diff --git a/mingw-w64-qt-installer-framework/0002-add-installation-stuff-to-pro-files.patch b/mingw-w64-qt-installer-framework-git/0002-add-installation-stuff-to-pro-files.patch
similarity index 100%
rename from mingw-w64-qt-installer-framework/0002-add-installation-stuff-to-pro-files.patch
rename to mingw-w64-qt-installer-framework-git/0002-add-installation-stuff-to-pro-files.patch
diff --git a/mingw-w64-qt-installer-framework/0003-add-recursive-option-to-rmdir-operation.patch b/mingw-w64-qt-installer-framework-git/0003-add-recursive-option-to-rmdir-operation.patch
similarity index 100%
rename from mingw-w64-qt-installer-framework/0003-add-recursive-option-to-rmdir-operation.patch
rename to mingw-w64-qt-installer-framework-git/0003-add-recursive-option-to-rmdir-operation.patch
diff --git a/mingw-w64-qt-installer-framework/0004-add-dirExists-fuction.patch b/mingw-w64-qt-installer-framework-git/0004-add-dirExists-fuction.patch
similarity index 100%
rename from mingw-w64-qt-installer-framework/0004-add-dirExists-fuction.patch
rename to mingw-w64-qt-installer-framework-git/0004-add-dirExists-fuction.patch
diff --git a/mingw-w64-qt-installer-framework/0005-Fix-RunProgram-variable-substitution.patch b/mingw-w64-qt-installer-framework-git/0005-Fix-RunProgram-variable-substitution.patch
similarity index 100%
rename from mingw-w64-qt-installer-framework/0005-Fix-RunProgram-variable-substitution.patch
rename to mingw-w64-qt-installer-framework-git/0005-Fix-RunProgram-variable-substitution.patch
diff --git a/mingw-w64-qt-installer-framework/0006-Don-t-remove-files-that-live-outside-of-path.patch b/mingw-w64-qt-installer-framework-git/0006-Don-t-remove-files-that-live-outside-of-path.patch
similarity index 100%
rename from mingw-w64-qt-installer-framework/0006-Don-t-remove-files-that-live-outside-of-path.patch
rename to mingw-w64-qt-installer-framework-git/0006-Don-t-remove-files-that-live-outside-of-path.patch
diff --git a/mingw-w64-qt-installer-framework/0007-Don-t-prevent-qmake-linking-qmltooling-plugin.patch b/mingw-w64-qt-installer-framework-git/0007-Don-t-prevent-qmake-linking-qmltooling-plugin.patch
similarity index 100%
rename from mingw-w64-qt-installer-framework/0007-Don-t-prevent-qmake-linking-qmltooling-plugin.patch
rename to mingw-w64-qt-installer-framework-git/0007-Don-t-prevent-qmake-linking-qmltooling-plugin.patch
diff --git a/mingw-w64-qt-installer-framework/0008-Use-QTPLUGIN-qminimal-on-Windows-too.patch b/mingw-w64-qt-installer-framework-git/0008-Use-QTPLUGIN-qminimal-on-Windows-too.patch
similarity index 100%
rename from mingw-w64-qt-installer-framework/0008-Use-QTPLUGIN-qminimal-on-Windows-too.patch
rename to mingw-w64-qt-installer-framework-git/0008-Use-QTPLUGIN-qminimal-on-Windows-too.patch
diff --git a/mingw-w64-qt-installer-framework/0009-Add-explicit-platform-commandline-option.patch b/mingw-w64-qt-installer-framework-git/0009-Add-explicit-platform-commandline-option.patch
similarity index 100%
rename from mingw-w64-qt-installer-framework/0009-Add-explicit-platform-commandline-option.patch
rename to mingw-w64-qt-installer-framework-git/0009-Add-explicit-platform-commandline-option.patch
diff --git a/mingw-w64-qt-installer-framework/PKGBUILD b/mingw-w64-qt-installer-framework-git/PKGBUILD
similarity index 99%
rename from mingw-w64-qt-installer-framework/PKGBUILD
rename to mingw-w64-qt-installer-framework-git/PKGBUILD
index 636b62c296..693b7316d2 100644
--- a/mingw-w64-qt-installer-framework/PKGBUILD
+++ b/mingw-w64-qt-installer-framework-git/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Ray Donnelly <mingw.android@gmail.com>
 
 _realname=installer-framework
-pkgbase=mingw-w64-${_realname}-git
+pkgbase=mingw-w64-qt-${_realname}-git
 pkgname="${MINGW_PACKAGE_PREFIX}-qt-${_realname}-git"
 pkgdesc="The Qt Installer Framework used for the Qt SDK installer (mingw-w64)"
 pkgver=r2902.f63d2de
diff --git a/mingw-w64-qwt-qt5/PKGBUILD b/mingw-w64-qwt-qt5/PKGBUILD
index f9bb839228..aac174b7da 100644
--- a/mingw-w64-qwt-qt5/PKGBUILD
+++ b/mingw-w64-qwt-qt5/PKGBUILD
@@ -3,7 +3,7 @@
 # Based on work by AlexWMF <alexxwmf@gmail.com>
 
 _realname=qwt
-pkgbase=mingw-w64-${_realname}
+pkgbase=mingw-w64-${_realname}-qt5
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}-qt5"
 pkgver=6.1.2
 pkgrel=2
diff --git a/mingw-w64-librdf/PKGBUILD b/mingw-w64-redland/PKGBUILD
similarity index 100%
rename from mingw-w64-librdf/PKGBUILD
rename to mingw-w64-redland/PKGBUILD
diff --git a/mingw-w64-remake-git/PKGBUILD b/mingw-w64-remake-git/PKGBUILD
index b6f05aa36e..07e72a5dc8 100644
--- a/mingw-w64-remake-git/PKGBUILD
+++ b/mingw-w64-remake-git/PKGBUILD
@@ -2,7 +2,7 @@
 
 _realname=remake
 _autotools=yes
-pkgbase=mingw-w64-${_realname}
+pkgbase=mingw-w64-${_realname}-git
 pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}")
 _ver_base=4.1
 pkgver=4.1.2943.f059924
diff --git a/mingw-w64-scite-git/.gitignore b/mingw-w64-scite-hg/.gitignore
similarity index 100%
rename from mingw-w64-scite-git/.gitignore
rename to mingw-w64-scite-hg/.gitignore
diff --git a/mingw-w64-scite-git/0001-Use-POSIX-tools-in-makefiles.patch b/mingw-w64-scite-hg/0001-Use-POSIX-tools-in-makefiles.patch
similarity index 100%
rename from mingw-w64-scite-git/0001-Use-POSIX-tools-in-makefiles.patch
rename to mingw-w64-scite-hg/0001-Use-POSIX-tools-in-makefiles.patch
diff --git a/mingw-w64-scite-git/0002-Prefix-library-names.patch b/mingw-w64-scite-hg/0002-Prefix-library-names.patch
similarity index 100%
rename from mingw-w64-scite-git/0002-Prefix-library-names.patch
rename to mingw-w64-scite-hg/0002-Prefix-library-names.patch
diff --git a/mingw-w64-scite-git/0003-Use-FHS.patch b/mingw-w64-scite-hg/0003-Use-FHS.patch
similarity index 100%
rename from mingw-w64-scite-git/0003-Use-FHS.patch
rename to mingw-w64-scite-hg/0003-Use-FHS.patch
diff --git a/mingw-w64-scite-git/PKGBUILD b/mingw-w64-scite-hg/PKGBUILD
similarity index 100%
rename from mingw-w64-scite-git/PKGBUILD
rename to mingw-w64-scite-hg/PKGBUILD
diff --git a/mingw-w64-sgml-common/PKGBUILD b/mingw-w64-sgml-common/PKGBUILD
index 23a1f7cef8..afb29d92c5 100644
--- a/mingw-w64-sgml-common/PKGBUILD
+++ b/mingw-w64-sgml-common/PKGBUILD
@@ -2,6 +2,7 @@
 # Maintainer: J. Peter Mugaas <jpmugaas@suddenlink.net>
 #stolen from Archlinux with some modifications for our layout
 _realname=sgml-common
+pkgbase=mingw-w64-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}")
 pkgver=0.6.3
 pkgrel=1
diff --git a/mingw-w64-solid-qt5/PKGBUILD b/mingw-w64-solid-qt5/PKGBUILD
index 103ee6c6c0..c4882eddec 100644
--- a/mingw-w64-solid-qt5/PKGBUILD
+++ b/mingw-w64-solid-qt5/PKGBUILD
@@ -4,6 +4,7 @@ _variant=-static
 #_variant=-shared
 source "$(dirname ${BASH_SOURCE[0]})"/../mingw-w64-PKGBUILD-common/kde-frameworks5
 _kde_f5_init_package "${_variant}" "solid"
+pkgbase=mingw-w64-solid-qt5
 pkgver=5.12.0
 pkgrel=1
 arch=('any')
diff --git a/mingw-w64-thrift/0001-thrift-build-option-defines.patch b/mingw-w64-thrift-git/0001-thrift-build-option-defines.patch
similarity index 100%
rename from mingw-w64-thrift/0001-thrift-build-option-defines.patch
rename to mingw-w64-thrift-git/0001-thrift-build-option-defines.patch
diff --git a/mingw-w64-thrift/PKGBUILD b/mingw-w64-thrift-git/PKGBUILD
similarity index 100%
rename from mingw-w64-thrift/PKGBUILD
rename to mingw-w64-thrift-git/PKGBUILD
diff --git a/mingw-w64-tkimg/PKGBUILD b/mingw-w64-tkimg/PKGBUILD
index efb32fd308..ace60fb2dd 100644
--- a/mingw-w64-tkimg/PKGBUILD
+++ b/mingw-w64-tkimg/PKGBUILD
@@ -2,7 +2,7 @@
 # Don't building with installed jbigkit package as we build tiff without jbigkit support
 
 _pkgname=tkimg
-pkgbase=mingw-w64-${_realname}
+pkgbase=mingw-w64-${_pkgname}
 pkgname=${MINGW_PACKAGE_PREFIX}-$_pkgname
 _pkgver=1.4
 pkgver=${_pkgver}.2
diff --git a/mingw-w64-unibilium/PKGBUILD b/mingw-w64-unibilium/PKGBUILD
index e71f850de8..9263cbf86d 100644
--- a/mingw-w64-unibilium/PKGBUILD
+++ b/mingw-w64-unibilium/PKGBUILD
@@ -1,4 +1,5 @@
 _realname=unibilium
+pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 pkgver=1.2.0
 pkgrel=1
diff --git a/mingw-w64-usbview-git/PKGBUILD b/mingw-w64-usbview-git/PKGBUILD
index e60f1cc0ae..e10598a31a 100644
--- a/mingw-w64-usbview-git/PKGBUILD
+++ b/mingw-w64-usbview-git/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: David Grayson <davidegrayson@gmail.com>
 
 _realname=usbview
-pkgbase=mingw-w64-${_realname}
+pkgbase=mingw-w64-${_realname}-git
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}-git"
 provides=("${MINGW_PACKAGE_PREFIX}-${_realname}")
 conflicts=("${MINGW_PACKAGE_PREFIX}-${_realname}")
diff --git a/mingw-w64-webkitgtk3/0020-W32-Fixup-dummy-HeapStatistics-implementation.all.patch b/mingw-w64-webkitgtk/0020-W32-Fixup-dummy-HeapStatistics-implementation.all.patch
similarity index 100%
rename from mingw-w64-webkitgtk3/0020-W32-Fixup-dummy-HeapStatistics-implementation.all.patch
rename to mingw-w64-webkitgtk/0020-W32-Fixup-dummy-HeapStatistics-implementation.all.patch
diff --git a/mingw-w64-webkitgtk3/0021-W32-Change-printf-format-atribute-to-gnu_printf-.all.patch b/mingw-w64-webkitgtk/0021-W32-Change-printf-format-atribute-to-gnu_printf-.all.patch
similarity index 100%
rename from mingw-w64-webkitgtk3/0021-W32-Change-printf-format-atribute-to-gnu_printf-.all.patch
rename to mingw-w64-webkitgtk/0021-W32-Change-printf-format-atribute-to-gnu_printf-.all.patch
diff --git a/mingw-w64-webkitgtk3/0022-gl-casts.patch b/mingw-w64-webkitgtk/0022-gl-casts.patch
similarity index 100%
rename from mingw-w64-webkitgtk3/0022-gl-casts.patch
rename to mingw-w64-webkitgtk/0022-gl-casts.patch
diff --git a/mingw-w64-webkitgtk3/0101-webkitgtk-2.4.3-gcc-asm.all.patch b/mingw-w64-webkitgtk/0101-webkitgtk-2.4.3-gcc-asm.all.patch
similarity index 100%
rename from mingw-w64-webkitgtk3/0101-webkitgtk-2.4.3-gcc-asm.all.patch
rename to mingw-w64-webkitgtk/0101-webkitgtk-2.4.3-gcc-asm.all.patch
diff --git a/mingw-w64-webkitgtk3/PKGBUILD b/mingw-w64-webkitgtk/PKGBUILD
similarity index 100%
rename from mingw-w64-webkitgtk3/PKGBUILD
rename to mingw-w64-webkitgtk/PKGBUILD
diff --git a/mingw-w64-webkitgtk3/webkitgtk-2.4.9-abs.patch b/mingw-w64-webkitgtk/webkitgtk-2.4.9-abs.patch
similarity index 100%
rename from mingw-w64-webkitgtk3/webkitgtk-2.4.9-abs.patch
rename to mingw-w64-webkitgtk/webkitgtk-2.4.9-abs.patch
diff --git a/mingw-w64-webkitgtk2/PKGBUILD b/mingw-w64-webkitgtk2/PKGBUILD
index f0d4a4b536..b7a5a2fc07 100644
--- a/mingw-w64-webkitgtk2/PKGBUILD
+++ b/mingw-w64-webkitgtk2/PKGBUILD
@@ -2,7 +2,7 @@
 
 _realname=webkitgtk
 
-pkgbase=mingw-w64-${_realname}
+pkgbase=mingw-w64-${_realname}2
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}2"
 pkgver=1.10.2
 pkgrel=1
diff --git a/mingw-w64-wined3d/PKGBUILD b/mingw-w64-wined3d/PKGBUILD
index e2e9f50997..7bb145f75a 100644
--- a/mingw-w64-wined3d/PKGBUILD
+++ b/mingw-w64-wined3d/PKGBUILD
@@ -3,7 +3,7 @@
 
 _realname=wine
 
-pkgbase=mingw-w64-${_realname}
+pkgbase=mingw-w64-wined3d
 pkgname="${MINGW_PACKAGE_PREFIX}-wined3d"
 pkgver=1.9.2
 pkgrel=1
diff --git a/mingw-w64-wxwidgets/PKGBUILD b/mingw-w64-wxWidgets/PKGBUILD
similarity index 100%
rename from mingw-w64-wxwidgets/PKGBUILD
rename to mingw-w64-wxWidgets/PKGBUILD
diff --git a/mingw-w64-wxwidgets/wxWidgets-3.0.0-gcc-codelight.patch b/mingw-w64-wxWidgets/wxWidgets-3.0.0-gcc-codelight.patch
similarity index 100%
rename from mingw-w64-wxwidgets/wxWidgets-3.0.0-gcc-codelight.patch
rename to mingw-w64-wxWidgets/wxWidgets-3.0.0-gcc-codelight.patch
diff --git a/mingw-w64-wxwidgets/wxWidgets-3.0.2-gcc6-abs.patch b/mingw-w64-wxWidgets/wxWidgets-3.0.2-gcc6-abs.patch
similarity index 100%
rename from mingw-w64-wxwidgets/wxWidgets-3.0.2-gcc6-abs.patch
rename to mingw-w64-wxWidgets/wxWidgets-3.0.2-gcc6-abs.patch
diff --git a/mingw-w64-wxwidgets/wxWidgets-3.0.2-msw-dc-orientation-fix.patch b/mingw-w64-wxWidgets/wxWidgets-3.0.2-msw-dc-orientation-fix.patch
similarity index 100%
rename from mingw-w64-wxwidgets/wxWidgets-3.0.2-msw-dc-orientation-fix.patch
rename to mingw-w64-wxWidgets/wxWidgets-3.0.2-msw-dc-orientation-fix.patch
diff --git a/mingw-w64-wxwidgets/wxWidgets-3.0.2-relax-abi-compatibility-gcc.patch b/mingw-w64-wxWidgets/wxWidgets-3.0.2-relax-abi-compatibility-gcc.patch
similarity index 100%
rename from mingw-w64-wxwidgets/wxWidgets-3.0.2-relax-abi-compatibility-gcc.patch
rename to mingw-w64-wxWidgets/wxWidgets-3.0.2-relax-abi-compatibility-gcc.patch
diff --git a/mingw-w64-wxwidgets/wxWidgets-3.0.2-relocate-prefix-in-bin-wx-config.patch b/mingw-w64-wxWidgets/wxWidgets-3.0.2-relocate-prefix-in-bin-wx-config.patch
similarity index 100%
rename from mingw-w64-wxwidgets/wxWidgets-3.0.2-relocate-prefix-in-bin-wx-config.patch
rename to mingw-w64-wxWidgets/wxWidgets-3.0.2-relocate-prefix-in-bin-wx-config.patch
diff --git a/mingw-w64-wxwidgets/wxWidgets-3.0.2-windows-version.patch b/mingw-w64-wxWidgets/wxWidgets-3.0.2-windows-version.patch
similarity index 100%
rename from mingw-w64-wxwidgets/wxWidgets-3.0.2-windows-version.patch
rename to mingw-w64-wxWidgets/wxWidgets-3.0.2-windows-version.patch
diff --git a/mingw-w64-xmlstarlet/PKGBUILD b/mingw-w64-xmlstarlet-git/PKGBUILD
similarity index 100%
rename from mingw-w64-xmlstarlet/PKGBUILD
rename to mingw-w64-xmlstarlet-git/PKGBUILD