indentation
Using message type naming convention.
More work on FW-2.