Fixed naming issues created in merge
Merge branch 'master' of https://github.com/BDL-Hacks/Docker