Make names in build more relevant to this project
Make project amenable to easy testing