some class renaming plus cleanup