Fix a few internal name choices
3 files changed