Refactor the naming service
The source and sink are named sperately