Renamings and other fixes
3 files changed