Update builder name to match convention for Builder naming