diff --git a/cloud.spec b/cloud.spec
index bd49128846b..0fdebc1cbcf 100644
--- a/cloud.spec
+++ b/cloud.spec
@@ -441,7 +441,7 @@ fi
 %{_javadir}/%{name}-user-authenticator-ldap.jar
 %{_javadir}/%{name}-user-authenticator-md5.jar
 %{_javadir}/%{name}-user-authenticator-plaintext.jar
-%{_javadir}/%{name}-xen.jar
+%{_javadir}/%{name}-plugin-hypervisor-xen.jar
 %{_javadir}/%{name}-plugin-elb.jar
 %{_javadir}/%{name}-plugin-nicira-nvp.jar
 %config(noreplace) %{_sysconfdir}/%{name}/server/*
diff --git a/debian/cloud-server.install b/debian/cloud-server.install
index 76849f05f28..9cd1eebb5ff 100644
--- a/debian/cloud-server.install
+++ b/debian/cloud-server.install
@@ -28,4 +28,4 @@
 /usr/share/java/cloud-user-authenticator-ldap.jar
 /usr/share/java/cloud-user-authenticator-md5.jar
 /usr/share/java/cloud-user-authenticator-plaintext.jar
-/usr/share/java/cloud-xen.jar
+/usr/share/java/cloud-plugin-hypervisor-xen.jar
diff --git a/plugins/hypervisors/xen/build.xml b/plugins/hypervisors/xen/build.xml
index 377d6b77a3d..9d3406f0ae2 100755
--- a/plugins/hypervisors/xen/build.xml
+++ b/plugins/hypervisors/xen/build.xml
@@ -75,7 +75,7 @@
 
   <property name="deps.dir" location="${top.dir}/deps" />
   
-  <property name="xen.jar" value="cloud-xen.jar" />
+  <property name="xen.jar" value="cloud-plugin-hypervisor-xen.jar" />
   <property name="xen-scripts.dir" location="${base.dir}/plugins/hypervisors/xen/scripts" />
 	
   <import file="${build.dir}/build-common.xml"/>
diff --git a/wscript_configure b/wscript_configure
index 0e909631241..965847dd101 100644
--- a/wscript_configure
+++ b/wscript_configure
@@ -322,7 +322,7 @@ depsclasspath = [ in_javadir(_basename(x)) for x in _glob(_join(conf.srcdir,"dep
 conf.env.DEPSCLASSPATH = pathsep.join(depsclasspath)
 
 # the MS classpath points to JARs required to run the management server
-msclasspath = [ in_javadir("%s-%s.jar"%(conf.env.PACKAGE,x)) for x in "utils api core server server-extras core-extras vmware-base ovm dp-user-concentrated-pod dp-user-dispersing host-allocator-random plugin-f5 plugin-netscaler plugin-ovs plugin-srx storage-allocator-random user-authenticator-ldap user-authenticator-md5 user-authenticator-plaintext vmware xen plugin-nicira-nvp plugin-elb plugin-netapp".split() ]
+msclasspath = [ in_javadir("%s-%s.jar"%(conf.env.PACKAGE,x)) for x in "utils api core server server-extras core-extras vmware-base ovm dp-user-concentrated-pod dp-user-dispersing host-allocator-random plugin-f5 plugin-netscaler plugin-ovs plugin-srx storage-allocator-random user-authenticator-ldap user-authenticator-md5 user-authenticator-plaintext vmware plugin-hypervisor-xen plugin-nicira-nvp plugin-elb plugin-netapp".split() ]
 conf.env.MSCLASSPATH = pathsep.join(msclasspath)
 
 # the agent and simulator classpaths point to JARs required to run these two applications