Fix variable naming
Merge branch 'svg-uml-output'