Message changes and fixes
Changes to names