diff --git a/docs/upgrade.rst b/docs/upgrade.rst
--- a/docs/upgrade.rst
+++ b/docs/upgrade.rst
@@ -20,7 +20,7 @@ Upgrading from PyPI (aka "Cheeseshop")
 If using a sqlite database, stop the Rhodecode process/daemon/service, and
 then make a copy of the database file::
 
- service rhodecode stop
+ service kallithea stop
  cp rhodecode.db rhodecode.db.{version}
 
 
@@ -90,7 +90,7 @@ readily apparent::
 
 Once that is complete, you may now start your upgraded Rhodecode Instance::
 
- service rhodecode start
+ service kallithea start
 
 Or::
 
diff --git a/init.d/celeryd-upstart.conf b/init.d/celeryd-upstart.conf
--- a/init.d/celeryd-upstart.conf
+++ b/init.d/celeryd-upstart.conf
@@ -1,19 +1,19 @@
-# celeryd - run the celeryd daemon as an upstart job for rhodecode
+# celeryd - run the celeryd daemon as an upstart job for kallithea
 # Change variables/paths as necessary and place file /etc/init/celeryd.conf
 # start/stop/restart as normal upstart job (ie: $ start celeryd)
 
 description	"Celery for RhodeCode Mercurial Server"
 author		"Matt Zuba <matt.zuba@goodwillaz.org"
 
-start on starting rhodecode
-stop on stopped rhodecode
+start on starting kallithea
+stop on stopped kallithea
 
 respawn
 
 umask 0022
 
 env PIDFILE=/tmp/celeryd.pid
-env APPINI=/var/hg/rhodecode/production.ini
+env APPINI=/var/hg/kallithea/production.ini
 env HOME=/var/hg
 env USER=hg
 # To use group (if different from user), you must edit sudoers file and change
@@ -21,7 +21,7 @@ env USER=hg
 # env GROUP=hg
 
 script
-    COMMAND="/var/hg/.virtualenvs/rhodecode/bin/paster celeryd $APPINI --pidfile=$PIDFILE"
+    COMMAND="/var/hg/.virtualenvs/kallithea/bin/paster celeryd $APPINI --pidfile=$PIDFILE"
     if [ -z "$GROUP" ]; then
         exec sudo -u $USER $COMMAND
     else
diff --git a/init.d/rhodecode-daemon4 b/init.d/kallithea-daemon-arch
rename from init.d/rhodecode-daemon4
rename to init.d/kallithea-daemon-arch
--- a/init.d/rhodecode-daemon4
+++ b/init.d/kallithea-daemon-arch
@@ -6,7 +6,7 @@
 . /etc/rc.conf
 . /etc/rc.d/functions
 
-DAEMON=rhodecode
+DAEMON=kallithea
 APP_HOMEDIR="/srv"
 APP_PATH="$APP_HOMEDIR/$DAEMON"
 CONF_NAME="production.ini"
diff --git a/init.d/rhodecode-daemon2 b/init.d/kallithea-daemon-debian
rename from init.d/rhodecode-daemon2
rename to init.d/kallithea-daemon-debian
--- a/init.d/rhodecode-daemon2
+++ b/init.d/kallithea-daemon-debian
@@ -4,16 +4,16 @@
 ########################################
  
 ### BEGIN INIT INFO
-# Provides:          rhodecode          
+# Provides:          kallithea          
 # Required-Start:    $all
 # Required-Stop:     $all
 # Default-Start:     2 3 4 5
 # Default-Stop:      0 1 6
-# Short-Description: starts instance of rhodecode
-# Description:       starts instance of rhodecode using start-stop-daemon
+# Short-Description: starts instance of kallithea
+# Description:       starts instance of kallithea using start-stop-daemon
 ### END INIT INFO
  
-APP_NAME="rhodecode"
+APP_NAME="kallithea"
 APP_HOMEDIR="opt"
 APP_PATH="/$APP_HOMEDIR/$APP_NAME"
  
diff --git a/init.d/rhodecode-daemon b/init.d/kallithea-daemon-gentoo
rename from init.d/rhodecode-daemon
rename to init.d/kallithea-daemon-gentoo
--- a/init.d/rhodecode-daemon
+++ b/init.d/kallithea-daemon-gentoo
@@ -3,8 +3,8 @@
 #### THIS IS AN GENTOO INIT.D SCRIPT####
 ########################################
 
