More work done on naming service. New issues with USN were discovered during this.