use consistent hidd naming