diff --git a/tools/docker/alignak_container/Dockerfile b/tools/docker/alignak_container/Dockerfile
index fffd1d7..967493e 100644
--- a/tools/docker/alignak_container/Dockerfile
+++ b/tools/docker/alignak_container/Dockerfile
@@ -7,19 +7,30 @@ RUN apt-get update && apt-get install -y vim supervisor python-dev libffi-dev li
 
 ### Alignak
 RUN apt-get update && apt-get install -y python-pip git
-RUN useradd shinken && pip install https://github.com/naparuba/shinken/archive/601a9cd74ddbc2082f44a8275788d965b700ab3f.zip
+RUN useradd alignak && pip install https://github.com/Alignak-monitoring/alignak/archive/d7f457d5ed94f08d9a6a38809106d3e0d35a1712.tar.gz
 RUN apt-get install -y python-pycurl
-RUN shinken --init
+RUN alignak --init
 
 ## modules
-RUN shinken install webui
-RUN shinken install auth-cfg-password
+# mod-webui
+RUN cd /tmp && \
+    wget -O mod-webui.tar.gz https://github.com/shinken-monitoring/mod-webui/archive/3215d6c775326d1fb3afb161eb279dfb44e45986.tar.gz && \
+    tar -zxvf mod-webui.tar.gz && \
+    mv /tmp/mod-webui-*/module /var/lib/alignak/modules/webui && \
+    rm -rfv /tmp/mod-webui*
+
+# auth-cfg-password
+RUN cd /tmp && \
+    wget -O mod-auth-cfg-password.tar.gz https://github.com/shinken-monitoring/mod-auth-cfg-password/archive/6079d31974305b74e332424df44efecc9dfeabfc.tar.gz && \
+    tar -zxvf mod-auth-cfg-password.tar.gz && \
+    mv /tmp/mod-auth-cfg-password-*/module /var/lib/alignak/modules/auth-cfg-password && \
+    rm -rfv /tmp/mod-auth-cfg-password*
 
 # mod-booster-nrpe
 RUN cd /tmp && \
     wget -O mod-booster-nrpe.tar.gz https://github.com/shinken-monitoring/mod-booster-nrpe/archive/de7099706855e32c1962c77740be0fae446d15f5.tar.gz && \
     tar -zxvf mod-booster-nrpe.tar.gz && \
-    mv /tmp/mod-booster-nrpe-*/module /var/lib/shinken/modules/mod-booster-nrpe && \
+    mv /tmp/mod-booster-nrpe-*/module /var/lib/alignak/modules/mod-booster-nrpe && \
     rm -rfv /tmp/mod-booster-nrpe*
 
 # mod-mongodb
@@ -27,7 +38,7 @@ RUN pip install pymongo==3.0.2
 RUN cd /tmp && \
     wget -O mod-mongodb.tar.gz https://github.com/shinken-monitoring/mod-mongodb/archive/5396fded1c56d57202236d1236703a160aec7375.tar.gz && \
     tar -zxvf mod-mongodb.tar.gz && \
-    mv /tmp/mod-mongodb-*/module /var/lib/shinken/modules/mod-mongodb && \
+    mv /tmp/mod-mongodb-*/module /var/lib/alignak/modules/mod-mongodb && \
     rm -rfv /tmp/mod-mongodb*
 
 # mod-influxdb
@@ -35,26 +46,26 @@ RUN pip install influxdb==2.3.0
 RUN cd /tmp && \
     wget -O mod-influxdb.tar.gz https://github.com/savoirfairelinux/mod-influxdb/archive/28c1bf1a34748002ad8ee1404123579373ce82fd.tar.gz && \
     tar -zxvf mod-influxdb.tar.gz && \
-    mv /tmp/mod-influxdb-*/module /var/lib/shinken/modules/mod-influxdb && \
+    mv /tmp/mod-influxdb-*/module /var/lib/alignak/modules/mod-influxdb && \
     rm -rfv /tmp/mod-influxdb*
 
 # mod-ws-arbiter
 RUN cd /tmp && \
     wget -O mod-ws-arbiter.tar.gz https://github.com/shinken-monitoring/mod-ws-arbiter/archive/ebae7950be9452ab80ec58575e9887d9b2a15d2a.tar.gz && \
     tar -zxvf mod-ws-arbiter.tar.gz && \
-    mv /tmp/mod-ws-arbiter-*/module /var/lib/shinken/modules/ws-arbiter && \
+    mv /tmp/mod-ws-arbiter-*/module /var/lib/alignak/modules/ws-arbiter && \
     rm -rfv /tmp/mod-ws-arbiter*
 
 # mod-mongo-live-config
 RUN cd /tmp && \
     wget -O mod-mongo-live-config.tar.gz https://github.com/savoirfairelinux/mod-mongo-live-config/archive/0.2.0.tar.gz && \
     tar -zxvf mod-mongo-live-config.tar.gz && \
-    mv /tmp/mod-mongo-live-config-*/mod_mongo_live_config /var/lib/shinken/modules/mod_mongo_live_config && \
+    mv /tmp/mod-mongo-live-config-*/mod_mongo_live_config /var/lib/alignak/modules/mod_mongo_live_config && \
     rm -rfv /tmp/mod-mongo-live-config*
 
 ## plugins
 RUN apt-get update && apt-get install -y nagios-plugins nagios-nrpe-plugin
-# run permissions for user `shinken`
+# run permissions for user `alignak`
 RUN chmod u+s /usr/lib/nagios/plugins/check_icmp
 RUN chmod u+s /bin/ping
 RUN chmod u+s /bin/ping6
@@ -86,14 +97,14 @@ RUN sh  -c 'gpg --recv-keys --keyserver keyserver.ubuntu.com 2320E8F8 && gpg --e
     apt-get install -y --force-yes monitoring-packs-sfl-generic-host monitoring-packs-sfl-linux-system-nrpe
 
 ## configuration
-RUN rm -rf /etc/shinken
-ADD etc/shinken /etc/shinken
-RUN chown -R root:shinken /etc/shinken
+RUN rm -rf /etc/alignak
+ADD etc/alignak /etc/alignak
+RUN chown -R root:alignak /etc/alignak
 
 ### Supervisor
 ADD etc/supervisor /etc/supervisor
 
-# Shinken WEBUI
+# Alignak WEBUI
 EXPOSE 7767
 
 # ws-arbiter
diff --git a/tools/docker/alignak_container/etc/shinken/shinken.cfg b/tools/docker/alignak_container/etc/alignak/alignak.cfg
similarity index 90%
rename from tools/docker/alignak_container/etc/shinken/shinken.cfg
rename to tools/docker/alignak_container/etc/alignak/alignak.cfg
index af697c3..e0cbe8b 100644
--- a/tools/docker/alignak_container/etc/shinken/shinken.cfg
+++ b/tools/docker/alignak_container/etc/alignak/alignak.cfg
@@ -95,31 +95,31 @@ no_event_handlers_during_downtimes=1
 # [Optionnal], a pack distribution file is a local file near the arbiter
 # that will keep host pack id association, and so push same host on the same
 # scheduler if possible between restarts.
-pack_distribution_file=/var/lib/shinken/pack_distribution.dat
+pack_distribution_file=/var/lib/alignak/pack_distribution.dat
 
 
 
 ## Arbiter daemon part, similar to ini
 
 #If not specified will use lockfile direname
