Consistent naming for inclusion in dia-additional-shapes.