diff --git a/src/GovUk.Frontend.AspNetCore.DocSamples/Pages/Accordion/AccordionWithSummarySections.cshtml b/src/GovUk.Frontend.AspNetCore.DocSamples/Pages/Accordion/AccordionWithSummarySections.cshtml
index c6b522984..ef1fb7594 100644
--- a/src/GovUk.Frontend.AspNetCore.DocSamples/Pages/Accordion/AccordionWithSummarySections.cshtml
+++ b/src/GovUk.Frontend.AspNetCore.DocSamples/Pages/Accordion/AccordionWithSummarySections.cshtml
@@ -1,9 +1,9 @@
 @page
 
 <govuk-accordion id="accordion-with-summary-sections" heading-level="3">
-    <govuk-accordion-item expanded="true">
-        <govuk-accordion-item-heading>Understanding agile project management</govuk-accordion-item-heading>
-        <govuk-accordion-item-summary>Introductions, methods, core features.</govuk-accordion-item-summary>
+    <accordion-item expanded="true">
+        <heading>Understanding agile project management</heading>
+        <summary>Introductions, methods, core features.</summary>
         <ul class="govuk-list">
             <li>
                 <a class="govuk-link" href="#">Agile and government services: an introduction</a>
@@ -15,10 +15,10 @@
                 <a class="govuk-link" href="#">Core principles of agile</a>
             </li>
         </ul>
-    </govuk-accordion-item>
-    <govuk-accordion-item>
-        <govuk-accordion-item-heading>Working with agile methods</govuk-accordion-item-heading>
-        <govuk-accordion-item-summary>Workspaces, tools and techniques, user stories, planning.</govuk-accordion-item-summary>
+    </accordion-item>
+    <accordion-item>
+        <heading>Working with agile methods</heading>
+        <summary>Workspaces, tools and techniques, user stories, planning.</summary>
         <ul class="govuk-list">
             <li>
                 <a class="govuk-link" href="#">Creating an agile working environment</a>
@@ -42,10 +42,10 @@
                 <a class="govuk-link" href="#">Developing a roadmap</a>
             </li>
         </ul>
-    </govuk-accordion-item>
-    <govuk-accordion-item>
-        <govuk-accordion-item-heading>Governing agile services</govuk-accordion-item-heading>
-        <govuk-accordion-item-summary>Principles, measuring progress, spending money.</govuk-accordion-item-summary>
+    </accordion-item>
+    <accordion-item>
+        <heading>Governing agile services</heading>
+        <summary>Principles, measuring progress, spending money.</summary>
         <ul class="govuk-list">
             <li>
                 <a class="govuk-link" href="#">Governance principles for agile service delivery</a>
@@ -66,10 +66,10 @@
                 <a class="govuk-link" href="#">Working across organisational boundaries</a>
             </li>
         </ul>
-    </govuk-accordion-item>
-    <govuk-accordion-item>
-        <govuk-accordion-item-heading>Phases of an agile project</govuk-accordion-item-heading>
-        <govuk-accordion-item-summary>Discovery, alpha, beta, live and retirement.</govuk-accordion-item-summary>
+    </accordion-item>
+    <accordion-item>
+        <heading>Phases of an agile project</heading>
+        <summary>Discovery, alpha, beta, live and retirement.</summary>
         <ul class="govuk-list">
             <li>
                 <a class="govuk-link" href="#">How the discovery phase works</a>
@@ -87,5 +87,5 @@
                 <a class="govuk-link" href="#">Retiring your service</a>
             </li>
         </ul>
-    </govuk-accordion-item>
+    </accordion-item>
 </govuk-accordion>
diff --git a/src/GovUk.Frontend.AspNetCore.DocSamples/Pages/Breadcrumbs/Breadcrumbs.cshtml b/src/GovUk.Frontend.AspNetCore.DocSamples/Pages/Breadcrumbs/Breadcrumbs.cshtml
index a9862dd5c..e29dcbe65 100644
--- a/src/GovUk.Frontend.AspNetCore.DocSamples/Pages/Breadcrumbs/Breadcrumbs.cshtml
+++ b/src/GovUk.Frontend.AspNetCore.DocSamples/Pages/Breadcrumbs/Breadcrumbs.cshtml
@@ -1,7 +1,7 @@
 @page
 
 <govuk-breadcrumbs collapse-on-mobile="true">
-    <govuk-breadcrumbs-item asp-controller="Home" asp-action="Index">Home</govuk-breadcrumbs-item>
-    <govuk-breadcrumbs-item href="#" link-target="_blank">Passports, travel and living abroad</govuk-breadcrumbs-item>
-    <govuk-breadcrumbs-item>Travel abroad</govuk-breadcrumbs-item>
+    <breadcrumbs-item asp-controller="Home" asp-action="Index">Home</breadcrumbs-item>
+    <breadcrumbs-item href="#" link-target="_blank">Passports, travel and living abroad</breadcrumbs-item>
+    <breadcrumbs-item>Travel abroad</breadcrumbs-item>
 </govuk-breadcrumbs>
diff --git a/src/GovUk.Frontend.AspNetCore.DocSamples/Pages/CharacterCount/CharacterCount.cshtml b/src/GovUk.Frontend.AspNetCore.DocSamples/Pages/CharacterCount/CharacterCount.cshtml
index 1d92293dd..b68d48243 100644
--- a/src/GovUk.Frontend.AspNetCore.DocSamples/Pages/CharacterCount/CharacterCount.cshtml
+++ b/src/GovUk.Frontend.AspNetCore.DocSamples/Pages/CharacterCount/CharacterCount.cshtml
@@ -1,10 +1,10 @@
 @page
 
 <govuk-character-count name="more-detail" max-length="200">
-    <govuk-character-count-label class="govuk-label--l" is-page-heading="true">
+    <label class="govuk-label--l" is-page-heading="true">
         Can you provide more detail?
-    </govuk-character-count-label>
-    <govuk-character-count-hint>
+    </label>
+    <hint>
         Do not include personal or financial information like your National Insurance number or credit card details.
-    </govuk-character-count-hint>
+    </hint>
 </govuk-character-count>
diff --git a/src/GovUk.Frontend.AspNetCore.DocSamples/Pages/Checkboxes/Checkboxes.cshtml b/src/GovUk.Frontend.AspNetCore.DocSamples/Pages/Checkboxes/Checkboxes.cshtml
index aa70a9502..d1d6515af 100644
--- a/src/GovUk.Frontend.AspNetCore.DocSamples/Pages/Checkboxes/Checkboxes.cshtml
+++ b/src/GovUk.Frontend.AspNetCore.DocSamples/Pages/Checkboxes/Checkboxes.cshtml
@@ -1,20 +1,20 @@
 @page
 
 <govuk-checkboxes name="nationality">
-    <govuk-checkboxes-fieldset>
-        <govuk-checkboxes-fieldset-legend is-page-heading="true" class="govuk-fieldset__legend--l">
+    <checkboxes-fieldset>
+        <legend is-page-heading="true" class="govuk-fieldset__legend--l">
             What is your nationality?
-        </govuk-checkboxes-fieldset-legend>
+        </legend>
 
-        <govuk-checkboxes-hint>
+        <hint>
             If you have dual nationality, select all options that are relevant to you.
-        </govuk-checkboxes-hint>
+        </hint>
 
-        <govuk-checkboxes-item value="british">
+        <checkboxes-item value="british">
             British
-            <govuk-checkboxes-item-hint>including English, Scottish, Welsh and Northern Irish</govuk-checkboxes-item-hint>
-        </govuk-checkboxes-item>
-        <govuk-checkboxes-item value="irish">Irish</govuk-checkboxes-item>
-        <govuk-checkboxes-item value="other">Citizen of another country</govuk-checkboxes-item>
-    </govuk-checkboxes-fieldset>
+            <hint>including English, Scottish, Welsh and Northern Irish</hint>
+        </checkboxes-item>
+        <checkboxes-item value="irish">Irish</checkboxes-item>
+        <checkboxes-item value="other">Citizen of another country</checkboxes-item>
+    </checkboxes-fieldset>
 </govuk-checkboxes>
diff --git a/src/GovUk.Frontend.AspNetCore.DocSamples/Pages/Checkboxes/CheckboxesWithConditional.cshtml b/src/GovUk.Frontend.AspNetCore.DocSamples/Pages/Checkboxes/CheckboxesWithConditional.cshtml
index 8fd78b668..dc8bbbf4e 100644
--- a/src/GovUk.Frontend.AspNetCore.DocSamples/Pages/Checkboxes/CheckboxesWithConditional.cshtml
+++ b/src/GovUk.Frontend.AspNetCore.DocSamples/Pages/Checkboxes/CheckboxesWithConditional.cshtml
@@ -1,40 +1,40 @@
 @page
 
 <govuk-checkboxes name="contact">
-    <govuk-checkboxes-fieldset>
-        <govuk-checkboxes-fieldset-legend is-page-heading="true" class="govuk-fieldset__legend--l">
+    <checkboxes-fieldset>
+        <legend is-page-heading="true" class="govuk-fieldset__legend--l">
             How would you like to be contacted?
-        </govuk-checkboxes-fieldset-legend>
+        </legend>
 
-        <govuk-checkboxes-hint>
+        <hint>
             Select all options that are relevant to you.
-        </govuk-checkboxes-hint>
+        </hint>
 
-        <govuk-checkboxes-item value="email">
+        <checkboxes-item value="email">
             Email
-            <govuk-checkboxes-item-conditional>
+            <conditional>
                 <govuk-input name="contact-by-email" type="email" autocomplete="email" spellcheck="false" input-class="govuk-!-width-one-third">
-                    <govuk-input-label>Email address</govuk-input-label>
+                    <label>Email address</label>
                 </govuk-input>
-            </govuk-checkboxes-item-conditional>
-        </govuk-checkboxes-item>
+            </conditional>
+        </checkboxes-item>
 
-        <govuk-checkboxes-item value="phone">
+        <checkboxes-item value="phone">
             Phone
-            <govuk-checkboxes-item-conditional>
+            <conditional>
                 <govuk-input name="contact-by-phone" type="tel" autocomplete="tel" input-class="govuk-!-width-one-third">
-                    <govuk-input-label>Phone number</govuk-input-label>
+                    <label>Phone number</label>
                 </govuk-input>
-            </govuk-checkboxes-item-conditional>
-        </govuk-checkboxes-item>
+            </conditional>
+        </checkboxes-item>
 
-        <govuk-checkboxes-item value="text message">
+        <checkboxes-item value="text message">
             Text message
-            <govuk-checkboxes-item-conditional>
+            <conditional>
                 <govuk-input name="contact-by-text" type="tel" autocomplete="tel" input-class="govuk-!-width-one-third">
-                    <govuk-input-label>Mobile phone number</govuk-input-label>
+                    <label>Mobile phone number</label>
                 </govuk-input>
-            </govuk-checkboxes-item-conditional>
-        </govuk-checkboxes-item>
-    </govuk-checkboxes-fieldset>
+            </conditional>
+        </checkboxes-item>
+    </checkboxes-fieldset>
 </govuk-checkboxes>
diff --git a/src/GovUk.Frontend.AspNetCore.DocSamples/Pages/Checkboxes/CheckboxesWithError.cshtml b/src/GovUk.Frontend.AspNetCore.DocSamples/Pages/Checkboxes/CheckboxesWithError.cshtml
index d2a34559d..10040a277 100644
--- a/src/GovUk.Frontend.AspNetCore.DocSamples/Pages/Checkboxes/CheckboxesWithError.cshtml
+++ b/src/GovUk.Frontend.AspNetCore.DocSamples/Pages/Checkboxes/CheckboxesWithError.cshtml
@@ -1,24 +1,24 @@
 @page
 
 <govuk-checkboxes name="nationality">
-    <govuk-checkboxes-fieldset>
-        <govuk-checkboxes-fieldset-legend is-page-heading="true" class="govuk-fieldset__legend--l">
+    <checkboxes-fieldset>
+        <legend is-page-heading="true" class="govuk-fieldset__legend--l">
             What is your nationality?
-        </govuk-checkboxes-fieldset-legend>
+        </legend>
 
-        <govuk-checkboxes-hint>
+        <hint>
             If you have dual nationality, select all options that are relevant to you.
-        </govuk-checkboxes-hint>
+        </hint>
 
-        <govuk-checkboxes-error-message>
+        <error-message>
             Select if you are British, Irish or a citizen of a different country
-        </govuk-checkboxes-error-message>
+        </error-message>
 
-        <govuk-checkboxes-item value="british">
+        <checkboxes-item value="british">
             British
             <govuk-checkboxes-item-hint>including English, Scottish, Welsh and Northern Irish</govuk-checkboxes-item-hint>
-        </govuk-checkboxes-item>
-        <govuk-checkboxes-item value="irish">Irish</govuk-checkboxes-item>
-        <govuk-checkboxes-item value="other">Citizen of another country</govuk-checkboxes-item>
-    </govuk-checkboxes-fieldset>
+        </checkboxes-item>
+        <checkboxes-item value="irish">Irish</checkboxes-item>
+        <checkboxes-item value="other">Citizen of another country</checkboxes-item>
+    </checkboxes-fieldset>
 </govuk-checkboxes>
diff --git a/src/GovUk.Frontend.AspNetCore.DocSamples/Pages/Checkboxes/CheckboxesWithNone.cshtml b/src/GovUk.Frontend.AspNetCore.DocSamples/Pages/Checkboxes/CheckboxesWithNone.cshtml
index 33d36939c..e2025d374 100644
--- a/src/GovUk.Frontend.AspNetCore.DocSamples/Pages/Checkboxes/CheckboxesWithNone.cshtml
+++ b/src/GovUk.Frontend.AspNetCore.DocSamples/Pages/Checkboxes/CheckboxesWithNone.cshtml
@@ -1,19 +1,19 @@
 @page
 
 <govuk-checkboxes name="countries">
-    <govuk-checkboxes-fieldset>
-        <govuk-checkboxes-fieldset-legend is-page-heading="true" class="govuk-fieldset__legend--l">
+    <checkboxes-fieldset>
+        <legend is-page-heading="true" class="govuk-fieldset__legend--l">
             Will you be travelling to any of these countries?
-        </govuk-checkboxes-fieldset-legend>
+        </legend>
 
-        <govuk-checkboxes-hint>
+        <hint>
             Select all countries that apply
-        </govuk-checkboxes-hint>
+        </hint>
 
-        <govuk-checkboxes-item value="france">France</govuk-checkboxes-item>
-        <govuk-checkboxes-item value="portugal">Portugal</govuk-checkboxes-item>
-        <govuk-checkboxes-item value="spain">Spain</govuk-checkboxes-item>
-        <govuk-checkboxes-divider>or</govuk-checkboxes-divider>
-        <govuk-checkboxes-item value="none" behavior="Exclusive">No, I will not be travelling to any of these countries</govuk-checkboxes-item>
-    </govuk-checkboxes-fieldset>
+        <checkboxes-item value="france">France</checkboxes-item>
+        <checkboxes-item value="portugal">Portugal</checkboxes-item>
+        <checkboxes-item value="spain">Spain</checkboxes-item>
+        <checkboxes-divider>or</checkboxes-divider>
+        <checkboxes-item value="none" behavior="Exclusive">No, I will not be travelling to any of these countries</checkboxes-item>
+    </checkboxes-fieldset>
 </govuk-checkboxes>
diff --git a/src/GovUk.Frontend.AspNetCore.DocSamples/Pages/Checkboxes/CheckboxesWithoutFieldset.cshtml b/src/GovUk.Frontend.AspNetCore.DocSamples/Pages/Checkboxes/CheckboxesWithoutFieldset.cshtml
index e51caf312..577e3779e 100644
--- a/src/GovUk.Frontend.AspNetCore.DocSamples/Pages/Checkboxes/CheckboxesWithoutFieldset.cshtml
+++ b/src/GovUk.Frontend.AspNetCore.DocSamples/Pages/Checkboxes/CheckboxesWithoutFieldset.cshtml
@@ -1,7 +1,7 @@
 @page
 
 <govuk-checkboxes name="t-and-c">
-    <govuk-checkboxes-item value="yes">
+    <checkboxes-item value="yes">
         I agree to the terms and conditions
-    </govuk-checkboxes-item>
+    </checkboxes-item>
 </govuk-checkboxes>
diff --git a/src/GovUk.Frontend.AspNetCore.DocSamples/Pages/DateInput/DateInputWithCustomItemLabels.cshtml b/src/GovUk.Frontend.AspNetCore.DocSamples/Pages/DateInput/DateInputWithCustomItemLabels.cshtml
index 3f88219f2..87434b5d2 100644
--- a/src/GovUk.Frontend.AspNetCore.DocSamples/Pages/DateInput/DateInputWithCustomItemLabels.cshtml
+++ b/src/GovUk.Frontend.AspNetCore.DocSamples/Pages/DateInput/DateInputWithCustomItemLabels.cshtml
@@ -1,13 +1,13 @@
 @page
 
 <govuk-date-input id="passport-issued" name-prefix="passport-issued">
-    <govuk-date-input-day>
-        <govuk-date-input-day-label>Dydd</govuk-date-input-day-label>
-    </govuk-date-input-day>
-    <govuk-date-input-month>
-        <govuk-date-input-month-label>Mis</govuk-date-input-month-label>
-    </govuk-date-input-month>
-    <govuk-date-input-year>
-        <govuk-date-input-year-label>Blwyddyn</govuk-date-input-year-label>
-    </govuk-date-input-year>
+    <day>
+        <label>Dydd</label>
+    </day>
+    <month>
+        <label>Mis</label>
+    </month>
+    <year>
+        <label>Blwyddyn</label>
+    </year>
 </govuk-date-input>
diff --git a/src/GovUk.Frontend.AspNetCore.DocSamples/Pages/DateInput/DateInputWithCustomItemValues.cshtml b/src/GovUk.Frontend.AspNetCore.DocSamples/Pages/DateInput/DateInputWithCustomItemValues.cshtml
index 26d044937..59641487c 100644
--- a/src/GovUk.Frontend.AspNetCore.DocSamples/Pages/DateInput/DateInputWithCustomItemValues.cshtml
+++ b/src/GovUk.Frontend.AspNetCore.DocSamples/Pages/DateInput/DateInputWithCustomItemValues.cshtml
@@ -1,7 +1,7 @@
 @page
 
 <govuk-date-input id="passport-issued" name-prefix="passport-issued">
-    <govuk-date-input-day value="1" />
-    <govuk-date-input-month value="4" />
-    <govuk-date-input-year value="2022" />
+    <day value="1" />
+    <month value="4" />
+    <year value="2022" />
 </govuk-date-input>
diff --git a/src/GovUk.Frontend.AspNetCore.DocSamples/Pages/DateInput/DateInputWithError.cshtml b/src/GovUk.Frontend.AspNetCore.DocSamples/Pages/DateInput/DateInputWithError.cshtml
index 4d0681838..d7d804d6e 100644
--- a/src/GovUk.Frontend.AspNetCore.DocSamples/Pages/DateInput/DateInputWithError.cshtml
+++ b/src/GovUk.Frontend.AspNetCore.DocSamples/Pages/DateInput/DateInputWithError.cshtml
@@ -1,7 +1,7 @@
 @page
 
 <govuk-date-input id="passport-issued" name-prefix="passport-issued">
