renamed wording
Merge branches 'renaming' and 'master'