package names: standardize, put in tower frontend.
Merge remote-tracking branch 'origin/hardcode-names' into master