-workdir=/var/lib/shinken/
+workdir=/var/lib/alignak/
 
 # Lock file (with pid) for Arbiterd
-lock_file=/var/run/shinken/arbiterd.pid
+lock_file=/var/run/alignak/arbiterd.pid
 
 # The arbiter can have it's own local log
-local_log=/var/log/shinken/arbiterd.log
+local_log=/var/log/alignak/arbiterd.log
 
 # Accepted log level values: DEBUG,INFO,WARNING,ERROR,CRITICAL
 #log_level=WARNING
 
 # User that will be used by the arbiter.
 # If commented, run as current user (root?)
-shinken_user=shinken
-shinken_group=shinken
+alignak_user=alignak
+alignak_group=alignak
 
 # The path to the modules directory
-modules_dir=/var/lib/shinken/modules
+modules_dir=/var/lib/alignak/modules
 
 # Set to 0 if you want to make this daemon (arbiter) NOT run
 daemon_enabled=1
@@ -127,9 +127,9 @@ daemon_enabled=1
 #-- Security using SSL --
 use_ssl=0
 # WARNING : Put full paths for certs
-ca_cert=/etc/shinken/certs/ca.pem
-server_cert=/etc/shinken/certs/server.cert
-server_key=/etc/shinken/certs/server.key
+ca_cert=/etc/alignak/certs/ca.pem
+server_cert=/etc/alignak/certs/server.cert
+server_key=/etc/alignak/certs/server.key
 hard_ssl_name_check=0
 
 # If cherrypy3 is not available, it will fail back to swsgiref
diff --git a/tools/docker/alignak_container/etc/shinken/arbiters/arbiter-master.cfg b/tools/docker/alignak_container/etc/alignak/arbiters/arbiter-master.cfg
similarity index 93%
rename from tools/docker/alignak_container/etc/shinken/arbiters/arbiter-master.cfg
rename to tools/docker/alignak_container/etc/alignak/arbiters/arbiter-master.cfg
index 918f6b3..69fae80 100644
--- a/tools/docker/alignak_container/etc/shinken/arbiters/arbiter-master.cfg
+++ b/tools/docker/alignak_container/etc/alignak/arbiters/arbiter-master.cfg
@@ -3,9 +3,9 @@
 #===============================================================================
 # Description: The Arbiter is responsible for:
 # - Loading, manipulating and dispatching the configuration
-# - Validating the health of all other Shinken daemons
-# - Issuing global directives to Shinken daemons (kill, activate-spare, etc.)
-# https://shinken.readthedocs.org/en/latest/08_configobjects/arbiter.html
+# - Validating the health of all other Alignak daemons
+# - Issuing global directives to Alignak daemons (kill, activate-spare, etc.)
+# https://alignak.readthedocs.org/en/latest/08_configobjects/arbiter.html
 #===============================================================================
 # IMPORTANT: If you use several arbiters you MUST set the host_name on each
 # servers to its real DNS name ('hostname' command).
