Remove additional unneeded tq method conversions

142 files changed, 250 insertions, 250 deletions

diff --git a/kivio/kiviopart/stencils/Dia/Assorted/arrow-chevron.shape b/kivio/kiviopart/stencils/Dia/Assorted/arrow-chevron.shape
index 7d7cb3cb..8ff02c32 100644
--- a/kivio/kiviopart/stencils/Dia/Assorted/arrow-chevron.shape
+++ b/kivio/kiviopart/stencils/Dia/Assorted/arrow-chevron.shape
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" xmlns:svg="http://www.w3.org/2000/svg">
+<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg">
 <!-- Author: Alan Horkan, 2002, mailto:[email protected] -->
   <name>Block Arrow - Chevron</name><!-- Block Arrow - Chevron, as seen in PowerPoint 97 -->
   <icon>arrow-chevron.png</icon>
@@ -32,4 +32,4 @@
     <svg:polygon style="fill: default" points="0,0 2,0 3,1 2,2 0,2 1,1 "/>
     <svg:polygon style="stroke-width: 0.1; stroke: #000000" points="0,0 2,0 3,1 2,2 0,2 1,1 "/>
   </svg:svg>
-</tqshape>
+</shape>
diff --git a/kivio/kiviopart/stencils/Dia/Assorted/arrow-down.shape b/kivio/kiviopart/stencils/Dia/Assorted/arrow-down.shape
index b0e44553..6e1388fe 100644
--- a/kivio/kiviopart/stencils/Dia/Assorted/arrow-down.shape
+++ b/kivio/kiviopart/stencils/Dia/Assorted/arrow-down.shape
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" xmlns:svg="http://www.w3.org/2000/svg">
+<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg">
 <!-- Author: Alan Horkan, 2002, mailto:[email protected] -->
   <name>Geometric - Down Arrow</name>
   <icon>arrow-down.png</icon>
@@ -36,4 +36,4 @@
     <svg:polygon style="fill: default" points="1,0 1,2 0,2 2,4 4,2 3,2 3,0 "/>
     <svg:polygon style="stroke-width: 0.1; stroke: #000000" points="1,0 1,2 0,2 2,4 4,2 3,2 3,0 "/>
   </svg:svg>
-</tqshape>
+</shape>
diff --git a/kivio/kiviopart/stencils/Dia/Assorted/arrow-left-notched.shape b/kivio/kiviopart/stencils/Dia/Assorted/arrow-left-notched.shape
index d536a6b6..a4f20839 100644
--- a/kivio/kiviopart/stencils/Dia/Assorted/arrow-left-notched.shape
+++ b/kivio/kiviopart/stencils/Dia/Assorted/arrow-left-notched.shape
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" xmlns:svg="http://www.w3.org/2000/svg">
+<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg">
 <!-- Author: Alan Horkan, 2002, mailto:[email protected] -->
   <name>Geometric - Notched Left Arrow</name>
   <icon>arrow-left-notched.png</icon>
@@ -40,4 +40,4 @@
     <svg:polygon style="fill: default" points="4,1 2,1 2,0 0,2 2,4 2,3 4,3 3,2 "/>
     <svg:polygon style="stroke-width: 0.1; stroke: #000000" points="4,1 2,1 2,0 0,2 2,4 2,3 4,3 3,2 "/>
   </svg:svg>
-</tqshape>
+</shape>
diff --git a/kivio/kiviopart/stencils/Dia/Assorted/arrow-left-right-up.shape b/kivio/kiviopart/stencils/Dia/Assorted/arrow-left-right-up.shape
index d2579d6d..54babdd8 100644
--- a/kivio/kiviopart/stencils/Dia/Assorted/arrow-left-right-up.shape
+++ b/kivio/kiviopart/stencils/Dia/Assorted/arrow-left-right-up.shape
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" xmlns:svg="http://www.w3.org/2000/svg">
+<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg">
 <!-- Author: Alan Horkan, 2002, mailto:[email protected] -->
   <name>Geometric - Left-Right-Up Arrow</name>
   <icon>arrow-left-right-up.png</icon>
@@ -76,4 +76,4 @@
     <svg:polygon style="fill: default" points="8,4 6,4 6,2 7,2 5,0 3,2 4,2 4,4 2,4 2,3 0,5 2,7 2,6 8,6 8,7 10,5 8,3 "/>
     <svg:polygon style="stroke-width: 0.1; stroke: #000000" points="8,4 6,4 6,2 7,2 5,0 3,2 4,2 4,4 2,4 2,3 0,5 2,7 2,6 8,6 8,7 10,5 8,3 "/>
   </svg:svg>
-</tqshape>
+</shape>
diff --git a/kivio/kiviopart/stencils/Dia/Assorted/arrow-left-right.shape b/kivio/kiviopart/stencils/Dia/Assorted/arrow-left-right.shape
index b2e85882..03b7787c 100644
--- a/kivio/kiviopart/stencils/Dia/Assorted/arrow-left-right.shape
+++ b/kivio/kiviopart/stencils/Dia/Assorted/arrow-left-right.shape
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" xmlns:svg="http://www.w3.org/2000/svg">
+<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg">
 <!-- Author: Alan Horkan, 2002, mailto:[email protected] -->
   <name>Geometric - Left-Right Arrow</name>
   <icon>arrow-left-right.png</icon>
@@ -48,4 +48,4 @@
     <svg:polygon style="fill: default" points="6,1 2,1 2,0 0,2 2,4 2,3 6,3 6,4 8,2 6,0 "/>
     <svg:polygon style="stroke-width: 0.1; stroke: #000000" points="6,1 2,1 2,0 0,2 2,4 2,3 6,3 6,4 8,2 6,0 "/>
   </svg:svg>
-</tqshape>
+</shape>
diff --git a/kivio/kiviopart/stencils/Dia/Assorted/arrow-left-up.shape b/kivio/kiviopart/stencils/Dia/Assorted/arrow-left-up.shape
index e70c0d2a..e3c0c008 100644
--- a/kivio/kiviopart/stencils/Dia/Assorted/arrow-left-up.shape
+++ b/kivio/kiviopart/stencils/Dia/Assorted/arrow-left-up.shape
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" xmlns:svg="http://www.w3.org/2000/svg">
+<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg">
 <!-- Author: Alan Horkan, 2002, mailto:[email protected] -->
   <name>Assorted - Left-Up Arrow</name>
   <icon>arrow-left-up.png</icon>
@@ -56,4 +56,4 @@
     <svg:polygon style="fill: #ffffff" points="6,2 7,2 5,0 3,2 4,2 4,4 2,4 2,3 0,5 2,7 2,6 6,6 "/>
     <svg:polygon style="stroke-width: 0.1; stroke: #000000" points="6,2 7,2 5,0 3,2 4,2 4,4 2,4 2,3 0,5 2,7 2,6 6,6 "/>
   </svg:svg>
-</tqshape>
+</shape>
diff --git a/kivio/kiviopart/stencils/Dia/Assorted/arrow-left.shape b/kivio/kiviopart/stencils/Dia/Assorted/arrow-left.shape
index e2e513af..8eb15cd4 100644
--- a/kivio/kiviopart/stencils/Dia/Assorted/arrow-left.shape
+++ b/kivio/kiviopart/stencils/Dia/Assorted/arrow-left.shape
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" xmlns:svg="http://www.w3.org/2000/svg">
+<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg">
 <!-- Author: Alan Horkan, 2002, mailto:[email protected] -->
   <name>Geometric - Left Arrow</name>
   <icon>arrow-left.png</icon>
@@ -36,4 +36,4 @@
     <svg:polygon style="fill: default" points="4,1 2,1 2,0 0,2 2,4 2,3 4,3 "/>
     <svg:polygon style="stroke-width: 0.1; stroke: #000000" points="4,1 2,1 2,0 0,2 2,4 2,3 4,3 "/>
   </svg:svg>
-</tqshape>
+</shape>
diff --git a/kivio/kiviopart/stencils/Dia/Assorted/arrow-pentagon.shape b/kivio/kiviopart/stencils/Dia/Assorted/arrow-pentagon.shape
index b99c3461..ef0f7f47 100644
--- a/kivio/kiviopart/stencils/Dia/Assorted/arrow-pentagon.shape
+++ b/kivio/kiviopart/stencils/Dia/Assorted/arrow-pentagon.shape
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" xmlns:svg="http://www.w3.org/2000/svg">
+<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg">
 <!-- Author: Alan Horkan, 2002, mailto:[email protected] -->
   <name>Block Arrow - Pentagon</name><!-- Arrow Pentagon as seen in Powerpoint 97 -->
   <icon>arrow-pentagon.png</icon>
@@ -28,4 +28,4 @@
     <svg:polygon style="fill: default" points="0,0 2,0 3,1 2,2 0,2 "/>
     <svg:polygon style="stroke-width: 0.1; stroke: #000000" points="0,0 2,0 3,1 2,2 0,2 "/>
   </svg:svg>
-</tqshape>
+</shape>
diff --git a/kivio/kiviopart/stencils/Dia/Assorted/arrow-quad.shape b/kivio/kiviopart/stencils/Dia/Assorted/arrow-quad.shape
index 1886293b..6351e8dd 100644
--- a/kivio/kiviopart/stencils/Dia/Assorted/arrow-quad.shape
+++ b/kivio/kiviopart/stencils/Dia/Assorted/arrow-quad.shape
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" xmlns:svg="http://www.w3.org/2000/svg">
+<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg">
 <!-- Author: Alan Horkan, 2002, mailto:[email protected] -->
   <name>Geometric - Quad Arrow</name>
   <icon>arrow-quad.png</icon>
@@ -57,4 +57,4 @@
     <svg:polygon style="fill: default" points="8,4 6,4 6,2 7,2 5,0 3,2 4,2 4,4 2,4 2,3 0,5 2,7 2,6 4,6 4,8 3,8 5,10 7,8 6,8 6,6 8,6 8,7 10,5 8,3 "/>
     <svg:polygon style="stroke-width: 0.1; stroke: #000000" points="8,4 6,4 6,2 7,2 5,0 3,2 4,2 4,4 2,4 2,3 0,5 2,7 2,6 4,6 4,8 3,8 5,10 7,8 6,8 6,6 8,6 8,7 10,5 8,3 "/>
   </svg:svg>
-</tqshape>
+</shape>
diff --git a/kivio/kiviopart/stencils/Dia/Assorted/arrow-right-notched.shape b/kivio/kiviopart/stencils/Dia/Assorted/arrow-right-notched.shape
index 8738ffea..17d670fc 100644
--- a/kivio/kiviopart/stencils/Dia/Assorted/arrow-right-notched.shape
+++ b/kivio/kiviopart/stencils/Dia/Assorted/arrow-right-notched.shape
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" xmlns:svg="http://www.w3.org/2000/svg">
+<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg">
 <!-- Author: Alan Horkan, 2002, mailto:[email protected] -->
   <name>Geometric - Notched Right Arrow</name>
   <icon>arrow-right-notched.png</icon>
@@ -40,4 +40,4 @@
     <svg:polygon style="fill: default" points="0,1 2,1 2,0 4,2 2,4 2,3 0,3 1,2 "/>
     <svg:polygon style="stroke-width: 0.1; stroke: #000000" points="0,1 2,1 2,0 4,2 2,4 2,3 0,3 1,2 "/>
   </svg:svg>
-</tqshape>
+</shape>
diff --git a/kivio/kiviopart/stencils/Dia/Assorted/arrow-right.shape b/kivio/kiviopart/stencils/Dia/Assorted/arrow-right.shape
index be5bf79c..8e9fea1d 100644
--- a/kivio/kiviopart/stencils/Dia/Assorted/arrow-right.shape
+++ b/kivio/kiviopart/stencils/Dia/Assorted/arrow-right.shape
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" xmlns:svg="http://www.w3.org/2000/svg">
+<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg">
 <!-- Author: Alan Horkan, 2002, mailto:[email protected] -->
   <name>Geometric - Right Arrow</name>
   <icon>arrow-right.png</icon>
@@ -36,4 +36,4 @@
     <svg:polygon style="fill: default" points="0,1 2,1 2,0 4,2 2,4 2,3 0,3 "/>
     <svg:polygon style="stroke-width: 0.1; stroke: #000000" points="0,1 2,1 2,0 4,2 2,4 2,3 0,3 "/>
   </svg:svg>
-</tqshape>
+</shape>
diff --git a/kivio/kiviopart/stencils/Dia/Assorted/arrow-up-down-left.shape b/kivio/kiviopart/stencils/Dia/Assorted/arrow-up-down-left.shape
index 0549dbe8..8d418022 100644
--- a/kivio/kiviopart/stencils/Dia/Assorted/arrow-up-down-left.shape
+++ b/kivio/kiviopart/stencils/Dia/Assorted/arrow-up-down-left.shape
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" xmlns:svg="http://www.w3.org/2000/svg">
+<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg">
 <!-- Author: Alan Horkan, 2002, mailto:[email protected] -->
   <name>Geometric - Up-Down-Left Arrow</name>
   <icon>arrow-up-down-left.png</icon>
@@ -76,4 +76,4 @@
     <svg:polygon style="fill: default" points="6,2 7,2 5,0 3,2 4,2 4,4 2,4 2,3 0,5 2,7 2,6 4,6 4,8 3,8 5,10 7,8 6,8 "/>
     <svg:polygon style="stroke-width: 0.1; stroke: #000000" points="6,2 7,2 5,0 3,2 4,2 4,4 2,4 2,3 0,5 2,7 2,6 4,6 4,8 3,8 5,10 7,8 6,8 "/>
   </svg:svg>
-</tqshape>
+</shape>
diff --git a/kivio/kiviopart/stencils/Dia/Assorted/arrow-up-down.shape b/kivio/kiviopart/stencils/Dia/Assorted/arrow-up-down.shape
index f0f8623e..e94d2d17 100644
--- a/kivio/kiviopart/stencils/Dia/Assorted/arrow-up-down.shape
+++ b/kivio/kiviopart/stencils/Dia/Assorted/arrow-up-down.shape
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" xmlns:svg="http://www.w3.org/2000/svg">
+<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg">
 <!-- Author: Alan Horkan, 2002, mailto:[email protected] -->
   <name>Geometric - Up-Down Arrow</name>
   <icon>arrow-up-down.png</icon>
@@ -48,4 +48,4 @@
     <svg:polygon style="fill: default" points="1,6 1,2 0,2 2,0 4,2 3,2 3,6 4,6 2,8 0,6 "/>
     <svg:polygon style="stroke-width: 0.1; stroke: #000000" points="1,6 1,2 0,2 2,0 4,2 3,2 3,6 4,6 2,8 0,6 "/>
   </svg:svg>
-</tqshape>
+</shape>
diff --git a/kivio/kiviopart/stencils/Dia/Assorted/arrow-up.shape b/kivio/kiviopart/stencils/Dia/Assorted/arrow-up.shape
index 83222aa8..791f8a78 100644
--- a/kivio/kiviopart/stencils/Dia/Assorted/arrow-up.shape
+++ b/kivio/kiviopart/stencils/Dia/Assorted/arrow-up.shape
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" xmlns:svg="http://www.w3.org/2000/svg">
+<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg">
 <!-- Author: Alan Horkan, 2002, mailto:[email protected] -->
   <name>Geometric - Up Arrow</name>
   <icon>arrow-up.png</icon>
@@ -36,4 +36,4 @@
     <svg:polygon style="fill: default" points="1,4 1,2 0,2 2,0 4,2 3,2 3,4 "/>
     <svg:polygon style="stroke-width: 0.1; stroke: #000000" points="1,4 1,2 0,2 2,0 4,2 3,2 3,4 "/>
   </svg:svg>
