diff --git a/src/reference/asciidoc/message.adoc b/src/reference/asciidoc/message.adoc
index 728fa3bed6..e2a8589fee 100644
--- a/src/reference/asciidoc/message.adoc
+++ b/src/reference/asciidoc/message.adoc
@@ -75,30 +75,30 @@ The following table describes the pre-defined message headers:
 | Header Type
 | Usage
 
-| `MessageHeaders.ID`
+| MessageHeaders.ID
 | java.util.UUID
 | An identifier for this message instance.
 Changes each time a message is mutated.
 
-| `MessageHeaders.
-TIMESTAMP`
+| MessageHeaders.
+TIMESTAMP
 | java.lang.Long
 | The time the message was created.
 Changes each time a message is mutated.
 
-| `MessageHeaders.
-REPLY_CHANNEL`
-| `java.lang.Object`
-(`String` or
-`MessageChannel`)
+| MessageHeaders.
+REPLY_CHANNEL
+| java.lang.Object
+(String or
+MessageChannel)
 | A channel to which a reply (if any) is sent when no explicit output channel is configured and there is no `ROUTING_SLIP` or the `ROUTING_SLIP` is exhausted.
 If the value is a `String`, it must represent a bean name or have been generated by a `ChannelRegistry.`
 
 | MessageHeaders.
 ERROR_CHANNEL
-| `java.lang.Object`
-(`String` or
-`MessageChannel`)
+| java.lang.Object
+(String or
+MessageChannel)
 | A channel to which errors are sent.
 If the value is a `String`, it must represent a bean name or have been generated by a `ChannelRegistry.`
 |===
@@ -120,56 +120,56 @@ The following table describes the pre-defined message headers:
 | Header Type
 | Usage
 
-| `IntegrationMessageHeaderAccessor.
-CORRELATION_ID`
-| `java.lang.Object`
+| IntegrationMessageHeaderAccessor.
+CORRELATION_ID
+| java.lang.Object
 | Used to correlate two or more messages.
 
-| `IntegrationMessageHeaderAccessor.
-SEQUENCE_NUMBER`
-| `java.lang.Integer`
+| IntegrationMessageHeaderAccessor.
+SEQUENCE_NUMBER
+| java.lang.Integer
 | Usually a sequence number with a group of messages with a `SEQUENCE_SIZE` but can also be used in a `<resequencer/>` to resequence an unbounded group of messages.
 
-| `IntegrationMessageHeaderAccessor.
-SEQUENCE_SIZE`
-| `java.lang.Integer`
+| IntegrationMessageHeaderAccessor.
+SEQUENCE_SIZE
+| java.lang.Integer
 | The number of messages within a group of correlated messages.
 
-| `IntegrationMessageHeaderAccessor.
-EXPIRATION_DATE`
-| `java.lang.Long`
+| IntegrationMessageHeaderAccessor.
+EXPIRATION_DATE
+| java.lang.Long
 | Indicates when a message is expired.
 Not used by the framework directly but can be set with a header enricher and used in a `<filter/>` that is configured with an `UnexpiredMessageSelector`.
 
-| `IntegrationMessageHeaderAccessor.
-PRIORITY`
-| `java.lang.Integer`
+| IntegrationMessageHeaderAccessor.
+PRIORITY
+| java.lang.Integer
 | Message priority -- for example, within a `PriorityChannel`.
 
 
-| `IntegrationMessageHeaderAccessor.
-DUPLICATE_MESSAGE`
-| `java.lang.Boolean`
+| IntegrationMessageHeaderAccessor.
+DUPLICATE_MESSAGE
+| java.lang.Boolean
 | True if a message was detected as a duplicate by an idempotent receiver interceptor.
 See <<idempotent-receiver>>.
 
-| `IntegrationMessageHeaderAccessor.
-CLOSEABLE_RESOURCE`
-| `java.io.Closeable`
+| IntegrationMessageHeaderAccessor.
+CLOSEABLE_RESOURCE
+| java.io.Closeable
 | This header is present if the message is associated with a `Closeable` that should be closed when message processing is complete.
 An example is the `Session` associated with a streamed file transfer using FTP, SFTP, and so on.
 
-| `IntegrationMessageHeaderAccessor.
-DELIVERY_ATTEMPT`
-| `java.lang.`
-`AtomicInteger`
+| IntegrationMessageHeaderAccessor.
+DELIVERY_ATTEMPT
+| java.lang.
+AtomicInteger
 | If a message-driven channel adapter supports the configuration of a `RetryTemplate`, this header contains the current delivery attempt.
 
-| `IntegrationMessageHeaderAccessor.
-ACKNOWLEDGMENT_CALLBACK`
-| `o.s.i.support.`
-`Acknowledgment`
-`Callback`
+| IntegrationMessageHeaderAccessor.
+ACKNOWLEDGMENT_CALLBACK
+| o.s.i.support.
+Acknowledgment
+Callback
 | If a message source supports it, a call back to accept, reject, or requeue a message.
 See <<deferred-acks-message-source>>.
 |===
diff --git a/src/reference/asciidoc/whats-new.adoc b/src/reference/asciidoc/whats-new.adoc
index 90a404971f..4c2f15e695 100644
--- a/src/reference/asciidoc/whats-new.adoc
+++ b/src/reference/asciidoc/whats-new.adoc
@@ -197,6 +197,6 @@ See <<http>> and <<webflux>> for more information.
 === JMX Changes
 
 Object name key values are now quoted if they contain any characters other than those allowed in a Java identifier (or period `.`).
-e.g. `org.springframework.integration:type=MessageChannel,name="input:foo.myGroup.errors"`.
+e.g. `org.springframework.integration:type=MessageChannel,` `name="input:foo.myGroup.errors"`.
 This has the side effect that previously "allowed" names, with such characters, will now be quoted.
-e.g. `org.springframework.integration:type=MessageChannel,name="input#foo.myGroup.errors"`.
+e.g. `org.springframework.integration:type=MessageChannel,` `name="input#foo.myGroup.errors"`.