change builder methods name
remove builder static factory method