Revert "Adding name to service locator"

This reverts commit 675639df87e9e01041a5d0bcaa3bb5205c23c383.