-</tqshape>
+</shape>
diff --git a/kivio/kiviopart/stencils/Dia/Assorted/circle.shape b/kivio/kiviopart/stencils/Dia/Assorted/circle.shape
index ae10097e..26647def 100644
--- a/kivio/kiviopart/stencils/Dia/Assorted/circle.shape
+++ b/kivio/kiviopart/stencils/Dia/Assorted/circle.shape
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" xmlns:svg="http://www.w3.org/2000/svg">
+<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg">
 <!-- Author: Alan Horkan, 2002, mailto:[email protected] -->
   <name>Geometric - Perfect Circle</name>
   <icon>circle.png</icon>
@@ -18,4 +18,4 @@
     <svg:ellipse style="fill: default" cx="1.5" cy="2" rx="1" ry="1"/>
     <svg:ellipse style="stroke-width: 0.1; stroke: #000000" cx="1.5" cy="2" rx="1" ry="1"/>
   </svg:svg>
-</tqshape>
+</shape>
diff --git a/kivio/kiviopart/stencils/Dia/Assorted/cross-maltese.shape b/kivio/kiviopart/stencils/Dia/Assorted/cross-maltese.shape
index 2b6a598c..2bc02249 100644
--- a/kivio/kiviopart/stencils/Dia/Assorted/cross-maltese.shape
+++ b/kivio/kiviopart/stencils/Dia/Assorted/cross-maltese.shape
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" xmlns:svg="http://www.w3.org/2000/svg">
+<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg">
 <!-- Author: Alan Horkan, 2002, mailto:[email protected] -->
   <name>Geometric - Maltese Cross</name><!-- St. John's Ambulance -->
   <icon>cross-maltese.png</icon>
@@ -41,4 +41,4 @@
     <svg:polygon style="fill: default" points="7,6 7.5,5 7,4 9,5 8,3 9,3.5 10,3 9,5 11,4 10.5,5 11,6 9,5 10,7 9,6.5 8,7 9,5 "/>
     <svg:polygon style="stroke-width: 0.1; stroke: #000000" points="7,6 7.5,5 7,4 9,5 8,3 9,3.5 10,3 9,5 11,4 10.5,5 11,6 9,5 10,7 9,6.5 8,7 9,5 "/>
   </svg:svg>
-</tqshape>
+</shape>
diff --git a/kivio/kiviopart/stencils/Dia/Assorted/cross-swiss.shape b/kivio/kiviopart/stencils/Dia/Assorted/cross-swiss.shape
index 88d86baa..2aeef611 100644
--- a/kivio/kiviopart/stencils/Dia/Assorted/cross-swiss.shape
+++ b/kivio/kiviopart/stencils/Dia/Assorted/cross-swiss.shape
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" xmlns:svg="http://www.w3.org/2000/svg">
+<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg">
 <!-- Author: Alan Horkan, 2002, mailto:[email protected] -->
   <name>Geometric - Swiss Cross</name>
   <!-- Swiss flag has a white cross on red -->
@@ -59,4 +59,4 @@
     <svg:polygon style="fill: default" points="2.55,3.05 2.55,2.55 3.05,2.55 3.05,2.05 3.55,2.05 3.55,2.55 4.05,2.55 4.05,3.05 3.55,3.05 3.55,3.55 3.05,3.55 3.05,3.05 "/>
     <svg:polygon style="stroke-width: 0.1; stroke: #000000" points="2.55,3.05 2.55,2.55 3.05,2.55 3.05,2.05 3.55,2.05 3.55,2.55 4.05,2.55 4.05,3.05 3.55,3.05 3.55,3.55 3.05,3.55 3.05,3.05 "/>
   </svg:svg>
-</tqshape>
+</shape>
diff --git a/kivio/kiviopart/stencils/Dia/Assorted/diamond.shape b/kivio/kiviopart/stencils/Dia/Assorted/diamond.shape
index a031d369..88948942 100644
--- a/kivio/kiviopart/stencils/Dia/Assorted/diamond.shape
+++ b/kivio/kiviopart/stencils/Dia/Assorted/diamond.shape
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" xmlns:svg="http://www.w3.org/2000/svg">
+<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg">
 <!-- Author: Alan Horkan, 2002, mailto:[email protected] -->
   <name>Geometric - Diamond</name>
   <icon>diamond.png</icon>
@@ -18,4 +18,4 @@
     <svg:polygon style="fill: default" points="1,0 2,1 1,2 0,1 "/>
     <svg:polygon style="stroke-width: 0.1; stroke: #000000" points="1,0 2,1 1,2 0,1 "/>
   </svg:svg>
-</tqshape>
+</shape>
diff --git a/kivio/kiviopart/stencils/Dia/Assorted/heptagon.shape b/kivio/kiviopart/stencils/Dia/Assorted/heptagon.shape
index ecfac8e2..ea2c2400 100644
--- a/kivio/kiviopart/stencils/Dia/Assorted/heptagon.shape
+++ b/kivio/kiviopart/stencils/Dia/Assorted/heptagon.shape
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" xmlns:svg="http://www.w3.org/2000/svg">
+<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg">
 <!-- Author: Alan Horkan, 2002, mailto:[email protected] -->
   <name>Geometric - Heptagon</name>
   <icon>heptagon.png</icon>
@@ -36,4 +36,4 @@
     <svg:polygon style="fill: #ffffff" points="0,6 0.5,2 5,0 9.5,2 10,6 7.5,9.5 2.5,9.5 "/>
     <svg:polygon style="stroke-width: 0.1; stroke: #000000" points="0,6 0.5,2 5,0 9.5,2 10,6 7.5,9.5 2.5,9.5 "/>
   </svg:svg>
-</tqshape>
+</shape>
diff --git a/kivio/kiviopart/stencils/Dia/Assorted/hexagon.shape b/kivio/kiviopart/stencils/Dia/Assorted/hexagon.shape
index 71bedc8d..a21aa220 100644
--- a/kivio/kiviopart/stencils/Dia/Assorted/hexagon.shape
+++ b/kivio/kiviopart/stencils/Dia/Assorted/hexagon.shape
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" xmlns:svg="http://www.w3.org/2000/svg">
+<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg">
 <!-- Author: Alan Horkan, 2002, mailto:[email protected] -->
   <name>Geometric - Hexagon</name>
   <icon>hexagon.png</icon>
@@ -32,4 +32,4 @@
     <svg:polygon style="fill: default" points="1.5,1 3,1 4,2.5 3,4 1.5,4 0.5,2.5 "/>
     <svg:polygon style="stroke-width: 0.1; stroke: #000000" points="1.5,1 3,1 4,2.5 3,4 1.5,4 0.5,2.5 "/>
   </svg:svg>
-</tqshape>
+</shape>
diff --git a/kivio/kiviopart/stencils/Dia/Assorted/octagon.shape b/kivio/kiviopart/stencils/Dia/Assorted/octagon.shape
index 794cd4b8..c0dceb97 100644
--- a/kivio/kiviopart/stencils/Dia/Assorted/octagon.shape
+++ b/kivio/kiviopart/stencils/Dia/Assorted/octagon.shape
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" xmlns:svg="http://www.w3.org/2000/svg">
+<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg">
 <!-- Author: Alan Horkan, 2002, mailto:[email protected] -->
   <name>Geometric - Octagon</name>
   <icon>octagon.png</icon>
@@ -25,4 +25,4 @@
     <svg:polygon style="fill: default" points="3.55,2.05 5.05,2.05 6.05,3.05 6.05,4.55 5.05,5.55 3.55,5.55 2.55,4.55 2.55,3.05 "/>
     <svg:polygon style="stroke-width: 0.1; stroke: #000000" points="3.55,2.05 5.05,2.05 6.05,3.05 6.05,4.55 5.05,5.55 3.55,5.55 2.55,4.55 2.55,3.05 "/>
   </svg:svg>
-</tqshape>
+</shape>
diff --git a/kivio/kiviopart/stencils/Dia/Assorted/parallelogram-horizontal.shape b/kivio/kiviopart/stencils/Dia/Assorted/parallelogram-horizontal.shape
index b85fa737..1c37662b 100644
--- a/kivio/kiviopart/stencils/Dia/Assorted/parallelogram-horizontal.shape
+++ b/kivio/kiviopart/stencils/Dia/Assorted/parallelogram-horizontal.shape
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" xmlns:svg="http://www.w3.org/2000/svg">
+<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg">
 <!-- Author: Alan Horkan, 2002, mailto:[email protected] -->
   <name>Geometric -Qt::Horizontal Parallelogram</name>
   <icon>parallelogram-horizontal.png</icon>
@@ -24,4 +24,4 @@
     <svg:polygon style="fill: default" points="1,0 2,0 1,1 0,1 "/>
     <svg:polygon style="stroke-width: 0.1; stroke: #000000" points="1,0 2,0 1,1 0,1 "/>
   </svg:svg>
-</tqshape>
+</shape>
diff --git a/kivio/kiviopart/stencils/Dia/Assorted/parallelogram-vertical.shape b/kivio/kiviopart/stencils/Dia/Assorted/parallelogram-vertical.shape
index d5794080..0f344091 100644
--- a/kivio/kiviopart/stencils/Dia/Assorted/parallelogram-vertical.shape
+++ b/kivio/kiviopart/stencils/Dia/Assorted/parallelogram-vertical.shape
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" xmlns:svg="http://www.w3.org/2000/svg">
+<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg">
 <!-- Author: Alan Horkan, 2002, mailto:[email protected] -->
   <name>Geometric -Qt::Vertical Parallelogram</name>
   <icon>parallelogram-vertical.png</icon>
@@ -24,4 +24,4 @@
     <svg:polygon style="fill: default" points="0,1 1,0 1,1 0,2 "/>
     <svg:polygon style="stroke-width: 0.1; stroke: #000000" points="0,1 1,0 1,1 0,2 "/>
   </svg:svg>
-</tqshape>
+</shape>
diff --git a/kivio/kiviopart/stencils/Dia/Assorted/pentagon.shape b/kivio/kiviopart/stencils/Dia/Assorted/pentagon.shape
index a3941127..89db85e7 100644
--- a/kivio/kiviopart/stencils/Dia/Assorted/pentagon.shape
+++ b/kivio/kiviopart/stencils/Dia/Assorted/pentagon.shape
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" xmlns:svg="http://www.w3.org/2000/svg">
+<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg">
 <!-- Author: Alan Horkan, 2002, mailto:[email protected] -->
   <name>Geometric - Pentagon</name>
   <icon>pentagon.png</icon>
@@ -28,4 +28,4 @@
     <svg:polygon style="fill: default" points="0,1.5 2,0 4,1.5 3,3.5 1,3.5 "/>
     <svg:polygon style="stroke-width: 0.1; stroke: #000000" points="0,1.5 2,0 4,1.5 3,3.5 1,3.5 "/>
   </svg:svg>
-</tqshape>
+</shape>
diff --git a/kivio/kiviopart/stencils/Dia/Assorted/square.shape b/kivio/kiviopart/stencils/Dia/Assorted/square.shape
index e7be1a89..67d58bf4 100644
--- a/kivio/kiviopart/stencils/Dia/Assorted/square.shape
+++ b/kivio/kiviopart/stencils/Dia/Assorted/square.shape
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" xmlns:svg="http://www.w3.org/2000/svg">
+<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg">
 <!-- Author: Alan Horkan, 2002, mailto:[email protected] -->
   <name>Geometric - Perfect Square</name>
   <icon>square.png</icon>
@@ -26,4 +26,4 @@
     <svg:rect style="fill: default" x="4.5" y="2.45" width="1.5" height="1.55"/>
     <svg:rect style="stroke-width: 0.1; stroke: #000000" x="4.5" y="2.45" width="1.5" height="1.55"/>
   </svg:svg>
-</tqshape>
+</shape>
diff --git a/kivio/kiviopart/stencils/Dia/Assorted/star4.shape b/kivio/kiviopart/stencils/Dia/Assorted/star4.shape
index 5d66851c..d57432a9 100644
--- a/kivio/kiviopart/stencils/Dia/Assorted/star4.shape
+++ b/kivio/kiviopart/stencils/Dia/Assorted/star4.shape
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" xmlns:svg="http://www.w3.org/2000/svg">
+<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg">
 <!-- Author: Alan Horkan, 2002, mailto:[email protected] -->
   <name>Geometric - Four Point Star</name>
   <icon>star4.png</icon>
@@ -25,4 +25,4 @@
     <svg:polygon style="fill: default" points="0,2.5 1.5,2 2,0.5 2.5,2 4,2.5 2.5,3 2,4.5 1.5,3 "/>
     <svg:polygon style="stroke-width: 0.1; stroke: #000000" points="0,2.5 1.5,2 2,0.5 2.5,2 4,2.5 2.5,3 2,4.5 1.5,3 "/>
   </svg:svg>
-</tqshape>
+</shape>
diff --git a/kivio/kiviopart/stencils/Dia/Assorted/star5.shape b/kivio/kiviopart/stencils/Dia/Assorted/star5.shape
index 379b74c6..20d55b99 100644
--- a/kivio/kiviopart/stencils/Dia/Assorted/star5.shape
+++ b/kivio/kiviopart/stencils/Dia/Assorted/star5.shape
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" xmlns:svg="http://www.w3.org/2000/svg">
+<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg">
 <!-- Author: Alan Horkan, 2002, mailto:[email protected] -->
   <name>Geometric - Five Point Star</name>
   <!-- Eventually decided that it was better to get these done than worry about them being perfect -->
@@ -50,5 +50,5 @@
     <svg:polygon style="stroke-width: 0.1; stroke: #000000" points="0,4.5 5,4.5 7,0 9,4.5 14,4.5 10,7.5 12,12.5 7,9 2,12.5 4,7.5 "/>
   </svg:svg>
   <!-- Alan Horkan was here 2002 -->
-</tqshape>
+</shape>
 
diff --git a/kivio/kiviopart/stencils/Dia/Assorted/star6.shape b/kivio/kiviopart/stencils/Dia/Assorted/star6.shape
index 2c2f5cac..bbaf2853 100644
--- a/kivio/kiviopart/stencils/Dia/Assorted/star6.shape
+++ b/kivio/kiviopart/stencils/Dia/Assorted/star6.shape
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" xmlns:svg="http://www.w3.org/2000/svg">
+<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg">
 <!-- Author: Alan Horkan, 2002, mailto:[email protected] -->
   <name>Geometric - Six Point Star</name><!-- aka Star of David -->
   <icon>star6.png</icon>
@@ -56,4 +56,4 @@
     <svg:polygon style="fill: default" points="0,1 1,1 1.5,0 2,1 3,1 2.5,2 3,3 2,3 1.5,4 1,3 0,3 0.5,2 "/>
     <svg:polygon style="stroke-width: 0.1; stroke: #000000" points="0,1 1,1 1.5,0 2,1 3,1 2.5,2 3,3 2,3 1.5,4 1,3 0,3 0.5,2 "/>
   </svg:svg>
-</tqshape>
+</shape>
diff --git a/kivio/kiviopart/stencils/Dia/Assorted/star7.shape b/kivio/kiviopart/stencils/Dia/Assorted/star7.shape
index adef753f..cb008f12 100644
--- a/kivio/kiviopart/stencils/Dia/Assorted/star7.shape
+++ b/kivio/kiviopart/stencils/Dia/Assorted/star7.shape
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" xmlns:svg="http://www.w3.org/2000/svg">
+<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg">
 <!-- Author: Alan Horkan, 2002, mailto:[email protected] -->
   <name>Geometric - Seven Point Star</name>
   <!-- It may not be a perfect Heptagon, but it looks good and it is at least Symmetrical.  -->
@@ -65,4 +65,4 @@
     <svg:polygon style="fill: default" points="5,0 6.5,2 9,2 8.5,4.5 10,6.5 8,7 7.5,9.5 5,8 2.5,9.5 2,7 0,6.5 1.5,4.5 1,2 3.5,2 "/>
     <svg:polygon style="stroke-width: 0.1; stroke: #000000" points="5,0 6.5,2 9,2 8.5,4.5 10,6.5 8,7 7.5,9.5 5,8 2.5,9.5 2,7 0,6.5 1.5,4.5 1,2 3.5,2 "/>
   </svg:svg>
