Updated class names to match api naming convention