more naming cleanups. nw.