A few more renamings