various cleanups and renamings