naming cleanups