Rename TextWireMaker to TextShapeMaker, and makeWire() to make().