TIM-125: Pull request fixups

* Fixes to method names requested on the PR