Use my new name everywhere.
Merge branch 'stable'