diff --git a/cfg.mk b/cfg.mk
index 35ef44490a5eff7c879cf552741247a9fbef8347..4e302c8d048d67fbddeff01fc1edb815f2394a91 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -775,7 +775,7 @@ sc_prohibit_cross_inclusion:
 	    locking/) safe="($$dir|util|conf|rpc)";;			\
 	    cpu/| network/| node_device/| rpc/| security/| storage/)	\
 	      safe="($$dir|util|conf|storage)";;			\
-	    xenapi/ | xenxs/ ) safe="($$dir|util|conf|xen)";;		\
+	    xenapi/ | xenconfig/ ) safe="($$dir|util|conf|xen)";;	\
 	    *) safe="($$dir|$(mid_dirs)|util)";;			\
 	  esac;								\
 	  in_vc_files="^src/$$dir"					\
diff --git a/configure.ac b/configure.ac
index af3fe2896438cdb91a6a369caecbfb14a1bf9af1..f93c6c239fa7a404d6484e91235241a7a1a851e4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -967,7 +967,7 @@ AM_CONDITIONAL([WITH_XEN], [test "$with_xen" = "yes"])
 AC_SUBST([XEN_CFLAGS])
 AC_SUBST([XEN_LIBS])
 
-AM_CONDITIONAL([WITH_XENXS], [test "$with_libxl" = "yes" || test "$with_xen" = "yes"])
+AM_CONDITIONAL([WITH_XENCONFIG], [test "$with_libxl" = "yes" || test "$with_xen" = "yes"])
 
 dnl
 dnl check for kernel headers required by xen_inotify
diff --git a/po/POTFILES.in b/po/POTFILES.in
index f09fa94f9c893db6cb05051704744b34b9f65c6d..6bef06411cdefe785aa7366e7144ef7f33a5c970 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -232,8 +232,8 @@ src/xen/xm_internal.c
 src/xen/xs_internal.c
 src/xenapi/xenapi_driver.c
 src/xenapi/xenapi_utils.c
-src/xenxs/xen_sxpr.c
-src/xenxs/xen_xm.c
+src/xenconfig/xen_sxpr.c
+src/xenconfig/xen_xm.c
 tools/libvirt-guests.sh.in
 tools/virsh.c
 tools/virsh.h
diff --git a/src/Makefile.am b/src/Makefile.am
index f69923fcb8fb6d8d581118b5daaec9a5b61c3cfc..997797974e6943516a65485b4bfdd3fe3bc25114 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -964,10 +964,10 @@ CPU_SOURCES =							\
 VMX_SOURCES =							\
 		vmx/vmx.c vmx/vmx.h
 
-XENXS_SOURCES =							\
-		xenxs/xenxs_private.h				\
-		xenxs/xen_sxpr.c xenxs/xen_sxpr.h		\
-		xenxs/xen_xm.c xenxs/xen_xm.h
+XENCONFIG_SOURCES =						\
+		xenconfig/xenxs_private.h			\
+		xenconfig/xen_sxpr.c xenconfig/xen_sxpr.h	\
+		xenconfig/xen_xm.c xenconfig/xen_xm.h
 
 pkgdata_DATA =	cpu/cpu_map.xml
 
@@ -1019,13 +1019,13 @@ libvirt_vmx_la_CFLAGS = \
 libvirt_vmx_la_SOURCES = $(VMX_SOURCES)
 endif WITH_VMX
 
-if WITH_XENXS
-noinst_LTLIBRARIES += libvirt_xenxs.la
-libvirt_la_BUILT_LIBADD += libvirt_xenxs.la
-libvirt_xenxs_la_CFLAGS = \
+if WITH_XENCONFIG
+noinst_LTLIBRARIES += libvirt_xenconfig.la
+libvirt_la_BUILT_LIBADD += libvirt_xenconfig.la
+libvirt_xenconfig_la_CFLAGS = \
 		-I$(top_srcdir)/src/conf $(AM_CFLAGS)
