turned names controller into common names controller
fixed trailing spaces and old-style syntax
Merge rename names controller branch