Changed class names to match java coding standards