Fixed legacy message sender and receiver componentn names