Index: applications/editors/josm/plugins/toms/src/toms/seamarks/buoys/BuoySaw.java
===================================================================
--- applications/editors/josm/plugins/toms/src/toms/seamarks/buoys/BuoySaw.java	(revision 26150)
+++ applications/editors/josm/plugins/toms/src/toms/seamarks/buoys/BuoySaw.java	(revision 26151)
@@ -69,5 +69,5 @@
 			else if (str.equals("spar")) //$NON-NLS-1$
 				setStyleIndex(SAFE_SPAR);
-			else if (str.equals("sphere")) //$NON-NLS-1$
+			else if (str.equals("spherical")) //$NON-NLS-1$
 				setStyleIndex(SAFE_SPHERE);
 		} else if ((keys.containsKey("seamark:type")) //$NON-NLS-1$
@@ -225,5 +225,5 @@
 			super.saveSign("buoy_safe_water"); //$NON-NLS-1$
 			Main.main.undoRedo.add(new ChangePropertyCommand(node,
-					"seamark:buoy_safe_water:shape", "sphere")); //$NON-NLS-1$ //$NON-NLS-2$
+					"seamark:buoy_safe_water:shape", "spherical")); //$NON-NLS-1$ //$NON-NLS-2$
 			break;
 		case SAFE_BEACON:
Index: applications/editors/josm/plugins/toms/src/toms/seamarks/buoys/BuoySpec.java
===================================================================
--- applications/editors/josm/plugins/toms/src/toms/seamarks/buoys/BuoySpec.java	(revision 26150)
+++ applications/editors/josm/plugins/toms/src/toms/seamarks/buoys/BuoySpec.java	(revision 26151)
@@ -86,5 +86,5 @@
 			else if (str.equals("spar")) //$NON-NLS-1$
 				setStyleIndex(SPEC_SPAR);
-			else if (str.equals("sphere")) //$NON-NLS-1$
+			else if (str.equals("spherical")) //$NON-NLS-1$
 				setStyleIndex(SPEC_SPHERE);
 			else if (str.equals("barrel")) //$NON-NLS-1$
@@ -374,5 +374,5 @@
 			super.saveSign("buoy_special_purpose"); //$NON-NLS-1$
 			Main.main.undoRedo.add(new ChangePropertyCommand(node,
-					"seamark:buoy_special_purpose:shape", "sphere")); //$NON-NLS-1$ //$NON-NLS-2$
+					"seamark:buoy_special_purpose:shape", "spherical")); //$NON-NLS-1$ //$NON-NLS-2$
 			Main.main.undoRedo.add(new ChangePropertyCommand(node,
 					"seamark:buoy_special_purpose:colour", "yellow")); //$NON-NLS-1$ //$NON-NLS-2$