Should this have the _locator suffix?