Index: /applications/editors/josm/plugins/toms/src/toms/dialogs/SmpDialogAction.java
===================================================================
--- /applications/editors/josm/plugins/toms/src/toms/dialogs/SmpDialogAction.java	(revision 22562)
+++ /applications/editors/josm/plugins/toms/src/toms/dialogs/SmpDialogAction.java	(revision 22563)
@@ -581,7 +581,7 @@
 
 			// Test buoy_safewater
-			if (keys.containsKey("seamark:buoy_safewater:shape") == true) {
-
-				if (keys.containsKey("seamark:buoy_safewater:colour") == false) {
+			if (keys.containsKey("seamark:buoy_water:shape") == true) {
+
+				if (keys.containsKey("seamark:buoy_safe_water:colour") == false) {
 					buoy = new BuoyUkn(this, "Parse-Error: No colour set");
 					buoy.setNode(node);
@@ -589,5 +589,5 @@
 				}
 
-				str = keys.get("seamark:buoy_safewater:colour");
+				str = keys.get("seamark:buoy_safe_water:colour");
 				if (str.compareTo("red;white") != 0) {
 					buoy = new BuoyUkn(this, "Parse-Error: Invalid colour");
Index: /applications/editors/josm/plugins/toms/src/toms/seamarks/buoys/BuoySaw.java
===================================================================
--- /applications/editors/josm/plugins/toms/src/toms/seamarks/buoys/BuoySaw.java	(revision 22562)
+++ /applications/editors/josm/plugins/toms/src/toms/seamarks/buoys/BuoySaw.java	(revision 22563)
@@ -109,29 +109,29 @@
 		}
 
-		super.saveSign("buoy_safewater");
+		super.saveSign("buoy_safe_water");
 
 		switch (getStyleIndex()) {
 		case SAFE_PILLAR:
 			Main.main.undoRedo.add(new ChangePropertyCommand(node,
-					"seamark:buoy_safewater:shape", "pillar"));
+					"seamark:buoy_safe_water:shape", "pillar"));
 			break;
 		case SAFE_SPAR:
 			Main.main.undoRedo.add(new ChangePropertyCommand(node,
-					"seamark:buoy_safewater:shape", "spar"));
+					"seamark:buoy_safe_water:shape", "spar"));
 			break;
 		case SAFE_SPHERE:
 			Main.main.undoRedo.add(new ChangePropertyCommand(node,
-					"seamark:buoy_safewater:shape", "sphere"));
+					"seamark:buoy_safe_water:shape", "sphere"));
 			break;
 		case SAFE_FLOAT:
 			Main.main.undoRedo.add(new ChangePropertyCommand(node,
-					"seamark:buoy_safewater:shape", "float"));
+					"seamark:buoy_safe_water:shape", "float"));
 			break;
 		default:
 		}
 		Main.main.undoRedo.add(new ChangePropertyCommand(node,
-				"seamark:buoy_safewater:colour_pattern", "vertical stripes"));
+				"seamark:buoy_safe_water:colour_pattern", "vertical stripes"));
 		Main.main.undoRedo.add(new ChangePropertyCommand(node,
-				"seamark:buoy_safewater:colour", "red;white"));
+				"seamark:buoy_safe_water:colour", "red;white"));
 
 		saveTopMarkData("spherical", "red");
@@ -215,6 +215,6 @@
 		keys = node.getKeys();
 
-		if (keys.containsKey("seamark:buoy_safewater:shape")) {
-			str = keys.get("seamark:buoy_safewater:shape");
+		if (keys.containsKey("seamark:buoy_safe_water:shape")) {
+			str = keys.get("seamark:buoy_safe_water:shape");
 			
 			if (str.compareTo("pillar") == 0)