unified builder methods

some builders use methods called 'withXYZ' some just 'XYZ'. All builders have been unified to use the 'XYZ' form.