Renamed SurveyCtrl to ThematicCtrl