Update to latest terryfy (including 10.10 naming)