Rename two Classes