diff --git a/build-system/tasks/extension-generator/extension-doc.template.md b/build-system/tasks/extension-generator/extension-doc.template.md
index 0ebd040bf5e1..22ac2514bca7 100644
--- a/build-system/tasks/extension-generator/extension-doc.template.md
+++ b/build-system/tasks/extension-generator/extension-doc.template.md
@@ -156,6 +156,10 @@ Explain analytics.
Accessibility information related to `${name}`.
+## Version notes (optional)
+
+Information on version differences and migration notes.
+
## Validation
See [\${name} rules](https://github.com/ampproject/amphtml/blob/master/extensions/${name}/validator-${name}.protoascii) in the AMP validator specification.
diff --git a/extensions/amp-accordion/amp-accordion.md b/extensions/amp-accordion/amp-accordion.md
index be092f52589e..30862b235987 100644
--- a/extensions/amp-accordion/amp-accordion.md
+++ b/extensions/amp-accordion/amp-accordion.md
@@ -28,7 +28,7 @@ limitations under the License.
Provides a way for viewers to glance at the content outline and jump to any section. This is helpful for mobile devices where even a couple of sentences into a section requires scrolling.
-## Behavior
+## Usage
The `amp-accordion` component allows you to display collapsible and expandable content sections. This component provides a way for viewers to glance at the content outline and jump to any section. Effective use reduces scrolling needs on mobile devices.
diff --git a/extensions/amp-next-page/amp-next-page.md b/extensions/amp-next-page/amp-next-page.md
index 4472f8a65bba..80e264836d87 100644
--- a/extensions/amp-next-page/amp-next-page.md
+++ b/extensions/amp-next-page/amp-next-page.md
@@ -24,21 +24,6 @@ limitations under the License.
# amp-next-page
-## Behavior
-
-Given a list of pages, `amp-next-page` tries to load them after the current
-document, providing an infinite-scroll type experience.
-
-Pages should be specified in a JSON config loaded from a remote URL listed in
-the element `src`, or inlined as a `script` element child.
-
-## Version notes
-
-| Version | Description |
-| ------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| 1.0 | Support for an infinite number of page recommendations, reduced bundle size, improved API, support for amp-analytics, templated separators and recommendation box, better handling of fixed elements.
API changes are breaking, please take a look at the [migration section](https://amp.dev/documentation/components/amp-next-page/#migrating-from-0.1) for details. |
-| 0.1 | Initial experimental implementation. Limited to three recommended documents |
-
## Usage
The `` component loads content pages one after another creating an infinite scroll experience.
@@ -396,6 +381,13 @@ The default recommendation box and default separator both have a generic, non-lo
Both the default recommendation box and default separator are keyboard-focusable. When a custom separator is provided, its `tabindex` is preserved if present, otherwise a `tabindex` of `0` will be added to the given element.
+## Version notes
+
+| Version | Description |
+| ------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| 1.0 | Support for an infinite number of page recommendations, reduced bundle size, improved API, support for amp-analytics, templated separators and recommendation box, better handling of fixed elements.
API changes are breaking, please take a look at the [migration section](https://amp.dev/documentation/components/amp-next-page/#migrating-from-0.1) for details. |
+| 0.1 | Initial experimental implementation. Limited to three recommended documents |
+
## Validation
See [amp-next-page rules](https://github.com/ampproject/amphtml/blob/master/extensions/amp-next-page/validator-amp-next-page.protoascii)