Consistent naming for inclusion in dia-additional shapes

To make things scriptable and to be consistent with the other shape sets, I've renamed things a little bit. Hope that's ok for you.