diff --git a/dist/debian/build_deb.sh b/dist/debian/build_deb.sh
index 25016e1..8b6eda5 100755
--- a/dist/debian/build_deb.sh
+++ b/dist/debian/build_deb.sh
@@ -92,7 +92,7 @@ VERSION=$(./SCYLLA-VERSION-GEN)
 SCYLLA_VERSION=$(cat build/SCYLLA-VERSION-FILE | sed 's/\.rc/~rc/')
 SCYLLA_RELEASE=$(cat build/SCYLLA-RELEASE-FILE)
 echo $VERSION > version
-./scripts/git-archive-all --extra version --force-submodules --prefix scylla-jmx ../scylla-jmx_$SCYLLA_VERSION-$SCYLLA_RELEASE.orig.tar.gz 
+./scripts/git-archive-all --extra version --force-submodules --prefix scylla-enterprise-jmx ../scylla-enterprise-jmx_$SCYLLA_VERSION-$SCYLLA_RELEASE.orig.tar.gz
 
 cp -a dist/debian/debian debian
 cp dist/debian/changelog.in debian/changelog
diff --git a/dist/debian/changelog.in b/dist/debian/changelog.in
index ad2c675..a3c6d52 100644
--- a/dist/debian/changelog.in
+++ b/dist/debian/changelog.in
@@ -1,4 +1,4 @@
-scylla-jmx (@@VERSION@@-@@RELEASE@@-@@REVISION@@) @@CODENAME@@; urgency=medium
+scylla-enterprise-jmx (@@VERSION@@-@@RELEASE@@-@@REVISION@@) @@CODENAME@@; urgency=medium
 
   * Initial release.
 
diff --git a/dist/debian/debian/control b/dist/debian/debian/control
index 66ae08e..4edd490 100644
--- a/dist/debian/debian/control
+++ b/dist/debian/debian/control
@@ -1,4 +1,4 @@
-Source: scylla-jmx
+Source: scylla-enterprise-jmx
 Maintainer: Takuya ASADA <syuu@scylladb.com>
 Homepage: http://scylladb.com
 Section: database
@@ -6,9 +6,11 @@ Priority: optional
 Standards-Version: 3.9.5
 Build-Depends: debhelper (>= 9), maven, openjdk-8-jdk-headless
 
-Package: scylla-jmx
+Package: scylla-enterprise-jmx
 Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}, openjdk-8-jre-headless | openjdk-8-jre | oracle-java8-set-default, scylla-server
+Depends: ${shlibs:Depends}, ${misc:Depends}, openjdk-8-jre-headless | openjdk-8-jre | oracle-java8-set-default, scylla-enterprise-server
+Conflicts: scylla-jmx (<< 2.2)
+Replaces: scylla-jmx (<< 2.2)
 Description: Scylla JMX server binaries 
  Scylla is a highly scalable, eventually consistent, distributed,
  partitioned row DB.
diff --git a/dist/debian/rules.in b/dist/debian/rules.in
index 3f48638..6ba108c 100755
--- a/dist/debian/rules.in
+++ b/dist/debian/rules.in
@@ -1,7 +1,7 @@
 #!/usr/bin/make -f
 
-DOC = $(CURDIR)/debian/scylla-jmx/usr/share/doc/scylla-jmx
-DEST = $(CURDIR)/debian/scylla-jmx/usr/lib/scylla/jmx
+DOC = $(CURDIR)/debian/scylla-enterprise-jmx/usr/share/doc/scylla-jmx
+DEST = $(CURDIR)/debian/scylla-enterprise-jmx/usr/lib/scylla/jmx
 M2_REPO= $(CURDIR)/m2
 
 override_dh_auto_build:
@@ -11,9 +11,9 @@ override_dh_auto_clean:
 	rm -rf target m2
 
 override_dh_auto_install:
-	mkdir -p $(CURDIR)/debian/scylla-jmx/etc/default/ && \
+	mkdir -p $(CURDIR)/debian/scylla-enterprise-jmx/etc/default/ && \
 	cp $(CURDIR)/dist/common/sysconfig/scylla-jmx  \
