Use proper names instead of code names

As per:
https://bugs.launchpad.net/openstack-manuals/+bug/1121866

Also fixes some minor typos

Change-Id: If33c53750c5f2a795fa9d9fa4ae045b426d14d41