diff --git a/api/secure_variables.go b/api/variables.go
similarity index 100%
rename from api/secure_variables.go
rename to api/variables.go
diff --git a/api/secure_variables_test.go b/api/variables_test.go
similarity index 100%
rename from api/secure_variables_test.go
rename to api/variables_test.go
diff --git a/command/agent/secure_variable_endpoint.go b/command/agent/variable_endpoint.go
similarity index 100%
rename from command/agent/secure_variable_endpoint.go
rename to command/agent/variable_endpoint.go
diff --git a/command/agent/secure_variable_endpoint_test.go b/command/agent/variable_endpoint_test.go
similarity index 100%
rename from command/agent/secure_variable_endpoint_test.go
rename to command/agent/variable_endpoint_test.go
diff --git a/command/operator_secure_variables_keyring.go b/command/operator_root_keyring.go
similarity index 100%
rename from command/operator_secure_variables_keyring.go
rename to command/operator_root_keyring.go
diff --git a/command/operator_secure_variables_keyring_install.go b/command/operator_root_keyring_install.go
similarity index 100%
rename from command/operator_secure_variables_keyring_install.go
rename to command/operator_root_keyring_install.go
diff --git a/command/operator_secure_variables_keyring_list.go b/command/operator_root_keyring_list.go
similarity index 100%
rename from command/operator_secure_variables_keyring_list.go
rename to command/operator_root_keyring_list.go
diff --git a/command/operator_secure_variables_keyring_remove.go b/command/operator_root_keyring_remove.go
similarity index 100%
rename from command/operator_secure_variables_keyring_remove.go
rename to command/operator_root_keyring_remove.go
diff --git a/command/operator_secure_variables_keyring_rotate.go b/command/operator_root_keyring_rotate.go
similarity index 100%
rename from command/operator_secure_variables_keyring_rotate.go
rename to command/operator_root_keyring_rotate.go
diff --git a/nomad/state/state_store_secure_variables.go b/nomad/state/state_store_variables.go
similarity index 100%
rename from nomad/state/state_store_secure_variables.go
rename to nomad/state/state_store_variables.go
diff --git a/nomad/state/state_store_secure_variables_oss.go b/nomad/state/state_store_variables_oss.go
similarity index 100%
rename from nomad/state/state_store_secure_variables_oss.go
rename to nomad/state/state_store_variables_oss.go
diff --git a/nomad/state/state_store_secure_variables_test.go b/nomad/state/state_store_variables_test.go
similarity index 100%
rename from nomad/state/state_store_secure_variables_test.go
rename to nomad/state/state_store_variables_test.go
diff --git a/nomad/structs/secure_variables.go b/nomad/structs/variables.go
similarity index 100%
rename from nomad/structs/secure_variables.go
rename to nomad/structs/variables.go
diff --git a/nomad/structs/secure_variables_test.go b/nomad/structs/variables_test.go
similarity index 100%
rename from nomad/structs/secure_variables_test.go
rename to nomad/structs/variables_test.go
diff --git a/nomad/secure_variables_endpoint.go b/nomad/variables_endpoint.go
similarity index 100%
rename from nomad/secure_variables_endpoint.go
rename to nomad/variables_endpoint.go
diff --git a/nomad/secure_variables_endpoint_test.go b/nomad/variables_endpoint_test.go
similarity index 100%
rename from nomad/secure_variables_endpoint_test.go
rename to nomad/variables_endpoint_test.go