Fixed a broken ref in the messages project and renamed a few messages