Revert "Revert "Adding name to service locator""

This reverts commit 59be8eac2bae2e48d8ffaeca7887c3bd2e2356a5.