diff --git a/src/client/Transaction.js b/src/client/Transaction.js
index 55505b0..39cc69a 100644
--- a/src/client/Transaction.js
+++ b/src/client/Transaction.js
@@ -2,7 +2,7 @@
  * Copyright (C) 2015,2016 The Measurement Factory.
  * Licensed under the Apache License, Version 2.0.                       */
 
-import { requestPrefix } from "../http/one/MessageWriter";
+import { requestPrefix } from "../http/one/MessagePacker";
 import ResponseParser from "../http/one/ResponseParser";
 import Request from "../http/Request";
 import { Must, SendBytes } from "../misc/Gadgets";
diff --git a/src/http/one/MessageWriter.js b/src/http/one/MessagePacker.js
similarity index 72%
rename from src/http/one/MessageWriter.js
rename to src/http/one/MessagePacker.js
index 2d114c4..cc82c3f 100644
--- a/src/http/one/MessageWriter.js
+++ b/src/http/one/MessagePacker.js
@@ -1,4 +1,4 @@
-function rawStatusLine(statusLine) {
+function packStatusLine(statusLine) {
     return [
         statusLine.protocol,
         statusLine.protocolDelimiter,
@@ -9,7 +9,7 @@ function rawStatusLine(statusLine) {
     ].filter(item => item !== null).join("");
 }
 
-function rawRequestLine(requestLine) {
+function packRequestLine(requestLine) {
     return [
         requestLine.method,
         requestLine.methodDelimiter,
@@ -20,24 +20,24 @@ function rawRequestLine(requestLine) {
     ].filter(item => item !== null).join("");
 }
 
-function rawHeader(header) {
+function packHeader(header) {
     if (header._raw !== null)
         return header._raw;
 
-    function rawField(field) {
+    function packField(field) {
         return field.name + field.separator +
             field.value + field.terminator;
     }
 
-    return header.fields.map(rawField).join("");
+    return header.fields.map(packField).join("");
 }
 
 export function requestPrefix(message) {
     if (message.startLine.protocol === "HTTP/0.9")
         return "";
 
-    return rawRequestLine(message.startLine) +
-        rawHeader(message.header) +
+    return packRequestLine(message.startLine) +
+        packHeader(message.header) +
         message.headerDelimiter;
 }
 
@@ -45,7 +45,7 @@ export function responsePrefix(message) {
     if (message.startLine.protocol === "HTTP/0.9")
         return "";
 
-    return rawStatusLine(message.startLine) +
-        rawHeader(message.header) +
+    return packStatusLine(message.startLine) +
+        packHeader(message.header) +
         message.headerDelimiter;
 }
diff --git a/src/proxy/Transaction.js b/src/proxy/Transaction.js
index 67b7507..be2986d 100644
--- a/src/proxy/Transaction.js
+++ b/src/proxy/Transaction.js
@@ -7,7 +7,7 @@
 import net from "net";
 import RequestParser from "../http/one/RequestParser";
 import ResponseParser from "../http/one/ResponseParser";
-import { requestPrefix, responsePrefix } from "../http/one/MessageWriter";
+import { requestPrefix, responsePrefix } from "../http/one/MessagePacker";
 import * as Config from "../misc/Config";
 import { Must, SendBytes } from "../misc/Gadgets";
 import * as Gadgets from "../misc/Gadgets";
diff --git a/src/server/Transaction.js b/src/server/Transaction.js
index d5da575..492bd3d 100644
--- a/src/server/Transaction.js
+++ b/src/server/Transaction.js
@@ -2,7 +2,7 @@
  * Copyright (C) 2015,2016 The Measurement Factory.
  * Licensed under the Apache License, Version 2.0.                       */
 
-import { responsePrefix } from "../http/one/MessageWriter";
+import { responsePrefix } from "../http/one/MessagePacker";
 import RequestParser from "../http/one/RequestParser";
 import Response from "../http/Response";
 import Body from "../http/Body";