Changed class names to UpCase format.