Simplify naming during round-trips to reduce number of generated svg #36

Simplify naming during round-trips to reduce number of generated svg #36