diff --git a/trustmanager/x509store_test.go b/trustmanager/x509store_test.go
index c958c213cb..ba2f65b492 100644
--- a/trustmanager/x509store_test.go
+++ b/trustmanager/x509store_test.go
@@ -133,6 +133,6 @@ func TestVerifyLeafWithNoLeaf(t *testing.T) {
 	// Try to find a valid chain for cert
 	err = Verify(store, "secure.example.com", certList)
 	if err == nil {
-		t.Fatalf("expected error due to no leafs provided")
+		t.Fatalf("expected error due to no leaves provided")
 	}
 }
diff --git a/trustmanager/x509utils.go b/trustmanager/x509utils.go
index b9db737cef..8a154ab82c 100644
--- a/trustmanager/x509utils.go
+++ b/trustmanager/x509utils.go
@@ -541,8 +541,8 @@ func CertsToKeys(leafCerts []*x509.Certificate, intCerts map[string][]*x509.Cert
 		if err != nil {
 			continue
 		}
-		if intCertsForLeafs, ok := intCerts[certID]; ok {
-			certBundle = append(certBundle, intCertsForLeafs...)
+		if intCertsForLeaves, ok := intCerts[certID]; ok {
+			certBundle = append(certBundle, intCertsForLeaves...)
 		}
 		certChainPEM, err := CertChainToPEM(certBundle)
 		if err != nil {
diff --git a/trustmanager/yubikey/yubikeystore.go b/trustmanager/yubikey/yubikeystore.go
index 3bb594b7d2..1b01995806 100644
--- a/trustmanager/yubikey/yubikeystore.go
+++ b/trustmanager/yubikey/yubikeystore.go
@@ -137,7 +137,7 @@ type YubiPrivateKey struct {
 	libLoader     pkcs11LibLoader
 }
 
-// YubiKeySigner wraps a YubiPrivateKey and implements the crypto.Signer interface
+// yubikeySigner wraps a YubiPrivateKey and implements the crypto.Signer interface
 type yubikeySigner struct {
 	YubiPrivateKey
 }
@@ -344,7 +344,7 @@ func getECDSAKey(ctx IPKCS11Ctx, session pkcs11.SessionHandle, pkcs11KeyID []byt
 	return data.NewECDSAPublicKey(pubBytes), data.CanonicalRootRole, nil
 }
 
-// Sign returns a signature for a given signature request
+// sign returns a signature for a given signature request
 func sign(ctx IPKCS11Ctx, session pkcs11.SessionHandle, pkcs11KeyID []byte, passRetriever passphrase.Retriever, payload []byte) ([]byte, error) {
 	err := login(ctx, session, passRetriever, pkcs11.CKU_USER, UserPin)
 	if err != nil {