More cleanup
Changed default builder name