some deletions and propagating name changes