-</tqshape>
+</shape>
diff --git a/kivio/kiviopart/stencils/Dia/Assorted/star8.shape b/kivio/kiviopart/stencils/Dia/Assorted/star8.shape
index 80664b5f..b67bdb42 100644
--- a/kivio/kiviopart/stencils/Dia/Assorted/star8.shape
+++ b/kivio/kiviopart/stencils/Dia/Assorted/star8.shape
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" xmlns:svg="http://www.w3.org/2000/svg">
+<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg">
 <!-- Author: Alan Horkan, 2002, mailto:[email protected] -->
   <name>Geometric - Eight Point Star</name>
   <!-- The points all have Nintey Degree Angles -->
@@ -74,4 +74,4 @@
     <svg:polygon style="stroke-width: 0.1; stroke: #000000" points="0,3.5 1,2.5 1,1 2.5,1 3.5,0 4.5,1 6,1 6,2.5 7,3.5 6,4.5 6,6 4.5,6 3.5,7 2.5,6 1,6 1,4.5 "/>
   </svg:svg>
   <!-- Alan Horkan, 2002, [email protected] -->
-</tqshape>
+</shape>
diff --git a/kivio/kiviopart/stencils/Dia/Assorted/star8sharp.shape b/kivio/kiviopart/stencils/Dia/Assorted/star8sharp.shape
index 1e97b53b..c68e257c 100644
--- a/kivio/kiviopart/stencils/Dia/Assorted/star8sharp.shape
+++ b/kivio/kiviopart/stencils/Dia/Assorted/star8sharp.shape
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" xmlns:svg="http://www.w3.org/2000/svg">
+<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg">
 <!-- Author: Alan Horkan, 2002, mailto:[email protected] -->
   <name>Geometric - Sharp Eight Point Star</name>
   <!-- Angles in this Star are much sharper, about Thirty degrees -->
@@ -73,5 +73,5 @@
     <svg:polygon style="fill: default" points="0,7.5 5,6.5 2.5,2.5 6.5,5 7.5,0 8.5,5 12.5,2.5 10,6.5 15,7.5 10,8.5 12.5,12.5 8.5,10 7.5,15 6.5,10 2.5,12.5 5,8.5 "/>
     <svg:polygon style="stroke-width: 0.1; stroke: #000000" points="0,7.5 5,6.5 2.5,2.5 6.5,5 7.5,0 8.5,5 12.5,2.5 10,6.5 15,7.5 10,8.5 12.5,12.5 8.5,10 7.5,15 6.5,10 2.5,12.5 5,8.5 "/>
   </svg:svg>
-</tqshape>
+</shape>
 <!-- Author: Alan Horkan, 2002, mailto:[email protected] -->
diff --git a/kivio/kiviopart/stencils/Dia/Assorted/sun.shape b/kivio/kiviopart/stencils/Dia/Assorted/sun.shape
index b638e315..48ae7b4e 100644
--- a/kivio/kiviopart/stencils/Dia/Assorted/sun.shape
+++ b/kivio/kiviopart/stencils/Dia/Assorted/sun.shape
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" xmlns:svg="http://www.w3.org/2000/svg">
+<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg">
 <!-- Author: Alan Horkan, 2002, mailto:[email protected] -->
   <name>Assorted - Sun</name>
   <icon>sun.png</icon>
@@ -94,7 +94,7 @@
     <point x="1.25" y="5.5"/>
   </connections>
   <aspectratio type="fixed"/>
-  <!-- I orignally used a nice warm gold colour #ffcc00, but tqshape files 
+  <!-- I orignally used a nice warm gold colour #ffcc00, but shape files 
 have to use default if you want to allow the user to change the fill colour -->
   <svg:svg>
     <svg:polygon style="fill: default" points="3.5,0 4,1 3,1 "/>
@@ -116,5 +116,5 @@ have to use default if you want to allow the user to change the fill colour -->
     <svg:polygon style="fill: default" points="2,5.5 1.5,5 1,6 "/>
     <svg:polygon style="stroke-width: 0.1; stroke: #000000" points="2,5.5 1.5,5 1,6 "/>
   </svg:svg>
-</tqshape>
+</shape>
 <!-- Author: Alan Horkan, 2002, mailto:[email protected] -->
diff --git a/kivio/kiviopart/stencils/Dia/Assorted/trapezoid.shape b/kivio/kiviopart/stencils/Dia/Assorted/trapezoid.shape
index 474317f5..fb971a58 100644
--- a/kivio/kiviopart/stencils/Dia/Assorted/trapezoid.shape
+++ b/kivio/kiviopart/stencils/Dia/Assorted/trapezoid.shape
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" xmlns:svg="http://www.w3.org/2000/svg">
+<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg">
 <!-- Author: Alan Horkan, 2002, mailto:[email protected] -->
   <name>Geometric - Trapezoid</name>
   <icon>trapezoid.png</icon>
@@ -18,4 +18,4 @@
     <svg:polygon style="fill: #ffffff" points="1,0 3,0 4,2 0,2 "/>
     <svg:polygon style="stroke-width: 0.1; stroke: #000000" points="1,0 3,0 4,2 0,2 "/>
   </svg:svg>
-</tqshape>
+</shape>
diff --git a/kivio/kiviopart/stencils/Dia/Assorted/triangle-isoceles.shape b/kivio/kiviopart/stencils/Dia/Assorted/triangle-isoceles.shape
index 74245a0c..2708c5c0 100644
--- a/kivio/kiviopart/stencils/Dia/Assorted/triangle-isoceles.shape
+++ b/kivio/kiviopart/stencils/Dia/Assorted/triangle-isoceles.shape
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" xmlns:svg="http://www.w3.org/2000/svg">
+<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg">
 <!-- Author: Alan Horkan, 2002, mailto:[email protected] -->
   <name>Geometric - Isosceles Triangle</name><!-- Triangle with two sides of equal length -->
   <icon>triangle-isoceles.png</icon>
@@ -20,4 +20,4 @@
     <svg:polygon style="fill: default" points="5.5,4 6.5,6 4.5,6 "/>
     <svg:polygon style="stroke-width: 0.1; stroke: #000000" points="5.5,4 6.5,6 4.5,6 "/>
   </svg:svg>
-</tqshape>
+</shape>
diff --git a/kivio/kiviopart/stencils/Dia/Assorted/triangle-rightangle.shape b/kivio/kiviopart/stencils/Dia/Assorted/triangle-rightangle.shape
index 5d38874a..3d7097ac 100644
--- a/kivio/kiviopart/stencils/Dia/Assorted/triangle-rightangle.shape
+++ b/kivio/kiviopart/stencils/Dia/Assorted/triangle-rightangle.shape
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" xmlns:svg="http://www.w3.org/2000/svg">
+<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg">
 <!-- Author: Alan Horkan, 2002, mailto:[email protected] -->
   <name>Geometric - Right Angle Triangle</name>
   <icon>triangle-rightangle.png</icon>
@@ -18,5 +18,5 @@
     <svg:polygon style="fill: #ffffff" points="0,2 2,2 0,0 "/>
     <svg:polygon style="stroke-width: 0.1; stroke: #000000" points="0,2 2,2 0,0 "/>
   </svg:svg>
-</tqshape>
+</shape>
 
diff --git a/kivio/kiviopart/stencils/Dia/Circuit/npn.shape b/kivio/kiviopart/stencils/Dia/Circuit/npn.shape
index d57fe166..d0636820 100644
--- a/kivio/kiviopart/stencils/Dia/Circuit/npn.shape
+++ b/kivio/kiviopart/stencils/Dia/Circuit/npn.shape
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 
-<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns"
+<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
        xmlns:svg="http://www.w3.org/2000/svg">
   <name>Circuit - NPN Transistor</name>
   <!--
@@ -24,5 +24,5 @@
 
     <svg:polyline points="5,4 6,4 5.6154,3.0769" />
   </svg:svg>
-</tqshape>
+</shape>
 
diff --git a/kivio/kiviopart/stencils/Dia/Circuit/opamp.shape b/kivio/kiviopart/stencils/Dia/Circuit/opamp.shape
index 756cf865..f6e83ce1 100644
--- a/kivio/kiviopart/stencils/Dia/Circuit/opamp.shape
+++ b/kivio/kiviopart/stencils/Dia/Circuit/opamp.shape
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 
-<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns"
+<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
        xmlns:svg="http://www.w3.org/2000/svg">
   <name>Circuit - Op Amp</name>
   <description>An operational amplifier</description>
@@ -22,5 +22,5 @@
     <svg:line x1="1.2" y1="1" x2="2" y2="1" />
     <svg:line x1="4.5" y1="0" x2="5.5" y2="0" />
   </svg:svg>
-</tqshape>
+</shape>
 
diff --git a/kivio/kiviopart/stencils/Dia/Circuit/pnp.shape b/kivio/kiviopart/stencils/Dia/Circuit/pnp.shape
index c89b7832..3e0e59ef 100644
--- a/kivio/kiviopart/stencils/Dia/Circuit/pnp.shape
+++ b/kivio/kiviopart/stencils/Dia/Circuit/pnp.shape
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 
-<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns"
+<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
        xmlns:svg="http://www.w3.org/2000/svg">
   <name>Circuit - PNP Transistor</name>
   <!--
@@ -24,5 +24,5 @@
 
     <svg:polyline points="4,2 3,2 3.3846,2.9231" />
   </svg:svg>
-</tqshape>
+</shape>
 
diff --git a/kivio/kiviopart/stencils/Dia/Civil/civil_arrow_right.shape b/kivio/kiviopart/stencils/Dia/Civil/civil_arrow_right.shape
index 66f3b1ba..9032094b 100644
--- a/kivio/kiviopart/stencils/Dia/Civil/civil_arrow_right.shape
+++ b/kivio/kiviopart/stencils/Dia/Civil/civil_arrow_right.shape
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns"
+<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
 xmlns:svg="http://www.w3.org/2000/svg">
   <name>Civil - Right Arrow</name>
 
@@ -78,5 +78,5 @@ xmlns:svg="http://www.w3.org/2000/svg">
     <svg:polygon style="stroke-width: 1; stroke: foreground"
     points="0,0.5 1.5,0.5 2,0.5 2,0 3,1 2,2 2,1.5 0,1.5 " />
   </svg:svg>
-</tqshape>
+</shape>
 
diff --git a/kivio/kiviopart/stencils/Dia/Civil/civil_arrow_up.shape b/kivio/kiviopart/stencils/Dia/Civil/civil_arrow_up.shape
index 2053db21..b1a15619 100644
--- a/kivio/kiviopart/stencils/Dia/Civil/civil_arrow_up.shape
+++ b/kivio/kiviopart/stencils/Dia/Civil/civil_arrow_up.shape
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns"
+<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
 xmlns:svg="http://www.w3.org/2000/svg">
   <name>Civil - Up Arrow</name>
 
@@ -76,5 +76,5 @@ xmlns:svg="http://www.w3.org/2000/svg">
     <svg:polygon style="stroke-width: 1; stroke: foreground"
     points="0.5,3 0.5,1 0,1 1,0 1,0 2,1 1.5,1 1.5,3 " />
   </svg:svg>
-</tqshape>
+</shape>
 
diff --git a/kivio/kiviopart/stencils/Dia/Civil/civil_backflow_preventer.shape b/kivio/kiviopart/stencils/Dia/Civil/civil_backflow_preventer.shape
index 5abe7185..9168966d 100644
--- a/kivio/kiviopart/stencils/Dia/Civil/civil_backflow_preventer.shape
+++ b/kivio/kiviopart/stencils/Dia/Civil/civil_backflow_preventer.shape
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns"
+<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
 xmlns:svg="http://www.w3.org/2000/svg">
   <name>Civil - Backflow Preventer</name>
 
@@ -55,5 +55,5 @@ xmlns:svg="http://www.w3.org/2000/svg">
     <svg:line style="stroke-width: 1; stroke: #000000" x1="0.2"
     y1="0.8" x2="0.8" y2="0.2" />
   </svg:svg>
-</tqshape>
+</shape>
 
diff --git a/kivio/kiviopart/stencils/Dia/Civil/civil_basin.shape b/kivio/kiviopart/stencils/Dia/Civil/civil_basin.shape
index 0d7c4231..ea4d47a9 100644
--- a/kivio/kiviopart/stencils/Dia/Civil/civil_basin.shape
+++ b/kivio/kiviopart/stencils/Dia/Civil/civil_basin.shape
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns"
+<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
 xmlns:svg="http://www.w3.org/2000/svg">
   <name>Civil - Basin</name>
 
@@ -74,5 +74,5 @@ xmlns:svg="http://www.w3.org/2000/svg">
     <svg:polygon style="stroke-width: 1; stroke: #000000"
     points="0,0 0.2,0 0.2,2.8 4.8,2.8 4.8,0 5,0 5,3 0,3 " />
   </svg:svg>
-</tqshape>
+</shape>
 
diff --git a/kivio/kiviopart/stencils/Dia/Civil/civil_final-settling_basin.shape b/kivio/kiviopart/stencils/Dia/Civil/civil_final-settling_basin.shape
index 5add8f35..84a2002f 100644
--- a/kivio/kiviopart/stencils/Dia/Civil/civil_final-settling_basin.shape
+++ b/kivio/kiviopart/stencils/Dia/Civil/civil_final-settling_basin.shape
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns"
+<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
 xmlns:svg="http://www.w3.org/2000/svg">
   <name>Civil - Final-Settling Basin</name>
 
@@ -106,5 +106,5 @@ xmlns:svg="http://www.w3.org/2000/svg">
     style="stroke-width: 1; stroke: foreground; fill: background"
     points="0,0 0.3,0 0.3,1.9 1.4,3.7 1.6,3.7 2.7,1.9 2.7,0 3,0 3,2 1.8,4 1.2,4 0,2 " />
   </svg:svg>
-</tqshape>
+</shape>
 
diff --git a/kivio/kiviopart/stencils/Dia/Civil/civil_frequency_converter.shape b/kivio/kiviopart/stencils/Dia/Civil/civil_frequency_converter.shape
index bdfcb107..ac143720 100644
--- a/kivio/kiviopart/stencils/Dia/Civil/civil_frequency_converter.shape
+++ b/kivio/kiviopart/stencils/Dia/Civil/civil_frequency_converter.shape
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns"
+<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
 xmlns:svg="http://www.w3.org/2000/svg">
   <name>Civil - Frequency Converter</name>
 
@@ -57,5 +57,5 @@ xmlns:svg="http://www.w3.org/2000/svg">
     <svg:line style="stroke-width: 1; stroke: #000000" x1="0" y1="2"
     x2="3" y2="0" />
   </svg:svg>
-</tqshape>
+</shape>
 
diff --git a/kivio/kiviopart/stencils/Dia/Civil/civil_horizontal_valve.shape b/kivio/kiviopart/stencils/Dia/Civil/civil_horizontal_valve.shape
index bbe4d3dc..83d94349 100644
--- a/kivio/kiviopart/stencils/Dia/Civil/civil_horizontal_valve.shape
+++ b/kivio/kiviopart/stencils/Dia/Civil/civil_horizontal_valve.shape
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns"
+<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
 xmlns:svg="http://www.w3.org/2000/svg">
   <name>Civil -Qt::Horizontal Valve</name>
 
@@ -62,5 +62,5 @@ xmlns:svg="http://www.w3.org/2000/svg">
     <svg:polygon style="stroke-width: 1; stroke: foreground"
     points="0,1 0,0 0.5,0.5 1,0 1,1 0.5,0.5 " />
   </svg:svg>
-</tqshape>
+</shape>
 
