Update device ids due to clash