Fix name service