[Refactor] Update to reflect MChat namespace changes Part 2...