Updated message names
Merge branch 'pics' into mckay