Refactor naming to camelCase. Add manual addLocation function to locator.