Change HREM class name to SystemMsg

And some other small stuff