Last changes to the Builder API, renaming to enfore consistency and
improve maintainability.

Close #1785