diff --git a/srcpkgs/mccabe/template b/srcpkgs/mccabe/template
index ca855c0e102..a2ee42dbb1b 100644
--- a/srcpkgs/mccabe/template
+++ b/srcpkgs/mccabe/template
@@ -1,40 +1,11 @@
 # Template file for 'mccabe'
 pkgname=mccabe
 version=0.5.2
-revision=2
+revision=3
 noarch=yes
-build_style=python-module
-pycompile_module="mccabe.py"
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python"
-short_desc="McCabe complexity checker for Python2"
+build_style=meta
+short_desc="McCabe complexity checker for Python2 (transitional dummy package)"
+depends="python-mccabe>=${version}_${revision}"
 maintainer="Alessio Sergi <al3hex@gmail.com>"
 homepage="https://github.com/PyCQA/mccabe"
 license="MIT"
-distfiles="${PYPI_SITE}/m/mccabe/mccabe-${version}.tar.gz"
-checksum=3473f06c8b757bbb5cdf295099bf64032e5f7d6fe0ec2f97ee9b23cb0a435aff
-
-pre_build() {
-	sed -i '/setup_requires=/d' setup.py
-}
-post_install() {
-	vlicense LICENSE
-}
-
-python3-mccabe_package() {
-	noarch=yes
-	pycompile_module="mccabe.py"
-	replaces="python3.4-mccabe>=0"
-	depends="python3"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove usr/lib/python3*
-		vlicense LICENSE
-	}
-}
-python3.4-mccabe_package() {
-	noarch=yes
-	build_style=meta
-	short_desc="${short_desc/Python2/Python3.4} (transitional dummy package)"
-	depends="python3-mccabe>=${version}_${revision}"
-}
diff --git a/srcpkgs/pycodestyle/template b/srcpkgs/pycodestyle/template
index 848a7f4ce41..1d1503afc82 100644
--- a/srcpkgs/pycodestyle/template
+++ b/srcpkgs/pycodestyle/template
@@ -1,45 +1,11 @@
 # Template file for 'pycodestyle'
 pkgname=pycodestyle
 version=2.0.0
-revision=3
+revision=4
 noarch=yes
-build_style=python-module
-pycompile_module="pycodestyle.py"
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python-setuptools"
-short_desc="Python2 style guide checker (formerly called pep8)"
+build_style=meta
+short_desc="Python2 style guide checker (transitional dummy package)"
+depends="python-pycodestyle>=${version}_${revision}"
 maintainer="Alessio Sergi <al3hex@gmail.com>"
 homepage="https://github.com/PyCQA/pycodestyle"
 license="MIT"