diff --git a/tools/docker/alignak_container/etc/shinken/brokers/broker-master.cfg b/tools/docker/alignak_container/etc/alignak/brokers/broker-master.cfg
similarity index 100%
rename from tools/docker/alignak_container/etc/shinken/brokers/broker-master.cfg
rename to tools/docker/alignak_container/etc/alignak/brokers/broker-master.cfg
diff --git a/tools/docker/alignak_container/etc/shinken/certs/02.pem b/tools/docker/alignak_container/etc/alignak/certs/02.pem
similarity index 100%
rename from tools/docker/alignak_container/etc/shinken/certs/02.pem
rename to tools/docker/alignak_container/etc/alignak/certs/02.pem
diff --git a/tools/docker/alignak_container/etc/shinken/certs/README b/tools/docker/alignak_container/etc/alignak/certs/README
similarity index 100%
rename from tools/docker/alignak_container/etc/shinken/certs/README
rename to tools/docker/alignak_container/etc/alignak/certs/README
diff --git a/tools/docker/alignak_container/etc/shinken/certs/ca.pem b/tools/docker/alignak_container/etc/alignak/certs/ca.pem
similarity index 100%
rename from tools/docker/alignak_container/etc/shinken/certs/ca.pem
rename to tools/docker/alignak_container/etc/alignak/certs/ca.pem
diff --git a/tools/docker/alignak_container/etc/shinken/certs/certindex.txt b/tools/docker/alignak_container/etc/alignak/certs/certindex.txt
similarity index 100%
rename from tools/docker/alignak_container/etc/shinken/certs/certindex.txt
rename to tools/docker/alignak_container/etc/alignak/certs/certindex.txt
diff --git a/tools/docker/alignak_container/etc/shinken/certs/certindex.txt.attr b/tools/docker/alignak_container/etc/alignak/certs/certindex.txt.attr
similarity index 100%
rename from tools/docker/alignak_container/etc/shinken/certs/certindex.txt.attr
rename to tools/docker/alignak_container/etc/alignak/certs/certindex.txt.attr
diff --git a/tools/docker/alignak_container/etc/shinken/certs/certindex.txt.old b/tools/docker/alignak_container/etc/alignak/certs/certindex.txt.old
similarity index 100%
rename from tools/docker/alignak_container/etc/shinken/certs/certindex.txt.old
rename to tools/docker/alignak_container/etc/alignak/certs/certindex.txt.old
diff --git a/tools/docker/alignak_container/etc/shinken/certs/client.pem b/tools/docker/alignak_container/etc/alignak/certs/client.pem
similarity index 100%
rename from tools/docker/alignak_container/etc/shinken/certs/client.pem
rename to tools/docker/alignak_container/etc/alignak/certs/client.pem
diff --git a/tools/docker/alignak_container/etc/shinken/certs/demoCA/cacert.pem b/tools/docker/alignak_container/etc/alignak/certs/demoCA/cacert.pem
similarity index 100%
rename from tools/docker/alignak_container/etc/shinken/certs/demoCA/cacert.pem
rename to tools/docker/alignak_container/etc/alignak/certs/demoCA/cacert.pem
diff --git a/tools/docker/alignak_container/etc/shinken/certs/demoCA/careq.pem b/tools/docker/alignak_container/etc/alignak/certs/demoCA/careq.pem
similarity index 100%
rename from tools/docker/alignak_container/etc/shinken/certs/demoCA/careq.pem
rename to tools/docker/alignak_container/etc/alignak/certs/demoCA/careq.pem
diff --git a/tools/docker/alignak_container/etc/shinken/certs/demoCA/crlnumber b/tools/docker/alignak_container/etc/alignak/certs/demoCA/crlnumber
similarity index 100%
rename from tools/docker/alignak_container/etc/shinken/certs/demoCA/crlnumber
rename to tools/docker/alignak_container/etc/alignak/certs/demoCA/crlnumber
diff --git a/tools/docker/alignak_container/etc/shinken/certs/demoCA/index.txt b/tools/docker/alignak_container/etc/alignak/certs/demoCA/index.txt
similarity index 100%
rename from tools/docker/alignak_container/etc/shinken/certs/demoCA/index.txt
rename to tools/docker/alignak_container/etc/alignak/certs/demoCA/index.txt
diff --git a/tools/docker/alignak_container/etc/shinken/certs/demoCA/index.txt.attr b/tools/docker/alignak_container/etc/alignak/certs/demoCA/index.txt.attr
similarity index 100%
rename from tools/docker/alignak_container/etc/shinken/certs/demoCA/index.txt.attr
rename to tools/docker/alignak_container/etc/alignak/certs/demoCA/index.txt.attr
diff --git a/tools/docker/alignak_container/etc/shinken/certs/demoCA/index.txt.attr.old b/tools/docker/alignak_container/etc/alignak/certs/demoCA/index.txt.attr.old
similarity index 100%
rename from tools/docker/alignak_container/etc/shinken/certs/demoCA/index.txt.attr.old
rename to tools/docker/alignak_container/etc/alignak/certs/demoCA/index.txt.attr.old
diff --git a/tools/docker/alignak_container/etc/shinken/certs/demoCA/index.txt.old b/tools/docker/alignak_container/etc/alignak/certs/demoCA/index.txt.old
similarity index 100%
rename from tools/docker/alignak_container/etc/shinken/certs/demoCA/index.txt.old
rename to tools/docker/alignak_container/etc/alignak/certs/demoCA/index.txt.old
diff --git a/tools/docker/alignak_container/etc/shinken/certs/demoCA/newcerts/EC5B5DDAD51BE4A8.pem b/tools/docker/alignak_container/etc/alignak/certs/demoCA/newcerts/EC5B5DDAD51BE4A8.pem
similarity index 100%
rename from tools/docker/alignak_container/etc/shinken/certs/demoCA/newcerts/EC5B5DDAD51BE4A8.pem
rename to tools/docker/alignak_container/etc/alignak/certs/demoCA/newcerts/EC5B5DDAD51BE4A8.pem
diff --git a/tools/docker/alignak_container/etc/shinken/certs/demoCA/newcerts/EC5B5DDAD51BE4A9.pem b/tools/docker/alignak_container/etc/alignak/certs/demoCA/newcerts/EC5B5DDAD51BE4A9.pem
similarity index 100%
rename from tools/docker/alignak_container/etc/shinken/certs/demoCA/newcerts/EC5B5DDAD51BE4A9.pem
rename to tools/docker/alignak_container/etc/alignak/certs/demoCA/newcerts/EC5B5DDAD51BE4A9.pem
diff --git a/tools/docker/alignak_container/etc/shinken/certs/demoCA/private/cakey.pem b/tools/docker/alignak_container/etc/alignak/certs/demoCA/private/cakey.pem
similarity index 100%
rename from tools/docker/alignak_container/etc/shinken/certs/demoCA/private/cakey.pem
rename to tools/docker/alignak_container/etc/alignak/certs/demoCA/private/cakey.pem
diff --git a/tools/docker/alignak_container/etc/shinken/certs/demoCA/serial b/tools/docker/alignak_container/etc/alignak/certs/demoCA/serial
similarity index 100%
rename from tools/docker/alignak_container/etc/shinken/certs/demoCA/serial
rename to tools/docker/alignak_container/etc/alignak/certs/demoCA/serial
diff --git a/tools/docker/alignak_container/etc/shinken/certs/demoCA/serial.old b/tools/docker/alignak_container/etc/alignak/certs/demoCA/serial.old
similarity index 100%
rename from tools/docker/alignak_container/etc/shinken/certs/demoCA/serial.old
rename to tools/docker/alignak_container/etc/alignak/certs/demoCA/serial.old
diff --git a/tools/docker/alignak_container/etc/shinken/certs/serial b/tools/docker/alignak_container/etc/alignak/certs/serial
similarity index 100%
rename from tools/docker/alignak_container/etc/shinken/certs/serial
rename to tools/docker/alignak_container/etc/alignak/certs/serial
diff --git a/tools/docker/alignak_container/etc/shinken/certs/serial.old b/tools/docker/alignak_container/etc/alignak/certs/serial.old
similarity index 100%
rename from tools/docker/alignak_container/etc/shinken/certs/serial.old
rename to tools/docker/alignak_container/etc/alignak/certs/serial.old
diff --git a/tools/docker/alignak_container/etc/shinken/certs/server.cert b/tools/docker/alignak_container/etc/alignak/certs/server.cert
similarity index 100%
rename from tools/docker/alignak_container/etc/shinken/certs/server.cert
rename to tools/docker/alignak_container/etc/alignak/certs/server.cert
diff --git a/tools/docker/alignak_container/etc/shinken/certs/server.key b/tools/docker/alignak_container/etc/alignak/certs/server.key
similarity index 100%
rename from tools/docker/alignak_container/etc/shinken/certs/server.key
rename to tools/docker/alignak_container/etc/alignak/certs/server.key
diff --git a/tools/docker/alignak_container/etc/shinken/certs/server.pem b/tools/docker/alignak_container/etc/alignak/certs/server.pem
similarity index 100%
rename from tools/docker/alignak_container/etc/shinken/certs/server.pem
rename to tools/docker/alignak_container/etc/alignak/certs/server.pem
diff --git a/tools/docker/alignak_container/etc/shinken/certs/server.req b/tools/docker/alignak_container/etc/alignak/certs/server.req
similarity index 100%
rename from tools/docker/alignak_container/etc/shinken/certs/server.req
rename to tools/docker/alignak_container/etc/alignak/certs/server.req
diff --git a/tools/docker/alignak_container/etc/shinken/certs/shinken_openssl_cnf b/tools/docker/alignak_container/etc/alignak/certs/shinken_openssl_cnf
similarity index 100%
rename from tools/docker/alignak_container/etc/shinken/certs/shinken_openssl_cnf
rename to tools/docker/alignak_container/etc/alignak/certs/shinken_openssl_cnf
diff --git a/tools/docker/alignak_container/etc/shinken/commands/check_dig.cfg b/tools/docker/alignak_container/etc/alignak/commands/check_dig.cfg
similarity index 100%
rename from tools/docker/alignak_container/etc/shinken/commands/check_dig.cfg
rename to tools/docker/alignak_container/etc/alignak/commands/check_dig.cfg
diff --git a/tools/docker/alignak_container/etc/shinken/commands/check_host_alive.cfg b/tools/docker/alignak_container/etc/alignak/commands/check_host_alive.cfg
similarity index 100%
rename from tools/docker/alignak_container/etc/shinken/commands/check_host_alive.cfg
rename to tools/docker/alignak_container/etc/alignak/commands/check_host_alive.cfg
diff --git a/tools/docker/alignak_container/etc/shinken/commands/check_http_url.cfg b/tools/docker/alignak_container/etc/alignak/commands/check_http_url.cfg
similarity index 100%
rename from tools/docker/alignak_container/etc/shinken/commands/check_http_url.cfg
rename to tools/docker/alignak_container/etc/alignak/commands/check_http_url.cfg
diff --git a/tools/docker/alignak_container/etc/shinken/commands/check_nrpe.cfg b/tools/docker/alignak_container/etc/alignak/commands/check_nrpe.cfg
similarity index 100%
rename from tools/docker/alignak_container/etc/shinken/commands/check_nrpe.cfg
rename to tools/docker/alignak_container/etc/alignak/commands/check_nrpe.cfg
diff --git a/tools/docker/alignak_container/etc/shinken/commands/check_nrpe_args.cfg b/tools/docker/alignak_container/etc/alignak/commands/check_nrpe_args.cfg
similarity index 100%
rename from tools/docker/alignak_container/etc/shinken/commands/check_nrpe_args.cfg
rename to tools/docker/alignak_container/etc/alignak/commands/check_nrpe_args.cfg
diff --git a/tools/docker/alignak_container/etc/shinken/commands/check_ping.cfg b/tools/docker/alignak_container/etc/alignak/commands/check_ping.cfg
similarity index 100%
rename from tools/docker/alignak_container/etc/shinken/commands/check_ping.cfg
rename to tools/docker/alignak_container/etc/alignak/commands/check_ping.cfg
diff --git a/tools/docker/alignak_container/etc/shinken/commands/check_snmp_service.cfg b/tools/docker/alignak_container/etc/alignak/commands/check_snmp_service.cfg
similarity index 100%
rename from tools/docker/alignak_container/etc/shinken/commands/check_snmp_service.cfg
rename to tools/docker/alignak_container/etc/alignak/commands/check_snmp_service.cfg
diff --git a/tools/docker/alignak_container/etc/shinken/commands/check_snmp_storage.cfg b/tools/docker/alignak_container/etc/alignak/commands/check_snmp_storage.cfg
similarity index 100%
rename from tools/docker/alignak_container/etc/shinken/commands/check_snmp_storage.cfg
rename to tools/docker/alignak_container/etc/alignak/commands/check_snmp_storage.cfg
diff --git a/tools/docker/alignak_container/etc/shinken/commands/check_snmp_time.cfg b/tools/docker/alignak_container/etc/alignak/commands/check_snmp_time.cfg
similarity index 100%
rename from tools/docker/alignak_container/etc/shinken/commands/check_snmp_time.cfg
rename to tools/docker/alignak_container/etc/alignak/commands/check_snmp_time.cfg
diff --git a/tools/docker/alignak_container/etc/shinken/commands/check_tcp.cfg b/tools/docker/alignak_container/etc/alignak/commands/check_tcp.cfg
similarity index 100%
rename from tools/docker/alignak_container/etc/shinken/commands/check_tcp.cfg
rename to tools/docker/alignak_container/etc/alignak/commands/check_tcp.cfg
diff --git a/tools/docker/alignak_container/etc/shinken/commands/configuration-check.cfg b/tools/docker/alignak_container/etc/alignak/commands/configuration-check.cfg
similarity index 53%
rename from tools/docker/alignak_container/etc/shinken/commands/configuration-check.cfg
rename to tools/docker/alignak_container/etc/alignak/commands/configuration-check.cfg
index 806f70e..7859989 100644
--- a/tools/docker/alignak_container/etc/shinken/commands/configuration-check.cfg
+++ b/tools/docker/alignak_container/etc/alignak/commands/configuration-check.cfg
@@ -1,5 +1,5 @@
 define command {
     command_name        configuration-check
-    command_line        sudo /etc/init.d/shinken check
+    command_line        sudo /etc/init.d/alignak check
 }
 
