diff --git a/charger/homeassistant-switch.go b/charger/homeassistant-switch.go
index 3dc1917c8..254a8fe5f 100644
--- a/charger/homeassistant-switch.go
+++ b/charger/homeassistant-switch.go
@@ -22,8 +22,8 @@ func init() {
 func NewHomeAssistantSwitchFromConfig(other map[string]any) (api.Charger, error) {
 	cc := struct {
 		embed        `mapstructure:",squash"`
-		_URI         string `mapstructure:"uri"`   // TODO deprecated
-		_Token       string `mapstructure:"token"` // TODO deprecated
+		URI_         string `mapstructure:"uri"`   // TODO deprecated
+		Token_       string `mapstructure:"token"` // TODO deprecated
 		Home         string
 		Enable       string
 		Power        string
diff --git a/charger/homeassistant.go b/charger/homeassistant.go
index 6811cb3d8..32fe32655 100644
--- a/charger/homeassistant.go
+++ b/charger/homeassistant.go
@@ -28,8 +28,8 @@ func init() {
 // NewHomeAssistantFromConfig creates a HomeAssistant charger from generic config
 func NewHomeAssistantFromConfig(other map[string]any) (api.Charger, error) {
 	cc := struct {
-		_URI       string `mapstructure:"uri"`   // TODO deprecated
-		_Token     string `mapstructure:"token"` // TODO deprecated
+		URI_       string `mapstructure:"uri"`   // TODO deprecated
+		Token_     string `mapstructure:"token"` // TODO deprecated
 		Home       string
 		Status     string   // required - sensor for charge status
 		Enabled    string   // required - sensor for enabled state
diff --git a/meter/homeassistant.go b/meter/homeassistant.go
index 499a9b755..ccf44447b 100644
--- a/meter/homeassistant.go
+++ b/meter/homeassistant.go
@@ -24,8 +24,8 @@ func init() {
 // NewHomeAssistantFromConfig creates a HomeAssistant meter from generic config
 func NewHomeAssistantFromConfig(other map[string]any) (api.Meter, error) {
 	cc := struct {
-		_URI     string `mapstructure:"uri"`   // TODO deprecated
-		_Token   string `mapstructure:"token"` // TODO deprecated
+		URI_     string `mapstructure:"uri"`   // TODO deprecated
+		Token_   string `mapstructure:"token"` // TODO deprecated
 		Home     string
 		Power    string
 		Energy   string
diff --git a/vehicle/homeassistant.go b/vehicle/homeassistant.go
index a84a8ff1a..a3e2eb4b5 100644
--- a/vehicle/homeassistant.go
+++ b/vehicle/homeassistant.go
@@ -25,8 +25,8 @@ func init() {
 func NewHomeAssistantVehicleFromConfig(other map[string]any) (api.Vehicle, error) {
 	cc := struct {
 		embed   `mapstructure:",squash"`
-		_URI    string `mapstructure:"uri"`   // TODO deprecated
-		_Token  string `mapstructure:"token"` // TODO deprecated
+		URI_    string `mapstructure:"uri"`   // TODO deprecated
+		Token_  string `mapstructure:"token"` // TODO deprecated
 		Home    string
 		Sensors struct {
 			Soc        string // required