diff --git a/stream/mts/psi/psi_test.go b/stream/mts/psi/psi_test.go
index 96d9f5d5..5f2e20a5 100644
--- a/stream/mts/psi/psi_test.go
+++ b/stream/mts/psi/psi_test.go
@@ -33,7 +33,7 @@ import (
 
 // Some common manifestations of PSI
 var (
-	// PSI struct to represent basic pat
+	// standardPat is a minimal PAT.
 	standardPat = PSI{
 		Pf:  0x00,
 		Tid: 0x00,
@@ -53,7 +53,7 @@ var (
 		},
 	}
 
-	// PSI struct to represent basic pmt without descriptors for time and location
+	// standardPmt is a minimal PMT, without time and location descriptors.
 	standardPmt = PSI{
 		Pf:  0x00,
 		Tid: 0x02,
@@ -77,7 +77,7 @@ var (
 		},
 	}
 
-	// Std pmt with time and location descriptors, time and location fields are zeroed out
+	// standardPmtTimeLocation is a minimal PMT with time and location descriptors.
 	standardPmtTimeLocation = PSI{
 		Pf:  0x00,
 		Tid: 0x02,
@@ -189,14 +189,14 @@ var bytesTests = []struct {
 	// Pat test
 	{
 		name:  "pat Bytes()",
-		input: StandardPat,
+		input: standardPat,
 		want:  StandardPatBytes,
 	},
 
 	// Pmt test data no descriptor
 	{
 		name:  "pmt to Bytes() without descriptors",
-		input: StandardPmt,
+		input: standardPmt,
 		want:  StandardPmtBytes,
 	},
 
@@ -326,7 +326,7 @@ func TestTimeGet(t *testing.T) {
 
 // TestLocationGet checks that we can correctly get location data from a pmt table
 func TestLocationGet(t *testing.T) {
-	pb := StandardPmtTimeLocation.Bytes()
+	pb := standardPmtTimeLocation.Bytes()
 	err := UpdateLocation(pb, locationTstStr1)
 	if err != nil {
 		t.Errorf("Error for TestLocationGet UpdateLocation(pb, locationTstStr1): %v", err)