Index: /applications/editors/josm/plugins/toms/src/toms/seamarks/buoys/Buoy.java
===================================================================
--- /applications/editors/josm/plugins/toms/src/toms/seamarks/buoys/Buoy.java	(revision 26137)
+++ /applications/editors/josm/plugins/toms/src/toms/seamarks/buoys/Buoy.java	(revision 26138)
@@ -505,5 +505,5 @@
 				if (key.equals("ref"))
 					setLitRef(value);
-				if (key.equals("inform"))
+				if (key.equals("information"))
 					setLitInf(value);
 				if (key.equals("category"))
@@ -930,5 +930,5 @@
 			if (!LitInf.isEmpty())
 				Main.main.undoRedo.add(new ChangePropertyCommand(Node,
-						"seamark:light:inform", LitInf));
+						"seamark:light:information", LitInf));
 
 			if (!LitCat.isEmpty())
Index: /applications/editors/josm/plugins/toms/src/toms/seamarks/buoys/BuoyLat.java
===================================================================
--- /applications/editors/josm/plugins/toms/src/toms/seamarks/buoys/BuoyLat.java	(revision 26137)
+++ /applications/editors/josm/plugins/toms/src/toms/seamarks/buoys/BuoyLat.java	(revision 26138)
@@ -281,10 +281,10 @@
 		}
 
-		if (keys.containsKey("seamark:buoy_lateral:marsys")) //$NON-NLS-1$
-			setRegion(keys.get("seamark:buoy_lateral:marsys").equals("B")); //$NON-NLS-1$
-		else if (keys.containsKey("seamark:beacon_lateral:marsys")) //$NON-NLS-1$
-			setRegion(keys.get("seamark:beacon_lateral:marsys").equals("B")); //$NON-NLS-1$
-		else if (keys.containsKey("seamark:light_float:marsys")) //$NON-NLS-1$
-			setRegion(keys.get("seamark:light_float:marsys").equals("B")); //$NON-NLS-1$
+		if (keys.containsKey("seamark:buoy_lateral:system")) //$NON-NLS-1$
+			setRegion(keys.get("seamark:buoy_lateral:system").equals("iala-b")); //$NON-NLS-1$
+		else if (keys.containsKey("seamark:beacon_lateral:system")) //$NON-NLS-1$
+			setRegion(keys.get("seamark:beacon_lateral:system").equals("iala-b")); //$NON-NLS-1$
+		else if (keys.containsKey("seamark:light_float:system")) //$NON-NLS-1$
+			setRegion(keys.get("seamark:light_float:system").equals("iala-b")); //$NON-NLS-1$
 
 		refreshStyles();
@@ -1081,14 +1081,14 @@
 		case LAT_SPAR:
 			Main.main.undoRedo.add(new ChangePropertyCommand(node,
-					"seamark:buoy_lateral:marsys", (getRegion() ? "B" : "A"))); //$NON-NLS-1$ //$NON-NLS-2$
+					"seamark:buoy_lateral:system", (getRegion() ? "iala-b" : "iala-a"))); //$NON-NLS-1$ //$NON-NLS-2$
 			break;
 		case LAT_BEACON:
 		case LAT_TOWER:
 			Main.main.undoRedo.add(new ChangePropertyCommand(node,
-					"seamark:beacon_lateral:marsys", (getRegion() ? "B" : "A"))); //$NON-NLS-1$ //$NON-NLS-2$
+					"seamark:beacon_lateral:system", (getRegion() ? "iala-b" : "iala-a"))); //$NON-NLS-1$ //$NON-NLS-2$
 			break;
 		case LAT_FLOAT:
 			Main.main.undoRedo.add(new ChangePropertyCommand(node,
-					"seamark:light_float:marsys", (getRegion() ? "B" : "A"))); //$NON-NLS-1$ //$NON-NLS-2$
+					"seamark:light_float:system", (getRegion() ? "iala-b" : "iala-a"))); //$NON-NLS-1$ //$NON-NLS-2$
 			break;
 		}
@@ -1098,5 +1098,5 @@
 		saveRadarFogData();
 
-		Main.pref.put("tomsplugin.IALA", getRegion() ? "B" : "A"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+		Main.pref.put("tomsplugin.IALA", getRegion() ? "iala-b" : "iala-a"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
 	}
 }