Yet more renamings