renaming class for consistency