diff --git a/tools/docker/alignak_container/etc/shinken/commands/detailled-host-by-email.cfg b/tools/docker/alignak_container/etc/alignak/commands/detailled-host-by-email.cfg
similarity index 100%
rename from tools/docker/alignak_container/etc/shinken/commands/detailled-host-by-email.cfg
rename to tools/docker/alignak_container/etc/alignak/commands/detailled-host-by-email.cfg
diff --git a/tools/docker/alignak_container/etc/shinken/commands/detailled-service-by-email.cfg b/tools/docker/alignak_container/etc/alignak/commands/detailled-service-by-email.cfg
similarity index 100%
rename from tools/docker/alignak_container/etc/shinken/commands/detailled-service-by-email.cfg
rename to tools/docker/alignak_container/etc/alignak/commands/detailled-service-by-email.cfg
diff --git a/tools/docker/alignak_container/etc/shinken/commands/notify-host-by-android-sms.cfg b/tools/docker/alignak_container/etc/alignak/commands/notify-host-by-android-sms.cfg
similarity index 100%
rename from tools/docker/alignak_container/etc/shinken/commands/notify-host-by-android-sms.cfg
rename to tools/docker/alignak_container/etc/alignak/commands/notify-host-by-android-sms.cfg
diff --git a/tools/docker/alignak_container/etc/shinken/commands/notify-host-by-email.cfg b/tools/docker/alignak_container/etc/alignak/commands/notify-host-by-email.cfg
similarity index 100%
rename from tools/docker/alignak_container/etc/shinken/commands/notify-host-by-email.cfg
rename to tools/docker/alignak_container/etc/alignak/commands/notify-host-by-email.cfg
diff --git a/tools/docker/alignak_container/etc/shinken/commands/notify-host-by-xmpp.cfg b/tools/docker/alignak_container/etc/alignak/commands/notify-host-by-xmpp.cfg
similarity index 100%
rename from tools/docker/alignak_container/etc/shinken/commands/notify-host-by-xmpp.cfg
rename to tools/docker/alignak_container/etc/alignak/commands/notify-host-by-xmpp.cfg
diff --git a/tools/docker/alignak_container/etc/shinken/commands/notify-service-by-android-sms.cfg b/tools/docker/alignak_container/etc/alignak/commands/notify-service-by-android-sms.cfg
similarity index 100%
rename from tools/docker/alignak_container/etc/shinken/commands/notify-service-by-android-sms.cfg
rename to tools/docker/alignak_container/etc/alignak/commands/notify-service-by-android-sms.cfg
diff --git a/tools/docker/alignak_container/etc/shinken/commands/notify-service-by-email.cfg b/tools/docker/alignak_container/etc/alignak/commands/notify-service-by-email.cfg
similarity index 100%
rename from tools/docker/alignak_container/etc/shinken/commands/notify-service-by-email.cfg
rename to tools/docker/alignak_container/etc/alignak/commands/notify-service-by-email.cfg
diff --git a/tools/docker/alignak_container/etc/shinken/commands/notify-service-by-xmpp.cfg b/tools/docker/alignak_container/etc/alignak/commands/notify-service-by-xmpp.cfg
similarity index 100%
rename from tools/docker/alignak_container/etc/shinken/commands/notify-service-by-xmpp.cfg
rename to tools/docker/alignak_container/etc/alignak/commands/notify-service-by-xmpp.cfg
diff --git a/tools/docker/alignak_container/etc/alignak/commands/reload-alignak.cfg b/tools/docker/alignak_container/etc/alignak/commands/reload-alignak.cfg
new file mode 100644
index 0000000..7ad6cbc
--- /dev/null
+++ b/tools/docker/alignak_container/etc/alignak/commands/reload-alignak.cfg
@@ -0,0 +1,5 @@
+define command {
+    command_name        reload-alignak
+    command_line        /etc/init.d/alignak reload
+}
+
diff --git a/tools/docker/alignak_container/etc/alignak/commands/restart-alignak.cfg b/tools/docker/alignak_container/etc/alignak/commands/restart-alignak.cfg
new file mode 100644
index 0000000..74616ef
--- /dev/null
+++ b/tools/docker/alignak_container/etc/alignak/commands/restart-alignak.cfg
@@ -0,0 +1,5 @@
+define command {
+    command_name        restart-alignak
+    command_line        /etc/init.d/alignak restart
+}
+
diff --git a/tools/docker/alignak_container/etc/shinken/contactgroups/admins.cfg b/tools/docker/alignak_container/etc/alignak/contactgroups/admins.cfg
similarity index 100%
rename from tools/docker/alignak_container/etc/shinken/contactgroups/admins.cfg
rename to tools/docker/alignak_container/etc/alignak/contactgroups/admins.cfg
diff --git a/tools/docker/alignak_container/etc/shinken/contactgroups/users.cfg b/tools/docker/alignak_container/etc/alignak/contactgroups/users.cfg
similarity index 100%
rename from tools/docker/alignak_container/etc/shinken/contactgroups/users.cfg
rename to tools/docker/alignak_container/etc/alignak/contactgroups/users.cfg
diff --git a/tools/docker/alignak_container/etc/shinken/contacts/admin.cfg b/tools/docker/alignak_container/etc/alignak/contacts/admin.cfg
similarity index 100%
rename from tools/docker/alignak_container/etc/shinken/contacts/admin.cfg
rename to tools/docker/alignak_container/etc/alignak/contacts/admin.cfg
diff --git a/tools/docker/alignak_container/etc/shinken/daemons/brokerd.ini b/tools/docker/alignak_container/etc/alignak/daemons/brokerd.ini
similarity index 69%
rename from tools/docker/alignak_container/etc/shinken/daemons/brokerd.ini
rename to tools/docker/alignak_container/etc/alignak/daemons/brokerd.ini
index 4cc8d2e..18fd46f 100644
--- a/tools/docker/alignak_container/etc/shinken/daemons/brokerd.ini
+++ b/tools/docker/alignak_container/etc/alignak/daemons/brokerd.ini
@@ -1,16 +1,16 @@
 [daemon]
 
 # The daemon will chdir into the directory workdir when launched
