4 files changed, 6 insertions, 6 deletions
diff --git a/pkg/db/trillian.go b/pkg/db/trillian.go
index 97f1305..024a021 100644
--- a/pkg/db/trillian.go
+++ b/pkg/db/trillian.go
@@ -29,7 +29,7 @@ func (c *TrillianClient) AddLeaf(ctx context.Context, req *requests.Leaf) error
 			Checksum:  *types.HashFn(req.Message[:]),
 		},
 		Signature: req.Signature,
-		KeyHash:   *types.HashFn(req.VerificationKey[:]),
+		KeyHash:   *types.HashFn(req.PublicKey[:]),
 	}
 	serialized := leaf.ToBinary()
 
diff --git a/pkg/db/trillian_test.go b/pkg/db/trillian_test.go
index 9a390a1..2b19096 100644
--- a/pkg/db/trillian_test.go
+++ b/pkg/db/trillian_test.go
@@ -23,7 +23,7 @@ func TestAddLeaf(t *testing.T) {
 		ShardHint:       0,
 		Message:         types.Hash{},
 		Signature:       types.Signature{},
-		VerificationKey: types.PublicKey{},
+		PublicKey:       types.PublicKey{},
 		DomainHint:      "example.com",
 	}
 	for _, table := range []struct {
diff --git a/pkg/instance/handler_test.go b/pkg/instance/handler_test.go
index 0b81f6c..ab429ae 100644
--- a/pkg/instance/handler_test.go
+++ b/pkg/instance/handler_test.go
@@ -682,7 +682,7 @@ func mustLeafBuffer(t *testing.T, shardHint uint64, message types.Hash, wantSig
 		"shard_hint", shardHint,
 		"message", message[:],
 		"signature", sig,
-		"verification_key", vk,
+		"public_key", vk,
 		"domain_hint", "example.com",
 	))
 }
diff --git a/pkg/instance/instance.go b/pkg/instance/instance.go
index 18255a1..4d7582a 100644
--- a/pkg/instance/instance.go
+++ b/pkg/instance/instance.go
@@ -24,7 +24,7 @@ type Config struct {
 	Interval   time.Duration // Cosigning frequency
 	ShardStart uint64        // Shard interval start (num seconds since UNIX epoch)
 
-	// Witnesses map trusted witness identifiers to public verification keys
+	// Witnesses map trusted witness identifiers to public keys
 	Witnesses map[types.Hash]types.PublicKey
 }
 
@@ -65,7 +65,7 @@ func (i *Instance) leafRequestFromHTTP(ctx context.Context, r *http.Request) (*r
 		ShardHint: req.ShardHint,
 		Checksum:  *types.HashFn(req.Message[:]),
 	}
-	if !stmt.Verify(&req.VerificationKey, &req.Signature) {
+	if !stmt.Verify(&req.PublicKey, &req.Signature) {
 		return nil, fmt.Errorf("invalid signature")
 	}
 	shardEnd := uint64(time.Now().Unix())
@@ -75,7 +75,7 @@ func (i *Instance) leafRequestFromHTTP(ctx context.Context, r *http.Request) (*r
 	if req.ShardHint > shardEnd {
 		return nil, fmt.Errorf("invalid shard hint: %d not in [%d, %d]", req.ShardHint, i.ShardStart, shardEnd)
 	}
-	if err := i.DNS.Verify(ctx, req.DomainHint, &req.VerificationKey); err != nil {
+	if err := i.DNS.Verify(ctx, req.DomainHint, &req.PublicKey); err != nil {
 		return nil, fmt.Errorf("invalid domain hint: %v", err)
 	}
 	return &req, nil