Index: trunk/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java
===================================================================
--- trunk/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java	(revision 4344)
+++ trunk/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java	(revision 4345)
@@ -138,5 +138,5 @@
                     newValue = invertNumber(value);
                 }
-            } else if (!key.startsWith("name") && !key.endsWith("name")) {
+            } else if (!ignoreKeyForPrefixSuffixCorrection(key)) {
                 for (PrefixSuffixSwitcher prefixSuffixSwitcher : prefixSuffixSwitchers) {
                     newKey = prefixSuffixSwitcher.apply(key);
@@ -211,3 +211,8 @@
                         + "to maintain data consistency."));
     }
+
+    private static boolean ignoreKeyForPrefixSuffixCorrection(String key) {
+        return key.startsWith("name") || key.endsWith("name")
+                || key.equalsIgnoreCase("fixme") || key.startsWith("note");
+    }
 }
