Minor fixes
Renamed trip controller.