botmpy rename - take 1
Merge remote-tracking branch 'origin/name-change' into name-change