diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index a0aa389081df26cfa605b61af5bc9271da2b5a49..e5ad238cf340cf26962f4a4e0bfc4f9cee477cdd 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -1,7 +1,22 @@
+#
+# Copyright 2021 The Sigstore Authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 # https://help.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
 version: 2
 updates:
-  - package-ecosystem: "gomod" 
+  - package-ecosystem: "gomod"
     directory: "/" # Location of package manifests
     schedule:
       interval: "daily"
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index a18d84f403d37adc19d6a9a5405b9ecddd1c641d..81c91c29839f18483164d73f3457903c60c8b2bf 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -1,5 +1,20 @@
+#
+# Copyright 2021 The Sigstore Authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 # https://docs.github.com/en/free-pro-team@latest/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#changing-the-languages-that-are-analyzed
-name: "CodeQL"
+name: CodeQL
 on:
   push:
     branches: [ main ]
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 88bf843d2de88b90c7f259b31e9d1495f50de3f1..e1e461af3edeadc117f17387d319b52826b035a4 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -1,66 +1,55 @@
-# This is a basic workflow to help you get started with Actions
+#
+# Copyright 2021 The Sigstore Authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
 
 name: CI
 
-# Controls when the action will run. Triggers the workflow on push or pull request
-# events but only for the main branch
 on:
   push:
     branches: [ main ]
   pull_request:
     branches: [ main ]
 
-# A workflow run is made up of one or more jobs that can run sequentially or in parallel
 jobs:
   build:
-    # The type of runner that the job will run on
     runs-on: ubuntu-20.04
 
-    # Steps represent a sequence of tasks that will be executed as part of the job
     steps:
-      # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
       - uses: actions/checkout@v2
-      # Extract version of Go to use
       - name: Extract version of Go to use
         run: echo "GOVERSION=$(cat Dockerfile|grep golang | awk ' { print $2 } ' | sed -r 's/^.*://g'| uniq)" >> $GITHUB_ENV
-      # Setup Go
       - uses: actions/setup-go@v2
         with:
           go-version: ${{ env.GOVERSION }}
-      # Download go-swagger
       - name: download go-swagger
         run : go install github.com/go-swagger/go-swagger/cmd/swagger@v0.27.0
       - name: Validate OpenAPI with Swagger
         run: swagger validate openapi.yaml
-      # Make it
       - name: Build
         run: make -C $GITHUB_WORKSPACE all
-      # Lint it
-      - name: golangci-lint
-        uses: golangci/golangci-lint-action@v2.5.2
-        with:
-          version: v1.37.1
-      # Test It
       - name: Test
         run: go test -v ./...
-      # Gosec It
-      - name: Run Gosec Security Scanner
-        uses: securego/gosec@v2.7.0
-        env:
-          GOROOT: ""
-        with:
-          args: ./...
       - name: Ensure no files were modified as a result of the build
         run: git update-index --refresh && git diff-index --quiet HEAD -- || git diff --exit-code
+
   e2e:
-    # The type of runner that the job will run on
-    runs-on: ubuntu-20.04 
+    runs-on: ubuntu-20.04
     needs: build
-    # Steps represent a sequence of tasks that will be executed as part of the job
+
     steps:
       - name: download minisign
         run: sudo add-apt-repository ppa:dysfunctionalprogramming/minisign && sudo apt-get update && sudo apt-get install minisign
-      # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
       - uses: actions/checkout@v2
       - name: Docker Build
         run: docker-compose build
diff --git a/.github/workflows/verify.yml b/.github/workflows/verify.yml
new file mode 100644
index 0000000000000000000000000000000000000000..c5c061dd0a25cdb234263a2f291c9a5cf540343e
--- /dev/null
+++ b/.github/workflows/verify.yml
@@ -0,0 +1,49 @@
+#
+# Copyright 2021 The Sigstore Authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+name: Verify
+
+on: [push, pull_request]
+
+jobs:
+  license-check:
+    name: license boilerplate check
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-go@v2
+        with:
+          go-version: '1.16'
+      - name: Install addlicense
+        run: go install github.com/google/addlicense@latest
+      - name: Check license headers
+        run: |
+          set -e
+          addlicense -l apache -c 'The Sigstore Authors' -v *
+          git diff --exit-code
+
+  golangci:
+    name: lint
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: deps
+        run: sudo apt-get update && sudo apt-get install -yq libpcsclite-dev
+      - name: golangci-lint
+        uses: golangci/golangci-lint-action@v2
+        timeout-minutes: 5
+        with:
+          # Required: the version of golangci-lint is required and must be specified without patch version: we always use the latest patch version.
+          version: v1.39
diff --git a/.golangci.yml b/.golangci.yml
new file mode 100644
index 0000000000000000000000000000000000000000..03ee27504a2bb6a065ab505fb1031d1d283b4f5d
--- /dev/null
+++ b/.golangci.yml
@@ -0,0 +1,38 @@
+#
+# Copyright 2021 The Sigstore Authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+linters:
+  enable:
+  - deadcode
+  - errcheck
+  - gofmt
+  - goimports
+  - gosec
+  - gocritic
+  - golint
+  - misspell
+output:
+  uniq-by-line: false
+issues:
+  exclude-rules:
+  - path: _test\.go
+    linters:
+    - errcheck
+    - gosec
+  max-issues-per-linter: 0
+  max-same-issues: 0
+run:
+  issues-exit-code: 1
+  timeout: 10m
diff --git a/COPYRIGHT.txt b/COPYRIGHT.txt
index 8b2da50b481231d83ce4fa254a3b590bdf6afd13..7a01c84986423e740cae3be6db386f27a0347a25 100644
--- a/COPYRIGHT.txt
+++ b/COPYRIGHT.txt
@@ -1,5 +1,5 @@
-/*
-Copyright The Rekor Authors.
+
+Copyright 2021 The Sigstore Authors.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -12,4 +12,3 @@ distributed under the License is distributed on an "AS IS" BASIS,
 WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
-*/
diff --git a/Dockerfile b/Dockerfile
index f4bfe336cc9896472cf2513221a9af0802571248..97634ae2afdeb88f635f5c224c3045cb86e147ee 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,3 +1,18 @@
+#
+# Copyright 2021 The Sigstore Authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 FROM golang:1.16.3 AS builder
 ENV APP_ROOT=/opt/app-root
 ENV GOPATH=$APP_ROOT
diff --git a/Makefile b/Makefile
index 824d92d2dd7ee595a3cd0cd3d0265f071d00b9a5..4f9d8c5c9444285a4643e16bbfe6db6de2242e32 100644
--- a/Makefile
+++ b/Makefile
@@ -1,3 +1,18 @@
+#
+# Copyright 2021 The Sigstore Authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 .PHONY: all test clean clean-gen lint gosec
 
 all: rekor-cli rekor-server