-workdir = /var/run/shinken
-logdir  = /var/log/shinken
+workdir = /var/run/alignak
+logdir  = /var/log/alignak
 
 pidfile=%(workdir)s/brokerd.pid
 
 # Using default values for following config variables value:
 # Paths, if not absolute paths, are relative to workdir.
 
-#user=shinken         ; by default it's the current user
-#group=shinken        ; by default it's the current group
+#user=alignak         ; by default it's the current user
+#group=alignak        ; by default it's the current group
 
 
 #host=0.0.0.0
@@ -23,9 +23,9 @@ daemon_enabled=1
 
 #-- SSL configuration --
 use_ssl=0
-#ca_cert=/etc/shinken/certs/ca.pem
-#server_cert=/etc/shinken/certs/server.cert
-#server_key=/etc/shinken/certs/server.key
+#ca_cert=/etc/alignak/certs/ca.pem
+#server_cert=/etc/alignak/certs/server.cert
+#server_key=/etc/alignak/certs/server.key
 #hard_ssl_name_check=0
 http_backend=auto
 
@@ -43,6 +43,6 @@ log_level=WARNING
 max_queue_size=100000
 
 
-modules_dir=/var/lib/shinken/modules
-user=shinken
-group=shinken
+modules_dir=/var/lib/alignak/modules
+user=alignak
+group=alignak
diff --git a/tools/docker/alignak_container/etc/shinken/daemons/pollerd.ini b/tools/docker/alignak_container/etc/alignak/daemons/pollerd.ini
similarity index 68%
rename from tools/docker/alignak_container/etc/shinken/daemons/pollerd.ini
rename to tools/docker/alignak_container/etc/alignak/daemons/pollerd.ini
index d4e202d..81ca1d4 100644
--- a/tools/docker/alignak_container/etc/shinken/daemons/pollerd.ini
+++ b/tools/docker/alignak_container/etc/alignak/daemons/pollerd.ini
@@ -1,8 +1,8 @@
 [daemon]
 
 #-- Global Configuration
-#user=shinken         ; if not set then by default it's the current user.
-#group=shinken        ; if not set then by default it's the current group.
+#user=alignak         ; if not set then by default it's the current user.
+#group=alignak        ; if not set then by default it's the current group.
 # Set to 0 if you want to make this daemon NOT run
 daemon_enabled=1
 
@@ -10,8 +10,8 @@ daemon_enabled=1
 # The daemon will chdir into the directory workdir when launched
 # paths variables values, if not absolute paths, are relative to workdir.
 # using default values for following config variables value:
-workdir = /var/run/shinken
-logdir  = /var/log/shinken
+workdir = /var/run/alignak
+logdir  = /var/log/alignak
 pidfile=%(workdir)s/pollerd.pid
 
 #-- Network configuration
@@ -23,9 +23,9 @@ pidfile=%(workdir)s/pollerd.pid
 #-- SSL configuration --
 use_ssl=0
 # WARNING : Put full paths for certs
-#ca_cert=/etc/shinken/certs/ca.pem
-#server_cert=/etc/shinken/certs/server.cert
-#server_key=/etc/shinken/certs/server.key
+#ca_cert=/etc/alignak/certs/ca.pem
+#server_cert=/etc/alignak/certs/server.cert
+#server_key=/etc/alignak/certs/server.key
 #hard_ssl_name_check=0
 
 #-- Local log management --
@@ -36,6 +36,6 @@ local_log=%(logdir)s/pollerd.log
 log_level=WARNING
 
 
-modules_dir=/var/lib/shinken/modules
-user=shinken
-group=shinken
+modules_dir=/var/lib/alignak/modules
+user=alignak
+group=alignak
diff --git a/tools/docker/alignak_container/etc/shinken/daemons/reactionnerd.ini b/tools/docker/alignak_container/etc/alignak/daemons/reactionnerd.ini
similarity index 65%
rename from tools/docker/alignak_container/etc/shinken/daemons/reactionnerd.ini
rename to tools/docker/alignak_container/etc/alignak/daemons/reactionnerd.ini
index 12c7ae9..40dfa6c 100644
--- a/tools/docker/alignak_container/etc/shinken/daemons/reactionnerd.ini
+++ b/tools/docker/alignak_container/etc/alignak/daemons/reactionnerd.ini
@@ -1,15 +1,15 @@
 [daemon]
 
 # The daemon will chdir into the directory workdir when launched
-workdir = /var/run/shinken
-logdir  = /var/log/shinken
+workdir = /var/run/alignak
+logdir  = /var/log/alignak
 
 pidfile=%(workdir)s/reactionnerd.pid
 
 port=7769
 #host=0.0.0.0
-#user=shinken
-#group=shinken
+#user=alignak
+#group=alignak
 idontcareaboutsecurity=0
 
 # Set to 0 if you want to make this daemon NOT run
@@ -17,9 +17,9 @@ daemon_enabled=1
 
 #-- SSL configuration --
 use_ssl=0
-#ca_cert=/etc/shinken/certs/ca.pem
-#server_cert=/etc/shinken/certs/server.cert
-#server_key=/etc/shinken/certs/server.key
+#ca_cert=/etc/alignak/certs/ca.pem
+#server_cert=/etc/alignak/certs/server.cert
+#server_key=/etc/alignak/certs/server.key
 #hard_ssl_name_check=0
 http_backend=auto
 
@@ -31,6 +31,6 @@ local_log=%(logdir)s/reactionnerd.log
 # accepted log level values= DEBUG,INFO,WARNING,ERROR,CRITICAL
 log_level=WARNING
 
