additional class renaming