Some more renamings