Update wheel naming and to latest terryfy