some clas renamings and more cleanups