diff --git a/kivio/kiviopart/stencils/Dia/Civil/civil_motor.shape b/kivio/kiviopart/stencils/Dia/Civil/civil_motor.shape
index beec8aa1..270628be 100644
--- a/kivio/kiviopart/stencils/Dia/Civil/civil_motor.shape
+++ b/kivio/kiviopart/stencils/Dia/Civil/civil_motor.shape
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns"
+<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
 xmlns:svg="http://www.w3.org/2000/svg">
   <name>Civil - Motor</name>
 
@@ -53,5 +53,5 @@ xmlns:svg="http://www.w3.org/2000/svg">
     <svg:polyline style="stroke-width: 1; stroke: #000000"
     points="0.3,0.7 0.3,0.3 0.5,0.5 0.7,0.3 0.7,0.7 " />
   </svg:svg>
-</tqshape>
+</shape>
 
diff --git a/kivio/kiviopart/stencils/Dia/Civil/civil_preliminary_clarification_tank.shape b/kivio/kiviopart/stencils/Dia/Civil/civil_preliminary_clarification_tank.shape
index c78f62f0..36c4f89b 100644
--- a/kivio/kiviopart/stencils/Dia/Civil/civil_preliminary_clarification_tank.shape
+++ b/kivio/kiviopart/stencils/Dia/Civil/civil_preliminary_clarification_tank.shape
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns"
+<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
 xmlns:svg="http://www.w3.org/2000/svg">
   <name>Civil - Preliminary Clarification Tank</name>
 
@@ -257,5 +257,5 @@ xmlns:svg="http://www.w3.org/2000/svg">
     <svg:line style="stroke-width: 0.5; stroke: #000000" x1="3.4"
     y1="0.4" x2="5.8" y2="0.4" />
   </svg:svg>
-</tqshape>
+</shape>
 
diff --git a/kivio/kiviopart/stencils/Dia/Civil/civil_rotor.shape b/kivio/kiviopart/stencils/Dia/Civil/civil_rotor.shape
index a721ed0e..4f0f98df 100644
--- a/kivio/kiviopart/stencils/Dia/Civil/civil_rotor.shape
+++ b/kivio/kiviopart/stencils/Dia/Civil/civil_rotor.shape
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns"
+<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
 xmlns:svg="http://www.w3.org/2000/svg">
   <name>Civil - Rotor</name>
 
@@ -104,5 +104,5 @@ xmlns:svg="http://www.w3.org/2000/svg">
     <svg:line style="stroke-width: 1; stroke: #000000" x1="2.20711"
     y1="0.792893" x2="2.56066" y2="0.43934" />
   </svg:svg>
-</tqshape>
+</shape>
 
diff --git a/kivio/kiviopart/stencils/Dia/Civil/civil_soil.shape b/kivio/kiviopart/stencils/Dia/Civil/civil_soil.shape
index 03f859e5..a658df14 100644
--- a/kivio/kiviopart/stencils/Dia/Civil/civil_soil.shape
+++ b/kivio/kiviopart/stencils/Dia/Civil/civil_soil.shape
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns"
+<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
 xmlns:svg="http://www.w3.org/2000/svg">
   <name>Civil - Soil</name>
 
@@ -71,5 +71,5 @@ xmlns:svg="http://www.w3.org/2000/svg">
     <svg:line style="stroke-width: 0.8; stroke: foreground"
     x1="2.36192" y1="0" x2="1.75837" y2="1" />
   </svg:svg>
-</tqshape>
+</shape>
 
diff --git a/kivio/kiviopart/stencils/Dia/Contact/c_if.shape b/kivio/kiviopart/stencils/Dia/Contact/c_if.shape
index 43b9495f..57cdbdb7 100644
--- a/kivio/kiviopart/stencils/Dia/Contact/c_if.shape
+++ b/kivio/kiviopart/stencils/Dia/Contact/c_if.shape
@@ -1,6 +1,6 @@
 <?xml version="1.0"?> <!-- -*- xml -*- -->
 
-<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns"
+<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
        xmlns:svg="http://www.w3.org/2000/svg">
   <name>Contact - if</name> <!-- XXX - OBSOLETE -->
   <description>if</description>
@@ -18,6 +18,6 @@
     <svg:polyline points="-2,0 -.75,0" />
     <svg:polyline points="-1,1 1,0 2,0 "/>
   </svg:svg>
-</tqshape>
+</shape>
 
 
diff --git a/kivio/kiviopart/stencils/Dia/Contact/c_ifnot.shape b/kivio/kiviopart/stencils/Dia/Contact/c_ifnot.shape
index 667e75f6..d8ae4d62 100644
--- a/kivio/kiviopart/stencils/Dia/Contact/c_ifnot.shape
+++ b/kivio/kiviopart/stencils/Dia/Contact/c_ifnot.shape
@@ -1,6 +1,6 @@
 <?xml version="1.0"?> <!-- -*- xml -*- -->
 
-<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns"
+<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
        xmlns:svg="http://www.w3.org/2000/svg">
   <name>Contact - ifnot</name> <!-- XXX - OBSOLETE -->
   <description>if not</description>
@@ -20,6 +20,6 @@
     <svg:line x1="-.5" y1="-2.2" x2=".5" y2="-2.2" 
 	      svg:style="stroke-width:.05"/>
   </svg:svg>
-</tqshape>
+</shape>
 
 
diff --git a/kivio/kiviopart/stencils/Dia/Contact/c_lamp.shape b/kivio/kiviopart/stencils/Dia/Contact/c_lamp.shape
index 1e3d1042..15cc5257 100644
--- a/kivio/kiviopart/stencils/Dia/Contact/c_lamp.shape
+++ b/kivio/kiviopart/stencils/Dia/Contact/c_lamp.shape
@@ -1,6 +1,6 @@
 <?xml version="1.0"?> <!-- -*- xml -*- -->
 
-<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns"
+<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
        xmlns:svg="http://www.w3.org/2000/svg">
   <name>Contact - lamp</name> <!-- XXX OBSOLETE -->
   <description>lamp</description>
@@ -20,6 +20,6 @@
     <svg:polyline points="-.707,-.707 .707,.707"/>
     <svg:polyline points="-.707,.707 .707,-.707"/>
   </svg:svg>
-</tqshape>
+</shape>
 
 
diff --git a/kivio/kiviopart/stencils/Dia/Contact/c_relay.shape b/kivio/kiviopart/stencils/Dia/Contact/c_relay.shape
index 4016df10..f933cf5b 100644
--- a/kivio/kiviopart/stencils/Dia/Contact/c_relay.shape
+++ b/kivio/kiviopart/stencils/Dia/Contact/c_relay.shape
@@ -1,6 +1,6 @@
 <?xml version="1.0"?> <!-- -*- xml -*- -->
 
-<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns"
+<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
        xmlns:svg="http://www.w3.org/2000/svg">
   <name>Contact - relay</name> <!-- XXX OBSOLETE -->
   <description>relay</description>
@@ -21,6 +21,6 @@
     <svg:rect x="-1" y="-1" width="2" height="2"/>
     <svg:polyline points="-1,.5 1,-.5"/>
   </svg:svg>
-</tqshape>
+</shape>
 
 
diff --git a/kivio/kiviopart/stencils/Dia/Contact/l_ifnot.shape b/kivio/kiviopart/stencils/Dia/Contact/l_ifnot.shape
index 1a7fd4e7..a58db432 100644
--- a/kivio/kiviopart/stencils/Dia/Contact/l_ifnot.shape
+++ b/kivio/kiviopart/stencils/Dia/Contact/l_ifnot.shape
@@ -1,6 +1,6 @@
 <?xml version="1.0"?> <!-- -*- xml -*- -->
 
-<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns"
+<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
        xmlns:svg="http://www.w3.org/2000/svg">
   <name>LADDER - ifnot</name>
   <description>if not</description>
@@ -23,4 +23,4 @@
     <svg:line x1="-.5" y1="-2.2" x2=".5" y2="-2.2" 
 	      svg:style="stroke-width:.05"/>
   </svg:svg>
-</tqshape>
+</shape>
diff --git a/kivio/kiviopart/stencils/Dia/Contact/l_out.shape b/kivio/kiviopart/stencils/Dia/Contact/l_out.shape
index 124c3069..f595cb6a 100644
--- a/kivio/kiviopart/stencils/Dia/Contact/l_out.shape
+++ b/kivio/kiviopart/stencils/Dia/Contact/l_out.shape
@@ -1,6 +1,6 @@
 <?xml version="1.0"?> <!-- -*- xml -*- -->
 
-<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns"
+<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
        xmlns:svg="http://www.w3.org/2000/svg">
   <name>LADDER - out</name>
   <description>out</description>
@@ -22,6 +22,6 @@
     <svg:path d="M .5,.75 C .75,.5 .75,.25 .75,0
 	      C .75,-.25 .75,-.5 .5,-.75" />
   </svg:svg>
-</tqshape>
+</shape>
 
 
diff --git a/kivio/kiviopart/stencils/Dia/Contact/l_outj.shape b/kivio/kiviopart/stencils/Dia/Contact/l_outj.shape
index 49060cdf..427fd724 100644
--- a/kivio/kiviopart/stencils/Dia/Contact/l_outj.shape
+++ b/kivio/kiviopart/stencils/Dia/Contact/l_outj.shape
@@ -1,6 +1,6 @@
 <?xml version="1.0"?> <!-- -*- xml -*- -->
 
-<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns"
+<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
        xmlns:svg="http://www.w3.org/2000/svg">
   <name>LADDER - outj</name>
   <description>out jump</description>
@@ -25,6 +25,6 @@
 	         C .25,.5 .5,.5 .5,.25
 	         L .5,-.5"/>
   </svg:svg>
-</tqshape>
+</shape>
 
 
diff --git a/kivio/kiviopart/stencils/Dia/Contact/l_outnot.shape b/kivio/kiviopart/stencils/Dia/Contact/l_outnot.shape
index 5a360fc5..15c078bd 100644
--- a/kivio/kiviopart/stencils/Dia/Contact/l_outnot.shape
+++ b/kivio/kiviopart/stencils/Dia/Contact/l_outnot.shape
@@ -1,6 +1,6 @@
 <?xml version="1.0"?> <!-- -*- xml -*- -->
 
-<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns"
+<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
        xmlns:svg="http://www.w3.org/2000/svg">
   <name>LADDER - outnot</name>
   <description>outnot</description>
@@ -23,6 +23,6 @@
 	      C .75,-.25 .75,-.5 .5,-.75" />
     <svg:polyline points="-.5,.5 .5,-.5"/>
   </svg:svg>
-</tqshape>
+</shape>
 
 
diff --git a/kivio/kiviopart/stencils/Dia/Contact/l_outr.shape b/kivio/kiviopart/stencils/Dia/Contact/l_outr.shape
index 94761257..830eaae1 100644
--- a/kivio/kiviopart/stencils/Dia/Contact/l_outr.shape
+++ b/kivio/kiviopart/stencils/Dia/Contact/l_outr.shape
@@ -1,6 +1,6 @@
 <?xml version="1.0"?> <!-- -*- xml -*- -->
 
-<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns"
+<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
        xmlns:svg="http://www.w3.org/2000/svg">
   <name>LADDER - outr</name>
   <description>out reset</description>
@@ -28,6 +28,6 @@
     <svg:polyline points="-.5,0 0,0" />
     <svg:path d="M -.25,0 C 0,.25 0,.25 .5,.5"/>
   </svg:svg>
-</tqshape>
+</shape>
 
 
diff --git a/kivio/kiviopart/stencils/Dia/Contact/l_outs.shape b/kivio/kiviopart/stencils/Dia/Contact/l_outs.shape
index 2ef92bd0..03cf0f4f 100644
--- a/kivio/kiviopart/stencils/Dia/Contact/l_outs.shape
+++ b/kivio/kiviopart/stencils/Dia/Contact/l_outs.shape
@@ -1,6 +1,6 @@
 <?xml version="1.0"?> <!-- -*- xml -*- -->
 
-<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns"
+<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
        xmlns:svg="http://www.w3.org/2000/svg">
   <name>LADDER - outs</name>
   <description>out set</description>
@@ -28,6 +28,6 @@
                  C .5,.5 .25,.5 0,.5
                  C -.25,.5 -.5,.5 -.5,.25"/>
   </svg:svg>
-</tqshape>
+</shape>
 
 
diff --git a/kivio/kiviopart/stencils/Dia/Contact/l_sout.shape b/kivio/kiviopart/stencils/Dia/Contact/l_sout.shape
index db9a6228..6635c317 100644
--- a/kivio/kiviopart/stencils/Dia/Contact/l_sout.shape
+++ b/kivio/kiviopart/stencils/Dia/Contact/l_sout.shape
@@ -1,6 +1,6 @@
 <?xml version="1.0"?> <!-- -*- xml -*- -->
 
-<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns"
+<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
        xmlns:svg="http://www.w3.org/2000/svg">
   <name>LADDER - sout</name>
   <description>ps out</description>
@@ -28,7 +28,7 @@
     <svg:path d="M 1.25,-1.125
 	      C 1.375,-1 1.625,-1 1.75,-1.125"/>
   </svg:svg>
-</tqshape>
+</shape>
 
 
 
diff --git a/kivio/kiviopart/stencils/Dia/Contact/l_soutnot.shape b/kivio/kiviopart/stencils/Dia/Contact/l_soutnot.shape
index 5a2f6f18..45fc49a4 100644
--- a/kivio/kiviopart/stencils/Dia/Contact/l_soutnot.shape
+++ b/kivio/kiviopart/stencils/Dia/Contact/l_soutnot.shape
@@ -1,6 +1,6 @@
 <?xml version="1.0"?> <!-- -*- xml -*- -->
 
-<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns"
+<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
        xmlns:svg="http://www.w3.org/2000/svg">
   <name>LADDER - soutnot</name>
   <description>ps outnot</description>
@@ -29,6 +29,6 @@
     <svg:path d="M 1.25,-1.125
 	      C 1.375,-1 1.625,-1 1.75,-1.125"/>
   </svg:svg>
-</tqshape>
+</shape>
 
 
diff --git a/kivio/kiviopart/stencils/Dia/Contact/l_soutr.shape b/kivio/kiviopart/stencils/Dia/Contact/l_soutr.shape
index 8d54e7be..f2c48f8f 100644
--- a/kivio/kiviopart/stencils/Dia/Contact/l_soutr.shape
+++ b/kivio/kiviopart/stencils/Dia/Contact/l_soutr.shape
@@ -1,6 +1,6 @@
 <?xml version="1.0"?> <!-- -*- xml -*- -->
 
-<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns"
+<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
        xmlns:svg="http://www.w3.org/2000/svg">
   <name>LADDER - soutr</name>
   <description>ps out reset</description>
@@ -34,7 +34,7 @@
     <svg:path d="M 1.25,-1.125
 	      C 1.375,-1 1.625,-1 1.75,-1.125"/>
   </svg:svg>
-</tqshape>
+</shape>
 
 
 
diff --git a/kivio/kiviopart/stencils/Dia/Contact/l_souts.shape b/kivio/kiviopart/stencils/Dia/Contact/l_souts.shape
index 0cd35bbb..32520cae 100644
--- a/kivio/kiviopart/stencils/Dia/Contact/l_souts.shape
+++ b/kivio/kiviopart/stencils/Dia/Contact/l_souts.shape
@@ -1,6 +1,6 @@
 <?xml version="1.0"?> <!-- -*- xml -*- -->
 
-<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns"
+<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
        xmlns:svg="http://www.w3.org/2000/svg">
   <name>LADDER - souts</name>
   <description>ps out set</description>
@@ -34,6 +34,6 @@
     <svg:path d="M 1.25,-1.125
 	      C 1.375,-1 1.625,-1 1.75,-1.125"/>
   </svg:svg>
