rename class and wrapper