Bug 4041: (QA followup) Change addressformat to AddressFormat