Controller classes renamed