JavaDocs and slight API improvement for AddressBuilder
Naming cleanup