Merge "Change resource name to be consistent with fingerprint"