Refactor naming conventions for controllers and templates