Fix some additional renaming issues
3 files changed