diff --git a/dev-libs/libcpath/libcpath-20170108_alpha.ebuild b/dev-libs/libcpath/libcpath-20170108.ebuild
similarity index 73%
rename from dev-libs/libcpath/libcpath-20170108_alpha.ebuild
rename to dev-libs/libcpath/libcpath-20170108.ebuild
index 20e5ccd7c..94478d70a 100644
--- a/dev-libs/libcpath/libcpath-20170108_alpha.ebuild
+++ b/dev-libs/libcpath/libcpath-20170108.ebuild
@@ -3,14 +3,14 @@
 
 EAPI=6
 
-inherit versionator autotools eutils
+inherit eutils
 
-MY_PV="$(get_major_version)"
-MY_PV2="$(get_after_major_version)"
+#MY_PV="$(get_major_version)"
+#MY_PV2="$(get_after_major_version)"
 
 DESCRIPTION="Library for cross-platform C path functions"
 HOMEPAGE="https://github.com/libyal/${PN}"
-SRC_URI="https://github.com/libyal/${PN}/releases/download/${MY_PV}/${PN}-${MY_PV2}-${MY_PV}.tar.gz"
+SRC_URI="https://github.com/libyal/${PN}/releases/download/${PV}/${PN}-alpha-${PV}.tar.gz"
 
 LICENSE="LGPL-3"
 SLOT="0"
@@ -24,8 +24,6 @@ DEPEND="dev-libs/libcerror
 
 RDEPEND="${DEPEND}"
 
