Name cleanups
8 files changed