-modules_dir=/var/lib/shinken/modules
-user=shinken
-group=shinken
+modules_dir=/var/lib/alignak/modules
+user=alignak
+group=alignak
diff --git a/tools/docker/alignak_container/etc/shinken/daemons/receiverd.ini b/tools/docker/alignak_container/etc/alignak/daemons/receiverd.ini
similarity index 65%
rename from tools/docker/alignak_container/etc/shinken/daemons/receiverd.ini
rename to tools/docker/alignak_container/etc/alignak/daemons/receiverd.ini
index b58c89f..1d48783 100644
--- a/tools/docker/alignak_container/etc/shinken/daemons/receiverd.ini
+++ b/tools/docker/alignak_container/etc/alignak/daemons/receiverd.ini
@@ -1,15 +1,15 @@
 [daemon]
 
 # The daemon will chdir into the directory workdir when launched
-workdir = /var/run/shinken
-logdir  = /var/log/shinken
+workdir = /var/run/alignak
+logdir  = /var/log/alignak
 
 pidfile=%(workdir)s/receiverd.pid
 
 port=7773
 #host=0.0.0.0
-#user=shinken
-#group=shinken
+#user=alignak
+#group=alignak
 idontcareaboutsecurity=0
 
 # Set to 0 if you want to make this daemon NOT run
@@ -17,9 +17,9 @@ daemon_enabled=1
 
 #-- SSL configuration --
 use_ssl=0
-#ca_cert=/etc/shinken/certs/ca.pem
-#server_cert=/etc/shinken/certs/server.cert
-#server_key=/etc/shinken/certs/server.key
+#ca_cert=/etc/alignak/certs/ca.pem
+#server_cert=/etc/alignak/certs/server.cert
+#server_key=/etc/alignak/certs/server.key
 #hard_ssl_name_check=0
 http_backend=auto
 
@@ -31,6 +31,6 @@ local_log=%(logdir)s/receiverd.log
 # accepted log level values= DEBUG,INFO,WARNING,ERROR,CRITICAL
 log_level=WARNING
 
-modules_dir=/var/lib/shinken/modules
-user=shinken
-group=shinken
+modules_dir=/var/lib/alignak/modules
+user=alignak
+group=alignak
diff --git a/tools/docker/alignak_container/etc/shinken/daemons/schedulerd.ini b/tools/docker/alignak_container/etc/alignak/daemons/schedulerd.ini
similarity index 70%
rename from tools/docker/alignak_container/etc/shinken/daemons/schedulerd.ini
rename to tools/docker/alignak_container/etc/alignak/daemons/schedulerd.ini
index 9425ce2..6aa628c 100644
--- a/tools/docker/alignak_container/etc/shinken/daemons/schedulerd.ini
+++ b/tools/docker/alignak_container/etc/alignak/daemons/schedulerd.ini
@@ -1,15 +1,15 @@
 [daemon]
 
 # The daemon will chdir into the directory workdir when launched
-workdir = /var/run/shinken
-logdir  = /var/log/shinken
+workdir = /var/run/alignak
+logdir  = /var/log/alignak
 
 pidfile=%(workdir)s/schedulerd.pid
 
 port=7768
 #host=0.0.0.0
-#user=shinken
-#group=shinken
+#user=alignak
+#group=alignak
 idontcareaboutsecurity=0
 
 # To be changed, to match your real modules directory installation
@@ -22,9 +22,9 @@ daemon_enabled=1
 #-- SSL configuration --
 use_ssl=0
 # WARNING : Use full paths for certs
-#ca_cert=/etc/shinken/certs/ca.pem
-#server_cert=/etc/shinken/certs/server.cert
-#server_key=/etc/shinken/certs/server.key
+#ca_cert=/etc/alignak/certs/ca.pem
+#server_cert=/etc/alignak/certs/server.cert
+#server_key=/etc/alignak/certs/server.key
 hard_ssl_name_check=0
 http_backend=auto
 
@@ -36,6 +36,6 @@ local_log=%(logdir)s/schedulerd.log
 # accepted log level values= DEBUG,INFO,WARNING,ERROR,CRITICAL
 log_level=WARNING
 
-modules_dir=/var/lib/shinken/modules
-user=shinken
-group=shinken
+modules_dir=/var/lib/alignak/modules
+user=alignak
+group=alignak
diff --git a/tools/docker/alignak_container/etc/shinken/dependencies/sample.cfg b/tools/docker/alignak_container/etc/alignak/dependencies/sample.cfg
similarity index 100%
rename from tools/docker/alignak_container/etc/shinken/dependencies/sample.cfg
rename to tools/docker/alignak_container/etc/alignak/dependencies/sample.cfg
diff --git a/tools/docker/alignak_container/etc/shinken/discovery/discovery.cfg b/tools/docker/alignak_container/etc/alignak/discovery/discovery.cfg
similarity index 91%
rename from tools/docker/alignak_container/etc/shinken/discovery/discovery.cfg
rename to tools/docker/alignak_container/etc/alignak/discovery/discovery.cfg
index cf8afe3..b2007a2 100644
--- a/tools/docker/alignak_container/etc/shinken/discovery/discovery.cfg
+++ b/tools/docker/alignak_container/etc/alignak/discovery/discovery.cfg
@@ -1,6 +1,6 @@
 
 # Log file of the discovery command
-log_file=/var/log/shinken/discovery.log
+log_file=/var/log/alignak/discovery.log
 
 
 # Configuration files with common discovery objects
@@ -13,7 +13,7 @@ cfg_file=discovery_rules.cfg
 cfg_file=discovery_runs.cfg
 
 # Load modules, for possible bdd connection
-cfg_file=../shinken.cfg
+cfg_file=../alignak.cfg
 
 # Load all commands that will be used
 cfg_dir=../commands
