rename NewServer to NewEtcd