Currently any shapes drawn using the shape tools on the toolbar/ribbon are given generic names like Shape.xxx
Would it not be better to give the shapes more useful names line Toolbar Rectangle or Toolbar Freeform?
Oh yes, and put a suitable master into the document stencil at the same time.
