drop "FormFactor" from shape names

Joachim Wuttkerequested to merge
net into main

To make this possible, we first add "Net" to the shape names in Sample/Shape.

Merge request reports