Rename class for clarity