Tiny naming cleanups.