diff --git a/roles/ejabberd/templates/ejabberd b/roles/ejabberd/templates/ejabberd
index bf0d2505c..ef7fa5c5e 100755
--- a/roles/ejabberd/templates/ejabberd
+++ b/roles/ejabberd/templates/ejabberd
@@ -3,9 +3,9 @@
 #
 # ejabberd now handles domain changes in the initrd script
 #
-SERVICE_NAME=ejabberd-xs
+SERVICE_NAME=ejabberd-iiab
 
-CONFIG_LIST="/etc/ejabberd/ejabberd-xs.cfg"
+CONFIG_LIST="/etc/ejabberd/ejabberd-iiab.cfg"
 
 # taken from ejabberd spec %post
 # taken from ejabberd spec %post
diff --git a/roles/ejabberd/templates/ejabberd-xs b/roles/ejabberd/templates/ejabberd-iiab
similarity index 90%
rename from roles/ejabberd/templates/ejabberd-xs
rename to roles/ejabberd/templates/ejabberd-iiab
index 627260af5..ab85fb555 100755
--- a/roles/ejabberd/templates/ejabberd-xs
+++ b/roles/ejabberd/templates/ejabberd-iiab
@@ -2,7 +2,7 @@
 
 ## Where should ejabberd find its configuration file?
 #
-CONFIG_FILE=/etc/ejabberd/ejabberd-xs.cfg
+CONFIG_FILE=/etc/ejabberd/ejabberd-iiab.cfg
 
 ## ULIMIT_MAX_FILES alters the number of files that ejabberd is
 ## allowed to have open at once.  If it is unset the system default
diff --git a/roles/ejabberd/templates/ejabberd-xs.cfg.j2 b/roles/ejabberd/templates/ejabberd-iiab.cfg.j2
similarity index 100%
rename from roles/ejabberd/templates/ejabberd-xs.cfg.j2
rename to roles/ejabberd/templates/ejabberd-iiab.cfg.j2
diff --git a/roles/ejabberd/templates/ejabberd-xs.init b/roles/ejabberd/templates/ejabberd-iiab.init
similarity index 93%
rename from roles/ejabberd/templates/ejabberd-xs.init
rename to roles/ejabberd/templates/ejabberd-iiab.init
index 9585e2ada..43d747d90 100755
--- a/roles/ejabberd/templates/ejabberd-xs.init
+++ b/roles/ejabberd/templates/ejabberd-iiab.init
@@ -17,10 +17,13 @@
 # Description: A distributed, fault-tolerant Jabber/XMPP server
 ### END INIT INFO
 
+SYS_DOMAIN_FILE=/etc/sysconfig/iiab_domain_name
+OUR_DOMAIN_FILE=/etc/sysconfig/ejabberd_domain_name
+
 . /etc/rc.d/init.d/functions
 
-if [ -r /etc/sysconfig/ejabberd-xs ]; then
-	. /etc/sysconfig/ejabberd-xs
+if [ -r /etc/sysconfig/ejabberd-iiab ]; then
+	. /etc/sysconfig/ejabberd-iiab
 fi
 
 if [ ! "$CONFIG_FILE" ]; then
@@ -34,25 +37,22 @@ chown ejabberd:ejabberd /var/run/ejabberd
 # avoid using consolehelper, call ejabberdctl directly
 progctl=/usr/sbin/ejabberdctl
 
