Change class reference name to be more expressive
Rename builder classes