diff --git a/hyracks/hyracks-dataflow-hadoop/src/main/java/edu/uci/ics/hyracks/dataflow/hadoop/util/DuplicateKeyMapper.java b/hyracks/hyracks-dataflow-hadoop/src/main/java/edu/uci/ics/hyracks/dataflow/hadoop/util/DuplicateKeyMapper.java
index 0003076..1601a28 100644
--- a/hyracks/hyracks-dataflow-hadoop/src/main/java/edu/uci/ics/hyracks/dataflow/hadoop/util/DuplicateKeyMapper.java
+++ b/hyracks/hyracks-dataflow-hadoop/src/main/java/edu/uci/ics/hyracks/dataflow/hadoop/util/DuplicateKeyMapper.java
@@ -18,9 +18,9 @@
 
 import edu.uci.ics.hyracks.api.dataflow.IDataWriter;
 import edu.uci.ics.hyracks.api.exceptions.HyracksDataException;
-import edu.uci.ics.hyracks.dataflow.std.map.IMapper;
+import edu.uci.ics.hyracks.dataflow.std.map.IDeserializedMapper;
 
-public class DuplicateKeyMapper implements IMapper {
+public class DuplicateKeyMapper implements IDeserializedMapper {
 
     @Override
     public void map(Object[] data, IDataWriter<Object[]> writer) throws HyracksDataException {
diff --git a/hyracks/hyracks-dataflow-hadoop/src/main/java/edu/uci/ics/hyracks/dataflow/hadoop/util/PreappendLongWritableMapper.java b/hyracks/hyracks-dataflow-hadoop/src/main/java/edu/uci/ics/hyracks/dataflow/hadoop/util/PreappendLongWritableMapper.java
index 05be19e..e4542c6 100644
--- a/hyracks/hyracks-dataflow-hadoop/src/main/java/edu/uci/ics/hyracks/dataflow/hadoop/util/PreappendLongWritableMapper.java
+++ b/hyracks/hyracks-dataflow-hadoop/src/main/java/edu/uci/ics/hyracks/dataflow/hadoop/util/PreappendLongWritableMapper.java
@@ -21,9 +21,9 @@
 
 import edu.uci.ics.hyracks.api.dataflow.IDataWriter;
 import edu.uci.ics.hyracks.api.exceptions.HyracksDataException;
-import edu.uci.ics.hyracks.dataflow.std.map.IMapper;
+import edu.uci.ics.hyracks.dataflow.std.map.IDeserializedMapper;
 
-public class PreappendLongWritableMapper implements IMapper {
+public class PreappendLongWritableMapper implements IDeserializedMapper {
 
     @Override
     public void map(Object[] data, IDataWriter<Object[]> writer) throws HyracksDataException {
diff --git a/hyracks/hyracks-dataflow-std/src/main/java/edu/uci/ics/hyracks/dataflow/std/map/MapperOperatorDescriptor.java b/hyracks/hyracks-dataflow-std/src/main/java/edu/uci/ics/hyracks/dataflow/std/map/DeserializedMapperOperatorDescriptor.java
similarity index 89%
rename from hyracks/hyracks-dataflow-std/src/main/java/edu/uci/ics/hyracks/dataflow/std/map/MapperOperatorDescriptor.java
rename to hyracks/hyracks-dataflow-std/src/main/java/edu/uci/ics/hyracks/dataflow/std/map/DeserializedMapperOperatorDescriptor.java
index 87721f0..64b45d7 100644
--- a/hyracks/hyracks-dataflow-std/src/main/java/edu/uci/ics/hyracks/dataflow/std/map/MapperOperatorDescriptor.java
+++ b/hyracks/hyracks-dataflow-std/src/main/java/edu/uci/ics/hyracks/dataflow/std/map/DeserializedMapperOperatorDescriptor.java
@@ -26,9 +26,9 @@
 import edu.uci.ics.hyracks.dataflow.std.base.IOpenableDataWriterOperator;
 import edu.uci.ics.hyracks.dataflow.std.util.DeserializedOperatorNodePushable;
 
-public class MapperOperatorDescriptor extends AbstractSingleActivityOperatorDescriptor {
+public class DeserializedMapperOperatorDescriptor extends AbstractSingleActivityOperatorDescriptor {
     private class MapperOperator implements IOpenableDataWriterOperator {
-        private IMapper mapper;
+        private IDeserializedMapper mapper;
         private IOpenableDataWriter<Object[]> writer;
 
         @Override
@@ -59,9 +59,9 @@
 
     private static final long serialVersionUID = 1L;
 
-    private final IMapperFactory mapperFactory;
+    private final IDeserializedMapperFactory mapperFactory;
 
-    public MapperOperatorDescriptor(JobSpecification spec, IMapperFactory mapperFactory,
+    public DeserializedMapperOperatorDescriptor(JobSpecification spec, IDeserializedMapperFactory mapperFactory,
             RecordDescriptor recordDescriptor) {
         super(spec, 1, 1);
         this.mapperFactory = mapperFactory;
diff --git a/hyracks/hyracks-dataflow-std/src/main/java/edu/uci/ics/hyracks/dataflow/std/map/IMapper.java b/hyracks/hyracks-dataflow-std/src/main/java/edu/uci/ics/hyracks/dataflow/std/map/IDeserializedMapper.java
similarity index 95%
rename from hyracks/hyracks-dataflow-std/src/main/java/edu/uci/ics/hyracks/dataflow/std/map/IMapper.java
rename to hyracks/hyracks-dataflow-std/src/main/java/edu/uci/ics/hyracks/dataflow/std/map/IDeserializedMapper.java
index 2b457b9..fe9ab1c 100644
--- a/hyracks/hyracks-dataflow-std/src/main/java/edu/uci/ics/hyracks/dataflow/std/map/IMapper.java
+++ b/hyracks/hyracks-dataflow-std/src/main/java/edu/uci/ics/hyracks/dataflow/std/map/IDeserializedMapper.java
@@ -17,6 +17,6 @@
 import edu.uci.ics.hyracks.api.dataflow.IDataWriter;
 import edu.uci.ics.hyracks.api.exceptions.HyracksDataException;
 
-public interface IMapper {
+public interface IDeserializedMapper {
     public void map(Object[] data, IDataWriter<Object[]> writer) throws HyracksDataException;
 }
diff --git a/hyracks/hyracks-dataflow-std/src/main/java/edu/uci/ics/hyracks/dataflow/std/map/IMapperFactory.java b/hyracks/hyracks-dataflow-std/src/main/java/edu/uci/ics/hyracks/dataflow/std/map/IDeserializedMapperFactory.java
similarity index 84%
rename from hyracks/hyracks-dataflow-std/src/main/java/edu/uci/ics/hyracks/dataflow/std/map/IMapperFactory.java
rename to hyracks/hyracks-dataflow-std/src/main/java/edu/uci/ics/hyracks/dataflow/std/map/IDeserializedMapperFactory.java
index 9eda690..6fadfdc 100644
--- a/hyracks/hyracks-dataflow-std/src/main/java/edu/uci/ics/hyracks/dataflow/std/map/IMapperFactory.java
+++ b/hyracks/hyracks-dataflow-std/src/main/java/edu/uci/ics/hyracks/dataflow/std/map/IDeserializedMapperFactory.java
@@ -18,6 +18,6 @@
 
 import edu.uci.ics.hyracks.api.exceptions.HyracksDataException;
 
-public interface IMapperFactory extends Serializable {
-    public IMapper createMapper() throws HyracksDataException;
+public interface IDeserializedMapperFactory extends Serializable {
+    public IDeserializedMapper createMapper() throws HyracksDataException;
 }
\ No newline at end of file
diff --git a/hyracks/hyracks-dataflow-std/src/main/java/edu/uci/ics/hyracks/dataflow/std/map/ReflectionBasedMapperFactory.java b/hyracks/hyracks-dataflow-std/src/main/java/edu/uci/ics/hyracks/dataflow/std/map/ReflectionBasedDeserializedMapperFactory.java
similarity index 76%
rename from hyracks/hyracks-dataflow-std/src/main/java/edu/uci/ics/hyracks/dataflow/std/map/ReflectionBasedMapperFactory.java
rename to hyracks/hyracks-dataflow-std/src/main/java/edu/uci/ics/hyracks/dataflow/std/map/ReflectionBasedDeserializedMapperFactory.java
index d6263fb..d207a5c 100644
--- a/hyracks/hyracks-dataflow-std/src/main/java/edu/uci/ics/hyracks/dataflow/std/map/ReflectionBasedMapperFactory.java
+++ b/hyracks/hyracks-dataflow-std/src/main/java/edu/uci/ics/hyracks/dataflow/std/map/ReflectionBasedDeserializedMapperFactory.java
@@ -16,17 +16,17 @@
 
 import edu.uci.ics.hyracks.api.exceptions.HyracksDataException;
 
-public class ReflectionBasedMapperFactory implements IMapperFactory {
+public class ReflectionBasedDeserializedMapperFactory implements IDeserializedMapperFactory {
     private static final long serialVersionUID = 1L;
 
-    private final Class<? extends IMapper> mapperClass;
+    private final Class<? extends IDeserializedMapper> mapperClass;
 
-    public ReflectionBasedMapperFactory(Class<? extends IMapper> mapperClass) {
+    public ReflectionBasedDeserializedMapperFactory(Class<? extends IDeserializedMapper> mapperClass) {
         this.mapperClass = mapperClass;
     }
 
     @Override
-    public IMapper createMapper() throws HyracksDataException {
+    public IDeserializedMapper createMapper() throws HyracksDataException {
         try {
             return mapperClass.newInstance();
         } catch (InstantiationException e) {
diff --git a/hyracks/hyracks-dataflow-std/src/main/java/edu/uci/ics/hyracks/dataflow/std/map/SamplerMapFactory.java b/hyracks/hyracks-dataflow-std/src/main/java/edu/uci/ics/hyracks/dataflow/std/map/SamplerDeserializedMapperFactory.java
similarity index 82%
rename from hyracks/hyracks-dataflow-std/src/main/java/edu/uci/ics/hyracks/dataflow/std/map/SamplerMapFactory.java
rename to hyracks/hyracks-dataflow-std/src/main/java/edu/uci/ics/hyracks/dataflow/std/map/SamplerDeserializedMapperFactory.java
index 62a7ded..bf05106 100644
--- a/hyracks/hyracks-dataflow-std/src/main/java/edu/uci/ics/hyracks/dataflow/std/map/SamplerMapFactory.java
+++ b/hyracks/hyracks-dataflow-std/src/main/java/edu/uci/ics/hyracks/dataflow/std/map/SamplerDeserializedMapperFactory.java
@@ -19,17 +19,17 @@
 import edu.uci.ics.hyracks.api.dataflow.IDataWriter;
 import edu.uci.ics.hyracks.api.exceptions.HyracksDataException;
 
-public class SamplerMapFactory implements IMapperFactory {
+public class SamplerDeserializedMapperFactory implements IDeserializedMapperFactory {
     private static final long serialVersionUID = 1L;
     private final float sampleRatio;
 
-    public SamplerMapFactory(float sampleRatio) {
+    public SamplerDeserializedMapperFactory(float sampleRatio) {
         this.sampleRatio = sampleRatio;
     }
 
     @Override
-    public IMapper createMapper() throws HyracksDataException {
-        return new IMapper() {
+    public IDeserializedMapper createMapper() throws HyracksDataException {
+        return new IDeserializedMapper() {
             private Random random = new Random();
 
             @Override