diff --git a/internal/config/cli.go b/internal/config/cli.go
index 8eca29de..5cd95751 100644
--- a/internal/config/cli.go
+++ b/internal/config/cli.go
@@ -20,14 +20,14 @@ import (
 	"github.com/pelletier/go-toml"
 )
 
-// CLIConfig stores the options for the nvidia-container-cli
-type CLIConfig struct {
+// ContainerCLIConfig stores the options for the nvidia-container-cli
+type ContainerCLIConfig struct {
 	Root string
 }
 
-// getCLIConfigFrom reads the nvidia container runtime config from the specified toml Tree.
-func getCLIConfigFrom(toml *toml.Tree) *CLIConfig {
-	cfg := getDefaultCLIConfig()
+// getContainerCLIConfigFrom reads the nvidia container runtime config from the specified toml Tree.
+func getContainerCLIConfigFrom(toml *toml.Tree) *ContainerCLIConfig {
+	cfg := getDefaultContainerCLIConfig()
 
 	if toml == nil {
 		return cfg
@@ -38,9 +38,9 @@ func getCLIConfigFrom(toml *toml.Tree) *CLIConfig {
 	return cfg
 }
 
-// getDefaultCLIConfig defines the default values for the config
-func getDefaultCLIConfig() *CLIConfig {
-	c := CLIConfig{
+// getDefaultContainerCLIConfig defines the default values for the config
+func getDefaultContainerCLIConfig() *ContainerCLIConfig {
+	c := ContainerCLIConfig{
 		Root: "",
 	}
 
diff --git a/internal/config/config.go b/internal/config/config.go
index df880954..8e328487 100644
--- a/internal/config/config.go
+++ b/internal/config/config.go
@@ -37,8 +37,8 @@ var (
 // Config represents the contents of the config.toml file for the NVIDIA Container Toolkit
 // Note: This is currently duplicated by the HookConfig in cmd/nvidia-container-toolkit/hook_config.go
 type Config struct {
-	NVIDIAContainerCLIConfig     CLIConfig     `toml:"nvidia-container-cli"`
-	NVIDIAContainerRuntimeConfig RuntimeConfig `toml:"nvidia-container-runtime"`
+	NVIDIAContainerCLIConfig     ContainerCLIConfig `toml:"nvidia-container-cli"`
+	NVIDIAContainerRuntimeConfig RuntimeConfig      `toml:"nvidia-container-runtime"`
 }
 
 // GetConfig sets up the config struct. Values are read from a toml file
@@ -82,7 +82,7 @@ func getConfigFrom(toml *toml.Tree) *Config {
 		return cfg
 	}
 
-	cfg.NVIDIAContainerCLIConfig = *getCLIConfigFrom(toml)
+	cfg.NVIDIAContainerCLIConfig = *getContainerCLIConfigFrom(toml)
 	cfg.NVIDIAContainerRuntimeConfig = *getRuntimeConfigFrom(toml)
 
 	return cfg
@@ -91,7 +91,7 @@ func getConfigFrom(toml *toml.Tree) *Config {
 // getDefaultConfig defines the default values for the config
 func getDefaultConfig() *Config {
 	c := Config{
-		NVIDIAContainerCLIConfig:     *getDefaultCLIConfig(),
+		NVIDIAContainerCLIConfig:     *getDefaultContainerCLIConfig(),
 		NVIDIAContainerRuntimeConfig: *getDefaultRuntimeConfig(),
 	}
 
diff --git a/internal/config/runtime_test.go b/internal/config/runtime_test.go
index 82495719..32ea7a0b 100644
--- a/internal/config/runtime_test.go
+++ b/internal/config/runtime_test.go
@@ -57,7 +57,7 @@ func TestGetConfig(t *testing.T) {
 		{
 			description: "empty config is default",
 			expectedConfig: &Config{
-				NVIDIAContainerCLIConfig: CLIConfig{
+				NVIDIAContainerCLIConfig: ContainerCLIConfig{
 					Root: "",
 				},
 				NVIDIAContainerRuntimeConfig: RuntimeConfig{
@@ -75,7 +75,7 @@ func TestGetConfig(t *testing.T) {
 				"nvidia-container-runtime.discover-mode = \"not-legacy\"",
 			},
 			expectedConfig: &Config{
-				NVIDIAContainerCLIConfig: CLIConfig{
+				NVIDIAContainerCLIConfig: ContainerCLIConfig{
 					Root: "",
 				},
 				NVIDIAContainerRuntimeConfig: RuntimeConfig{
@@ -94,7 +94,7 @@ func TestGetConfig(t *testing.T) {
 				"discover-mode = \"not-legacy\"",
 			},
 			expectedConfig: &Config{
-				NVIDIAContainerCLIConfig: CLIConfig{
+				NVIDIAContainerCLIConfig: ContainerCLIConfig{
 					Root: "",
 				},
 				NVIDIAContainerRuntimeConfig: RuntimeConfig{