diff --git a/aspell-de/PKGBUILD b/aspell-de/PKGBUILD
index df9fc2012cd..087836d62a0 100644
--- a/aspell-de/PKGBUILD
+++ b/aspell-de/PKGBUILD
@@ -3,7 +3,7 @@ _realname=aspell-${_lang}
 pkgname=${_realname}
 _pkgver=20161207-7-0
 pkgver=${_pkgver//-/.}
-pkgrel=1
+pkgrel=2
 _pkgname=aspell6-${_lang}-${_pkgver}
 pkgdesc='German dictionary for aspell'
 arch=('i686' 'x86_64')
@@ -28,5 +28,5 @@ package() {
   cd "${srcdir}/${_pkgname}"
   make install DESTDIR="${pkgdir}"
 
-  install -vDm444 -t "${pkgdir}/usr/share/licenses/${pkgname}" COPYRIGHT
+  install -vDm444 -T Copyright "${pkgdir}/usr/share/licenses/${pkgname}/COPYRIGHT"
 }
diff --git a/cjson/PKGBUILD b/cjson/PKGBUILD
index 08e70c44b09..1cccacc6182 100644
--- a/cjson/PKGBUILD
+++ b/cjson/PKGBUILD
@@ -1,6 +1,6 @@
 pkgname=cjson
 pkgver=1.7.19
-pkgrel=1
+pkgrel=2
 pkgdesc="Ultralightweight JSON parser in ANSI C"
 arch=(x86_64)
 url="https://github.com/DaveGamble/cJSON"
@@ -38,5 +38,5 @@ build() {
 
 package() {
   DESTDIR="${pkgdir}" make -C build install
-  install -Dm644 "$srcdir/$pkgname-$pkgver/LICENSE" "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+  install -Dm644 "$srcdir/cJSON-$pkgver/LICENSE" "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 }
diff --git a/colordiff/PKGBUILD b/colordiff/PKGBUILD
index 7935a688072..e0c50483f26 100644
--- a/colordiff/PKGBUILD
+++ b/colordiff/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgname=colordiff
 pkgver=1.0.22
-pkgrel=1
+pkgrel=2
 pkgdesc='Diff wrapper with pretty syntax highlighting'
 url='https://www.colordiff.org/'
 msys2_repository_url="https://github.com/daveewart/colordiff"
@@ -19,11 +19,11 @@ sha256sums=('221a9dae6916883f906c0f387695b8a48fda64566e20aa3d527ab4ca0abc8f62'
 prepare() {
   cd "${pkgname}-${pkgver}"
   patch -p1 -i "${srcdir}/002-build-fix.patch"
-  
+
   # xmlto txt conversion apparently does not work even with w3m
   # anyhow only man page is packaged
-  sed -i "s/xmlto -vv txt colordiff.xml//" makefile
-  sed -i "s/mv colordiff.txt README//" makefile
+  sed -i "s/xmlto -vv txt colordiff.xml//" Makefile
+  sed -i "s/mv colordiff.txt README//" Makefile
 }
 
 package() {
diff --git a/help2man/PKGBUILD b/help2man/PKGBUILD
index 0a3f3bf79b8..f007c32f6f2 100644
--- a/help2man/PKGBUILD
+++ b/help2man/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgname=help2man
 pkgver=1.49.3
-pkgrel=1
+pkgrel=2
 pkgdesc="Conversion tool to create man files"
 arch=('i686' 'x86_64')
 url="https://www.gnu.org/software/help2man/"
@@ -40,7 +40,7 @@ prepare() {
   cd ${srcdir}
   tar -xf ${pkgname}-${pkgver}.tar.xz || true
   cd "${srcdir}/${pkgname}-${pkgver}"
-  del_file_exists Changelog
+  del_file_exists ChangeLog
   ln -s debian/changelog ChangeLog
   apply_patch_with_msg_p2 1.40.4-cygwin-nls.patch
   autoreconf -ivf
diff --git a/libyaml/PKGBUILD b/libyaml/PKGBUILD
index 77902b48340..89ae5ed6538 100644
--- a/libyaml/PKGBUILD
+++ b/libyaml/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgname=('libyaml' 'libyaml-devel')
 pkgver=0.2.5
-pkgrel=2
+pkgrel=3
 pkgdesc="YAML 1.1 library"
 arch=('i686' 'x86_64')
 url="https://pyyaml.org/wiki/LibYAML"
@@ -33,7 +33,7 @@ build() {
 
   make
   make DESTDIR="$srcdir/dest" install
-  install -m644 -D LICENSE ${srcdir}/dest/usr/share/licenses/${pkgname}/LICENSE
+  install -m644 -D License ${srcdir}/dest/usr/share/licenses/${pkgname}/LICENSE
 }
 
 package_libyaml() {
diff --git a/perl-Convert-BinHex/PKGBUILD b/perl-Convert-BinHex/PKGBUILD
index ffaf87131b5..dfdcc0db6aa 100644
--- a/perl-Convert-BinHex/PKGBUILD
+++ b/perl-Convert-BinHex/PKGBUILD
@@ -3,7 +3,7 @@
 _realname=Convert-BinHex
 pkgname="perl-${_realname}"
 pkgver=1.125
-pkgrel=2
+pkgrel=3
 pkgdesc="Perl module to extract data from Macintosh BinHex files"
 arch=('any')
 url="https://metacpan.org/dist/Convert-BinHex"
diff --git a/perl-Convert-BinHex/perl-convert-binhex.install b/perl-Convert-BinHex/perl-Convert-BinHex.install
similarity index 100%
rename from perl-Convert-BinHex/perl-convert-binhex.install
rename to perl-Convert-BinHex/perl-Convert-BinHex.install
diff --git a/perl-Locale-Gettext/PKGBUILD b/perl-Locale-Gettext/PKGBUILD
index b84015146a2..da90282db15 100644
--- a/perl-Locale-Gettext/PKGBUILD
+++ b/perl-Locale-Gettext/PKGBUILD
@@ -3,7 +3,7 @@
 _realname=Locale-Gettext
 pkgname=perl-${_realname}
 pkgver=1.07
-pkgrel=13
+pkgrel=14
 groups=('perl-modules')
 pkgdesc="Permits access from Perl to the gettext() family of functions"
 arch=('i686' 'x86_64')
@@ -19,7 +19,7 @@ source=(${_realname}-${pkgver}.tar.gz::"https://cpan.metacpan.org/authors/id/P/P
 sha256sums=('909d47954697e7c04218f972915b787bd1244d75e3bd01620bc167d5bbc49c15')
 
 build() {
-  cd "${srcdir}/${_realname}-${pkgver}"
+  cd "${srcdir}/Locale-gettext-${pkgver}"
 
   # install module in vendor directories.
   perl Makefile.PL INSTALLDIRS=vendor
@@ -27,13 +27,13 @@ build() {
 }
 
 check() {
-  cd "${srcdir}/${_realname}-${pkgver}"
+  cd "${srcdir}/Locale-gettext-${pkgver}"
 
   make test
 }
 
 package() {
-  cd "${srcdir}/${_realname}-${pkgver}"
+  cd "${srcdir}/Locale-gettext-${pkgver}"
   make install DESTDIR="${pkgdir}"
 
   # fix permissons
diff --git a/perl-Test-Requiresinternet/PKGBUILD b/perl-Test-Requiresinternet/PKGBUILD
index 582f496c13e..09ab2fbb027 100644
--- a/perl-Test-Requiresinternet/PKGBUILD
+++ b/perl-Test-Requiresinternet/PKGBUILD
@@ -1,9 +1,8 @@
 # Maintainer: Peter Budai <peterbudai@hotmail.com>
-
-_realname=Test-Requiresinternet
-pkgname=perl-${_realname}
+_realname=Test-RequiresInternet
+pkgname=perl-Test-Requiresinternet
 pkgver=0.05
-pkgrel=2
+pkgrel=3
 pkgdesc="Easily test network connectivity"
 arch=('any')
 url="https://metacpan.org/release/Test-RequiresInternet"
diff --git a/python-mako/PKGBUILD b/python-mako/PKGBUILD
index b9c8beef5a9..4c68a16da96 100644
--- a/python-mako/PKGBUILD
+++ b/python-mako/PKGBUILD
@@ -4,7 +4,7 @@ _realname=mako
 pkgbase="python-${_realname}"
 pkgname=("python-${_realname}")
 pkgver=1.3.12
-pkgrel=1
+pkgrel=2
 pkgdesc="A super-fast templating language that borrows the best ideas from the existing templating languages"
 arch=('any')
 url="https://www.makotemplates.org/"
@@ -28,19 +28,19 @@ source=("https://pypi.python.org/packages/source/m/mako/mako-${pkgver}.tar.gz")
 sha256sums=('9f778e93289bd410bb35daadeb4fc66d95a746f0b75777b942088b7fd7af550a')
 
 build() {
-  cd "${srcdir}/Mako-${pkgver}"
+  cd "${srcdir}/mako-${pkgver}"
 
   python -m build --wheel --skip-dependency-check --no-isolation
 }
 
 check() {
-  cd "${srcdir}/Mako-${pkgver}"
+  cd "${srcdir}/mako-${pkgver}"
 
   python -m pytest
 }
 
 package() {
-  cd "${srcdir}/Mako-${pkgver}"
+  cd "${srcdir}/mako-${pkgver}"
 
   python -m installer --destdir="${pkgdir}" dist/*.whl
 
diff --git a/xxhash/PKGBUILD b/xxhash/PKGBUILD
index eb496addce0..5e15624f996 100644
--- a/xxhash/PKGBUILD
+++ b/xxhash/PKGBUILD
@@ -3,7 +3,7 @@
 pkgbase=xxhash
 pkgname=("xxhash" "libxxhash" "libxxhash-devel")
 pkgver=0.8.3
-pkgrel=1
+pkgrel=2
 pkgdesc="Extremely fast non-cryptographic hash algorithm"
 arch=('i686' 'x86_64')
 url="https://github.com/Cyan4973/xxHash"
@@ -18,7 +18,7 @@ source=("${pkgname}-${pkgver}.tar.gz::https://codeload.github.com/Cyan4973/xxHas
 sha256sums=('aae608dfe8213dfd05d909a57718ef82f30722c392344583d3f39050c7f29a80')
 
 prepare() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd "${srcdir}/xxHash-${pkgver}"
 }
 
 build() {
@@ -28,7 +28,7 @@ build() {
   cmake \
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DCMAKE_BUILD_TYPE=Release \
-    "../${pkgname}-${pkgver}/cmake_unofficial"
+    "../xxHash-${pkgver}/cmake_unofficial"
 
   make
   make DESTDIR="${srcdir}/dest" install
@@ -46,7 +46,7 @@ package_libxxhash() {
   cd "${srcdir}/dest"
   mkdir -p ${pkgdir}/usr/bin
   cp usr/bin/*.dll ${pkgdir}/usr/bin/
-  install -Dm644 ${srcdir}/${pkgbase}-${pkgver}/LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
+  install -Dm644 ${srcdir}/xxHash-${pkgver}/LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
 }
 
 package_libxxhash-devel() {