Index: /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/AddressEditContainer.java
===================================================================
--- /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/AddressEditContainer.java	(revision 24093)
+++ /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/AddressEditContainer.java	(revision 24094)
@@ -290,6 +290,6 @@
 		if (ne != null) {
 			// Node is a street (segment)
-			if (ne instanceof StreetSegmentNode) {
-				StreetSegmentNode newSegment = (StreetSegmentNode) ne;
+			if (ne instanceof OSMStreetSegment) {
+				OSMStreetSegment newSegment = (OSMStreetSegment) ne;
 
 				if (newSegment != null) {
Index: /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/NodeFactory.java
===================================================================
--- /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/NodeFactory.java	(revision 24093)
+++ /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/NodeFactory.java	(revision 24094)
@@ -51,5 +51,5 @@
 	public static IOSMEntity createNodeFromWay(Way way) {
 		if (TagUtils.hasHighwayTag(way)) {
-			return new StreetSegmentNode(way);
+			return new OSMStreetSegment(way);
 		}
 		
Index: /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/OSMStreet.java
===================================================================
--- /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/OSMStreet.java	(revision 24093)
+++ /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/OSMStreet.java	(revision 24094)
@@ -45,5 +45,5 @@
 	 * @param segment
 	 */
-	public void addStreetSegment(StreetSegmentNode segment) {
+	public void addStreetSegment(OSMStreetSegment segment) {
 		lazyCreateChildren();
 		
@@ -100,5 +100,5 @@
 		int sc = 0;
 		for (IOSMEntity node : children) {
-			if (node instanceof StreetSegmentNode) {
+			if (node instanceof OSMStreetSegment) {
 				sc++;
 			}
Index: /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/OSMStreetSegment.java
===================================================================
--- /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/OSMStreetSegment.java	(revision 24094)
+++ /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/OSMStreetSegment.java	(revision 24094)
@@ -0,0 +1,39 @@
+/*
+ * This program is free software: you can redistribute it and/or modify it under 
+ * the terms of the GNU General Public License as published by the 
+ * Free Software Foundation, either version 3 of the License, or 
+ * (at your option) any later version. 
+ * 
+ * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; 
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. 
+ * See the GNU General Public License for more details. 
+ * 
+ * You should have received a copy of the GNU General Public License along with this program. 
+ * If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.openstreetmap.josm.plugins.fixAddresses;
+
+import java.util.List;
+
+import org.openstreetmap.josm.data.osm.OsmPrimitive;
+
+/**
+ * Represents a single segment of a street. In many cases a segment may represent the complete street, but
+ * sometimes a street is separated into many segments, e. g. due to different speed limits, bridges, etc..
+ * 
+ * @author Oliver Wieland <oliver.wieland@online.de>
+ * 
+ */
+
+public class OSMStreetSegment extends OSMEntityBase {
+
+	public OSMStreetSegment(OsmPrimitive osmObject) {
+		super(osmObject);
+	}
+
+	@Override
+	public List<IOSMEntity> getChildren() {
+		return null;
+	}
+
+}
Index: plications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/StreetSegmentNode.java
===================================================================
--- /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/StreetSegmentNode.java	(revision 24093)
+++ 	(revision )
@@ -1,39 +1,0 @@
-/*
- * This program is free software: you can redistribute it and/or modify it under 
- * the terms of the GNU General Public License as published by the 
- * Free Software Foundation, either version 3 of the License, or 
- * (at your option) any later version. 
- * 
- * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; 
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. 
- * See the GNU General Public License for more details. 
- * 
- * You should have received a copy of the GNU General Public License along with this program. 
- * If not, see <http://www.gnu.org/licenses/>.
- */
-package org.openstreetmap.josm.plugins.fixAddresses;
-
-import java.util.List;
-
-import org.openstreetmap.josm.data.osm.OsmPrimitive;
-
-/**
- * Represents a single segment of a street. In many cases a segment may represent the complete street, but
- * sometimes a street is separated into many segments, e. g. due to different speed limits, bridges, etc..
- * 
- * @author Oliver Wieland <oliver.wieland@online.de>
- * 
- */
-
-public class StreetSegmentNode extends OSMEntityBase {
-
-	public StreetSegmentNode(OsmPrimitive osmObject) {
-		super(osmObject);
-	}
-
-	@Override
-	public List<IOSMEntity> getChildren() {
-		return null;
-	}
-
-}