Changed shipping address naming convention