Renaming of functions in ToolBox.scala for consist

- Just to let them be consistent between each other + match the report
Merge branch 'master' of https://github.com/aghosn/persistence