Rename MessageType -> ThriftMessageType