-APP_NAME="rhodecode"
-APP_HOMEDIR="marcink/python_workspace"
+APP_NAME="kallithea"
+APP_HOMEDIR="username/python_workspace"
 APP_PATH="/home/$APP_HOMEDIR/$APP_NAME"
 
 CONF_NAME="production.ini"
@@ -14,7 +14,7 @@ LOG_PATH="$APP_PATH/$APP_NAME.log"
 
 PYTHON_PATH="/home/$APP_HOMEDIR/v-env"
 
-RUN_AS="marcink"
+RUN_AS="username"
 
 DAEMON="$PYTHON_PATH/bin/paster"
 
diff --git a/init.d/rhodecode-daemon3 b/init.d/kallithea-daemon-redhat
rename from init.d/rhodecode-daemon3
rename to init.d/kallithea-daemon-redhat
--- a/init.d/rhodecode-daemon3
+++ b/init.d/kallithea-daemon-redhat
@@ -12,7 +12,7 @@
 ##################################################
 
 
-APP_NAME="rhodecode"
+APP_NAME="kallithea"
 # the location of your app
 # since this is a web app, it should go in /var/www
 APP_PATH="/var/www/$APP_NAME"
@@ -22,14 +22,14 @@ CONF_NAME="production.ini"
 # write to wherever the PID should be stored, just ensure
 # that the user you run paster as has the appropriate permissions
 # same goes for the log file
-PID_PATH="/var/run/rhodecode/pid"
-LOG_PATH="/var/log/rhodecode/rhodecode.log"
+PID_PATH="/var/run/kallithea/pid"
+LOG_PATH="/var/log/kallithea/kallithea.log"
 
 # replace this with the path to the virtual environment you
 # made for RhodeCode
-PYTHON_PATH="/opt/python_virtualenvironments/rhodecode-venv"
+PYTHON_PATH="/opt/python_virtualenvironments/kallithea-venv"
 
-RUN_AS="rhodecode"
+RUN_AS="kallithea"
 
 DAEMON="$PYTHON_PATH/bin/paster"
 
@@ -39,7 +39,7 @@ DAEMON_OPTS="serve --daemon \
     --pid-file=$PID_PATH \
     --log-file=$LOG_PATH $APP_PATH/$CONF_NAME"
 
-DESC="rhodecode-server"
+DESC="kallithea-server"
 LOCK_FILE="/var/lock/subsys/$APP_NAME"
 
 # source CentOS init functions
@@ -61,7 +61,7 @@ ensure_pid_dir () {
   fi
 }
 
