diff --git a/deploy-cluster-aws/fabfile.py b/deploy-cluster-aws/fabfile.py
index 4019156a..2d261603 100644
--- a/deploy-cluster-aws/fabfile.py
+++ b/deploy-cluster-aws/fabfile.py
@@ -95,10 +95,10 @@ def install_rethinkdb():
         sudo('/etc/init.d/rethinkdb restart')
 
 
-# bigchain deployment
+# bigchaindb deployment
 @task
 @parallel
-def install_bigchain():
+def install_bigchaindb():
     sudo('python3 -m pip install bigchaindb')
 
 
diff --git a/deploy-cluster-aws/startup.sh b/deploy-cluster-aws/startup.sh
index 5a2a9c59..71f72609 100755
--- a/deploy-cluster-aws/startup.sh
+++ b/deploy-cluster-aws/startup.sh
@@ -78,14 +78,15 @@ chmod +x add2known_hosts.sh
 cp conf/bigchaindb.conf.template conf/bigchaindb.conf
 cat add2dbconf >> conf/bigchaindb.conf
 
-# rollout base packages for installation of storage and bigchain
+# rollout base packages (dependencies) needed before
+# storage backend (rethinkdb) and bigchaindb can be rolled out
 fab install_base_software
 
-# rollout storagebackend (rethinkdb)
+# rollout storage backend (rethinkdb)
 fab install_rethinkdb
 
-# rollout bigchain-reporitory
-fab install_bigchain
+# rollout bigchaindb
+fab install_bigchaindb
 
 # generate genesisblock
 HORST=`tail -1 conf/bigchaindb.conf|cut -d: -f1|cut -d= -f2`