more renaming

module, controller conventions
Merge branch 'nick's-branch'