Refactored original name locator, added main entry point and full integration test