Changed class names to start with capital letters