more class renaming