2 files changed, 6 insertions, 4 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 1299fbb1d64a..8c9e864a6b05 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,4 +1,4 @@
-pkgbase = neo4j-enterprise
+pkgbase = neo4j2-enterprise
 	pkgdesc = A fully transactional graph database implemented in Java
 	pkgver = 2.3.3
 	pkgrel = 1
@@ -10,7 +10,9 @@ pkgbase = neo4j-enterprise
 	depends = bash
 	depends = lsof
 	depends = java-runtime-headless
+	conflicts = neo4j2-community
 	conflicts = neo4j-community
+	conflicts = neo4j-enterprise
 	options = !strip
 	backup = etc/neo4j/neo4j-http-logging.xml
 	backup = etc/neo4j/neo4j-server.properties
@@ -31,5 +33,5 @@ pkgbase = neo4j-enterprise
 	sha256sums = eb4869d80e51f43f3846c84544202cdb20f668d46df130123efed46d090b40bb
 	sha256sums = e9ecbf86072ca92129ab1889b5f91e2494b86e84248bd15a37681a3997892d7d
 
-pkgname = neo4j-enterprise
+pkgname = neo4j2-enterprise
 
diff --git a/PKGBUILD b/PKGBUILD
index b80439aaaa36..a0b13070b441 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,5 +1,5 @@
 # Maintainer: Marcel Campello Ferreira <marcel.campello.ferreira@gmail.com>
-pkgname=neo4j-enterprise
+pkgname=neo4j2-enterprise
 pkgver=2.3.3
 pkgrel=1
 pkgdesc="A fully transactional graph database implemented in Java"
@@ -8,7 +8,7 @@ url="http://neo4j.org/"
 license=(GPL)
 makedepends=(patch)
 depends=(bash lsof java-runtime-headless)
-conflicts=(neo4j-community)
+conflicts=(neo4j2-community neo4j-community neo4j-enterprise)
 backup=(etc/neo4j/neo4j-http-logging.xml
         etc/neo4j/neo4j-server.properties
         etc/neo4j/neo4j-wrapper.conf