diff --git a/cmd/rekor-cli/app/format/wrap.go b/cmd/rekor-cli/app/format/wrap.go
index 4239388bb09bb2f0d27507f4889910e4c99755ef..99cf58b0ee76fb3e6a85f5085908d625392db5fc 100644
--- a/cmd/rekor-cli/app/format/wrap.go
+++ b/cmd/rekor-cli/app/format/wrap.go
@@ -1,3 +1,18 @@
+//
+// Copyright 2021 The Sigstore Authors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
 package format
 
 import (
@@ -9,11 +24,11 @@ import (
 	"github.com/spf13/viper"
 )
 
-type cobraCmd func(cmd *cobra.Command, args []string)
+type CobraCmd func(cmd *cobra.Command, args []string)
 
 type formatCmd func(args []string) (interface{}, error)
 
-func WrapCmd(f formatCmd) cobraCmd {
+func WrapCmd(f formatCmd) CobraCmd {
 	return func(cmd *cobra.Command, args []string) {
 		obj, err := f(args)
 		if err != nil {
@@ -27,15 +42,15 @@ func WrapCmd(f formatCmd) cobraCmd {
 			if s, ok := obj.(fmt.Stringer); ok {
 				fmt.Print(s.String())
 			} else {
-				fmt.Println(toJson(s))
+				fmt.Println(toJSON(s))
 			}
 		case "json":
-			fmt.Println(toJson(obj))
+			fmt.Println(toJSON(obj))
 		}
 	}
 }
 
-func toJson(i interface{}) string {
+func toJSON(i interface{}) string {
 	b, err := json.Marshal(i)
 	if err != nil {
 		log.Fatal(err)
diff --git a/cmd/rekor-cli/app/get.go b/cmd/rekor-cli/app/get.go
index 02e1f9a23f73210887269433bb0666cec3f2c592..2b3a7b4227d20da67f5b8b13092684198cd48d1e 100644
--- a/cmd/rekor-cli/app/get.go
+++ b/cmd/rekor-cli/app/get.go
@@ -1,18 +1,18 @@
-/*
-Copyright © 2020 Bob Callaway <bcallawa@redhat.com>
+//
+// Copyright 2021 The Sigstore Authors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
 package app
 
 import (
@@ -25,14 +25,14 @@ import (
 	"time"
 
 	"github.com/go-openapi/runtime"
+	"github.com/spf13/cobra"
+	"github.com/spf13/viper"
+
 	"github.com/sigstore/rekor/cmd/rekor-cli/app/format"
 	"github.com/sigstore/rekor/pkg/generated/client/entries"
 	"github.com/sigstore/rekor/pkg/generated/models"
 	"github.com/sigstore/rekor/pkg/log"
 	"github.com/sigstore/rekor/pkg/types"
-
-	"github.com/spf13/cobra"
-	"github.com/spf13/viper"
 )
 
 type getCmdOutput struct {
diff --git a/cmd/rekor-cli/app/log_info.go b/cmd/rekor-cli/app/log_info.go
index 4c4ed8a9988bf56baabaa48b98b33e688cbcf011..ab9e39bb114aa084e5115751858f761c16e9337c 100644
--- a/cmd/rekor-cli/app/log_info.go
+++ b/cmd/rekor-cli/app/log_info.go
@@ -1,18 +1,18 @@
-/*
-Copyright © 2020 Bob Callaway <bcallawa@redhat.com>
+//
+// Copyright 2021 The Sigstore Authors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
 package app
 
 import (
@@ -27,19 +27,18 @@ import (
 	"strings"
 	"time"
 
-	"github.com/sigstore/rekor/cmd/rekor-cli/app/state"
-
 	"github.com/google/trillian"
 	tclient "github.com/google/trillian/client"
 	tcrypto "github.com/google/trillian/crypto"
 	"github.com/google/trillian/merkle/logverifier"
 	rfc6962 "github.com/google/trillian/merkle/rfc6962/hasher"
+	"github.com/spf13/cobra"
+	"github.com/spf13/viper"
 
 	"github.com/sigstore/rekor/cmd/rekor-cli/app/format"
+	"github.com/sigstore/rekor/cmd/rekor-cli/app/state"
 	"github.com/sigstore/rekor/pkg/generated/client/tlog"
 	"github.com/sigstore/rekor/pkg/log"
-	"github.com/spf13/cobra"
-	"github.com/spf13/viper"
 )
 
 type logInfoCmdOutput struct {
diff --git a/cmd/rekor-cli/app/log_proof.go b/cmd/rekor-cli/app/log_proof.go
index 16682dac5744c76997294052bf8818dda5857c5d..55813cc9b829eb766c4624bc77aeddf55f3abcd2 100644
--- a/cmd/rekor-cli/app/log_proof.go
+++ b/cmd/rekor-cli/app/log_proof.go
@@ -1,18 +1,18 @@
-/*
-Copyright © 2020 Bob Callaway <bcallawa@redhat.com>
+//
+// Copyright 2021 The Sigstore Authors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
 package app
 
 import (
@@ -20,10 +20,11 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/sigstore/rekor/cmd/rekor-cli/app/format"
-	"github.com/sigstore/rekor/pkg/generated/client/tlog"
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
+
+	"github.com/sigstore/rekor/cmd/rekor-cli/app/format"
+	"github.com/sigstore/rekor/pkg/generated/client/tlog"
 )
 
 type logProofOutput struct {
diff --git a/cmd/rekor-cli/app/pflags.go b/cmd/rekor-cli/app/pflags.go
index 57a40388e22054c61813acc88da1137225a52f4b..cfd8acaaaa4974b3606667da419fcf0e18188a77 100644
--- a/cmd/rekor-cli/app/pflags.go
+++ b/cmd/rekor-cli/app/pflags.go
@@ -1,18 +1,18 @@
-/*
-Copyright © 2020 Bob Callaway <bcallawa@redhat.com>
+//
+// Copyright 2021 The Sigstore Authors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
 package app
 
 import (
@@ -30,11 +30,12 @@ import (
 
 	"github.com/go-openapi/strfmt"
 	"github.com/go-openapi/swag"
+	"github.com/spf13/cobra"
+	"github.com/spf13/viper"
+
 	"github.com/sigstore/rekor/pkg/generated/models"
 	rekord_v001 "github.com/sigstore/rekor/pkg/types/rekord/v0.0.1"
 	rpm_v001 "github.com/sigstore/rekor/pkg/types/rpm/v0.0.1"
-	"github.com/spf13/cobra"
-	"github.com/spf13/viper"
 )
 
 func addSearchPFlags(cmd *cobra.Command) error {
diff --git a/cmd/rekor-cli/app/pflags_test.go b/cmd/rekor-cli/app/pflags_test.go
index 252e7f810803252e01691fea74fe683a7462068e..2155aa51995d7871438b480455d12885c20da0b7 100644
--- a/cmd/rekor-cli/app/pflags_test.go
+++ b/cmd/rekor-cli/app/pflags_test.go
@@ -1,18 +1,17 @@
-/*
-Copyright © 2020 Bob Callaway <bcallawa@redhat.com>
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
+//
+// Copyright 2021 The Sigstore Authors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
 package app
 
@@ -23,10 +22,10 @@ import (
 	"net/http/httptest"
 	"testing"
 
-	"github.com/sigstore/rekor/pkg/generated/models"
+	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
 
-	"github.com/spf13/cobra"
+	"github.com/sigstore/rekor/pkg/generated/models"
 )
 
 func TestArtifactPFlags(t *testing.T) {
@@ -119,13 +118,13 @@ func TestArtifactPFlags(t *testing.T) {
 			expectValidateSuccess: false,
 		},
 		{
-			caseDesc:              "non-existant rekord file",
+			caseDesc:              "non-existent rekord file",
 			entry:                 "../../../tests/not_there.json",
 			expectParseSuccess:    false,
 			expectValidateSuccess: false,
 		},
 		{
-			caseDesc:              "non-existant rekord url",
+			caseDesc:              "non-existent rekord url",
 			entry:                 testServer.URL + "/not_found",
 			expectParseSuccess:    true,
 			expectValidateSuccess: false,
diff --git a/cmd/rekor-cli/app/root.go b/cmd/rekor-cli/app/root.go
index 233aea02eb1e98f46aaf1d3395f60197ae9eddb4..5fa41f072fbe1e667449d0e1b5c76795bae28140 100644
--- a/cmd/rekor-cli/app/root.go
+++ b/cmd/rekor-cli/app/root.go
@@ -1,18 +1,18 @@
-/*
-Copyright © 2020 Luke Hinds <lhinds@redhat.com>
+//
+// Copyright 2021 The Sigstore Authors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
 package app
 
 import (
@@ -25,13 +25,13 @@ import (
 	"github.com/go-openapi/runtime"
 	httptransport "github.com/go-openapi/runtime/client"
 	"github.com/go-openapi/strfmt"
-	"github.com/sigstore/rekor/pkg/generated/client"
-	"github.com/sigstore/rekor/pkg/util"
+	homedir "github.com/mitchellh/go-homedir"
 	"github.com/spf13/cobra"
 	"github.com/spf13/pflag"
-
-	homedir "github.com/mitchellh/go-homedir"
 	"github.com/spf13/viper"
+
+	"github.com/sigstore/rekor/pkg/generated/client"
+	"github.com/sigstore/rekor/pkg/util"
 )
 
 var rootCmd = &cobra.Command{
@@ -43,7 +43,7 @@ var rootCmd = &cobra.Command{
 	},
 }
 
-//Execute runs the base CLI
+// Execute runs the base CLI
 func Execute() {
 	if err := rootCmd.Execute(); err != nil {
 		fmt.Println(err)
diff --git a/cmd/rekor-cli/app/root_test.go b/cmd/rekor-cli/app/root_test.go
index de8f3095053b4041c942553e2159635c11ce540c..490b9a6991fc9e3b633c67f36d1dd20a6cd28cf0 100644
--- a/cmd/rekor-cli/app/root_test.go
+++ b/cmd/rekor-cli/app/root_test.go
@@ -1,18 +1,17 @@
-/*
-Copyright © 2021 Bob Callaway <bcallawa@redhat.com>
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
+//
+// Copyright 2021 The Sigstore Authors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
 package app
 
diff --git a/cmd/rekor-cli/app/search.go b/cmd/rekor-cli/app/search.go
index 90524148bd7f7c87d5434ac12bb8d5d0630dabea..160d780abd3de3f635d5d43ab897c6dceb99b93b 100644
--- a/cmd/rekor-cli/app/search.go
+++ b/cmd/rekor-cli/app/search.go
@@ -1,18 +1,18 @@
-/*
-Copyright © 2021 Bob Callaway <bcallawa@redhat.com>
+//
+// Copyright 2021 The Sigstore Authors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
 package app
 
 import (
@@ -26,17 +26,15 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/go-openapi/swag"
-
 	"github.com/go-openapi/strfmt"
+	"github.com/go-openapi/swag"
+	"github.com/spf13/cobra"
+	"github.com/spf13/viper"
 
 	"github.com/sigstore/rekor/cmd/rekor-cli/app/format"
 	"github.com/sigstore/rekor/pkg/generated/client/index"
 	"github.com/sigstore/rekor/pkg/generated/models"
 	"github.com/sigstore/rekor/pkg/log"
-
-	"github.com/spf13/cobra"
-	"github.com/spf13/viper"
 )
 
 type searchCmdOutput struct {
diff --git a/cmd/rekor-cli/app/state/state.go b/cmd/rekor-cli/app/state/state.go
index 5f97ff2067d14613c422156800ca3fe92e658924..bcc3989e38168566200ef1c09907819918b56aed 100644
--- a/cmd/rekor-cli/app/state/state.go
+++ b/cmd/rekor-cli/app/state/state.go
@@ -1,18 +1,17 @@
-/*
-Copyright © 2021 Dan Lorenc <lorenc.d@gmail.com>
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
+//
+// Copyright 2021 The Sigstore Authors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
 package state
 
diff --git a/cmd/rekor-cli/app/upload.go b/cmd/rekor-cli/app/upload.go
index 4918143fd16c8d5a3a1c30d73e86bc339b7743a1..2c49d765e2d181be0394395e642ace4400c97d36 100644
--- a/cmd/rekor-cli/app/upload.go
+++ b/cmd/rekor-cli/app/upload.go
@@ -1,18 +1,18 @@
-/*
-Copyright © 2020 Luke Hinds <lhinds@redhat.com>
+//
+// Copyright 2021 The Sigstore Authors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
 package app
 
 import (
@@ -21,12 +21,13 @@ import (
 	"os"
 
 	"github.com/go-openapi/swag"
+	"github.com/spf13/cobra"
+	"github.com/spf13/viper"
+
 	"github.com/sigstore/rekor/cmd/rekor-cli/app/format"
 	"github.com/sigstore/rekor/pkg/generated/client/entries"
 	"github.com/sigstore/rekor/pkg/generated/models"
 	"github.com/sigstore/rekor/pkg/log"
-	"github.com/spf13/cobra"
-	"github.com/spf13/viper"
 )
 
 type uploadCmdOutput struct {
diff --git a/cmd/rekor-cli/app/verify.go b/cmd/rekor-cli/app/verify.go
index 481cef94c32954ab12b910d0b26565f07e5051e5..f0e780888c26354d55f11caa14e58f54a019ffe2 100644
--- a/cmd/rekor-cli/app/verify.go
+++ b/cmd/rekor-cli/app/verify.go
@@ -1,18 +1,18 @@
-/*
-Copyright © 2020 Luke Hinds <lhinds@redhat.com>
+//
+// Copyright 2021 The Sigstore Authors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
 package app
 
 import (
@@ -24,13 +24,13 @@ import (
 
 	"github.com/google/trillian/merkle/logverifier"
 	rfc6962 "github.com/google/trillian/merkle/rfc6962/hasher"
+	"github.com/spf13/cobra"
+	"github.com/spf13/viper"
+
 	"github.com/sigstore/rekor/cmd/rekor-cli/app/format"
 	"github.com/sigstore/rekor/pkg/generated/client/entries"
 	"github.com/sigstore/rekor/pkg/generated/models"
 	"github.com/sigstore/rekor/pkg/log"
-
-	"github.com/spf13/cobra"
-	"github.com/spf13/viper"
 )
 
 type verifyCmdOutput struct {
diff --git a/cmd/rekor-cli/main.go b/cmd/rekor-cli/main.go
index fa9e727c8ad6320b5d3eea4571a1ca53f1897321..5cb211e3f118aa2fba07140a7cc326c5713b5226 100644
--- a/cmd/rekor-cli/main.go
+++ b/cmd/rekor-cli/main.go
@@ -1,18 +1,18 @@
-/*
-Copyright © 2020 Luke Hinds <lhinds@redhat.com>
+//
+// Copyright 2021 The Sigstore Authors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
 package main
 
 import "github.com/sigstore/rekor/cmd/rekor-cli/app"
diff --git a/cmd/rekor-server/app/root.go b/cmd/rekor-server/app/root.go
index 85f9b2be37aded63e77d46706af86c0caf335860..be17f83f0ae88d4a8cadf3f2e0ba394b64eeaaf5 100644
--- a/cmd/rekor-server/app/root.go
+++ b/cmd/rekor-server/app/root.go
@@ -1,18 +1,17 @@
-/*
-Copyright © 2020 Luke Hinds <lhinds@redhat.com>
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
+//
+// Copyright 2021 The Sigstore Authors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
 package app
 
@@ -20,11 +19,11 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/sigstore/rekor/pkg/log"
-	"github.com/spf13/cobra"
-
 	homedir "github.com/mitchellh/go-homedir"
+	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
+
+	"github.com/sigstore/rekor/pkg/log"
 )
 
 var cfgFile string
@@ -34,8 +33,8 @@ var logType string
 var rootCmd = &cobra.Command{
 	Use:   "rekor-server",
 	Short: "Rekor signature transparency log server",
-	Long: `Rekor fulfills the signature transparency role of sigstore's software 
-	signing infrastructure. It can also be run on its own and is designed to be 
+	Long: `Rekor fulfills the signature transparency role of sigstore's software
+	signing infrastructure. It can also be run on its own and is designed to be
 	extensible to work with different manifest schemas and PKI tooling`,
 	// Uncomment the following line if your bare application
 	// has an action associated with it:
diff --git a/cmd/rekor-server/app/serve.go b/cmd/rekor-server/app/serve.go
index 3aef9ddfc5b45dfdce232675eb7fd20b019e3f72..d92b11d05a1f6f9570f3cff55729a0d8ea74dd9e 100644
--- a/cmd/rekor-server/app/serve.go
+++ b/cmd/rekor-server/app/serve.go
@@ -1,18 +1,17 @@
-/*
-Copyright © 2020 Luke Hinds <lhinds@redhat.com>
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
+//
+// Copyright 2021 The Sigstore Authors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
 package app
 
@@ -21,18 +20,18 @@ import (
 	"net/http"
 
 	"github.com/go-openapi/loads"
+	"github.com/prometheus/client_golang/prometheus/promhttp"
+	"github.com/spf13/cobra"
+	"github.com/spf13/viper"
+
 	"github.com/sigstore/rekor/pkg/api"
+	"github.com/sigstore/rekor/pkg/generated/restapi"
 	"github.com/sigstore/rekor/pkg/generated/restapi/operations"
 	"github.com/sigstore/rekor/pkg/log"
 	"github.com/sigstore/rekor/pkg/types/rekord"
 	rekord_v001 "github.com/sigstore/rekor/pkg/types/rekord/v0.0.1"
 	"github.com/sigstore/rekor/pkg/types/rpm"
 	rpm_v001 "github.com/sigstore/rekor/pkg/types/rpm/v0.0.1"
-
-	"github.com/prometheus/client_golang/prometheus/promhttp"
-	"github.com/sigstore/rekor/pkg/generated/restapi"
-	"github.com/spf13/cobra"
-	"github.com/spf13/viper"
 )
 
 // serveCmd represents the serve command
diff --git a/cmd/rekor-server/app/watch.go b/cmd/rekor-server/app/watch.go
index 0f2952707b086156ef402592204b8d12ae0e15c3..43aac9342827cb74062d8e490e65f9dda5aaf1aa 100644
--- a/cmd/rekor-server/app/watch.go
+++ b/cmd/rekor-server/app/watch.go
@@ -1,18 +1,17 @@
-/*
-Copyright © 2021 Dan Lorenc <lorenc.d@gmail.com>
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
+//
+// Copyright 2021 The Sigstore Authors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
 package app
 
@@ -29,20 +28,20 @@ import (
 	"os"
 	"time"
 
+	_ "gocloud.dev/blob/fileblob" // fileblob
+	_ "gocloud.dev/blob/gcsblob"
+
 	"github.com/google/trillian"
 	tclient "github.com/google/trillian/client"
 	"github.com/google/trillian/merkle/rfc6962/hasher"
 	"github.com/google/trillian/types"
+	"github.com/spf13/cobra"
+	"github.com/spf13/viper"
+	"gocloud.dev/blob"
 
 	"github.com/sigstore/rekor/cmd/rekor-cli/app"
 	"github.com/sigstore/rekor/pkg/generated/client"
 	"github.com/sigstore/rekor/pkg/log"
-
-	"github.com/spf13/cobra"
-	"github.com/spf13/viper"
-	"gocloud.dev/blob"
-	_ "gocloud.dev/blob/fileblob"
-	_ "gocloud.dev/blob/gcsblob"
 )
 
 const rekorSthBucketEnv = "REKOR_STH_BUCKET"
diff --git a/cmd/rekor-server/main.go b/cmd/rekor-server/main.go
index 4aaccb0fa7a03f9cc7dae381f1d7c94445fa073a..8e160e859edffb489de16e5f450ab0842a7bd18d 100644
--- a/cmd/rekor-server/main.go
+++ b/cmd/rekor-server/main.go
@@ -1,18 +1,17 @@
-/*
-Copyright © 2020 Luke Hinds <lhinds@redhat.com>
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
+//
+// Copyright 2021 The Sigstore Authors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
 package main
 
diff --git a/config/rekor.yaml b/config/rekor.yaml
index d394cb0cc18b970ac4c7c8927d36c6e707b81148..6b52403f1ee30d847187428ce76f105c2478d9a0 100644
--- a/config/rekor.yaml
+++ b/config/rekor.yaml
@@ -1,3 +1,18 @@
+#
+# Copyright 2021 The Sigstore Authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 apiVersion: apps/v1
 kind: Deployment
 metadata:
diff --git a/config/watcher.yaml b/config/watcher.yaml
index 416aca5b2f3787955babf75ab30d38b76be289ee..bacdadfb7efa3c3670b123c7381a2c6a3554a334 100644
--- a/config/watcher.yaml
+++ b/config/watcher.yaml
@@ -1,3 +1,18 @@
+#
+# Copyright 2021 The Sigstore Authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 apiVersion: apps/v1
 kind: Deployment
 metadata:
diff --git a/docker-compose.debug.yml b/docker-compose.debug.yml
index 1c1565c84475cceaf1b5122386b9cdae81b2426e..f2f9eebc10a73f1f6f5b03a86d75bcb2a4369899 100644
--- a/docker-compose.debug.yml
+++ b/docker-compose.debug.yml
@@ -1,3 +1,18 @@
+#
+# Copyright 2021 The Sigstore Authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 version: '3.4'
 services:
   rekor-server-debug:
diff --git a/docker-compose.yml b/docker-compose.yml
index bf6ae12dd80f796994c696ff4c0e58ac582d1174..ff8b73688f100994551ae4095d377963e278a44a 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,3 +1,18 @@
+#
+# Copyright 2021 The Sigstore Authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 version: '3.4'
 services:
   mysql:
diff --git a/openapi.yaml b/openapi.yaml
index 0f4bf7c59261315f8a2ad2b0c2ad3d1e12121f95..e5bdb2ddb5db163fa8ef71545e1d5a1a254575d8 100644
--- a/openapi.yaml
+++ b/openapi.yaml
@@ -1,3 +1,18 @@
+#
+# Copyright 2021 The Sigstore Authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 swagger: "2.0"
 info:
   title: Rekor
diff --git a/pkg/api/api.go b/pkg/api/api.go
index 0599f00444e6b3f36fb787e16b764cd9b31a596e..5239fa042af109e9947188076a14b0e8510ec32d 100644
--- a/pkg/api/api.go
+++ b/pkg/api/api.go
@@ -1,18 +1,17 @@
-/*
-Copyright © 2020 Luke Hinds <lhinds@redhat.com>
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
+//
+// Copyright 2021 The Sigstore Authors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
 package api
 
@@ -25,9 +24,10 @@ import (
 	"github.com/google/trillian/client"
 	"github.com/google/trillian/crypto/keyspb"
 	radix "github.com/mediocregopher/radix/v4"
-	"github.com/sigstore/rekor/pkg/log"
 	"github.com/spf13/viper"
 	"google.golang.org/grpc"
+
+	"github.com/sigstore/rekor/pkg/log"
 )
 
 func dial(ctx context.Context, rpcServer string) (*grpc.ClientConn, error) {
diff --git a/pkg/api/entries.go b/pkg/api/entries.go
index cb371d0616e941bdfdf3e6b3231ae7a59a1aa310..d4b1e0d82b29f4dcea5d703c32abae3fe52eea45 100644
--- a/pkg/api/entries.go
+++ b/pkg/api/entries.go
@@ -1,18 +1,18 @@
-/*
-Copyright © 2020 Bob Callaway <bcallawa@redhat.com>
+//
+// Copyright 2021 The Sigstore Authors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
 package api
 
 import (
@@ -23,29 +23,24 @@ import (
 	"net/http"
 	"net/url"
 
-	ttypes "github.com/google/trillian/types"
-
+	"github.com/go-openapi/runtime/middleware"
+	"github.com/go-openapi/strfmt"
+	"github.com/go-openapi/swag"
 	"github.com/google/trillian"
+	rfc6962 "github.com/google/trillian/merkle/rfc6962/hasher"
+	ttypes "github.com/google/trillian/types"
 	"github.com/spf13/viper"
 	"golang.org/x/sync/errgroup"
-
-	"github.com/go-openapi/swag"
-
 	"google.golang.org/genproto/googleapis/rpc/code"
 	"google.golang.org/grpc/codes"
 
-	"github.com/sigstore/rekor/pkg/log"
-	"github.com/sigstore/rekor/pkg/types"
-
 	"github.com/sigstore/rekor/pkg/generated/models"
-
-	"github.com/go-openapi/runtime/middleware"
-	"github.com/go-openapi/strfmt"
-	rfc6962 "github.com/google/trillian/merkle/rfc6962/hasher"
 	"github.com/sigstore/rekor/pkg/generated/restapi/operations/entries"
+	"github.com/sigstore/rekor/pkg/log"
+	"github.com/sigstore/rekor/pkg/types"
 )
 
-//logEntryFromLeaf creates LogEntry struct from trillian structs
+// logEntryFromLeaf creates LogEntry struct from trillian structs
 func logEntryFromLeaf(tc TrillianClient, leaf *trillian.LogLeaf, signedLogRoot *trillian.SignedLogRoot, proof *trillian.Proof) (models.LogEntry, error) {
 
 	root := &ttypes.LogRootV1{}
@@ -76,7 +71,7 @@ func logEntryFromLeaf(tc TrillianClient, leaf *trillian.LogLeaf, signedLogRoot *
 	return logEntry, nil
 }
 
-//GetLogEntryAndProofByIndexHandler returns the entry and inclusion proof for a specified log index
+// GetLogEntryAndProofByIndexHandler returns the entry and inclusion proof for a specified log index
 func GetLogEntryByIndexHandler(params entries.GetLogEntryByIndexParams) middleware.Responder {
 	tc := NewTrillianClient(params.HTTPRequest.Context())
 
@@ -103,7 +98,7 @@ func GetLogEntryByIndexHandler(params entries.GetLogEntryByIndexParams) middlewa
 	return entries.NewGetLogEntryByIndexOK().WithPayload(logEntry)
 }
 
-//CreateLogEntryHandler creates new entry into log
+// CreateLogEntryHandler creates new entry into log
 func CreateLogEntryHandler(params entries.CreateLogEntryParams) middleware.Responder {
 	httpReq := params.HTTPRequest
 	entry, err := types.NewEntry(params.ProposedEntry)
@@ -119,12 +114,12 @@ func CreateLogEntryHandler(params entries.CreateLogEntryParams) middleware.Respo
 	tc := NewTrillianClient(httpReq.Context())
 
 	resp := tc.addLeaf(leaf)
-	//this represents overall GRPC response state (not the results of insertion into the log)
+	// this represents overall GRPC response state (not the results of insertion into the log)
 	if resp.status != codes.OK {
 		return handleRekorAPIError(params, http.StatusInternalServerError, fmt.Errorf("grpc error: %w", resp.err), trillianUnexpectedResult)
 	}
 
-	//this represents the results of inserting the proposed leaf into the log; status is nil in success path
+	// this represents the results of inserting the proposed leaf into the log; status is nil in success path
 	insertionStatus := resp.getAddResult.QueuedLeaf.Status
 	if insertionStatus != nil {
 		switch insertionStatus.Code {
@@ -164,7 +159,7 @@ func CreateLogEntryHandler(params entries.CreateLogEntryParams) middleware.Respo
 	return entries.NewCreateLogEntryCreated().WithPayload(logEntry).WithLocation(getEntryURL(*httpReq.URL, uuid)).WithETag(uuid)
 }
 
-//getEntryURL returns the absolute path to the log entry in a RESTful style
+// getEntryURL returns the absolute path to the log entry in a RESTful style
 func getEntryURL(locationURL url.URL, uuid string) strfmt.URI {
 	// remove API key from output
 	query := locationURL.Query()
@@ -175,7 +170,7 @@ func getEntryURL(locationURL url.URL, uuid string) strfmt.URI {
 
 }
 
-//GetLogEntryByUUIDHandler gets log entry and inclusion proof for specified UUID aka merkle leaf hash
+// GetLogEntryByUUIDHandler gets log entry and inclusion proof for specified UUID aka merkle leaf hash
 func GetLogEntryByUUIDHandler(params entries.GetLogEntryByUUIDParams) middleware.Responder {
 	hashValue, _ := hex.DecodeString(params.EntryUUID)
 	tc := NewTrillianClient(params.HTTPRequest.Context())
@@ -203,7 +198,7 @@ func GetLogEntryByUUIDHandler(params entries.GetLogEntryByUUIDParams) middleware
 	return entries.NewGetLogEntryByUUIDOK().WithPayload(logEntry)
 }
 
-//SearchLogQueryHandler searches log by index, UUID, or proposed entry and returns array of entries found with inclusion proofs
+// SearchLogQueryHandler searches log by index, UUID, or proposed entry and returns array of entries found with inclusion proofs
 func SearchLogQueryHandler(params entries.SearchLogQueryParams) middleware.Responder {
 	httpReqCtx := params.HTTPRequest.Context()
 	resultPayload := []models.LogEntry{}
diff --git a/pkg/api/error.go b/pkg/api/error.go
index 17a8177e96f3eb75339df9e712f5c58ab08bb1de..78d9767f077ba10373bc6964d1abae595c1a810c 100644
--- a/pkg/api/error.go
+++ b/pkg/api/error.go
@@ -1,18 +1,18 @@
-/*
-Copyright © 2020 Bob Callaway <bcallawa@redhat.com>
+//
+// Copyright 2021 The Sigstore Authors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
 package api
 
 import (
@@ -23,6 +23,7 @@ import (
 	"github.com/go-openapi/runtime/middleware"
 	"github.com/go-openapi/strfmt"
 	"github.com/mitchellh/mapstructure"
+
 	"github.com/sigstore/rekor/pkg/generated/models"
 	"github.com/sigstore/rekor/pkg/generated/restapi/operations/entries"
 	"github.com/sigstore/rekor/pkg/generated/restapi/operations/index"
diff --git a/pkg/api/index.go b/pkg/api/index.go
index 0b5fdb07db48e963f703ec39fda18022a8d66bf9..6ed73d3981f85a9b8f64406b919552ce1c987f82 100644
--- a/pkg/api/index.go
+++ b/pkg/api/index.go
@@ -1,18 +1,17 @@
-/*
-Copyright © 2021 Bob Callaway <bcallawa@redhat.com>
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
+//
+// Copyright 2021 The Sigstore Authors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
 package api
 
@@ -24,15 +23,14 @@ import (
 	"net/http"
 	"strings"
 
-	"github.com/sigstore/rekor/pkg/pki"
-
-	radix "github.com/mediocregopher/radix/v4"
-
 	"github.com/asaskevich/govalidator"
 	"github.com/go-openapi/runtime/middleware"
 	"github.com/go-openapi/swag"
+	radix "github.com/mediocregopher/radix/v4"
+
 	"github.com/sigstore/rekor/pkg/generated/models"
 	"github.com/sigstore/rekor/pkg/generated/restapi/operations/index"
+	"github.com/sigstore/rekor/pkg/pki"
 	"github.com/sigstore/rekor/pkg/util"
 )
 
@@ -41,7 +39,7 @@ func SearchIndexHandler(params index.SearchIndexParams) middleware.Responder {
 
 	var result []string
 	if params.Query.Hash != "" {
-		//validate this is only a valid sha256 hash
+		// validate this is only a valid sha256 hash
 		if !govalidator.IsSHA256(params.Query.Hash) {
 			return handleRekorAPIError(params, http.StatusBadRequest, errors.New("invalid hash value specified"), malformedHash)
 		}
diff --git a/pkg/api/metrics.go b/pkg/api/metrics.go
index 7a757e198ac325fb0d8bb6d302d652fe680a4439..2e33e325f67f9f472e84c46dd2fabd9eaad6dc02 100644
--- a/pkg/api/metrics.go
+++ b/pkg/api/metrics.go
@@ -1,3 +1,18 @@
+//
+// Copyright 2021 The Sigstore Authors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
 package api
 
 import (
diff --git a/pkg/api/tlog.go b/pkg/api/tlog.go
index edaf77a4a624b0aea33bb7344540810e44d03a09..2d2a4d8a78cec794fbb6913dcd7848e049b7c29b 100644
--- a/pkg/api/tlog.go
+++ b/pkg/api/tlog.go
@@ -1,18 +1,18 @@
-/*
-Copyright © 2020 Bob Callaway <bcallawa@redhat.com>
+//
+// Copyright 2021 The Sigstore Authors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
 package api
 
 import (
@@ -22,16 +22,16 @@ import (
 	"fmt"
 	"net/http"
 
-	"github.com/sigstore/rekor/pkg/generated/models"
-	"google.golang.org/grpc/codes"
-
 	"github.com/go-openapi/runtime/middleware"
 	"github.com/go-openapi/strfmt"
 	"github.com/google/trillian/types"
+	"google.golang.org/grpc/codes"
+
+	"github.com/sigstore/rekor/pkg/generated/models"
 	"github.com/sigstore/rekor/pkg/generated/restapi/operations/tlog"
 )
 
-//GetLogInfoHandler returns the current size of the tree and the STH
+// GetLogInfoHandler returns the current size of the tree and the STH
 func GetLogInfoHandler(params tlog.GetLogInfoParams) middleware.Responder {
 	tc := NewTrillianClient(params.HTTPRequest.Context())
 
@@ -66,7 +66,7 @@ func GetLogInfoHandler(params tlog.GetLogInfoParams) middleware.Responder {
 	return tlog.NewGetLogInfoOK().WithPayload(&logInfo)
 }
 
-//GetLogProofHandler returns information required to compute a consistency proof between two snapshots of log
+// GetLogProofHandler returns information required to compute a consistency proof between two snapshots of log
 func GetLogProofHandler(params tlog.GetLogProofParams) middleware.Responder {
 	if *params.FirstSize > params.LastSize {
 		return handleRekorAPIError(params, http.StatusBadRequest, nil, fmt.Sprintf(firstSizeLessThanLastSize, *params.FirstSize, params.LastSize))
@@ -102,10 +102,11 @@ func GetLogProofHandler(params tlog.GetLogProofParams) middleware.Responder {
 		RootHash: &hashString,
 		Hashes:   proofHashes,
 	}
+
 	return tlog.NewGetLogProofOK().WithPayload(&consistencyProof)
 }
 
-//GetPublicKeyHandler returns the public key used to verify the signature on the signed tree head
+// GetPublicKeyHandler returns the public key used to verify the signature on the signed tree head
 func GetPublicKeyHandler(params tlog.GetPublicKeyParams) middleware.Responder {
 	tc := NewTrillianClient(params.HTTPRequest.Context())
 
diff --git a/pkg/api/trillian_client.go b/pkg/api/trillian_client.go
index b02e257ed14f5818f4673a6d08f98bc00eb543cf..5c13b0a81bbd47d14c9ce22fb53842346e5e002a 100644
--- a/pkg/api/trillian_client.go
+++ b/pkg/api/trillian_client.go
@@ -1,18 +1,17 @@
-/*
-Copyright © 2020 Luke Hinds <lhinds@redhat.com>
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
+//
+// Copyright 2021 The Sigstore Authors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
 package api
 
@@ -22,6 +21,8 @@ import (
 	"fmt"
 	"time"
 
+	_ "github.com/google/trillian/merkle/rfc6962" // register hasher
+
 	"github.com/golang/protobuf/ptypes"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
@@ -30,7 +31,6 @@ import (
 	"github.com/google/trillian/client"
 	"github.com/google/trillian/crypto/keyspb"
 	"github.com/google/trillian/crypto/sigpb"
-	_ "github.com/google/trillian/merkle/rfc6962" //register hasher
 	"github.com/google/trillian/types"
 )
 
@@ -166,7 +166,7 @@ func (t *TrillianClient) addLeaf(byteValue []byte) *Response {
 		}
 	}
 
-	//overwrite queued leaf that doesn't have index set
+	// overwrite queued leaf that doesn't have index set
 	resp.QueuedLeaf.Leaf = leafResp.getLeafAndProofResult.Leaf
 
 	return &Response{
diff --git a/pkg/generated/client/entries/create_log_entry_parameters.go b/pkg/generated/client/entries/create_log_entry_parameters.go
index 80f9799bf002f77d32c2d9482eb67d11ba6ecee7..c5ccd212851b99c15ab737fe2cf32e6d34193739 100644
--- a/pkg/generated/client/entries/create_log_entry_parameters.go
+++ b/pkg/generated/client/entries/create_log_entry_parameters.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
-// /*
-// Copyright The Rekor Authors.
+//
+// Copyright 2021 The Sigstore Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -14,7 +14,6 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// */
 //
 
 package entries
diff --git a/pkg/generated/client/entries/create_log_entry_responses.go b/pkg/generated/client/entries/create_log_entry_responses.go
index 7e175eb292d80de8b81c3e7de1bf8f823f6f57e4..135bf9ca7934eb6b9a6020b20eef4c1eb279ff96 100644
--- a/pkg/generated/client/entries/create_log_entry_responses.go
+++ b/pkg/generated/client/entries/create_log_entry_responses.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
-// /*
-// Copyright The Rekor Authors.
+//
+// Copyright 2021 The Sigstore Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -14,7 +14,6 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// */
 //
 
 package entries
diff --git a/pkg/generated/client/entries/entries_client.go b/pkg/generated/client/entries/entries_client.go
index 901885b90b0617b5d3d1f87b8469bb09032c6d30..a6a9bf19fec17c5799aefa9094359c5b8652b074 100644
--- a/pkg/generated/client/entries/entries_client.go
+++ b/pkg/generated/client/entries/entries_client.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
-// /*
-// Copyright The Rekor Authors.
+//
+// Copyright 2021 The Sigstore Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -14,7 +14,6 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// */
 //
 
 package entries
diff --git a/pkg/generated/client/entries/get_log_entry_by_index_parameters.go b/pkg/generated/client/entries/get_log_entry_by_index_parameters.go
index 22a178a7ab14196520677cf03c3e5381e9b77817..405dee67c3f811fd6f7dd2d7295466409de5582f 100644
--- a/pkg/generated/client/entries/get_log_entry_by_index_parameters.go
+++ b/pkg/generated/client/entries/get_log_entry_by_index_parameters.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
-// /*
-// Copyright The Rekor Authors.
+//
+// Copyright 2021 The Sigstore Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -14,7 +14,6 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// */
 //
 
 package entries
diff --git a/pkg/generated/client/entries/get_log_entry_by_index_responses.go b/pkg/generated/client/entries/get_log_entry_by_index_responses.go
index d1bec16616277b1c9e392e293b1595cf0d591d0b..8b510fcadd4bbfc15128ef6c84494592b8f0ea3e 100644
--- a/pkg/generated/client/entries/get_log_entry_by_index_responses.go
+++ b/pkg/generated/client/entries/get_log_entry_by_index_responses.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
-// /*
-// Copyright The Rekor Authors.
+//
+// Copyright 2021 The Sigstore Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -14,7 +14,6 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// */
 //
 
 package entries
diff --git a/pkg/generated/client/entries/get_log_entry_by_uuid_parameters.go b/pkg/generated/client/entries/get_log_entry_by_uuid_parameters.go
index 928420ad1f28103e224da9a27a56c3fc1db610e5..560bee0165d527adedf6041bd320a43947767aca 100644
--- a/pkg/generated/client/entries/get_log_entry_by_uuid_parameters.go
+++ b/pkg/generated/client/entries/get_log_entry_by_uuid_parameters.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
-// /*
-// Copyright The Rekor Authors.
+//
+// Copyright 2021 The Sigstore Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -14,7 +14,6 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// */
 //
 
 package entries
diff --git a/pkg/generated/client/entries/get_log_entry_by_uuid_responses.go b/pkg/generated/client/entries/get_log_entry_by_uuid_responses.go
index 8141ee6ff99376c61ab15a6f320f3b268fa65e17..9d46b2fa4e1aa52a7a8f0967e9fce9cb879238a9 100644
--- a/pkg/generated/client/entries/get_log_entry_by_uuid_responses.go
+++ b/pkg/generated/client/entries/get_log_entry_by_uuid_responses.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
-// /*
-// Copyright The Rekor Authors.
+//
+// Copyright 2021 The Sigstore Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -14,7 +14,6 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// */
 //
 
 package entries
diff --git a/pkg/generated/client/entries/search_log_query_parameters.go b/pkg/generated/client/entries/search_log_query_parameters.go
index 8e759ab579a0bd23de5434bc11f02b1a52d7b333..459f1208ea5cd3ccb2d8905b9a332339fbb18b42 100644
--- a/pkg/generated/client/entries/search_log_query_parameters.go
+++ b/pkg/generated/client/entries/search_log_query_parameters.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
-// /*
-// Copyright The Rekor Authors.
+//
+// Copyright 2021 The Sigstore Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -14,7 +14,6 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// */
 //
 
 package entries
diff --git a/pkg/generated/client/entries/search_log_query_responses.go b/pkg/generated/client/entries/search_log_query_responses.go
index f28cb58fc9a1ebc08e41d16c8c946b8fcf73dce4..c459c0ccee6eec01811fdd12da74340e4a6c0b39 100644
--- a/pkg/generated/client/entries/search_log_query_responses.go
+++ b/pkg/generated/client/entries/search_log_query_responses.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
-// /*
-// Copyright The Rekor Authors.
+//
+// Copyright 2021 The Sigstore Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -14,7 +14,6 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// */
 //
 
 package entries
diff --git a/pkg/generated/client/index/index_client.go b/pkg/generated/client/index/index_client.go
index 4a60e2cafab2e4fbced349cf02970621ed8ad61d..bbe0f579ceb0dd25823bd89902b77bfa77d66e83 100644
--- a/pkg/generated/client/index/index_client.go
+++ b/pkg/generated/client/index/index_client.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
-// /*
-// Copyright The Rekor Authors.
+//
+// Copyright 2021 The Sigstore Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -14,7 +14,6 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// */
 //
 
 package index
diff --git a/pkg/generated/client/index/search_index_parameters.go b/pkg/generated/client/index/search_index_parameters.go
index 2195b535c3a38f2d17aee95b7fc75ed70238dc97..d54879b0f7257138c795c8a92c0b2a74e74996eb 100644
--- a/pkg/generated/client/index/search_index_parameters.go
+++ b/pkg/generated/client/index/search_index_parameters.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
-// /*
-// Copyright The Rekor Authors.
+//
+// Copyright 2021 The Sigstore Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -14,7 +14,6 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// */
 //
 
 package index
diff --git a/pkg/generated/client/index/search_index_responses.go b/pkg/generated/client/index/search_index_responses.go
index 12415d8105f8ba20d1f32423b7e2c75ca8a032e2..587a93817bda69502476fcd8616f262fcb501a81 100644
--- a/pkg/generated/client/index/search_index_responses.go
+++ b/pkg/generated/client/index/search_index_responses.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
-// /*
-// Copyright The Rekor Authors.
+//
+// Copyright 2021 The Sigstore Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -14,7 +14,6 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// */
 //
 
 package index
diff --git a/pkg/generated/client/rekor_client.go b/pkg/generated/client/rekor_client.go
index 414a5b88bf5cc786d4bdbd43da2dcc50e0fa567f..9605815a872124397297356f3ce55651402466b4 100644
--- a/pkg/generated/client/rekor_client.go
+++ b/pkg/generated/client/rekor_client.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
-// /*
-// Copyright The Rekor Authors.
+//
+// Copyright 2021 The Sigstore Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -14,7 +14,6 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// */
 //
 
 package client
diff --git a/pkg/generated/client/tlog/get_log_info_parameters.go b/pkg/generated/client/tlog/get_log_info_parameters.go
index ebe29ac1d93ccdfb56f9fe206863d05764fe4006..f051485aede56d2bb7fad5699db3a438219da228 100644
--- a/pkg/generated/client/tlog/get_log_info_parameters.go
+++ b/pkg/generated/client/tlog/get_log_info_parameters.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
-// /*
-// Copyright The Rekor Authors.
+//
+// Copyright 2021 The Sigstore Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -14,7 +14,6 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// */
 //
 
 package tlog
diff --git a/pkg/generated/client/tlog/get_log_info_responses.go b/pkg/generated/client/tlog/get_log_info_responses.go
index 84909e323f7dade08fca12b2c99375df39fb0f86..d8157506ad3d87b9e1f44c5fb74e55addd3660b3 100644
--- a/pkg/generated/client/tlog/get_log_info_responses.go
+++ b/pkg/generated/client/tlog/get_log_info_responses.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
-// /*
-// Copyright The Rekor Authors.
+//
+// Copyright 2021 The Sigstore Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -14,7 +14,6 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// */
 //
 
 package tlog
diff --git a/pkg/generated/client/tlog/get_log_proof_parameters.go b/pkg/generated/client/tlog/get_log_proof_parameters.go
index bff003fa74f2a76262579f1cecb94af51cd9861b..403dd3826f7818d28ea007f1a4b2da31a04e0266 100644
--- a/pkg/generated/client/tlog/get_log_proof_parameters.go
+++ b/pkg/generated/client/tlog/get_log_proof_parameters.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
-// /*
-// Copyright The Rekor Authors.
+//
+// Copyright 2021 The Sigstore Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -14,7 +14,6 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// */
 //
 
 package tlog
diff --git a/pkg/generated/client/tlog/get_log_proof_responses.go b/pkg/generated/client/tlog/get_log_proof_responses.go
index 91d09f62ad62b74b0ca9e5a8c514af2f09dbc570..76ebadb1075d982ae223f40fb91b26cdfc2d077b 100644
--- a/pkg/generated/client/tlog/get_log_proof_responses.go
+++ b/pkg/generated/client/tlog/get_log_proof_responses.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
-// /*
-// Copyright The Rekor Authors.
+//
+// Copyright 2021 The Sigstore Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -14,7 +14,6 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// */
 //
 
 package tlog
diff --git a/pkg/generated/client/tlog/get_public_key_parameters.go b/pkg/generated/client/tlog/get_public_key_parameters.go
index 2e8da302817aa3e0c4eca123b25b41d77f653bcb..cd6093d2de572238c90b683ad702d3dda69c80ed 100644
--- a/pkg/generated/client/tlog/get_public_key_parameters.go
+++ b/pkg/generated/client/tlog/get_public_key_parameters.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
-// /*
-// Copyright The Rekor Authors.
+//
+// Copyright 2021 The Sigstore Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -14,7 +14,6 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// */
 //
 
 package tlog
diff --git a/pkg/generated/client/tlog/get_public_key_responses.go b/pkg/generated/client/tlog/get_public_key_responses.go
index e6b146fa9871ed2560eab934962f70dca7191ab3..47fab0fa91f5bff5225ad23626e58f36ff9fa265 100644
--- a/pkg/generated/client/tlog/get_public_key_responses.go
+++ b/pkg/generated/client/tlog/get_public_key_responses.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
-// /*
-// Copyright The Rekor Authors.
+//
+// Copyright 2021 The Sigstore Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -14,7 +14,6 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// */
 //
 
 package tlog
diff --git a/pkg/generated/client/tlog/tlog_client.go b/pkg/generated/client/tlog/tlog_client.go
index 653684df1b954a4f08786eb33687afa65920f03a..19a869a43358db4dde102cdab90559801205218e 100644
--- a/pkg/generated/client/tlog/tlog_client.go
+++ b/pkg/generated/client/tlog/tlog_client.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
-// /*
-// Copyright The Rekor Authors.
+//
+// Copyright 2021 The Sigstore Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -14,7 +14,6 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// */
 //
 
 package tlog
diff --git a/pkg/generated/models/consistency_proof.go b/pkg/generated/models/consistency_proof.go
index c9c90ffca58b6aa944f3b7afad3cf3e104c10121..804ddd11a969e8204b74801b31a869457a6aa86d 100644
--- a/pkg/generated/models/consistency_proof.go
+++ b/pkg/generated/models/consistency_proof.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
-// /*
-// Copyright The Rekor Authors.
+//
+// Copyright 2021 The Sigstore Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -14,7 +14,6 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// */
 //
 
 package models
diff --git a/pkg/generated/models/error.go b/pkg/generated/models/error.go
index 4f8232f98bc2d0bdd8b920625467739f8db8e468..ac14f2026e40ce9167dc4052d79255a2131da17c 100644
--- a/pkg/generated/models/error.go
+++ b/pkg/generated/models/error.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
-// /*
-// Copyright The Rekor Authors.
+//
+// Copyright 2021 The Sigstore Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -14,7 +14,6 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// */
 //
 
 package models
diff --git a/pkg/generated/models/inclusion_proof.go b/pkg/generated/models/inclusion_proof.go
index 37bb9a9c4feddef2c67e7083ad3ba4da9472ae09..61399816c868a4e291d5a6c4e56972b048bb9906 100644
--- a/pkg/generated/models/inclusion_proof.go
+++ b/pkg/generated/models/inclusion_proof.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
-// /*
-// Copyright The Rekor Authors.
+//
+// Copyright 2021 The Sigstore Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -14,7 +14,6 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// */
 //
 
 package models
diff --git a/pkg/generated/models/log_entry.go b/pkg/generated/models/log_entry.go
index 09c124a22615478ce6c5f74de30b699058e242df..0f73747512574317db06f11615fb73659afd89a1 100644
--- a/pkg/generated/models/log_entry.go
+++ b/pkg/generated/models/log_entry.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
-// /*
-// Copyright The Rekor Authors.
+//
+// Copyright 2021 The Sigstore Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -14,7 +14,6 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// */
 //
 
 package models
diff --git a/pkg/generated/models/log_info.go b/pkg/generated/models/log_info.go
index 20bc80185e35e188cffbc166f9f0916660719f9e..f51a1d48dafab1e22d858e6c46897a4c87b20241 100644
--- a/pkg/generated/models/log_info.go
+++ b/pkg/generated/models/log_info.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
-// /*
-// Copyright The Rekor Authors.
+//
+// Copyright 2021 The Sigstore Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -14,7 +14,6 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// */
 //
 
 package models
diff --git a/pkg/generated/models/proposed_entry.go b/pkg/generated/models/proposed_entry.go
index 41611da0968ae6f91498cee50fb02e7b7f1a6729..511b3f414f88303441ac19a696ce1b3bfe2bdc67 100644
--- a/pkg/generated/models/proposed_entry.go
+++ b/pkg/generated/models/proposed_entry.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
-// /*
-// Copyright The Rekor Authors.
+//
+// Copyright 2021 The Sigstore Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -14,7 +14,6 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// */
 //
 
 package models
diff --git a/pkg/generated/models/rekord.go b/pkg/generated/models/rekord.go
index 00f51be67f19e734e32a12b249f78cd9667c813d..81c8ff05454137160ae47624dbf4e6a6663f4d4a 100644
--- a/pkg/generated/models/rekord.go
+++ b/pkg/generated/models/rekord.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
-// /*
-// Copyright The Rekor Authors.
+//
+// Copyright 2021 The Sigstore Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -14,7 +14,6 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// */
 //
 
 package models
diff --git a/pkg/generated/models/rekord_schema.go b/pkg/generated/models/rekord_schema.go
index 9d0bc0666ace03ec077c31e827e6595ff4946a53..7bf2783304b06383d9fae200db61c8729951883a 100644
--- a/pkg/generated/models/rekord_schema.go
+++ b/pkg/generated/models/rekord_schema.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
-// /*
-// Copyright The Rekor Authors.
+//
+// Copyright 2021 The Sigstore Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -14,7 +14,6 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// */
 //
 
 package models
diff --git a/pkg/generated/models/rekord_v001_schema.go b/pkg/generated/models/rekord_v001_schema.go
index a979c9be44fbf41cf0e427b6547e1a5028c935df..00e51e6a85a08b9987657c99b78674056256c880 100644
--- a/pkg/generated/models/rekord_v001_schema.go
+++ b/pkg/generated/models/rekord_v001_schema.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
-// /*
-// Copyright The Rekor Authors.
+//
+// Copyright 2021 The Sigstore Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -14,7 +14,6 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// */
 //
 
 package models
diff --git a/pkg/generated/models/rpm.go b/pkg/generated/models/rpm.go
index ceb0973ae50bdf912bd4668b52c1234ebab6cd7c..d4fab013dfc7d5d76bd21a910cadadba6bc909f4 100644
--- a/pkg/generated/models/rpm.go
+++ b/pkg/generated/models/rpm.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
-// /*
-// Copyright The Rekor Authors.
+//
+// Copyright 2021 The Sigstore Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -14,7 +14,6 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// */
 //
 
 package models
diff --git a/pkg/generated/models/rpm_schema.go b/pkg/generated/models/rpm_schema.go
index 8bf7304a7764c099ce25d489a7a3ff6f725bdc4b..0304bbe77c8c9dba9db6d0544d5fb561db066bc4 100644
--- a/pkg/generated/models/rpm_schema.go
+++ b/pkg/generated/models/rpm_schema.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
-// /*
-// Copyright The Rekor Authors.
+//
+// Copyright 2021 The Sigstore Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -14,7 +14,6 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// */
 //
 
 package models
diff --git a/pkg/generated/models/rpm_v001_schema.go b/pkg/generated/models/rpm_v001_schema.go
index 15846c8304331b29e0439fb580f9c60d37d27ea8..8ccd26c32a6bfd114bf7970f2623ed4c81ae5bd2 100644
--- a/pkg/generated/models/rpm_v001_schema.go
+++ b/pkg/generated/models/rpm_v001_schema.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
-// /*
-// Copyright The Rekor Authors.
+//
+// Copyright 2021 The Sigstore Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -14,7 +14,6 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// */
 //
 
 package models
diff --git a/pkg/generated/models/search_index.go b/pkg/generated/models/search_index.go
index c06bea04c42400b3134fd90804ee34dc70a9c706..c0427f6465814dc6d1e07a3198dae96be4f7cc04 100644
--- a/pkg/generated/models/search_index.go
+++ b/pkg/generated/models/search_index.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
-// /*
-// Copyright The Rekor Authors.
+//
+// Copyright 2021 The Sigstore Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -14,7 +14,6 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// */
 //
 
 package models
diff --git a/pkg/generated/models/search_log_query.go b/pkg/generated/models/search_log_query.go
index fe83030760b6c7432e78364438fcb574cc61ce79..d1ebe10766566b451a083e269c1bfaaab7df248e 100644
--- a/pkg/generated/models/search_log_query.go
+++ b/pkg/generated/models/search_log_query.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
-// /*
-// Copyright The Rekor Authors.
+//
+// Copyright 2021 The Sigstore Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -14,7 +14,6 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// */
 //
 
 package models
diff --git a/pkg/generated/restapi/configure_rekor_server.go b/pkg/generated/restapi/configure_rekor_server.go
index 8ef77192248f49e72b6a5c8f4887bdb93b525187..2ff1c62230e7eaab02e20a9de9d0a227dc944fbd 100644
--- a/pkg/generated/restapi/configure_rekor_server.go
+++ b/pkg/generated/restapi/configure_rekor_server.go
@@ -89,13 +89,13 @@ func configureAPI(api *operations.RekorServerAPI) http.Handler {
 
 	api.ServerShutdown = func() {}
 
-	//not cacheable
+	// not cacheable
 	api.AddMiddlewareFor("GET", "/api/v1/log", middleware.NoCache)
 	api.AddMiddlewareFor("GET", "/api/v1/log/proof", middleware.NoCache)
 	api.AddMiddlewareFor("GET", "/api/v1/log/entries", middleware.NoCache)
 	api.AddMiddlewareFor("GET", "/api/v1/log/entries/{entryUUID}", middleware.NoCache)
 
-	//cache forever
+	// cache forever
 	api.AddMiddlewareFor("GET", "/api/v1/log/publicKey", cacheForever)
 
 	return setupGlobalMiddleware(api.Serve(setupMiddlewares))
diff --git a/pkg/generated/restapi/doc.go b/pkg/generated/restapi/doc.go
index 99ed0fdc913a1deffa078e13efe7f982222db7ca..526232a1f7dc2d3e6f18481ba10e4fefba618dec 100644
--- a/pkg/generated/restapi/doc.go
+++ b/pkg/generated/restapi/doc.go
@@ -1,6 +1,6 @@
 // Code generated by go-swagger; DO NOT EDIT.
-// /*
-// Copyright The Rekor Authors.
+//
+// Copyright 2021 The Sigstore Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// */
 //
 
 // Package restapi Rekor
diff --git a/pkg/generated/restapi/embedded_spec.go b/pkg/generated/restapi/embedded_spec.go
index ba8c6e3092ba085fdc94c1a6a60cd0aba1753ddf..2b56688ab5b7d05ad9dc187370cdf23817ea8df1 100644
--- a/pkg/generated/restapi/embedded_spec.go
+++ b/pkg/generated/restapi/embedded_spec.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
-// /*
-// Copyright The Rekor Authors.
+//
+// Copyright 2021 The Sigstore Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -14,7 +14,6 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// */
 //
 
 package restapi
diff --git a/pkg/generated/restapi/operations/entries/create_log_entry.go b/pkg/generated/restapi/operations/entries/create_log_entry.go
index 3414cb5b3e9758f994fdf4b5df026e7ff179cffa..6860514d341b6160fbe7810f35e3abc94075c7bb 100644
--- a/pkg/generated/restapi/operations/entries/create_log_entry.go
+++ b/pkg/generated/restapi/operations/entries/create_log_entry.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
-// /*
-// Copyright The Rekor Authors.
+//
+// Copyright 2021 The Sigstore Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -14,7 +14,6 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// */
 //
 
 package entries
diff --git a/pkg/generated/restapi/operations/entries/create_log_entry_parameters.go b/pkg/generated/restapi/operations/entries/create_log_entry_parameters.go
index 13e881d34deaaa76e36d2bcc3baf1ba9c4557b86..dc624f2135c7664d3abc0a09565275c266389823 100644
--- a/pkg/generated/restapi/operations/entries/create_log_entry_parameters.go
+++ b/pkg/generated/restapi/operations/entries/create_log_entry_parameters.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
-// /*
-// Copyright The Rekor Authors.
+//
+// Copyright 2021 The Sigstore Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -14,7 +14,6 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// */
 //
 
 package entries
diff --git a/pkg/generated/restapi/operations/entries/create_log_entry_responses.go b/pkg/generated/restapi/operations/entries/create_log_entry_responses.go
index 0db00335bef69e2b8e4cdc53ff40a7f5de3ae57b..ddc2839c18be894f8eec69a525929998e1e96fdd 100644
--- a/pkg/generated/restapi/operations/entries/create_log_entry_responses.go
+++ b/pkg/generated/restapi/operations/entries/create_log_entry_responses.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
-// /*
-// Copyright The Rekor Authors.
+//
+// Copyright 2021 The Sigstore Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -14,7 +14,6 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// */
 //
 
 package entries
diff --git a/pkg/generated/restapi/operations/entries/create_log_entry_urlbuilder.go b/pkg/generated/restapi/operations/entries/create_log_entry_urlbuilder.go
index 03c1d43b71fec0fa2611083ce5790de975f7ec3f..116f611665a9675bdc6931105302ed2b87d1d9f4 100644
--- a/pkg/generated/restapi/operations/entries/create_log_entry_urlbuilder.go
+++ b/pkg/generated/restapi/operations/entries/create_log_entry_urlbuilder.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
-// /*
-// Copyright The Rekor Authors.
+//
+// Copyright 2021 The Sigstore Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -14,7 +14,6 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// */
 //
 
 package entries
diff --git a/pkg/generated/restapi/operations/entries/get_log_entry_by_index.go b/pkg/generated/restapi/operations/entries/get_log_entry_by_index.go
index 281f612a99bed61446183112274cee0177e12b1e..a27e5f60873066c4029389b70c2737a74ba1534c 100644
--- a/pkg/generated/restapi/operations/entries/get_log_entry_by_index.go
+++ b/pkg/generated/restapi/operations/entries/get_log_entry_by_index.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
-// /*
-// Copyright The Rekor Authors.
+//
+// Copyright 2021 The Sigstore Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -14,7 +14,6 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// */
 //
 
 package entries
diff --git a/pkg/generated/restapi/operations/entries/get_log_entry_by_index_parameters.go b/pkg/generated/restapi/operations/entries/get_log_entry_by_index_parameters.go
index 6927e216fbe19e2d5403dbdf6612fdf0dfa1b07c..cbbb8283f64c5a8c0a942b561a77ddd582b1315a 100644
--- a/pkg/generated/restapi/operations/entries/get_log_entry_by_index_parameters.go
+++ b/pkg/generated/restapi/operations/entries/get_log_entry_by_index_parameters.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
-// /*
-// Copyright The Rekor Authors.
+//
+// Copyright 2021 The Sigstore Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -14,7 +14,6 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// */
 //
 
 package entries
diff --git a/pkg/generated/restapi/operations/entries/get_log_entry_by_index_responses.go b/pkg/generated/restapi/operations/entries/get_log_entry_by_index_responses.go
index 130c36b6a30da1f9f62adcfb353d48577d19fde1..3b14b1a364d04b1d3ff5e39f3ae81a810e17f2ab 100644
--- a/pkg/generated/restapi/operations/entries/get_log_entry_by_index_responses.go
+++ b/pkg/generated/restapi/operations/entries/get_log_entry_by_index_responses.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
-// /*
-// Copyright The Rekor Authors.
+//
+// Copyright 2021 The Sigstore Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -14,7 +14,6 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// */
 //
 
 package entries
diff --git a/pkg/generated/restapi/operations/entries/get_log_entry_by_index_urlbuilder.go b/pkg/generated/restapi/operations/entries/get_log_entry_by_index_urlbuilder.go
index 3249dd78e88c656e646aa552042bf6ccc423716f..44ad564960edd4a2d224f12cab8ff5f2a3c9c405 100644
--- a/pkg/generated/restapi/operations/entries/get_log_entry_by_index_urlbuilder.go
+++ b/pkg/generated/restapi/operations/entries/get_log_entry_by_index_urlbuilder.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
-// /*
-// Copyright The Rekor Authors.
+//
+// Copyright 2021 The Sigstore Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -14,7 +14,6 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// */
 //
 
 package entries
diff --git a/pkg/generated/restapi/operations/entries/get_log_entry_by_uuid.go b/pkg/generated/restapi/operations/entries/get_log_entry_by_uuid.go
index 7231d60ebdd7e98649eccd5b17154d90c1c28efa..ea40f90251c8af12980fb9569ccea657ee38c984 100644
--- a/pkg/generated/restapi/operations/entries/get_log_entry_by_uuid.go
+++ b/pkg/generated/restapi/operations/entries/get_log_entry_by_uuid.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
-// /*
-// Copyright The Rekor Authors.
+//
+// Copyright 2021 The Sigstore Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -14,7 +14,6 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// */
 //
 
 package entries
diff --git a/pkg/generated/restapi/operations/entries/get_log_entry_by_uuid_parameters.go b/pkg/generated/restapi/operations/entries/get_log_entry_by_uuid_parameters.go
index d6f895179adb9bc493e76f268478c919b845d557..e97d9383b1779529eecaa6851ee5611fa549687c 100644
--- a/pkg/generated/restapi/operations/entries/get_log_entry_by_uuid_parameters.go
+++ b/pkg/generated/restapi/operations/entries/get_log_entry_by_uuid_parameters.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
-// /*
-// Copyright The Rekor Authors.
+//
+// Copyright 2021 The Sigstore Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -14,7 +14,6 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// */
 //
 
 package entries
diff --git a/pkg/generated/restapi/operations/entries/get_log_entry_by_uuid_responses.go b/pkg/generated/restapi/operations/entries/get_log_entry_by_uuid_responses.go
index be38342434d50f835c52aa5d7c56d9b5c67e81cd..ccabfba232423cad658e78f70f5cdfab91ab6bed 100644
--- a/pkg/generated/restapi/operations/entries/get_log_entry_by_uuid_responses.go
+++ b/pkg/generated/restapi/operations/entries/get_log_entry_by_uuid_responses.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
-// /*
-// Copyright The Rekor Authors.
+//
+// Copyright 2021 The Sigstore Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -14,7 +14,6 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// */
 //
 
 package entries
diff --git a/pkg/generated/restapi/operations/entries/get_log_entry_by_uuid_urlbuilder.go b/pkg/generated/restapi/operations/entries/get_log_entry_by_uuid_urlbuilder.go
index 35c633e931081fc0b862c5d4df2b92b33d998673..2aaaea7a1cb26f2d3a36e28a112b781e0b64d1ac 100644
--- a/pkg/generated/restapi/operations/entries/get_log_entry_by_uuid_urlbuilder.go
+++ b/pkg/generated/restapi/operations/entries/get_log_entry_by_uuid_urlbuilder.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
-// /*
-// Copyright The Rekor Authors.
+//
+// Copyright 2021 The Sigstore Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -14,7 +14,6 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// */
 //
 
 package entries
diff --git a/pkg/generated/restapi/operations/entries/search_log_query.go b/pkg/generated/restapi/operations/entries/search_log_query.go
index 0fe601787ea999ca66ed4c7de9ca1b3eb1a78f3c..098e225d72728d482990efdb931f5c2de2e8ee1e 100644
--- a/pkg/generated/restapi/operations/entries/search_log_query.go
+++ b/pkg/generated/restapi/operations/entries/search_log_query.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
-// /*
-// Copyright The Rekor Authors.
+//
+// Copyright 2021 The Sigstore Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -14,7 +14,6 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// */
 //
 
 package entries
diff --git a/pkg/generated/restapi/operations/entries/search_log_query_parameters.go b/pkg/generated/restapi/operations/entries/search_log_query_parameters.go
index cb354ad6034b246bce0f97d5ba3eb7a8e4a7cb9b..2812649d3477ed9447af7ac48250acc8e3432c65 100644
--- a/pkg/generated/restapi/operations/entries/search_log_query_parameters.go
+++ b/pkg/generated/restapi/operations/entries/search_log_query_parameters.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
-// /*
-// Copyright The Rekor Authors.
+//
+// Copyright 2021 The Sigstore Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -14,7 +14,6 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// */
 //
 
 package entries
diff --git a/pkg/generated/restapi/operations/entries/search_log_query_responses.go b/pkg/generated/restapi/operations/entries/search_log_query_responses.go
index 2fcc9f6b796588093df8e726011a834200920f7a..3694ef3d8317b6c16da74582d0f55336fbae1f8c 100644
--- a/pkg/generated/restapi/operations/entries/search_log_query_responses.go
+++ b/pkg/generated/restapi/operations/entries/search_log_query_responses.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
-// /*
-// Copyright The Rekor Authors.
+//
+// Copyright 2021 The Sigstore Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -14,7 +14,6 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// */
 //
 
 package entries
diff --git a/pkg/generated/restapi/operations/entries/search_log_query_urlbuilder.go b/pkg/generated/restapi/operations/entries/search_log_query_urlbuilder.go
index 13b318f1b5f178c40278a483538f575f4f461be1..aa62f60b65a1532141b4c93dedd4f3864626db8a 100644
--- a/pkg/generated/restapi/operations/entries/search_log_query_urlbuilder.go
+++ b/pkg/generated/restapi/operations/entries/search_log_query_urlbuilder.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
-// /*
-// Copyright The Rekor Authors.
+//
+// Copyright 2021 The Sigstore Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -14,7 +14,6 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// */
 //
 
 package entries
diff --git a/pkg/generated/restapi/operations/index/search_index.go b/pkg/generated/restapi/operations/index/search_index.go
index 4eb6e8af6f28fe07e6ffd9e98e652b4d326bcc10..5848525c28da56fd353d89244fd52b3e03da3806 100644
--- a/pkg/generated/restapi/operations/index/search_index.go
+++ b/pkg/generated/restapi/operations/index/search_index.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
-// /*
-// Copyright The Rekor Authors.
+//
+// Copyright 2021 The Sigstore Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -14,7 +14,6 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// */
 //
 
 package index
diff --git a/pkg/generated/restapi/operations/index/search_index_parameters.go b/pkg/generated/restapi/operations/index/search_index_parameters.go
index 6ff766ecd279b45f988f9e1f1ad592ffca9663ed..596cec3d1e28a7443ed863ac69a6fb069a9cc842 100644
--- a/pkg/generated/restapi/operations/index/search_index_parameters.go
+++ b/pkg/generated/restapi/operations/index/search_index_parameters.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
-// /*
-// Copyright The Rekor Authors.
+//
+// Copyright 2021 The Sigstore Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -14,7 +14,6 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// */
 //
 
 package index
diff --git a/pkg/generated/restapi/operations/index/search_index_responses.go b/pkg/generated/restapi/operations/index/search_index_responses.go
index 626f2a925bc2c3135d19102ad74b485b535cbc70..4a160125d75a8fc7c0d95594f6c43ecaef51c4b6 100644
--- a/pkg/generated/restapi/operations/index/search_index_responses.go
+++ b/pkg/generated/restapi/operations/index/search_index_responses.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
-// /*
-// Copyright The Rekor Authors.
+//
+// Copyright 2021 The Sigstore Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -14,7 +14,6 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// */
 //
 
 package index
diff --git a/pkg/generated/restapi/operations/index/search_index_urlbuilder.go b/pkg/generated/restapi/operations/index/search_index_urlbuilder.go
index 419e8167f89ff1fa1e8bd86575b8c49cd8141ae9..22462c3eb06e37c602b05bff4886b8fc9dc4765d 100644
--- a/pkg/generated/restapi/operations/index/search_index_urlbuilder.go
+++ b/pkg/generated/restapi/operations/index/search_index_urlbuilder.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
-// /*
-// Copyright The Rekor Authors.
+//
+// Copyright 2021 The Sigstore Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -14,7 +14,6 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// */
 //
 
 package index
diff --git a/pkg/generated/restapi/operations/rekor_server_api.go b/pkg/generated/restapi/operations/rekor_server_api.go
index 1fa53366a81e58d232c698e976313f0aea5ffc49..b190e894ea6677b6bfd8ab736fd43cb2844e193d 100644
--- a/pkg/generated/restapi/operations/rekor_server_api.go
+++ b/pkg/generated/restapi/operations/rekor_server_api.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
-// /*
-// Copyright The Rekor Authors.
+//
+// Copyright 2021 The Sigstore Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -14,7 +14,6 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// */
 //
 
 package operations
diff --git a/pkg/generated/restapi/operations/tlog/get_log_info.go b/pkg/generated/restapi/operations/tlog/get_log_info.go
index 93a91645c5aa303fc906d8940f808e2dd89d5cbb..2c7ccbcab263b763ed413a355ccc224fd01e8edd 100644
--- a/pkg/generated/restapi/operations/tlog/get_log_info.go
+++ b/pkg/generated/restapi/operations/tlog/get_log_info.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
-// /*
-// Copyright The Rekor Authors.
+//
+// Copyright 2021 The Sigstore Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -14,7 +14,6 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// */
 //
 
 package tlog
diff --git a/pkg/generated/restapi/operations/tlog/get_log_info_parameters.go b/pkg/generated/restapi/operations/tlog/get_log_info_parameters.go
index 4897136c0ffbb5ed7389c3f0dc83aa6e07a38c1b..f6b7e151bf85baefbb9860e3457746a7a2f188ec 100644
--- a/pkg/generated/restapi/operations/tlog/get_log_info_parameters.go
+++ b/pkg/generated/restapi/operations/tlog/get_log_info_parameters.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
-// /*
-// Copyright The Rekor Authors.
+//
+// Copyright 2021 The Sigstore Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -14,7 +14,6 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// */
 //
 
 package tlog
diff --git a/pkg/generated/restapi/operations/tlog/get_log_info_responses.go b/pkg/generated/restapi/operations/tlog/get_log_info_responses.go
index f88529c02b39a81883f7804e575791370a9954af..94efef292dd15351abca4ec54f1230cb97ff7845 100644
--- a/pkg/generated/restapi/operations/tlog/get_log_info_responses.go
+++ b/pkg/generated/restapi/operations/tlog/get_log_info_responses.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
-// /*
-// Copyright The Rekor Authors.
+//
+// Copyright 2021 The Sigstore Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -14,7 +14,6 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// */
 //
 
 package tlog
diff --git a/pkg/generated/restapi/operations/tlog/get_log_info_urlbuilder.go b/pkg/generated/restapi/operations/tlog/get_log_info_urlbuilder.go
index 6111b05d3cd4dc04704b568584fcc645d02a21c3..e344fac34ae4413c90481e787fb4fc9585512099 100644
--- a/pkg/generated/restapi/operations/tlog/get_log_info_urlbuilder.go
+++ b/pkg/generated/restapi/operations/tlog/get_log_info_urlbuilder.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
-// /*
-// Copyright The Rekor Authors.
+//
+// Copyright 2021 The Sigstore Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -14,7 +14,6 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// */
 //
 
 package tlog
diff --git a/pkg/generated/restapi/operations/tlog/get_log_proof.go b/pkg/generated/restapi/operations/tlog/get_log_proof.go
index 3f305f7b45c2711b99c1f59051f40693783a9fc6..c05f21197c99cc7646a7dacd7b14fea0d37dae91 100644
--- a/pkg/generated/restapi/operations/tlog/get_log_proof.go
+++ b/pkg/generated/restapi/operations/tlog/get_log_proof.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
-// /*
-// Copyright The Rekor Authors.
+//
+// Copyright 2021 The Sigstore Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -14,7 +14,6 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// */
 //
 
 package tlog
diff --git a/pkg/generated/restapi/operations/tlog/get_log_proof_parameters.go b/pkg/generated/restapi/operations/tlog/get_log_proof_parameters.go
index de4ce164681988d63e249206bbf0b91a42ddd448..06a21d63f2aad30b03e50deb2d5738acd9c1f1f5 100644
--- a/pkg/generated/restapi/operations/tlog/get_log_proof_parameters.go
+++ b/pkg/generated/restapi/operations/tlog/get_log_proof_parameters.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
-// /*
-// Copyright The Rekor Authors.
+//
+// Copyright 2021 The Sigstore Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -14,7 +14,6 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// */
 //
 
 package tlog
diff --git a/pkg/generated/restapi/operations/tlog/get_log_proof_responses.go b/pkg/generated/restapi/operations/tlog/get_log_proof_responses.go
index a01f9f6aaa23ae637cbb9465ca2fa7da27f4f52f..7f842ad5caea05f26324636f0e9d57a4faf4beba 100644
--- a/pkg/generated/restapi/operations/tlog/get_log_proof_responses.go
+++ b/pkg/generated/restapi/operations/tlog/get_log_proof_responses.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
-// /*
-// Copyright The Rekor Authors.
+//
+// Copyright 2021 The Sigstore Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -14,7 +14,6 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// */
 //
 
 package tlog
diff --git a/pkg/generated/restapi/operations/tlog/get_log_proof_urlbuilder.go b/pkg/generated/restapi/operations/tlog/get_log_proof_urlbuilder.go
index 6087d45eea1d1765e3d15fefcb262fcfd92c5ce1..44ee1412fa744ee0500d7801fe3866c98577605b 100644
--- a/pkg/generated/restapi/operations/tlog/get_log_proof_urlbuilder.go
+++ b/pkg/generated/restapi/operations/tlog/get_log_proof_urlbuilder.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
-// /*
-// Copyright The Rekor Authors.
+//
+// Copyright 2021 The Sigstore Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -14,7 +14,6 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// */
 //
 
 package tlog
diff --git a/pkg/generated/restapi/operations/tlog/get_public_key.go b/pkg/generated/restapi/operations/tlog/get_public_key.go
index 5aaf8a2a005b58177c4252945920965ead391ee7..82a1fd2f5208d87522c7671ed2463b265e65be62 100644
--- a/pkg/generated/restapi/operations/tlog/get_public_key.go
+++ b/pkg/generated/restapi/operations/tlog/get_public_key.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
-// /*
-// Copyright The Rekor Authors.
+//
+// Copyright 2021 The Sigstore Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -14,7 +14,6 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// */
 //
 
 package tlog
diff --git a/pkg/generated/restapi/operations/tlog/get_public_key_parameters.go b/pkg/generated/restapi/operations/tlog/get_public_key_parameters.go
index 6901f93434df7fa7495704ce19803b227918ea9e..67ccd2317e9e9291b022b95e3ea8777043d67518 100644
--- a/pkg/generated/restapi/operations/tlog/get_public_key_parameters.go
+++ b/pkg/generated/restapi/operations/tlog/get_public_key_parameters.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
-// /*
-// Copyright The Rekor Authors.
+//
+// Copyright 2021 The Sigstore Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -14,7 +14,6 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// */
 //
 
 package tlog
diff --git a/pkg/generated/restapi/operations/tlog/get_public_key_responses.go b/pkg/generated/restapi/operations/tlog/get_public_key_responses.go
index 6f978ad95d7b6788f4222173ba6656257685ef93..a7f86b168506c7465e4a2872c4c83423491cef36 100644
--- a/pkg/generated/restapi/operations/tlog/get_public_key_responses.go
+++ b/pkg/generated/restapi/operations/tlog/get_public_key_responses.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
-// /*
-// Copyright The Rekor Authors.
+//
+// Copyright 2021 The Sigstore Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -14,7 +14,6 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// */
 //
 
 package tlog
diff --git a/pkg/generated/restapi/operations/tlog/get_public_key_urlbuilder.go b/pkg/generated/restapi/operations/tlog/get_public_key_urlbuilder.go
index cb9d62cec1119424005de754f36a66df3a7cebb8..fcc754de587029dc2f6c41a20e48d4aba3cdb57c 100644
--- a/pkg/generated/restapi/operations/tlog/get_public_key_urlbuilder.go
+++ b/pkg/generated/restapi/operations/tlog/get_public_key_urlbuilder.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
-// /*
-// Copyright The Rekor Authors.
+//
+// Copyright 2021 The Sigstore Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -14,7 +14,6 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// */
 //
 
 package tlog
diff --git a/pkg/generated/restapi/server.go b/pkg/generated/restapi/server.go
index 283a26692bf81e2412765cb56bb935387b6fe66d..fdd6d0472b470d11cd0cffc402d2b07db1b09759 100644
--- a/pkg/generated/restapi/server.go
+++ b/pkg/generated/restapi/server.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
-// /*
-// Copyright The Rekor Authors.
+//
+// Copyright 2021 The Sigstore Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -14,7 +14,6 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// */
 //
 
 package restapi
diff --git a/pkg/log/log.go b/pkg/log/log.go
index e2ec2440e704f7b04de6145435077eab3240e5bb..ed3c6841a4508f679c06dc02ebe558862acd3201 100644
--- a/pkg/log/log.go
+++ b/pkg/log/log.go
@@ -1,3 +1,18 @@
+//
+// Copyright 2021 The Sigstore Authors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
 package log
 
 import (
@@ -10,7 +25,7 @@ import (
 	"go.uber.org/zap/zapcore"
 )
 
-// Set the default logger to development mode
+// Logger set the default logger to development mode
 var Logger *zap.SugaredLogger
 
 func init() {
diff --git a/pkg/pki/minisign/minisign.go b/pkg/pki/minisign/minisign.go
index e7e1cf32efbdc0b7562615d34148f983c43ce040..0f5c71a9af5bff0aacc374f2d5fc3f0223712e0f 100644
--- a/pkg/pki/minisign/minisign.go
+++ b/pkg/pki/minisign/minisign.go
@@ -1,18 +1,17 @@
-/*
-Copyright © 2021 Bob Callaway <bcallawa@redhat.com>
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
+//
+// Copyright 2021 The Sigstore Authors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
 package minisign
 
@@ -45,7 +44,7 @@ func NewSignature(r io.Reader) (*Signature, error) {
 	inputString := inputBuffer.String()
 	signature, err := minisign.DecodeSignature(inputString)
 	if err != nil {
-		//try to parse as signify
+		// try to parse as signify
 		lines := strings.Split(strings.TrimRight(inputString, "\n"), "\n")
 		if len(lines) != 2 {
 			return nil, fmt.Errorf("invalid signature provided: %v lines detected", len(lines))
@@ -61,6 +60,7 @@ func NewSignature(r io.Reader) (*Signature, error) {
 		copy(signature.KeyId[:], sigBytes[2:10])
 		copy(signature.Signature[:], sigBytes[10:])
 	}
+
 	s.signature = &signature
 	return &s, nil
 }
@@ -128,12 +128,13 @@ func NewPublicKey(r io.Reader) (*PublicKey, error) {
 	inputString := inputBuffer.String()
 	key, err := minisign.DecodePublicKey(inputString)
 	if err != nil {
-		//try as a standalone base64 string
+		// try as a standalone base64 string
 		key, err = minisign.NewPublicKey(inputString)
 		if err != nil {
 			return nil, fmt.Errorf("unable to read minisign public key: %w", err)
 		}
 	}
+
 	k.key = &key
 	return &k, nil
 }
diff --git a/pkg/pki/minisign/minisign_test.go b/pkg/pki/minisign/minisign_test.go
index 300e5c110e7425276925d92d878beba8cd833b35..f7aecd94f7d20cbb6c094f4d547da386fd0d5274 100644
--- a/pkg/pki/minisign/minisign_test.go
+++ b/pkg/pki/minisign/minisign_test.go
@@ -1,18 +1,17 @@
-/*
-Copyright © 2021 Bob Callaway <bcallawa@redhat.com>
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
+//
+// Copyright 2021 The Sigstore Authors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
 package minisign
 
diff --git a/pkg/pki/pgp/pgp.go b/pkg/pki/pgp/pgp.go
index b28c168dc987398449ae9794a4b009b1d953c08b..e645f1ed77fe15e6a2eded993ee2173ce84f6c38 100644
--- a/pkg/pki/pgp/pgp.go
+++ b/pkg/pki/pgp/pgp.go
@@ -1,18 +1,17 @@
-/*
-Copyright © 2020 Bob Callaway <bcallawa@redhat.com>
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
+//
+// Copyright 2021 The Sigstore Authors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
 package pgp
 
@@ -25,10 +24,9 @@ import (
 	"io"
 	"net/http"
 
+	"golang.org/x/crypto/openpgp"
 	"golang.org/x/crypto/openpgp/armor"
 	"golang.org/x/crypto/openpgp/packet"
-
-	"golang.org/x/crypto/openpgp"
 )
 
 // Signature Signature that follows the PGP standard; supports both armored & binary detached signatures
diff --git a/pkg/pki/pgp/pgp_test.go b/pkg/pki/pgp/pgp_test.go
index 5ad0d2c1f410ff60d25519204426cd0b40af2ce9..b534ac2bedaac118dcfcaf8a7a562690d239d284 100644
--- a/pkg/pki/pgp/pgp_test.go
+++ b/pkg/pki/pgp/pgp_test.go
@@ -1,18 +1,17 @@
-/*
-Copyright © 2020 Bob Callaway <bcallawa@redhat.com>
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
+//
+// Copyright 2021 The Sigstore Authors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
 package pgp
 
diff --git a/pkg/pki/pki.go b/pkg/pki/pki.go
index 1b273f651e745b53e9d21e7e61f7bf669b5b3c3f..c53116daeb4ae6bd9abf7784650d82ceb5d3f891 100644
--- a/pkg/pki/pki.go
+++ b/pkg/pki/pki.go
@@ -1,18 +1,17 @@
-/*
-Copyright © 2020 Bob Callaway <bcallawa@redhat.com>
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
+//
+// Copyright 2021 The Sigstore Authors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
 package pki
 
@@ -22,10 +21,9 @@ import (
 	"strings"
 
 	"github.com/sigstore/rekor/pkg/pki/minisign"
+	"github.com/sigstore/rekor/pkg/pki/pgp"
 	"github.com/sigstore/rekor/pkg/pki/ssh"
 	"github.com/sigstore/rekor/pkg/pki/x509"
-
-	"github.com/sigstore/rekor/pkg/pki/pgp"
 )
 
 // PublicKey Generic object representing a public key (regardless of format & algorithm)
diff --git a/pkg/pki/pki_test.go b/pkg/pki/pki_test.go
index f3d7c36ec600fea9ebe326ac5798830aaae1d609..0454a3eb90923efa369b4ff690c21525c6c78a9b 100644
--- a/pkg/pki/pki_test.go
+++ b/pkg/pki/pki_test.go
@@ -1,18 +1,17 @@
-/*
-Copyright © 2020 Bob Callaway <bcallawa@redhat.com>
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
+//
+// Copyright 2021 The Sigstore Authors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
 package pki
 
diff --git a/pkg/pki/ssh/encode.go b/pkg/pki/ssh/encode.go
index 05ceac46f469577d0a7128ea069d01b39f029649..a048f0965f374a6f7c2d551f5a960971a2ce1765 100644
--- a/pkg/pki/ssh/encode.go
+++ b/pkg/pki/ssh/encode.go
@@ -1,3 +1,18 @@
+//
+// Copyright 2021 The Sigstore Authors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
 package ssh
 
 import (
@@ -21,7 +36,8 @@ func Armor(s *ssh.Signature, p ssh.PublicKey) []byte {
 		HashAlgorithm: defaultHashAlgorithm,
 		Signature:     string(ssh.Marshal(s)),
 	}
-	copy(sig.MagicHeader[:], []byte(magicHeader))
+
+	copy(sig.MagicHeader[:], magicHeader)
 
 	enc := pem.EncodeToMemory(&pem.Block{
 		Type:  pemType,
diff --git a/pkg/pki/ssh/sign.go b/pkg/pki/ssh/sign.go
index 20a461ff73ff9c1ad86bfd0fc61de09a8303ab66..3bf2be813a32472ac6df484c0ee3e52c0a2ea283 100644
--- a/pkg/pki/ssh/sign.go
+++ b/pkg/pki/ssh/sign.go
@@ -1,3 +1,18 @@
+//
+// Copyright 2021 The Sigstore Authors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
 package ssh
 
 import (
diff --git a/pkg/pki/ssh/sign_test.go b/pkg/pki/ssh/sign_test.go
index cb0fb8f635836387a4f433ad6026d0d8cc87fbfa..eb7027a80e464974b5cbc8f5b7e031a1b358da65 100644
--- a/pkg/pki/ssh/sign_test.go
+++ b/pkg/pki/ssh/sign_test.go
@@ -1,3 +1,18 @@
+//
+// Copyright 2021 The Sigstore Authors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
 package ssh
 
 import (
@@ -53,7 +68,7 @@ gAATvvPoylyYUAAAAOdGVzdEByZWtvci5kZXYBAgMEBQ==
 	sshPublicKey = `ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDXofkiahE7uavjWvxnwkUF27qMgz7pdTwzSv0XzVG6EtirOv3PDWct4YKoXE9c0EqbxnIfYEKwEextdvB7zkgwczdJSHxf/18jQumLn/FuoCmugVSk1H5Qli/qzwBpaTnOk3WuakGuoYUl8ZAokKKgOKLA0aZJ1WRQ2ZCZggA3EkwNZiY17y9Q6HqdgQcH6XN8aAMADNVJdMAJb33hSRJjjsAPTmzBTishP8lYDoGRSsSE7/8XRBCEV5E4I8mI9GElcZwV/1KJx98mpH8QvMzXM1idFcwPRtt1NTAOshwgUU0Fu1x8lU5RQIa6ZKW36qNQLvLxy/BscC7B/mdLptoDs/ot9NimUXZcgCR1a2Q3o7Wi6jIgcgJcyV10Nba81ol4RdN4qPHnVZIzuo+dBkqwG3CMtB4Rj84+Qi+7zyU01hIPreoxQDXaayiGPBUUIiAlW9gsiuRWJzNnu3cvuWDLVfQIkjh7Wug58z+v2NOJ7IMdyERillhzDcvVHaq14+U= test@rekor.dev
 `
 	// Generated with "ssh-keygen -C other-test@rekor.dev -f id_rsa"
-	otherSshPrivateKey = `-----BEGIN OPENSSH PRIVATE KEY-----
+	otherSSHPrivateKey = `-----BEGIN OPENSSH PRIVATE KEY-----
 b3BlbnNzaC1rZXktdjEAAAAABG5vbmUAAAAEbm9uZQAAAAAAAAABAAABlwAAAAdzc2gtcn
 NhAAAAAwEAAQAAAYEAw/WCSWC9TEvCQOwO+T68EvNa3OSIv1Y0+sT8uSvyjPyEO0+p0t8C
 g/zy67vOxiQpU5jN6MItjXAjMmeCm8GKMt6gk+cDoaAev/ZfjuzSL7RayExpmhBleh2X3G
@@ -92,7 +107,7 @@ VxSZNdKrYfM/v9o6sRaDRqSfH1dG8BvkUxPznTAF+JDxBENcKXYECcq9f6dcl1w5IEnNTD
 Wry/EKQvgvOUjbAAAAFG90aGVyLXRlc3RAcmVrb3IuZGV2AQIDBAUG
 -----END OPENSSH PRIVATE KEY-----
 `
-	otherSshPublicKey = `ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDD9YJJYL1MS8JA7A75PrwS81rc5Ii/VjT6xPy5K/KM/IQ7T6nS3wKD/PLru87GJClTmM3owi2NcCMyZ4KbwYoy3qCT5wOhoB6/9l+O7NIvtFrITGmaEGV6HZfcYouSRcX0AEU1yGVOpIs5mISMOg2lsW/XopPWwToKpbwOPFdCRCT0krrmEsf4HF5Yw0IQlVoKZrhfThomYLvMkCLnIZ55PRIpWoyiFq8X3Q7peJgUJAe7Bc8/Id+hyqC52ZeejPP7oPprEkpkzBCw2ndYq6Y6OXNafEEIIHWXaM3pFqDxonbbvuIwVdHCNMv/yNoSxbgqTKwN/QaNXb+KpuvSrlvRqsNhu/sKsYFH64fTAbP9miDXHmJkA05uFlQukOstUmJ0QxzbsdcFvs8yw0PLsEZhEHXJzR3TLzenyZSq86VZICvGfVacBk7TikCBOtyWuESHhlc6SfZKfzZ67cOlDyKeSiVjgh+eEh9s4h56ahQ2rW05Sq6GjD0YtEzog2J4csE= other-test@rekor.dev
+	otherSSHPublicKey = `ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDD9YJJYL1MS8JA7A75PrwS81rc5Ii/VjT6xPy5K/KM/IQ7T6nS3wKD/PLru87GJClTmM3owi2NcCMyZ4KbwYoy3qCT5wOhoB6/9l+O7NIvtFrITGmaEGV6HZfcYouSRcX0AEU1yGVOpIs5mISMOg2lsW/XopPWwToKpbwOPFdCRCT0krrmEsf4HF5Yw0IQlVoKZrhfThomYLvMkCLnIZ55PRIpWoyiFq8X3Q7peJgUJAe7Bc8/Id+hyqC52ZeejPP7oPprEkpkzBCw2ndYq6Y6OXNafEEIIHWXaM3pFqDxonbbvuIwVdHCNMv/yNoSxbgqTKwN/QaNXb+KpuvSrlvRqsNhu/sKsYFH64fTAbP9miDXHmJkA05uFlQukOstUmJ0QxzbsdcFvs8yw0PLsEZhEHXJzR3TLzenyZSq86VZICvGfVacBk7TikCBOtyWuESHhlc6SfZKfzZ67cOlDyKeSiVjgh+eEh9s4h56ahQ2rW05Sq6GjD0YtEzog2J4csE= other-test@rekor.dev
 `
 
 	// Generated with ssh-keygen -C test@rekor.dev -t ed25519 -f id_ed25519
@@ -149,7 +164,7 @@ func TestFromOpenSSH(t *testing.T) {
 			}
 
 			// It should not verify if we check against another public key
-			if err := Verify(bytes.NewReader(data), sigBytes, []byte(otherSshPublicKey)); err == nil {
+			if err := Verify(bytes.NewReader(data), sigBytes, []byte(otherSSHPublicKey)); err == nil {
 				t.Error("expected error with incorrect key")
 			}
 
@@ -195,7 +210,7 @@ func TestToOpenSSH(t *testing.T) {
 
 			// Create an allowed_signers file with two keys to check against.
 			allowedSigner := "test@rekor.dev " + tt.pub + "\n"
-			allowedSigner += "othertest@rekor.dev " + otherSshPublicKey + "\n"
+			allowedSigner += "othertest@rekor.dev " + otherSSHPublicKey + "\n"
 			allowedSigners := write(t, []byte(allowedSigner), td, "allowed_signer")
 
 			// We use the correct principal here so it should work.
@@ -217,7 +232,7 @@ func TestRoundTrip(t *testing.T) {
 	data := []byte("my good data to be signed!")
 
 	// Create one extra signature for all the tests.
-	otherSig, err := Sign(otherSshPrivateKey, bytes.NewReader(data))
+	otherSig, err := Sign(otherSSHPrivateKey, bytes.NewReader(data))
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -256,7 +271,7 @@ func TestRoundTrip(t *testing.T) {
 			}
 
 			// Now check it against the wrong key.
-			if err := Verify(bytes.NewReader(data), sig, []byte(otherSshPublicKey)); err == nil {
+			if err := Verify(bytes.NewReader(data), sig, []byte(otherSSHPublicKey)); err == nil {
 				t.Error("expected error!")
 			}
 
@@ -270,7 +285,7 @@ func TestRoundTrip(t *testing.T) {
 				t.Error("expected error!")
 			}
 			// It should work against the correct public key.
-			if err := Verify(bytes.NewReader(data), otherSig, []byte(otherSshPublicKey)); err != nil {
+			if err := Verify(bytes.NewReader(data), otherSig, []byte(otherSSHPublicKey)); err != nil {
 				t.Error(err)
 			}
 		})
diff --git a/pkg/pki/ssh/ssh.go b/pkg/pki/ssh/ssh.go
index 26111014c6a8e0c956b1ae1942ce4d8447dc12c6..05a4fb14763580f3dd91842ac3448533eebdea53 100644
--- a/pkg/pki/ssh/ssh.go
+++ b/pkg/pki/ssh/ssh.go
@@ -1,18 +1,17 @@
-/*
-Copyright © 2021 Dan Lorenc <lorenc.d@gmail.com>
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
+//
+// Copyright 2021 The Sigstore Authors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
 package ssh
 
diff --git a/pkg/pki/ssh/verify.go b/pkg/pki/ssh/verify.go
index 5e8e48d6dea6e234a06e261ad768983c109299f5..3bbc0efdd650306eefc93ee956931ae781afdae8 100644
--- a/pkg/pki/ssh/verify.go
+++ b/pkg/pki/ssh/verify.go
@@ -1,3 +1,18 @@
+//
+// Copyright 2021 The Sigstore Authors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
 package ssh
 
 import (
diff --git a/pkg/pki/x509/x509.go b/pkg/pki/x509/x509.go
index 9208c533561f7f98c9c4ab905c5ec7d3159ee77d..bf0db8ca8dd7de3af6095aa609af7214cb043ede 100644
--- a/pkg/pki/x509/x509.go
+++ b/pkg/pki/x509/x509.go
@@ -1,18 +1,17 @@
-/*
-Copyright © 2021 Dan Lorenc <lorenc.d@gmail.com>
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
+//
+// Copyright 2021 The Sigstore Authors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
 package x509
 
diff --git a/pkg/pki/x509/x509_test.go b/pkg/pki/x509/x509_test.go
index e3d9a353c8ab2362db7cc6c5a0e66ceb67463222..19bf50da5eadded68252451725be3083f2142d95 100644
--- a/pkg/pki/x509/x509_test.go
+++ b/pkg/pki/x509/x509_test.go
@@ -1,18 +1,17 @@
-/*
-Copyright © 2021 Dan Lorenc <lorenc.d@gmail.com>
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
+//
+// Copyright 2021 The Sigstore Authors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
 package x509
 
@@ -190,7 +189,7 @@ func TestSignature_VerifyFail(t *testing.T) {
 			// Make some fake data, and tamper with the signature
 			data := []byte("hey! this is my test data")
 			sigBytes := signData(t, data, tt.priv)
-			sigBytes[0] = sigBytes[0] - 1
+			sigBytes[0]--
 			s, err := NewSignature(bytes.NewReader(sigBytes))
 			if err != nil {
 				t.Fatal(err)
diff --git a/pkg/types/README.md b/pkg/types/README.md
index 75dcc66ec3f85fe4714438917035b9047a44ff47..0824065114a2232172675caf27be40c75407eada 100644
--- a/pkg/types/README.md
+++ b/pkg/types/README.md
@@ -2,12 +2,12 @@
 
 ## Description
 
-Rekor supports pluggable types (aka different schemas) for entries stored in the transparency log. 
+Rekor supports pluggable types (aka different schemas) for entries stored in the transparency log.
 
 ### Currently supported types
 
 - Rekord (default type) [schema](rekord/rekord_schema.json)
-  - Versions: 0.0.1 
+  - Versions: 0.0.1
 
 
 ## Base Schema
diff --git a/pkg/types/rekord/rekord.go b/pkg/types/rekord/rekord.go
index 861e2f5814be4067d767df2e1493ea2f8e53e72f..5baeffc6c4c8366c8ac52664f59ff6ae52a3ae7b 100644
--- a/pkg/types/rekord/rekord.go
+++ b/pkg/types/rekord/rekord.go
@@ -1,29 +1,29 @@
-/*
-Copyright © 2020 Bob Callaway <bcallawa@redhat.com>
+//
+// Copyright 2021 The Sigstore Authors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
 package rekord
 
 import (
 	"errors"
 	"fmt"
 
-	"github.com/sigstore/rekor/pkg/types"
-	"github.com/sigstore/rekor/pkg/util"
-
 	"github.com/go-openapi/swag"
+
 	"github.com/sigstore/rekor/pkg/generated/models"
+	"github.com/sigstore/rekor/pkg/types"
+	"github.com/sigstore/rekor/pkg/util"
 )
 
 const (
diff --git a/pkg/types/rekord/rekord_test.go b/pkg/types/rekord/rekord_test.go
index 00ca497858d9796cfed5ba93399bbcc3ea3bd730..777dbf612b1098e01c4e95b92864c6d1b4af0d5a 100644
--- a/pkg/types/rekord/rekord_test.go
+++ b/pkg/types/rekord/rekord_test.go
@@ -1,18 +1,17 @@
-/*
-Copyright © 2020 Bob Callaway <bcallawa@redhat.com>
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
+//
+// Copyright 2021 The Sigstore Authors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
 package rekord
 
@@ -22,6 +21,7 @@ import (
 	"testing"
 
 	"github.com/go-openapi/swag"
+
 	"github.com/sigstore/rekor/pkg/generated/models"
 	"github.com/sigstore/rekor/pkg/types"
 )
diff --git a/pkg/types/rekord/v0.0.1/entry.go b/pkg/types/rekord/v0.0.1/entry.go
index 277a331f0aebf11232a420f4d1ff6dff6ac75fee..5c23f8a14d569d3c951f6d25d17cec878b6e63c1 100644
--- a/pkg/types/rekord/v0.0.1/entry.go
+++ b/pkg/types/rekord/v0.0.1/entry.go
@@ -1,18 +1,18 @@
-/*
-Copyright © 2020 Bob Callaway <bcallawa@redhat.com>
+//
+// Copyright 2021 The Sigstore Authors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
 package rekord
 
 import (
@@ -27,21 +27,18 @@ import (
 	"reflect"
 	"strings"
 
-	"github.com/sigstore/rekor/pkg/log"
-	"github.com/sigstore/rekor/pkg/types"
-	"github.com/sigstore/rekor/pkg/util"
-
 	"github.com/asaskevich/govalidator"
-
 	"github.com/go-openapi/strfmt"
-
-	"github.com/sigstore/rekor/pkg/pki"
-	"github.com/sigstore/rekor/pkg/types/rekord"
-
 	"github.com/go-openapi/swag"
 	"github.com/mitchellh/mapstructure"
-	"github.com/sigstore/rekor/pkg/generated/models"
 	"golang.org/x/sync/errgroup"
+
+	"github.com/sigstore/rekor/pkg/generated/models"
+	"github.com/sigstore/rekor/pkg/log"
+	"github.com/sigstore/rekor/pkg/pki"
+	"github.com/sigstore/rekor/pkg/types"
+	"github.com/sigstore/rekor/pkg/types/rekord"
+	"github.com/sigstore/rekor/pkg/util"
 )
 
 const (
@@ -370,7 +367,7 @@ func (v *V001Entry) Canonicalize(ctx context.Context) ([]byte, error) {
 	return bytes, nil
 }
 
-//Validate performs cross-field validation for fields in object
+// Validate performs cross-field validation for fields in object
 func (v V001Entry) Validate() error {
 
 	sig := v.RekordObj.Signature
diff --git a/pkg/types/rekord/v0.0.1/entry_test.go b/pkg/types/rekord/v0.0.1/entry_test.go
index 2c669a97db6b6ebd259b03857ad74c71fbad533f..b9eaa1f4f38e99828b487b3fad31e26d8b3e899e 100644
--- a/pkg/types/rekord/v0.0.1/entry_test.go
+++ b/pkg/types/rekord/v0.0.1/entry_test.go
@@ -1,18 +1,17 @@
-/*
-Copyright © 2020 Bob Callaway <bcallawa@redhat.com>
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
+//
+// Copyright 2021 The Sigstore Authors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
 package rekord
 
@@ -29,8 +28,9 @@ import (
 
 	"github.com/go-openapi/strfmt"
 	"github.com/go-openapi/swag"
-	"github.com/sigstore/rekor/pkg/generated/models"
 	"go.uber.org/goleak"
+
+	"github.com/sigstore/rekor/pkg/generated/models"
 )
 
 func TestMain(m *testing.M) {
diff --git a/pkg/types/rpm/rpm.go b/pkg/types/rpm/rpm.go
index 570bc4d2b70a23f90e8e23f3359ac28a8ef0476f..e6a729a004391800c3399aabf38cbc19c7ec10b1 100644
--- a/pkg/types/rpm/rpm.go
+++ b/pkg/types/rpm/rpm.go
@@ -1,29 +1,29 @@
-/*
-Copyright © 2021 Bob Callaway <bcallawa@redhat.com>
+//
+// Copyright 2021 The Sigstore Authors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
 package rpm
 
 import (
 	"errors"
 	"fmt"
 
-	"github.com/sigstore/rekor/pkg/types"
-	"github.com/sigstore/rekor/pkg/util"
-
 	"github.com/go-openapi/swag"
+
 	"github.com/sigstore/rekor/pkg/generated/models"
+	"github.com/sigstore/rekor/pkg/types"
+	"github.com/sigstore/rekor/pkg/util"
 )
 
 const (
diff --git a/pkg/types/rpm/rpm_test.go b/pkg/types/rpm/rpm_test.go
index 78bc425dbe6dba68fa14300312af4f3d63b061f5..d553c7db8c36c8fba0f3eea8d7712f8cf384b046 100644
--- a/pkg/types/rpm/rpm_test.go
+++ b/pkg/types/rpm/rpm_test.go
@@ -1,18 +1,17 @@
-/*
-Copyright © 2021 Bob Callaway <bcallawa@redhat.com>
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
+//
+// Copyright 2021 The Sigstore Authors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
 package rpm
 
@@ -22,6 +21,7 @@ import (
 	"testing"
 
 	"github.com/go-openapi/swag"
+
 	"github.com/sigstore/rekor/pkg/generated/models"
 	"github.com/sigstore/rekor/pkg/types"
 )
diff --git a/pkg/types/rpm/v0.0.1/entry.go b/pkg/types/rpm/v0.0.1/entry.go
index 62024dc225188fcd649f9761f5b4f3a0f2f40bbf..f2cc03de43ffd16823cd6389a45bcff94a93e1d3 100644
--- a/pkg/types/rpm/v0.0.1/entry.go
+++ b/pkg/types/rpm/v0.0.1/entry.go
@@ -1,18 +1,18 @@
-/*
-Copyright © 2021 Bob Callaway <bcallawa@redhat.com>
+//
+// Copyright 2021 The Sigstore Authors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
 package rpm
 
 import (
@@ -29,23 +29,20 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/sigstore/rekor/pkg/log"
-	"github.com/sigstore/rekor/pkg/pki/pgp"
-	"github.com/sigstore/rekor/pkg/types"
-	"github.com/sigstore/rekor/pkg/types/rpm"
-	"github.com/sigstore/rekor/pkg/util"
-
 	"github.com/asaskevich/govalidator"
-
-	"github.com/go-openapi/strfmt"
-
-	"github.com/sigstore/rekor/pkg/pki"
-
 	rpmutils "github.com/cavaliercoder/go-rpm"
+	"github.com/go-openapi/strfmt"
 	"github.com/go-openapi/swag"
 	"github.com/mitchellh/mapstructure"
-	"github.com/sigstore/rekor/pkg/generated/models"
 	"golang.org/x/sync/errgroup"
+
+	"github.com/sigstore/rekor/pkg/generated/models"
+	"github.com/sigstore/rekor/pkg/log"
+	"github.com/sigstore/rekor/pkg/pki"
+	"github.com/sigstore/rekor/pkg/pki/pgp"
+	"github.com/sigstore/rekor/pkg/types"
+	"github.com/sigstore/rekor/pkg/types/rpm"
+	"github.com/sigstore/rekor/pkg/util"
 )
 
 const (
@@ -271,7 +268,7 @@ func (v *V001Entry) FetchExternalEntities(ctx context.Context) error {
 		if err != nil {
 			return closePipesOnError(err)
 		}
-		//ReadPackageFile does not drain the entire reader so we need to discard the rest
+		// ReadPackageFile does not drain the entire reader so we need to discard the rest
 		if _, err = io.Copy(ioutil.Discard, rpmR); err != nil {
 			return closePipesOnError(err)
 		}
@@ -359,7 +356,7 @@ func (v *V001Entry) Canonicalize(ctx context.Context) ([]byte, error) {
 	return bytes, nil
 }
 
-//Validate performs cross-field validation for fields in object
+// Validate performs cross-field validation for fields in object
 func (v V001Entry) Validate() error {
 	key := v.RPMModel.PublicKey
 	if key == nil {
diff --git a/pkg/types/rpm/v0.0.1/entry_test.go b/pkg/types/rpm/v0.0.1/entry_test.go
index ac2a40562c3271bd249784fd8d837450c130f360..865e677a1bfc469060aa8b0c3a9b710c21991f06 100644
--- a/pkg/types/rpm/v0.0.1/entry_test.go
+++ b/pkg/types/rpm/v0.0.1/entry_test.go
@@ -1,18 +1,17 @@
-/*
-Copyright © 2021 Bob Callaway <bcallawa@redhat.com>
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
+//
+// Copyright 2021 The Sigstore Authors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
 package rpm
 
@@ -29,8 +28,9 @@ import (
 
 	"github.com/go-openapi/strfmt"
 	"github.com/go-openapi/swag"
-	"github.com/sigstore/rekor/pkg/generated/models"
 	"go.uber.org/goleak"
+
+	"github.com/sigstore/rekor/pkg/generated/models"
 )
 
 func TestMain(m *testing.M) {
diff --git a/pkg/types/types.go b/pkg/types/types.go
index 589fad99fd5faa139c416a8ce4d32ba0d9153e26..206c817921bf2454bd15097569f77ba2a0e007b9 100644
--- a/pkg/types/types.go
+++ b/pkg/types/types.go
@@ -1,18 +1,17 @@
-/*
-Copyright © 2020 Bob Callaway <bcallawa@redhat.com>
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
+//
+// Copyright 2021 The Sigstore Authors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
 package types
 
diff --git a/pkg/types/types_test.go b/pkg/types/types_test.go
index a59c0eca2b09324e28eb36fc6ca6e8517c057d01..5a7299e698c1bce491dec2211da305a5ac0e8289 100644
--- a/pkg/types/types_test.go
+++ b/pkg/types/types_test.go
@@ -1,18 +1,17 @@
-/*
-Copyright © 2020 Bob Callaway <bcallawa@redhat.com>
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
+//
+// Copyright 2021 The Sigstore Authors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
 package types
 
@@ -22,8 +21,9 @@ import (
 	"testing"
 
 	"github.com/go-openapi/strfmt"
-	"github.com/sigstore/rekor/pkg/generated/models"
 	"go.uber.org/goleak"
+
+	"github.com/sigstore/rekor/pkg/generated/models"
 )
 
 func TestMain(m *testing.M) {
diff --git a/pkg/util/fetch.go b/pkg/util/fetch.go
index b1862a69269e6a75797f445c4ecc40f678b3ac4f..e9c95bb196d2de3d34dbf5ba5dc52c8acc7b7950 100644
--- a/pkg/util/fetch.go
+++ b/pkg/util/fetch.go
@@ -1,18 +1,18 @@
-/*
-Copyright © 2021 Bob Callaway <bcallawa@redhat.com>
+//
+// Copyright 2021 The Sigstore Authors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
 package util
 
 import (
diff --git a/pkg/util/types.go b/pkg/util/types.go
index cf61162f5e14709433213fb926dc05d0400bfbde..7ff76af072f3a80f5ec55e53c830bb8a57b03631 100644
--- a/pkg/util/types.go
+++ b/pkg/util/types.go
@@ -1,24 +1,25 @@
-/*
-Copyright © 2021 Bob Callaway <bcallawa@redhat.com>
+//
+// Copyright 2021 The Sigstore Authors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
 package util
 
 import (
 	"sync"
 
 	"github.com/blang/semver"
+
 	"github.com/sigstore/rekor/pkg/log"
 	"github.com/sigstore/rekor/pkg/types"
 )
@@ -41,7 +42,7 @@ func (vfm *VersionFactoryMap) Get(version string) (VersionFactory, bool) {
 		return nil, false
 	}
 
-	//will return first function that matches
+	// will return first function that matches
 	for k, v := range vfm.VersionFactories {
 		semverRange, err := semver.ParseRange(k)
 		if err != nil {
diff --git a/pkg/util/yaml.go b/pkg/util/yaml.go
index 13961226025cb60c45cfd5777eeda2c895268642..c3df27ab9fafb33489b868c550829ca19adb110e 100644
--- a/pkg/util/yaml.go
+++ b/pkg/util/yaml.go
@@ -1,18 +1,17 @@
-/*
-Copyright © 2020 Bob Callaway <bcallawa@redhat.com>
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
+//
+// Copyright 2021 The Sigstore Authors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
 package util
 
@@ -22,7 +21,6 @@ import (
 	"io/ioutil"
 
 	"github.com/ghodss/yaml"
-
 	"github.com/go-openapi/runtime"
 )
 
diff --git a/rekor-server.yaml b/rekor-server.yaml
index 43589739bf52bb150d2319424b8b930c5bacf3ee..6c2bb3e90863ef12196acf1b00c630ff7db03fc2 100644
--- a/rekor-server.yaml
+++ b/rekor-server.yaml
@@ -1,3 +1,18 @@
+#
+# Copyright 2021 The Sigstore Authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 trillian_log_server:
   address: "127.0.0.1"
   port: 8091
@@ -5,4 +20,3 @@ trillian_log_server:
 rekor_server:
   address: "127.0.0.1"
   port: 3000
- 
diff --git a/scripts/createdb.sh b/scripts/createdb.sh
index d69bd788ee35032fca3c343d7ac40e07b65df60c..487a9c80631fc2289704c94acb8977816fb7e996 100755
--- a/scripts/createdb.sh
+++ b/scripts/createdb.sh
@@ -1,4 +1,19 @@
 #!/bin/bash
+#
+# Copyright 2021 The Sigstore Authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 
 DB="test"
 USER="test"
diff --git a/scripts/storage.sql b/scripts/storage.sql
index ca454173495ab23ca91cfc9f923546163a4d049b..eb77b6ff4e4bb68283d5489d859e618ff277d46a 100644
--- a/scripts/storage.sql
+++ b/scripts/storage.sql
@@ -1,3 +1,18 @@
+--
+-- Copyright 2021 The Sigstore Authors.
+--
+-- Licensed under the Apache License, Version 2.0 (the "License");
+-- you may not use this file except in compliance with the License.
+-- You may obtain a copy of the License at
+--
+--     http://www.apache.org/licenses/LICENSE-2.0
+--
+-- Unless required by applicable law or agreed to in writing, software
+-- distributed under the License is distributed on an "AS IS" BASIS,
+-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-- See the License for the specific language governing permissions and
+-- limitations under the License.
+
 # MySQL / MariaDB version of the tree schema
 
 -- ---------------------------------------------
diff --git a/tests/e2e-test.sh b/tests/e2e-test.sh
index ec53f6bcba71940661f4b1a2cf18122570852df6..2e8938a35c48c04fd7312789f909e05d0f73fb03 100755
--- a/tests/e2e-test.sh
+++ b/tests/e2e-test.sh
@@ -1,4 +1,19 @@
 #!/bin/bash
+#
+# Copyright 2021 The Sigstore Authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 set -e
 testdir=$(dirname "$0")
 
diff --git a/tests/e2e_test.go b/tests/e2e_test.go
index e15ccfd34c4ae07352cd68ffcc1603ae701fd80a..ee2c5f96659cfc68da7708ceeaaefa1f27b895c6 100644
--- a/tests/e2e_test.go
+++ b/tests/e2e_test.go
@@ -1,3 +1,18 @@
+//
+// Copyright 2021 The Sigstore Authors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
 // +build e2e
 
 package e2e
diff --git a/tests/pgp.go b/tests/pgp.go
index d40a3505c4dcfb898731fd702e1a1cf03d02db03..c05a76377d183c1958bf1bfe6d76e9d49caf225c 100644
--- a/tests/pgp.go
+++ b/tests/pgp.go
@@ -1,3 +1,18 @@
+//
+// Copyright 2021 The Sigstore Authors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
 // +build e2e
 
 package e2e
diff --git a/tests/rpm.go b/tests/rpm.go
index 40217bb779fa8bd1bfba4eaf4e852bcf8298fd1b..5df862a31a37b57404d38f351dedf1b987aab04d 100644
--- a/tests/rpm.go
+++ b/tests/rpm.go
@@ -1,20 +1,20 @@
 // +build e2e
 
-/*
-Copyright © 2021 Bob Callaway <bcallawa@redhat.com>
+//
+// Copyright 2021 The Sigstore Authors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
 package e2e
 
 import (
diff --git a/tests/ssh.go b/tests/ssh.go
index 110a4ae031bd49e286b29d622998307430e39868..9502301b1aa5a719dd8af08982614cf3b876d640 100644
--- a/tests/ssh.go
+++ b/tests/ssh.go
@@ -1,3 +1,18 @@
+//
+// Copyright 2021 The Sigstore Authors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
 // +build e2e
 
 package e2e
diff --git a/tests/util.go b/tests/util.go
index 6c5c049aae787e2ec52d7ebec83e2c2c6e5085f2..09697b85cbeff783b43dbcc7c227548ddee56105 100644
--- a/tests/util.go
+++ b/tests/util.go
@@ -1,3 +1,18 @@
+//
+// Copyright 2021 The Sigstore Authors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
 // +build e2e
 
 package e2e
diff --git a/tests/x509.go b/tests/x509.go
index 6321b60696f01eb202760f0d038046ed0ad255de..6b2aa979da1945cb10adf9a04e336d315d7a151b 100644
--- a/tests/x509.go
+++ b/tests/x509.go
@@ -1,3 +1,18 @@
+//
+// Copyright 2021 The Sigstore Authors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
 // +build e2e
 
 package e2e