-libvirt_xenxs_la_SOURCES = $(XENXS_SOURCES)
-endif WITH_XENXS
+libvirt_xenconfig_la_SOURCES = $(XENCONFIG_SOURCES)
+endif WITH_XENCONFIG
 
 
 noinst_LTLIBRARIES += libvirt_driver.la
@@ -1101,7 +1101,7 @@ libvirt_driver_xen_impl_la_CFLAGS =					\
 		$(XEN_CFLAGS)					\
 		-I$(top_srcdir)/src/access			\
 		-I$(top_srcdir)/src/conf			\
-		-I$(top_srcdir)/src/xenxs			\
+		-I$(top_srcdir)/src/xenconfig			\
 		$(AM_CFLAGS)
 libvirt_driver_xen_impl_la_LDFLAGS = $(AM_LDFLAGS)
 libvirt_driver_xen_impl_la_LIBADD = $(XEN_LIBS)
@@ -1186,10 +1186,10 @@ libvirt_driver_libxl_impl_la_CFLAGS = 		\
 		$(LIBXL_CFLAGS)			\
 		-I$(top_srcdir)/src/access	\
 		-I$(top_srcdir)/src/conf	\
-		-I$(top_srcdir)/src/xenxs	\
+		-I$(top_srcdir)/src/xenconfig	\
 		$(AM_CFLAGS)
 libvirt_driver_libxl_impl_la_LDFLAGS = $(AM_LDFLAGS)
-libvirt_driver_libxl_impl_la_LIBADD = $(LIBXL_LIBS) libvirt_xenxs.la
+libvirt_driver_libxl_impl_la_LIBADD = $(LIBXL_LIBS) libvirt_xenconfig.la
 libvirt_driver_libxl_impl_la_SOURCES = $(LIBXL_DRIVER_SOURCES)
 endif WITH_LIBXL
 
@@ -1743,7 +1743,7 @@ EXTRA_DIST +=							\
 		$(SECRET_DRIVER_SOURCES)			\
 		$(VBOX_DRIVER_EXTRA_DIST)			\
 		$(VMWARE_DRIVER_SOURCES)			\
-		$(XENXS_SOURCES)				\
+		$(XENCONFIG_SOURCES)				\
 		$(ACCESS_DRIVER_POLKIT_POLICY)
 
 check-local: check-augeas
@@ -1893,11 +1893,11 @@ else ! WITH_VMWARE
 SYM_FILES += $(srcdir)/libvirt_vmware.syms
 endif ! WITH_VMWARE
 
-if WITH_XENXS
-USED_SYM_FILES += $(srcdir)/libvirt_xenxs.syms
-else ! WITH_XENXS
-SYM_FILES += $(srcdir)/libvirt_xenxs.syms
-endif ! WITH_XENXS
+if WITH_XENCONFIG
+USED_SYM_FILES += $(srcdir)/libvirt_xenconfig.syms
+else ! WITH_XENCONFIG
+SYM_FILES += $(srcdir)/libvirt_xenconfig.syms
+endif ! WITH_XENCONFIG
 
 if WITH_SASL
 USED_SYM_FILES += $(srcdir)/libvirt_sasl.syms
diff --git a/src/libvirt_xenxs.syms b/src/libvirt_xenconfig.syms
similarity index 91%
rename from src/libvirt_xenxs.syms
rename to src/libvirt_xenconfig.syms
index 04b35c4befd81e34c456c96eff2bdbc2762e8b34..6541685fe5e196cd61c37bda7f89bc1a2f5857f1 100644
--- a/src/libvirt_xenxs.syms
+++ b/src/libvirt_xenconfig.syms
@@ -2,7 +2,7 @@
 # These symbols are dependent upon --with-xen via WITH_XEN or --with-libxl via WITH_LIBXL.
 #
 
-# xenxs/xen_sxpr.h
+# xenconfig/xen_sxpr.h
 xenFormatSxpr;
 xenFormatSxprChr;
 xenFormatSxprDisk;
