renamed controllers to remove abbreviations