Used international terminology for address fields. Simplified naming.