Refactor deviceId -> deviceIdent
Since the deviceId will be deprecated, better move to the deviceIdent