renaming class for clarity