diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt
index 606f20d07..c813b87bc 100644
--- a/docs/changelog/7.x.x.txt
+++ b/docs/changelog/7.x.x.txt
@@ -13,6 +13,8 @@
  - fixed #11525: Paste assets inside CS
  - added #620: Add buttons to the GalleryAlbum edit view so users can rotate photos by 90 deg (Bernd Kalbfuß-Zimmermann)
  - fixed #11530: account deactivation not working (United Knowledge)
+ - fixed #11531: MapPoint property conflict
+ - fixed #11532: MapPoint, no i18n
 
 7.9.2
  - added: Workflow to extend recurring Calendar events 2 years from the
diff --git a/docs/upgrades/packages-7.9.3/home_map_map-templates_default-edit-map-point.wgpkg b/docs/upgrades/packages-7.9.3/home_map_map-templates_default-edit-map-point.wgpkg
new file mode 100644
index 000000000..822fec147
Binary files /dev/null and b/docs/upgrades/packages-7.9.3/home_map_map-templates_default-edit-map-point.wgpkg differ
diff --git a/docs/upgrades/packages-7.9.3/home_map_map-templates_default-map-point-view.wgpkg b/docs/upgrades/packages-7.9.3/home_map_map-templates_default-map-point-view.wgpkg
new file mode 100644
index 000000000..c9f92fa55
Binary files /dev/null and b/docs/upgrades/packages-7.9.3/home_map_map-templates_default-map-point-view.wgpkg differ
diff --git a/docs/upgrades/upgrade_7.9.2-7.9.3.pl b/docs/upgrades/upgrade_7.9.2-7.9.3.pl
index 760eed9cf..501ea26e2 100644
--- a/docs/upgrades/upgrade_7.9.2-7.9.3.pl
+++ b/docs/upgrades/upgrade_7.9.2-7.9.3.pl
@@ -32,6 +32,7 @@ my $session = start(); # this line required
 
 reindexSiteForDefaultSynopsis( $session );
 addTopLevelWikiKeywords( $session );
+renameMapPointStateColumn( $session );
 
 finish($session); # this line required
 
@@ -45,6 +46,17 @@ finish($session); # this line required
 #    print "DONE!\n" unless $quiet;
 #}
 
+#----------------------------------------------------------------------------
+sub renameMapPointStateColumn {
+    my $session = shift;
+    print "\tRename the MapPoint column state to region... " unless $quiet;
+
+    $session->db->write('ALTER TABLE MapPoint CHANGE state region char(35)');
+
+    print "Done.\n" unless $quiet;
+}
+
+
 #----------------------------------------------------------------------------
 sub addTopLevelWikiKeywords {
     my $session = shift;
diff --git a/lib/WebGUI/Asset/MapPoint.pm b/lib/WebGUI/Asset/MapPoint.pm
index b76ef7361..961bfebfe 100644
--- a/lib/WebGUI/Asset/MapPoint.pm
+++ b/lib/WebGUI/Asset/MapPoint.pm
@@ -99,7 +99,7 @@ sub definition {
             label       => $i18n->get("city label"),
             hoverHelp   => $i18n->get("city description"),
         },
-        state => {
+        region => {
             tab         => "properties",
             fieldType   => "text",
             label       => $i18n->get("state label"),