Suffix the builders with "Builder"

To avoid clashing namespace issues
Merge pull request #2349 from Particular/builder-rename

Suffix the builders with "Builder"