diff --git a/view/theme/diabook/directory_item.tpl b/view/theme/diabook/directory_item.tpl
index 9a040fa49b..163c0c80e7 100644
--- a/view/theme/diabook/directory_item.tpl
+++ b/view/theme/diabook/directory_item.tpl
@@ -20,9 +20,9 @@
 					<span class="city-state-zip">
 						<span class="locality">$profile.locality</span>{{ if $profile.locality }}, {{ endif }}
 						<span class="region">$profile.region</span>
-						<span class="postal-code">$profile.postal-code</span>
+						<span class="postal-code">$profile.postal_code</span>
 					</span>
-					{{ if $profile.country-name }}<span class="country-name">$profile.country-name</span>{{ endif }}
+					{{ if $profile.country_name }}<span class="country-name">$profile.country_name</span>{{ endif }}
 				</dd>
 				</dl>
 			{{ endif }}
diff --git a/view/theme/diabook/profile_vcard.tpl b/view/theme/diabook/profile_vcard.tpl
index b982a20693..8251458257 100644
--- a/view/theme/diabook/profile_vcard.tpl
+++ b/view/theme/diabook/profile_vcard.tpl
@@ -33,9 +33,9 @@
 			<span class="city-state-zip">
 				<span class="locality">$profile.locality</span>{{ if $profile.locality }}, {{ endif }}
 				<span class="region">$profile.region</span>
-				<span class="postal-code">$profile.postal-code</span>
+				<span class="postal-code">$profile.postal_code</span>
 			</span>
-			{{ if $profile.country-name }}<span class="country-name">$profile.country-name</span>{{ endif }}
+			{{ if $profile.country_name }}<span class="country-name">$profile.country_name</span>{{ endif }}
 		</dd>
 		</dl>
 	{{ endif }}
diff --git a/view/theme/diabook/smarty3/directory_item.tpl b/view/theme/diabook/smarty3/directory_item.tpl
index dd5f7f38fb..84b4ada0fe 100644
--- a/view/theme/diabook/smarty3/directory_item.tpl
+++ b/view/theme/diabook/smarty3/directory_item.tpl
@@ -20,9 +20,9 @@
 					<span class="city-state-zip">
 						<span class="locality">{{$profile.locality}}</span>{{if $profile.locality}}, {{/if}}
 						<span class="region">{{$profile.region}}</span>
-						<span class="postal-code">{{$profile.postal-code}}</span>
+						<span class="postal-code">{{$profile.postal_code}}</span>
 					</span>
-					{{if $profile.country-name}}<span class="country-name">{{$profile.country-name}}</span>{{/if}}
+					{{if $profile.country_name}}<span class="country-name">{{$profile.country_name}}</span>{{/if}}
 				</dd>
 				</dl>
 			{{/if}}
diff --git a/view/theme/diabook/smarty3/profile_vcard.tpl b/view/theme/diabook/smarty3/profile_vcard.tpl
index e42636734a..ee3e5a2a45 100644
--- a/view/theme/diabook/smarty3/profile_vcard.tpl
+++ b/view/theme/diabook/smarty3/profile_vcard.tpl
@@ -33,9 +33,9 @@
 			<span class="city-state-zip">
 				<span class="locality">{{$profile.locality}}</span>{{if $profile.locality}}, {{/if}}
 				<span class="region">{{$profile.region}}</span>
-				<span class="postal-code">{{$profile.postal-code}}</span>
+				<span class="postal-code">{{$profile.postal_code}}</span>
 			</span>
-			{{if $profile.country-name}}<span class="country-name">{{$profile.country-name}}</span>{{/if}}
+			{{if $profile.country_name}}<span class="country-name">{{$profile.country_name}}</span>{{/if}}
 		</dd>
 		</dl>
 	{{/if}}
diff --git a/view/theme/dispy/profile_vcard.tpl b/view/theme/dispy/profile_vcard.tpl
index cf0054a675..b7c99edd9d 100644
--- a/view/theme/dispy/profile_vcard.tpl
+++ b/view/theme/dispy/profile_vcard.tpl
@@ -34,9 +34,9 @@
 			<span class="city-state-zip">
 				<span class="locality">$profile.locality</span>{{ if $profile.locality }}, {{ endif }}
 				<span class="region">$profile.region</span>
