message architect improvements

• simplified message architects
• standardized messaging naming

Ok, so I went down a slight rabbit hole, but this has been bugging me for awhile now anyways...