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 23982)
+++ applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/AddressEditContainer.java	(revision 24014)
@@ -432,5 +432,5 @@
 	 */
 	private boolean assignAddressToStreet(AddressNode aNode) {
-		String streetName = aNode.getStreet();
+		String streetName = aNode.getStreetName();
 		
 		if (streetName != null && shadowStreetDict.containsKey(streetName)) {
Index: applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/AddressNode.java
===================================================================
--- applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/AddressNode.java	(revision 23982)
+++ applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/AddressNode.java	(revision 24014)
@@ -47,5 +47,5 @@
 	 * @return
 	 */
-	public String getStreet() {
+	public String getStreetName() {
 		if (osmObject == null) return MISSING_TAG;
 		/*
@@ -202,10 +202,10 @@
 				cc = this.getCity().compareTo(other.getCity());				
 				if (cc  == 0) {
-					cc = this.getStreet().compareTo(other.getStreet());					
+					cc = this.getStreetName().compareTo(other.getStreetName());					
 					if (cc  == 0) {
 						if (hasGuessedStreetName()) {							
 							if (other.hasStreetName()) {
 								// Compare guessed name with the real name
-								cc = this.getGuessedStreetName().compareTo(other.getStreet());
+								cc = this.getGuessedStreetName().compareTo(other.getStreetName());
 								if (cc == 0) {
 									cc = this.getHouseNumber().compareTo(other.getHouseNumber());
@@ -237,5 +237,5 @@
 		if (node == null || !node.hasName()) return;
 		
-		if (!node.getName().equals(getStreet())) {
+		if (!node.getName().equals(getStreetName())) {
 			setStreetName(node.getName());			
 			node.addAddress(this);
@@ -304,5 +304,5 @@
 		// DE
 		String guessed = node.getGuessedStreetName();
-		String sName = node.getStreet();
+		String sName = node.getStreetName();
 		if (!StringUtils.isNullOrEmpty(guessed) && MISSING_TAG.equals(sName)) {
 			sName = String.format("(%s)", guessed);
Index: applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/IncompleteAddressesTableModel.java
===================================================================
--- applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/IncompleteAddressesTableModel.java	(revision 23982)
+++ applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/IncompleteAddressesTableModel.java	(revision 24014)
@@ -77,9 +77,9 @@
 		case 4:
 			if (!StringUtils.isNullOrEmpty(aNode.getGuessedStreetName()) && 
-					AddressNode.MISSING_TAG.equals(aNode.getStreet())) {
+					AddressNode.MISSING_TAG.equals(aNode.getStreetName())) {
 				
 				return "(" + aNode.getGuessedStreetName() + ")";
 			} else {
-				return aNode.getStreet();
+				return aNode.getStreetName();
 			}
 		default:
Index: applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/UnresolvedAddressesTableModel.java
===================================================================
--- applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/UnresolvedAddressesTableModel.java	(revision 23982)
+++ applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/UnresolvedAddressesTableModel.java	(revision 24014)
@@ -103,9 +103,9 @@
 		case 0:
 			String guessed = aNode.getGuessedStreetName();
-			String cur = aNode.getStreet();
+			String cur = aNode.getStreetName();
 			if (aNode.hasGuessedStreetName() && AddressNode.MISSING_TAG.equals(cur)) {				
 				return "*" + guessed;
 			} else {
-				return aNode.getStreet();
+				return aNode.getStreetName();
 			}
 		case 1: