a quick change in the names of some functions
Merge remote-tracking branch 'origin/master' into Christian's