renaming class names for consistancy