Fixed original global-rename problem but revealed another bug related to
ns-resolve.