Rename PackageLocator -> TargetLocator