-</tqshape>
+</shape>
 
 
diff --git a/kivio/kiviopart/stencils/Dia/Electric/command.shape b/kivio/kiviopart/stencils/Dia/Electric/command.shape
index 7ea6d2b8..b76f2aa9 100644
--- a/kivio/kiviopart/stencils/Dia/Electric/command.shape
+++ b/kivio/kiviopart/stencils/Dia/Electric/command.shape
@@ -1,6 +1,6 @@
 <?xml version="1.0"?> <!-- -*- xml -*- -->
 
-<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns"
+<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
        xmlns:svg="http://www.w3.org/2000/svg">
   <name>Electric - command</name>
   <description>command</description>
@@ -18,7 +18,7 @@
     <svg:line x1="0" y1=".5" x2="1" y2=".5"/>
     <svg:rect x=".3" y=".2" width=".4" height=".6" svg:style="fill:background"/>
   </svg:svg>
-</tqshape>
+</shape>
 
 
 
diff --git a/kivio/kiviopart/stencils/Dia/Electric/contact_f.shape b/kivio/kiviopart/stencils/Dia/Electric/contact_f.shape
index 31057db1..43208f14 100644
--- a/kivio/kiviopart/stencils/Dia/Electric/contact_f.shape
+++ b/kivio/kiviopart/stencils/Dia/Electric/contact_f.shape
@@ -1,6 +1,6 @@
 <?xml version="1.0"?> <!-- -*- xml -*- -->
 
-<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns"
+<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
        xmlns:svg="http://www.w3.org/2000/svg">
   <name>Electric - contact_f</name>
   <description>contact_f</description>
@@ -18,6 +18,6 @@
     <svg:polyline points="0,.5 .3,.5 .3,.3"/>
     <svg:polyline points="1,.5 .7,.5 .25,.275"/>
   </svg:svg>
-</tqshape>
+</shape>
 
 
diff --git a/kivio/kiviopart/stencils/Dia/Electric/contact_o.shape b/kivio/kiviopart/stencils/Dia/Electric/contact_o.shape
index ee1b2787..d2bea36d 100644
--- a/kivio/kiviopart/stencils/Dia/Electric/contact_o.shape
+++ b/kivio/kiviopart/stencils/Dia/Electric/contact_o.shape
@@ -1,6 +1,6 @@
 <?xml version="1.0"?> <!-- -*- xml -*- -->
 
-<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns"
+<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
        xmlns:svg="http://www.w3.org/2000/svg">
   <name>Electric - contact_o</name>
   <description>contact_o</description>
@@ -17,6 +17,6 @@
     <svg:line x1="0" y1=".5" x2=".3" y2=".5"/>
     <svg:polyline points="1,.5 .7,.5 .3,.7"/>
   </svg:svg>
-</tqshape>
+</shape>
 
 
diff --git a/kivio/kiviopart/stencils/Dia/Electric/intpos_f.shape b/kivio/kiviopart/stencils/Dia/Electric/intpos_f.shape
index 081ae768..87aa6861 100644
--- a/kivio/kiviopart/stencils/Dia/Electric/intpos_f.shape
+++ b/kivio/kiviopart/stencils/Dia/Electric/intpos_f.shape
@@ -1,6 +1,6 @@
 <?xml version="1.0"?> <!-- -*- xml -*- -->
 
-<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns"
+<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
        xmlns:svg="http://www.w3.org/2000/svg">
   <name>Electric - intpos_f</name>
   <description>intpos_f</description>
@@ -20,6 +20,6 @@
     <svg:polyline points="1,.5 .7,.5 .25,.275"/>
     <svg:polyline points=".6,.45 .35,.45 .4,.35"/>
   </svg:svg>
-</tqshape>
+</shape>
 
 
diff --git a/kivio/kiviopart/stencils/Dia/Electric/intpos_o.shape b/kivio/kiviopart/stencils/Dia/Electric/intpos_o.shape
index 086de61b..ceb72cb5 100644
--- a/kivio/kiviopart/stencils/Dia/Electric/intpos_o.shape
+++ b/kivio/kiviopart/stencils/Dia/Electric/intpos_o.shape
@@ -1,6 +1,6 @@
 <?xml version="1.0"?> <!-- -*- xml -*- -->
 
-<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns"
+<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
        xmlns:svg="http://www.w3.org/2000/svg">
   <name>Electric - intpos_o</name>
   <description>intpos_o</description>
@@ -19,6 +19,6 @@
     <svg:polyline points="1,.5 .7,.5 .3,.7"/>
     <svg:polyline points=".6,.55 .45,.75 .4,.65"/>
   </svg:svg>
-</tqshape>
+</shape>
 
 
diff --git a/kivio/kiviopart/stencils/Dia/Electric/relay.shape b/kivio/kiviopart/stencils/Dia/Electric/relay.shape
index 0a9461fb..0d506ff9 100644
--- a/kivio/kiviopart/stencils/Dia/Electric/relay.shape
+++ b/kivio/kiviopart/stencils/Dia/Electric/relay.shape
@@ -1,6 +1,6 @@
 <?xml version="1.0"?> <!-- -*- xml -*- -->
 
-<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns"
+<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
        xmlns:svg="http://www.w3.org/2000/svg">
   <name>Electric - relay</name>
   <description>relay</description>
@@ -19,7 +19,7 @@
     <svg:rect x=".3" y=".2" width=".4" height=".6" svg:style="fill:background"/>
     <svg:line x1=".3" y1=".6" x2=".7" y2=".4"/>
   </svg:svg>
-</tqshape>
+</shape>
 
 
 
diff --git a/kivio/kiviopart/stencils/Dia/MSE/demultiplexer.shape b/kivio/kiviopart/stencils/Dia/MSE/demultiplexer.shape
index 4f8d788c..ea8ee9bf 100644
--- a/kivio/kiviopart/stencils/Dia/MSE/demultiplexer.shape
+++ b/kivio/kiviopart/stencils/Dia/MSE/demultiplexer.shape
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 
-<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns"
+<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
        xmlns:svg="http://www.w3.org/2000/svg">
   <name>Demultiplexer</name>
   <description>Demultiplexer</description>
@@ -24,4 +24,4 @@
     <svg:line x1="10" y1="5" x2="0" y2="10"/>
     <svg:line x1="0" y1="0" x2="0" y2="10"/>
   </svg:svg>
-</tqshape>
+</shape>
diff --git a/kivio/kiviopart/stencils/Dia/MSE/large_extension_node.shape b/kivio/kiviopart/stencils/Dia/MSE/large_extension_node.shape
index 96f90015..364565ff 100644
--- a/kivio/kiviopart/stencils/Dia/MSE/large_extension_node.shape
+++ b/kivio/kiviopart/stencils/Dia/MSE/large_extension_node.shape
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 
-<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns"
+<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
        xmlns:svg="http://www.w3.org/2000/svg">
   <name>Large Extension Node</name>
   <description>Large Extension Node</description>
@@ -26,5 +26,5 @@
     <svg:line x1="1" y1="1" x2="1" y2="5"/>
     <svg:line x1="7" y1="1" x2="7" y2="5"/>
   </svg:svg>
-</tqshape>
+</shape>
 
diff --git a/kivio/kiviopart/stencils/Dia/MSE/multiplexer.shape b/kivio/kiviopart/stencils/Dia/MSE/multiplexer.shape
index 9483a7df..371eef0d 100644
--- a/kivio/kiviopart/stencils/Dia/MSE/multiplexer.shape
+++ b/kivio/kiviopart/stencils/Dia/MSE/multiplexer.shape
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 
-<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns"
+<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
        xmlns:svg="http://www.w3.org/2000/svg">
   <name>Multiplexer</name>
   <description>Multiplexer</description>
@@ -24,4 +24,4 @@
     <svg:line x1="0" y1="5" x2="10" y2="10"/>
     <svg:line x1="10" y1="0" x2="10" y2="10"/>
   </svg:svg>
-</tqshape>
+</shape>
diff --git a/kivio/kiviopart/stencils/Dia/MSE/node_center.shape b/kivio/kiviopart/stencils/Dia/MSE/node_center.shape
index 3f59d4ca..31a84511 100644
--- a/kivio/kiviopart/stencils/Dia/MSE/node_center.shape
+++ b/kivio/kiviopart/stencils/Dia/MSE/node_center.shape
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 
-<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns"
+<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
        xmlns:svg="http://www.w3.org/2000/svg">
   <name>Node Center</name>
   <description>Node Center</description>
@@ -22,4 +22,4 @@
     <svg:line x1="5" y1="10" x2="9.330126" y2="2.5"/>
     <svg:line x1="0.669874" y1="2.5" x2="9.330126" y2="2.5"/>
   </svg:svg>
-</tqshape>
+</shape>
diff --git a/kivio/kiviopart/stencils/Dia/MSE/small_extension_node.shape b/kivio/kiviopart/stencils/Dia/MSE/small_extension_node.shape
index 1513e25b..19a8b68e 100644
--- a/kivio/kiviopart/stencils/Dia/MSE/small_extension_node.shape
+++ b/kivio/kiviopart/stencils/Dia/MSE/small_extension_node.shape
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 
-<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns"
+<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
        xmlns:svg="http://www.w3.org/2000/svg">
   <name>Small Extension Node</name>
   <description>Small Extension Node</description>
@@ -21,5 +21,5 @@
     <svg:line x1="0" y1="0" x2="0" y2="6"/>
     <svg:line x1="8" y1="0" x2="8" y2="6"/>
   </svg:svg>
-</tqshape>
+</shape>
 
diff --git a/kivio/kiviopart/stencils/Dia/MSE/tacsat.shape b/kivio/kiviopart/stencils/Dia/MSE/tacsat.shape
index 411bd80a..2964a28b 100644
--- a/kivio/kiviopart/stencils/Dia/MSE/tacsat.shape
+++ b/kivio/kiviopart/stencils/Dia/MSE/tacsat.shape
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 
-<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns"
+<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
        xmlns:svg="http://www.w3.org/2000/svg">
   <name>Tactical Satellite Communications Terminal</name>
   <description>Tactical Satellite Communications Terminal</description>
@@ -24,4 +24,4 @@
 
     <svg:path d="M 3,0 C 0.5,2.5 8.5,10.5 11,8"/>
   </svg:svg>
-</tqshape>
+</shape>
diff --git a/kivio/kiviopart/stencils/Dia/Network/dat_external.shape b/kivio/kiviopart/stencils/Dia/Network/dat_external.shape
index c768f038..39d6a058 100644
--- a/kivio/kiviopart/stencils/Dia/Network/dat_external.shape
+++ b/kivio/kiviopart/stencils/Dia/Network/dat_external.shape
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns"
+<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
        xmlns:svg="http://www.w3.org/2000/svg">
   <name>Network - An external DAT drive</name>
   <icon>dat_external.xpm</icon>
@@ -33,4 +33,4 @@
     <svg:line style="stroke-width: 0.1; stroke: #000000" x1="13.5" y1="6" x2="1.5" y2="6"/>
     <svg:line style="stroke-width: 0.1; stroke: #000000" x1="1.5" y1="6.5" x2="13.5" y2="6.5"/>
   </svg:svg>
-</tqshape>
+</shape>
diff --git a/kivio/kiviopart/stencils/Dia/Network/digitizing_board.shape b/kivio/kiviopart/stencils/Dia/Network/digitizing_board.shape
index 7b2b8e22..0b7f7ded 100644
--- a/kivio/kiviopart/stencils/Dia/Network/digitizing_board.shape
+++ b/kivio/kiviopart/stencils/Dia/Network/digitizing_board.shape
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" xmlns:svg="http://www.w3.org/2000/svg">
+<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg">
   <name>Network - Digitizing Board</name>
   <icon>digitizing_board.png</icon>
   <connections>
@@ -30,4 +30,4 @@
     <svg:rect style="fill: #4c4c4c" x="10" y="9" width="3" height="0.5"/>
     <svg:rect style="stroke-width: 0.1; stroke: foreground" x="10" y="9" width="3" height="0.5"/>
   </svg:svg>
-</tqshape>
+</shape>
diff --git a/kivio/kiviopart/stencils/Dia/Network/diskette.shape b/kivio/kiviopart/stencils/Dia/Network/diskette.shape
index 280da134..904760e0 100644
--- a/kivio/kiviopart/stencils/Dia/Network/diskette.shape
+++ b/kivio/kiviopart/stencils/Dia/Network/diskette.shape
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns"
+<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
        xmlns:svg="http://www.w3.org/2000/svg">
   <name>Network - A Diskette</name>
   <icon>diskette.xpm</icon>
@@ -35,4 +35,4 @@
     <svg:line style="stroke-width: 0.1; stroke: #000000" x1="3" y1="6" x2="13" y2="6"/>
     <svg:line style="stroke-width: 0.1; stroke: #000000" x1="13" y1="8" x2="3" y2="8"/>
   </svg:svg>
-</tqshape>
+</shape>
diff --git a/kivio/kiviopart/stencils/Dia/Network/firewall.shape b/kivio/kiviopart/stencils/Dia/Network/firewall.shape
index 53734fbc..ea128a59 100644
--- a/kivio/kiviopart/stencils/Dia/Network/firewall.shape
+++ b/kivio/kiviopart/stencils/Dia/Network/firewall.shape
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns"
+<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
        xmlns:svg="http://www.w3.org/2000/svg">
   <name>Network - Firewall</name>
   <icon>firewall.xpm</icon>
@@ -78,4 +78,4 @@
     <svg:polyline style="stroke:foreground; stroke-width:.5"
     points="0,0 .125,-.125 1.125,-.125,1.125,1.875 1,2 0,2 0,0"/>
   </svg:svg>
-</tqshape>
+</shape>
diff --git a/kivio/kiviopart/stencils/Dia/Network/hub.shape b/kivio/kiviopart/stencils/Dia/Network/hub.shape
index b2faadbb..62c624f1 100644
--- a/kivio/kiviopart/stencils/Dia/Network/hub.shape
+++ b/kivio/kiviopart/stencils/Dia/Network/hub.shape
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns"
+<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
        xmlns:svg="http://www.w3.org/2000/svg">
   <name>Network - Hub</name>
   <icon>hub.xpm</icon>
@@ -37,5 +37,5 @@
     <svg:rect style="stroke:none; fill:foreground"
      x="4" y=".75" width=".25" height=".24"/>
   </svg:svg>
-</tqshape>
+</shape>
 
diff --git a/kivio/kiviopart/stencils/Dia/Network/mobile_phone.shape b/kivio/kiviopart/stencils/Dia/Network/mobile_phone.shape
index 431c5efd..ba006a8f 100644
--- a/kivio/kiviopart/stencils/Dia/Network/mobile_phone.shape
+++ b/kivio/kiviopart/stencils/Dia/Network/mobile_phone.shape
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns"
+<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
        xmlns:svg="http://www.w3.org/2000/svg">
   <name>Network - A Mobile Phone</name>
   <icon>mobile_phone.xpm</icon>
@@ -59,4 +59,4 @@
     <svg:rect style="fill: #d0f4e5" x="5.5" y="11.5" width="2" height="2"/>
     <svg:rect style="stroke-width: 0.1; stroke: #000000" x="5.5" y="11.5" width="2" height="2"/>
   </svg:svg>
-</tqshape>
+</shape>
diff --git a/kivio/kiviopart/stencils/Dia/Network/monitor.shape b/kivio/kiviopart/stencils/Dia/Network/monitor.shape
index fcc21c3a..66fc1734 100644
--- a/kivio/kiviopart/stencils/Dia/Network/monitor.shape
+++ b/kivio/kiviopart/stencils/Dia/Network/monitor.shape
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns"
+<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
        xmlns:svg="http://www.w3.org/2000/svg">
   <name>Network - A Workstation Monitor</name>
   <icon>monitor.xpm</icon>
