Index: trunk/test/unit/org/openstreetmap/josm/actions/mapmode/DrawActionTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/actions/mapmode/DrawActionTest.java	(revision 13559)
+++ trunk/test/unit/org/openstreetmap/josm/actions/mapmode/DrawActionTest.java	(revision 13564)
@@ -24,5 +24,5 @@
 import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.MapFrame;
-import org.openstreetmap.josm.gui.OsmPrimitivRenderer;
+import org.openstreetmap.josm.gui.PrimitiveRenderer;
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
 import org.openstreetmap.josm.testutils.JOSMTestRules;
@@ -44,5 +44,5 @@
     /**
      * Non regression test case for bug #12011.
-     * Add a new node in the middle of way then undo. The rendering of the node, selected, must not cause any crash in OsmPrimitivRenderer.
+     * Add a new node in the middle of way then undo. The rendering of the node, selected, must not cause any crash in PrimitiveRenderer.
      * @throws SecurityException see {@link Class#getDeclaredField} for details
      * @throws NoSuchFieldException see {@link Class#getDeclaredField} for details
@@ -82,5 +82,5 @@
 
             JList<OsmPrimitive> lstPrimitives = new JList<>();
-            OsmPrimitivRenderer renderer = new OsmPrimitivRenderer();
+            PrimitiveRenderer renderer = new PrimitiveRenderer();
 
             assertEquals(3, w.getNodesCount());
Index: trunk/test/unit/org/openstreetmap/josm/data/osm/DefaultNameFormatterTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/data/osm/DefaultNameFormatterTest.java	(revision 13559)
+++ trunk/test/unit/org/openstreetmap/josm/data/osm/DefaultNameFormatterTest.java	(revision 13564)
@@ -63,5 +63,5 @@
         TaggingPresets.addTaggingPresets(TaggingPresetReader.readAll("http://localhost:" + wireMockRule.port() + "/" + source, true));
 
-        Comparator<Relation> comparator = DefaultNameFormatter.getInstance().getRelationComparator();
+        Comparator<IRelation> comparator = DefaultNameFormatter.getInstance().getRelationComparator();
 
         try (InputStream is = TestUtils.getRegressionDataStream(9632, "data.osm.zip")) {