diff --git a/types/block.go b/types/block.go
index 2cc1efa98e..f65bc1a25c 100644
--- a/types/block.go
+++ b/types/block.go
@@ -1007,7 +1007,7 @@ func CommitFromProto(cp *tmproto.Commit) (*Commit, error) {
 
 // Data contains all the available Data of the block.
 // Data with reserved namespaces (Txs, IntermediateStateRoots, Evidence) and
-// Celestia application specific Messages.
+// Celestia application specific Blobs.
 type Data struct {
 	// Txs that will be applied by state @ block.Height+1.
 	// NOTE: not all txs here are valid.  We're just agreeing on the order first.
@@ -1069,7 +1069,7 @@ type Blob struct {
 	// namespace it will use in the namespaced Merkle tree.
 	NamespaceID namespace.ID
 
-	// Data is the actual data contained in the message
+	// Data is the actual data of the blob.
 	// (e.g. a block of a virtual sidechain).
 	Data []byte
 
diff --git a/types/block_test.go b/types/block_test.go
index fbc9f043f1..a7f7e1571b 100644
--- a/types/block_test.go
+++ b/types/block_test.go
@@ -853,7 +853,7 @@ func TestBlockIDEquals(t *testing.T) {
 	assert.False(t, blockIDEmpty.Equals(blockIDDifferent))
 }
 
-func TestMessagesIsSorted(t *testing.T) {
+func TestBlobsByNamespaceIsSorted(t *testing.T) {
 	sortedBlobs := []Blob{
 		{
 			NamespaceID: []byte{1, 2, 3, 4, 5, 6, 7, 8},