diff --git a/blocks.go b/blocks.go
index 777ab4c..d5f4df7 100644
--- a/blocks.go
+++ b/blocks.go
@@ -20,47 +20,47 @@ type Block interface {
 }
 
 // Block is a singular block of data in ipfs
-type RawBlock struct {
+type BasicBlock struct {
 	multihash mh.Multihash
 	data      []byte
 }
 
 // NewBlock creates a Block object from opaque data. It will hash the data.
-func NewBlock(data []byte) *RawBlock {
-	return &RawBlock{data: data, multihash: u.Hash(data)}
+func NewBlock(data []byte) *BasicBlock {
+	return &BasicBlock{data: data, multihash: u.Hash(data)}
 }
 
 // NewBlockWithHash creates a new block when the hash of the data
 // is already known, this is used to save time in situations where
 // we are able to be confident that the data is correct
-func NewBlockWithHash(data []byte, h mh.Multihash) (*RawBlock, error) {
+func NewBlockWithHash(data []byte, h mh.Multihash) (*BasicBlock, error) {
 	if u.Debug {
 		chk := u.Hash(data)
 		if string(chk) != string(h) {
 			return nil, errors.New("Data did not match given hash!")
 		}
 	}
-	return &RawBlock{data: data, multihash: h}, nil
+	return &BasicBlock{data: data, multihash: h}, nil
 }
 
-func (b *RawBlock) Multihash() mh.Multihash {
+func (b *BasicBlock) Multihash() mh.Multihash {
 	return b.multihash
 }
 
-func (b *RawBlock) Data() []byte {
+func (b *BasicBlock) Data() []byte {
 	return b.data
 }
 
 // Key returns the block's Multihash as a Key value.
-func (b *RawBlock) Key() key.Key {
+func (b *BasicBlock) Key() key.Key {
 	return key.Key(b.multihash)
 }
 
-func (b *RawBlock) String() string {
+func (b *BasicBlock) String() string {
 	return fmt.Sprintf("[Block %s]", b.Key())
 }
 
-func (b *RawBlock) Loggable() map[string]interface{} {
+func (b *BasicBlock) Loggable() map[string]interface{} {
 	return map[string]interface{}{
 		"block": b.Key().String(),
 	}