Updated way name is used. Sig verification is still not fully functional.