RF: continue refactor to terryfy

[skip ci]