Rename classes, legacy package