-				<span class="postal-code">$profile.postal-code</span>
+				<span class="postal-code">$profile.postal_code</span>
 			</span>
-			{{ if $profile.country-name }}<span class="country-name">$profile.country-name</span>{{ endif }}
+			{{ if $profile.country_name }}<span class="country-name">$profile.country_name</span>{{ endif }}
 		</div>
 		</div>
 	{{ endif }}
diff --git a/view/theme/dispy/smarty3/profile_vcard.tpl b/view/theme/dispy/smarty3/profile_vcard.tpl
index 3a2cf73eea..55c78e9c50 100644
--- a/view/theme/dispy/smarty3/profile_vcard.tpl
+++ b/view/theme/dispy/smarty3/profile_vcard.tpl
@@ -34,9 +34,9 @@
 			<span class="city-state-zip">
 				<span class="locality">{{$profile.locality}}</span>{{if $profile.locality}}, {{/if}}
 				<span class="region">{{$profile.region}}</span>
-				<span class="postal-code">{{$profile.postal-code}}</span>
+				<span class="postal-code">{{$profile.postal_code}}</span>
 			</span>
-			{{if $profile.country-name}}<span class="country-name">{{$profile.country-name}}</span>{{/if}}
+			{{if $profile.country_name}}<span class="country-name">{{$profile.country_name}}</span>{{/if}}
 		</div>
 		</div>
 	{{/if}}
diff --git a/view/theme/duepuntozero/profile_vcard.tpl b/view/theme/duepuntozero/profile_vcard.tpl
index bcb5baeeb5..e91e6125ff 100644
--- a/view/theme/duepuntozero/profile_vcard.tpl
+++ b/view/theme/duepuntozero/profile_vcard.tpl
@@ -16,9 +16,9 @@
 			<span class="city-state-zip">
 				<span class="locality">$profile.locality</span>{{ if $profile.locality }}, {{ endif }}
 				<span class="region">$profile.region</span>
-				<span class="postal-code">$profile.postal-code</span>
+				<span class="postal-code">$profile.postal_code</span>
 			</span>
-			{{ if $profile.country-name }}<span class="country-name">$profile.country-name</span>{{ endif }}
+			{{ if $profile.country_name }}<span class="country-name">$profile.country_name</span>{{ endif }}
 		</dd>
 		</dl>
 	{{ endif }}
diff --git a/view/theme/duepuntozero/smarty3/profile_vcard.tpl b/view/theme/duepuntozero/smarty3/profile_vcard.tpl
index b7300329c5..91630b0ec3 100644
--- a/view/theme/duepuntozero/smarty3/profile_vcard.tpl
+++ b/view/theme/duepuntozero/smarty3/profile_vcard.tpl
@@ -16,9 +16,9 @@
 			<span class="city-state-zip">
 				<span class="locality">{{$profile.locality}}</span>{{if $profile.locality}}, {{/if}}
 				<span class="region">{{$profile.region}}</span>
-				<span class="postal-code">{{$profile.postal-code}}</span>
+				<span class="postal-code">{{$profile.postal_code}}</span>
 			</span>
-			{{if $profile.country-name}}<span class="country-name">{{$profile.country-name}}</span>{{/if}}
+			{{if $profile.country_name}}<span class="country-name">{{$profile.country_name}}</span>{{/if}}
 		</dd>
 		</dl>
 	{{/if}}
diff --git a/view/theme/facepark/profile_vcard.tpl b/view/theme/facepark/profile_vcard.tpl
index 154f22363c..07d2df5df3 100644
--- a/view/theme/facepark/profile_vcard.tpl
+++ b/view/theme/facepark/profile_vcard.tpl
@@ -16,9 +16,9 @@
 			<span class="city-state-zip">
 				<span class="locality">$profile.locality</span>{{ if $profile.locality }}, {{ endif }}
 				<span class="region">$profile.region</span>
-				<span class="postal-code">$profile.postal-code</span>
+				<span class="postal-code">$profile.postal_code</span>
 			</span>
-			{{ if $profile.country-name }}<span class="country-name">$profile.country-name</span>{{ endif }}
+			{{ if $profile.country_name }}<span class="country-name">$profile.country_name</span>{{ endif }}
 		</dd>
 		</dl>
 	{{ endif }}
