removed caller from function names, locator replaced by locate, Find with find
Merge branch 'Development'

Merge