Camelcase module name
Updated more machine names in views