Add some safe guesses for the last few names
Merge branch 'master' into production