Structure Update: names and tags are now separated by an "_" rather than "-"
Merge branch 'master' into build