Consistency in naming.

Change-Id: Id9ac1ec0ec06defd570556f697f947997cb90b38
No need to store the address detail object.

Just get one from the document when needed.

Change-Id: Id053c70c40e7a7580a3c5969af8d547ac1fcbf4e