Renaming all the things!

Addresses https://github.com/modcloth/docker-builder/issues/32