Rename to Hawk the last HSP references