diff --git a/main.go b/main.go
index 4b14c640633766c970823ced76fcaa55825071b9..bbcb1a0755777fe8995a1f3588a1e2d3c02d291a 100644
--- a/main.go
+++ b/main.go
@@ -10,14 +10,16 @@ import (
 )
 
 func main() {
-	// my own Name 
-	var qlName1, udpQL1AddrString string
+	// my own Name
+	var udpQL1AddrString string
+	var ql1Name string
 	// a name for potential self-testing
-	var qlName2, udpQL2AddrString string
+	var udpQL2AddrString string
+	var ql2Name string
 	// Setup flags that allows to initially provide a address to a second
 	// quantumlayer so generated keys can be fetched. This is mainly to simplify
 	// the initial setup process.
-	flag.StringVar(&udpQL2AddrString, "address", "[::1]:50900",
+	flag.StringVar(&udpQL1AddrString, "address", "[::1]:50900",
 		"The UDP address for my quantumlayer so keys can be fetched")
 
 	flag.StringVar(&ql1Name, "name", "ekms-ql1",
@@ -29,15 +31,13 @@ func main() {
 	flag.StringVar(&ql2Name, "name", "ekms-ql2",
 		"The name of the quantumlayer")
 
-
 	// Parse the provided flags
 	flag.Parse()
 
-	log.Println("Welcome to the proto-kms called: ", qlName)
+	log.Println("Welcome to the proto-kms called: ", ql1Name)
 
 	go emulatedKMS(ql2Name, udpQL2AddrString, udpQL1AddrString)
 	emulatedKMS(ql1Name, udpQL1AddrString, udpQL2AddrString)
-	
 
 	return
 }