Entity added with same name as an entity marked was incorrectly removed from name map. Fixes #1585 (closed).