diff --git a/pkg/intoto/metadata.go b/pkg/intoto/metadata.go
index d14e5f8..4166e11 100644
--- a/pkg/intoto/metadata.go
+++ b/pkg/intoto/metadata.go
@@ -12,13 +12,13 @@ import (
 // Metadata points to root layout, its public keys, and/or links
 type Metadata struct {
 	Data       []byte   `json:"data"`
-	PublicKeys []string `json:"public-keys"` // filenames
-	Links      []string `json:"links"`       // filenames
+	PublicKeys []string `json:"pubkeys"` // filenames
+	Links      []string `json:"links"`   // filenames
 }
 
 // Custom is a generic structure that contains in-toto Metadata
 type Custom struct {
-	InToto Metadata `json:"in-toto"`
+	InToto Metadata `json:"intoto"`
 }
 
 // PublicKeys is a map from the GUN-qualified filename
diff --git a/pkg/tuf/common.go b/pkg/tuf/common.go
index 1fefdfc..ebfa5fd 100644
--- a/pkg/tuf/common.go
+++ b/pkg/tuf/common.go
@@ -1,9 +1,3 @@
-// Most of the helper functions are adapted from github.com/theupdateframework/notary
-//
-// Figure out the proper way of making sure we are respecting the licensing from Notary
-// While we are also vendoring Notary directly (see LICENSE in vendor/github.com/theupdateframework/notary/LICENSE),
-// copying unexported functions could fall under different licensing, so we need to make sure.
-
 package tuf
 
 import (
diff --git a/pkg/tuf/common_test.go b/pkg/tuf/common_test.go
deleted file mode 100644
index cbd1b4a..0000000
--- a/pkg/tuf/common_test.go
+++ /dev/null
@@ -1 +0,0 @@
-package tuf
diff --git a/pkg/tuf/sign.go b/pkg/tuf/sign.go
index 4152543..97ccce0 100644
--- a/pkg/tuf/sign.go
+++ b/pkg/tuf/sign.go
@@ -185,7 +185,7 @@ func reuseKeys(repo client.Repository, rootKey string) error {
 			}
 
 		default:
-			return fmt.Errorf("cannot list targets: %v", err)
+			return fmt.Errorf("cannot list targets while reusing keys: %v", err)
 		}
 	}
 	return nil