diff --git a/tools/docker/alignak_container/etc/shinken/discovery/discovery_rules.cfg b/tools/docker/alignak_container/etc/alignak/discovery/discovery_rules.cfg
similarity index 100%
rename from tools/docker/alignak_container/etc/shinken/discovery/discovery_rules.cfg
rename to tools/docker/alignak_container/etc/alignak/discovery/discovery_rules.cfg
diff --git a/tools/docker/alignak_container/etc/shinken/discovery/discovery_runs.cfg b/tools/docker/alignak_container/etc/alignak/discovery/discovery_runs.cfg
similarity index 100%
rename from tools/docker/alignak_container/etc/shinken/discovery/discovery_runs.cfg
rename to tools/docker/alignak_container/etc/alignak/discovery/discovery_runs.cfg
diff --git a/tools/docker/alignak_container/etc/shinken/escalations/sample.cfg b/tools/docker/alignak_container/etc/alignak/escalations/sample.cfg
similarity index 100%
rename from tools/docker/alignak_container/etc/shinken/escalations/sample.cfg
rename to tools/docker/alignak_container/etc/alignak/escalations/sample.cfg
diff --git a/tools/docker/alignak_container/etc/shinken/hostgroups/linux.cfg b/tools/docker/alignak_container/etc/alignak/hostgroups/linux.cfg
similarity index 100%
rename from tools/docker/alignak_container/etc/shinken/hostgroups/linux.cfg
rename to tools/docker/alignak_container/etc/alignak/hostgroups/linux.cfg
diff --git a/tools/docker/alignak_container/etc/shinken/hosts/localhost.cfg b/tools/docker/alignak_container/etc/alignak/hosts/localhost.cfg
similarity index 100%
rename from tools/docker/alignak_container/etc/shinken/hosts/localhost.cfg
rename to tools/docker/alignak_container/etc/alignak/hosts/localhost.cfg
diff --git a/tools/docker/alignak_container/etc/shinken/modules/auth_cfg_password.cfg b/tools/docker/alignak_container/etc/alignak/modules/auth_cfg_password.cfg
similarity index 100%
rename from tools/docker/alignak_container/etc/shinken/modules/auth_cfg_password.cfg
rename to tools/docker/alignak_container/etc/alignak/modules/auth_cfg_password.cfg
diff --git a/tools/docker/alignak_container/etc/shinken/modules/booster_nrpe.cfg b/tools/docker/alignak_container/etc/alignak/modules/booster_nrpe.cfg
similarity index 100%
rename from tools/docker/alignak_container/etc/shinken/modules/booster_nrpe.cfg
rename to tools/docker/alignak_container/etc/alignak/modules/booster_nrpe.cfg
diff --git a/tools/docker/alignak_container/etc/shinken/modules/influxdb.cfg b/tools/docker/alignak_container/etc/alignak/modules/influxdb.cfg
similarity index 100%
rename from tools/docker/alignak_container/etc/shinken/modules/influxdb.cfg
rename to tools/docker/alignak_container/etc/alignak/modules/influxdb.cfg
diff --git a/tools/docker/alignak_container/etc/shinken/modules/mongo-live-config.cfg b/tools/docker/alignak_container/etc/alignak/modules/mongo-live-config.cfg
similarity index 100%
rename from tools/docker/alignak_container/etc/shinken/modules/mongo-live-config.cfg
rename to tools/docker/alignak_container/etc/alignak/modules/mongo-live-config.cfg
diff --git a/tools/docker/alignak_container/etc/shinken/modules/mongodb.cfg b/tools/docker/alignak_container/etc/alignak/modules/mongodb.cfg
similarity index 100%
rename from tools/docker/alignak_container/etc/shinken/modules/mongodb.cfg
rename to tools/docker/alignak_container/etc/alignak/modules/mongodb.cfg
diff --git a/tools/docker/alignak_container/etc/shinken/modules/webui.cfg b/tools/docker/alignak_container/etc/alignak/modules/webui.cfg
similarity index 100%
rename from tools/docker/alignak_container/etc/shinken/modules/webui.cfg
rename to tools/docker/alignak_container/etc/alignak/modules/webui.cfg
diff --git a/tools/docker/alignak_container/etc/shinken/modules/ws_arbiter.cfg b/tools/docker/alignak_container/etc/alignak/modules/ws_arbiter.cfg
similarity index 100%
rename from tools/docker/alignak_container/etc/shinken/modules/ws_arbiter.cfg
rename to tools/docker/alignak_container/etc/alignak/modules/ws_arbiter.cfg
diff --git a/tools/docker/alignak_container/etc/shinken/notificationways/detailled-email.cfg b/tools/docker/alignak_container/etc/alignak/notificationways/detailled-email.cfg
similarity index 100%
rename from tools/docker/alignak_container/etc/shinken/notificationways/detailled-email.cfg
rename to tools/docker/alignak_container/etc/alignak/notificationways/detailled-email.cfg
diff --git a/tools/docker/alignak_container/etc/shinken/notificationways/email.cfg b/tools/docker/alignak_container/etc/alignak/notificationways/email.cfg
similarity index 100%
rename from tools/docker/alignak_container/etc/shinken/notificationways/email.cfg
rename to tools/docker/alignak_container/etc/alignak/notificationways/email.cfg
diff --git a/tools/docker/alignak_container/etc/shinken/notificationways/sms-android.cfg b/tools/docker/alignak_container/etc/alignak/notificationways/sms-android.cfg
similarity index 100%
rename from tools/docker/alignak_container/etc/shinken/notificationways/sms-android.cfg
rename to tools/docker/alignak_container/etc/alignak/notificationways/sms-android.cfg
diff --git a/tools/docker/alignak_container/etc/shinken/packs/readme.cfg b/tools/docker/alignak_container/etc/alignak/packs/readme.cfg
similarity index 100%
rename from tools/docker/alignak_container/etc/shinken/packs/readme.cfg
rename to tools/docker/alignak_container/etc/alignak/packs/readme.cfg
diff --git a/tools/docker/alignak_container/etc/shinken/pollers/poller-master.cfg b/tools/docker/alignak_container/etc/alignak/pollers/poller-master.cfg
similarity index 100%
rename from tools/docker/alignak_container/etc/shinken/pollers/poller-master.cfg
rename to tools/docker/alignak_container/etc/alignak/pollers/poller-master.cfg
diff --git a/tools/docker/alignak_container/etc/shinken/reactionners/reactionner-android-sms.cfg b/tools/docker/alignak_container/etc/alignak/reactionners/reactionner-android-sms.cfg
similarity index 100%
rename from tools/docker/alignak_container/etc/shinken/reactionners/reactionner-android-sms.cfg
rename to tools/docker/alignak_container/etc/alignak/reactionners/reactionner-android-sms.cfg
diff --git a/tools/docker/alignak_container/etc/shinken/reactionners/reactionner-master.cfg b/tools/docker/alignak_container/etc/alignak/reactionners/reactionner-master.cfg
similarity index 100%
rename from tools/docker/alignak_container/etc/shinken/reactionners/reactionner-master.cfg
rename to tools/docker/alignak_container/etc/alignak/reactionners/reactionner-master.cfg
diff --git a/tools/docker/alignak_container/etc/shinken/realms/all.cfg b/tools/docker/alignak_container/etc/alignak/realms/all.cfg
similarity index 100%
rename from tools/docker/alignak_container/etc/shinken/realms/all.cfg
rename to tools/docker/alignak_container/etc/alignak/realms/all.cfg
diff --git a/tools/docker/alignak_container/etc/shinken/receivers/receiver-master.cfg b/tools/docker/alignak_container/etc/alignak/receivers/receiver-master.cfg
similarity index 100%
rename from tools/docker/alignak_container/etc/shinken/receivers/receiver-master.cfg
rename to tools/docker/alignak_container/etc/alignak/receivers/receiver-master.cfg
diff --git a/tools/docker/alignak_container/etc/shinken/resource.d/active-directory.cfg b/tools/docker/alignak_container/etc/alignak/resource.d/active-directory.cfg
similarity index 83%
rename from tools/docker/alignak_container/etc/shinken/resource.d/active-directory.cfg
rename to tools/docker/alignak_container/etc/alignak/resource.d/active-directory.cfg
index 12e501a..ae1041a 100644
--- a/tools/docker/alignak_container/etc/shinken/resource.d/active-directory.cfg
+++ b/tools/docker/alignak_container/etc/alignak/resource.d/active-directory.cfg
@@ -1,6 +1,6 @@
 # Active Directory and LDAP
 $DOMAIN$=MYDOMAIN
-$DOMAINUSERSHORT$=shinken_user
+$DOMAINUSERSHORT$=alignak_user
 $DOMAINUSER$=$DOMAIN$\\$DOMAINUSERSHORT$
 $DOMAINPASSWORD$=superpassword
 $LDAPBASE$=dc=eu,dc=society,dc=com
