diff --git a/.env.example b/.env.example
index c89d8cc..091662f 100644
--- a/.env.example
+++ b/.env.example
@@ -55,49 +55,49 @@ TINYAUTH_AUTH_LOGINMAXRETRIES=3
 TINYAUTH_AUTH_TRUSTEDPROXIES=
 
 # The domain of the app.
-TINYAUTH_APPS_NAME_CONFIG_DOMAIN=
+TINYAUTH_APPS_name_CONFIG_DOMAIN=
 
 # Comma-separated list of allowed users.
-TINYAUTH_APPS_NAME_USERS_ALLOW=
+TINYAUTH_APPS_name_USERS_ALLOW=
 
 # Comma-separated list of blocked users.
-TINYAUTH_APPS_NAME_USERS_BLOCK=
+TINYAUTH_APPS_name_USERS_BLOCK=
 
 # Comma-separated list of allowed OAuth groups.
-TINYAUTH_APPS_NAME_OAUTH_WHITELIST=
+TINYAUTH_APPS_name_OAUTH_WHITELIST=
 
 # Comma-separated list of required OAuth groups.
-TINYAUTH_APPS_NAME_OAUTH_GROUPS=
+TINYAUTH_APPS_name_OAUTH_GROUPS=
 
 # List of allowed IPs or CIDR ranges.
-TINYAUTH_APPS_NAME_IP_ALLOW=
+TINYAUTH_APPS_name_IP_ALLOW=
 
 # List of blocked IPs or CIDR ranges.
-TINYAUTH_APPS_NAME_IP_BLOCK=
+TINYAUTH_APPS_name_IP_BLOCK=
 
 # List of IPs or CIDR ranges that bypass authentication.
-TINYAUTH_APPS_NAME_IP_BYPASS=
+TINYAUTH_APPS_name_IP_BYPASS=
 
 # Custom headers to add to the response.
-TINYAUTH_APPS_NAME_RESPONSE_HEADERS=
+TINYAUTH_APPS_name_RESPONSE_HEADERS=
 
 # Basic auth username.
-TINYAUTH_APPS_NAME_RESPONSE_BASICAUTH_USERNAME=
+TINYAUTH_APPS_name_RESPONSE_BASICAUTH_USERNAME=
 
 # Basic auth password.
-TINYAUTH_APPS_NAME_RESPONSE_BASICAUTH_PASSWORD=
+TINYAUTH_APPS_name_RESPONSE_BASICAUTH_PASSWORD=
 
 # Path to the file containing the basic auth password.
-TINYAUTH_APPS_NAME_RESPONSE_BASICAUTH_PASSWORDFILE=
+TINYAUTH_APPS_name_RESPONSE_BASICAUTH_PASSWORDFILE=
 
 # Comma-separated list of allowed paths.
-TINYAUTH_APPS_NAME_PATH_ALLOW=
+TINYAUTH_APPS_name_PATH_ALLOW=
 
 # Comma-separated list of blocked paths.
-TINYAUTH_APPS_NAME_PATH_BLOCK=
+TINYAUTH_APPS_name_PATH_BLOCK=
 
 # Comma-separated list of required LDAP groups.
-TINYAUTH_APPS_NAME_LDAP_GROUPS=
+TINYAUTH_APPS_name_LDAP_GROUPS=
 
 # Comma-separated list of allowed OAuth domains.
 TINYAUTH_OAUTH_WHITELIST=
@@ -106,34 +106,34 @@ TINYAUTH_OAUTH_WHITELIST=
 TINYAUTH_OAUTH_AUTOREDIRECT=
 
 # OAuth client ID.
-TINYAUTH_OAUTH_PROVIDERS_NAME_CLIENTID=
+TINYAUTH_OAUTH_PROVIDERS_name_CLIENTID=
 
 # OAuth client secret.
