Correcting class names to singular, remaining bit correct Controllers