-    <govuk-date-input-error-message>
+    <error-message>
         The date your passport was issued must be in the past
-    </govuk-date-input-error-message>
+    </error-message>
 </govuk-date-input>
diff --git a/src/GovUk.Frontend.AspNetCore.DocSamples/Pages/DateInput/DateInputWithFieldset.cshtml b/src/GovUk.Frontend.AspNetCore.DocSamples/Pages/DateInput/DateInputWithFieldset.cshtml
index 76e3cd25a..62eca952f 100644
--- a/src/GovUk.Frontend.AspNetCore.DocSamples/Pages/DateInput/DateInputWithFieldset.cshtml
+++ b/src/GovUk.Frontend.AspNetCore.DocSamples/Pages/DateInput/DateInputWithFieldset.cshtml
@@ -1,15 +1,15 @@
 @page
 
 <govuk-date-input id="passport-issued" name-prefix="passport-issued">
-    <govuk-date-input-fieldset>
-        <govuk-date-input-fieldset-legend is-page-heading="true" class="govuk-fieldset__legend--l">
+    <date-input-fieldset>
+        <legend is-page-heading="true" class="govuk-fieldset__legend--l">
             When was your passport issued?
-        </govuk-date-input-fieldset-legend>
-        <govuk-date-input-hint>
+        </legend>
+        <hint>
             For example, 27 3 2007
-        </govuk-date-input-hint>
-        <govuk-date-input-error-message>
+        </hint>
+        <error-message>
             The date your passport was issued must be in the past
-        </govuk-date-input-error-message>
-    </govuk-date-input-fieldset>
+        </error-message>
+    </date-input-fieldset>
 </govuk-date-input>
diff --git a/src/GovUk.Frontend.AspNetCore.DocSamples/Pages/Details/Details.cshtml b/src/GovUk.Frontend.AspNetCore.DocSamples/Pages/Details/Details.cshtml
index c3e88f53d..0ebaeca1a 100644
--- a/src/GovUk.Frontend.AspNetCore.DocSamples/Pages/Details/Details.cshtml
+++ b/src/GovUk.Frontend.AspNetCore.DocSamples/Pages/Details/Details.cshtml
@@ -1,11 +1,11 @@
 @page
 
 <govuk-details>
-    <govuk-details-summary>
+    <summary>
         Help with nationality
-    </govuk-details-summary>
-    <govuk-details-text>
+    </summary>
+    <text>
         We need to know your nationality so we can work out which elections you’re entitled to vote in.
         If you cannot provide your nationality, you’ll have to send copies of identity documents through the post.
-    </govuk-details-text>
+    </text>
 </govuk-details>
diff --git a/src/GovUk.Frontend.AspNetCore.DocSamples/Pages/Details/DetailsExpanded.cshtml b/src/GovUk.Frontend.AspNetCore.DocSamples/Pages/Details/DetailsExpanded.cshtml
index cd4198275..11a23a14e 100644
--- a/src/GovUk.Frontend.AspNetCore.DocSamples/Pages/Details/DetailsExpanded.cshtml
+++ b/src/GovUk.Frontend.AspNetCore.DocSamples/Pages/Details/DetailsExpanded.cshtml
@@ -1,11 +1,11 @@
 @page
 
 <govuk-details open="true">
-    <govuk-details-summary>
+    <summary>
         Help with nationality
-    </govuk-details-summary>
-    <govuk-details-text>
+    </summary>
+    <text>
         We need to know your nationality so we can work out which elections you’re entitled to vote in.
         If you cannot provide your nationality, you’ll have to send copies of identity documents through the post.
-    </govuk-details-text>
+    </text>
 </govuk-details>
diff --git a/src/GovUk.Frontend.AspNetCore.DocSamples/Pages/ErrorSummary/ErrorSummary.cshtml b/src/GovUk.Frontend.AspNetCore.DocSamples/Pages/ErrorSummary/ErrorSummary.cshtml
index 4089f5a14..245b8fba4 100644
--- a/src/GovUk.Frontend.AspNetCore.DocSamples/Pages/ErrorSummary/ErrorSummary.cshtml
+++ b/src/GovUk.Frontend.AspNetCore.DocSamples/Pages/ErrorSummary/ErrorSummary.cshtml
@@ -1,6 +1,6 @@
 @page
 
 <govuk-error-summary>
-    <govuk-error-summary-item href="#passport-issued-day">The date your passport was issued must be in the past</govuk-error-summary-item>
-    <govuk-error-summary-item href="#postcode-input">Enter a postcode, like AA1 1AA</govuk-error-summary-item>
+    <error-item href="#passport-issued-day">The date your passport was issued must be in the past</error-item>
+    <error-item href="#postcode-input">Enter a postcode, like AA1 1AA</error-item>
 </govuk-error-summary>
diff --git a/src/GovUk.Frontend.AspNetCore.DocSamples/Pages/ErrorSummary/ErrorSummaryWithModelStateError.cshtml b/src/GovUk.Frontend.AspNetCore.DocSamples/Pages/ErrorSummary/ErrorSummaryWithModelStateError.cshtml
index 4259a24dd..a1aaf9108 100644
--- a/src/GovUk.Frontend.AspNetCore.DocSamples/Pages/ErrorSummary/ErrorSummaryWithModelStateError.cshtml
+++ b/src/GovUk.Frontend.AspNetCore.DocSamples/Pages/ErrorSummary/ErrorSummaryWithModelStateError.cshtml
@@ -2,5 +2,5 @@
 @model ErrorSummaryWithModelStateErrorModel
 
 <govuk-error-summary>
-    <govuk-error-summary-item asp-for="FullName" />
+    <error-item asp-for="FullName" />
 </govuk-error-summary>
diff --git a/src/GovUk.Frontend.AspNetCore.DocSamples/Pages/ErrorSummary/ErrorSummaryWithTitle.cshtml b/src/GovUk.Frontend.AspNetCore.DocSamples/Pages/ErrorSummary/ErrorSummaryWithTitle.cshtml
index 8d4fb3ed9..b917f91ee 100644
--- a/src/GovUk.Frontend.AspNetCore.DocSamples/Pages/ErrorSummary/ErrorSummaryWithTitle.cshtml
+++ b/src/GovUk.Frontend.AspNetCore.DocSamples/Pages/ErrorSummary/ErrorSummaryWithTitle.cshtml
@@ -1,7 +1,7 @@
 @page
 
 <govuk-error-summary>
-    <govuk-error-summary-title>There is a problem</govuk-error-summary-title>
-    <govuk-error-summary-item href="#passport-issued-day">The date your passport was issued must be in the past</govuk-error-summary-item>
-    <govuk-error-summary-item href="#postcode-input">Enter a postcode, like AA1 1AA</govuk-error-summary-item>
+    <title>There is a problem</title>
+    <error-item href="#passport-issued-day">The date your passport was issued must be in the past</error-item>
+    <error-item href="#postcode-input">Enter a postcode, like AA1 1AA</error-item>
 </govuk-error-summary>
diff --git a/src/GovUk.Frontend.AspNetCore.DocSamples/Pages/Fieldset/Fieldset.cshtml b/src/GovUk.Frontend.AspNetCore.DocSamples/Pages/Fieldset/Fieldset.cshtml
index 5548888e5..e22b2c381 100644
--- a/src/GovUk.Frontend.AspNetCore.DocSamples/Pages/Fieldset/Fieldset.cshtml
+++ b/src/GovUk.Frontend.AspNetCore.DocSamples/Pages/Fieldset/Fieldset.cshtml
@@ -1,5 +1,5 @@
 @page
 
 <govuk-fieldset>
-    <govuk-fieldset-legend is-page-heading="true" class="govuk-fieldset__legend--l">Legend as page heading</govuk-fieldset-legend>
+    <legend is-page-heading="true" class="govuk-fieldset__legend--l">Legend as page heading</legend>
 </govuk-fieldset>
diff --git a/src/GovUk.Frontend.AspNetCore.DocSamples/Pages/FileUpload/FileUpload.cshtml b/src/GovUk.Frontend.AspNetCore.DocSamples/Pages/FileUpload/FileUpload.cshtml
index c24c9aad2..cc59c98dc 100644
--- a/src/GovUk.Frontend.AspNetCore.DocSamples/Pages/FileUpload/FileUpload.cshtml
+++ b/src/GovUk.Frontend.AspNetCore.DocSamples/Pages/FileUpload/FileUpload.cshtml
@@ -1,5 +1,5 @@
 @page
 
 <govuk-file-upload name="FileUpload1">
-    <govuk-file-upload-label>Upload a file</govuk-file-upload-label>
+    <label>Upload a file</label>
 </govuk-file-upload>
diff --git a/src/GovUk.Frontend.AspNetCore.DocSamples/Pages/FileUpload/FileUploadWithErrors.cshtml b/src/GovUk.Frontend.AspNetCore.DocSamples/Pages/FileUpload/FileUploadWithErrors.cshtml
index cb9a6b24e..24ff26b6f 100644
--- a/src/GovUk.Frontend.AspNetCore.DocSamples/Pages/FileUpload/FileUploadWithErrors.cshtml
+++ b/src/GovUk.Frontend.AspNetCore.DocSamples/Pages/FileUpload/FileUploadWithErrors.cshtml
@@ -1,6 +1,6 @@
 @page
 
 <govuk-file-upload name="FileUpload1">
-    <govuk-file-upload-label>Upload a file</govuk-file-upload-label>
-    <govuk-file-upload-error-message>The CSV must be smaller than 2MB</govuk-file-upload-error-message>
+    <label>Upload a file</label>
+    <error-message>The CSV must be smaller than 2MB</error-message>
 </govuk-file-upload>
diff --git a/src/GovUk.Frontend.AspNetCore.DocSamples/Pages/NotificationBanner/NotificationBannerWithOverridenTitle.cshtml b/src/GovUk.Frontend.AspNetCore.DocSamples/Pages/NotificationBanner/NotificationBannerWithOverridenTitle.cshtml
index 12c059cb3..1ce9f602d 100644
--- a/src/GovUk.Frontend.AspNetCore.DocSamples/Pages/NotificationBanner/NotificationBannerWithOverridenTitle.cshtml
+++ b/src/GovUk.Frontend.AspNetCore.DocSamples/Pages/NotificationBanner/NotificationBannerWithOverridenTitle.cshtml
@@ -1,9 +1,9 @@
 @page
 
 <govuk-notification-banner>
-    <govuk-notification-banner-title heading-level="2" id="banner-title">
+    <title heading-level="2" id="banner-title">
         Important information
-    </govuk-notification-banner-title>
+    </title>
     <p class="govuk-notification-banner__heading">
         You have 7 days left to send your application.
         <a class="govuk-notification-banner__link" href="#">View application</a>.
diff --git a/src/GovUk.Frontend.AspNetCore.DocSamples/Pages/Pagination/Pagination.cshtml b/src/GovUk.Frontend.AspNetCore.DocSamples/Pages/Pagination/Pagination.cshtml
index 9c8e861f6..7608c946b 100644
--- a/src/GovUk.Frontend.AspNetCore.DocSamples/Pages/Pagination/Pagination.cshtml
+++ b/src/GovUk.Frontend.AspNetCore.DocSamples/Pages/Pagination/Pagination.cshtml
@@ -1,9 +1,9 @@
 @page
 
 <govuk-pagination>
-    <govuk-pagination-previous href="#" />
-    <govuk-pagination-item href="#">1</govuk-pagination-item>
-    <govuk-pagination-item href="#" is-current="true">2</govuk-pagination-item>
-    <govuk-pagination-item href="#">3</govuk-pagination-item>
-    <govuk-pagination-next href="#" />
+    <previous href="#" />
+    <pagination-item href="#">1</pagination-item>
+    <pagination-item href="#" is-current="true">2</pagination-item>
+    <pagination-item href="#">3</pagination-item>
+    <next href="#" />
 </govuk-pagination>
diff --git a/src/GovUk.Frontend.AspNetCore.DocSamples/Pages/Pagination/Stacked.cshtml b/src/GovUk.Frontend.AspNetCore.DocSamples/Pages/Pagination/Stacked.cshtml
index f78f0ce94..f55e0b595 100644
--- a/src/GovUk.Frontend.AspNetCore.DocSamples/Pages/Pagination/Stacked.cshtml
+++ b/src/GovUk.Frontend.AspNetCore.DocSamples/Pages/Pagination/Stacked.cshtml
@@ -1,6 +1,6 @@
 @page
 
 <govuk-pagination>
-    <govuk-pagination-previous href="#" label-text="Applying for a provisional lorry or bus licence" />
-    <govuk-pagination-next href="#" label-text="Driver CPC part 1 test: theory" />
+    <previous href="#" label-text="Applying for a provisional lorry or bus licence" />
+    <next href="#" label-text="Driver CPC part 1 test: theory" />
 </govuk-pagination>
diff --git a/src/GovUk.Frontend.AspNetCore.DocSamples/Pages/Pagination/WithEllipsis.cshtml b/src/GovUk.Frontend.AspNetCore.DocSamples/Pages/Pagination/WithEllipsis.cshtml
index 9d3c7cc94..39df38a6b 100644
--- a/src/GovUk.Frontend.AspNetCore.DocSamples/Pages/Pagination/WithEllipsis.cshtml
+++ b/src/GovUk.Frontend.AspNetCore.DocSamples/Pages/Pagination/WithEllipsis.cshtml
@@ -1,13 +1,13 @@
 @page
 
 <govuk-pagination>
-    <govuk-pagination-previous href="#" />
-    <govuk-pagination-item href="#">1</govuk-pagination-item>
-    <govuk-pagination-ellipsis />
-    <govuk-pagination-item href="#">6</govuk-pagination-item>
-    <govuk-pagination-item href="#" is-current="true">7</govuk-pagination-item>
-    <govuk-pagination-item href="#">8</govuk-pagination-item>
-    <govuk-pagination-ellipsis />
-    <govuk-pagination-item href="#">42</govuk-pagination-item>
-    <govuk-pagination-next href="#" />
+    <previous href="#" />
+    <pagination-item href="#">1</pagination-item>
+    <ellipsis />
+    <pagination-item href="#">6</pagination-item>
+    <pagination-item href="#" is-current="true">7</pagination-item>
+    <pagination-item href="#">8</pagination-item>
+    <ellipsis />
+    <pagination-item href="#">42</pagination-item>
+    <next href="#" />
 </govuk-pagination>
diff --git a/src/GovUk.Frontend.AspNetCore.DocSamples/Pages/Panel/Panel.cshtml b/src/GovUk.Frontend.AspNetCore.DocSamples/Pages/Panel/Panel.cshtml
index 11550ce40..d0395cf6e 100644
--- a/src/GovUk.Frontend.AspNetCore.DocSamples/Pages/Panel/Panel.cshtml
+++ b/src/GovUk.Frontend.AspNetCore.DocSamples/Pages/Panel/Panel.cshtml
@@ -1,8 +1,8 @@
 @page
 
 <govuk-panel heading-level="2">
-    <govuk-panel-title>Application complete</govuk-panel-title>
-    <govuk-panel-body>
+    <title>Application complete</title>
+    <body>
         Your reference number<br><strong>HDJ2123F</strong>
-    </govuk-panel-body>
+    </body>
 </govuk-panel>
diff --git a/src/GovUk.Frontend.AspNetCore.DocSamples/Pages/PhaseBanner/PhaseBanner.cshtml b/src/GovUk.Frontend.AspNetCore.DocSamples/Pages/PhaseBanner/PhaseBanner.cshtml
index 90a2e7c09..13877c186 100644
--- a/src/GovUk.Frontend.AspNetCore.DocSamples/Pages/PhaseBanner/PhaseBanner.cshtml
+++ b/src/GovUk.Frontend.AspNetCore.DocSamples/Pages/PhaseBanner/PhaseBanner.cshtml
@@ -1,6 +1,6 @@
 @page
 
 <govuk-phase-banner>
-    <govuk-phase-banner-tag>Alpha</govuk-phase-banner-tag>
+    <tag>Alpha</tag>
     This is a new service - your <a href="#" class="govuk-link">feedback</a> will help us to improve it.
 </govuk-phase-banner>
diff --git a/src/GovUk.Frontend.AspNetCore.DocSamples/Pages/Radios/Radios.cshtml b/src/GovUk.Frontend.AspNetCore.DocSamples/Pages/Radios/Radios.cshtml
index abcb259a6..a7f16d828 100644
--- a/src/GovUk.Frontend.AspNetCore.DocSamples/Pages/Radios/Radios.cshtml
+++ b/src/GovUk.Frontend.AspNetCore.DocSamples/Pages/Radios/Radios.cshtml
@@ -1,20 +1,20 @@
 @page
 
 <govuk-radios name="where-do-you-live">
-    <govuk-radios-fieldset>
-        <govuk-radios-fieldset-legend is-page-heading="true" class="govuk-fieldset__legend--l">
+    <radios-fieldset>
+        <legend is-page-heading="true" class="govuk-fieldset__legend--l">
             Where do you live?
-        </govuk-radios-fieldset-legend>
+        </legend>
 
-        <govuk-radios-hint>
+        <hint>
             Select one option.
-        </govuk-radios-hint>
+        </hint>
 
-        <govuk-radios-item value="england">England</govuk-radios-item>
-        <govuk-radios-item value="scotland">Scotland</govuk-radios-item>
-        <govuk-radios-item value="wales">Wales</govuk-radios-item>
-        <govuk-radios-item value="northern-ireland">Northern Ireland</govuk-radios-item>
-        <govuk-radios-divider>or</govuk-radios-divider>
-        <govuk-radios-item value="abroad">I am a British citizen living abroad</govuk-radios-item>
-    </govuk-radios-fieldset>
+        <radios-item value="england">England</radios-item>
+        <radios-item value="scotland">Scotland</radios-item>
+        <radios-item value="wales">Wales</radios-item>
+        <radios-item value="northern-ireland">Northern Ireland</radios-item>
+        <radios-divider>or</radios-divider>
+        <radios-item value="abroad">I am a British citizen living abroad</radios-item>
+    </radios-fieldset>
 </govuk-radios>
diff --git a/src/GovUk.Frontend.AspNetCore.DocSamples/Pages/Radios/RadiosWithConditional.cshtml b/src/GovUk.Frontend.AspNetCore.DocSamples/Pages/Radios/RadiosWithConditional.cshtml
index 02a8ecdcf..49dc73c55 100644
--- a/src/GovUk.Frontend.AspNetCore.DocSamples/Pages/Radios/RadiosWithConditional.cshtml
+++ b/src/GovUk.Frontend.AspNetCore.DocSamples/Pages/Radios/RadiosWithConditional.cshtml
@@ -1,41 +1,41 @@
 @page
 
 <govuk-radios name="how-contacted" id-prefix="contact">
-    <govuk-radios-fieldset>
-        <govuk-radios-fieldset-legend is-page-heading="true" class="govuk-fieldset__legend--l">
+    <radios-fieldset>
+        <legend is-page-heading="true" class="govuk-fieldset__legend--l">
             How would you prefer to be contacted?
-        </govuk-radios-fieldset-legend>
+        </legend>
 
-        <govuk-radios-hint>
+        <hint>
             Select one option.
-        </govuk-radios-hint>
+        </hint>
 
