diff --git a/content/en/render-hooks/headings.md b/content/en/render-hooks/headings.md
index dc64296ea..2635802e8 100755
--- a/content/en/render-hooks/headings.md
+++ b/content/en/render-hooks/headings.md
@@ -64,7 +64,7 @@ In its default configuration, Hugo renders Markdown headings according to the [C
 [CommonMark specification]: https://spec.commonmark.org/current/
 
 {{< code file=layouts/_default/_markup/render-heading.html copy=true >}}
-<h{{ .Level }} id="{{ .Anchor }}">
+<h{{ .Level }} id="{{ .Anchor }}" {{- with .Attributes.class }} class="{{ . }}" {{- end }}>
   {{- .Text -}}
 </h{{ .Level }}>
 {{< /code >}}
@@ -72,7 +72,7 @@ In its default configuration, Hugo renders Markdown headings according to the [C
 To add an anchor link to the right of each heading:
 
 {{< code file=layouts/_default/_markup/render-heading.html copy=true >}}
-<h{{ .Level }} id="{{ .Anchor }}">
+<h{{ .Level }} id="{{ .Anchor }}" {{- with .Attributes.class }} class="{{ . }}" {{- end }}>
   {{ .Text }}
   <a href="#{{ .Anchor }}">#</a>
 </h{{ .Level }}>
diff --git a/content/en/render-hooks/images.md b/content/en/render-hooks/images.md
index eca346c10..d3067c5a4 100755
--- a/content/en/render-hooks/images.md
+++ b/content/en/render-hooks/images.md
@@ -91,7 +91,7 @@ In its default configuration, Hugo renders Markdown images according to the [Com
 
 {{< code file=layouts/_default/_markup/render-image.html copy=true >}}
 <img src="{{ .Destination | safeURL }}"
-  {{- with .Text }} alt="{{ . }}"{{ end -}}
+  {{- with .PlainText }} alt="{{ . }}"{{ end -}}
   {{- with .Title }} title="{{ . }}"{{ end -}}
 >
 {{- /* chomp trailing newline */ -}}
@@ -103,13 +103,13 @@ To render standalone images within `figure` elements:
 {{- if .IsBlock -}}
   <figure>
     <img src="{{ .Destination | safeURL }}"
-      {{- with .Text }} alt="{{ . }}"{{ end -}}
+      {{- with .PlainText }} alt="{{ . }}"{{ end -}}
     >
     {{- with .Title }}<figcaption>{{ . }}</figcaption>{{ end -}}
   </figure>
 {{- else -}}
   <img src="{{ .Destination | safeURL }}"
-    {{- with .Text }} alt="{{ . }}"{{ end -}}
+    {{- with .PlainText }} alt="{{ . }}"{{ end -}}
     {{- with .Title }} title="{{ . }}"{{ end -}}
   >
 {{- end -}}