Rename class accordingly