Minor name cleanups