some renamings and cleanups