Revert to use names with service locator.

This is because of a missing API call in Seam Autowire. It should be a part of its replacement when we move to CDI.