diff --git a/view/theme/facepark/smarty3/profile_vcard.tpl b/view/theme/facepark/smarty3/profile_vcard.tpl
index b7ba41918e..f7622bbb3d 100644
--- a/view/theme/facepark/smarty3/profile_vcard.tpl
+++ b/view/theme/facepark/smarty3/profile_vcard.tpl
@@ -16,9 +16,9 @@
 			<span class="city-state-zip">
 				<span class="locality">{{$profile.locality}}</span>{{if $profile.locality}}, {{/if}}
 				<span class="region">{{$profile.region}}</span>
-				<span class="postal-code">{{$profile.postal-code}}</span>
+				<span class="postal-code">{{$profile.postal_code}}</span>
 			</span>
-			{{if $profile.country-name}}<span class="country-name">{{$profile.country-name}}</span>{{/if}}
+			{{if $profile.country_name}}<span class="country-name">{{$profile.country_name}}</span>{{/if}}
 		</dd>
 		</dl>
 	{{/if}}
diff --git a/view/theme/frost-mobile/profile_vcard.tpl b/view/theme/frost-mobile/profile_vcard.tpl
index bcb5baeeb5..e91e6125ff 100644
--- a/view/theme/frost-mobile/profile_vcard.tpl
+++ b/view/theme/frost-mobile/profile_vcard.tpl
@@ -16,9 +16,9 @@
 			<span class="city-state-zip">
 				<span class="locality">$profile.locality</span>{{ if $profile.locality }}, {{ endif }}
 				<span class="region">$profile.region</span>
-				<span class="postal-code">$profile.postal-code</span>
+				<span class="postal-code">$profile.postal_code</span>
 			</span>
-			{{ if $profile.country-name }}<span class="country-name">$profile.country-name</span>{{ endif }}
+			{{ if $profile.country_name }}<span class="country-name">$profile.country_name</span>{{ endif }}
 		</dd>
 		</dl>
 	{{ endif }}
diff --git a/view/theme/frost-mobile/smarty3/profile_vcard.tpl b/view/theme/frost-mobile/smarty3/profile_vcard.tpl
index b7300329c5..91630b0ec3 100644
--- a/view/theme/frost-mobile/smarty3/profile_vcard.tpl
+++ b/view/theme/frost-mobile/smarty3/profile_vcard.tpl
@@ -16,9 +16,9 @@
 			<span class="city-state-zip">
 				<span class="locality">{{$profile.locality}}</span>{{if $profile.locality}}, {{/if}}
 				<span class="region">{{$profile.region}}</span>
-				<span class="postal-code">{{$profile.postal-code}}</span>
+				<span class="postal-code">{{$profile.postal_code}}</span>
 			</span>
-			{{if $profile.country-name}}<span class="country-name">{{$profile.country-name}}</span>{{/if}}
+			{{if $profile.country_name}}<span class="country-name">{{$profile.country_name}}</span>{{/if}}
 		</dd>
 		</dl>
 	{{/if}}
diff --git a/view/theme/frost/profile_vcard.tpl b/view/theme/frost/profile_vcard.tpl
index bcb5baeeb5..e91e6125ff 100644
--- a/view/theme/frost/profile_vcard.tpl
+++ b/view/theme/frost/profile_vcard.tpl
@@ -16,9 +16,9 @@
 			<span class="city-state-zip">
 				<span class="locality">$profile.locality</span>{{ if $profile.locality }}, {{ endif }}
 				<span class="region">$profile.region</span>
-				<span class="postal-code">$profile.postal-code</span>
+				<span class="postal-code">$profile.postal_code</span>
 			</span>
-			{{ if $profile.country-name }}<span class="country-name">$profile.country-name</span>{{ endif }}
+			{{ if $profile.country_name }}<span class="country-name">$profile.country_name</span>{{ endif }}
 		</dd>
 		</dl>
 	{{ endif }}
diff --git a/view/theme/frost/smarty3/profile_vcard.tpl b/view/theme/frost/smarty3/profile_vcard.tpl
index b7300329c5..91630b0ec3 100644
--- a/view/theme/frost/smarty3/profile_vcard.tpl
+++ b/view/theme/frost/smarty3/profile_vcard.tpl
@@ -16,9 +16,9 @@
 			<span class="city-state-zip">
 				<span class="locality">{{$profile.locality}}</span>{{if $profile.locality}}, {{/if}}
 				<span class="region">{{$profile.region}}</span>
