diff --git a/test/vp9_boolcoder_test.cc b/test/vp9_boolcoder_test.cc
index 5edde9020..d9c3750df 100644
--- a/test/vp9_boolcoder_test.cc
+++ b/test/vp9_boolcoder_test.cc
@@ -15,8 +15,8 @@
 #include "third_party/googletest/src/include/gtest/gtest.h"
 
 extern "C" {
-#include "vp9/encoder/vp9_boolhuff.h"
 #include "vp9/decoder/vp9_dboolhuff.h"
+#include "vp9/encoder/vp9_writer.h"
 }
 
 #include "test/acm_random.h"
diff --git a/vp9/encoder/vp9_subexp.c b/vp9/encoder/vp9_subexp.c
index f31e568b7..def99d18e 100644
--- a/vp9/encoder/vp9_subexp.c
+++ b/vp9/encoder/vp9_subexp.c
@@ -11,8 +11,8 @@
 #include "vp9/common/vp9_common.h"
 #include "vp9/common/vp9_entropy.h"
 
-#include "vp9/encoder/vp9_boolhuff.h"
 #include "vp9/encoder/vp9_treewriter.h"
+#include "vp9/encoder/vp9_writer.h"
 
 #define vp9_cost_upd256  ((int)(vp9_cost_one(upd) - vp9_cost_zero(upd)))
 
diff --git a/vp9/encoder/vp9_treewriter.h b/vp9/encoder/vp9_treewriter.h
index 913b5f0ca..09f80b0ba 100644
--- a/vp9/encoder/vp9_treewriter.h
+++ b/vp9/encoder/vp9_treewriter.h
@@ -11,7 +11,7 @@
 #ifndef VP9_ENCODER_VP9_TREEWRITER_H_
 #define VP9_ENCODER_VP9_TREEWRITER_H_
 
-#include "vp9/encoder/vp9_boolhuff.h"       /* for now */
+#include "vp9/encoder/vp9_writer.h"
 
 #define vp9_cost_zero(prob) (vp9_prob_cost[prob])
 
diff --git a/vp9/encoder/vp9_boolhuff.c b/vp9/encoder/vp9_writer.c
similarity index 98%
rename from vp9/encoder/vp9_boolhuff.c
rename to vp9/encoder/vp9_writer.c
index 32c136e0f..3d13d07b6 100644
--- a/vp9/encoder/vp9_boolhuff.c
+++ b/vp9/encoder/vp9_writer.c
@@ -9,7 +9,7 @@
  */
 
 #include <assert.h>
-#include "vp9/encoder/vp9_boolhuff.h"
+#include "vp9/encoder/vp9_writer.h"
 #include "vp9/common/vp9_entropy.h"
 
 #if defined(SECTIONBITS_OUTPUT)
diff --git a/vp9/encoder/vp9_boolhuff.h b/vp9/encoder/vp9_writer.h
similarity index 85%
rename from vp9/encoder/vp9_boolhuff.h
rename to vp9/encoder/vp9_writer.h
index 343c1bb9b..9cac7a84f 100644
--- a/vp9/encoder/vp9_boolhuff.h
+++ b/vp9/encoder/vp9_writer.h
@@ -8,16 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-
-/****************************************************************************
-*
-*   Module Title :     vp9_boolhuff.h
-*
-*   Description  :     Bool Coder header file.
-*
-****************************************************************************/
-#ifndef VP9_ENCODER_VP9_BOOLHUFF_H_
-#define VP9_ENCODER_VP9_BOOLHUFF_H_
+#ifndef VP9_ENCODER_VP9_WRITER_H_
+#define VP9_ENCODER_VP9_WRITER_H_
 
 #include "vpx_ports/mem.h"
 
@@ -33,7 +25,7 @@ typedef struct {
 
   // Variables used to track bit costs without outputing to the bitstream
   unsigned int  measure_cost;
-  unsigned long bit_counter;
+  uint64_t bit_counter;
 } vp9_writer;
 
 extern const unsigned int vp9_prob_cost[256];
@@ -113,4 +105,4 @@ static void vp9_write_literal(vp9_writer *w, int data, int bits) {
 
 #define vp9_write_prob(w, v) vp9_write_literal((w), (v), 8)
 
-#endif  // VP9_ENCODER_VP9_BOOLHUFF_H_
+#endif  // VP9_ENCODER_VP9_WRITER_H_
diff --git a/vp9/vp9cx.mk b/vp9/vp9cx.mk
index ce83a6703..9114a30e7 100644
--- a/vp9/vp9cx.mk
+++ b/vp9/vp9cx.mk
@@ -18,7 +18,6 @@ VP9_CX_SRCS_REMOVE-no  += $(VP9_COMMON_SRCS_REMOVE-no)
 VP9_CX_SRCS-yes += vp9_cx_iface.c
 
 VP9_CX_SRCS-yes += encoder/vp9_bitstream.c
-VP9_CX_SRCS-yes += encoder/vp9_boolhuff.c
 VP9_CX_SRCS-yes += encoder/vp9_dct.c
 VP9_CX_SRCS-yes += encoder/vp9_dct.h
 VP9_CX_SRCS-yes += encoder/vp9_encodeframe.c
@@ -28,7 +27,8 @@ VP9_CX_SRCS-yes += encoder/vp9_encodemv.c
 VP9_CX_SRCS-yes += encoder/vp9_extend.c
 VP9_CX_SRCS-yes += encoder/vp9_firstpass.c
 VP9_CX_SRCS-yes += encoder/vp9_block.h
-VP9_CX_SRCS-yes += encoder/vp9_boolhuff.h
+VP9_CX_SRCS-yes += encoder/vp9_writer.h
+VP9_CX_SRCS-yes += encoder/vp9_writer.c
 VP9_CX_SRCS-yes += encoder/vp9_write_bit_buffer.h
 VP9_CX_SRCS-yes += encoder/vp9_bitstream.h
 VP9_CX_SRCS-yes += encoder/vp9_encodemb.h