Normalize a few more name references
3 files changed