Add server naming