Improved controller naming conventions.