Fix a few fingerprints

Change-Id: Ia836205a77cd48fbc07260ee0477e1bf4026f9b5
Fix find 7 naming

Change-Id: Ib68fe101e8ccadf7fab360c177469e713f9e193c