Renaming class to be consistent with behavior.