Updated/added names.
Merge branch 'bugfixes' into 3.1