-distfiles="${PYPI_SITE}/p/pycodestyle/pycodestyle-${version}.tar.gz"
-checksum=37f0420b14630b0eaaf452978f3a6ea4816d787c3e6dcbba6fb255030adae2e7
-alternatives="pycodestyle:pycodestyle:/usr/bin/pycodestyle2"
-
-post_install() {
-	# fix permissions
-	find ${DESTDIR}/usr/lib/python*/site-packages -type f -perm 0640 \
-		-exec chmod 0644 "{}" \;
-
-	sed -n '/Copyright/,/SOFTWARE\./p' pycodestyle.py >LICENSE
-	vlicense LICENSE
-}
-
-python3-pycodestyle_package() {
-	noarch=yes
-	pycompile_module="pycodestyle.py"
-	replaces="python3.4-pycodestyle>=0"
-	depends="python3-setuptools"
-	short_desc="${short_desc/Python2/Python3}"
-	alternatives="pycodestyle:pycodestyle:/usr/bin/pycodestyle3"
-	pkg_install() {
-		vmove usr/bin/*3
-		vmove usr/lib/python3*
-		vlicense LICENSE
-	}
-}
-python3.4-pycodestyle_package() {
-	noarch=yes
-	build_style=meta
-	short_desc="${short_desc/Python2/Python3.4} (transitional dummy package)"
-	depends="python3-pycodestyle>=${version}_${revision}"
-}
diff --git a/srcpkgs/pyflakes/template b/srcpkgs/pyflakes/template
index fc7274898f9..02068a5ba8e 100644
--- a/srcpkgs/pyflakes/template
+++ b/srcpkgs/pyflakes/template
@@ -1,40 +1,11 @@
 # Template file for 'pyflakes'
 pkgname=pyflakes
 version=1.3.0
-revision=2
+revision=3
 noarch=yes
-build_style=python-module
-pycompile_module="pyflakes"
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python-setuptools"
-short_desc="Passive checker of Python programs (Python2)"
+build_style=meta
+short_desc="Passive checker of Python programs (transitional dummy package)"
+depends="python-pyflakes>=${version}_${revision}"
 maintainer="Alessio Sergi <al3hex@gmail.com>"
 homepage="https://github.com/PyCQA/pyflakes"
 license="MIT"
-distfiles="${PYPI_SITE}/p/pyflakes/pyflakes-${version}.tar.gz"
-checksum=a4f93317c97a9d9ed71d6ecfe08b68e3de9fea3f4d94dcd1d9d83ccbf929bc31
-alternatives="pyflakes:pyflakes:/usr/bin/pyflakes2"
-
-post_install() {
-	vlicense LICENSE
-}
-
-python3-pyflakes_package() {
-	noarch=yes
-	pycompile_module="pyflakes"
-	replaces="python3.4-pyflakes>=0"
-	depends="python3-setuptools"
-	short_desc="${short_desc/Python2/Python3}"
-	alternatives="pyflakes:pyflakes:/usr/bin/pyflakes3"
-	pkg_install() {
-		vmove usr/bin/*3
-		vmove usr/lib/python3*
-		vlicense LICENSE
-	}
-}
-python3.4-pyflakes_package() {
-	noarch=yes
-	build_style=meta
-	short_desc="${short_desc/Python2/Python3.4} (transitional dummy package)"
-	depends="python3-pyflakes>=${version}_${revision}"
-}
diff --git a/srcpkgs/python-mccabe/template b/srcpkgs/python-mccabe/template
new file mode 100644
index 00000000000..3f2cf6ff807
--- /dev/null
+++ b/srcpkgs/python-mccabe/template
@@ -0,0 +1,42 @@
+# Template file for 'python-mccabe'
+pkgname=python-mccabe
+version=0.5.2
+revision=4
+noarch=yes
+replaces="mccabe>=0"
+wrksrc="mccabe-${version}"
+build_style=python-module
+pycompile_module="mccabe.py"
+hostmakedepends="python-setuptools python3-setuptools"
+depends="python"
+short_desc="McCabe complexity checker for Python2"
+maintainer="Alessio Sergi <al3hex@gmail.com>"
+homepage="https://github.com/PyCQA/mccabe"
+license="MIT"
+distfiles="${PYPI_SITE}/m/mccabe/mccabe-${version}.tar.gz"
+checksum=3473f06c8b757bbb5cdf295099bf64032e5f7d6fe0ec2f97ee9b23cb0a435aff
+
+pre_build() {
+	sed -i '/setup_requires=/d' setup.py
+}
+post_install() {
+	vlicense LICENSE
+}
+
+python3-mccabe_package() {
+	noarch=yes
+	pycompile_module="mccabe.py"
+	replaces="python3.4-mccabe>=0"
+	depends="python3"
+	short_desc="${short_desc/Python2/Python3}"
+	pkg_install() {
+		vmove usr/lib/python3*
+		vlicense LICENSE
+	}
+}
+python3.4-mccabe_package() {
+	noarch=yes
+	build_style=meta
+	short_desc="${short_desc/Python2/Python3.4} (transitional dummy package)"
+	depends="python3-mccabe>=${version}_${revision}"
+}
diff --git a/srcpkgs/python-pycodestyle/template b/srcpkgs/python-pycodestyle/template
new file mode 100644
index 00000000000..69e14e15768
--- /dev/null
+++ b/srcpkgs/python-pycodestyle/template
@@ -0,0 +1,47 @@
+# Template file for 'python-pycodestyle'
+pkgname=python-pycodestyle
+version=2.0.0
+revision=5
+noarch=yes
+replaces="pycodestyle>=0"
+wrksrc="pycodestyle-${version}"
+build_style=python-module
+pycompile_module="pycodestyle.py"
+hostmakedepends="python-setuptools python3-setuptools"
+depends="python-setuptools"
+short_desc="Python2 style guide checker (formerly called pep8)"
+maintainer="Alessio Sergi <al3hex@gmail.com>"
+homepage="https://github.com/PyCQA/pycodestyle"
+license="MIT"
+distfiles="${PYPI_SITE}/p/pycodestyle/pycodestyle-${version}.tar.gz"
+checksum=37f0420b14630b0eaaf452978f3a6ea4816d787c3e6dcbba6fb255030adae2e7
+alternatives="pycodestyle:pycodestyle:/usr/bin/pycodestyle2"
+
+post_install() {
+	# fix permissions
+	find ${DESTDIR}/usr/lib/python*/site-packages -type f -perm 0640 \
+		-exec chmod 0644 "{}" \;
+
+	sed -n '/Copyright/,/SOFTWARE\./p' pycodestyle.py >LICENSE
+	vlicense LICENSE
+}
+
+python3-pycodestyle_package() {
+	noarch=yes
+	pycompile_module="pycodestyle.py"
+	replaces="python3.4-pycodestyle>=0"
+	depends="python3-setuptools"
+	short_desc="${short_desc/Python2/Python3}"
+	alternatives="pycodestyle:pycodestyle:/usr/bin/pycodestyle3"
+	pkg_install() {
+		vmove usr/bin/*3
+		vmove usr/lib/python3*
+		vlicense LICENSE
+	}
+}
+python3.4-pycodestyle_package() {
+	noarch=yes
+	build_style=meta
+	short_desc="${short_desc/Python2/Python3.4} (transitional dummy package)"
+	depends="python3-pycodestyle>=${version}_${revision}"
+}
diff --git a/srcpkgs/pycodestyle/update b/srcpkgs/python-pycodestyle/update
similarity index 100%
rename from srcpkgs/pycodestyle/update
rename to srcpkgs/python-pycodestyle/update
diff --git a/srcpkgs/python-pyflakes/template b/srcpkgs/python-pyflakes/template
new file mode 100644
index 00000000000..7d1611c1aef
--- /dev/null
+++ b/srcpkgs/python-pyflakes/template
@@ -0,0 +1,42 @@
+# Template file for 'python-pyflakes'
+pkgname=python-pyflakes
+version=1.3.0
+revision=4
+noarch=yes
+replaces="pyflakes>=0"
+wrksrc="pyflakes-${version}"
+build_style=python-module
+pycompile_module="pyflakes"
+hostmakedepends="python-setuptools python3-setuptools"
+depends="python-setuptools"
+short_desc="Passive checker of Python programs (Python2)"
+maintainer="Alessio Sergi <al3hex@gmail.com>"
+homepage="https://github.com/PyCQA/pyflakes"
+license="MIT"
+distfiles="${PYPI_SITE}/p/pyflakes/pyflakes-${version}.tar.gz"
+checksum=a4f93317c97a9d9ed71d6ecfe08b68e3de9fea3f4d94dcd1d9d83ccbf929bc31
+alternatives="pyflakes:pyflakes:/usr/bin/pyflakes2"
+
+post_install() {
+	vlicense LICENSE
+}
+
+python3-pyflakes_package() {
+	noarch=yes
+	pycompile_module="pyflakes"
+	replaces="python3.4-pyflakes>=0"
+	depends="python3-setuptools"
+	short_desc="${short_desc/Python2/Python3}"
+	alternatives="pyflakes:pyflakes:/usr/bin/pyflakes3"
+	pkg_install() {
+		vmove usr/bin/*3
+		vmove usr/lib/python3*
+		vlicense LICENSE
+	}
+}
+python3.4-pyflakes_package() {
+	noarch=yes
+	build_style=meta
+	short_desc="${short_desc/Python2/Python3.4} (transitional dummy package)"
+	depends="python3-pyflakes>=${version}_${revision}"
+}
diff --git a/srcpkgs/python3-mccabe b/srcpkgs/python3-mccabe
index 97a28606a83..78bc1fd5f05 120000
--- a/srcpkgs/python3-mccabe
+++ b/srcpkgs/python3-mccabe
@@ -1 +1 @@
-mccabe
\ No newline at end of file
+python-mccabe
\ No newline at end of file
diff --git a/srcpkgs/python3-pycodestyle b/srcpkgs/python3-pycodestyle
index a8e7b5b4a2c..f253ce6d35f 120000
--- a/srcpkgs/python3-pycodestyle
+++ b/srcpkgs/python3-pycodestyle
@@ -1 +1 @@
-pycodestyle
\ No newline at end of file
+python-pycodestyle
\ No newline at end of file
diff --git a/srcpkgs/python3-pyflakes b/srcpkgs/python3-pyflakes
index 9a309e4c683..5b70bae7b6a 120000
--- a/srcpkgs/python3-pyflakes
+++ b/srcpkgs/python3-pyflakes
@@ -1 +1 @@
-pyflakes
\ No newline at end of file
+python-pyflakes
\ No newline at end of file
diff --git a/srcpkgs/python3.4-mccabe b/srcpkgs/python3.4-mccabe
index 97a28606a83..78bc1fd5f05 120000
--- a/srcpkgs/python3.4-mccabe
+++ b/srcpkgs/python3.4-mccabe
@@ -1 +1 @@
-mccabe
\ No newline at end of file
+python-mccabe
\ No newline at end of file
diff --git a/srcpkgs/python3.4-pycodestyle b/srcpkgs/python3.4-pycodestyle
index a8e7b5b4a2c..f253ce6d35f 120000
--- a/srcpkgs/python3.4-pycodestyle
+++ b/srcpkgs/python3.4-pycodestyle
@@ -1 +1 @@
-pycodestyle
\ No newline at end of file
+python-pycodestyle
\ No newline at end of file
diff --git a/srcpkgs/python3.4-pyflakes b/srcpkgs/python3.4-pyflakes
index 9a309e4c683..5b70bae7b6a 120000
--- a/srcpkgs/python3.4-pyflakes
+++ b/srcpkgs/python3.4-pyflakes
@@ -1 +1 @@
-pyflakes
\ No newline at end of file
+python-pyflakes
\ No newline at end of file