diff --git a/yaml/src/test/java/perf/DeserPerf.java b/yaml/src/test/java/perf/YAMLDeserPerf.java
similarity index 92%
rename from yaml/src/test/java/perf/DeserPerf.java
rename to yaml/src/test/java/perf/YAMLDeserPerf.java
index e3bc347a..ab95cd76 100644
--- a/yaml/src/test/java/perf/DeserPerf.java
+++ b/yaml/src/test/java/perf/YAMLDeserPerf.java
@@ -8,7 +8,7 @@
 /**
  * Micro-benchmark for comparing performance of bean deserialization
  */
-public final class DeserPerf
+public final class YAMLDeserPerf
 {
     /*
     /**********************************************************
@@ -18,7 +18,7 @@ public final class DeserPerf
 
     private final int REPS;
 
-    private DeserPerf() {
+    private YAMLDeserPerf() {
         // Let's try to guestimate suitable size
         REPS = 9000;
     }
@@ -115,7 +115,7 @@ public void test()
     protected int testDeser(ObjectMapper mapper, byte[] input, int reps)
         throws Exception
     {
-        JavaType type = TypeFactory.defaultInstance().constructType(MediaItem.class);
+        JavaType type = mapper.constructType(MediaItem.class);
         MediaItem item = null;
         for (int i = 0; i < reps; ++i) {
             item = mapper.readValue(input, 0, input.length, type);
@@ -123,20 +123,20 @@ protected int testDeser(ObjectMapper mapper, byte[] input, int reps)
         return item.hashCode(); // just to get some non-optimizable number
     }
 
-    protected int testDeser(JsonFactory jf, byte[] input, int reps)
+    protected int testDeser(JsonFactory f, byte[] input, int reps)
         throws Exception
     {
         MediaItem item = null;
         for (int i = 0; i < reps; ++i) {
-            JsonParser jp = jf.createParser(input);
-            item = MediaItem.deserialize(jp);
-            jp.close();
+            JsonParser p = f.createParser(input);
+            item = MediaItem.deserialize(p);
+            p.close();
         }
         return item.hashCode(); // just to get some non-optimizable number
     }
     
     public static void main(String[] args) throws Exception
     {
-        new DeserPerf().test();
+        new YAMLDeserPerf().test();
     }
 }
diff --git a/yaml/src/test/java/perf/SerPerf.java b/yaml/src/test/java/perf/YAMLSerPerf.java
similarity index 97%
rename from yaml/src/test/java/perf/SerPerf.java
rename to yaml/src/test/java/perf/YAMLSerPerf.java
index d3c3e32c..3254e394 100644
--- a/yaml/src/test/java/perf/SerPerf.java
+++ b/yaml/src/test/java/perf/YAMLSerPerf.java
@@ -7,7 +7,7 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.dataformat.yaml.YAMLFactory;
 
-public final class SerPerf
+public final class YAMLSerPerf
 {
     /*
     /**********************************************************
@@ -17,7 +17,7 @@ public final class SerPerf
 
     private final int REPS;
 
-    private SerPerf() throws Exception
+    private YAMLSerPerf() throws Exception
     {
         // Let's try to guesstimate suitable size...
         REPS = 6000;
@@ -141,6 +141,6 @@ protected int testObjectSer(JsonFactory jf, MediaItem value, int reps, ByteArray
     
     public static void main(String[] args) throws Exception
     {
-        new SerPerf().test();
+        new YAMLSerPerf().test();
     }
 }