Renamings, cleanups