project cleanup, renamings