Split out AbstractBuilder and rename it

No match.