Rename SingleValueFieldBuilder to PrimitiveFieldBuilder