Refactored controllers names