--- a/docs/how-to-build-an-ami.rst	Thu Jan 09 12:49:11 2014 +0100
+++ b/docs/how-to-build-an-ami.rst	Thu Nov 28 10:40:55 2013 +0100
@@ -3,7 +3,7 @@
 
 *Prerequisite* : having an AMI builder image on AWS or OpenStack
 
-Creating an AMI is as simple as instanciating the salt-creator image in
+Creating an AMI is as simple as instanciating the salt-builder image in
 your cloud infrastructure with proper user-data content.
 
 What will be installed and configured in the built AMI image will
@@ -26,7 +26,7 @@
    unless your are in a prepared environment (chroot), this will be done
    automatically by the ami-builder instance.
 
-2. Then, launch an instance of the "ami-creator" image in your
+2. Then, launch an instance of the "ami-builder" image in your
    cloud. Use at least 5Gb of disk (add more if your sls file requires
    more).
 

--- a/docs/using-on-local-machine.rst	Thu Jan 09 12:49:11 2014 +0100
+++ b/docs/using-on-local-machine.rst	Thu Nov 28 10:40:55 2013 +0100
@@ -51,6 +51,6 @@
 
   root@machine~# cp /srv/salt/minion /etc/salt/
 
-save this machine as an ami-creator image and you can then use it by simply
+save this machine as an ami-builder image and you can then use it by simply
 adding relevant user data at boot
 

--- a/others/rc.local	Thu Jan 09 12:49:11 2014 +0100
+++ b/others/rc.local	Thu Nov 28 10:40:55 2013 +0100
@@ -23,7 +23,7 @@
         sleep 1
     done
     ## wait until salt-call is not running any longer
-    salt-call --no-color --local state.highstate | tee -a /var/log/ami-creator.log > /dev/console 2>&1
+    salt-call --no-color --local state.highstate | tee -a /var/log/ami-builder.log > /dev/console 2>&1
 done
 
 while [ `pgrep -c salt-call` -ne 0 ]
@@ -33,7 +33,7 @@
 ## wait until salt-call is not running any longer
 ## download, untar, resize and mount
 ## update modify image depending on variation.sls file
-salt-call --no-color --local state.sls ami_builder | tee -a /var/log/ami-creator.log > /dev/console 2>&1
+salt-call --no-color --local state.sls ami_builder | tee -a /var/log/ami-builder.log > /dev/console 2>&1
 ## umount, resize and upload if possible
 
 exit 0