Rename Prefix() and SetPrefix() to CidPrefix() and SetCidPrefix().

coding.go

@@ -93,7 +93,7 @@ func (n *ProtoNode) EncodeProtobuf(force bool) ([]byte, error) {
 	}
 
 	if n.cached == nil {
-		c, err := n.Prefix().Sum(n.encoded)
+		c, err := n.CidBuilder().Sum(n.encoded)
 		if err != nil {
 			return nil, err
 		}
@@ -131,7 +131,7 @@ func DecodeProtobufBlock(b blocks.Block) (ipld.Node, error) {
 	}
 
 	decnd.cached = c
-	decnd.SetPrefix(c.Prefix())
+	decnd.SetCidBuilder(c.Prefix())
 	return decnd, nil
 }
 

node.go

@@ -63,21 +63,21 @@ func PrefixForCidVersion(version int) (cid.Prefix, error) {
 	}
 }
 
-// Prefix returns the CID Prefix for this ProtoNode, it is never nil
-func (n *ProtoNode) Prefix() cid.Builder {
+// CidBuilder returns the CID Builder for this ProtoNode, it is never nil
+func (n *ProtoNode) CidBuilder() cid.Builder {
 	if n.builder == nil {
 		n.builder = v0CidPrefix
 	}
 	return n.builder
 }
 
-// SetPrefix sets the CID prefix if it is non nil, if prefix is nil then
-// it resets it the default value
-func (n *ProtoNode) SetPrefix(prefix cid.Builder) {
-	if prefix == nil {
+// SetCidBuilder sets the CID builder if it is non nil, if nil then it
+// is reset to the default value
+func (n *ProtoNode) SetCidBuilder(builder cid.Builder) {
+	if builder == nil {
 		n.builder = v0CidPrefix
 	} else {
-		n.builder = prefix.WithCodec(cid.DagProtobuf)
+		n.builder = builder.WithCodec(cid.DagProtobuf)
 		n.encoded = nil
 		n.cached = nil
 	}

raw.go

@@ -34,11 +34,10 @@ func DecodeRawBlock(block blocks.Block) (ipld.Node, error) {
 
 var _ ipld.DecodeBlockFunc = DecodeRawBlock
 
-// NewRawNodeWPrefix creates a RawNode with the hash function
-// specified in prefix.
-func NewRawNodeWPrefix(data []byte, prefix cid.Builder) (*RawNode, error) {
-	prefix = prefix.WithCodec(cid.Raw)
-	c, err := prefix.Sum(data)
+// NewRawNodeWPrefix creates a RawNode using the provided cid builder
+func NewRawNodeWPrefix(data []byte, builder cid.Builder) (*RawNode, error) {
+	builder = builder.WithCodec(cid.Raw)
+	c, err := builder.Sum(data)
 	if err != nil {
 		return nil, err
 	}