-SYS_DOMAIN_FILE=/etc/sysconfig/xs_domain_name
-OUR_DOMAIN_FILE=/etc/sysconfig/ejabberd_domain_name
-
 check_domain_configured() {
-    if [ ! -e /etc/sysconfig/xs_domain_name ]; then
-	echo "Domain not configured yet" > /dev/stderr
+    if [ ! -e $SYS_DOMAIN_FILE ]; then
+	echo "Domain not configured yet 1" > /dev/stderr
 	exit 1;
     fi
 
     domain=`cat "$SYS_DOMAIN_FILE" `
     if [ "$domain" == "random.xs.laptop.org" ]; then
-	echo "Domain not configured yet" > /dev/stderr
+	echo "Domain not configured yet 2" > /dev/stderr
 	exit 1;
     fi
 
     #hostname=`hostname -f`
     hostname=`hostname `
     if [ "$hostname" == "localhost.localdomain" ]; then
-         echo "Domain not configured yet" > /dev/stderr
+         echo "Domain not configured yet 3" > /dev/stderr
     fi
 
 #    if [ "$hostname" != "schoolserver.$domain" ]; then
@@ -218,5 +218,3 @@ case "$1" in
 esac
 
 exit $RETVAL
-
-
diff --git a/roles/ejabberd/templates/ejabberd-xs.service.j2 b/roles/ejabberd/templates/ejabberd-iiab.service.j2
similarity index 64%
rename from roles/ejabberd/templates/ejabberd-xs.service.j2
rename to roles/ejabberd/templates/ejabberd-iiab.service.j2
index 73a9b9ea3..28f1b10dc 100755
--- a/roles/ejabberd/templates/ejabberd-xs.service.j2
+++ b/roles/ejabberd/templates/ejabberd-iiab.service.j2
@@ -8,9 +8,9 @@ User=root
 Group=root
 LimitNOFILE=50000
 RestartSec=5
-EnvironmentFile=/etc/sysconfig/ejabberd-xs
-ExecStart=/usr/libexec/ejabberd-xs start
-ExecStop=/usr/libexec/ejabberd-xs stop
+EnvironmentFile=/etc/sysconfig/ejabberd-iiab
+ExecStart=/usr/libexec/ejabberd-iiab start
+ExecStop=/usr/libexec/ejabberd-iiab stop
 RemainAfterExit=yes
 
 [Install]
diff --git a/roles/ejabberd/templates/xs-ejabberd-srg b/roles/ejabberd/templates/iiab-ejabberd-srg
similarity index 96%
rename from roles/ejabberd/templates/xs-ejabberd-srg
rename to roles/ejabberd/templates/iiab-ejabberd-srg
index 4f3b5bc32..f794020bf 100755
--- a/roles/ejabberd/templates/xs-ejabberd-srg
+++ b/roles/ejabberd/templates/iiab-ejabberd-srg
@@ -2,7 +2,7 @@
 
 progctl=/usr/sbin/ejabberdctl
 
-SYS_DOMAIN_FILE=/etc/sysconfig/xs_domain_name
+SYS_DOMAIN_FILE=/etc/sysconfig/iiab_domain_name
 OUR_DOMAIN_FILE=/etc/sysconfig/ejabberd_domain_name
 
 setup_online_srg() {
diff --git a/roles/ejabberd_xs/templates/ejabberd-xs.init b/roles/ejabberd_xs/templates/ejabberd-xs.init
index 9585e2ada..9bd07eea0 100755
--- a/roles/ejabberd_xs/templates/ejabberd-xs.init
+++ b/roles/ejabberd_xs/templates/ejabberd-xs.init
@@ -17,6 +17,9 @@
 # Description: A distributed, fault-tolerant Jabber/XMPP server
 ### END INIT INFO
 
+SYS_DOMAIN_FILE=/etc/sysconfig/iiab_domain_name
+OUR_DOMAIN_FILE=/etc/sysconfig/ejabberd_domain_name
+
 . /etc/rc.d/init.d/functions
 
 if [ -r /etc/sysconfig/ejabberd-xs ]; then
@@ -34,25 +37,22 @@ chown ejabberd:ejabberd /var/run/ejabberd
 # avoid using consolehelper, call ejabberdctl directly
 progctl=/usr/sbin/ejabberdctl
 
-SYS_DOMAIN_FILE=/etc/sysconfig/xs_domain_name
-OUR_DOMAIN_FILE=/etc/sysconfig/ejabberd_domain_name
-
 check_domain_configured() {
-    if [ ! -e /etc/sysconfig/xs_domain_name ]; then
-	echo "Domain not configured yet" > /dev/stderr
+    if [ ! -e $SYS_DOMAIN_FILE ]; then
+	echo "Domain not configured yet 1" > /dev/stderr
 	exit 1;
     fi
 
     domain=`cat "$SYS_DOMAIN_FILE" `
     if [ "$domain" == "random.xs.laptop.org" ]; then
-	echo "Domain not configured yet" > /dev/stderr
+	echo "Domain not configured yet 2" > /dev/stderr
 	exit 1;
     fi
 
     #hostname=`hostname -f`
     hostname=`hostname `
     if [ "$hostname" == "localhost.localdomain" ]; then
-         echo "Domain not configured yet" > /dev/stderr
+         echo "Domain not configured yet 3" > /dev/stderr
     fi
 
 #    if [ "$hostname" != "schoolserver.$domain" ]; then