Change of terminology - fix after marging
Merge remote-tracking branch 'origin/master'