* nnir.el: Use the server names without suffixes.