Changed class name for consistency reasons