diff --git a/cmd/revid-cli/main.go b/cmd/revid-cli/main.go
index ae5e76af..c76343e4 100644
--- a/cmd/revid-cli/main.go
+++ b/cmd/revid-cli/main.go
@@ -179,15 +179,15 @@ func handleFlags() revid.Config {
 
 	switch *inputPtr {
 	case "Raspivid":
-		cfg.Input = revid.Raspivid
+		cfg.Input = revid.InputRaspivid
 	case "v4l":
-		cfg.Input = revid.V4L
+		cfg.Input = revid.InputV4L
 	case "File":
-		cfg.Input = revid.File
+		cfg.Input = revid.InputFile
 	case "Audio":
-		cfg.Input = revid.Audio
+		cfg.Input = revid.InputAudio
 	case "RTSP":
-		cfg.Input = revid.RTSP
+		cfg.Input = revid.InputRTSP
 	case "":
 	default:
 		log.Log(logger.Error, pkg+"bad input argument")
@@ -214,13 +214,13 @@ func handleFlags() revid.Config {
 	for _, o := range outputs {
 		switch o {
 		case "File":
-			cfg.Outputs = append(cfg.Outputs, revid.File)
+			cfg.Outputs = append(cfg.Outputs, revid.OutputFile)
 		case "Http":
-			cfg.Outputs = append(cfg.Outputs, revid.HTTP)
+			cfg.Outputs = append(cfg.Outputs, revid.OutputHTTP)
 		case "Rtmp":
-			cfg.Outputs = append(cfg.Outputs, revid.RTMP)
+			cfg.Outputs = append(cfg.Outputs, revid.OutputRTMP)
 		case "Rtp":
-			cfg.Outputs = append(cfg.Outputs, revid.RTP)
+			cfg.Outputs = append(cfg.Outputs, revid.OutputRTP)
 		case "":
 		default:
 			log.Log(logger.Error, pkg+"bad output argument", "arg", o)