More work done on naming service.