fixes of HA related variables names