-TINYAUTH_OAUTH_PROVIDERS_NAME_CLIENTSECRET=
+TINYAUTH_OAUTH_PROVIDERS_name_CLIENTSECRET=
 
 # Path to the file containing the OAuth client secret.
-TINYAUTH_OAUTH_PROVIDERS_NAME_CLIENTSECRETFILE=
+TINYAUTH_OAUTH_PROVIDERS_name_CLIENTSECRETFILE=
 
 # OAuth scopes.
-TINYAUTH_OAUTH_PROVIDERS_NAME_SCOPES=
+TINYAUTH_OAUTH_PROVIDERS_name_SCOPES=
 
 # OAuth redirect URL.
-TINYAUTH_OAUTH_PROVIDERS_NAME_REDIRECTURL=
+TINYAUTH_OAUTH_PROVIDERS_name_REDIRECTURL=
 
 # OAuth authorization URL.
-TINYAUTH_OAUTH_PROVIDERS_NAME_AUTHURL=
+TINYAUTH_OAUTH_PROVIDERS_name_AUTHURL=
 
 # OAuth token URL.
-TINYAUTH_OAUTH_PROVIDERS_NAME_TOKENURL=
+TINYAUTH_OAUTH_PROVIDERS_name_TOKENURL=
 
 # OAuth userinfo URL.
-TINYAUTH_OAUTH_PROVIDERS_NAME_USERINFOURL=
+TINYAUTH_OAUTH_PROVIDERS_name_USERINFOURL=
 
 # Allow insecure OAuth connections.
-TINYAUTH_OAUTH_PROVIDERS_NAME_INSECURE=false
+TINYAUTH_OAUTH_PROVIDERS_name_INSECURE=false
 
 # Provider name in UI.
-TINYAUTH_OAUTH_PROVIDERS_NAME_NAME=
+TINYAUTH_OAUTH_PROVIDERS_name_NAME=
 
 # Path to the private key file.
 TINYAUTH_OIDC_PRIVATEKEYPATH="./tinyauth_oidc_key"
@@ -142,19 +142,19 @@ TINYAUTH_OIDC_PRIVATEKEYPATH="./tinyauth_oidc_key"
 TINYAUTH_OIDC_PUBLICKEYPATH="./tinyauth_oidc_key.pub"
 
 # OIDC client ID.
-TINYAUTH_OIDC_CLIENTS_NAME_CLIENTID=
+TINYAUTH_OIDC_CLIENTS_name_CLIENTID=
 
 # OIDC client secret.
-TINYAUTH_OIDC_CLIENTS_NAME_CLIENTSECRET=
+TINYAUTH_OIDC_CLIENTS_name_CLIENTSECRET=
 
 # Path to the file containing the OIDC client secret.
-TINYAUTH_OIDC_CLIENTS_NAME_CLIENTSECRETFILE=
+TINYAUTH_OIDC_CLIENTS_name_CLIENTSECRETFILE=
 
 # List of trusted redirect URIs.
-TINYAUTH_OIDC_CLIENTS_NAME_TRUSTEDREDIRECTURIS=
+TINYAUTH_OIDC_CLIENTS_name_TRUSTEDREDIRECTURIS=
 
 # Client name in UI.
-TINYAUTH_OIDC_CLIENTS_NAME_NAME=
+TINYAUTH_OIDC_CLIENTS_name_NAME=
 
 # The title of the UI.
 TINYAUTH_UI_TITLE="Tinyauth"
diff --git a/gen/gen_env.go b/gen/gen_env.go
index f5723de..8db51c9 100644
--- a/gen/gen_env.go
+++ b/gen/gen_env.go
@@ -110,7 +110,7 @@ func buildMapPaths(field reflect.StructField, parentPath string, paths *[]Path)
 		return
 	}
 
-	mapPath := parentPath + strings.ToUpper(field.Name) + "_NAME_"
+	mapPath := parentPath + strings.ToUpper(field.Name) + "_name_"
 	valueType := fieldType.Elem()
 
 	if valueType.Kind() == reflect.Struct {