@@ -28,4 +28,4 @@
     <svg:rect style="fill: #d9d9cd" x="3" y="17" width="12" height="1"/>
     <svg:rect style="stroke-width: 0.1; stroke: #000000" x="3" y="17" width="12" height="1"/>
   </svg:svg>
-</tqshape>
+</shape>
diff --git a/kivio/kiviopart/stencils/Dia/Network/pc_bigtower.shape b/kivio/kiviopart/stencils/Dia/Network/pc_bigtower.shape
index 2b2025ea..639f4b7a 100644
--- a/kivio/kiviopart/stencils/Dia/Network/pc_bigtower.shape
+++ b/kivio/kiviopart/stencils/Dia/Network/pc_bigtower.shape
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns"
+<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
        xmlns:svg="http://www.w3.org/2000/svg">
   <name>Network - A Bigtower PC</name>
   <icon>pc_bigtower.xpm</icon>
@@ -63,4 +63,4 @@
     <svg:line style="stroke-width: 0.1; stroke: #000000" x1="2.5" y1="23.5" x2="11.5" y2="23.5"/>
     <svg:line style="stroke-width: 0.1; stroke: #000000" x1="11.5" y1="23" x2="2.5" y2="23"/>
   </svg:svg>
-</tqshape>
+</shape>
diff --git a/kivio/kiviopart/stencils/Dia/Network/pc_desktop.shape b/kivio/kiviopart/stencils/Dia/Network/pc_desktop.shape
index 7a3c7455..5847b063 100644
--- a/kivio/kiviopart/stencils/Dia/Network/pc_desktop.shape
+++ b/kivio/kiviopart/stencils/Dia/Network/pc_desktop.shape
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns"
+<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
        xmlns:svg="http://www.w3.org/2000/svg">
   <name>Network - A Desktop PC</name>
   <icon>pc_desktop.xpm</icon>
@@ -49,4 +49,4 @@
     <svg:line style="stroke-width: 0.1; stroke: #000000" x1="11.5" y1="5.5" x2="11.5" y2="5"/>
     <svg:line style="stroke-width: 0.1; stroke: #000000" x1="11.5" y1="1.5" x2="11.5" y2="1"/>
   </svg:svg>
-</tqshape>
+</shape>
diff --git a/kivio/kiviopart/stencils/Dia/Network/pc_miditower.shape b/kivio/kiviopart/stencils/Dia/Network/pc_miditower.shape
index 409c6e12..daed926e 100644
--- a/kivio/kiviopart/stencils/Dia/Network/pc_miditower.shape
+++ b/kivio/kiviopart/stencils/Dia/Network/pc_miditower.shape
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns"
+<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
        xmlns:svg="http://www.w3.org/2000/svg">
   <name>Network - A Midi-tower PC</name>
   <icon>pc_miditower.xpm</icon>
@@ -54,4 +54,4 @@
     <svg:line style="stroke-width: 0.1; stroke: #000000" x1="2.5" y1="17" x2="11.5" y2="17"/>
     <svg:line style="stroke-width: 0.1; stroke: #000000" x1="11.5" y1="16.5" x2="2.5" y2="16.5"/>
   </svg:svg>
-</tqshape>
+</shape>
diff --git a/kivio/kiviopart/stencils/Dia/Network/pc_minitower.shape b/kivio/kiviopart/stencils/Dia/Network/pc_minitower.shape
index 6b33ec5f..683e4ee1 100644
--- a/kivio/kiviopart/stencils/Dia/Network/pc_minitower.shape
+++ b/kivio/kiviopart/stencils/Dia/Network/pc_minitower.shape
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns"
+<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
        xmlns:svg="http://www.w3.org/2000/svg">
   <name>Network - A Minitower PC</name>
   <icon>pc_minitower.xpm</icon>
@@ -52,4 +52,4 @@
    <svg:line style="stroke-width: 0.1; stroke: #000000" x1="2" y1="8" x2="2.5" y2="8"/>
    <svg:line style="stroke-width: 0.1; stroke: #000000" x1="6" y1="8" x2="6.5" y2="8"/>
   </svg:svg>
-</tqshape>
+</shape>
diff --git a/kivio/kiviopart/stencils/Dia/Network/plotter.shape b/kivio/kiviopart/stencils/Dia/Network/plotter.shape
index 3c0cc737..ed64d2eb 100644
--- a/kivio/kiviopart/stencils/Dia/Network/plotter.shape
+++ b/kivio/kiviopart/stencils/Dia/Network/plotter.shape
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" xmlns:svg="http://www.w3.org/2000/svg">
+<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg">
   <name>Network - Plotter</name>
   <icon>plotter.png</icon>
   <connections>
@@ -41,4 +41,4 @@
     <svg:polyline style="stroke-width: 0.1; stroke: foreground" points="12.5,10.5 12.5,7.5 13.5,7.5 13.5,10.5 "/>
     <svg:polyline style="stroke-width: 0.1; stroke: foreground" points="14,10.5 14,7.5 15,7.5 15,10.5 "/>
   </svg:svg>
-</tqshape>
+</shape>
diff --git a/kivio/kiviopart/stencils/Dia/Network/workstation.shape b/kivio/kiviopart/stencils/Dia/Network/workstation.shape
index 19003b8e..109a0651 100644
--- a/kivio/kiviopart/stencils/Dia/Network/workstation.shape
+++ b/kivio/kiviopart/stencils/Dia/Network/workstation.shape
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns"
+<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
        xmlns:svg="http://www.w3.org/2000/svg">
   <name>Network - A Workstation</name>
   <icon>workstation.xpm</icon>
@@ -56,4 +56,4 @@
     <svg:rect style="fill: #cdcdcd" x="5" y="2" width="9" height="1"/>
     <svg:rect style="stroke-width: 0.1; stroke: #000000" x="5" y="2" width="9" height="1"/>
   </svg:svg>
-</tqshape>
+</shape>
diff --git a/kivio/kiviopart/stencils/Dia/Network/zip-disk.shape b/kivio/kiviopart/stencils/Dia/Network/zip-disk.shape
index e317f3e1..c071d1ca 100644
--- a/kivio/kiviopart/stencils/Dia/Network/zip-disk.shape
+++ b/kivio/kiviopart/stencils/Dia/Network/zip-disk.shape
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns"
+<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
        xmlns:svg="http://www.w3.org/2000/svg">
   <name>Network - A ZIP Disk</name>
   <icon>zip-disk.xpm</icon>
@@ -46,4 +46,4 @@
     <svg:line style="stroke-width: 0.1; stroke: #000000" x1="2" y1="4.375" x2="2" y2="9.875"/>
     <svg:line style="stroke-width: 0.1; stroke: #000000" x1="7.75" y1="4.375" x2="7.75" y2="9.85"/>
   </svg:svg>
-</tqshape>
+</shape>
diff --git a/kivio/kiviopart/stencils/Dia/Pneumatic/dejack.shape b/kivio/kiviopart/stencils/Dia/Pneumatic/dejack.shape
index fe6bc807..25a05e72 100644
--- a/kivio/kiviopart/stencils/Dia/Pneumatic/dejack.shape
+++ b/kivio/kiviopart/stencils/Dia/Pneumatic/dejack.shape
@@ -1,6 +1,6 @@
 <?xml version="1.0"?> <!-- -*- xml -*- -->
 
-<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns"
+<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
        xmlns:svg="http://www.w3.org/2000/svg">
   <name>Pneum - DEJack</name>
   <description>dejack</description>
@@ -25,6 +25,6 @@
     <svg:rect x=".4" y=".2" width="2.6" height=".8" 
 	      svg:style="stroke-width: 1.0"/>
   </svg:svg>
-</tqshape>
+</shape>
 
 
diff --git a/kivio/kiviopart/stencils/Dia/Pneumatic/dist32.shape b/kivio/kiviopart/stencils/Dia/Pneumatic/dist32.shape
index 0f484add..f0fd67e2 100644
--- a/kivio/kiviopart/stencils/Dia/Pneumatic/dist32.shape
+++ b/kivio/kiviopart/stencils/Dia/Pneumatic/dist32.shape
@@ -1,6 +1,6 @@
 <?xml version="1.0"?> <!-- -*- xml -*- -->
 
-<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns"
+<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
        xmlns:svg="http://www.w3.org/2000/svg">
   <name>Pneum - dist32</name>
   <description>dist32</description>
@@ -34,6 +34,6 @@
     <svg:polygon points="1.8,.8 1.8,1 1.6,.9" 
 		 svg:style="stroke:none; fill:foreground"/>
   </svg:svg>
-</tqshape>
+</shape>
 
 
diff --git a/kivio/kiviopart/stencils/Dia/Pneumatic/dist42.shape b/kivio/kiviopart/stencils/Dia/Pneumatic/dist42.shape
index 04e644eb..b2f38fc7 100644
--- a/kivio/kiviopart/stencils/Dia/Pneumatic/dist42.shape
+++ b/kivio/kiviopart/stencils/Dia/Pneumatic/dist42.shape
@@ -1,6 +1,6 @@
 <?xml version="1.0"?> <!-- -*- xml -*- -->
 
-<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns"
+<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
        xmlns:svg="http://www.w3.org/2000/svg">
   <name>Pneum - dist42</name>
   <description>dist42</description>
@@ -35,6 +35,6 @@
     <svg:polygon points="1.8,0 1.8,.2 1.6,.1"
 		 svg:style="stroke:none; fill:foreground"/>
   </svg:svg>
-</tqshape>
+</shape>
 
 
diff --git a/kivio/kiviopart/stencils/Dia/Pneumatic/dist52.shape b/kivio/kiviopart/stencils/Dia/Pneumatic/dist52.shape
index 021db07e..c1902669 100644
--- a/kivio/kiviopart/stencils/Dia/Pneumatic/dist52.shape
+++ b/kivio/kiviopart/stencils/Dia/Pneumatic/dist52.shape
@@ -1,6 +1,6 @@
 <?xml version="1.0"?> <!-- -*- xml -*- -->
 
-<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns"
+<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
        xmlns:svg="http://www.w3.org/2000/svg">
   <name>Pneum - dist52</name>
   <description>dist52</description>
@@ -44,6 +44,6 @@
     <svg:polygon points=".750,1 .830,.80 .650,.84"
 		 svg:style="stroke:none; fill:foreground"/>
   </svg:svg>
-</tqshape>
+</shape>
 
 
diff --git a/kivio/kiviopart/stencils/Dia/SDL/block.shape b/kivio/kiviopart/stencils/Dia/SDL/block.shape
index c697400d..4e18f2f5 100644
--- a/kivio/kiviopart/stencils/Dia/SDL/block.shape
+++ b/kivio/kiviopart/stencils/Dia/SDL/block.shape
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 
-<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns"
+<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
        xmlns:svg="http://www.w3.org/2000/svg">
   <name>SDL - Block</name>
   <description>Block Type Reference</description>
@@ -16,4 +16,4 @@
     <svg:polygon points="0,0 2.5,0 2.5,2 0,2" style="fill: default" />
     <svg:polygon points="0.15,0.15 2.35,0.15 2.35,1.85 0.15,1.85" style="fill: default" />
   </svg:svg>
-</tqshape>
+</shape>
diff --git a/kivio/kiviopart/stencils/Dia/SDL/decision.shape b/kivio/kiviopart/stencils/Dia/SDL/decision.shape
index 6cb1fba7..2c2ce44f 100644
--- a/kivio/kiviopart/stencils/Dia/SDL/decision.shape
+++ b/kivio/kiviopart/stencils/Dia/SDL/decision.shape
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 
-<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns"
+<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
        xmlns:svg="http://www.w3.org/2000/svg">
   <name>SDL - Decision</name>
   <description>Decision</description>
@@ -15,4 +15,4 @@
   <svg:svg width="2.5" height="2.5">
     <svg:polygon points="1.25,0 2.5,1.25 1.25,2.5 0,1.25" style="fill: default" />
   </svg:svg>
-</tqshape>
+</shape>
diff --git a/kivio/kiviopart/stencils/Dia/SDL/process.shape b/kivio/kiviopart/stencils/Dia/SDL/process.shape
index 95028b58..0a8512f5 100644
--- a/kivio/kiviopart/stencils/Dia/SDL/process.shape
+++ b/kivio/kiviopart/stencils/Dia/SDL/process.shape
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 
-<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns"
+<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
        xmlns:svg="http://www.w3.org/2000/svg">
   <name>SDL - Process</name>
   <description>Process Type Reference</description>
@@ -16,4 +16,4 @@
     <svg:polygon points="0.3,0 2.2,0 2.5,0.3 2.5,1.7 2.2,2 0.3,2 0,1.7 0,0.3" style="fill: default" />
     <svg:polygon points="0.3,0.15 2.2,0.15 2.35,0.3 2.35,1.7 2.2,1.85 0.3,1.85 0.15,1.7 0.15,0.3" style="fill: default" />
   </svg:svg>
-</tqshape>
+</shape>
diff --git a/kivio/kiviopart/stencils/Dia/SDL/service.shape b/kivio/kiviopart/stencils/Dia/SDL/service.shape
index fd4936e7..3223741f 100644
--- a/kivio/kiviopart/stencils/Dia/SDL/service.shape
+++ b/kivio/kiviopart/stencils/Dia/SDL/service.shape
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 
-<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns"
+<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
        xmlns:svg="http://www.w3.org/2000/svg">
   <name>SDL - Service</name>
   <description>Service Type Reference</description>
@@ -17,4 +17,4 @@
                  h -0.25  c -0.75,-0.4 -1.125,-0.6 -1.125,-1 c 0,-0.4 0.25,-0.6 1.125,-1 z"
               style="fill: default"/>
   </svg:svg>
-</tqshape>
+</shape>
diff --git a/kivio/kiviopart/stencils/Dia/Sybase/client.shape b/kivio/kiviopart/stencils/Dia/Sybase/client.shape
index 81ff9f03..4d3f913f 100644
--- a/kivio/kiviopart/stencils/Dia/Sybase/client.shape
+++ b/kivio/kiviopart/stencils/Dia/Sybase/client.shape
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns"
+<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
        xmlns:svg="http://www.w3.org/2000/svg">
   <name>Sybase - Client Application</name>
   <icon>client.xpm</icon>
@@ -21,5 +21,5 @@
     <svg:path style="stroke:foreground; stroke-width: 0.5" 
     d="M1.2,.8 L1.2,1.2 L1.6,1 L1.2,.8"/>
   </svg:svg>
-</tqshape>   
+</shape>   
 
diff --git a/kivio/kiviopart/stencils/Dia/Sybase/dataserver.shape b/kivio/kiviopart/stencils/Dia/Sybase/dataserver.shape
index 85340990..49cce15d 100644
--- a/kivio/kiviopart/stencils/Dia/Sybase/dataserver.shape
+++ b/kivio/kiviopart/stencils/Dia/Sybase/dataserver.shape
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns"
+<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
        xmlns:svg="http://www.w3.org/2000/svg">
   <name>Sybase - Dataserver</name>
   <icon>dataserver.xpm</icon>
@@ -19,7 +19,7 @@
     M 0.0706,0.66667 L 1.5,0.66667 M 0,1 L 1.5,1 M 0.0706,1.33333 L
   1.5,1.33333 M 0.24,1.66667 L 1.5,1.66667" /> 
   </svg:svg>
-</tqshape>
+</shape>
 
 
 
diff --git a/kivio/kiviopart/stencils/Dia/Sybase/ltm.shape b/kivio/kiviopart/stencils/Dia/Sybase/ltm.shape
index 508b64bf..1df9b7fc 100644
--- a/kivio/kiviopart/stencils/Dia/Sybase/ltm.shape
+++ b/kivio/kiviopart/stencils/Dia/Sybase/ltm.shape
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns"
+<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
        xmlns:svg="http://www.w3.org/2000/svg">
   <name>Sybase - Log Transfer Manager/Rep Agent</name>
   <icon>ltm.xpm</icon>