-				<span class="postal-code">{{$profile.postal-code}}</span>
+				<span class="postal-code">{{$profile.postal_code}}</span>
 			</span>
-			{{if $profile.country-name}}<span class="country-name">{{$profile.country-name}}</span>{{/if}}
+			{{if $profile.country_name}}<span class="country-name">{{$profile.country_name}}</span>{{/if}}
 		</dd>
 		</dl>
 	{{/if}}
diff --git a/view/theme/quattro/profile_vcard.tpl b/view/theme/quattro/profile_vcard.tpl
index e7264cfecf..13037c8a21 100644
--- a/view/theme/quattro/profile_vcard.tpl
+++ b/view/theme/quattro/profile_vcard.tpl
@@ -32,9 +32,9 @@
 			<span class="city-state-zip">
 				<span class="locality">$profile.locality</span>{{ if $profile.locality }}, {{ endif }}
 				<span class="region">$profile.region</span>
-				<span class="postal-code">$profile.postal-code</span>
+				<span class="postal-code">$profile.postal_code</span>
 			</span>
-			{{ if $profile.country-name }}<span class="country-name">$profile.country-name</span>{{ endif }}
+			{{ if $profile.country_name }}<span class="country-name">$profile.country_name</span>{{ endif }}
 		</dd>
 		</dl>
 	{{ endif }}
diff --git a/view/theme/quattro/smarty3/profile_vcard.tpl b/view/theme/quattro/smarty3/profile_vcard.tpl
index 902fb040de..37df4ae9a1 100644
--- a/view/theme/quattro/smarty3/profile_vcard.tpl
+++ b/view/theme/quattro/smarty3/profile_vcard.tpl
@@ -32,9 +32,9 @@
 			<span class="city-state-zip">
 				<span class="locality">{{$profile.locality}}</span>{{if $profile.locality}}, {{/if}}
 				<span class="region">{{$profile.region}}</span>
-				<span class="postal-code">{{$profile.postal-code}}</span>
+				<span class="postal-code">{{$profile.postal_code}}</span>
 			</span>
-			{{if $profile.country-name}}<span class="country-name">{{$profile.country-name}}</span>{{/if}}
+			{{if $profile.country_name}}<span class="country-name">{{$profile.country_name}}</span>{{/if}}
 		</dd>
 		</dl>
 	{{/if}}
diff --git a/view/theme/testbubble/profile_vcard.tpl b/view/theme/testbubble/profile_vcard.tpl
index 0ee6919bc9..1686706995 100644
--- a/view/theme/testbubble/profile_vcard.tpl
+++ b/view/theme/testbubble/profile_vcard.tpl
@@ -14,9 +14,9 @@
 			<span class="city-state-zip">
 				<span class="locality">$profile.locality</span>{{ if $profile.locality }}, {{ endif }}
 				<span class="region">$profile.region</span>
-				<span class="postal-code">$profile.postal-code</span>
+				<span class="postal-code">$profile.postal_code</span>
 			</span>
-			{{ if $profile.country-name }}<span class="country-name">$profile.country-name</span>{{ endif }}
+			{{ if $profile.country_name }}<span class="country-name">$profile.country_name</span>{{ endif }}
 		</dd>
 		</dl>
 	{{ endif }}
diff --git a/view/theme/testbubble/smarty3/profile_vcard.tpl b/view/theme/testbubble/smarty3/profile_vcard.tpl
index e1b05f81b3..a93f6c7895 100644
--- a/view/theme/testbubble/smarty3/profile_vcard.tpl
+++ b/view/theme/testbubble/smarty3/profile_vcard.tpl
@@ -14,9 +14,9 @@
 			<span class="city-state-zip">
 				<span class="locality">{{$profile.locality}}</span>{{if $profile.locality}}, {{/if}}
 				<span class="region">{{$profile.region}}</span>
-				<span class="postal-code">{{$profile.postal-code}}</span>
+				<span class="postal-code">{{$profile.postal_code}}</span>
 			</span>
-			{{if $profile.country-name}}<span class="country-name">{{$profile.country-name}}</span>{{/if}}
+			{{if $profile.country_name}}<span class="country-name">{{$profile.country_name}}</span>{{/if}}
 		</dd>
 		</dl>
 	{{/if}}