Some minor renamings