Rename class for consistency