diff --git a/algebricks/algebricks-data/src/main/java/edu/uci/ics/hyracks/algebricks/data/IResultSerializedAppenderFactoryProvider.java b/algebricks/algebricks-data/src/main/java/edu/uci/ics/hyracks/algebricks/data/IResultSerializerFactoryProvider.java
similarity index 86%
rename from algebricks/algebricks-data/src/main/java/edu/uci/ics/hyracks/algebricks/data/IResultSerializedAppenderFactoryProvider.java
rename to algebricks/algebricks-data/src/main/java/edu/uci/ics/hyracks/algebricks/data/IResultSerializerFactoryProvider.java
index 4b65822..439420a 100644
--- a/algebricks/algebricks-data/src/main/java/edu/uci/ics/hyracks/algebricks/data/IResultSerializedAppenderFactoryProvider.java
+++ b/algebricks/algebricks-data/src/main/java/edu/uci/ics/hyracks/algebricks/data/IResultSerializerFactoryProvider.java
@@ -18,10 +18,10 @@
 
 import edu.uci.ics.hyracks.algebricks.data.IAWriterFactory;
 import edu.uci.ics.hyracks.algebricks.data.IPrinterFactory;
-import edu.uci.ics.hyracks.api.dataflow.value.IResultSerializedAppenderFactory;
+import edu.uci.ics.hyracks.api.dataflow.value.IResultSerializerFactory;
 import edu.uci.ics.hyracks.api.dataflow.value.RecordDescriptor;
 
-public interface IResultSerializedAppenderFactoryProvider extends Serializable {
+public interface IResultSerializerFactoryProvider extends Serializable {
     /**
      * Creates a result serialized appender
      * 
@@ -35,6 +35,6 @@
      *            - The record descriptor describing the input frame to be serialized.
      * @return A new instance of result serialized appender.
      */
-    public IResultSerializedAppenderFactory getAqlResultAppenderFactoryProvider(int[] fields,
+    public IResultSerializerFactory getAqlResultAppenderFactoryProvider(int[] fields,
             IPrinterFactory[] printerFactories, IAWriterFactory writerFactory, RecordDescriptor inputRecordDesc);
 }
diff --git a/hyracks/hyracks-api/src/main/java/edu/uci/ics/hyracks/api/dataflow/value/IResultSerializedAppender.java b/hyracks/hyracks-api/src/main/java/edu/uci/ics/hyracks/api/dataflow/value/IResultSerializer.java
similarity index 94%
rename from hyracks/hyracks-api/src/main/java/edu/uci/ics/hyracks/api/dataflow/value/IResultSerializedAppender.java
rename to hyracks/hyracks-api/src/main/java/edu/uci/ics/hyracks/api/dataflow/value/IResultSerializer.java
index 1cfe02c..afb17e4 100644
--- a/hyracks/hyracks-api/src/main/java/edu/uci/ics/hyracks/api/dataflow/value/IResultSerializedAppender.java
+++ b/hyracks/hyracks-api/src/main/java/edu/uci/ics/hyracks/api/dataflow/value/IResultSerializer.java
@@ -19,7 +19,7 @@
 import edu.uci.ics.hyracks.api.comm.IFrameTupleAccessor;
 import edu.uci.ics.hyracks.api.exceptions.HyracksDataException;
 
-public interface IResultSerializedAppender extends Serializable {
+public interface IResultSerializer extends Serializable {
     /**
      * Method to serialize the result and append it to the provided output stream
      * 
diff --git a/hyracks/hyracks-api/src/main/java/edu/uci/ics/hyracks/api/dataflow/value/IResultSerializedAppenderFactory.java b/hyracks/hyracks-api/src/main/java/edu/uci/ics/hyracks/api/dataflow/value/IResultSerializerFactory.java
similarity index 73%
rename from hyracks/hyracks-api/src/main/java/edu/uci/ics/hyracks/api/dataflow/value/IResultSerializedAppenderFactory.java
rename to hyracks/hyracks-api/src/main/java/edu/uci/ics/hyracks/api/dataflow/value/IResultSerializerFactory.java
index 63d861b..92cf569 100644
--- a/hyracks/hyracks-api/src/main/java/edu/uci/ics/hyracks/api/dataflow/value/IResultSerializedAppenderFactory.java
+++ b/hyracks/hyracks-api/src/main/java/edu/uci/ics/hyracks/api/dataflow/value/IResultSerializerFactory.java
@@ -14,16 +14,16 @@
  */
 package edu.uci.ics.hyracks.api.dataflow.value;
 
-import java.io.OutputStream;
+import java.io.PrintStream;
 import java.io.Serializable;
 
-public interface IResultSerializedAppenderFactory extends Serializable {
+public interface IResultSerializerFactory extends Serializable {
     /**
      * Creates a result serialized appender
      * 
-     * @param outputStream
-     *            - An output stream object to which the serialized results will be appended.
+     * @param printStream
+     *            - A print stream object to which the serialized results will be written.
      * @return A new instance of result serialized appender.
      */
-    public IResultSerializedAppender createResultSerializer(OutputStream outputStream);
+    public IResultSerializer createResultSerializer(PrintStream printStream);
 }
\ No newline at end of file
