Change of terminology
Task - Level 3
Merge remote-tracking branch 'origin/TerminologyChangeSet' into TerminologyChangeSet