some minor renamings