Changed names to match class names