Cherry pick feature/rename factorybuilder factorytag

This is a manual cherry-pick of !92 (merged) and the bugfix !93 (merged) into releases/2.6. It acts on top of (i.e. contains) the content of !94 (merged).