Should I rename the class as well?