-start_rhodecode () {
+start_kallithea () {
     ensure_pid_dir
     PYTHON_EGG_CACHE="/tmp" daemon --pidfile $PID_PATH \
         --user $RUN_AS "$DAEMON $DAEMON_OPTS"
@@ -70,7 +70,7 @@ start_rhodecode () {
     return $RETVAL
 }
 
-stop_rhodecode () {
+stop_kallithea () {
     if [ -e $LOCK_FILE ]; then
       killproc -p $PID_PATH
       RETVAL=$?
@@ -82,7 +82,7 @@ stop_rhodecode () {
     return $RETVAL
 }
 
-status_rhodecode() {
+status_kallithea() {
   if [ -e $LOCK_FILE ]; then
     # exit with non-zero to indicate failure
     RETVAL=1
@@ -92,25 +92,25 @@ status_rhodecode() {
   return $RETVAL
 }
 
-restart_rhodecode () {
-    stop_rhodecode
-    start_rhodecode
+restart_kallithea () {
+    stop_kallithea
+    start_kallithea
     RETVAL=$?
 }
 
 case "$1" in
   start)
     echo -n $"Starting $DESC: "
-    start_rhodecode
+    start_kallithea
     echo
     ;;
   stop)
     echo -n $"Stopping $DESC: "
-    stop_rhodecode
+    stop_kallithea
     echo
     ;;
   status)
-    status_rhodecode
+    status_kallithea
     RETVAL=$?
     if [ ! $RETVAL -eq 0 ]; then
       echo "RhodeCode server is running..."
@@ -120,7 +120,7 @@ case "$1" in
     ;;
   restart)
     echo -n $"Restarting $DESC: "
-    restart_rhodecode
+    restart_kallithea
     echo
     ;;
   *)
diff --git a/init.d/rhodecode-upstart.conf b/init.d/kallithea-upstart.conf
rename from init.d/rhodecode-upstart.conf
rename to init.d/kallithea-upstart.conf
--- a/init.d/rhodecode-upstart.conf
+++ b/init.d/kallithea-upstart.conf
@@ -1,6 +1,6 @@
-# rhodecode - run the rhodecode daemon as an upstart job
-# Change variables/paths as necessary and place file /etc/init/rhodecode.conf
-# start/stop/restart as normal upstart job (ie: $ start rhodecode)
+# kallithea - run the kallithea daemon as an upstart job
+# Change variables/paths as necessary and place file /etc/init/kallithea.conf
+# start/stop/restart as normal upstart job (ie: $ start kallithea)
 
 description	"RhodeCode Mercurial Server"
 author		"Matt Zuba <matt.zuba@goodwillaz.org"
@@ -12,14 +12,14 @@ respawn
 
 umask 0022
 
-env PIDFILE=/var/hg/rhodecode/rhodecode.pid
-env LOGFILE=/var/hg/rhodecode/log/rhodecode.log
-env APPINI=/var/hg/rhodecode/production.ini
+env PIDFILE=/var/hg/kallithea/kallithea.pid
+env LOGFILE=/var/hg/kallithea/log/kallithea.log
+env APPINI=/var/hg/kallithea/production.ini
 env HOME=/var/hg
 env USER=hg
 env GROUP=hg
 
-exec /var/hg/.virtualenvs/rhodecode/bin/paster serve --user=$USER --group=$GROUP --pid-file=$PIDFILE --log-file=$LOGFILE $APPINI
+exec /var/hg/.virtualenvs/kallithea/bin/paster serve --user=$USER --group=$GROUP --pid-file=$PIDFILE --log-file=$LOGFILE $APPINI
 
 post-stop script
 	rm -f $PIDFILE
diff --git a/init.d/supervisord.conf b/init.d/supervisord.conf
--- a/init.d/supervisord.conf
+++ b/init.d/supervisord.conf
@@ -9,21 +9,21 @@ port=127.0.0.1:9001        ; (ip_address
 ;password=123               ; (default is no password (open server))
 
 [supervisord]
-logfile=/%(here)s/supervisord_rhodecode.log ; (main log file;default $CWD/supervisord.log)
+logfile=/%(here)s/supervisord_kallithea.log ; (main log file;default $CWD/supervisord.log)
 logfile_maxbytes=50MB        ; (max main logfile bytes b4 rotation;default 50MB)
 logfile_backups=10           ; (num of main logfile rotation backups;default 10)
 loglevel=info                ; (log level;default info; others: debug,warn,trace)
-pidfile=/%(here)s/supervisord_rhodecode.pid ; (supervisord pidfile;default supervisord.pid)
+pidfile=/%(here)s/supervisord_kallithea.pid ; (supervisord pidfile;default supervisord.pid)
 nodaemon=true               ; (start in foreground if true;default false)
 minfds=1024                  ; (min. avail startup file descriptors;default 1024)
 minprocs=200                 ; (min. avail process descriptors;default 200)
 umask=022                    ; (process file creation umask;default 022)
-user=marcink                  ; (default is current user, required if root)
+user=username                  ; (default is current user, required if root)
 ;identifier=supervisor       ; (supervisord identifier, default is 'supervisor')
 ;directory=/tmp              ; (default is not to cd during start)
 ;nocleanup=true              ; (don't clean up tempfiles at start;default false)
 ;childlogdir=/tmp            ; ('AUTO' child log dir, default $TEMP)
-environment=HOME=/home/marcink       ; (key value pairs to add to environment)
+environment=HOME=/home/username       ; (key value pairs to add to environment)
 ;strip_ansi=false            ; (strip ansi escape codes in logs; def. false)
 
 ; the below section must remain in the config file for RPC
@@ -40,12 +40,12 @@ serverurl=http://127.0.0.1:9001 ; use an
 ;history_file=~/.sc_history  ; use readline history if available
 
 
-; restart with supervisorctl restart rhodecode:*
-[program:rhodecode]
+; restart with supervisorctl restart kallithea:*
+[program:kallithea]
 numprocs = 1
 numprocs_start = 5000 # possible should match ports
-directory=/home/marcink/rhodecode-dir
-command = /home/marcink/v-env/bin/paster serve rc.ini
+directory=/home/username/kallithea-dir
+command = /home/username/v-env/bin/paster serve rc.ini
 process_name = %(program_name)s_%(process_num)04d
 redirect_stderr=true 
-stdout_logfile=/%(here)s/rhodecode.log 
\ No newline at end of file
+stdout_logfile=/%(here)s/kallithea.log 
\ No newline at end of file