Suffix the builders with "Builder"

To avoid clashing namespace issues


Please review