-        <govuk-radios-item value="email">
+        <radios-item value="email">
             Email
-            <govuk-radios-item-conditional>
+            <conditional>
                 <govuk-input id="contact-by-email" name="contact-by-email" type="email" autocomplete="email" spellcheck="false" class="govuk-!-width-one-half">
-                    <govuk-input-label>Email address</govuk-input-label>
-                    <govuk-input-error-message>Email address cannot be blank</govuk-input-error-message>
+                    <label>Email address</label>
+                    <error-message>Email address cannot be blank</error-message>
                 </govuk-input>
-            </govuk-radios-item-conditional>
-        </govuk-radios-item>
+            </conditional>
+        </radios-item>
 
-        <govuk-radios-item value="phone">
+        <radios-item value="phone">
             Phone
-            <govuk-radios-item-conditional>
+            <conditional>
                 <govuk-input id="contact-by-phone" name="contact-by-phone" type="tel" autocomplete="tel" class="govuk-!-width-one-third">
-                    <govuk-input-label>Phone number</govuk-input-label>
+                    <label>Phone number</label>
                 </govuk-input>
-            </govuk-radios-item-conditional>
-        </govuk-radios-item>
+            </conditional>
+        </radios-item>
 
-        <govuk-radios-item value="text">
+        <radios-item value="text">
             Text message
-            <govuk-radios-item-conditional>
+            <conditional>
                 <govuk-input id="contact-by-text" name="contact-by-text" type="tel" autocomplete="tel" class="govuk-!-width-one-third">
-                    <govuk-input-label>Mobile phone number</govuk-input-label>
+                    <label>Mobile phone number</label>
                 </govuk-input>
-            </govuk-radios-item-conditional>
-        </govuk-radios-item>
-    </govuk-radios-fieldset>
+            </conditional>
+        </radios-item>
+    </radios-fieldset>
 </govuk-radios>
diff --git a/src/GovUk.Frontend.AspNetCore.DocSamples/Pages/Radios/RadiosWithError.cshtml b/src/GovUk.Frontend.AspNetCore.DocSamples/Pages/Radios/RadiosWithError.cshtml
index 224ed325a..a37aac6be 100644
--- a/src/GovUk.Frontend.AspNetCore.DocSamples/Pages/Radios/RadiosWithError.cshtml
+++ b/src/GovUk.Frontend.AspNetCore.DocSamples/Pages/Radios/RadiosWithError.cshtml
@@ -1,22 +1,22 @@
 @page
 
 <govuk-radios name="where-do-you-live">
-    <govuk-radios-fieldset>
-        <govuk-radios-fieldset-legend is-page-heading="true" class="govuk-fieldset__legend--l">
+    <radios-fieldset>
+        <legend is-page-heading="true" class="govuk-fieldset__legend--l">
             Where do you live?
-        </govuk-radios-fieldset-legend>
+        </legend>
 
-        <govuk-radios-hint>
+        <hint>
             Select one option.
-        </govuk-radios-hint>
+        </hint>
 
-        <govuk-radios-error-message>
+        <error-message>
             Select the country where you live
-        </govuk-radios-error-message>
+        </error-message>
 
-        <govuk-radios-item value="england">England</govuk-radios-item>
-        <govuk-radios-item value="scotland">Scotland</govuk-radios-item>
-        <govuk-radios-item value="wales">Wales</govuk-radios-item>
-        <govuk-radios-item value="northern-ireland">Northern Ireland</govuk-radios-item>
-    </govuk-radios-fieldset>
+        <radios-item value="england">England</radios-item>
+        <radios-item value="scotland">Scotland</radios-item>
+        <radios-item value="wales">Wales</radios-item>
+        <radios-item value="northern-ireland">Northern Ireland</radios-item>
+    </radios-fieldset>
 </govuk-radios>
diff --git a/src/GovUk.Frontend.AspNetCore.DocSamples/Pages/Select/Select.cshtml b/src/GovUk.Frontend.AspNetCore.DocSamples/Pages/Select/Select.cshtml
index 4f761faf0..48d88518d 100644
--- a/src/GovUk.Frontend.AspNetCore.DocSamples/Pages/Select/Select.cshtml
+++ b/src/GovUk.Frontend.AspNetCore.DocSamples/Pages/Select/Select.cshtml
@@ -1,9 +1,9 @@
 @page
 
 <govuk-select name="Sort">
-    <govuk-select-label>Sort by</govuk-select-label>
-    <govuk-select-item value="published">Recently published</govuk-select-item>
-    <govuk-select-item value="updated" selected="true">Recently updated</govuk-select-item>
-    <govuk-select-item value="views">Most views</govuk-select-item>
-    <govuk-select-item value="comments">Most comments</govuk-select-item>
+    <label>Sort by</label>
+    <select-item value="published">Recently published</select-item>
+    <select-item value="updated" selected="true">Recently updated</select-item>
+    <select-item value="views">Most views</select-item>
+    <select-item value="comments">Most comments</select-item>
 </govuk-select>
diff --git a/src/GovUk.Frontend.AspNetCore.DocSamples/Pages/SummaryList/SummaryListWithActions.cshtml b/src/GovUk.Frontend.AspNetCore.DocSamples/Pages/SummaryList/SummaryListWithActions.cshtml
index a18da139b..0f46c4797 100644
--- a/src/GovUk.Frontend.AspNetCore.DocSamples/Pages/SummaryList/SummaryListWithActions.cshtml
+++ b/src/GovUk.Frontend.AspNetCore.DocSamples/Pages/SummaryList/SummaryListWithActions.cshtml
@@ -1,48 +1,48 @@
 @page
 
 <govuk-summary-list>
-    <govuk-summary-list-row>
-        <govuk-summary-list-row-key>
+    <summary-list-row>
+        <key>
             Name
-        </govuk-summary-list-row-key>
-        <govuk-summary-list-row-value>
+        </key>
+        <value>
             Sarah Philips
-        </govuk-summary-list-row-value>
-        <govuk-summary-list-row-actions>
-            <govuk-summary-list-row-action href="#" visually-hidden-text="name">Change</govuk-summary-list-row-action>
-        </govuk-summary-list-row-actions>
-    </govuk-summary-list-row>
-    <govuk-summary-list-row>
-        <govuk-summary-list-row-key>
+        </value>
+        <actions>
+            <action href="#" visually-hidden-text="name">Change</action>
+        </actions>
+    </summary-list-row>
+    <summary-list-row>
+        <key>
             Date of birth
-        </govuk-summary-list-row-key>
-        <govuk-summary-list-row-value>
+        </key>
+        <value>
             5 January 1978
-        </govuk-summary-list-row-value>
-        <govuk-summary-list-row-actions>
-            <govuk-summary-list-row-action href="#" visually-hidden-text="date of birth">Change</govuk-summary-list-row-action>
-        </govuk-summary-list-row-actions>
-    </govuk-summary-list-row>
-    <govuk-summary-list-row>
-        <govuk-summary-list-row-key>
+        </value>
+        <actions>
+            <action href="#" visually-hidden-text="date of birth">Change</action>
+        </actions>
+    </summary-list-row>
+    <summary-list-row>
+        <key>
             Contact information
-        </govuk-summary-list-row-key>
-        <govuk-summary-list-row-value>
+        </key>
+        <value>
             72 Guild Street<br>London<br>SE23 6FH
-        </govuk-summary-list-row-value>
-        <govuk-summary-list-row-actions>
-            <govuk-summary-list-row-action href="#" visually-hidden-text="contact information">Change</govuk-summary-list-row-action>
-        </govuk-summary-list-row-actions>
-    </govuk-summary-list-row>
-    <govuk-summary-list-row>
-        <govuk-summary-list-row-key>
+        </value>
+        <actions>
+            <action href="#" visually-hidden-text="contact information">Change</action>
+        </actions>
+    </summary-list-row>
+    <summary-list-row>
+        <key>
             Contact details
-        </govuk-summary-list-row-key>
-        <govuk-summary-list-row-value>
+        </key>
+        <value>
             <p class="govuk-body">07700 900457</p><p class="govuk-body">sarah.phillips@example.com</p>
-        </govuk-summary-list-row-value>
-        <govuk-summary-list-row-actions>
-            <govuk-summary-list-row-action href="#" visually-hidden-text="contact details">Change</govuk-summary-list-row-action>
-        </govuk-summary-list-row-actions>
-    </govuk-summary-list-row>
+        </value>
+        <actions>
+            <action href="#" visually-hidden-text="contact details">Change</action>
+        </actions>
+    </summary-list-row>
 </govuk-summary-list>
diff --git a/src/GovUk.Frontend.AspNetCore.DocSamples/Pages/SummaryList/SummaryListWithoutActions.cshtml b/src/GovUk.Frontend.AspNetCore.DocSamples/Pages/SummaryList/SummaryListWithoutActions.cshtml
index 6f56e876f..4d8c801b6 100644
--- a/src/GovUk.Frontend.AspNetCore.DocSamples/Pages/SummaryList/SummaryListWithoutActions.cshtml
+++ b/src/GovUk.Frontend.AspNetCore.DocSamples/Pages/SummaryList/SummaryListWithoutActions.cshtml
@@ -1,36 +1,36 @@
 @page
 
 <govuk-summary-list>
-    <govuk-summary-list-row>
-        <govuk-summary-list-row-key>
+    <summary-list-row>
+        <key>
             Name
-        </govuk-summary-list-row-key>
-        <govuk-summary-list-row-value>
+        </key>
+        <value>
             Sarah Philips
-        </govuk-summary-list-row-value>
-    </govuk-summary-list-row>
-    <govuk-summary-list-row>
-        <govuk-summary-list-row-key>
+        </value>
+    </summary-list-row>
+    <summary-list-row>
+        <key>
             Date of birth
-        </govuk-summary-list-row-key>
-        <govuk-summary-list-row-value>
+        </key>
+        <value>
             5 January 1978
-        </govuk-summary-list-row-value>
-    </govuk-summary-list-row>
-    <govuk-summary-list-row>
-        <govuk-summary-list-row-key>
+        </value>
+    </summary-list-row>
+    <summary-list-row>
+        <key>
             Contact information
-        </govuk-summary-list-row-key>
-        <govuk-summary-list-row-value>
+        </key>
+        <value>
             72 Guild Street<br>London<br>SE23 6FH
-        </govuk-summary-list-row-value>
-    </govuk-summary-list-row>
-    <govuk-summary-list-row>
-        <govuk-summary-list-row-key>
+        </value>
+    </summary-list-row>
+    <summary-list-row>
+        <key>
             Contact details
-        </govuk-summary-list-row-key>
-        <govuk-summary-list-row-value>
+        </key>
+        <value>
             <p class="govuk-body">07700 900457</p><p class="govuk-body">sarah.phillips@example.com</p>
-        </govuk-summary-list-row-value>
-    </govuk-summary-list-row>
+        </value>
+    </summary-list-row>
 </govuk-summary-list>
diff --git a/src/GovUk.Frontend.AspNetCore.DocSamples/Pages/TextArea/TextArea.cshtml b/src/GovUk.Frontend.AspNetCore.DocSamples/Pages/TextArea/TextArea.cshtml
index cb561c745..5fb8578bd 100644
--- a/src/GovUk.Frontend.AspNetCore.DocSamples/Pages/TextArea/TextArea.cshtml
+++ b/src/GovUk.Frontend.AspNetCore.DocSamples/Pages/TextArea/TextArea.cshtml
@@ -1,10 +1,10 @@
 @page
 
 <govuk-textarea name="more-detail">
-    <govuk-textarea-label class="govuk-label--l" is-page-heading="true">
+    <label class="govuk-label--l" is-page-heading="true">
         Can you provide more detail?
-    </govuk-textarea-label>
-    <govuk-textarea-hint>
+    </label>
+    <hint>
         Do not include personal or financial information like your National Insurance number or credit card details.
-    </govuk-textarea-hint>
+    </hint>
 </govuk-textarea>
diff --git a/src/GovUk.Frontend.AspNetCore.DocSamples/Pages/TextInput/TextInput.cshtml b/src/GovUk.Frontend.AspNetCore.DocSamples/Pages/TextInput/TextInput.cshtml
index 88f2e13c1..665c58de3 100644
--- a/src/GovUk.Frontend.AspNetCore.DocSamples/Pages/TextInput/TextInput.cshtml
+++ b/src/GovUk.Frontend.AspNetCore.DocSamples/Pages/TextInput/TextInput.cshtml
@@ -1,6 +1,6 @@
 @page
 
 <govuk-input name="AccountNumber" input-class="govuk-input--width-10" inputmode="numeric" pattern="[0-9]*" spellcheck="false">
-    <govuk-input-label is-page-heading="true" class="govuk-label--l">What is your account number?</govuk-input-label>
-    <govuk-input-hint>Must be between 6 and 8 digits long</govuk-input-hint>
+    <label is-page-heading="true" class="govuk-label--l">What is your account number?</label>
+    <hint>Must be between 6 and 8 digits long</hint>
 </govuk-input>
diff --git a/src/GovUk.Frontend.AspNetCore.DocSamples/Pages/TextInput/TextInputWithError.cshtml b/src/GovUk.Frontend.AspNetCore.DocSamples/Pages/TextInput/TextInputWithError.cshtml
index dc40252a8..bc6944c02 100644
--- a/src/GovUk.Frontend.AspNetCore.DocSamples/Pages/TextInput/TextInputWithError.cshtml
+++ b/src/GovUk.Frontend.AspNetCore.DocSamples/Pages/TextInput/TextInputWithError.cshtml
@@ -1,7 +1,7 @@
 @page
 
 <govuk-input name="EventName">
-    <govuk-input-label is-page-heading="true" class="govuk-label--l">What is the name of the event?</govuk-input-label>
-    <govuk-input-hint>The name you’ll use on promotional material.</govuk-input-hint>
-    <govuk-input-error-message>Enter an event name</govuk-input-error-message>
+    <label is-page-heading="true" class="govuk-label--l">What is the name of the event?</label>
+    <hint>The name you’ll use on promotional material.</hint>
+    <error-message>Enter an event name</error-message>
 </govuk-input>
diff --git a/src/GovUk.Frontend.AspNetCore.DocSamples/Pages/TextInput/TextInputWithPrefixAndSuffix.cshtml b/src/GovUk.Frontend.AspNetCore.DocSamples/Pages/TextInput/TextInputWithPrefixAndSuffix.cshtml
index 65053a73f..a0824c8cd 100644
--- a/src/GovUk.Frontend.AspNetCore.DocSamples/Pages/TextInput/TextInputWithPrefixAndSuffix.cshtml
+++ b/src/GovUk.Frontend.AspNetCore.DocSamples/Pages/TextInput/TextInputWithPrefixAndSuffix.cshtml
@@ -1,7 +1,7 @@
 @page
 
 <govuk-input name="AccountNumber" input-class="govuk-input--width-5" spellcheck="false">
-    <govuk-input-label is-page-heading="true" class="govuk-label--l">What is the cost per item, in pounds?</govuk-input-label>
-    <govuk-input-prefix>&pound;</govuk-input-prefix>
-    <govuk-input-suffix>per item</govuk-input-suffix>
+    <label is-page-heading="true" class="govuk-label--l">What is the cost per item, in pounds?</label>
+    <prefix>&pound;</prefix>
+    <suffix>per item</suffix>
 </govuk-input>
diff --git a/src/GovUk.Frontend.AspNetCore/TagHelpers/AccordionItemHeadingTagHelper.cs b/src/GovUk.Frontend.AspNetCore/TagHelpers/AccordionItemHeadingTagHelper.cs
index b5ab717e7..ab2b9df64 100644
--- a/src/GovUk.Frontend.AspNetCore/TagHelpers/AccordionItemHeadingTagHelper.cs
+++ b/src/GovUk.Frontend.AspNetCore/TagHelpers/AccordionItemHeadingTagHelper.cs
@@ -7,9 +7,13 @@ namespace GovUk.Frontend.AspNetCore.TagHelpers
     /// Represents the heading in a GDS accordion component item.
     /// </summary>
     [HtmlTargetElement(TagName, ParentTag = AccordionItemTagHelper.TagName)]
