diff --git a/cmd/vcert/main.go b/cmd/vcert/main.go
index 86333ba3..57f23fff 100644
--- a/cmd/vcert/main.go
+++ b/cmd/vcert/main.go
@@ -35,6 +35,10 @@ var (
 	exit   = os.Exit
 )
 
+func init() {
+	log.SetPrefix(UtilityShortName + ": ")
+}
+
 // UtilityName is the full name of the command-line utility
 const UtilityName string = "Venafi Certificate Utility"
 
diff --git a/pkg/endpoint/endpoint.go b/pkg/endpoint/endpoint.go
index 4a8d525d..d5ae664a 100644
--- a/pkg/endpoint/endpoint.go
+++ b/pkg/endpoint/endpoint.go
@@ -24,7 +24,6 @@ import (
 	"encoding/pem"
 	"errors"
 	"fmt"
-	"log"
 	"net"
 	"net/http"
 	"regexp"
@@ -55,7 +54,6 @@ const (
 )
 
 func init() {
-	log.SetPrefix("vCert: ")
 	LocalIP = getPrimaryNetAddr()
 }