changed inconsistent controller naming