a few more renamings