Renamed AbstractSimplePersonBuilder => AbstractPersonBuilder