Rename some functions used in vanilla-test.T to be more consistent/logical.
Assimilate renamer tests.