Changed class names

Please work.