Add fingerprint and device name overrides