minor renamings