diff --git a/mtca/mtca.go b/mtca/mtca.go
index 60a4e10a9aa..e7f263aac75 100644
--- a/mtca/mtca.go
+++ b/mtca/mtca.go
@@ -147,7 +147,7 @@ func getCAID(issuerCert *x509.Certificate) (string, error) {
 }
 
 func initDB(dbMap *borp.DbMap) *db.WrappedMap {
-	dbMap.AddTableWithName(checkpoint{}, "checkpoints").SetKeys(true, "ID")
+	dbMap.AddTableWithName(checkpointRow{}, "checkpoints").SetKeys(true, "ID")
 	return db.NewWrappedMap(dbMap)
 }
 
@@ -188,7 +188,7 @@ func (m *mtca) InitLog(ctx context.Context) error {
 				m.logID.String(), numCheckpoints, numLatestCheckpoints)
 		}
 
-		firstCheckpoint := checkpoint{
+		firstCheckpoint := checkpointRow{
 			MTCLogID: m.logID.String(),
 			TreeSize: candidate.TreeSize(),
 			RootHash: rootHash[:],
@@ -482,7 +482,7 @@ func (m *mtca) sequence(ctx context.Context) error {
 		return fmt.Errorf("staging candidate tiles: %s", err)
 	}
 
-	newCheckpoint := checkpoint{
+	newCheckpoint := checkpointRow{
 		ID:              0,
 		MTCLogID:        m.logID.String(),
 		MTCASignature:   nil,
@@ -593,7 +593,7 @@ func (m *mtca) sequence(ctx context.Context) error {
 // checkpoint represents the database storage of a checkpoint and associated signatures.
 //
 // For signing, the TreeSize and RootHash fields are incorporated into a `cosigned.Message`.
-type checkpoint struct {
+type checkpointRow struct {
 	ID              int64  `db:"id"`
 	MTCLogID        string `db:"mtcLogID"`
 	MTCASignature   []byte `db:"mtcaSignature"`
@@ -603,7 +603,7 @@ type checkpoint struct {
 	RootHash        []byte `db:"rootHash"`
 }
 
-func (c *checkpoint) valid() error {
+func (c *checkpointRow) valid() error {
 	if len(c.MTCLogID) == 0 {
 		return errors.New("MTCLogID is empty")
 	}
@@ -620,12 +620,12 @@ func (c *checkpoint) valid() error {
 	return nil
 }
 
-func (c *checkpoint) mirrored() bool {
+func (c *checkpointRow) mirrored() bool {
 	return len(c.MTCASignature) > 0 && len(c.MirrorSignature) > 0
 }
 
 // String returns a string that is reasonable to print in logs, omitting the (large) signatures.
-func (c *checkpoint) String() string {
+func (c *checkpointRow) String() string {
 	caSig := "empty"
 	if len(c.MTCASignature) > 0 {
 		caSig = "non-empty"
@@ -638,8 +638,8 @@ func (c *checkpoint) String() string {
 		c.ID, c.MTCLogID, caSig, c.MirrorID, mirrorSig, c.TreeSize, c.RootHash)
 }
 
-func (m *mtca) latestCheckpoint(ctx context.Context) (*checkpoint, error) {
-	var latest checkpoint
+func (m *mtca) latestCheckpoint(ctx context.Context) (*checkpointRow, error) {
+	var latest checkpointRow
 	err := m.db.SelectOne(ctx, &latest,
 		`SELECT id, checkpoints.mtcLogID, mtcaSignature, mirrorID,
 		        mirrorSignature, treeSize, rootHash
@@ -659,7 +659,7 @@ func (m *mtca) latestCheckpoint(ctx context.Context) (*checkpoint, error) {
 	return &latest, nil
 }
 
-func (m *mtca) signCheckpoint(c *checkpoint) ([]byte, error) {
+func (m *mtca) signCheckpoint(c *checkpointRow) ([]byte, error) {
 	err := c.valid()
 	if err != nil {
 		return nil, fmt.Errorf("validating checkpoint: %s", err)
diff --git a/mtca/mtca_test.go b/mtca/mtca_test.go
index 61b3aae1ff0..4d9d9b42928 100644
--- a/mtca/mtca_test.go
+++ b/mtca/mtca_test.go
@@ -150,16 +150,16 @@ func TestPool(t *testing.T) {
 func TestCheckpointValid(t *testing.T) {
 	type testCase struct {
 		name  string
-		value checkpoint
+		value checkpointRow
 	}
 
 	rootHash := [32]byte{}
 
 	testCases := []testCase{
-		{"no MTCLogID", checkpoint{ID: 7, TreeSize: 9, RootHash: rootHash[:]}},
-		{"no TreeSize", checkpoint{ID: 7, MTCLogID: "TestLog", RootHash: rootHash[:]}},
-		{"short RootHash", checkpoint{ID: 7, MTCLogID: "TestLog", TreeSize: 9, RootHash: rootHash[:4]}},
-		{"no RootHash", checkpoint{ID: 7, MTCLogID: "TestLog", TreeSize: 9}},
+		{"no MTCLogID", checkpointRow{ID: 7, TreeSize: 9, RootHash: rootHash[:]}},
+		{"no TreeSize", checkpointRow{ID: 7, MTCLogID: "TestLog", RootHash: rootHash[:]}},
+		{"short RootHash", checkpointRow{ID: 7, MTCLogID: "TestLog", TreeSize: 9, RootHash: rootHash[:4]}},
+		{"no RootHash", checkpointRow{ID: 7, MTCLogID: "TestLog", TreeSize: 9}},
 	}
 
 	for _, tc := range testCases {
@@ -171,7 +171,7 @@ func TestCheckpointValid(t *testing.T) {
 		})
 	}
 
-	goodCheckpoint := checkpoint{
+	goodCheckpoint := checkpointRow{
 		ID:       7,
 		MTCLogID: "TestLog",
 		TreeSize: 9,
@@ -293,7 +293,7 @@ func mirrorCosign(t *testing.T, m *mtca) {
 //   - m.frontier
 //   - m.latestCheckpoint()
 //   - fake tile storage
-func verifyStores(t *testing.T, m *mtca, fs3 *bs3test.FakeS3) *checkpoint {
+func verifyStores(t *testing.T, m *mtca, fs3 *bs3test.FakeS3) *checkpointRow {
 	t.Helper()
 	latest, err := m.latestCheckpoint(t.Context())
 	if err != nil {
@@ -536,7 +536,7 @@ func TestInitLog(t *testing.T) {
 	verifyCheckpoint(t, mtca, latest)
 }
 
-func verifyCheckpoint(t *testing.T, mtca *mtca, checkpoint *checkpoint) {
+func verifyCheckpoint(t *testing.T, mtca *mtca, checkpoint *checkpointRow) {
 	t.Helper()
 	message := cosigned.Message{
 		CosignerName: "oid/1.3.6.1.4.1." + mtca.logID.CAID,
diff --git a/mtpublisher/mtpublisher.go b/mtpublisher/mtpublisher.go
index c6dec64a920..3c9951c9ebd 100644
--- a/mtpublisher/mtpublisher.go
+++ b/mtpublisher/mtpublisher.go
@@ -81,7 +81,7 @@ func New(dbMap *db.WrappedMap, interval time.Duration, logID issuancelog.ID, mir
 	}, nil
 }
 
-type checkpointEntry struct {
+type checkpointRow struct {
 	ID              int64  `db:"id"`
 	MTCLogID        string `db:"mtcLogID"`
 	MTCASignature   []byte `db:"mtcaSignature"`
@@ -111,7 +111,7 @@ func (p *publisher) cosign(tree tlog.Tree) (string, error) {
 // cosignature and stores the raw signature in the database. Start calls it at
 // each interval.
 func (p *publisher) Publish(ctx context.Context) error {
-	var latest checkpointEntry
+	var latest checkpointRow
 	err := p.db.SelectOne(ctx, &latest,
 		`SELECT id, checkpoints.mtcLogID, mtcaSignature, mirrorID,
 		        mirrorSignature, treeSize, rootHash