more renaming

module, controller conventions