diff --git a/pkg/apis/certmanager/validation/util/BUILD.bazel b/pkg/apis/certmanager/validation/util/BUILD.bazel
index 5215549c1..1fa02fb97 100644
--- a/pkg/apis/certmanager/validation/util/BUILD.bazel
+++ b/pkg/apis/certmanager/validation/util/BUILD.bazel
@@ -2,7 +2,7 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library")
 
 go_library(
     name = "go_default_library",
-    srcs = ["nameserver.go.go"],
+    srcs = ["nameserver.go"],
     importpath = "github.com/jetstack/cert-manager/pkg/apis/certmanager/validation/util",
     visibility = ["//visibility:public"],
 )
diff --git a/pkg/apis/certmanager/validation/util/nameserver.go.go b/pkg/apis/certmanager/validation/util/nameserver.go
similarity index 69%
rename from pkg/apis/certmanager/validation/util/nameserver.go.go
rename to pkg/apis/certmanager/validation/util/nameserver.go
index e05b02d29..0954f4213 100644
--- a/pkg/apis/certmanager/validation/util/nameserver.go.go
+++ b/pkg/apis/certmanager/validation/util/nameserver.go
@@ -1,3 +1,19 @@
+/*
+Copyright 2019 The Jetstack cert-manager contributors.
+
+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/controller/certificaterequests/ca/ca.go b/pkg/controller/certificaterequests/ca/ca.go
index 8ef9aab4b..a7e904add 100644
--- a/pkg/controller/certificaterequests/ca/ca.go
+++ b/pkg/controller/certificaterequests/ca/ca.go
@@ -137,6 +137,6 @@ func (c *CA) Sign(ctx context.Context, cr *v1alpha1.CertificateRequest) (*issuer
 
 	return &issuerpkg.IssueResponse{
 		Certificate: certPEM,
-		CA: caPEM,
+		CA:          caPEM,
 	}, nil
 }