diff --git a/cmd/backup.go b/cmd/backup.go
index f3c7f308d30b7f3d9f286970a8f72b8c5a9c0c2a..ecac98375e28440cc692197f9f2b21e1e1376aae 100644
--- a/cmd/backup.go
+++ b/cmd/backup.go
@@ -30,7 +30,7 @@ func loadOrInitBackup(backupPath string, backupPass string, password []byte, sto
 	// create a new client if none exist
 	if _, err := os.Stat(storeDir); errors.Is(err, fs.ErrNotExist) {
 		// Initialize from scratch
-		ndfJson, err := ioutil.ReadFile(viper.GetString("ndf"))
+		ndfJson, err := ioutil.ReadFile(viper.GetString(ndfFlag))
 		if err != nil {
 			jww.FATAL.Panicf("%+v", err)
 		}
@@ -44,7 +44,7 @@ func loadOrInitBackup(backupPath string, backupPass string, password []byte, sto
 		}
 
 		// Write the backup JSON to file
-		err = utils.WriteFileDef(viper.GetString("backupJsonOut"), backupJson)
+		err = utils.WriteFileDef(viper.GetString(backupJsonOutFlag), backupJson)
 		if err != nil {
 			jww.FATAL.Panicf("Failed to write backup to file: %+v", err)
 		}
@@ -56,7 +56,7 @@ func loadOrInitBackup(backupPath string, backupPass string, password []byte, sto
 			jww.FATAL.Panicf("%+v", err)
 		}
 
-		backupIdListPath := viper.GetString("backupIdList")
+		backupIdListPath := viper.GetString(backupIdListFlag)
 		if backupIdListPath != "" {
 			// Marshal backed up ID list to JSON
 			backedUpIdListJson, err := json.Marshal(backupIdList)
diff --git a/cmd/broadcast.go b/cmd/broadcast.go
index 1e43d12867cfb7bb2708d962c27ad897ebe7f477..bdd460137a41e89127b1cbfcb2723eafec369689 100644
--- a/cmd/broadcast.go
+++ b/cmd/broadcast.go
@@ -27,7 +27,7 @@ var broadcastCmd = &cobra.Command{
 	Run: func(cmd *cobra.Command, args []string) {
 		cmixParams, e2eParams := initParams()
 		authCbs := makeAuthCallbacks(
-			viper.GetBool("unsafe-channel-creation"), e2eParams)
+			viper.GetBool(unsafeChannelCreationFlag), e2eParams)
 		client := initE2e(cmixParams, e2eParams, authCbs)
 
 		// Write user contact to file
@@ -148,8 +148,8 @@ var broadcastCmd = &cobra.Command{
 		/* Broadcast client setup */
 
 		// Select broadcast method
-		symmetric := viper.GetString("symmetric")
-		asymmetric := viper.GetString("asymmetric")
+		symmetric := viper.GetString(broadcastSymmetricFlag)
+		asymmetric := viper.GetString(broadcastAsymmetricFlag)
 
 		// Connect to broadcast channel
 		bcl, err := broadcast.NewBroadcastChannel(*channel, client.GetCmix(), client.GetRng())
@@ -187,7 +187,7 @@ var broadcastCmd = &cobra.Command{
 			go func() {
 				jww.INFO.Printf("Attempting to send broadcasts...")
 
-				sendDelay := time.Duration(viper.GetUint("sendDelay"))
+				sendDelay := time.Duration(viper.GetUint(sendDelayFlag))
 				maxRetries := 10
 				retries := 0
 				for {
diff --git a/cmd/dumpRounds.go b/cmd/dumpRounds.go
index 4aa2f7ee8e96ff40a4708ba74f6193e199c6844c..79fe5a60a72c0d073e7f868b429d450978dff671 100644
--- a/cmd/dumpRounds.go
+++ b/cmd/dumpRounds.go
@@ -34,7 +34,7 @@ var dumpRoundsCmd = &cobra.Command{
 
 		cmixParams, e2eParams := initParams()
 		authCbs := makeAuthCallbacks(
-			viper.GetBool("unsafe-channel-creation"), e2eParams)
+			viper.GetBool(unsafeChannelCreationFlag), e2eParams)
 		client := initE2e(cmixParams, e2eParams, authCbs)
 		err := client.StartNetworkFollower(5 * time.Second)
 		if err != nil {
diff --git a/cmd/fileTransfer.go b/cmd/fileTransfer.go
index b44bdbf50f3755e24375e0562d11694b6e65b5f2..30420ff0220bd71ac2c4059366e47e6892f21bcd 100644
--- a/cmd/fileTransfer.go
+++ b/cmd/fileTransfer.go
@@ -37,7 +37,7 @@ var ftCmd = &cobra.Command{
 	Run: func(cmd *cobra.Command, args []string) {
 		cmixParams, e2eParams := initParams()
 		authCbs := makeAuthCallbacks(
-			viper.GetBool("unsafe-channel-creation"), e2eParams)
+			viper.GetBool(unsafeChannelCreationFlag), e2eParams)
 		client := initE2e(cmixParams, e2eParams, authCbs)
 
 		// Print user's reception ID and save contact file
diff --git a/cmd/group.go b/cmd/group.go
index 7e9b8c63b1dcd5a034c168e9984d7f2020d8fd87..9c5e1d09dd6e4e1b2694cdb7cdf9c31c79980945 100644
--- a/cmd/group.go
+++ b/cmd/group.go
@@ -36,7 +36,7 @@ var groupCmd = &cobra.Command{
 	Run: func(cmd *cobra.Command, args []string) {
 		cmixParams, e2eParams := initParams()
 		authCbs := makeAuthCallbacks(
-			viper.GetBool("unsafe-channel-creation"), e2eParams)
+			viper.GetBool(unsafeChannelCreationFlag), e2eParams)
 		client := initE2e(cmixParams, e2eParams, authCbs)
 
 		// Print user's reception ID
diff --git a/cmd/init.go b/cmd/init.go
index d278a0f9b834b62ca68f9e1cdf249432328327ef..0c4b874eec96f416b697eb9516da495aea2f93ed 100644
--- a/cmd/init.go
+++ b/cmd/init.go
@@ -29,12 +29,12 @@ var initCmd = &cobra.Command{
 	Args:  cobra.NoArgs,
 	Run: func(cmd *cobra.Command, args []string) {
 		// TODO: Handle userid-prefix argument
-		storePassword := parsePassword(viper.GetString("password"))
-		storeDir := viper.GetString("session")
-		regCode := viper.GetString("regcode")
+		storePassword := parsePassword(viper.GetString(passwordFlag))
+		storeDir := viper.GetString(sessionFlag)
+		regCode := viper.GetString(regCodeFlag)
 
 		// Initialize from scratch
-		ndfJson, err := ioutil.ReadFile(viper.GetString("ndf"))
+		ndfJson, err := ioutil.ReadFile(viper.GetString(ndfFlag))
 		if err != nil {
 			jww.FATAL.Panicf("%+v", err)
 		}
@@ -78,7 +78,7 @@ func loadOrInitCmix(password []byte, storeDir, regCode string,
 	// create a new client if none exist
 	if _, err := os.Stat(storeDir); errors.Is(err, fs.ErrNotExist) {
 		// Initialize from scratch
-		ndfJson, err := ioutil.ReadFile(viper.GetString("ndf"))
+		ndfJson, err := ioutil.ReadFile(viper.GetString(ndfFlag))
 		if err != nil {
 			jww.FATAL.Panicf("%+v", err)
 		}
@@ -162,7 +162,7 @@ func loadOrInitVanity(password []byte, storeDir, regCode, userIdPrefix string,
 	// create a new client if none exist
 	if _, err := os.Stat(storeDir); errors.Is(err, fs.ErrNotExist) {
 		// Initialize from scratch
-		ndfJson, err := ioutil.ReadFile(viper.GetString("ndf"))
+		ndfJson, err := ioutil.ReadFile(viper.GetString(ndfFlag))
 		if err != nil {
 			jww.FATAL.Panicf("%+v", err)
 		}
diff --git a/cmd/root.go b/cmd/root.go
index 905b5c25954dcc476f85b7c9aa8fbda5b530f303..921a28290aa578380a9d7744b50ca5b10189640e 100644
--- a/cmd/root.go
+++ b/cmd/root.go
@@ -70,7 +70,7 @@ var rootCmd = &cobra.Command{
 		cmixParams, e2eParams := initParams()
 
 		authCbs := makeAuthCallbacks(
-			viper.GetBool("unsafe-channel-creation"), e2eParams)
+			viper.GetBool(unsafeChannelCreationFlag), e2eParams)
 		client := initE2e(cmixParams, e2eParams, authCbs)
 
 		jww.INFO.Printf("Client Initialized...")
diff --git a/cmd/single.go b/cmd/single.go
index fb5cd10305bb878d2e28f5decf90c89c23f0a755..60c148fa3d61ec2f306eac9f944ccded6b5037ae 100644
--- a/cmd/single.go
+++ b/cmd/single.go
@@ -35,7 +35,7 @@ var singleCmd = &cobra.Command{
 
 		cmixParams, e2eParams := initParams()
 		authCbs := makeAuthCallbacks(
-			viper.GetBool("unsafe-channel-creation"), e2eParams)
+			viper.GetBool(unsafeChannelCreationFlag), e2eParams)
 		client := initE2e(cmixParams, e2eParams, authCbs)
 
 		// Write user contact to file
diff --git a/cmd/ud.go b/cmd/ud.go
index d7f79831d623aa883d0d18b5eca4d739ee5bb551..dfc9f5e20f8c4c04628818ff5e532e566a1910ba 100644
--- a/cmd/ud.go
+++ b/cmd/ud.go
@@ -36,7 +36,7 @@ var udCmd = &cobra.Command{
 	Run: func(cmd *cobra.Command, args []string) {
 		cmixParams, e2eParams := initParams()
 		authCbs := makeAuthCallbacks(
-			viper.GetBool("unsafe-channel-creation"), e2eParams)
+			viper.GetBool(unsafeChannelCreationFlag), e2eParams)
 		client := initE2e(cmixParams, e2eParams, authCbs)
 
 		// get user and save contact to file
@@ -63,7 +63,7 @@ var udCmd = &cobra.Command{
 
 		// Make user discovery manager
 		rng := client.GetRng()
-		userToRegister := viper.GetString("register")
+		userToRegister := viper.GetString(udRegisterFlag)
 		jww.TRACE.Printf("[UD] Registering user %v...", userToRegister)
 		userDiscoveryMgr, err := ud.NewManager(client, client.GetComms(),
 			client.NetworkFollowerStatus, userToRegister, nil)