Refactor controllers name