Add x02da-gw, rename servers