names cleanups