Refactoring naming conventions
Message system skeleton