make deviceId section of the API more explicit