+    [HtmlTargetElement(TagName, ParentTag = AccordionItemTagHelper.ShortTagName)]
+    [HtmlTargetElement(ShortTagName, ParentTag = AccordionItemTagHelper.TagName)]
+    [HtmlTargetElement(ShortTagName, ParentTag = AccordionItemTagHelper.ShortTagName)]
     public class AccordionItemHeadingTagHelper : TagHelper
     {
         internal const string TagName = "govuk-accordion-item-heading";
+        internal const string ShortTagName = "heading";
 
         /// <inheritdoc/>
         public override async Task ProcessAsync(TagHelperContext context, TagHelperOutput output)
diff --git a/src/GovUk.Frontend.AspNetCore/TagHelpers/AccordionItemSummaryTagHelper.cs b/src/GovUk.Frontend.AspNetCore/TagHelpers/AccordionItemSummaryTagHelper.cs
index 53fdfb7e0..480ee51dd 100644
--- a/src/GovUk.Frontend.AspNetCore/TagHelpers/AccordionItemSummaryTagHelper.cs
+++ b/src/GovUk.Frontend.AspNetCore/TagHelpers/AccordionItemSummaryTagHelper.cs
@@ -8,10 +8,14 @@ namespace GovUk.Frontend.AspNetCore.TagHelpers
     /// Represents the summary in a GDS accordion component item.
     /// </summary>
     [HtmlTargetElement(TagName, ParentTag = AccordionItemTagHelper.TagName)]
+    [HtmlTargetElement(TagName, ParentTag = AccordionItemTagHelper.ShortTagName)]
+    [HtmlTargetElement(ShortTagName, ParentTag = AccordionItemTagHelper.TagName)]
+    [HtmlTargetElement(ShortTagName, ParentTag = AccordionItemTagHelper.ShortTagName)]
     [OutputElementHint(ComponentGenerator.AccordionItemSummaryElement)]
     public class AccordionItemSummaryTagHelper : TagHelper
     {
         internal const string TagName = "govuk-accordion-item-summary";
+        internal const string ShortTagName = "summary";
 
         /// <inheritdoc/>
         public override async Task ProcessAsync(TagHelperContext context, TagHelperOutput output)
diff --git a/src/GovUk.Frontend.AspNetCore/TagHelpers/AccordionItemTagHelper.cs b/src/GovUk.Frontend.AspNetCore/TagHelpers/AccordionItemTagHelper.cs
index df464f7c7..bb710d6d5 100644
--- a/src/GovUk.Frontend.AspNetCore/TagHelpers/AccordionItemTagHelper.cs
+++ b/src/GovUk.Frontend.AspNetCore/TagHelpers/AccordionItemTagHelper.cs
@@ -9,10 +9,12 @@ namespace GovUk.Frontend.AspNetCore.TagHelpers
     /// Represents an item in a GDS accordion component.
     /// </summary>
     [HtmlTargetElement(TagName, ParentTag = AccordionTagHelper.TagName)]
+    [HtmlTargetElement(ShortTagName, ParentTag = AccordionTagHelper.TagName)]
     [OutputElementHint(ComponentGenerator.AccordionItemElement)]
     public class AccordionItemTagHelper : TagHelper
     {
         internal const string TagName = "govuk-accordion-item";
+        internal const string ShortTagName = "accordion-item";
 
         private const string ExpandedAttributeName = "expanded";
 
diff --git a/src/GovUk.Frontend.AspNetCore/TagHelpers/AccordionTagHelper.cs b/src/GovUk.Frontend.AspNetCore/TagHelpers/AccordionTagHelper.cs
index 2264a3419..08fde41a2 100644
--- a/src/GovUk.Frontend.AspNetCore/TagHelpers/AccordionTagHelper.cs
+++ b/src/GovUk.Frontend.AspNetCore/TagHelpers/AccordionTagHelper.cs
@@ -12,7 +12,7 @@ namespace GovUk.Frontend.AspNetCore.TagHelpers
     /// </summary>
     [HtmlTargetElement(TagName)]
     [OutputElementHint(ComponentGenerator.AccordionElement)]
-    [RestrictChildren(AccordionItemTagHelper.TagName)]
+    [RestrictChildren(AccordionItemTagHelper.TagName, AccordionItemTagHelper.ShortTagName)]
     public class AccordionTagHelper : TagHelper
     {
         internal const string TagName = "govuk-accordion";
diff --git a/src/GovUk.Frontend.AspNetCore/TagHelpers/BreadcrumbsItemTagHelper.cs b/src/GovUk.Frontend.AspNetCore/TagHelpers/BreadcrumbsItemTagHelper.cs
index 33126243f..6e39bf366 100644
--- a/src/GovUk.Frontend.AspNetCore/TagHelpers/BreadcrumbsItemTagHelper.cs
+++ b/src/GovUk.Frontend.AspNetCore/TagHelpers/BreadcrumbsItemTagHelper.cs
@@ -9,10 +9,12 @@ namespace GovUk.Frontend.AspNetCore.TagHelpers
     /// Represents an item in a GDS breadcrumbs component.
     /// </summary>
     [HtmlTargetElement(TagName, ParentTag = BreadcrumbsTagHelper.TagName)]
+    [HtmlTargetElement(ShortTagName, ParentTag = BreadcrumbsTagHelper.TagName)]
     //[OutputElementHint(ComponentGenerator.BreadcrumbsItemElement)]  // Omitted since it produces intellisense warnings
     public class BreadcrumbsItemTagHelper : TagHelper
     {
         internal const string TagName = "govuk-breadcrumbs-item";
+        internal const string ShortTagName = "breadcrumbs-item";
 
         private const string LinkAttributesPrefix = "link-";
 
diff --git a/src/GovUk.Frontend.AspNetCore/TagHelpers/BreadcrumbsTagHelper.cs b/src/GovUk.Frontend.AspNetCore/TagHelpers/BreadcrumbsTagHelper.cs
index 4a8645f26..11a4bb1b5 100644
--- a/src/GovUk.Frontend.AspNetCore/TagHelpers/BreadcrumbsTagHelper.cs
+++ b/src/GovUk.Frontend.AspNetCore/TagHelpers/BreadcrumbsTagHelper.cs
@@ -9,7 +9,7 @@ namespace GovUk.Frontend.AspNetCore.TagHelpers
     /// Generates a GDS breadcrumbs component.
     /// </summary>
     [HtmlTargetElement(TagName)]
-    [RestrictChildren(BreadcrumbsItemTagHelper.TagName)]
+    [RestrictChildren(BreadcrumbsItemTagHelper.TagName, BreadcrumbsItemTagHelper.ShortTagName)]
     [OutputElementHint(ComponentGenerator.BreadcrumbsElement)]
     public class BreadcrumbsTagHelper : TagHelper
     {
diff --git a/src/GovUk.Frontend.AspNetCore/TagHelpers/CharacterCountTagHelper.cs b/src/GovUk.Frontend.AspNetCore/TagHelpers/CharacterCountTagHelper.cs
index fc247fa87..bb81b8e49 100644
--- a/src/GovUk.Frontend.AspNetCore/TagHelpers/CharacterCountTagHelper.cs
+++ b/src/GovUk.Frontend.AspNetCore/TagHelpers/CharacterCountTagHelper.cs
@@ -11,7 +11,15 @@ namespace GovUk.Frontend.AspNetCore.TagHelpers
     /// Generates a GDS character count component.
     /// </summary>
     [HtmlTargetElement(TagName)]
-    [RestrictChildren(LabelTagName, HintTagName, ErrorMessageTagName, CharacterCountValueTagHelper.TagName)]
+    [RestrictChildren(
+        LabelTagName,
+        FormGroupLabelTagHelper.ShortTagName,
+        HintTagName,
+        FormGroupHintTagHelper.ShortTagName,
+        ErrorMessageTagName,
+        FormGroupErrorMessageTagHelper.ShortTagName,
+        CharacterCountValueTagHelper.TagName,
+        CharacterCountValueTagHelper.ShortTagName)]
     [OutputElementHint(ComponentGenerator.CharacterCountElement)]
     public class CharacterCountTagHelper : FormGroupTagHelperBase
     {
diff --git a/src/GovUk.Frontend.AspNetCore/TagHelpers/CharacterCountValueTagHelper.cs b/src/GovUk.Frontend.AspNetCore/TagHelpers/CharacterCountValueTagHelper.cs
index fdbe4e922..e7c799679 100644
--- a/src/GovUk.Frontend.AspNetCore/TagHelpers/CharacterCountValueTagHelper.cs
+++ b/src/GovUk.Frontend.AspNetCore/TagHelpers/CharacterCountValueTagHelper.cs
@@ -10,6 +10,7 @@ namespace GovUk.Frontend.AspNetCore.TagHelpers
     public class CharacterCountValueTagHelper : TagHelper
     {
         internal const string TagName = "govuk-character-count-value";
+        internal const string ShortTagName = "value";
 
         /// <inheritdoc/>
         public override async Task ProcessAsync(TagHelperContext context, TagHelperOutput output)
diff --git a/src/GovUk.Frontend.AspNetCore/TagHelpers/CheckboxesFieldsetLegendTagHelper.cs b/src/GovUk.Frontend.AspNetCore/TagHelpers/CheckboxesFieldsetLegendTagHelper.cs
index 2d41b8816..f65d1a6b9 100644
--- a/src/GovUk.Frontend.AspNetCore/TagHelpers/CheckboxesFieldsetLegendTagHelper.cs
+++ b/src/GovUk.Frontend.AspNetCore/TagHelpers/CheckboxesFieldsetLegendTagHelper.cs
@@ -8,10 +8,14 @@ namespace GovUk.Frontend.AspNetCore.TagHelpers
     /// Represents the legend in a GDS checkboxes component fieldset.
     /// </summary>
     [HtmlTargetElement(TagName, ParentTag = CheckboxesFieldsetTagHelper.TagName)]
+    [HtmlTargetElement(ShortTagName, ParentTag = CheckboxesFieldsetTagHelper.TagName)]
+    [HtmlTargetElement(TagName, ParentTag = CheckboxesFieldsetTagHelper.ShortTagName)]
+    [HtmlTargetElement(ShortTagName, ParentTag = CheckboxesFieldsetTagHelper.ShortTagName)]
     [OutputElementHint(ComponentGenerator.FieldsetLegendElement)]
     public class CheckboxesFieldsetLegendTagHelper : TagHelper
     {
         internal const string TagName = "govuk-checkboxes-fieldset-legend";
+        internal const string ShortTagName = "legend";
 
         private const string IsPageHeadingAttributeName = "is-page-heading";
 
diff --git a/src/GovUk.Frontend.AspNetCore/TagHelpers/CheckboxesFieldsetTagHelper.cs b/src/GovUk.Frontend.AspNetCore/TagHelpers/CheckboxesFieldsetTagHelper.cs
index 6ab5ca126..8850dc8bb 100644
--- a/src/GovUk.Frontend.AspNetCore/TagHelpers/CheckboxesFieldsetTagHelper.cs
+++ b/src/GovUk.Frontend.AspNetCore/TagHelpers/CheckboxesFieldsetTagHelper.cs
@@ -8,11 +8,23 @@ namespace GovUk.Frontend.AspNetCore.TagHelpers
     /// Represents the fieldset in a GDS checkboxes component.
     /// </summary>
     [HtmlTargetElement(TagName, ParentTag = CheckboxesTagHelper.TagName)]
-    [RestrictChildren(CheckboxesFieldsetLegendTagHelper.TagName, CheckboxesItemTagHelper.TagName, CheckboxesItemDividerTagHelper.TagName, CheckboxesTagHelper.HintTagName, CheckboxesTagHelper.ErrorMessageTagName)]
+    [HtmlTargetElement(ShortTagName, ParentTag = CheckboxesTagHelper.TagName)]
+    [RestrictChildren(
+        CheckboxesFieldsetLegendTagHelper.TagName,
+        CheckboxesFieldsetLegendTagHelper.ShortTagName,
+        CheckboxesItemTagHelper.TagName,
+        CheckboxesItemTagHelper.ShortTagName,
+        CheckboxesItemDividerTagHelper.TagName,
+        CheckboxesItemDividerTagHelper.ShortTagName,
+        CheckboxesTagHelper.HintTagName,
+        FormGroupHintTagHelper.ShortTagName,
+        CheckboxesTagHelper.ErrorMessageTagName,
+        FormGroupErrorMessageTagHelper.ShortTagName)]
     [OutputElementHint(ComponentGenerator.FieldsetElement)]
     public class CheckboxesFieldsetTagHelper : TagHelper
     {
         internal const string TagName = "govuk-checkboxes-fieldset";
+        internal const string ShortTagName = "checkboxes-fieldset";  // 'fieldset' clashes with FieldsetTagHelper
 
         /// <inheritdoc/>
         public override async Task ProcessAsync(TagHelperContext context, TagHelperOutput output)
diff --git a/src/GovUk.Frontend.AspNetCore/TagHelpers/CheckboxesItemConditionalTagHelper.cs b/src/GovUk.Frontend.AspNetCore/TagHelpers/CheckboxesItemConditionalTagHelper.cs
index 0ce7616a0..16db1145d 100644
--- a/src/GovUk.Frontend.AspNetCore/TagHelpers/CheckboxesItemConditionalTagHelper.cs
+++ b/src/GovUk.Frontend.AspNetCore/TagHelpers/CheckboxesItemConditionalTagHelper.cs
@@ -7,9 +7,13 @@ namespace GovUk.Frontend.AspNetCore.TagHelpers
     /// Represents the conditional reveal of a checkbox item in a GDS checkboxes component.
     /// </summary>
     [HtmlTargetElement(TagName, ParentTag = CheckboxesItemTagHelper.TagName)]
+    [HtmlTargetElement(ShortTagName, ParentTag = CheckboxesItemTagHelper.TagName)]
+    [HtmlTargetElement(TagName, ParentTag = CheckboxesItemTagHelper.ShortTagName)]
+    [HtmlTargetElement(ShortTagName, ParentTag = CheckboxesItemTagHelper.ShortTagName)]
     public class CheckboxesItemConditionalTagHelper : TagHelper
     {
         internal const string TagName = "govuk-checkboxes-item-conditional";
+        internal const string ShortTagName = "conditional";
 
         /// <inheritdoc/>
         public override async Task ProcessAsync(TagHelperContext context, TagHelperOutput output)
diff --git a/src/GovUk.Frontend.AspNetCore/TagHelpers/CheckboxesItemDividerTagHelper.cs b/src/GovUk.Frontend.AspNetCore/TagHelpers/CheckboxesItemDividerTagHelper.cs
index 29e6c2c14..f9262a983 100644
--- a/src/GovUk.Frontend.AspNetCore/TagHelpers/CheckboxesItemDividerTagHelper.cs
+++ b/src/GovUk.Frontend.AspNetCore/TagHelpers/CheckboxesItemDividerTagHelper.cs
@@ -9,10 +9,15 @@ namespace GovUk.Frontend.AspNetCore.TagHelpers
     /// </summary>
     [HtmlTargetElement(TagName, ParentTag = CheckboxesTagHelper.TagName)]
     [HtmlTargetElement(TagName, ParentTag = CheckboxesFieldsetTagHelper.TagName)]
+    [HtmlTargetElement(TagName, ParentTag = CheckboxesFieldsetTagHelper.ShortTagName)]
+    [HtmlTargetElement(ShortTagName, ParentTag = CheckboxesTagHelper.TagName)]
+    [HtmlTargetElement(ShortTagName, ParentTag = CheckboxesFieldsetTagHelper.TagName)]
+    [HtmlTargetElement(ShortTagName, ParentTag = CheckboxesFieldsetTagHelper.ShortTagName)]
     [OutputElementHint(ComponentGenerator.CheckboxesDividerItemElement)]
     public class CheckboxesItemDividerTagHelper : TagHelper
     {
         internal const string TagName = "govuk-checkboxes-divider";
+        internal const string ShortTagName = "checkboxes-divider";
 
         /// <inheritdoc/>
         public override async Task ProcessAsync(TagHelperContext context, TagHelperOutput output)
diff --git a/src/GovUk.Frontend.AspNetCore/TagHelpers/CheckboxesItemHintTagHelper.cs b/src/GovUk.Frontend.AspNetCore/TagHelpers/CheckboxesItemHintTagHelper.cs
index 4919b48f0..ec722f7be 100644
--- a/src/GovUk.Frontend.AspNetCore/TagHelpers/CheckboxesItemHintTagHelper.cs
+++ b/src/GovUk.Frontend.AspNetCore/TagHelpers/CheckboxesItemHintTagHelper.cs
@@ -8,10 +8,14 @@ namespace GovUk.Frontend.AspNetCore.TagHelpers
     /// Represents the hint of a checkbox item in a GDS checkboxes component.
     /// </summary>
     [HtmlTargetElement(TagName, ParentTag = CheckboxesItemTagHelper.TagName)]
+    [HtmlTargetElement(TagName, ParentTag = CheckboxesItemTagHelper.ShortTagName)]
+    [HtmlTargetElement(ShortTagName, ParentTag = CheckboxesItemTagHelper.TagName)]
+    [HtmlTargetElement(ShortTagName, ParentTag = CheckboxesItemTagHelper.ShortTagName)]
     [OutputElementHint(ComponentGenerator.HintElement)]
     public class CheckboxesItemHintTagHelper : TagHelper
     {
         internal const string TagName = "govuk-checkboxes-item-hint";
+        internal const string ShortTagName = "hint";
 
         /// <inheritdoc/>
         public override async Task ProcessAsync(TagHelperContext context, TagHelperOutput output)
diff --git a/src/GovUk.Frontend.AspNetCore/TagHelpers/CheckboxesItemTagHelper.cs b/src/GovUk.Frontend.AspNetCore/TagHelpers/CheckboxesItemTagHelper.cs
index 68f7eab0c..4f3377e78 100644
--- a/src/GovUk.Frontend.AspNetCore/TagHelpers/CheckboxesItemTagHelper.cs
+++ b/src/GovUk.Frontend.AspNetCore/TagHelpers/CheckboxesItemTagHelper.cs
@@ -16,10 +16,15 @@ namespace GovUk.Frontend.AspNetCore.TagHelpers
     /// </summary>
     [HtmlTargetElement(TagName, ParentTag = CheckboxesTagHelper.TagName)]
     [HtmlTargetElement(TagName, ParentTag = CheckboxesFieldsetTagHelper.TagName)]
+    [HtmlTargetElement(TagName, ParentTag = CheckboxesFieldsetTagHelper.ShortTagName)]
+    [HtmlTargetElement(ShortTagName, ParentTag = CheckboxesTagHelper.TagName)]
+    [HtmlTargetElement(ShortTagName, ParentTag = CheckboxesFieldsetTagHelper.TagName)]
+    [HtmlTargetElement(ShortTagName, ParentTag = CheckboxesFieldsetTagHelper.ShortTagName)]
     [OutputElementHint(ComponentGenerator.CheckboxesItemElement)]
     public class CheckboxesItemTagHelper : TagHelper
     {
         internal const string TagName = "govuk-checkboxes-item";
+        internal const string ShortTagName = "checkboxes-item";
 
         private const string CheckedAttributeName = "checked";
         private const string DisabledAttributeName = "disabled";
diff --git a/src/GovUk.Frontend.AspNetCore/TagHelpers/CheckboxesTagHelper.cs b/src/GovUk.Frontend.AspNetCore/TagHelpers/CheckboxesTagHelper.cs
index 49f78ad57..34105952d 100644
--- a/src/GovUk.Frontend.AspNetCore/TagHelpers/CheckboxesTagHelper.cs
+++ b/src/GovUk.Frontend.AspNetCore/TagHelpers/CheckboxesTagHelper.cs
@@ -1,4 +1,3 @@
-using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Diagnostics.CodeAnalysis;
@@ -13,7 +12,17 @@ namespace GovUk.Frontend.AspNetCore.TagHelpers
     /// Generates a GDS checkboxes component.
     /// </summary>
     [HtmlTargetElement(TagName)]
-    [RestrictChildren(CheckboxesFieldsetTagHelper.TagName, CheckboxesItemTagHelper.TagName, CheckboxesItemDividerTagHelper.TagName, HintTagName, ErrorMessageTagName)]
+    [RestrictChildren(
+        CheckboxesFieldsetTagHelper.TagName,
+        CheckboxesFieldsetTagHelper.ShortTagName,
+        CheckboxesItemTagHelper.TagName,
+        CheckboxesItemTagHelper.ShortTagName,
+        CheckboxesItemDividerTagHelper.TagName,
+        CheckboxesItemDividerTagHelper.ShortTagName,
+        HintTagName,
+        FormGroupHintTagHelper.ShortTagName,
+        ErrorMessageTagName,
+        FormGroupErrorMessageTagHelper.ShortTagName)]
     [OutputElementHint(ComponentGenerator.FormGroupElement)]
     public class CheckboxesTagHelper : FormGroupTagHelperBase
     {
diff --git a/src/GovUk.Frontend.AspNetCore/TagHelpers/DateInputContext.cs b/src/GovUk.Frontend.AspNetCore/TagHelpers/DateInputContext.cs
index b02d8102f..d8ec101b2 100644
--- a/src/GovUk.Frontend.AspNetCore/TagHelpers/DateInputContext.cs
+++ b/src/GovUk.Frontend.AspNetCore/TagHelpers/DateInputContext.cs
@@ -165,8 +165,11 @@ public override void SetLabel(
         internal static DateInputItemType GetItemTypeFromTagName(string tagName) => tagName switch
         {
             DateInputItemTagHelper.DayTagName => DateInputItemType.Day,
+            DateInputItemTagHelper.ShortDayTagName => DateInputItemType.Day,
             DateInputItemTagHelper.MonthTagName => DateInputItemType.Month,
+            DateInputItemTagHelper.ShortMonthTagName => DateInputItemType.Month,
             DateInputItemTagHelper.YearTagName => DateInputItemType.Year,
+            DateInputItemTagHelper.ShortYearTagName => DateInputItemType.Year,
             _ => throw new ArgumentException($"Unknown tag name: '{tagName}'.", nameof(tagName))
         };
 
diff --git a/src/GovUk.Frontend.AspNetCore/TagHelpers/DateInputErrorMessageTagHelper.cs b/src/GovUk.Frontend.AspNetCore/TagHelpers/DateInputErrorMessageTagHelper.cs
index 7938e58b5..97bec4e19 100644
--- a/src/GovUk.Frontend.AspNetCore/TagHelpers/DateInputErrorMessageTagHelper.cs
+++ b/src/GovUk.Frontend.AspNetCore/TagHelpers/DateInputErrorMessageTagHelper.cs
@@ -6,6 +6,10 @@ namespace GovUk.Frontend.AspNetCore.TagHelpers
     /// <inheritdoc/>
     [HtmlTargetElement(DateInputTagHelper.ErrorMessageTagName, ParentTag = DateInputTagHelper.TagName)]
     [HtmlTargetElement(DateInputTagHelper.ErrorMessageTagName, ParentTag = DateInputFieldsetTagHelper.TagName)]
+    [HtmlTargetElement(DateInputTagHelper.ErrorMessageTagName, ParentTag = DateInputFieldsetTagHelper.ShortTagName)]
+    [HtmlTargetElement(ShortTagName, ParentTag = DateInputTagHelper.TagName)]
+    [HtmlTargetElement(ShortTagName, ParentTag = DateInputFieldsetTagHelper.TagName)]
+    [HtmlTargetElement(ShortTagName, ParentTag = DateInputFieldsetTagHelper.ShortTagName)]
     [OutputElementHint(ComponentGenerator.ErrorMessageElement)]
     public class DateInputErrorMessageTagHelper : FormGroupErrorMessageTagHelper
     {
diff --git a/src/GovUk.Frontend.AspNetCore/TagHelpers/DateInputFieldsetLegendTagHelper.cs b/src/GovUk.Frontend.AspNetCore/TagHelpers/DateInputFieldsetLegendTagHelper.cs
index 76c1e4530..b33dfa2ab 100644
--- a/src/GovUk.Frontend.AspNetCore/TagHelpers/DateInputFieldsetLegendTagHelper.cs
+++ b/src/GovUk.Frontend.AspNetCore/TagHelpers/DateInputFieldsetLegendTagHelper.cs
@@ -8,10 +8,14 @@ namespace GovUk.Frontend.AspNetCore.TagHelpers
     /// Represents the legend in a GDS date input component's fieldset.
     /// </summary>
     [HtmlTargetElement(TagName, ParentTag = DateInputFieldsetTagHelper.TagName)]
+    [HtmlTargetElement(TagName, ParentTag = DateInputFieldsetTagHelper.ShortTagName)]
+    [HtmlTargetElement(ShortTagName, ParentTag = DateInputFieldsetTagHelper.TagName)]
+    [HtmlTargetElement(ShortTagName, ParentTag = DateInputFieldsetTagHelper.ShortTagName)]
     [OutputElementHint(ComponentGenerator.FieldsetLegendElement)]
     public class DateInputFieldsetLegendTagHelper : TagHelper
     {
         internal const string TagName = "govuk-date-input-fieldset-legend";
+        internal const string ShortTagName = "legend";
 
         private const string IsPageHeadingAttributeName = "is-page-heading";
 
diff --git a/src/GovUk.Frontend.AspNetCore/TagHelpers/DateInputFieldsetTagHelper.cs b/src/GovUk.Frontend.AspNetCore/TagHelpers/DateInputFieldsetTagHelper.cs
index a886116d1..ad05d00b1 100644
--- a/src/GovUk.Frontend.AspNetCore/TagHelpers/DateInputFieldsetTagHelper.cs
+++ b/src/GovUk.Frontend.AspNetCore/TagHelpers/DateInputFieldsetTagHelper.cs
@@ -8,17 +8,25 @@ namespace GovUk.Frontend.AspNetCore.TagHelpers
     /// Represents the fieldset in a GDS date input component.
     /// </summary>
     [HtmlTargetElement(TagName, ParentTag = DateInputTagHelper.TagName)]
+    [HtmlTargetElement(ShortTagName, ParentTag = DateInputTagHelper.TagName)]
     [RestrictChildren(
         DateInputFieldsetLegendTagHelper.TagName,
+        DateInputFieldsetLegendTagHelper.ShortTagName,
         DateInputTagHelper.HintTagName,
+        FormGroupHintTagHelper.ShortTagName,
         DateInputTagHelper.ErrorMessageTagName,
+        FormGroupErrorMessageTagHelper.ShortTagName,
         DateInputItemTagHelper.DayTagName,
+        DateInputItemTagHelper.ShortDayTagName,
         DateInputItemTagHelper.MonthTagName,
-        DateInputItemTagHelper.YearTagName)]
+        DateInputItemTagHelper.ShortMonthTagName,
+        DateInputItemTagHelper.YearTagName,
+        DateInputItemTagHelper.ShortYearTagName)]
     [OutputElementHint(ComponentGenerator.FieldsetElement)]
     public class DateInputFieldsetTagHelper : TagHelper
     {
         internal const string TagName = "govuk-date-input-fieldset";
+        internal const string ShortTagName = "date-input-fieldset";
 
         private const string DescribedByAttributeName = "described-by";
 
diff --git a/src/GovUk.Frontend.AspNetCore/TagHelpers/DateInputItemLabelTagHelper.cs b/src/GovUk.Frontend.AspNetCore/TagHelpers/DateInputItemLabelTagHelper.cs
index df6c29ef4..5f108396e 100644
--- a/src/GovUk.Frontend.AspNetCore/TagHelpers/DateInputItemLabelTagHelper.cs
+++ b/src/GovUk.Frontend.AspNetCore/TagHelpers/DateInputItemLabelTagHelper.cs
@@ -8,14 +8,24 @@ namespace GovUk.Frontend.AspNetCore.TagHelpers
     /// Represents the label in a GDS date input component item.
     /// </summary>
     [HtmlTargetElement(DayTagName, ParentTag = DateInputItemTagHelper.DayTagName)]
+    [HtmlTargetElement(DayTagName, ParentTag = DateInputItemTagHelper.ShortDayTagName)]
     [HtmlTargetElement(MonthTagName, ParentTag = DateInputItemTagHelper.MonthTagName)]
+    [HtmlTargetElement(MonthTagName, ParentTag = DateInputItemTagHelper.ShortMonthTagName)]
     [HtmlTargetElement(YearTagName, ParentTag = DateInputItemTagHelper.YearTagName)]
+    [HtmlTargetElement(YearTagName, ParentTag = DateInputItemTagHelper.ShortYearTagName)]
+    [HtmlTargetElement(ShortTagName, ParentTag = DateInputItemTagHelper.DayTagName)]
+    [HtmlTargetElement(ShortTagName, ParentTag = DateInputItemTagHelper.ShortDayTagName)]
+    [HtmlTargetElement(ShortTagName, ParentTag = DateInputItemTagHelper.MonthTagName)]
+    [HtmlTargetElement(ShortTagName, ParentTag = DateInputItemTagHelper.ShortMonthTagName)]
+    [HtmlTargetElement(ShortTagName, ParentTag = DateInputItemTagHelper.YearTagName)]
+    [HtmlTargetElement(ShortTagName, ParentTag = DateInputItemTagHelper.ShortYearTagName)]
     [OutputElementHint(ComponentGenerator.LabelElement)]
     public class DateInputItemLabelTagHelper : TagHelper
     {
         internal const string DayTagName = "govuk-date-input-day-label";
         internal const string MonthTagName = "govuk-date-input-month-label";
         internal const string YearTagName = "govuk-date-input-year-label";
+        internal const string ShortTagName = "label";
 
         /// <summary>
         /// Creates a <see cref="DateInputItemLabelTagHelper"/>.
diff --git a/src/GovUk.Frontend.AspNetCore/TagHelpers/DateInputItemTagHelper.cs b/src/GovUk.Frontend.AspNetCore/TagHelpers/DateInputItemTagHelper.cs
index ebd383f0e..1bf5057f2 100644
--- a/src/GovUk.Frontend.AspNetCore/TagHelpers/DateInputItemTagHelper.cs
+++ b/src/GovUk.Frontend.AspNetCore/TagHelpers/DateInputItemTagHelper.cs
@@ -12,17 +12,36 @@ namespace GovUk.Frontend.AspNetCore.TagHelpers
     /// </summary>
     [HtmlTargetElement(DayTagName, ParentTag = DateInputTagHelper.TagName)]
     [HtmlTargetElement(DayTagName, ParentTag = DateInputFieldsetTagHelper.TagName)]
+    [HtmlTargetElement(DayTagName, ParentTag = DateInputFieldsetTagHelper.ShortTagName)]
+    [HtmlTargetElement(ShortDayTagName, ParentTag = DateInputTagHelper.TagName)]
+    [HtmlTargetElement(ShortDayTagName, ParentTag = DateInputFieldsetTagHelper.TagName)]
+    [HtmlTargetElement(ShortDayTagName, ParentTag = DateInputFieldsetTagHelper.ShortTagName)]
     [HtmlTargetElement(MonthTagName, ParentTag = DateInputTagHelper.TagName)]
     [HtmlTargetElement(MonthTagName, ParentTag = DateInputFieldsetTagHelper.TagName)]
+    [HtmlTargetElement(MonthTagName, ParentTag = DateInputFieldsetTagHelper.ShortTagName)]
+    [HtmlTargetElement(ShortMonthTagName, ParentTag = DateInputTagHelper.TagName)]
+    [HtmlTargetElement(ShortMonthTagName, ParentTag = DateInputFieldsetTagHelper.TagName)]
+    [HtmlTargetElement(ShortMonthTagName, ParentTag = DateInputFieldsetTagHelper.ShortTagName)]
     [HtmlTargetElement(YearTagName, ParentTag = DateInputTagHelper.TagName)]
     [HtmlTargetElement(YearTagName, ParentTag = DateInputFieldsetTagHelper.TagName)]
+    [HtmlTargetElement(YearTagName, ParentTag = DateInputFieldsetTagHelper.ShortTagName)]
+    [HtmlTargetElement(ShortYearTagName, ParentTag = DateInputTagHelper.TagName)]
+    [HtmlTargetElement(ShortYearTagName, ParentTag = DateInputFieldsetTagHelper.TagName)]
+    [HtmlTargetElement(ShortYearTagName, ParentTag = DateInputFieldsetTagHelper.ShortTagName)]
     [OutputElementHint(ComponentGenerator.FormGroupElement)]
-    [RestrictChildren(DateInputItemLabelTagHelper.DayTagName, DateInputItemLabelTagHelper.MonthTagName, DateInputItemLabelTagHelper.YearTagName)]
+    [RestrictChildren(
+        DateInputItemLabelTagHelper.DayTagName,
+        DateInputItemLabelTagHelper.MonthTagName,
+        DateInputItemLabelTagHelper.YearTagName,
+        DateInputItemLabelTagHelper.ShortTagName)]
     public class DateInputItemTagHelper : TagHelper
     {
         internal const string DayTagName = "govuk-date-input-day";
+        internal const string ShortDayTagName = "day";
         internal const string MonthTagName = "govuk-date-input-month";
+        internal const string ShortMonthTagName = "month";
         internal const string YearTagName = "govuk-date-input-year";
+        internal const string ShortYearTagName = "year";
 
         private const string AutocompleteAttributeName = "autocomplete";
         private const string IdAttributeName = "id";
diff --git a/src/GovUk.Frontend.AspNetCore/TagHelpers/DateInputTagHelper.cs b/src/GovUk.Frontend.AspNetCore/TagHelpers/DateInputTagHelper.cs
index 5f32aa4c5..076f1270a 100644
--- a/src/GovUk.Frontend.AspNetCore/TagHelpers/DateInputTagHelper.cs
+++ b/src/GovUk.Frontend.AspNetCore/TagHelpers/DateInputTagHelper.cs
@@ -4,7 +4,6 @@
 using GovUk.Frontend.AspNetCore.HtmlGeneration;
 using GovUk.Frontend.AspNetCore.ModelBinding;
 using Microsoft.AspNetCore.Html;
-using Microsoft.AspNetCore.Mvc.ModelBinding;
 using Microsoft.AspNetCore.Mvc.Rendering;
 using Microsoft.AspNetCore.Razor.TagHelpers;
 using Microsoft.Extensions.Options;
@@ -17,11 +16,17 @@ namespace GovUk.Frontend.AspNetCore.TagHelpers
     [HtmlTargetElement(TagName)]
     [RestrictChildren(
         DateInputFieldsetTagHelper.TagName,
+        DateInputFieldsetTagHelper.ShortTagName,
         HintTagName,
+        FormGroupHintTagHelper.ShortTagName,
         ErrorMessageTagName,
+        FormGroupErrorMessageTagHelper.ShortTagName,
         DateInputItemTagHelper.DayTagName,
+        DateInputItemTagHelper.ShortDayTagName,
         DateInputItemTagHelper.MonthTagName,
-        DateInputItemTagHelper.YearTagName)]
+        DateInputItemTagHelper.ShortMonthTagName,
+        DateInputItemTagHelper.YearTagName,
+        DateInputItemTagHelper.ShortYearTagName)]
     [OutputElementHint(ComponentGenerator.FormGroupElement)]
     public class DateInputTagHelper : FormGroupTagHelperBase
     {
diff --git a/src/GovUk.Frontend.AspNetCore/TagHelpers/DetailsSummaryTagHelper.cs b/src/GovUk.Frontend.AspNetCore/TagHelpers/DetailsSummaryTagHelper.cs
index 1dac420eb..020aa31b0 100644
--- a/src/GovUk.Frontend.AspNetCore/TagHelpers/DetailsSummaryTagHelper.cs
+++ b/src/GovUk.Frontend.AspNetCore/TagHelpers/DetailsSummaryTagHelper.cs
@@ -8,10 +8,12 @@ namespace GovUk.Frontend.AspNetCore.TagHelpers
     /// Represents the summary in a GDS details component.
     /// </summary>
     [HtmlTargetElement(TagName, ParentTag = DetailsTagHelper.TagName)]
+    [HtmlTargetElement(ShortTagName, ParentTag = DetailsTagHelper.TagName)]
     [OutputElementHint(ComponentGenerator.DetailsSummaryElement)]
     public class DetailsSummaryTagHelper : TagHelper
     {
         internal const string TagName = "govuk-details-summary";
+        internal const string ShortTagName = "summary";
 
         /// <inheritdoc/>
         public override async Task ProcessAsync(TagHelperContext context, TagHelperOutput output)
diff --git a/src/GovUk.Frontend.AspNetCore/TagHelpers/DetailsTagHelper.cs b/src/GovUk.Frontend.AspNetCore/TagHelpers/DetailsTagHelper.cs
index 31152fc48..9009d30e1 100644
--- a/src/GovUk.Frontend.AspNetCore/TagHelpers/DetailsTagHelper.cs
+++ b/src/GovUk.Frontend.AspNetCore/TagHelpers/DetailsTagHelper.cs
@@ -9,7 +9,11 @@ namespace GovUk.Frontend.AspNetCore.TagHelpers
     /// Generates a GDS details component.
     /// </summary>
     [HtmlTargetElement(TagName)]
-    [RestrictChildren(DetailsSummaryTagHelper.TagName, DetailsTextTagHelper.TagName)]
+    [RestrictChildren(
+        DetailsSummaryTagHelper.TagName,
+        DetailsSummaryTagHelper.ShortTagName,
+        DetailsTextTagHelper.TagName,
+        DetailsTextTagHelper.ShortTagName)]
     [OutputElementHint(ComponentGenerator.DetailsElement)]
     public class DetailsTagHelper : TagHelper
     {
diff --git a/src/GovUk.Frontend.AspNetCore/TagHelpers/DetailsTextTagHelper.cs b/src/GovUk.Frontend.AspNetCore/TagHelpers/DetailsTextTagHelper.cs
index d730d73ed..52a2c85b3 100644
--- a/src/GovUk.Frontend.AspNetCore/TagHelpers/DetailsTextTagHelper.cs
+++ b/src/GovUk.Frontend.AspNetCore/TagHelpers/DetailsTextTagHelper.cs
@@ -8,10 +8,12 @@ namespace GovUk.Frontend.AspNetCore.TagHelpers
     /// Represents the text in a GDS details component.
     /// </summary>
     [HtmlTargetElement(TagName, ParentTag = DetailsTagHelper.TagName)]
+    [HtmlTargetElement(ShortTagName, ParentTag = DetailsTagHelper.TagName)]
     [OutputElementHint(ComponentGenerator.DetailsTextElement)]
     public class DetailsTextTagHelper : TagHelper
     {
         internal const string TagName = "govuk-details-text";
+        internal const string ShortTagName = "text";
 
         /// <inheritdoc/>
         public override async Task ProcessAsync(TagHelperContext context, TagHelperOutput output)
diff --git a/src/GovUk.Frontend.AspNetCore/TagHelpers/ErrorSummaryDescriptionTagHelper.cs b/src/GovUk.Frontend.AspNetCore/TagHelpers/ErrorSummaryDescriptionTagHelper.cs
index 920398b08..106d7564c 100644
--- a/src/GovUk.Frontend.AspNetCore/TagHelpers/ErrorSummaryDescriptionTagHelper.cs
+++ b/src/GovUk.Frontend.AspNetCore/TagHelpers/ErrorSummaryDescriptionTagHelper.cs
@@ -7,9 +7,11 @@ namespace GovUk.Frontend.AspNetCore.TagHelpers
     /// Represents the description in a GDS error summary component.
     /// </summary>
     [HtmlTargetElement(TagName, ParentTag = ErrorSummaryTagHelper.TagName)]
+    [HtmlTargetElement(ShortTagName, ParentTag = ErrorSummaryTagHelper.TagName)]
     public class ErrorSummaryDescriptionTagHelper : TagHelper
     {
         internal const string TagName = "govuk-error-summary-description";
+        internal const string ShortTagName = "description";
 
         /// <inheritdoc/>
         public override async Task ProcessAsync(TagHelperContext context, TagHelperOutput output)
diff --git a/src/GovUk.Frontend.AspNetCore/TagHelpers/ErrorSummaryItemTagHelper.cs b/src/GovUk.Frontend.AspNetCore/TagHelpers/ErrorSummaryItemTagHelper.cs
index e0289b671..484880df4 100644
--- a/src/GovUk.Frontend.AspNetCore/TagHelpers/ErrorSummaryItemTagHelper.cs
+++ b/src/GovUk.Frontend.AspNetCore/TagHelpers/ErrorSummaryItemTagHelper.cs
@@ -17,9 +17,11 @@ namespace GovUk.Frontend.AspNetCore.TagHelpers
     /// Represents an error item in a GDS error summary component.
     /// </summary>
     [HtmlTargetElement(TagName, ParentTag = ErrorSummaryTagHelper.TagName)]
+    [HtmlTargetElement(ShortTagName, ParentTag = ErrorSummaryTagHelper.TagName)]
     public class ErrorSummaryItemTagHelper : TagHelper
     {
         internal const string TagName = "govuk-error-summary-item";
+        internal const string ShortTagName = "error-item";
 
         private const string AspForAttributeName = "asp-for";
         private const string LinkAttributesPrefix = "link-";
diff --git a/src/GovUk.Frontend.AspNetCore/TagHelpers/ErrorSummaryTagHelper.cs b/src/GovUk.Frontend.AspNetCore/TagHelpers/ErrorSummaryTagHelper.cs
index ae851b740..3602390d6 100644
--- a/src/GovUk.Frontend.AspNetCore/TagHelpers/ErrorSummaryTagHelper.cs
+++ b/src/GovUk.Frontend.AspNetCore/TagHelpers/ErrorSummaryTagHelper.cs
@@ -10,7 +10,13 @@ namespace GovUk.Frontend.AspNetCore.TagHelpers
     /// Generates a GDS error summary component.
     /// </summary>
     [HtmlTargetElement(TagName)]
-    [RestrictChildren(ErrorSummaryTitleTagHelper.TagName, ErrorSummaryDescriptionTagHelper.TagName, "govuk-error-summary-item")]
+    [RestrictChildren(
+        ErrorSummaryTitleTagHelper.TagName,
+        ErrorSummaryTitleTagHelper.ShortTagName,
+        ErrorSummaryDescriptionTagHelper.TagName,
+        ErrorSummaryDescriptionTagHelper.ShortTagName,
+        ErrorSummaryItemTagHelper.TagName,
+        ErrorSummaryItemTagHelper.ShortTagName)]
     [OutputElementHint(ComponentGenerator.ErrorSummaryElement)]
     public class ErrorSummaryTagHelper : TagHelper
     {
diff --git a/src/GovUk.Frontend.AspNetCore/TagHelpers/ErrorSummaryTitleTagHelper.cs b/src/GovUk.Frontend.AspNetCore/TagHelpers/ErrorSummaryTitleTagHelper.cs
index 70187f7c1..6e7b06677 100644
--- a/src/GovUk.Frontend.AspNetCore/TagHelpers/ErrorSummaryTitleTagHelper.cs
+++ b/src/GovUk.Frontend.AspNetCore/TagHelpers/ErrorSummaryTitleTagHelper.cs
@@ -7,9 +7,11 @@ namespace GovUk.Frontend.AspNetCore.TagHelpers
     /// Represents the title in the GDS error summary component.
     /// </summary>
     [HtmlTargetElement(TagName, ParentTag = ErrorSummaryTagHelper.TagName)]
+    [HtmlTargetElement(ShortTagName, ParentTag = ErrorSummaryTagHelper.TagName)]
     public class ErrorSummaryTitleTagHelper : TagHelper
     {
         internal const string TagName = "govuk-error-summary-title";
+        internal const string ShortTagName = "title";
 
         /// <inheritdoc/>
         public override async Task ProcessAsync(TagHelperContext context, TagHelperOutput output)
diff --git a/src/GovUk.Frontend.AspNetCore/TagHelpers/FieldsetLegendTagHelper.cs b/src/GovUk.Frontend.AspNetCore/TagHelpers/FieldsetLegendTagHelper.cs
index 8b70e4aee..1bbb03438 100644
--- a/src/GovUk.Frontend.AspNetCore/TagHelpers/FieldsetLegendTagHelper.cs
+++ b/src/GovUk.Frontend.AspNetCore/TagHelpers/FieldsetLegendTagHelper.cs
@@ -8,10 +8,12 @@ namespace GovUk.Frontend.AspNetCore.TagHelpers
     /// Represents the legend in a GDS fieldset component.
     /// </summary>
     [HtmlTargetElement(TagName, ParentTag = FieldsetTagHelper.TagName)]
+    [HtmlTargetElement(ShortTagName, ParentTag = FieldsetTagHelper.TagName)]
     [OutputElementHint(ComponentGenerator.FieldsetLegendElement)]
     public class FieldsetLegendTagHelper : TagHelper
     {
         internal const string TagName = "govuk-fieldset-legend";
+        internal const string ShortTagName = "legend";
 
         private const string IsPageHeadingAttributeName = "is-page-heading";
 
diff --git a/src/GovUk.Frontend.AspNetCore/TagHelpers/FileUploadTagHelper.cs b/src/GovUk.Frontend.AspNetCore/TagHelpers/FileUploadTagHelper.cs
index 8d6cf7158..69e42ecba 100644
--- a/src/GovUk.Frontend.AspNetCore/TagHelpers/FileUploadTagHelper.cs
+++ b/src/GovUk.Frontend.AspNetCore/TagHelpers/FileUploadTagHelper.cs
@@ -10,7 +10,13 @@ namespace GovUk.Frontend.AspNetCore.TagHelpers
     /// Generates a GDS File upload component.
     /// </summary>
     [HtmlTargetElement(TagName)]
-    [RestrictChildren(LabelTagName, HintTagName, ErrorMessageTagName)]
+    [RestrictChildren(
+        LabelTagName,
+        FormGroupLabelTagHelper.ShortTagName,
+        HintTagName,
+        FormGroupHintTagHelper.ShortTagName,
+        ErrorMessageTagName,
+        FormGroupErrorMessageTagHelper.ShortTagName)]
     public class FileUploadTagHelper : FormGroupTagHelperBase
     {
         internal const string ErrorMessageTagName = "govuk-file-upload-error-message";
diff --git a/src/GovUk.Frontend.AspNetCore/TagHelpers/FormGroupErrorMessageTagHelper.cs b/src/GovUk.Frontend.AspNetCore/TagHelpers/FormGroupErrorMessageTagHelper.cs
index fcaa22e71..27b1b1b9b 100644
--- a/src/GovUk.Frontend.AspNetCore/TagHelpers/FormGroupErrorMessageTagHelper.cs
+++ b/src/GovUk.Frontend.AspNetCore/TagHelpers/FormGroupErrorMessageTagHelper.cs
@@ -8,17 +8,32 @@ namespace GovUk.Frontend.AspNetCore.TagHelpers
     /// Represents the error message in a GDS form group component.
     /// </summary>
     [HtmlTargetElement(CheckboxesTagHelper.ErrorMessageTagName, ParentTag = CheckboxesTagHelper.TagName)]
+    [HtmlTargetElement(ShortTagName, ParentTag = CheckboxesTagHelper.TagName)]
     [HtmlTargetElement(CheckboxesTagHelper.ErrorMessageTagName, ParentTag = CheckboxesFieldsetTagHelper.TagName)]
+    [HtmlTargetElement(ShortTagName, ParentTag = CheckboxesFieldsetTagHelper.TagName)]
+    [HtmlTargetElement(CheckboxesTagHelper.ErrorMessageTagName, ParentTag = CheckboxesFieldsetTagHelper.ShortTagName)]
+    [HtmlTargetElement(ShortTagName, ParentTag = CheckboxesFieldsetTagHelper.ShortTagName)]
     [HtmlTargetElement(CharacterCountTagHelper.ErrorMessageTagName, ParentTag = CharacterCountTagHelper.TagName)]
+    [HtmlTargetElement(ShortTagName, ParentTag = CharacterCountTagHelper.TagName)]
     [HtmlTargetElement(FileUploadTagHelper.ErrorMessageTagName, ParentTag = FileUploadTagHelper.TagName)]
+    [HtmlTargetElement(ShortTagName, ParentTag = FileUploadTagHelper.TagName)]
     [HtmlTargetElement(RadiosTagHelper.ErrorMessageTagName, ParentTag = RadiosTagHelper.TagName)]
+    [HtmlTargetElement(ShortTagName, ParentTag = RadiosTagHelper.TagName)]
     [HtmlTargetElement(RadiosTagHelper.ErrorMessageTagName, ParentTag = RadiosFieldsetTagHelper.TagName)]
+    [HtmlTargetElement(ShortTagName, ParentTag = RadiosFieldsetTagHelper.TagName)]
+    [HtmlTargetElement(RadiosTagHelper.ErrorMessageTagName, ParentTag = RadiosFieldsetTagHelper.ShortTagName)]
+    [HtmlTargetElement(ShortTagName, ParentTag = RadiosFieldsetTagHelper.ShortTagName)]
     [HtmlTargetElement(SelectTagHelper.ErrorMessageTagName, ParentTag = SelectTagHelper.TagName)]
+    [HtmlTargetElement(ShortTagName, ParentTag = SelectTagHelper.TagName)]
     [HtmlTargetElement(TextAreaTagHelper.ErrorMessageTagName, ParentTag = TextAreaTagHelper.TagName)]
+    [HtmlTargetElement(ShortTagName, ParentTag = TextAreaTagHelper.TagName)]
     [HtmlTargetElement(TextInputTagHelper.ErrorMessageTagName, ParentTag = TextInputTagHelper.TagName)]
+    [HtmlTargetElement(ShortTagName, ParentTag = TextInputTagHelper.TagName)]
     [OutputElementHint(ComponentGenerator.ErrorMessageElement)]
     public class FormGroupErrorMessageTagHelper : TagHelper
     {
+        internal const string ShortTagName = "error-message";
+
         private const string VisuallyHiddenTextAttributeName = "visually-hidden-text";
 
         /// <summary>
diff --git a/src/GovUk.Frontend.AspNetCore/TagHelpers/FormGroupHintTagHelper.cs b/src/GovUk.Frontend.AspNetCore/TagHelpers/FormGroupHintTagHelper.cs
index 6d43fa21a..b8fc39bc1 100644
--- a/src/GovUk.Frontend.AspNetCore/TagHelpers/FormGroupHintTagHelper.cs
+++ b/src/GovUk.Frontend.AspNetCore/TagHelpers/FormGroupHintTagHelper.cs
@@ -8,19 +8,38 @@ namespace GovUk.Frontend.AspNetCore.TagHelpers
     /// Represents the hint in a GDS form group component.
     /// </summary>
     [HtmlTargetElement(CheckboxesTagHelper.HintTagName, ParentTag = CheckboxesTagHelper.TagName)]
+    [HtmlTargetElement(ShortTagName, ParentTag = CheckboxesTagHelper.TagName)]
     [HtmlTargetElement(CheckboxesTagHelper.HintTagName, ParentTag = CheckboxesFieldsetTagHelper.TagName)]
+    [HtmlTargetElement(ShortTagName, ParentTag = CheckboxesFieldsetTagHelper.TagName)]
+    [HtmlTargetElement(CheckboxesTagHelper.HintTagName, ParentTag = CheckboxesFieldsetTagHelper.ShortTagName)]
+    [HtmlTargetElement(ShortTagName, ParentTag = CheckboxesFieldsetTagHelper.ShortTagName)]
     [HtmlTargetElement(CharacterCountTagHelper.HintTagName, ParentTag = CharacterCountTagHelper.TagName)]
+    [HtmlTargetElement(ShortTagName, ParentTag = CharacterCountTagHelper.TagName)]
     [HtmlTargetElement(DateInputTagHelper.HintTagName, ParentTag = DateInputTagHelper.TagName)]
+    [HtmlTargetElement(ShortTagName, ParentTag = DateInputTagHelper.TagName)]
     [HtmlTargetElement(DateInputTagHelper.HintTagName, ParentTag = DateInputFieldsetTagHelper.TagName)]
+    [HtmlTargetElement(ShortTagName, ParentTag = DateInputFieldsetTagHelper.TagName)]
+    [HtmlTargetElement(DateInputTagHelper.HintTagName, ParentTag = DateInputFieldsetTagHelper.ShortTagName)]
+    [HtmlTargetElement(ShortTagName, ParentTag = DateInputFieldsetTagHelper.ShortTagName)]
     [HtmlTargetElement(FileUploadTagHelper.HintTagName, ParentTag = FileUploadTagHelper.TagName)]
+    [HtmlTargetElement(ShortTagName, ParentTag = FileUploadTagHelper.TagName)]
     [HtmlTargetElement(RadiosTagHelper.HintTagName, ParentTag = RadiosTagHelper.TagName)]
+    [HtmlTargetElement(ShortTagName, ParentTag = RadiosTagHelper.TagName)]
     [HtmlTargetElement(RadiosTagHelper.HintTagName, ParentTag = RadiosFieldsetTagHelper.TagName)]
+    [HtmlTargetElement(ShortTagName, ParentTag = RadiosFieldsetTagHelper.TagName)]
+    [HtmlTargetElement(RadiosTagHelper.HintTagName, ParentTag = RadiosFieldsetTagHelper.ShortTagName)]
+    [HtmlTargetElement(ShortTagName, ParentTag = RadiosFieldsetTagHelper.ShortTagName)]
     [HtmlTargetElement(SelectTagHelper.HintTagName, ParentTag = SelectTagHelper.TagName)]
+    [HtmlTargetElement(ShortTagName, ParentTag = SelectTagHelper.TagName)]
     [HtmlTargetElement(TextAreaTagHelper.HintTagName, ParentTag = TextAreaTagHelper.TagName)]
+    [HtmlTargetElement(ShortTagName, ParentTag = TextAreaTagHelper.TagName)]
     [HtmlTargetElement(TextInputTagHelper.HintTagName, ParentTag = TextInputTagHelper.TagName)]
+    [HtmlTargetElement(ShortTagName, ParentTag = TextInputTagHelper.TagName)]
     [OutputElementHint(ComponentGenerator.HintElement)]
     public class FormGroupHintTagHelper : TagHelper
     {
+        internal const string ShortTagName = "hint";
+
         /// <summary>
         /// Creates a <see cref="FormGroupHintTagHelper"/>.
         /// </summary>
diff --git a/src/GovUk.Frontend.AspNetCore/TagHelpers/FormGroupLabelTagHelper.cs b/src/GovUk.Frontend.AspNetCore/TagHelpers/FormGroupLabelTagHelper.cs
index 3cb6cdc89..af4a644de 100644
--- a/src/GovUk.Frontend.AspNetCore/TagHelpers/FormGroupLabelTagHelper.cs
+++ b/src/GovUk.Frontend.AspNetCore/TagHelpers/FormGroupLabelTagHelper.cs
@@ -8,13 +8,20 @@ namespace GovUk.Frontend.AspNetCore.TagHelpers
     /// Represents the label in a GDS form group component.
     /// </summary>
     [HtmlTargetElement(CharacterCountTagHelper.LabelTagName, ParentTag = CharacterCountTagHelper.TagName)]
+    [HtmlTargetElement(ShortTagName, ParentTag = CharacterCountTagHelper.TagName)]
     [HtmlTargetElement(FileUploadTagHelper.LabelTagName, ParentTag = FileUploadTagHelper.TagName)]
+    [HtmlTargetElement(ShortTagName, ParentTag = FileUploadTagHelper.TagName)]
     [HtmlTargetElement(SelectTagHelper.LabelTagName, ParentTag = SelectTagHelper.TagName)]	
+    [HtmlTargetElement(ShortTagName, ParentTag = SelectTagHelper.TagName)]
     [HtmlTargetElement(TextAreaTagHelper.LabelTagName, ParentTag = TextAreaTagHelper.TagName)]
+    [HtmlTargetElement(ShortTagName, ParentTag = TextAreaTagHelper.TagName)]
     [HtmlTargetElement(TextInputTagHelper.LabelTagName, ParentTag = TextInputTagHelper.TagName)]
+    [HtmlTargetElement(ShortTagName, ParentTag = TextInputTagHelper.TagName)]
     [OutputElementHint(ComponentGenerator.LabelElement)]
     public class FormGroupLabelTagHelper : TagHelper
     {
+        internal const string ShortTagName = "label";
+
         private const string IsPageHeadingAttributeName = "is-page-heading";
 
         /// <summary>
diff --git a/src/GovUk.Frontend.AspNetCore/TagHelpers/NotificationBannerTitleTagHelper.cs b/src/GovUk.Frontend.AspNetCore/TagHelpers/NotificationBannerTitleTagHelper.cs
index 53dbba0ec..c37a4412f 100644
--- a/src/GovUk.Frontend.AspNetCore/TagHelpers/NotificationBannerTitleTagHelper.cs
+++ b/src/GovUk.Frontend.AspNetCore/TagHelpers/NotificationBannerTitleTagHelper.cs
@@ -9,9 +9,11 @@ namespace GovUk.Frontend.AspNetCore.TagHelpers
     /// Represents the title in a GDS notification banner component.
     /// </summary>
     [HtmlTargetElement(TagName, ParentTag = NotificationBannerTagHelper.TagName)]
+    [HtmlTargetElement(ShortTagName, ParentTag = NotificationBannerTagHelper.TagName)]
     public class NotificationBannerTitleTagHelper : TagHelper
     {
         internal const string TagName = "govuk-notification-banner-title";
+        internal const string ShortTagName = "title";
 
         private const string HeadingLevelAttributeName = "heading-level";
         private const string IdAttributeName = "heading-level";
diff --git a/src/GovUk.Frontend.AspNetCore/TagHelpers/PaginationEllipsisItemTagHelper.cs b/src/GovUk.Frontend.AspNetCore/TagHelpers/PaginationEllipsisItemTagHelper.cs
index 599d77e47..60ffb8f2e 100644
--- a/src/GovUk.Frontend.AspNetCore/TagHelpers/PaginationEllipsisItemTagHelper.cs
+++ b/src/GovUk.Frontend.AspNetCore/TagHelpers/PaginationEllipsisItemTagHelper.cs
@@ -7,10 +7,12 @@ namespace GovUk.Frontend.AspNetCore.TagHelpers
     /// Represents an ellipsis item in a GDS pagination component.
     /// </summary>
     [HtmlTargetElement(TagName, ParentTag = PaginationTagHelper.TagName)]
+    [HtmlTargetElement(ShortTagName, ParentTag = PaginationTagHelper.TagName)]
     [OutputElementHint(ComponentGenerator.PaginationEllipsisElement)]
     public class PaginationEllipsisItemTagHelper : TagHelper
     {
         internal const string TagName = "govuk-pagination-ellipsis";
+        internal const string ShortTagName = "ellipsis";
 
         /// <inheritdoc/>
         public override void Process(TagHelperContext context, TagHelperOutput output)
diff --git a/src/GovUk.Frontend.AspNetCore/TagHelpers/PaginationItemTagHelper.cs b/src/GovUk.Frontend.AspNetCore/TagHelpers/PaginationItemTagHelper.cs
index 4eae99609..fdf25c730 100644
--- a/src/GovUk.Frontend.AspNetCore/TagHelpers/PaginationItemTagHelper.cs
+++ b/src/GovUk.Frontend.AspNetCore/TagHelpers/PaginationItemTagHelper.cs
@@ -12,10 +12,12 @@ namespace GovUk.Frontend.AspNetCore.TagHelpers
     /// Represents an item in a GDS pagination component.
     /// </summary>
     [HtmlTargetElement(TagName, ParentTag = PaginationTagHelper.TagName)]
+    [HtmlTargetElement(ShortTagName, ParentTag = PaginationTagHelper.TagName)]
     [OutputElementHint(ComponentGenerator.PaginationItemElement)]
     public class PaginationItemTagHelper : TagHelper
     {
         internal const string TagName = "govuk-pagination-item";
+        internal const string ShortTagName = "pagination-item";
 
         private const string IsCurrentAttributeName = "is-current";
         private const string VisuallyHiddenTextAttributeName = "visually-hidden-text";
diff --git a/src/GovUk.Frontend.AspNetCore/TagHelpers/PaginationNextTagHelper.cs b/src/GovUk.Frontend.AspNetCore/TagHelpers/PaginationNextTagHelper.cs
index 28dcfb967..7e4052c25 100644
--- a/src/GovUk.Frontend.AspNetCore/TagHelpers/PaginationNextTagHelper.cs
+++ b/src/GovUk.Frontend.AspNetCore/TagHelpers/PaginationNextTagHelper.cs
@@ -9,10 +9,12 @@ namespace GovUk.Frontend.AspNetCore.TagHelpers
     /// Represents the link to the next page in a GDS pagination component.
     /// </summary>
     [HtmlTargetElement(TagName, ParentTag = PaginationTagHelper.TagName)]
+    [HtmlTargetElement(ShortTagName, ParentTag = PaginationTagHelper.TagName)]
     [OutputElementHint(ComponentGenerator.PaginationNextElement)]
     public class PaginationNextTagHelper : TagHelper
     {
         internal const string TagName = "govuk-pagination-next";
+        internal const string ShortTagName = "next";
 
         private const string LabelTextAttributeName = "label-text";
         private const string LinkAttributesPrefix = "link-";
diff --git a/src/GovUk.Frontend.AspNetCore/TagHelpers/PaginationPreviousTagHelper.cs b/src/GovUk.Frontend.AspNetCore/TagHelpers/PaginationPreviousTagHelper.cs
index 703eddbc5..fa3d40e54 100644
--- a/src/GovUk.Frontend.AspNetCore/TagHelpers/PaginationPreviousTagHelper.cs
+++ b/src/GovUk.Frontend.AspNetCore/TagHelpers/PaginationPreviousTagHelper.cs
@@ -9,10 +9,12 @@ namespace GovUk.Frontend.AspNetCore.TagHelpers
     /// Represents the link to the previous page in a GDS pagination component.
     /// </summary>
     [HtmlTargetElement(TagName, ParentTag = PaginationTagHelper.TagName)]
+    [HtmlTargetElement(ShortTagName, ParentTag = PaginationTagHelper.TagName)]
     [OutputElementHint(ComponentGenerator.PaginationPreviousElement)]
     public class PaginationPreviousTagHelper : TagHelper
     {
         internal const string TagName = "govuk-pagination-previous";
+        internal const string ShortTagName = "previous";
 
         private const string LabelTextAttributeName = "label-text";
         private const string LinkAttributesPrefix = "link-";
diff --git a/src/GovUk.Frontend.AspNetCore/TagHelpers/PaginationTagHelper.cs b/src/GovUk.Frontend.AspNetCore/TagHelpers/PaginationTagHelper.cs
index c38347ca0..89aa23065 100644
--- a/src/GovUk.Frontend.AspNetCore/TagHelpers/PaginationTagHelper.cs
+++ b/src/GovUk.Frontend.AspNetCore/TagHelpers/PaginationTagHelper.cs
@@ -12,9 +12,13 @@ namespace GovUk.Frontend.AspNetCore.TagHelpers
     [HtmlTargetElement(TagName)]
     [RestrictChildren(
         PaginationPreviousTagHelper.TagName,
+        PaginationPreviousTagHelper.ShortTagName,
         PaginationItemTagHelper.TagName,
+        PaginationItemTagHelper.ShortTagName,
         PaginationEllipsisItemTagHelper.TagName,
-        PaginationNextTagHelper.TagName)]
+        PaginationEllipsisItemTagHelper.ShortTagName,
+        PaginationNextTagHelper.TagName,
+        PaginationNextTagHelper.ShortTagName)]
     [OutputElementHint(ComponentGenerator.PaginationElement)]
     public class PaginationTagHelper : TagHelper
     {
diff --git a/src/GovUk.Frontend.AspNetCore/TagHelpers/PanelBodyTagHelper.cs b/src/GovUk.Frontend.AspNetCore/TagHelpers/PanelBodyTagHelper.cs
index 5fa23bcf7..4e1d813ae 100644
--- a/src/GovUk.Frontend.AspNetCore/TagHelpers/PanelBodyTagHelper.cs
+++ b/src/GovUk.Frontend.AspNetCore/TagHelpers/PanelBodyTagHelper.cs
@@ -7,9 +7,11 @@ namespace GovUk.Frontend.AspNetCore.TagHelpers
     /// Represents the body in a GDS panel component.
     /// </summary>
     [HtmlTargetElement(TagName, ParentTag = PanelTagHelper.TagName)]
+    [HtmlTargetElement(ShortTagName, ParentTag = PanelTagHelper.TagName)]
     public class PanelBodyTagHelper : TagHelper
     {
         internal const string TagName = "govuk-panel-body";
+        internal const string ShortTagName = "body";
 
         /// <inheritdoc/>
         public override async Task ProcessAsync(TagHelperContext context, TagHelperOutput output)
diff --git a/src/GovUk.Frontend.AspNetCore/TagHelpers/PanelTagHelper.cs b/src/GovUk.Frontend.AspNetCore/TagHelpers/PanelTagHelper.cs
index 08965db12..9939e72d6 100644
--- a/src/GovUk.Frontend.AspNetCore/TagHelpers/PanelTagHelper.cs
+++ b/src/GovUk.Frontend.AspNetCore/TagHelpers/PanelTagHelper.cs
@@ -11,7 +11,11 @@ namespace GovUk.Frontend.AspNetCore.TagHelpers
     /// </summary>
     [HtmlTargetElement(TagName)]
     [OutputElementHint(ComponentGenerator.PanelElement)]
-    [RestrictChildren(PanelTitleTagHelper.TagName, PanelBodyTagHelper.TagName)]
+    [RestrictChildren(
+        PanelTitleTagHelper.TagName,
+        PanelTitleTagHelper.ShortTagName,
+        PanelBodyTagHelper.TagName,
+        PanelBodyTagHelper.ShortTagName)]
     public class PanelTagHelper : TagHelper
     {
         internal const string TagName = "govuk-panel";
diff --git a/src/GovUk.Frontend.AspNetCore/TagHelpers/PanelTitleTagHelper.cs b/src/GovUk.Frontend.AspNetCore/TagHelpers/PanelTitleTagHelper.cs
index 457843f8b..1593c4db3 100644
--- a/src/GovUk.Frontend.AspNetCore/TagHelpers/PanelTitleTagHelper.cs
+++ b/src/GovUk.Frontend.AspNetCore/TagHelpers/PanelTitleTagHelper.cs
@@ -7,9 +7,11 @@ namespace GovUk.Frontend.AspNetCore.TagHelpers
     /// Represents the title in a GDS panel component.
     /// </summary>
     [HtmlTargetElement(TagName, ParentTag = PanelTagHelper.TagName)]
+    [HtmlTargetElement(ShortTagName, ParentTag = PanelTagHelper.TagName)]
     public class PanelTitleTagHelper : TagHelper
     {
         internal const string TagName = "govuk-panel-title";
+        internal const string ShortTagName = "title";
 
         /// <inheritdoc/>
         public override async Task ProcessAsync(TagHelperContext context, TagHelperOutput output)
diff --git a/src/GovUk.Frontend.AspNetCore/TagHelpers/PhaseBannerTagTagHelper.cs b/src/GovUk.Frontend.AspNetCore/TagHelpers/PhaseBannerTagTagHelper.cs
index 4bbdc3d87..e049f6b94 100644
--- a/src/GovUk.Frontend.AspNetCore/TagHelpers/PhaseBannerTagTagHelper.cs
+++ b/src/GovUk.Frontend.AspNetCore/TagHelpers/PhaseBannerTagTagHelper.cs
@@ -8,10 +8,12 @@ namespace GovUk.Frontend.AspNetCore.TagHelpers
     /// Represents the tag in a GDS phase banner component.
     /// </summary>
     [HtmlTargetElement(TagName, ParentTag = PhaseBannerTagHelper.TagName)]
+    [HtmlTargetElement(ShortTagName, ParentTag = PhaseBannerTagHelper.TagName)]
     [OutputElementHint(ComponentGenerator.TagElement)]
     public class PhaseBannerTagTagHelper : TagHelper
     {
         internal const string TagName = "govuk-phase-banner-tag";
+        internal const string ShortTagName = "tag";
 
         /// <summary>
         /// Creates a <see cref="PhaseBannerTagTagHelper"/>.
diff --git a/src/GovUk.Frontend.AspNetCore/TagHelpers/RadiosFieldsetLegendTagHelper.cs b/src/GovUk.Frontend.AspNetCore/TagHelpers/RadiosFieldsetLegendTagHelper.cs
index 48f7cdaa8..e378526a5 100644
--- a/src/GovUk.Frontend.AspNetCore/TagHelpers/RadiosFieldsetLegendTagHelper.cs
+++ b/src/GovUk.Frontend.AspNetCore/TagHelpers/RadiosFieldsetLegendTagHelper.cs
@@ -8,10 +8,14 @@ namespace GovUk.Frontend.AspNetCore.TagHelpers
     /// Represents the legend in a GDS radios component fieldset.
     /// </summary>
     [HtmlTargetElement(TagName, ParentTag = RadiosFieldsetTagHelper.TagName)]
+    [HtmlTargetElement(TagName, ParentTag = RadiosFieldsetTagHelper.ShortTagName)]
+    [HtmlTargetElement(ShortTagName, ParentTag = RadiosFieldsetTagHelper.TagName)]
+    [HtmlTargetElement(ShortTagName, ParentTag = RadiosFieldsetTagHelper.ShortTagName)]
     [OutputElementHint(ComponentGenerator.FieldsetLegendElement)]
     public class RadiosFieldsetLegendTagHelper : TagHelper
     {
         internal const string TagName = "govuk-radios-fieldset-legend";
+        internal const string ShortTagName = "legend";
 
         private const string IsPageHeadingAttributeName = "is-page-heading";
 
diff --git a/src/GovUk.Frontend.AspNetCore/TagHelpers/RadiosFieldsetTagHelper.cs b/src/GovUk.Frontend.AspNetCore/TagHelpers/RadiosFieldsetTagHelper.cs
index 7d6908960..60bb284cb 100644
--- a/src/GovUk.Frontend.AspNetCore/TagHelpers/RadiosFieldsetTagHelper.cs
+++ b/src/GovUk.Frontend.AspNetCore/TagHelpers/RadiosFieldsetTagHelper.cs
@@ -8,11 +8,23 @@ namespace GovUk.Frontend.AspNetCore.TagHelpers
     /// Represents the fieldset in a GDS radios component.
     /// </summary>
     [HtmlTargetElement(TagName, ParentTag = RadiosTagHelper.TagName)]
-    [RestrictChildren(RadiosFieldsetLegendTagHelper.TagName, RadiosItemTagHelper.TagName, RadiosItemDividerTagHelper.TagName, RadiosTagHelper.HintTagName, RadiosTagHelper.ErrorMessageTagName)]
+    [HtmlTargetElement(ShortTagName, ParentTag = RadiosTagHelper.TagName)]
+    [RestrictChildren(
+        RadiosFieldsetLegendTagHelper.TagName,
+        RadiosFieldsetLegendTagHelper.ShortTagName,
+        RadiosItemTagHelper.TagName,
+        RadiosItemTagHelper.ShortTagName,
+        RadiosItemDividerTagHelper.TagName,
+        RadiosItemDividerTagHelper.ShortTagName,
+        RadiosTagHelper.HintTagName,
+        FormGroupHintTagHelper.ShortTagName,
+        RadiosTagHelper.ErrorMessageTagName,
+        FormGroupErrorMessageTagHelper.ShortTagName)]
     [OutputElementHint(ComponentGenerator.FieldsetElement)]
     public class RadiosFieldsetTagHelper : TagHelper
     {
         internal const string TagName = "govuk-radios-fieldset";
+        internal const string ShortTagName = "radios-fieldset";
 
         /// <inheritdoc/>
         public override async Task ProcessAsync(TagHelperContext context, TagHelperOutput output)
diff --git a/src/GovUk.Frontend.AspNetCore/TagHelpers/RadiosItemConditionalTagHelper.cs b/src/GovUk.Frontend.AspNetCore/TagHelpers/RadiosItemConditionalTagHelper.cs
index 1f7b87bf0..0cba85bf5 100644
--- a/src/GovUk.Frontend.AspNetCore/TagHelpers/RadiosItemConditionalTagHelper.cs
+++ b/src/GovUk.Frontend.AspNetCore/TagHelpers/RadiosItemConditionalTagHelper.cs
@@ -7,9 +7,13 @@ namespace GovUk.Frontend.AspNetCore.TagHelpers
     /// Represents the conditional reveal of a radios item in a GDS radios component.
     /// </summary>
     [HtmlTargetElement(TagName, ParentTag = RadiosItemTagHelper.TagName)]
+    [HtmlTargetElement(TagName, ParentTag = RadiosItemTagHelper.ShortTagName)]
+    [HtmlTargetElement(ShortTagName, ParentTag = RadiosItemTagHelper.TagName)]
+    [HtmlTargetElement(ShortTagName, ParentTag = RadiosItemTagHelper.ShortTagName)]
     public class RadiosItemConditionalTagHelper : TagHelper
     {
         internal const string TagName = "govuk-radios-item-conditional";
+        internal const string ShortTagName = "conditional";
 
         /// <inheritdoc/>
         public override async Task ProcessAsync(TagHelperContext context, TagHelperOutput output)
diff --git a/src/GovUk.Frontend.AspNetCore/TagHelpers/RadiosItemDividerTagHelper.cs b/src/GovUk.Frontend.AspNetCore/TagHelpers/RadiosItemDividerTagHelper.cs
index 7bd3e8e39..f043c6bdb 100644
--- a/src/GovUk.Frontend.AspNetCore/TagHelpers/RadiosItemDividerTagHelper.cs
+++ b/src/GovUk.Frontend.AspNetCore/TagHelpers/RadiosItemDividerTagHelper.cs
@@ -9,10 +9,15 @@ namespace GovUk.Frontend.AspNetCore.TagHelpers
     /// </summary>
     [HtmlTargetElement(TagName, ParentTag = RadiosTagHelper.TagName)]
     [HtmlTargetElement(TagName, ParentTag = RadiosFieldsetTagHelper.TagName)]
+    [HtmlTargetElement(TagName, ParentTag = RadiosFieldsetTagHelper.ShortTagName)]
+    [HtmlTargetElement(ShortTagName, ParentTag = RadiosTagHelper.TagName)]
+    [HtmlTargetElement(ShortTagName, ParentTag = RadiosFieldsetTagHelper.TagName)]
+    [HtmlTargetElement(ShortTagName, ParentTag = RadiosFieldsetTagHelper.ShortTagName)]
     [OutputElementHint(ComponentGenerator.RadiosDividerItemElement)]
     public class RadiosItemDividerTagHelper : TagHelper
     {
         internal const string TagName = "govuk-radios-divider";
+        internal const string ShortTagName = "radios-divider";
 
         /// <inheritdoc/>
         public override async Task ProcessAsync(TagHelperContext context, TagHelperOutput output)
diff --git a/src/GovUk.Frontend.AspNetCore/TagHelpers/RadiosItemHintTagHelper.cs b/src/GovUk.Frontend.AspNetCore/TagHelpers/RadiosItemHintTagHelper.cs
index 1343b2206..f42198f9a 100644
--- a/src/GovUk.Frontend.AspNetCore/TagHelpers/RadiosItemHintTagHelper.cs
+++ b/src/GovUk.Frontend.AspNetCore/TagHelpers/RadiosItemHintTagHelper.cs
@@ -8,10 +8,14 @@ namespace GovUk.Frontend.AspNetCore.TagHelpers
     /// Represents the hint of a radios item in a GDS radios component.
     /// </summary>
     [HtmlTargetElement(TagName, ParentTag = RadiosItemTagHelper.TagName)]
+    [HtmlTargetElement(TagName, ParentTag = RadiosItemTagHelper.ShortTagName)]
+    [HtmlTargetElement(ShortTagName, ParentTag = RadiosItemTagHelper.TagName)]
+    [HtmlTargetElement(ShortTagName, ParentTag = RadiosItemTagHelper.ShortTagName)]
     [OutputElementHint(ComponentGenerator.HintElement)]
     public class RadiosItemHintTagHelper : TagHelper
     {
         internal const string TagName = "govuk-radios-item-hint";
+        internal const string ShortTagName = "hint";
 
         /// <inheritdoc/>
         public override async Task ProcessAsync(TagHelperContext context, TagHelperOutput output)
diff --git a/src/GovUk.Frontend.AspNetCore/TagHelpers/RadiosItemTagHelper.cs b/src/GovUk.Frontend.AspNetCore/TagHelpers/RadiosItemTagHelper.cs
index b8c1d1d81..773bb33e9 100644
--- a/src/GovUk.Frontend.AspNetCore/TagHelpers/RadiosItemTagHelper.cs
+++ b/src/GovUk.Frontend.AspNetCore/TagHelpers/RadiosItemTagHelper.cs
@@ -11,10 +11,15 @@ namespace GovUk.Frontend.AspNetCore.TagHelpers
     /// </summary>
     [HtmlTargetElement(TagName, ParentTag = RadiosTagHelper.TagName)]
     [HtmlTargetElement(TagName, ParentTag = RadiosFieldsetTagHelper.TagName)]
+    [HtmlTargetElement(TagName, ParentTag = RadiosFieldsetTagHelper.ShortTagName)]
+    [HtmlTargetElement(ShortTagName, ParentTag = RadiosTagHelper.TagName)]
+    [HtmlTargetElement(ShortTagName, ParentTag = RadiosFieldsetTagHelper.TagName)]
+    [HtmlTargetElement(ShortTagName, ParentTag = RadiosFieldsetTagHelper.ShortTagName)]
     [OutputElementHint(ComponentGenerator.RadiosItemElement)]
     public class RadiosItemTagHelper : TagHelper
     {
         internal const string TagName = "govuk-radios-item";
+        internal const string ShortTagName = "radios-item";
 
         private const string CheckedAttributeName = "checked";
         private const string DisabledAttributeName = "disabled";
diff --git a/src/GovUk.Frontend.AspNetCore/TagHelpers/RadiosTagHelper.cs b/src/GovUk.Frontend.AspNetCore/TagHelpers/RadiosTagHelper.cs
index 623259134..3c022c00b 100644
--- a/src/GovUk.Frontend.AspNetCore/TagHelpers/RadiosTagHelper.cs
+++ b/src/GovUk.Frontend.AspNetCore/TagHelpers/RadiosTagHelper.cs
@@ -1,7 +1,6 @@
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Diagnostics.CodeAnalysis;
-using System.Threading.Tasks;
 using GovUk.Frontend.AspNetCore.HtmlGeneration;
 using Microsoft.AspNetCore.Html;
 using Microsoft.AspNetCore.Mvc.Rendering;
@@ -13,7 +12,17 @@ namespace GovUk.Frontend.AspNetCore.TagHelpers
     /// Generates a GDS checkboxes component.
     /// </summary>
     [HtmlTargetElement(TagName)]
-    [RestrictChildren(RadiosFieldsetTagHelper.TagName, RadiosItemTagHelper.TagName, RadiosItemDividerTagHelper.TagName, HintTagName, ErrorMessageTagName)]
+    [RestrictChildren(
+        RadiosFieldsetTagHelper.TagName,
+        RadiosFieldsetTagHelper.ShortTagName,
+        RadiosItemTagHelper.TagName,
+        RadiosItemTagHelper.ShortTagName,
+        RadiosItemDividerTagHelper.TagName,
+        RadiosItemDividerTagHelper.ShortTagName,
+        HintTagName,
+        FormGroupHintTagHelper.ShortTagName,
+        ErrorMessageTagName,
+        FormGroupErrorMessageTagHelper.ShortTagName)]
     [OutputElementHint(ComponentGenerator.RadiosElement)]
     public class RadiosTagHelper : FormGroupTagHelperBase
     {
diff --git a/src/GovUk.Frontend.AspNetCore/TagHelpers/SelectItemTagHelper.cs b/src/GovUk.Frontend.AspNetCore/TagHelpers/SelectItemTagHelper.cs
index b6a467023..8443febf0 100644
--- a/src/GovUk.Frontend.AspNetCore/TagHelpers/SelectItemTagHelper.cs
+++ b/src/GovUk.Frontend.AspNetCore/TagHelpers/SelectItemTagHelper.cs
@@ -11,9 +11,11 @@ namespace GovUk.Frontend.AspNetCore.TagHelpers
     /// Represents an item in a GDS select component.
     /// </summary>
     [HtmlTargetElement(TagName, ParentTag = SelectTagHelper.TagName)]
+    [HtmlTargetElement(ShortTagName, ParentTag = SelectTagHelper.TagName)]
     public class SelectItemTagHelper : TagHelper
     {
         internal const string TagName = "govuk-select-item";
+        internal const string ShortTagName = "select-item";
 
         private const string DisabledAttributeName = "disabled";
         private const string SelectedAttributeName = "selected";
diff --git a/src/GovUk.Frontend.AspNetCore/TagHelpers/SelectTagHelper.cs b/src/GovUk.Frontend.AspNetCore/TagHelpers/SelectTagHelper.cs
index 95cbf5304..ad67ac675 100644
--- a/src/GovUk.Frontend.AspNetCore/TagHelpers/SelectTagHelper.cs
+++ b/src/GovUk.Frontend.AspNetCore/TagHelpers/SelectTagHelper.cs
@@ -10,7 +10,15 @@ namespace GovUk.Frontend.AspNetCore.TagHelpers
     /// Generates a GDS select component.
     /// </summary>
     [HtmlTargetElement(TagName)]
-    [RestrictChildren(SelectItemTagHelper.TagName, LabelTagName, HintTagName, ErrorMessageTagName)]
+    [RestrictChildren(
+        SelectItemTagHelper.TagName,
+        SelectItemTagHelper.ShortTagName,
+        LabelTagName,
+        FormGroupLabelTagHelper.ShortTagName,
+        HintTagName,
+        FormGroupHintTagHelper.ShortTagName,
+        ErrorMessageTagName,
+        FormGroupErrorMessageTagHelper.ShortTagName)]
     [OutputElementHint(ComponentGenerator.FormGroupElement)]
     public class SelectTagHelper : FormGroupTagHelperBase
     {
diff --git a/src/GovUk.Frontend.AspNetCore/TagHelpers/SummaryListRowActionTagHelper.cs b/src/GovUk.Frontend.AspNetCore/TagHelpers/SummaryListRowActionTagHelper.cs
index 91b7e61f9..040de82a7 100644
--- a/src/GovUk.Frontend.AspNetCore/TagHelpers/SummaryListRowActionTagHelper.cs
+++ b/src/GovUk.Frontend.AspNetCore/TagHelpers/SummaryListRowActionTagHelper.cs
@@ -8,10 +8,14 @@ namespace GovUk.Frontend.AspNetCore.TagHelpers
     /// Represents an action in a GDS summary list row.
     /// </summary>
     [HtmlTargetElement(TagName, ParentTag = SummaryListRowActionsTagHelper.TagName)]
+    [HtmlTargetElement(TagName, ParentTag = SummaryListRowActionsTagHelper.ShortTagName)]
+    [HtmlTargetElement(ShortTagName, ParentTag = SummaryListRowActionsTagHelper.TagName)]
+    [HtmlTargetElement(ShortTagName, ParentTag = SummaryListRowActionsTagHelper.ShortTagName)]
     [OutputElementHint(ComponentGenerator.SummaryListRowActionElement)]
     public class SummaryListRowActionTagHelper : TagHelper
     {
         internal const string TagName = "govuk-summary-list-row-action";
+        internal const string ShortTagName = "action";
 
         private const string VisuallyHiddenTextAttributeName = "visually-hidden-text";
 
diff --git a/src/GovUk.Frontend.AspNetCore/TagHelpers/SummaryListRowActionsTagHelper.cs b/src/GovUk.Frontend.AspNetCore/TagHelpers/SummaryListRowActionsTagHelper.cs
index 8b2ed0440..cfa8b5ac3 100644
--- a/src/GovUk.Frontend.AspNetCore/TagHelpers/SummaryListRowActionsTagHelper.cs
+++ b/src/GovUk.Frontend.AspNetCore/TagHelpers/SummaryListRowActionsTagHelper.cs
@@ -8,11 +8,15 @@ namespace GovUk.Frontend.AspNetCore.TagHelpers
     /// Represents the actions wrapper in a GDS summary list component row.
     /// </summary>
     [HtmlTargetElement(TagName, ParentTag = SummaryListRowTagHelper.TagName)]
-    [RestrictChildren(SummaryListRowActionTagHelper.TagName)]
+    [HtmlTargetElement(TagName, ParentTag = SummaryListRowTagHelper.ShortTagName)]
+    [HtmlTargetElement(ShortTagName, ParentTag = SummaryListRowTagHelper.TagName)]
+    [HtmlTargetElement(ShortTagName, ParentTag = SummaryListRowTagHelper.ShortTagName)]
+    [RestrictChildren(SummaryListRowActionTagHelper.TagName, SummaryListRowActionTagHelper.ShortTagName)]
     [OutputElementHint(ComponentGenerator.SummaryListRowActionsElement)]
     public class SummaryListRowActionsTagHelper : TagHelper
     {
         internal const string TagName = "govuk-summary-list-row-actions";
+        internal const string ShortTagName = "actions";
 
         /// <summary>
         /// Creates a new <see cref="SummaryListRowActionsTagHelper"/>.
diff --git a/src/GovUk.Frontend.AspNetCore/TagHelpers/SummaryListRowKeyTagHelper.cs b/src/GovUk.Frontend.AspNetCore/TagHelpers/SummaryListRowKeyTagHelper.cs
index 0b43915d6..dc1079854 100644
--- a/src/GovUk.Frontend.AspNetCore/TagHelpers/SummaryListRowKeyTagHelper.cs
+++ b/src/GovUk.Frontend.AspNetCore/TagHelpers/SummaryListRowKeyTagHelper.cs
@@ -8,10 +8,14 @@ namespace GovUk.Frontend.AspNetCore.TagHelpers
     /// Represents the value in a GDS summary list component row.
     /// </summary>
     [HtmlTargetElement(TagName, ParentTag = SummaryListRowTagHelper.TagName)]
+    [HtmlTargetElement(TagName, ParentTag = SummaryListRowTagHelper.ShortTagName)]
+    [HtmlTargetElement(ShortTagName, ParentTag = SummaryListRowTagHelper.TagName)]
+    [HtmlTargetElement(ShortTagName, ParentTag = SummaryListRowTagHelper.ShortTagName)]
     [OutputElementHint(ComponentGenerator.SummaryListRowKeyElement)]
     public class SummaryListRowKeyTagHelper : TagHelper
     {
         internal const string TagName = "govuk-summary-list-row-key";
+        internal const string ShortTagName = "key";
 
         /// <inheritdoc/>
         public override async Task ProcessAsync(TagHelperContext context, TagHelperOutput output)
diff --git a/src/GovUk.Frontend.AspNetCore/TagHelpers/SummaryListRowTagHelper.cs b/src/GovUk.Frontend.AspNetCore/TagHelpers/SummaryListRowTagHelper.cs
index 424f601b5..ded0ee180 100644
--- a/src/GovUk.Frontend.AspNetCore/TagHelpers/SummaryListRowTagHelper.cs
+++ b/src/GovUk.Frontend.AspNetCore/TagHelpers/SummaryListRowTagHelper.cs
@@ -8,11 +8,19 @@ namespace GovUk.Frontend.AspNetCore.TagHelpers
     /// Represents a row in a GDS summary list component.
     /// </summary>
     [HtmlTargetElement(TagName, ParentTag = SummaryListTagHelper.TagName)]
-    [RestrictChildren(SummaryListRowKeyTagHelper.TagName, SummaryListRowValueTagHelper.TagName, SummaryListRowActionsTagHelper.TagName)]
+    [HtmlTargetElement(ShortTagName, ParentTag = SummaryListTagHelper.TagName)]
+    [RestrictChildren(
+        SummaryListRowKeyTagHelper.TagName,
+        SummaryListRowKeyTagHelper.ShortTagName,
+        SummaryListRowValueTagHelper.TagName,
+        SummaryListRowValueTagHelper.ShortTagName,
+        SummaryListRowActionsTagHelper.TagName,
+        SummaryListRowActionsTagHelper.ShortTagName)]
     [OutputElementHint(ComponentGenerator.SummaryListRowElement)]
     public class SummaryListRowTagHelper : TagHelper
     {
         internal const string TagName = "govuk-summary-list-row";
+        internal const string ShortTagName = "summary-list-row";
 
         /// <inheritdoc/>
         public override async Task ProcessAsync(TagHelperContext context, TagHelperOutput output)
diff --git a/src/GovUk.Frontend.AspNetCore/TagHelpers/SummaryListRowValueTagHelper.cs b/src/GovUk.Frontend.AspNetCore/TagHelpers/SummaryListRowValueTagHelper.cs
index 6db1ffc7c..f298be4fd 100644
--- a/src/GovUk.Frontend.AspNetCore/TagHelpers/SummaryListRowValueTagHelper.cs
+++ b/src/GovUk.Frontend.AspNetCore/TagHelpers/SummaryListRowValueTagHelper.cs
@@ -8,10 +8,14 @@ namespace GovUk.Frontend.AspNetCore.TagHelpers
     /// Represents the value in a GDS summary list component row.
     /// </summary>
     [HtmlTargetElement(TagName, ParentTag = SummaryListRowTagHelper.TagName)]
+    [HtmlTargetElement(TagName, ParentTag = SummaryListRowTagHelper.ShortTagName)]
+    [HtmlTargetElement(ShortTagName, ParentTag = SummaryListRowTagHelper.TagName)]
+    [HtmlTargetElement(ShortTagName, ParentTag = SummaryListRowTagHelper.ShortTagName)]
     [OutputElementHint(ComponentGenerator.SummaryListRowValueElement)]
     public class SummaryListRowValueTagHelper : TagHelper
     {
         internal const string TagName = "govuk-summary-list-row-value";
+        internal const string ShortTagName = "value";
 
         /// <inheritdoc/>
         public override async Task ProcessAsync(TagHelperContext context, TagHelperOutput output)
diff --git a/src/GovUk.Frontend.AspNetCore/TagHelpers/SummaryListTagHelper.cs b/src/GovUk.Frontend.AspNetCore/TagHelpers/SummaryListTagHelper.cs
index c729201c1..d0cbe1c2a 100644
--- a/src/GovUk.Frontend.AspNetCore/TagHelpers/SummaryListTagHelper.cs
+++ b/src/GovUk.Frontend.AspNetCore/TagHelpers/SummaryListTagHelper.cs
@@ -9,7 +9,7 @@ namespace GovUk.Frontend.AspNetCore.TagHelpers
     /// Generates a GDS summary list component.
     /// </summary>
     [HtmlTargetElement(TagName)]
-    [RestrictChildren(SummaryListRowTagHelper.TagName)]
+    [RestrictChildren(SummaryListRowTagHelper.TagName, SummaryListRowTagHelper.ShortTagName)]
     [OutputElementHint(ComponentGenerator.SummaryListElement)]
     public class SummaryListTagHelper : TagHelper
     {
diff --git a/src/GovUk.Frontend.AspNetCore/TagHelpers/TabsTagHelper.cs b/src/GovUk.Frontend.AspNetCore/TagHelpers/TabsTagHelper.cs
index 77cc68ee6..a4d8e0f1f 100644
--- a/src/GovUk.Frontend.AspNetCore/TagHelpers/TabsTagHelper.cs
+++ b/src/GovUk.Frontend.AspNetCore/TagHelpers/TabsTagHelper.cs
@@ -10,7 +10,7 @@
 namespace GovUk.Frontend.AspNetCore.TagHelpers
 {
     [HtmlTargetElement("govuk-tabs", TagStructure = TagStructure.NormalOrSelfClosing)]
-    [RestrictChildren("govuk-tabs-item")]
+    [RestrictChildren("govuk-tabs-item", "item")]
     public class TabsTagHelper : TagHelper
     {
         internal const string IdPrefixAttributeName = "id-prefix";
@@ -59,6 +59,7 @@ public override async Task ProcessAsync(TagHelperContext context, TagHelperOutpu
     }
 
     [HtmlTargetElement("govuk-tabs-item", ParentTag = "govuk-tabs", TagStructure = TagStructure.NormalOrSelfClosing)]
+    [HtmlTargetElement("item", ParentTag = "govuk-tabs", TagStructure = TagStructure.NormalOrSelfClosing)]
     public class TabsItemTagHelper : TagHelper
     {
         private const string IdAttributeName = "id";
diff --git a/src/GovUk.Frontend.AspNetCore/TagHelpers/TextAreaTagHelper.cs b/src/GovUk.Frontend.AspNetCore/TagHelpers/TextAreaTagHelper.cs
index d2476cc6f..6814ec463 100644
--- a/src/GovUk.Frontend.AspNetCore/TagHelpers/TextAreaTagHelper.cs
+++ b/src/GovUk.Frontend.AspNetCore/TagHelpers/TextAreaTagHelper.cs
@@ -10,7 +10,15 @@ namespace GovUk.Frontend.AspNetCore.TagHelpers
     /// Generates a GDS textarea component.
     /// </summary>
     [HtmlTargetElement(TagName)]
-    [RestrictChildren(LabelTagName, HintTagName, ErrorMessageTagName, TextAreaValueTagHelper.TagName)]
+    [RestrictChildren(
+        LabelTagName,
+        FormGroupLabelTagHelper.ShortTagName,
+        HintTagName,
+        FormGroupHintTagHelper.ShortTagName,
+        ErrorMessageTagName,
+        FormGroupErrorMessageTagHelper.ShortTagName,
+        TextAreaValueTagHelper.TagName,
+        TextAreaValueTagHelper.ShortTagName)]
     [OutputElementHint(ComponentGenerator.FormGroupElement)]
     public class TextAreaTagHelper : FormGroupTagHelperBase
     {
diff --git a/src/GovUk.Frontend.AspNetCore/TagHelpers/TextAreaValueTagHelper.cs b/src/GovUk.Frontend.AspNetCore/TagHelpers/TextAreaValueTagHelper.cs
index 1804a8c3a..f5c621c44 100644
--- a/src/GovUk.Frontend.AspNetCore/TagHelpers/TextAreaValueTagHelper.cs
+++ b/src/GovUk.Frontend.AspNetCore/TagHelpers/TextAreaValueTagHelper.cs
@@ -7,9 +7,11 @@ namespace GovUk.Frontend.AspNetCore.TagHelpers
     /// Represents the value of a GDS character count component.
     /// </summary>
     [HtmlTargetElement(TagName, ParentTag = TextAreaTagHelper.TagName)]
+    [HtmlTargetElement(ShortTagName, ParentTag = TextAreaTagHelper.TagName)]
     public class TextAreaValueTagHelper : TagHelper
     {
         internal const string TagName = "govuk-textarea-value";
+        internal const string ShortTagName = "value";
 
         /// <inheritdoc/>
         public override async Task ProcessAsync(TagHelperContext context, TagHelperOutput output)
diff --git a/src/GovUk.Frontend.AspNetCore/TagHelpers/TextInputPrefixTagHelper.cs b/src/GovUk.Frontend.AspNetCore/TagHelpers/TextInputPrefixTagHelper.cs
index 2f323a111..0098991d8 100644
--- a/src/GovUk.Frontend.AspNetCore/TagHelpers/TextInputPrefixTagHelper.cs
+++ b/src/GovUk.Frontend.AspNetCore/TagHelpers/TextInputPrefixTagHelper.cs
@@ -8,10 +8,12 @@ namespace GovUk.Frontend.AspNetCore.TagHelpers
     /// Represents the prefix element in a GDS input component.
     /// </summary>
     [HtmlTargetElement(TagName, ParentTag = TextInputTagHelper.TagName)]
+    [HtmlTargetElement(ShortTagName, ParentTag = TextInputTagHelper.TagName)]
     [OutputElementHint(ComponentGenerator.InputPrefixElement)]
     public class TextInputPrefixTagHelper : TagHelper
     {
         internal const string TagName = "govuk-input-prefix";
+        internal const string ShortTagName = "prefix";
 
         /// <summary>
         /// Creates an <see cref="TextInputPrefixTagHelper"/>.
diff --git a/src/GovUk.Frontend.AspNetCore/TagHelpers/TextInputSuffixTagHelper.cs b/src/GovUk.Frontend.AspNetCore/TagHelpers/TextInputSuffixTagHelper.cs
index 58046ea85..681a03384 100644
--- a/src/GovUk.Frontend.AspNetCore/TagHelpers/TextInputSuffixTagHelper.cs
+++ b/src/GovUk.Frontend.AspNetCore/TagHelpers/TextInputSuffixTagHelper.cs
@@ -8,10 +8,12 @@ namespace GovUk.Frontend.AspNetCore.TagHelpers
     /// Represents the prefix suffix in a GDS input component.
     /// </summary>
     [HtmlTargetElement(TagName, ParentTag = TextInputTagHelper.TagName)]
+    [HtmlTargetElement(ShortTagName, ParentTag = TextInputTagHelper.TagName)]
     [OutputElementHint(ComponentGenerator.InputSuffixElement)]
     public class TextInputSuffixTagHelper : TagHelper
     {
         internal const string TagName = "govuk-input-suffix";
+        internal const string ShortTagName = "suffix";
 
         /// <summary>
         /// Creates an <see cref="TextInputSuffixTagHelper"/>.
diff --git a/src/GovUk.Frontend.AspNetCore/TagHelpers/TextInputTagHelper.cs b/src/GovUk.Frontend.AspNetCore/TagHelpers/TextInputTagHelper.cs
index be6c86ee2..e9f16a687 100644
--- a/src/GovUk.Frontend.AspNetCore/TagHelpers/TextInputTagHelper.cs
+++ b/src/GovUk.Frontend.AspNetCore/TagHelpers/TextInputTagHelper.cs
@@ -11,7 +11,17 @@ namespace GovUk.Frontend.AspNetCore.TagHelpers
     /// Generates a GDS input component.
     /// </summary>
     [HtmlTargetElement(TagName)]
-    [RestrictChildren(LabelTagName, HintTagName, ErrorMessageTagName, TextInputPrefixTagHelper.TagName, TextInputSuffixTagHelper.TagName)]
+    [RestrictChildren(
+        LabelTagName,
+        FormGroupLabelTagHelper.ShortTagName,
+        HintTagName,
+        FormGroupHintTagHelper.ShortTagName,
+        ErrorMessageTagName,
+        FormGroupErrorMessageTagHelper.ShortTagName,
+        TextInputPrefixTagHelper.TagName,
+        TextInputPrefixTagHelper.ShortTagName,
+        TextInputSuffixTagHelper.TagName,
+        TextInputSuffixTagHelper.ShortTagName)]
     [OutputElementHint(ComponentGenerator.FormGroupElement)]
     public class TextInputTagHelper : FormGroupTagHelperBase
     {