diff --git a/main.go b/main.go
index 2ef99f217ceafab16fcc5e857fe1568e034e6846..bad82803d0c00f5a15b8b7de415da26b36f14d43 100644
--- a/main.go
+++ b/main.go
@@ -22,19 +22,19 @@ func main() {
 	// quantumlayer so generated keys can be fetched. This is mainly to simplify
 	// the initial setup process.
 
-	flag.BoolVar(&selfTesting, "selfTesting", false,
+	flag.BoolVar(&selfTesting, "selfTesting", true,
 		"Will perform self-testing with second quantum link if set to true")
 
-	flag.StringVar(&udpQL1AddrString, "address", "[::1]:50900",
+	flag.StringVar(&udpQL1AddrString, "my-address", "[::1]:50900",
 		"The UDP address for my quantumlayer so keys can be fetched")
 
-	flag.StringVar(&ql1Name, "name", "ekms-ql1",
+	flag.StringVar(&ql1Name, "my-name", "ekms-ql1",
 		"The name of the quantumlayer")
 
-	flag.StringVar(&udpQL2AddrString, "address", "[::1]:50901",
+	flag.StringVar(&udpQL2AddrString, "remote-address", "[::1]:50901",
 		"The UDP address to a second quantumlayer so keys can be fetched")
 
-	flag.StringVar(&ql2Name, "name", "ekms-ql2",
+	flag.StringVar(&ql2Name, "remote-name", "ekms-ql2",
 		"The name of the quantumlayer")
 
 	// Parse the provided flags