Rename terms to fingerprint
Optimized imports