diff --git a/tools/docker/alignak_container/etc/shinken/resource.d/nmap.cfg b/tools/docker/alignak_container/etc/alignak/resource.d/nmap.cfg
similarity index 100%
rename from tools/docker/alignak_container/etc/shinken/resource.d/nmap.cfg
rename to tools/docker/alignak_container/etc/alignak/resource.d/nmap.cfg
diff --git a/tools/docker/alignak_container/etc/shinken/resource.d/paths.cfg b/tools/docker/alignak_container/etc/alignak/resource.d/paths.cfg
similarity index 78%
rename from tools/docker/alignak_container/etc/shinken/resource.d/paths.cfg
rename to tools/docker/alignak_container/etc/alignak/resource.d/paths.cfg
index 47102b3..1e94ef5 100644
--- a/tools/docker/alignak_container/etc/shinken/resource.d/paths.cfg
+++ b/tools/docker/alignak_container/etc/alignak/resource.d/paths.cfg
@@ -3,5 +3,5 @@ $USER1$=$NAGIOSPLUGINSDIR$
 $NAGIOSPLUGINSDIR$=/usr/lib/nagios/plugins
 
 #-- Location of the plugins for Shinken
-$PLUGINSDIR$=/usr/lib/shinken/plugins
+$PLUGINSDIR$=/usr/lib/alignak/plugins
 
diff --git a/tools/docker/alignak_container/etc/shinken/resource.d/snmp.cfg b/tools/docker/alignak_container/etc/alignak/resource.d/snmp.cfg
similarity index 100%
rename from tools/docker/alignak_container/etc/shinken/resource.d/snmp.cfg
rename to tools/docker/alignak_container/etc/alignak/resource.d/snmp.cfg
diff --git a/tools/docker/alignak_container/etc/shinken/schedulers/scheduler-master.cfg b/tools/docker/alignak_container/etc/alignak/schedulers/scheduler-master.cfg
similarity index 100%
rename from tools/docker/alignak_container/etc/shinken/schedulers/scheduler-master.cfg
rename to tools/docker/alignak_container/etc/alignak/schedulers/scheduler-master.cfg
diff --git a/tools/docker/alignak_container/etc/shinken/servicegroups/sample.cfg b/tools/docker/alignak_container/etc/alignak/servicegroups/sample.cfg
similarity index 100%
rename from tools/docker/alignak_container/etc/shinken/servicegroups/sample.cfg
rename to tools/docker/alignak_container/etc/alignak/servicegroups/sample.cfg
diff --git a/tools/docker/alignak_container/etc/shinken/services/services.cfg b/tools/docker/alignak_container/etc/alignak/services/services.cfg
similarity index 100%
rename from tools/docker/alignak_container/etc/shinken/services/services.cfg
rename to tools/docker/alignak_container/etc/alignak/services/services.cfg
diff --git a/tools/docker/alignak_container/etc/shinken/templates/generic-contact.cfg b/tools/docker/alignak_container/etc/alignak/templates/generic-contact.cfg
similarity index 100%
rename from tools/docker/alignak_container/etc/shinken/templates/generic-contact.cfg
rename to tools/docker/alignak_container/etc/alignak/templates/generic-contact.cfg
diff --git a/tools/docker/alignak_container/etc/shinken/templates/generic-host.cfg b/tools/docker/alignak_container/etc/alignak/templates/generic-host.cfg
similarity index 100%
rename from tools/docker/alignak_container/etc/shinken/templates/generic-host.cfg
rename to tools/docker/alignak_container/etc/alignak/templates/generic-host.cfg
diff --git a/tools/docker/alignak_container/etc/shinken/templates/generic-service.cfg b/tools/docker/alignak_container/etc/alignak/templates/generic-service.cfg
similarity index 100%
rename from tools/docker/alignak_container/etc/shinken/templates/generic-service.cfg
rename to tools/docker/alignak_container/etc/alignak/templates/generic-service.cfg
diff --git a/tools/docker/alignak_container/etc/shinken/templates/srv-pnp.cfg b/tools/docker/alignak_container/etc/alignak/templates/srv-pnp.cfg
similarity index 100%
rename from tools/docker/alignak_container/etc/shinken/templates/srv-pnp.cfg
rename to tools/docker/alignak_container/etc/alignak/templates/srv-pnp.cfg
diff --git a/tools/docker/alignak_container/etc/shinken/templates/time_templates.cfg b/tools/docker/alignak_container/etc/alignak/templates/time_templates.cfg
similarity index 100%
rename from tools/docker/alignak_container/etc/shinken/templates/time_templates.cfg
rename to tools/docker/alignak_container/etc/alignak/templates/time_templates.cfg
diff --git a/tools/docker/alignak_container/etc/shinken/timeperiods/24x7.cfg b/tools/docker/alignak_container/etc/alignak/timeperiods/24x7.cfg
similarity index 100%
rename from tools/docker/alignak_container/etc/shinken/timeperiods/24x7.cfg
rename to tools/docker/alignak_container/etc/alignak/timeperiods/24x7.cfg
diff --git a/tools/docker/alignak_container/etc/shinken/timeperiods/none.cfg b/tools/docker/alignak_container/etc/alignak/timeperiods/none.cfg
similarity index 100%
rename from tools/docker/alignak_container/etc/shinken/timeperiods/none.cfg
rename to tools/docker/alignak_container/etc/alignak/timeperiods/none.cfg
diff --git a/tools/docker/alignak_container/etc/shinken/timeperiods/us-holidays.cfg b/tools/docker/alignak_container/etc/alignak/timeperiods/us-holidays.cfg
similarity index 100%
rename from tools/docker/alignak_container/etc/shinken/timeperiods/us-holidays.cfg
rename to tools/docker/alignak_container/etc/alignak/timeperiods/us-holidays.cfg
diff --git a/tools/docker/alignak_container/etc/shinken/timeperiods/workhours.cfg b/tools/docker/alignak_container/etc/alignak/timeperiods/workhours.cfg
similarity index 100%
rename from tools/docker/alignak_container/etc/shinken/timeperiods/workhours.cfg
rename to tools/docker/alignak_container/etc/alignak/timeperiods/workhours.cfg
diff --git a/tools/docker/alignak_container/etc/shinken/commands/reload-shinken.cfg b/tools/docker/alignak_container/etc/shinken/commands/reload-shinken.cfg
deleted file mode 100644
index 3bc9110..0000000
--- a/tools/docker/alignak_container/etc/shinken/commands/reload-shinken.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-define command {
-    command_name        reload-shinken
-    command_line        /etc/init.d/shinken reload
-}
-
diff --git a/tools/docker/alignak_container/etc/shinken/commands/restart-shinken.cfg b/tools/docker/alignak_container/etc/shinken/commands/restart-shinken.cfg
deleted file mode 100644
index 4c05ce7..0000000
--- a/tools/docker/alignak_container/etc/shinken/commands/restart-shinken.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-define command {
-    command_name        restart-shinken
-    command_line        /etc/init.d/shinken restart
-}
-
diff --git a/tools/docker/alignak_container/etc/supervisor/conf.d/supervisor.conf b/tools/docker/alignak_container/etc/supervisor/conf.d/supervisor.conf
index 81815e0..cc97e34 100644
--- a/tools/docker/alignak_container/etc/supervisor/conf.d/supervisor.conf
+++ b/tools/docker/alignak_container/etc/supervisor/conf.d/supervisor.conf
@@ -2,7 +2,7 @@
 nodaemon=true
 
 [program:alignak]
-command=/bin/sh -c "service shinken start"
+command=/bin/sh -c "service alignak start"
 
 [program:nrpe]
 command=/bin/sh -c "service nagios-nrpe-server start"