diff --git a/sci-biology/ants/ChangeLog b/sci-biology/ants/ChangeLog
index a6e2e47..7a89409 100644
--- a/sci-biology/ants/ChangeLog
+++ b/sci-biology/ants/ChangeLog
@@ -1,3 +1,9 @@
+*ants-2.3.1_p20191013 (14 Dec 2019)
+
+  14 Dec 2019;  <chymera@gentoo.org> +ants-2.3.1_p20191013.ebuild,
+  -ants-9999.ebuild, metadata.xml:
+  sci-biology/ants: prefix fix ahead of Gentoo Science
+
   25 Nov 2019;  <chymera@gentoo.org> -ants-2.3.1_p20191013.ebuild:
   sci-biology/ants: migrated version bump to Gentoo Scinece  https://gitweb.gent
   oo.org/proj/sci.git/commit/?id=402183f38c721910fe038ed4ce04e0a98a37c584
diff --git a/sci-biology/ants/ants-9999.ebuild b/sci-biology/ants/ants-2.3.1_p20191013.ebuild
similarity index 71%
rename from sci-biology/ants/ants-9999.ebuild
rename to sci-biology/ants/ants-2.3.1_p20191013.ebuild
index b759acb..060a38c 100644
--- a/sci-biology/ants/ants-9999.ebuild
+++ b/sci-biology/ants/ants-2.3.1_p20191013.ebuild
@@ -11,14 +11,15 @@ DESCRIPTION="Advanced Normalitazion Tools for neuroimaging"
 HOMEPAGE="http://stnava.github.io/ANTs/"
 SRC_URI="
 	test? (
-		http://chymera.eu/distfiles/ants_testdata-2.3.1_p20191013.tar.xz
+		http://chymera.eu/distfiles/ants_testdata-${PV}.tar.xz
 	)
 "
 EGIT_REPO_URI="https://github.com/stnava/ANTs.git"
+EGIT_COMMIT="f78b2d4a382d3090230641b5ade5da28962dad04"
 
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86"
 IUSE="test vtk"
 
 DEPEND="
@@ -31,27 +32,28 @@ DEPEND="
 RDEPEND="${DEPEND}"
 
 PATCHES=(
-	"${FILESDIR}/${PN}-2.3.1_p20191013-paths.patch"
+	"${FILESDIR}/${P}-logic.patch"
+	"${FILESDIR}/${P}-paths.patch"
 )
 
 src_unpack() {
 	git-r3_src_unpack
 	if use test; then
 		mkdir -p "${S}/.ExternalData/MD5" || die "Could not create test data directory."
-		tar xvf "${DISTDIR}/ants_testdata-2.3.1_p20191013.tar.xz" -C "${S}/.ExternalData/MD5/" > /dev/null || die "Could not unpack test data."
+		tar xvf "${DISTDIR}/ants_testdata-${PV}.tar.xz" -C "${S}/.ExternalData/MD5/" > /dev/null || die "Could not unpack test data."
 	fi
 }
 
 src_configure() {
 	local mycmakeargs=(
 		-DUSE_SYSTEM_ITK=ON
-		-DITK_DIR="/usr/include/ITK-5.0/"
+		-DITK_DIR="${EROOT}/usr/include/ITK-5.0/"
 		-DBUILD_TESTING="$(usex test ON OFF)"
 		-DUSE_VTK=$(usex vtk ON OFF)
 		-DUSE_SYSTEM_VTK=$(usex vtk ON OFF)
 	)
 	use vtk && mycmakeargs+=(
-		-DVTK_DIR="/usr/include/vtk-8.1/"
+		-DVTK_DIR="${EROOT}/usr/include/vtk-8.1/"
 	)
 	use test && mycmakeargs+=(
 		-DExternalData_OBJECT_STORES="${S}/.ExternalData/MD5"
@@ -65,6 +67,6 @@ src_install() {
 	cd "${WORKDIR}/${P}/Scripts" || die "scripts dir not found"
 	dobin *.sh
 	dodir /usr/$(get_libdir)/ants
-	install -t "${D}"/usr/$(get_libdir)/ants * || die
+	install -t "${D}"/"${EROOT%/}"/usr/$(get_libdir)/ants * || die
 	doenvd "${FILESDIR}"/99ants
 }
diff --git a/sci-biology/ants/metadata.xml b/sci-biology/ants/metadata.xml
index efbe326..87d2feb 100644
--- a/sci-biology/ants/metadata.xml
+++ b/sci-biology/ants/metadata.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>horea.christ@gmail.com</email>
+		<email>chr@chymera.eu</email>
 		<name>Horea Christian</name>
 	</maintainer>
 	<maintainer type="project">