@@ -16,7 +16,7 @@ xenParseSxprChar;
 xenParseSxprSound;
 xenParseSxprString;
 
-# xenxs/xen_xm.h
+# xenconfig/xen_xm.h
 xenFormatXM;
 xenParseXM;
 
diff --git a/src/xenxs/xen_sxpr.c b/src/xenconfig/xen_sxpr.c
similarity index 99%
rename from src/xenxs/xen_sxpr.c
rename to src/xenconfig/xen_sxpr.c
index 610b7e4d1fbdf771ddf7c64dd12c5165979c6b37..ff81c365049f60af3763d9cbaa4aee9312fc1e05 100644
--- a/src/xenxs/xen_sxpr.c
+++ b/src/xenconfig/xen_sxpr.c
@@ -39,7 +39,7 @@
 #include "virstoragefile.h"
 #include "virstring.h"
 
-VIR_LOG_INIT("xenxs.xen_sxpr");
+VIR_LOG_INIT("xenconfig.xen_sxpr");
 
 /* Get a domain id from a S-expression string */
 int xenGetDomIdFromSxprString(const char *sexpr, int xendConfigVersion, int *id)
diff --git a/src/xenxs/xen_sxpr.h b/src/xenconfig/xen_sxpr.h
similarity index 100%
rename from src/xenxs/xen_sxpr.h
rename to src/xenconfig/xen_sxpr.h
diff --git a/src/xenxs/xen_xm.c b/src/xenconfig/xen_xm.c
similarity index 100%
rename from src/xenxs/xen_xm.c
rename to src/xenconfig/xen_xm.c
diff --git a/src/xenxs/xen_xm.h b/src/xenconfig/xen_xm.h
similarity index 100%
rename from src/xenxs/xen_xm.h
rename to src/xenconfig/xen_xm.h
diff --git a/src/xenxs/xenxs_private.h b/src/xenconfig/xenxs_private.h
similarity index 100%
rename from src/xenxs/xenxs_private.h
rename to src/xenconfig/xenxs_private.h
diff --git a/tests/sexpr2xmltest.c b/tests/sexpr2xmltest.c
index 15fe187903ff7914edd7ac3a4000f7a620de13cb..7247414c191184b07f143390a0de2417e9ec91d8 100644
--- a/tests/sexpr2xmltest.c
+++ b/tests/sexpr2xmltest.c
@@ -9,7 +9,7 @@
 #include "datatypes.h"
 #include "xen/xen_driver.h"
 #include "xen/xend_internal.h"
-#include "xenxs/xen_sxpr.h"
+#include "xenconfig/xen_sxpr.h"
 #include "testutils.h"
 #include "testutilsxen.h"
 #include "virstring.h"
diff --git a/tests/xmconfigtest.c b/tests/xmconfigtest.c
index e9fccc3f09fffca4f3d7228fc2ca5e31c10034e8..0c6f803585a4eb97d23e07d52023181810ce39ce 100644
--- a/tests/xmconfigtest.c
+++ b/tests/xmconfigtest.c
@@ -31,7 +31,7 @@
 #include "datatypes.h"
 #include "xen/xen_driver.h"
 #include "xen/xm_internal.h"
-#include "xenxs/xen_xm.h"
+#include "xenconfig/xen_xm.h"
 #include "testutils.h"
 #include "testutilsxen.h"
 #include "viralloc.h"
diff --git a/tests/xml2sexprtest.c b/tests/xml2sexprtest.c
index 1bead7deaaf0b0714fd5c904ac223b32d6a2e201..7d9e780f9bd43580bf92cf0763d993c3c2dc4d22 100644
--- a/tests/xml2sexprtest.c
+++ b/tests/xml2sexprtest.c
@@ -10,7 +10,7 @@
 #include "internal.h"
 #include "xen/xend_internal.h"
 #include "xen/xen_driver.h"
-#include "xenxs/xen_sxpr.h"
+#include "xenconfig/xen_sxpr.h"
 #include "testutils.h"
 #include "testutilsxen.h"
 #include "virstring.h"