Fix up naming changes
2 files changed