-		$(CURDIR)/debian/scylla-jmx/etc/default/
+		$(CURDIR)/debian/scylla-enterprise-jmx/etc/default/
 
 	mkdir -p $(DOC) && \
 	cp $(CURDIR)/*.md $(DOC)
@@ -26,7 +26,7 @@ override_dh_auto_install:
 	ln -sf /usr/bin/java $(DEST)/symlinks/scylla-jmx
 
 override_dh_installinit:
-	dh_installinit --no-start @@DH_INSTALLINIT@@
+	dh_installinit --no-start --name scylla-jmx @@DH_INSTALLINIT@@
 
 %:
 	dh $@
diff --git a/dist/redhat/build_rpm.sh b/dist/redhat/build_rpm.sh
index 8d19c6e..1239db7 100755
--- a/dist/redhat/build_rpm.sh
+++ b/dist/redhat/build_rpm.sh
@@ -62,10 +62,10 @@ fi
 VERSION=$(./SCYLLA-VERSION-GEN)
 SCYLLA_VERSION=$(cat build/SCYLLA-VERSION-FILE)
 SCYLLA_RELEASE=$(cat build/SCYLLA-RELEASE-FILE)
-git archive --format=tar --prefix=scylla-jmx-$SCYLLA_VERSION/ HEAD -o build/scylla-jmx-$VERSION.tar
-cp dist/redhat/scylla-jmx.spec.in build/scylla-jmx.spec
-sed -i -e "s/@@VERSION@@/$SCYLLA_VERSION/g" build/scylla-jmx.spec
-sed -i -e "s/@@RELEASE@@/$SCYLLA_RELEASE/g" build/scylla-jmx.spec
+git archive --format=tar --prefix=scylla-enterprise-jmx-$SCYLLA_VERSION/ HEAD -o build/scylla-enterprise-jmx-$VERSION.tar
+cp dist/redhat/scylla-jmx.spec.in build/scylla-enterprise-jmx.spec
+sed -i -e "s/@@VERSION@@/$SCYLLA_VERSION/g" build/scylla-enterprise-jmx.spec
+sed -i -e "s/@@RELEASE@@/$SCYLLA_RELEASE/g" build/scylla-enterprise-jmx.spec
 
-sudo mock --buildsrpm --root=$TARGET --resultdir=`pwd`/build/srpms --spec=build/scylla-jmx.spec --sources=build/scylla-jmx-$VERSION.tar
-sudo mock --rebuild --root=$TARGET --resultdir=`pwd`/build/rpms build/srpms/scylla-jmx-$VERSION*.src.rpm
+sudo mock --buildsrpm --root=$TARGET --resultdir=`pwd`/build/srpms --spec=build/scylla-enterprise-jmx.spec --sources=build/scylla-enterprise-jmx-$VERSION.tar
+sudo mock --rebuild --root=$TARGET --resultdir=`pwd`/build/rpms build/srpms/scylla-enterprise-jmx-$VERSION*.src.rpm
diff --git a/dist/redhat/scylla-jmx.spec.in b/dist/redhat/scylla-jmx.spec.in
index d0070a0..0957c92 100644
--- a/dist/redhat/scylla-jmx.spec.in
+++ b/dist/redhat/scylla-jmx.spec.in
@@ -1,4 +1,4 @@
-Name:           scylla-jmx
+Name:           scylla-enterprise-jmx
 Version:        @@VERSION@@
 Release:        @@RELEASE@@%{?dist}
 Summary:        Scylla JMX
@@ -10,7 +10,8 @@ Source0:        %{name}-@@VERSION@@-@@RELEASE@@.tar
 
 BuildArch:      noarch
 BuildRequires:  maven systemd-units java-1.8.0-openjdk-devel
-Requires:       scylla-server java-1.8.0-openjdk-headless
+Requires:       scylla-enterprise-server java-1.8.0-openjdk-headless
+Obsoletes:      scylla-jmx < 2.2
 
 %description