@@ -28,4 +28,4 @@
     d="M 1.4,1 L 1.8,1"/>
     
   </svg:svg>
-</tqshape>
+</shape>
diff --git a/kivio/kiviopart/stencils/Dia/Sybase/repserver.shape b/kivio/kiviopart/stencils/Dia/Sybase/repserver.shape
index bef14946..946603b1 100644
--- a/kivio/kiviopart/stencils/Dia/Sybase/repserver.shape
+++ b/kivio/kiviopart/stencils/Dia/Sybase/repserver.shape
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns"
+<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
        xmlns:svg="http://www.w3.org/2000/svg">
   <name>Sybase - Replication Server</name>
   <icon>repserver.xpm</icon>
@@ -26,6 +26,6 @@
     points="1,1 .7,.85 .7,1.15"/>
     <svg:circle style="stroke:none; fill:foreground" cx="1" cy="1" r=".5"/>
   </svg:svg>
-</tqshape>
+</shape>
 
 
diff --git a/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/Card.sml b/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/Card.sml
index 707882e9..704e66b0 100644
--- a/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/Card.sml
+++ b/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/Card.sml
@@ -4,7 +4,7 @@
 		<Author data="Landshark"/>
 		<Title data="Card"/>
 		<Id data="Card"/>
-		<Description data="Basic flowcharting card tqshape"/>
+		<Description data="Basic flowcharting card shape"/>
 		<Version data="0.1"/>
 		<Web data="www.thekompany.com"/>
 		<Email data="[email protected]"/>
diff --git a/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/Data.sml b/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/Data.sml
index a052fc1c..2fa28f24 100644
--- a/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/Data.sml
+++ b/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/Data.sml
@@ -4,7 +4,7 @@
 		<Author data="Dave Marotti"/>
 		<Title data="Data"/>
 		<Id data="Data"/>
-		<Description data="Data tqshape for flowcharting"/>
+		<Description data="Data shape for flowcharting"/>
 		<Version data="1.0"/>
 		<Web data="www.thekompany.com"/>
 		<Email data="[email protected]"/>
diff --git a/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/Decision.sml b/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/Decision.sml
index 2e83ee8e..e069d4ac 100644
--- a/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/Decision.sml
+++ b/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/Decision.sml
@@ -4,7 +4,7 @@
 		<Author data="Landshark"/>
 		<Title data="Decision"/>
 		<Id data="Decision"/>
-		<Description data="Basic flowcharting decision tqshape"/>
+		<Description data="Basic flowcharting decision shape"/>
 		<Version data="0.1"/>
 		<Web data="www.thekompany.com"/>
 		<Email data="[email protected]"/>
diff --git a/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/DirectData.sml b/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/DirectData.sml
index df9d3a5f..21661b74 100644
--- a/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/DirectData.sml
+++ b/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/DirectData.sml
@@ -4,7 +4,7 @@
 		<Author data="Landshark"/>
 		<Title data="Direct Data"/>
 		<Id data="Direct Data"/>
-		<Description data="Basic flowcharting direct data tqshape"/>
+		<Description data="Basic flowcharting direct data shape"/>
 		<Version data="0.1"/>
 		<Web data="www.thekompany.com"/>
 		<Email data="[email protected]"/>
diff --git a/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/Display.sml b/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/Display.sml
index 9634593e..f07580d2 100644
--- a/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/Display.sml
+++ b/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/Display.sml
@@ -4,7 +4,7 @@
 		<Author data="Landshark"/>
 		<Title data="Display"/>
 		<Id data="Display"/>
-		<Description data="Basic flowcharting display tqshape"/>
+		<Description data="Basic flowcharting display shape"/>
 		<Version data="0.1"/>
 		<Web data="www.thekompany.com"/>
 		<Email data="[email protected]"/>
diff --git a/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/InternalStorage.sml b/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/InternalStorage.sml
index d4051189..3a7a50ae 100644
--- a/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/InternalStorage.sml
+++ b/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/InternalStorage.sml
@@ -4,7 +4,7 @@
 		<Author data="Landshark"/>
 		<Title data="Internal Storage"/>
 		<Id data="Internal Storage"/>
-		<Description data="Internal storage tqshape"/>
+		<Description data="Internal storage shape"/>
 		<Version data="0.1"/>
 		<Web data="www.thekompany.com"/>
 		<Email data="[email protected]"/>
diff --git a/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/LoopLimit.sml b/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/LoopLimit.sml
index b409c57a..199072a6 100644
--- a/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/LoopLimit.sml
+++ b/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/LoopLimit.sml
@@ -4,7 +4,7 @@
 		<Author data="Landshark"/>
 		<Title data="Loop Limit"/>
 		<Id data="Loop Limit"/>
-		<Description data="Basic flowcharting loop limit tqshape"/>
+		<Description data="Basic flowcharting loop limit shape"/>
 		<Version data="0.1"/>
 		<Web data="www.thekompany.com"/>
 		<Email data="[email protected]"/>
diff --git a/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/ManualInput.sml b/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/ManualInput.sml
index 17691486..d6104506 100644
--- a/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/ManualInput.sml
+++ b/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/ManualInput.sml
@@ -4,7 +4,7 @@
 		<Author data="Landshark"/>
 		<Title data="Manual Input"/>
 		<Id data="Manual Input"/>
-		<Description data="Basic flowcharting manual input tqshape"/>
+		<Description data="Basic flowcharting manual input shape"/>
 		<Version data="0.1"/>
 		<Web data="www.thekompany.com"/>
 		<Email data="[email protected]"/>
diff --git a/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/ManualOperation.sml b/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/ManualOperation.sml
index 2536f822..bc452400 100644
--- a/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/ManualOperation.sml
+++ b/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/ManualOperation.sml
@@ -4,7 +4,7 @@
 		<Author data="Landshark"/>
 		<Title data="Manual Operation"/>
 		<Id data="Manual Operation"/>
-		<Description data="Basic flowcharting manual operation tqshape"/>
+		<Description data="Basic flowcharting manual operation shape"/>
 		<Version data="0.1"/>
 		<Web data="www.thekompany.com"/>
 		<Email data="[email protected]"/>
diff --git a/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/PredefinedProcess.sml b/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/PredefinedProcess.sml
index e1f80367..452e048a 100644
--- a/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/PredefinedProcess.sml
+++ b/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/PredefinedProcess.sml
@@ -4,7 +4,7 @@
 		<Author data="Landshark"/>
 		<Title data="Predefined Process"/>
 		<Id data="Predefined Process"/>
-		<Description data="Predefined process tqshape"/>
+		<Description data="Predefined process shape"/>
 		<Version data="0.1"/>
 		<Web data="www.thekompany.com"/>
 		<Email data="[email protected]"/>
diff --git a/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/Preperation.sml b/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/Preperation.sml
index b935d273..f79d2a51 100644
--- a/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/Preperation.sml
+++ b/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/Preperation.sml
@@ -4,7 +4,7 @@
 		<Author data="Landshark"/>
 		<Title data="Preparation"/>
 		<Id data="Preperation"/>
-		<Description data="Basic flowcharting preparation tqshape"/>
+		<Description data="Basic flowcharting preparation shape"/>
 		<Version data="0.1"/>
 		<Web data="www.thekompany.com"/>
 		<Email data="[email protected]"/>
diff --git a/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/Process.sml b/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/Process.sml
index 60a00732..94d129ac 100644
--- a/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/Process.sml
+++ b/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/Process.sml
@@ -4,7 +4,7 @@
 		<Author data="Landshark"/>
 		<Title data="Process"/>
 		<Id data="Process"/>
-		<Description data="Basic flowcharting process tqshape"/>
+		<Description data="Basic flowcharting process shape"/>
 		<Version data="0.1"/>
 		<Web data="www.thekompany.com"/>
 		<Email data="[email protected]"/>
diff --git a/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/PyStencil.spy b/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/PyStencil.spy
index aa11f970..fc01b542 100644
--- a/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/PyStencil.spy
+++ b/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/PyStencil.spy
@@ -4,7 +4,7 @@
         <Author data="Dmitry Poplavsky"/>
         <Title data="Python"/>
         <Id data="Python"/>
-        <Description data="Basic flowcharting card tqshape"/>
+        <Description data="Basic flowcharting card shape"/>
         <Version data="0.1"/>
         <Web data="www.thekompany.com"/>
         <Email data="[email protected]"/>
@@ -40,7 +40,7 @@ connector_targets = [ { "x":x+2,  "y":y-2 },
                     ]
 
 
