end of some class renaming