-S="${WORKDIR}/${PN}-${MY_PV}"
-
 src_configure() {
 	econf $(use_enable nls) \
 		$(use_with nls libiconv-prefix) \
diff --git a/dev-libs/libcstring/libcstring-20150101_alpha.ebuild b/dev-libs/libcstring/libcstring-20150101.ebuild
similarity index 68%
rename from dev-libs/libcstring/libcstring-20150101_alpha.ebuild
rename to dev-libs/libcstring/libcstring-20150101.ebuild
index b808b42bb..fb7c55771 100644
--- a/dev-libs/libcstring/libcstring-20150101_alpha.ebuild
+++ b/dev-libs/libcstring/libcstring-20150101.ebuild
@@ -3,22 +3,15 @@
 
 EAPI=6
 
-inherit versionator autotools
-
-MY_PV="$(get_major_version)"
-MY_PV2="$(get_after_major_version)"
-
 DESCRIPTION="Library for cross-platform C string functions"
 HOMEPAGE="https://github.com/libyal/${PN}"
-SRC_URI="https://github.com/libyal/${PN}/releases/download/${MY_PV}/${PN}-${MY_PV2}-${MY_PV}.tar.gz"
+SRC_URI="https://github.com/libyal/${PN}/releases/download/${PV}/${PN}-alpha-${PV}.tar.gz"
 
 LICENSE="LGPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~hppa ~ppc ~x86"
 IUSE="nls unicode"
 
-S="${WORKDIR}/${PN}-${MY_PV}"
-
 DEPEND=""
 RDEPEND="${DEPEND}"
 
diff --git a/dev-libs/libcsystem/libcsystem-20150629_alpha.ebuild b/dev-libs/libcsystem/libcsystem-20150629.ebuild
similarity index 76%
rename from dev-libs/libcsystem/libcsystem-20150629_alpha.ebuild
rename to dev-libs/libcsystem/libcsystem-20150629.ebuild
index 1dc8e777d..c3fc009f0 100644
--- a/dev-libs/libcsystem/libcsystem-20150629_alpha.ebuild
+++ b/dev-libs/libcsystem/libcsystem-20150629.ebuild
@@ -3,14 +3,9 @@
 
 EAPI=6
 
-inherit versionator autotools
-
-MY_PV="$(get_major_version)"
-MY_PV2="$(get_after_major_version)"
-
 DESCRIPTION="Library for cross-platform C locale functions"
 HOMEPAGE="https://github.com/libyal/${PN}"
-SRC_URI="https://github.com/libyal/${PN}/releases/download/${MY_PV}/${PN}-${MY_PV2}-${MY_PV}.tar.gz"
+SRC_URI="https://github.com/libyal/${PN}/releases/download/${PV}/${PN}-alpha-${PV}.tar.gz"
 
 LICENSE="LGPL-3"
 SLOT="0"
@@ -25,8 +20,6 @@ DEPEND="dev-libs/libcerror
 "
 RDEPEND="${DEPEND}"
 
-S="${WORKDIR}/${PN}-${MY_PV}"
-
 src_configure() {
 	econf $(use_enable nls) \
 		$(use_with nls libiconv-prefix) \
diff --git a/dev-libs/libfcache/libfcache-20170111_alpha.ebuild b/dev-libs/libfcache/libfcache-20170111.ebuild
similarity index 70%
rename from dev-libs/libfcache/libfcache-20170111_alpha.ebuild
rename to dev-libs/libfcache/libfcache-20170111.ebuild
index ae2b89462..24fc4d3e2 100644
--- a/dev-libs/libfcache/libfcache-20170111_alpha.ebuild
+++ b/dev-libs/libfcache/libfcache-20170111.ebuild
@@ -3,14 +3,9 @@
 
 EAPI=6
 
-inherit versionator autotools
-
-MY_PV="$(get_major_version)"
-MY_PV2="$(get_after_major_version)"
-
 DESCRIPTION="Library for cross-platform C cache functions"
 HOMEPAGE="https://github.com/libyal/${PN}"
-SRC_URI="https://github.com/libyal/${PN}/releases/download/${MY_PV}/${PN}-${MY_PV2}-${MY_PV}.tar.gz"
+SRC_URI="https://github.com/libyal/${PN}/releases/download/${PV}/${PN}-alpha-${PV}.tar.gz"
 
 LICENSE="LGPL-3"
 SLOT="0"
@@ -22,8 +17,6 @@ DEPEND="dev-libs/libcdata
 	dev-libs/libcthreads"
 RDEPEND="${DEPEND}"
 
-S="${WORKDIR}/${PN}-${MY_PV}"
-
 src_configure() {
 	econf $(use_enable nls) \
 		$(use_with nls libiconv-prefix) \
diff --git a/dev-libs/libfdata/libfdata-20170112_alpha.ebuild b/dev-libs/libfdata/libfdata-20170112.ebuild
similarity index 75%
rename from dev-libs/libfdata/libfdata-20170112_alpha.ebuild
rename to dev-libs/libfdata/libfdata-20170112.ebuild
index fbfa5d4ae..09acbeec0 100644
--- a/dev-libs/libfdata/libfdata-20170112_alpha.ebuild
+++ b/dev-libs/libfdata/libfdata-20170112.ebuild
@@ -3,14 +3,9 @@
 
 EAPI=6
 
-inherit versionator autotools
-
-MY_PV="$(get_major_version)"
-MY_PV2="$(get_after_major_version)"
-
 DESCRIPTION="Library for cross-platform C file data functions"
 HOMEPAGE="https://github.com/libyal/${PN}"
-SRC_URI="https://github.com/libyal/${PN}/releases/download/${MY_PV}/${PN}-${MY_PV2}-${MY_PV}.tar.gz"
+SRC_URI="https://github.com/libyal/${PN}/releases/download/${PV}/${PN}-alpha-${PV}.tar.gz"
 
 LICENSE="LGPL-3"
 SLOT="0"
@@ -25,8 +20,6 @@ DEPEND="dev-libs/libcdata
 
 RDEPEND="${DEPEND}"
 
-S="${WORKDIR}/${PN}-${MY_PV}"
-
 src_configure() {
 	econf $(use_enable nls) \
 		$(use_with nls libiconv-prefix) \
diff --git a/dev-libs/libfwnt/libfwnt-20170115_alpha.ebuild b/dev-libs/libfwnt/libfwnt-20170115.ebuild
similarity index 83%
rename from dev-libs/libfwnt/libfwnt-20170115_alpha.ebuild
rename to dev-libs/libfwnt/libfwnt-20170115.ebuild
index 1e2ca5b4c..fa5d46077 100644
--- a/dev-libs/libfwnt/libfwnt-20170115_alpha.ebuild
+++ b/dev-libs/libfwnt/libfwnt-20170115.ebuild
@@ -5,14 +5,11 @@ EAPI=6
 
 PYTHON_COMPAT=( python{2_7,3_4,3_5} )
 
-inherit versionator python-r1
-
-MY_PV="$(get_major_version)"
-MY_PV2="$(get_after_major_version)"
+inherit python-r1
 
 DESCRIPTION="Library for Windows NT data types"
 HOMEPAGE="https://github.com/libyal/${PN}"
-SRC_URI="https://github.com/libyal/${PN}/releases/download/${MY_PV}/${PN}-${MY_PV2}-${MY_PV}.tar.gz"
+SRC_URI="https://github.com/libyal/${PN}/releases/download/${PV}/${PN}-alpha-${PV}.tar.gz"
 
 LICENSE="LGPL-3"
 SLOT="0"
@@ -27,8 +24,6 @@ RDEPEND="${DEPEND}"
 
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
-S="${WORKDIR}/${PN}-${MY_PV}"
-
 CMAKE_IN_SOURCE_BUILD=1
 
 src_configure() {
diff --git a/dev-libs/libsmdev/libsmdev-20170225_alpha.ebuild b/dev-libs/libsmdev/libsmdev-20170225.ebuild
similarity index 82%
rename from dev-libs/libsmdev/libsmdev-20170225_alpha.ebuild
rename to dev-libs/libsmdev/libsmdev-20170225.ebuild
index 7aea0415e..b31a6c24d 100644
--- a/dev-libs/libsmdev/libsmdev-20170225_alpha.ebuild
+++ b/dev-libs/libsmdev/libsmdev-20170225.ebuild
@@ -5,14 +5,11 @@ EAPI=6
 
 PYTHON_COMPAT=( python{2_7,3_4,3_5} )
 
-inherit versionator autotools python-r1
-
-MY_PV="$(get_major_version)"
-MY_PV2="$(get_after_major_version)"
+inherit python-r1
 
 DESCRIPTION="Library to access to storage media device"
 HOMEPAGE="https://github.com/libyal/${PN}"
-SRC_URI="https://github.com/libyal/${PN}/releases/download/${MY_PV}/${PN}-${MY_PV2}-${MY_PV}.tar.gz"
+SRC_URI="https://github.com/libyal/${PN}/releases/download/${PV}/${PN}-alpha-${PV}.tar.gz"
 
 LICENSE="LGPL-3"
 SLOT="0"
@@ -30,8 +27,6 @@ DEPEND="dev-libs/libcdata
 
 RDEPEND="${DEPEND}"
 
-S="${WORKDIR}/${PN}-${MY_PV}"
-
 src_configure() {
 #	econf $(use_enable nls) \
 	local myconf=(