diff --git a/src.java/crosby/binary/file/FileBlock.java b/src.java/crosby/binary/file/FileBlock.java
index 069da97..6fb3c31 100644
--- a/src.java/crosby/binary/file/FileBlock.java
+++ b/src.java/crosby/binary/file/FileBlock.java
@@ -11,7 +11,7 @@ import java.util.zip.Deflater;
 import com.google.protobuf.ByteString;
 
 import crosby.binary.Fileformat;
-import crosby.binary.Fileformat.BlockHeader;
+import crosby.binary.Fileformat.BlobHeader;
 
 /** A full fileblock object contains both the metadata and data of a fileblock */
 public class FileBlock extends FileBlockBase {
@@ -71,7 +71,7 @@ public class FileBlock extends FileBlockBase {
 
     public FileBlockPosition writeTo(OutputStream outwrite, CompressFlags flags)
             throws IOException {
-        BlockHeader.Builder builder = Fileformat.BlockHeader
+        BlobHeader.Builder builder = Fileformat.BlobHeader
                 .newBuilder();
         if (indexdata != null)
             builder.setIndexdata(indexdata);
@@ -91,7 +91,7 @@ public class FileBlock extends FileBlockBase {
         Fileformat.Blob blob = blobbuilder.build();
 
         builder.setDatasize(blob.getSerializedSize());
-        Fileformat.BlockHeader message = builder.build();
+        Fileformat.BlobHeader message = builder.build();
         int size = message.getSerializedSize();
 
         // System.out.format("Outputed header size %d bytes, header of %d bytes, and blob of %d bytes\n",
diff --git a/src.java/crosby/binary/file/FileBlockHead.java b/src.java/crosby/binary/file/FileBlockHead.java
index 6942b93..4cfa098 100644
--- a/src.java/crosby/binary/file/FileBlockHead.java
+++ b/src.java/crosby/binary/file/FileBlockHead.java
@@ -36,7 +36,7 @@ public class FileBlockHead extends FileBlockReference {
         byte buf[] = new byte[headersize];
         datinput.readFully(buf);
         // System.out.format("Read buffer for header of %d bytes\n",buf.length);
-        Fileformat.BlockHeader header = Fileformat.BlockHeader
+        Fileformat.BlobHeader header = Fileformat.BlobHeader
                 .parseFrom(buf);
         FileBlockHead fileblock = new FileBlockHead(header.getType(), header
                 .getIndexdata());
diff --git a/src.java/crosby/binary/test/BuildTestFile.java b/src.java/crosby/binary/test/BuildTestFile.java
index 7fbb784..047892f 100644
--- a/src.java/crosby/binary/test/BuildTestFile.java
+++ b/src.java/crosby/binary/test/BuildTestFile.java
@@ -9,7 +9,7 @@ import java.util.Collections;
 import com.google.protobuf.ByteString;
 
 import crosby.binary.Fileformat.Blob;
-import crosby.binary.Fileformat.BlockHeader;
+import crosby.binary.Fileformat.BlobHeader;
 import crosby.binary.Osmformat.DenseNodes;
 import crosby.binary.Osmformat.HeaderBlock;
 import crosby.binary.Osmformat.Info;
diff --git a/src/fileformat.proto b/src/fileformat.proto
index 7cc76ab..006cba7 100644
--- a/src/fileformat.proto
+++ b/src/fileformat.proto
@@ -27,7 +27,7 @@ their length in network byte order, followed by a data block
 containing the actual data. types staring with a "_" are reserved.
 */
 
-message BlockHeader {
+message BlobHeader {
   required string type = 1;
   optional bytes indexdata = 2;
   required int32 datasize = 3;