- Changed class names to start with upper case