-tqshapes = {
+shapes = {
           "rect" :{
                    "type"  : "Rectangle",
                    "fillstyle" : "solid",
@@ -96,12 +96,12 @@ connector_targets = [ { "x":x+2,  "y":y-2 },
                             { "x":(x+x2)/2, "y":y }
                           ]
 
-tqshapes["rect2"]["x"] = x+w-35
-tqshapes["rect2"]["y"] = y+h-35
-tqshapes["rect2"]["w"] = 20
-tqshapes["rect2"]["h"] = 20
+shapes["rect2"]["x"] = x+w-35
+shapes["rect2"]["y"] = y+h-35
+shapes["rect2"]["w"] = 20
+shapes["rect2"]["h"] = 20
 
-if ( tqshapes["text"]["text"] == "1" ):
+if ( shapes["text"]["text"] == "1" ):
     stencil = curLayer().firstStencil()
     stencil.setText( "x:"+str(x)+"  y:"+str(y) )
 
diff --git a/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/StoredData.sml b/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/StoredData.sml
index 98ba2016..6a727990 100644
--- a/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/StoredData.sml
+++ b/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/StoredData.sml
@@ -4,7 +4,7 @@
 		<Author data="Landshark"/>
 		<Title data="Stored Data"/>
 		<Id data="Stored Data"/>
-		<Description data="Basic flowcharting stored data tqshape"/>
+		<Description data="Basic flowcharting stored data shape"/>
 		<Version data="0.1"/>
 		<Web data="www.thekompany.com"/>
 		<Email data="[email protected]"/>
diff --git a/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/Terminator.sml b/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/Terminator.sml
index a998b6ca..769d1f5d 100644
--- a/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/Terminator.sml
+++ b/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/Terminator.sml
@@ -4,7 +4,7 @@
 		<Author data="Landshark"/>
 		<Title data="Terminator"/>
 		<Id data="Terminator"/>
-		<Description data="Terminator tqshape"/>
+		<Description data="Terminator shape"/>
 		<Version data="0.1"/>
 		<Web data="kivio.sourceforge.net"/>
 		<Email data="[email protected]"/>
diff --git a/kivio/kiviopart/stencils/Flowcharting/Extended/Data_Store.sml b/kivio/kiviopart/stencils/Flowcharting/Extended/Data_Store.sml
index 445fef79..c96361ce 100644
--- a/kivio/kiviopart/stencils/Flowcharting/Extended/Data_Store.sml
+++ b/kivio/kiviopart/stencils/Flowcharting/Extended/Data_Store.sml
@@ -4,7 +4,7 @@
 		<Author data="Kristof Borrey"/>
 		<Title data="Data Store"/>
 		<Id data="Data Store"/>
-		<Description data="Data Store tqshape"/>
+		<Description data="Data Store shape"/>
 		<Version data="0.1"/>
 		<Web data="www.koffice.org"/>
 		<Email data="[email protected]"/>
diff --git a/kivio/kiviopart/stencils/Flowcharting/Extended/Database.sml b/kivio/kiviopart/stencils/Flowcharting/Extended/Database.sml
index 622b0205..b1d1a835 100644
--- a/kivio/kiviopart/stencils/Flowcharting/Extended/Database.sml
+++ b/kivio/kiviopart/stencils/Flowcharting/Extended/Database.sml
@@ -4,7 +4,7 @@
 		<Author data="Kristof Borrey"/>
 		<Title data="Database"/>
 		<Id data="database"/>
-		<Description data="Database tqshape"/>
+		<Description data="Database shape"/>
 		<Version data="0.1"/>
 		<Web data="www.koffice.org"/>
 		<Email data="[email protected]"/>
diff --git a/kivio/kiviopart/stencils/Flowcharting/Extended/Process.sml b/kivio/kiviopart/stencils/Flowcharting/Extended/Process.sml
index fa1824de..57229b1a 100644
--- a/kivio/kiviopart/stencils/Flowcharting/Extended/Process.sml
+++ b/kivio/kiviopart/stencils/Flowcharting/Extended/Process.sml
@@ -4,7 +4,7 @@
 		<Author data="Kristof Borrey"/>
 		<Title data="Process"/>
 		<Id data="Process"/>
-		<Description data="Process tqshape"/>
+		<Description data="Process shape"/>
 		<Version data="0.1"/>
 		<Web data="www.koffice.org"/>
 		<Email data="[email protected]"/>
diff --git a/kivio/kiviopart/stencils/Flowcharting/Extended/Source_or_Sink.sml b/kivio/kiviopart/stencils/Flowcharting/Extended/Source_or_Sink.sml
index e3f53b8f..c68f8a79 100644
--- a/kivio/kiviopart/stencils/Flowcharting/Extended/Source_or_Sink.sml
+++ b/kivio/kiviopart/stencils/Flowcharting/Extended/Source_or_Sink.sml
@@ -4,7 +4,7 @@
 		<Author data="Kristof Borrey"/>
 		<Title data="Source or Sink"/>
 		<Id data="Source or Sink"/>
-		<Description data="Source or Sink tqshape"/>
+		<Description data="Source or Sink shape"/>
 		<Version data="0.1"/>
 		<Web data="www.koffice.org"/>
 		<Email data="[email protected]"/>
diff --git a/kivio/kiviopart/stencils/Hardware/Computer/3FloppyDisk.sml b/kivio/kiviopart/stencils/Hardware/Computer/3FloppyDisk.sml
index b3ecbefc..34c0b640 100644
--- a/kivio/kiviopart/stencils/Hardware/Computer/3FloppyDisk.sml
+++ b/kivio/kiviopart/stencils/Hardware/Computer/3FloppyDisk.sml
@@ -4,7 +4,7 @@
 		<Author data="Kristof Borrey"/>
 		<Title data="Floppy Disk"/>
 		<Id data="Floppy Disk"/>
-		<Description data="Floppy Disk tqshape"/>
+		<Description data="Floppy Disk shape"/>
 		<Version data="0.1"/>
 		<Web data="www.koffice.org"/>
 		<Email data="[email protected]"/>
diff --git a/kivio/kiviopart/stencils/Hardware/Miscellaneous/key.sml b/kivio/kiviopart/stencils/Hardware/Miscellaneous/key.sml
index aa34fe08..a03ce9cb 100644
--- a/kivio/kiviopart/stencils/Hardware/Miscellaneous/key.sml
+++ b/kivio/kiviopart/stencils/Hardware/Miscellaneous/key.sml
@@ -4,7 +4,7 @@
 		<Author data="Kristof Borrey"/>
 		<Title data="Key"/>
 		<Id data="Key"/>
-		<Description data="Key tqshape"/>
+		<Description data="Key shape"/>
 		<Version data="0.1"/>
 		<Web data="www.koffice.org"/>
 		<Email data="[email protected]"/>
diff --git a/kivio/kiviopart/stencils/Miscellaneous/Arrows/Arrow.sml b/kivio/kiviopart/stencils/Miscellaneous/Arrows/Arrow.sml
index a9013398..6470beb0 100644
--- a/kivio/kiviopart/stencils/Miscellaneous/Arrows/Arrow.sml
+++ b/kivio/kiviopart/stencils/Miscellaneous/Arrows/Arrow.sml
@@ -4,7 +4,7 @@
 		<Author data="Kristof Borrey"/>
 		<Title data="Arrow"/>
 		<Id data="Arrow"/>
-		<Description data="Arrow tqshape"/>
+		<Description data="Arrow shape"/>
 		<Version data="0.1"/>
 		<Web data="www.koffice.org"/>
 		<Email data="[email protected]"/>
diff --git a/kivio/kiviopart/stencils/Miscellaneous/Arrows/Multiple_Arrow_1.sml b/kivio/kiviopart/stencils/Miscellaneous/Arrows/Multiple_Arrow_1.sml
index 72a5cfd3..909e814c 100644
--- a/kivio/kiviopart/stencils/Miscellaneous/Arrows/Multiple_Arrow_1.sml
+++ b/kivio/kiviopart/stencils/Miscellaneous/Arrows/Multiple_Arrow_1.sml
@@ -4,7 +4,7 @@
 		<Author data="Kristof Borrey"/>
 		<Title data="Multiple Arrow 1"/>
 		<Id data="Multiple arrow 1"/>
-		<Description data="Multiple Arrow tqshape 1"/>
+		<Description data="Multiple Arrow shape 1"/>
 		<Version data="0.1"/>
 		<Web data="www.koffice.org"/>
 		<Email data="[email protected]"/>
diff --git a/kivio/kiviopart/stencils/Miscellaneous/Arrows/Multiple_Arrow_2.sml b/kivio/kiviopart/stencils/Miscellaneous/Arrows/Multiple_Arrow_2.sml
index 296f55fb..16599b33 100644
--- a/kivio/kiviopart/stencils/Miscellaneous/Arrows/Multiple_Arrow_2.sml
+++ b/kivio/kiviopart/stencils/Miscellaneous/Arrows/Multiple_Arrow_2.sml
@@ -4,7 +4,7 @@
 		<Author data="Kristof Borrey"/>
 		<Title data="Multiple Arrow 2"/>
 		<Id data="Multiple arrow 2"/>
-		<Description data="Multiple Arrow tqshape 2"/>
+		<Description data="Multiple Arrow shape 2"/>
 		<Version data="0.1"/>
 		<Web data="www.koffice.org"/>
 		<Email data="[email protected]"/>
diff --git a/kivio/kiviopart/stencils/Miscellaneous/Arrows/Multiple_Arrow_3.sml b/kivio/kiviopart/stencils/Miscellaneous/Arrows/Multiple_Arrow_3.sml
index 13fe1905..b0243201 100644
--- a/kivio/kiviopart/stencils/Miscellaneous/Arrows/Multiple_Arrow_3.sml
+++ b/kivio/kiviopart/stencils/Miscellaneous/Arrows/Multiple_Arrow_3.sml
@@ -4,7 +4,7 @@
 		<Author data="Kristof Borrey"/>
 		<Title data="Multiple Arrow 3"/>
 		<Id data="Multiple arrow 3"/>
-		<Description data="Multiple Arrow tqshape 3"/>
+		<Description data="Multiple Arrow shape 3"/>
 		<Version data="0.1"/>
 		<Web data="www.koffice.org"/>
 		<Email data="[email protected]"/>
diff --git a/kivio/kiviopart/stencils/Miscellaneous/Arrows/Sun_Arrow.sml b/kivio/kiviopart/stencils/Miscellaneous/Arrows/Sun_Arrow.sml
index 07bdf483..7cfdc307 100644
--- a/kivio/kiviopart/stencils/Miscellaneous/Arrows/Sun_Arrow.sml
+++ b/kivio/kiviopart/stencils/Miscellaneous/Arrows/Sun_Arrow.sml
@@ -4,7 +4,7 @@
 		<Author data="Kristof Borrey"/>
 		<Title data="Sun Arrow"/>
 		<Id data="Sun arrow"/>
-		<Description data="Sun Arrow tqshape"/>
+		<Description data="Sun Arrow shape"/>
 		<Version data="0.1"/>
 		<Web data="www.koffice.org"/>
 		<Email data="[email protected]"/>
diff --git a/kivio/kiviopart/stencils/Miscellaneous/Buildings/Factory.sml b/kivio/kiviopart/stencils/Miscellaneous/Buildings/Factory.sml
index 7d8390db..8ff9b029 100755
--- a/kivio/kiviopart/stencils/Miscellaneous/Buildings/Factory.sml
+++ b/kivio/kiviopart/stencils/Miscellaneous/Buildings/Factory.sml
@@ -4,7 +4,7 @@
 		<Author data="Kristof Borrey"/>
 		<Title data="Factory"/>
 		<Id data="Factory"/>
-		<Description data="Factory tqshape"/>
+		<Description data="Factory shape"/>
 		<Version data="0.1"/>
 		<Web data="www.koffice.org"/>
 		<Email data="[email protected]"/>
diff --git a/kivio/kiviopart/stencils/Miscellaneous/Buildings/House.sml b/kivio/kiviopart/stencils/Miscellaneous/Buildings/House.sml
index 9e1193cf..95075972 100755
--- a/kivio/kiviopart/stencils/Miscellaneous/Buildings/House.sml
+++ b/kivio/kiviopart/stencils/Miscellaneous/Buildings/House.sml
@@ -4,7 +4,7 @@
 		<Author data="Kristof Borrey"/>
 		<Title data="House"/>
 		<Id data="House"/>
-		<Description data="House tqshape"/>
+		<Description data="House shape"/>
 		<Version data="0.1"/>
 		<Web data="www.koffice.org"/>
 		<Email data="[email protected]"/>
diff --git a/kivio/kiviopart/stencils/Miscellaneous/ER/attribute.sml b/kivio/kiviopart/stencils/Miscellaneous/ER/attribute.sml
index af310f33..88e06fdb 100644
--- a/kivio/kiviopart/stencils/Miscellaneous/ER/attribute.sml
+++ b/kivio/kiviopart/stencils/Miscellaneous/ER/attribute.sml
@@ -3,7 +3,7 @@
     <Title data="Attribute"/>
     <Id data="ER-Attribute"/>
     <Version data="1.0"/>
-    <Description data="Attribute tqshape used in ER diagrams"/>
+    <Description data="Attribute shape used in ER diagrams"/>
     <Copyright data="Copyright (C) 2005 Peter Simonsson. Distributed under the BSD license."/>
     <Author data="Peter Simonsson"/>
     <Email data="[email protected]"/>
diff --git a/kivio/kiviopart/stencils/Miscellaneous/ER/derivedattribute.sml b/kivio/kiviopart/stencils/Miscellaneous/ER/derivedattribute.sml
index 5c2e4f74..8c325c32 100644
--- a/kivio/kiviopart/stencils/Miscellaneous/ER/derivedattribute.sml
+++ b/kivio/kiviopart/stencils/Miscellaneous/ER/derivedattribute.sml
@@ -3,7 +3,7 @@
     <Title data="Derived Attribute"/>
     <Id data="ER-DerivedAttribute"/>
     <Version data="1.0"/>
-    <Description data="Derived Attribute tqshape used in ER diagrams"/>
+    <Description data="Derived Attribute shape used in ER diagrams"/>
     <Copyright data="Copyright (C) 2005 Peter Simonsson. Distributed under the BSD license."/>
     <Author data="Peter Simonsson"/>
     <Email data="[email protected]"/>
diff --git a/kivio/kiviopart/stencils/Miscellaneous/ER/entity.sml b/kivio/kiviopart/stencils/Miscellaneous/ER/entity.sml
index 2b22e32a..6eaed85a 100644
--- a/kivio/kiviopart/stencils/Miscellaneous/ER/entity.sml
+++ b/kivio/kiviopart/stencils/Miscellaneous/ER/entity.sml
@@ -4,7 +4,7 @@
     <Title data="Entity"/>
     <Id data="ER-Entity"/>
     <Version data="1.0"/>
-    <Description data="Entity tqshape used in ER diagrams"/>
+    <Description data="Entity shape used in ER diagrams"/>
     <Copyright data="Copyright (C) 2005 Peter Simonsson. Distributed under the BSD license."/>
     <Author data="Peter Simonsson"/>
     <Email data="[email protected]"/>
diff --git a/kivio/kiviopart/stencils/Miscellaneous/ER/multivaluedattribute.sml b/kivio/kiviopart/stencils/Miscellaneous/ER/multivaluedattribute.sml
index 56329cf1..baef5b76 100644
--- a/kivio/kiviopart/stencils/Miscellaneous/ER/multivaluedattribute.sml
+++ b/kivio/kiviopart/stencils/Miscellaneous/ER/multivaluedattribute.sml
@@ -3,7 +3,7 @@
     <Title data="Multivalued Attribute"/>
     <Id data="ER-MultivaluedAttribute"/>
     <Version data="1.0"/>
-    <Description data="Multivalued Attribute tqshape used in ER diagrams"/>
+    <Description data="Multivalued Attribute shape used in ER diagrams"/>
     <Copyright data="Copyright (C) 2005 Peter Simonsson. Distributed under the BSD license."/>
     <Author data="Peter Simonsson"/>
     <Email data="[email protected]"/>
diff --git a/kivio/kiviopart/stencils/Miscellaneous/ER/relationship.sml b/kivio/kiviopart/stencils/Miscellaneous/ER/relationship.sml
index dbcad720..bd6c93ea 100644
--- a/kivio/kiviopart/stencils/Miscellaneous/ER/relationship.sml
+++ b/kivio/kiviopart/stencils/Miscellaneous/ER/relationship.sml
@@ -4,7 +4,7 @@
     <Title data="Relationship"/>
     <Id data="ER-Relationship"/>
     <Version data="1.0"/>
-    <Description data="Relationship tqshape used in ER diagrams"/>
+    <Description data="Relationship shape used in ER diagrams"/>
     <Copyright data="Copyright (C) 2005 Peter Simonsson. Distributed under the BSD license."/>
     <Author data="Peter Simonsson"/>
     <Email data="[email protected]"/>
diff --git a/kivio/kiviopart/stencils/Miscellaneous/ER/weakentity.sml b/kivio/kiviopart/stencils/Miscellaneous/ER/weakentity.sml
index 02547ca0..b81da1e9 100644
--- a/kivio/kiviopart/stencils/Miscellaneous/ER/weakentity.sml
+++ b/kivio/kiviopart/stencils/Miscellaneous/ER/weakentity.sml
@@ -4,7 +4,7 @@
     <Title data="Weak Entity"/>
     <Id data="ER-WeakEntity"/>
     <Version data="1.0"/>
-    <Description data="Weak Entity tqshape used in ER diagrams"/>
+    <Description data="Weak Entity shape used in ER diagrams"/>
     <Copyright data="Copyright (C) 2005 Peter Simonsson. Distributed under the BSD license."/>
     <Author data="Peter Simonsson"/>
     <Email data="[email protected]"/>
diff --git a/kivio/kiviopart/stencils/Miscellaneous/ER/weakrelationship.sml b/kivio/kiviopart/stencils/Miscellaneous/ER/weakrelationship.sml
index 1e30e26d..ac102000 100644
--- a/kivio/kiviopart/stencils/Miscellaneous/ER/weakrelationship.sml
+++ b/kivio/kiviopart/stencils/Miscellaneous/ER/weakrelationship.sml
@@ -4,7 +4,7 @@
     <Title data="Relationship"/>
     <Id data="ER-Relationship"/>
     <Version data="1.0"/>
-    <Description data="Relationship tqshape used in ER diagrams"/>
+    <Description data="Relationship shape used in ER diagrams"/>
     <Copyright data="Copyright (C) 2005 Peter Simonsson. Distributed under the BSD license."/>
     <Author data="Peter Simonsson"/>
     <Email data="[email protected]"/>
diff --git a/kivio/kiviopart/stencils/Miscellaneous/People/Bad.sml b/kivio/kiviopart/stencils/Miscellaneous/People/Bad.sml
index 27c487ea..eb1650e7 100755
--- a/kivio/kiviopart/stencils/Miscellaneous/People/Bad.sml
+++ b/kivio/kiviopart/stencils/Miscellaneous/People/Bad.sml
@@ -4,7 +4,7 @@
 		<Author data="Kristof Borrey"/>
 		<Title data="Bad"/>
 		<Id data="Bad"/>
-		<Description data="Bad tqshape"/>
+		<Description data="Bad shape"/>
 		<Version data="0.1"/>
 		<Web data="www.koffice.org"/>
 		<Email data="[email protected]"/>
diff --git a/kivio/kiviopart/stencils/Miscellaneous/People/Good.sml b/kivio/kiviopart/stencils/Miscellaneous/People/Good.sml
index 88ff54e8..8cb5b46d 100755
--- a/kivio/kiviopart/stencils/Miscellaneous/People/Good.sml
+++ b/kivio/kiviopart/stencils/Miscellaneous/People/Good.sml
@@ -4,7 +4,7 @@
 		<Author data="Kristof Borrey"/>
 		<Title data="Good"/>
 		<Id data="Good"/>
-		<Description data="Good tqshape"/>
+		<Description data="Good shape"/>
 		<Version data="0.1"/>
 		<Web data="www.koffice.org"/>
 		<Email data="[email protected]"/>
diff --git a/kivio/kiviopart/stencils/Miscellaneous/People/Man.sml b/kivio/kiviopart/stencils/Miscellaneous/People/Man.sml
index 0656c2a7..13c5b46c 100755
--- a/kivio/kiviopart/stencils/Miscellaneous/People/Man.sml
+++ b/kivio/kiviopart/stencils/Miscellaneous/People/Man.sml
@@ -4,7 +4,7 @@
 		<Author data="Kristof Borrey"/>
 		<Title data="Man"/>
 		<Id data="Man"/>
-		<Description data="Man tqshape"/>
+		<Description data="Man shape"/>
 		<Version data="0.1"/>
 		<Web data="www.koffice.org"/>
 		<Email data="[email protected]"/>
diff --git a/kivio/kiviopart/stencils/Miscellaneous/People/Woman.sml b/kivio/kiviopart/stencils/Miscellaneous/People/Woman.sml
index 9f903a1f..e1c4aabc 100755
--- a/kivio/kiviopart/stencils/Miscellaneous/People/Woman.sml
+++ b/kivio/kiviopart/stencils/Miscellaneous/People/Woman.sml
@@ -4,7 +4,7 @@
 		<Author data="Kristof Borrey"/>
 		<Title data="Woman"/>
 		<Id data="Woman"/>
-		<Description data="Woman tqshape"/>
+		<Description data="Woman shape"/>
 		<Version data="0.1"/>
 		<Web data="www.koffice.org"/>
 		<Email data="[email protected]"/>
diff --git a/kivio/kiviopart/stencils/Miscellaneous/People/Woman_Shape.sml b/kivio/kiviopart/stencils/Miscellaneous/People/Woman_Shape.sml
index 6bd7f849..36e87464 100755
--- a/kivio/kiviopart/stencils/Miscellaneous/People/Woman_Shape.sml
+++ b/kivio/kiviopart/stencils/Miscellaneous/People/Woman_Shape.sml
@@ -4,7 +4,7 @@
 		<Author data="Kristof Borrey"/>
 		<Title data="Woman Shape"/>
 		<Id data="Woman Shape"/>
-		<Description data="Woman tqshape"/>
+		<Description data="Woman shape"/>
 		<Version data="0.1"/>
 		<Web data="www.koffice.org"/>
 		<Email data="[email protected]"/>
diff --git a/kivio/kiviopart/stencils/Miscellaneous/Transport/Truck.sml b/kivio/kiviopart/stencils/Miscellaneous/Transport/Truck.sml
index d8e01658..f7f6d666 100644
--- a/kivio/kiviopart/stencils/Miscellaneous/Transport/Truck.sml
+++ b/kivio/kiviopart/stencils/Miscellaneous/Transport/Truck.sml
@@ -4,7 +4,7 @@
 		<Author data="Kristof Borrey"/>
 		<Title data="Truck"/>
 		<Id data="Truck"/>
-		<Description data="Truck tqshape"/>
+		<Description data="Truck shape"/>
 		<Version data="0.1"/>
 		<Web data="www.koffice.org"/>
 		<Email data="[email protected]"/>