         return tag(SVGPathOpenTag, ["d":d])
     }
     
-    fileprivate func lineToSVG(_ line: Macaw.Line) -> String {
+    fileprivate func lineToSVG(_ line: Line) -> String {
         return tag(SVGLineOpenTag, ["x1":String(Int(line.x1)), "y1":att(line.y1), "x2":att(line.x2), "y2":att(line.y2)])
     }
     
-    fileprivate func ellipseToSVG(_ ellipse: Macaw.Ellipse) -> String {
+    fileprivate func ellipseToSVG(_ ellipse: Ellipse) -> String {
         return tag(SVGEllipseOpenTag, ["cx":att(ellipse.cx), "cy":att(ellipse.cy), "rx":att(ellipse.rx), "ry":att(ellipse.ry)])
     }
     
-    fileprivate func circleToSVG(_ circle: Macaw.Circle) -> String {
+    fileprivate func circleToSVG(_ circle: Circle) -> String {
         return tag(SVGCircleOpenTag, ["cx":att(circle.cx), "cy":att(circle.cy), "r":att(circle.r)])
     }
     
-    fileprivate func roundRectToSVG(_ roundRect: Macaw.RoundRect) -> String {
+    fileprivate func roundRectToSVG(_ roundRect: RoundRect) -> String {
         return tag(SVGRectOpenTag, ["rx":att(roundRect.rx), "ry":att(roundRect.ry), "width":att(roundRect.rect.w), "height":att(roundRect.rect.h)])
     }
     
-    fileprivate func rectToSVG(_ rect: Macaw.Rect) -> String {
+    fileprivate func rectToSVG(_ rect: Rect) -> String {
         return tag(SVGRectOpenTag, ["x":att(rect.x), "y":att(rect.y), "width":att(rect.w), "height":att(rect.h)])
     }
     
-    fileprivate func imageToSVG(_ image: Macaw.Image) -> String {
+    fileprivate func imageToSVG(_ image: Image) -> String {
         return tag(SVGImageOpenTag, ["xlink:href":image.src, "x":att(image.place.dx), "y":att(image.place.dy), "width":String(image.w), "height":String(image.h)], close: true)
     }
 
-    fileprivate func textToSVG(_ text: Macaw.Text) -> String {
+    fileprivate func textToSVG(_ text: Text) -> String {
         var result = tag(SVGTextOpenTag, ["x":att(text.place.dx), "y":att(text.place.dy)])
         if let font = text.font {
             result += "font-family=\"\(font.name)\" font-size=\"\(font.size)\""

        return "\(tag) \(attrs) \(closeTag)"
    }
    
    fileprivate func arcToSVG(_ arc: Macaw.Arc) -> String {
        if (arc.shift == 0.0) {
            return tag(SVGEllipseOpenTag, ["cx":att(arc.ellipse.cx), "cy":att(arc.ellipse.cy), "rx":att(arc.ellipse.rx), "ry":att(arc.ellipse.ry)])
        } else {

        if let image = node as? Image {
            return imageToSVG(image)
        }
        if let text = node as? Text {
            return textToSVG(text)
        }
        return "SVGUndefinedTag \(node)"
