minor renaming
6 files changed