diff --git a/goKMS/kms/kms.go b/goKMS/kms/kms.go
index 8f8616dfccab4eaa0827bd1390aa714db77cad1d..5473bd362d95194f0e8f7280c660b1bdfe1f35d7 100644
--- a/goKMS/kms/kms.go
+++ b/goKMS/kms/kms.go
@@ -127,7 +127,7 @@ func NewKMS(kmsUUID uuid.UUID, logOutput io.Writer, logLevel log.Level, logInJso
 
 	ckmsAkmsClient := client.NewCkmsAkmsClient(config.AkmsURL)
 
-	createdEKMS := &KMS{
+	createdKMS := &KMS{
 		kmsName:             config.Name,
 		kmsUUID:             kmsUUID,
 		interComAddr:        config.InterComAddr,
@@ -143,28 +143,28 @@ func NewKMS(kmsUUID uuid.UUID, logOutput io.Writer, logLevel log.Level, logInJso
 		CKMSAkmsClient:      ckmsAkmsClient,
 	}
 
-	createdEKMS.supportedKeyLengths[BitKeyLen256] = true
+	createdKMS.supportedKeyLengths[BitKeyLen256] = true
 
 	// start the inter communication gRPC server
-	go createdEKMS.startGRPC(config.InterComAddr, config.QuantumAddr, tlsData)
+	go createdKMS.startGRPC(config.InterComAddr, config.QuantumAddr, tlsData)
 
 	// initialize from config
-	err := initializePeers(createdEKMS, config)
+	err := createdKMS.initializePeers(config)
 	if err != nil {
 		log.Fatalf("Failed to initialize peers: %s", err)
 	}
 
 	// Start the akmsCkmsReceiverServer
 	if config.AkmsCkmsServerPort != "" {
-		createdEKMS.CKMSAkmsServer = server.NewAKMSReceiver(config.AkmsCkmsServerPort, createdEKMS.eventBus, createdEKMS.GenerateAndSendKSAKey)
+		createdKMS.CKMSAkmsServer = server.NewAKMSReceiver(config.AkmsCkmsServerPort, createdKMS.eventBus, createdKMS.GenerateAndSendKSAKey)
 		log.Infof("Starting AKMS receiver server on port: %s", config.AkmsCkmsServerPort)
-		go createdEKMS.CKMSAkmsServer.Serve()
+		go createdKMS.CKMSAkmsServer.Serve()
 	}
 
-	return createdEKMS
+	return createdKMS
 }
 
-func initializePeers(kms *KMS, config *config.Config) error {
+func (kms *KMS) initializePeers(config *config.Config) error {
 	var qm peers.QuantumModule
 	var err error
 	for _, peer := range config.Peers {