more name cleanups