diff --git a/command/agent/command.go b/command/agent/command.go
index f896f38b8..93ddaf5e7 100644
--- a/command/agent/command.go
+++ b/command/agent/command.go
@@ -26,7 +26,7 @@ import (
 	gsyslog "github.com/hashicorp/go-syslog"
 	"github.com/hashicorp/logutils"
 	"github.com/hashicorp/nomad/helper"
-	flaghelper "github.com/hashicorp/nomad/helper/flag-helpers"
+	flaghelper "github.com/hashicorp/nomad/helper/flags"
 	gatedwriter "github.com/hashicorp/nomad/helper/gated-writer"
 	"github.com/hashicorp/nomad/helper/logging"
 	"github.com/hashicorp/nomad/helper/winsvc"
diff --git a/command/deployment_promote.go b/command/deployment_promote.go
index d40d7c70d..1450644d6 100644
--- a/command/deployment_promote.go
+++ b/command/deployment_promote.go
@@ -6,7 +6,7 @@ import (
 
 	"github.com/hashicorp/nomad/api"
 	"github.com/hashicorp/nomad/api/contexts"
-	flaghelper "github.com/hashicorp/nomad/helper/flag-helpers"
+	flaghelper "github.com/hashicorp/nomad/helper/flags"
 	"github.com/posener/complete"
 )
 
diff --git a/command/job_dispatch.go b/command/job_dispatch.go
index 7ae9b06c3..022c24a51 100644
--- a/command/job_dispatch.go
+++ b/command/job_dispatch.go
@@ -7,7 +7,7 @@ import (
 	"strings"
 
 	"github.com/hashicorp/nomad/api/contexts"
-	flaghelper "github.com/hashicorp/nomad/helper/flag-helpers"
+	flaghelper "github.com/hashicorp/nomad/helper/flags"
 	"github.com/posener/complete"
 )
 
diff --git a/command/job_plan.go b/command/job_plan.go
index b84ff93db..bd43b0eab 100644
--- a/command/job_plan.go
+++ b/command/job_plan.go
@@ -7,7 +7,7 @@ import (
 	"time"
 
 	"github.com/hashicorp/nomad/api"
-	flaghelper "github.com/hashicorp/nomad/helper/flag-helpers"
+	flaghelper "github.com/hashicorp/nomad/helper/flags"
 	"github.com/hashicorp/nomad/scheduler"
 	"github.com/posener/complete"
 )
diff --git a/command/job_promote.go b/command/job_promote.go
index 976ce184c..35ce1bd55 100644
--- a/command/job_promote.go
+++ b/command/job_promote.go
@@ -6,7 +6,7 @@ import (
 
 	"github.com/hashicorp/nomad/api"
 	"github.com/hashicorp/nomad/api/contexts"
-	flaghelper "github.com/hashicorp/nomad/helper/flag-helpers"
+	flaghelper "github.com/hashicorp/nomad/helper/flags"
 	"github.com/posener/complete"
 )
 
diff --git a/command/job_run.go b/command/job_run.go
index ce73c4834..ba683dcaf 100644
--- a/command/job_run.go
+++ b/command/job_run.go
@@ -11,7 +11,7 @@ import (
 
 	"github.com/hashicorp/nomad/api"
 	"github.com/hashicorp/nomad/helper"
-	flaghelper "github.com/hashicorp/nomad/helper/flag-helpers"
+	flaghelper "github.com/hashicorp/nomad/helper/flags"
 	"github.com/posener/complete"
 )
 
diff --git a/command/job_validate.go b/command/job_validate.go
index 69d2a4ee1..1cbd3744c 100644
--- a/command/job_validate.go
+++ b/command/job_validate.go
@@ -7,7 +7,7 @@ import (
 	multierror "github.com/hashicorp/go-multierror"
 	"github.com/hashicorp/nomad/api"
 	"github.com/hashicorp/nomad/command/agent"
-	flaghelper "github.com/hashicorp/nomad/helper/flag-helpers"
+	flaghelper "github.com/hashicorp/nomad/helper/flags"
 	"github.com/hashicorp/nomad/nomad/structs"
 	"github.com/posener/complete"
 )
diff --git a/command/namespace_apply.go b/command/namespace_apply.go
index e41f0c0c7..b7c311c20 100644
--- a/command/namespace_apply.go
+++ b/command/namespace_apply.go
@@ -5,7 +5,7 @@ import (
 	"strings"
 
 	"github.com/hashicorp/nomad/api"
-	flaghelper "github.com/hashicorp/nomad/helper/flag-helpers"
+	flaghelper "github.com/hashicorp/nomad/helper/flags"
 	"github.com/posener/complete"
 )
 
diff --git a/command/operator_autopilot_set.go b/command/operator_autopilot_set.go
index 138dcff60..95b0d87d0 100644
--- a/command/operator_autopilot_set.go
+++ b/command/operator_autopilot_set.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"strings"
 
-	flaghelper "github.com/hashicorp/nomad/helper/flag-helpers"
+	flaghelper "github.com/hashicorp/nomad/helper/flags"
 	"github.com/posener/complete"
 )
 
diff --git a/helper/flag-helpers/autopilot_flags.go b/helper/flags/autopilot_flags.go
similarity index 99%
rename from helper/flag-helpers/autopilot_flags.go
rename to helper/flags/autopilot_flags.go
index 47e01a4d3..67740a8f5 100644
--- a/helper/flag-helpers/autopilot_flags.go
+++ b/helper/flags/autopilot_flags.go
@@ -1,4 +1,4 @@
-package flaghelper
+package flags
 
 // These flag type implementations are provided to maintain autopilot command
 // backwards compatibility.
diff --git a/helper/flag-helpers/autopilot_flags_test.go b/helper/flags/autopilot_flags_test.go
similarity index 98%
rename from helper/flag-helpers/autopilot_flags_test.go
rename to helper/flags/autopilot_flags_test.go
index 2d29fdbf3..ac9dbe092 100644
--- a/helper/flag-helpers/autopilot_flags_test.go
+++ b/helper/flags/autopilot_flags_test.go
@@ -1,4 +1,4 @@
-package flaghelper
+package flags
 
 import (
 	"flag"
diff --git a/helper/flag-helpers/flag.go b/helper/flags/flag.go
similarity index 98%
rename from helper/flag-helpers/flag.go
rename to helper/flags/flag.go
index 3156e3710..62859f004 100644
--- a/helper/flag-helpers/flag.go
+++ b/helper/flags/flag.go
@@ -1,4 +1,4 @@
-package flaghelper
+package flags
 
 import (
 	"strconv"
diff --git a/helper/flag-helpers/flag_test.go b/helper/flags/flag_test.go
similarity index 98%
rename from helper/flag-helpers/flag_test.go
rename to helper/flags/flag_test.go
index fbcffe8e3..03b064824 100644
--- a/helper/flag-helpers/flag_test.go
+++ b/helper/flags/flag_test.go
@@ -1,4 +1,4 @@
-package flaghelper
+package flags
 
 import (
 	"flag"