diff --git a/build/Android.common.mk b/build/Android.common.mk
index fd9dba5..b9d6109 100644
--- a/build/Android.common.mk
+++ b/build/Android.common.mk
@@ -118,6 +118,7 @@
 	src/file.cc \
 	src/file_linux.cc \
 	src/heap.cc \
+	src/heap_bitmap.cc \
 	src/image.cc \
 	src/image_writer.cc \
 	src/indirect_reference_table.cc \
@@ -154,7 +155,6 @@
 	src/oat_file.cc \
 	src/oat_writer.cc \
 	src/object.cc \
-	src/object_bitmap.cc \
 	src/offsets.cc \
 	src/org_apache_harmony_dalvik_ddmc_DdmServer.cc \
 	src/os_linux.cc \
diff --git a/src/heap.h b/src/heap.h
index 18b521d..433bf6a 100644
--- a/src/heap.h
+++ b/src/heap.h
@@ -20,7 +20,7 @@
 #include <vector>
 
 #include "globals.h"
-#include "object_bitmap.h"
+#include "heap_bitmap.h"
 #include "offsets.h"
 
 #define VERIFY_OBJECT_ENABLED 0
diff --git a/src/object_bitmap.cc b/src/heap_bitmap.cc
similarity index 99%
rename from src/object_bitmap.cc
rename to src/heap_bitmap.cc
index bacfd3d..2c3c436 100644
--- a/src/object_bitmap.cc
+++ b/src/heap_bitmap.cc
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "object_bitmap.h"
+#include "heap_bitmap.h"
 
 #include <sys/mman.h>
 
diff --git a/src/object_bitmap.h b/src/heap_bitmap.h
similarity index 97%
rename from src/object_bitmap.h
rename to src/heap_bitmap.h
index 1374563..4b20ee4 100644
--- a/src/object_bitmap.h
+++ b/src/heap_bitmap.h
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef ART_SRC_OBJECT_BITMAP_H_
-#define ART_SRC_OBJECT_BITMAP_H_
+#ifndef ART_SRC_HEAP_BITMAP_H_
+#define ART_SRC_HEAP_BITMAP_H_
 
 #include <limits.h>
 #include <stdint.h>
@@ -137,4 +137,4 @@
 
 }  // namespace art
 
-#endif  // ART_SRC_OBJECT_BITMAP_H_
+#endif  // ART_SRC_HEAP_BITMAP_H_
diff --git a/src/mark_sweep.h b/src/mark_sweep.h
index bcb4df0..8c37456 100644
--- a/src/mark_sweep.h
+++ b/src/mark_sweep.h
@@ -5,7 +5,7 @@
 
 #include "macros.h"
 #include "mark_stack.h"
-#include "object_bitmap.h"
+#include "heap_bitmap.h"
 #include "offsets.h"
 
 namespace art {