diff --git a/editor.planx.uk/docs/adding-a-new-component.md b/editor.planx.uk/docs/adding-a-new-component.md
index 453bbb47b2..45116943d6 100644
--- a/editor.planx.uk/docs/adding-a-new-component.md
+++ b/editor.planx.uk/docs/adding-a-new-component.md
@@ -66,7 +66,7 @@ type Props = PublicProps<SetValue>;
 function SetValueComponent(props: Props) {
   return (
     <Card handleSubmit={props.handleSubmit} isValid>
-      <QuestionHeader
+      <CardHeader
         info={props.info}
         policyRef={props.policyRef}
         howMeasured={props.howMeasured}
diff --git a/editor.planx.uk/src/@planx/components/AddressInput/Public.tsx b/editor.planx.uk/src/@planx/components/AddressInput/Public.tsx
index e721a811d7..2cc1185c55 100644
--- a/editor.planx.uk/src/@planx/components/AddressInput/Public.tsx
+++ b/editor.planx.uk/src/@planx/components/AddressInput/Public.tsx
@@ -1,5 +1,5 @@
 import Card from "@planx/components/shared/Preview/Card";
-import QuestionHeader from "@planx/components/shared/Preview/QuestionHeader";
+import CardHeader from "@planx/components/shared/Preview/CardHeader";
 import type { PublicProps } from "@planx/components/ui";
 import { useFormik } from "formik";
 import React from "react";
@@ -43,7 +43,7 @@ export default function AddressInputComponent(props: Props): FCReturn {
 
   return (
     <Card handleSubmit={formik.handleSubmit}>
-      <QuestionHeader
+      <CardHeader
         title={props.title}
         description={props.description}
         info={props.info}
diff --git a/editor.planx.uk/src/@planx/components/Checklist/Public.tsx b/editor.planx.uk/src/@planx/components/Checklist/Public.tsx
index 2b8810be9f..11e5c86ecf 100644
--- a/editor.planx.uk/src/@planx/components/Checklist/Public.tsx
+++ b/editor.planx.uk/src/@planx/components/Checklist/Public.tsx
@@ -4,7 +4,7 @@ import { visuallyHidden } from "@mui/utils";
 import type { Checklist, Group } from "@planx/components/Checklist/model";
 import ImageButton from "@planx/components/shared/Buttons/ImageButton";
 import Card from "@planx/components/shared/Preview/Card";
-import QuestionHeader from "@planx/components/shared/Preview/QuestionHeader";
+import CardHeader from "@planx/components/shared/Preview/CardHeader";
 import { getIn, useFormik } from "formik";
 import React, { useState } from "react";
 import InputLegend from "ui/editor/InputLegend";
@@ -132,7 +132,7 @@ const ChecklistComponent: React.FC<Props> = ({
 
   return (
     <Card handleSubmit={formik.handleSubmit} isValid>
-      <QuestionHeader
+      <CardHeader
         title={text}
         description={description}
         info={info}
diff --git a/editor.planx.uk/src/@planx/components/ContactInput/Public.tsx b/editor.planx.uk/src/@planx/components/ContactInput/Public.tsx
index 21c41fbf32..16a7accbe7 100644
--- a/editor.planx.uk/src/@planx/components/ContactInput/Public.tsx
+++ b/editor.planx.uk/src/@planx/components/ContactInput/Public.tsx
@@ -1,5 +1,5 @@
 import Card from "@planx/components/shared/Preview/Card";
-import QuestionHeader from "@planx/components/shared/Preview/QuestionHeader";
+import CardHeader from "@planx/components/shared/Preview/CardHeader";
 import type { PublicProps } from "@planx/components/ui";
 import { useFormik } from "formik";
 import React from "react";
@@ -57,7 +57,7 @@ export default function ContactInputComponent(props: Props): FCReturn {
 
   return (
     <Card handleSubmit={formik.handleSubmit}>
-      <QuestionHeader
+      <CardHeader
         title={props.title}
         description={props.description}
         info={props.info}
diff --git a/editor.planx.uk/src/@planx/components/Content/Public.tsx b/editor.planx.uk/src/@planx/components/Content/Public.tsx
index c177aebc79..7c8584c09e 100644
--- a/editor.planx.uk/src/@planx/components/Content/Public.tsx
+++ b/editor.planx.uk/src/@planx/components/Content/Public.tsx
@@ -12,9 +12,9 @@ import { getContrastTextColor } from "styleUtils";
 import { emptyContent } from "ui/editor/RichTextInput";
 import ReactMarkdownOrHtml from "ui/shared/ReactMarkdownOrHtml";
 
+import { HelpButton, Image } from "../shared/Preview/CardHeader";
 import MoreInfo from "../shared/Preview/MoreInfo";
 import MoreInfoSection from "../shared/Preview/MoreInfoSection";
-import { HelpButton, Image } from "../shared/Preview/QuestionHeader";
 
 export type Props = PublicProps<Content>;
 
diff --git a/editor.planx.uk/src/@planx/components/DateInput/Public.tsx b/editor.planx.uk/src/@planx/components/DateInput/Public.tsx
index 79850dead2..90e80d35d5 100644
--- a/editor.planx.uk/src/@planx/components/DateInput/Public.tsx
+++ b/editor.planx.uk/src/@planx/components/DateInput/Public.tsx
@@ -3,7 +3,7 @@ import { visuallyHidden } from "@mui/utils";
 import { DateInput, paddedDate } from "@planx/components/DateInput/model";
 import { dateRangeSchema } from "@planx/components/DateInput/model";
 import Card from "@planx/components/shared/Preview/Card";
-import QuestionHeader from "@planx/components/shared/Preview/QuestionHeader";
+import CardHeader from "@planx/components/shared/Preview/CardHeader";
 import { PublicProps } from "@planx/components/ui";
 import { useFormik } from "formik";
 import React from "react";
@@ -44,7 +44,7 @@ const DateInputPublic: React.FC<Props> = (props) => {
           .join(" ")}
       >
         <legend style={visuallyHidden}>{props.title}</legend>
-        <QuestionHeader
+        <CardHeader
           title={props.title}
           description={props.description}
           info={props.info}
diff --git a/editor.planx.uk/src/@planx/components/DrawBoundary/Public/index.tsx b/editor.planx.uk/src/@planx/components/DrawBoundary/Public/index.tsx
index 011b6bd735..e5086f1d17 100644
--- a/editor.planx.uk/src/@planx/components/DrawBoundary/Public/index.tsx
+++ b/editor.planx.uk/src/@planx/components/DrawBoundary/Public/index.tsx
@@ -5,11 +5,11 @@ import { visuallyHidden } from "@mui/utils";
 import { FileUploadSlot } from "@planx/components/FileUpload/Public";
 import { PASSPORT_REQUESTED_FILES_KEY } from "@planx/components/FileUploadAndLabel/model";
 import Card from "@planx/components/shared/Preview/Card";
+import CardHeader from "@planx/components/shared/Preview/CardHeader";
 import {
   MapContainer,
   MapFooter,
 } from "@planx/components/shared/Preview/MapContainer";
-import QuestionHeader from "@planx/components/shared/Preview/QuestionHeader";
 import { PrivateFileUpload } from "@planx/components/shared/PrivateFileUpload/PrivateFileUpload";
 import { squareMetresToHectares } from "@planx/components/shared/utils";
 import type { PublicProps } from "@planx/components/ui";
@@ -227,7 +227,7 @@ export default function Component(props: Props) {
     if (page === "draw") {
       return (
         <>
-          <QuestionHeader
+          <CardHeader
             title={props.title}
             description={props.description}
             info={props.info}
@@ -313,7 +313,7 @@ export default function Component(props: Props) {
     } else if (page === "upload") {
       return (
         <>
-          <QuestionHeader
+          <CardHeader
             title={props.titleForUploading}
             description={props.descriptionForUploading}
             info={props.info}
diff --git a/editor.planx.uk/src/@planx/components/FileUpload/Public.tsx b/editor.planx.uk/src/@planx/components/FileUpload/Public.tsx
index c3780cbcaf..e821865e94 100644
--- a/editor.planx.uk/src/@planx/components/FileUpload/Public.tsx
+++ b/editor.planx.uk/src/@planx/components/FileUpload/Public.tsx
@@ -1,6 +1,6 @@
 import { MoreInformation } from "@planx/components/shared";
 import Card from "@planx/components/shared/Preview/Card";
-import QuestionHeader from "@planx/components/shared/Preview/QuestionHeader";
+import CardHeader from "@planx/components/shared/Preview/CardHeader";
 import { Store, useStore } from "pages/FlowEditor/lib/store";
 import type { handleSubmit } from "pages/Preview/Node";
 import React, { useEffect, useRef, useState } from "react";
@@ -116,7 +116,7 @@ const FileUpload: React.FC<Props> = (props) => {
 
   return (
     <Card isValid={true} handleSubmit={handleSubmit}>
-      <QuestionHeader
+      <CardHeader
         title={props.title}
         description={props.description}
         info={props.info}
diff --git a/editor.planx.uk/src/@planx/components/FileUploadAndLabel/Public.tsx b/editor.planx.uk/src/@planx/components/FileUploadAndLabel/Public.tsx
index 7d28298ab0..2233382ef2 100644
--- a/editor.planx.uk/src/@planx/components/FileUploadAndLabel/Public.tsx
+++ b/editor.planx.uk/src/@planx/components/FileUploadAndLabel/Public.tsx
@@ -21,9 +21,9 @@ import ReactMarkdownOrHtml from "ui/shared/ReactMarkdownOrHtml";
 import { FileUploadSlot } from "../FileUpload/Public";
 import { MoreInformation } from "../shared";
 import Card from "../shared/Preview/Card";
+import CardHeader, { Image } from "../shared/Preview/CardHeader";
 import MoreInfo from "../shared/Preview/MoreInfo";
 import MoreInfoSection from "../shared/Preview/MoreInfoSection";
-import QuestionHeader, { Image } from "../shared/Preview/QuestionHeader";
 import { Dropzone } from "../shared/PrivateFileUpload/Dropzone";
 import { FileStatus } from "../shared/PrivateFileUpload/FileStatus";
 import { UploadedFileCard } from "../shared/PrivateFileUpload/UploadedFileCard";
@@ -194,7 +194,7 @@ function Component(props: Props) {
       }
     >
       <FullWidthWrapper>
-        <QuestionHeader {...props} />
+        <CardHeader {...props} />
         <DropzoneContainer>
           {!props.hideDropZone && (
             <>
diff --git a/editor.planx.uk/src/@planx/components/FindProperty/Public/index.tsx b/editor.planx.uk/src/@planx/components/FindProperty/Public/index.tsx
index cf755932d6..3f91883a05 100644
--- a/editor.planx.uk/src/@planx/components/FindProperty/Public/index.tsx
+++ b/editor.planx.uk/src/@planx/components/FindProperty/Public/index.tsx
@@ -4,7 +4,7 @@ import Link from "@mui/material/Link";
 import { styled } from "@mui/material/styles";
 import Typography from "@mui/material/Typography";
 import Card from "@planx/components/shared/Preview/Card";
-import QuestionHeader from "@planx/components/shared/Preview/QuestionHeader";
+import CardHeader from "@planx/components/shared/Preview/CardHeader";
 import { squareMetresToHectares } from "@planx/components/shared/utils";
 import { PublicProps } from "@planx/components/ui";
 import area from "@turf/area";
@@ -188,7 +188,7 @@ function Component(props: Props) {
     if (props.allowNewAddresses && page === "new-address") {
       return (
         <>
-          <QuestionHeader
+          <CardHeader
             title={props.newAddressTitle}
             description={props.newAddressDescription || ""}
           />
@@ -219,7 +219,7 @@ function Component(props: Props) {
       // default to page === "os-address"
       return (
         <>
-          <QuestionHeader
+          <CardHeader
             title={props.title}
             description={props.description || ""}
           />
diff --git a/editor.planx.uk/src/@planx/components/NextSteps/Public.tsx b/editor.planx.uk/src/@planx/components/NextSteps/Public.tsx
index c76bdd3811..98e1dde77e 100644
--- a/editor.planx.uk/src/@planx/components/NextSteps/Public.tsx
+++ b/editor.planx.uk/src/@planx/components/NextSteps/Public.tsx
@@ -3,7 +3,7 @@ import React from "react";
 import NextStepsList from "ui/public/NextStepsList";
 
 import Card from "../shared/Preview/Card";
-import QuestionHeader from "../shared/Preview/QuestionHeader";
+import CardHeader from "../shared/Preview/CardHeader";
 import { NextSteps } from "./model";
 
 export type Props = PublicProps<NextSteps>;
@@ -11,7 +11,7 @@ export type Props = PublicProps<NextSteps>;
 const NextStepsComponent: React.FC<Props> = (props) => {
   return (
     <Card>
-      <QuestionHeader
+      <CardHeader
         title={props.title}
         description={props.description}
         info={props.info}
diff --git a/editor.planx.uk/src/@planx/components/Notice/Public.tsx b/editor.planx.uk/src/@planx/components/Notice/Public.tsx
index 5e57c092e5..be9f7903ff 100644
--- a/editor.planx.uk/src/@planx/components/Notice/Public.tsx
+++ b/editor.planx.uk/src/@planx/components/Notice/Public.tsx
@@ -7,7 +7,7 @@ import Typography from "@mui/material/Typography";
 import type { Notice } from "@planx/components/Notice/model";
 import Card from "@planx/components/shared/Preview/Card";
 import { contentFlowSpacing } from "@planx/components/shared/Preview/Card";
-import QuestionHeader from "@planx/components/shared/Preview/QuestionHeader";
+import CardHeader from "@planx/components/shared/Preview/CardHeader";
 import { PublicProps } from "@planx/components/ui";
 import { useAnalyticsTracking } from "pages/FlowEditor/lib/analytics/provider";
 import React from "react";
@@ -94,7 +94,7 @@ const NoticeComponent: React.FC<Props> = (props) => {
   return (
     <Card handleSubmit={handleSubmit} isValid>
       <>
-        <QuestionHeader
+        <CardHeader
           info={props.info}
           policyRef={props.policyRef}
           howMeasured={props.howMeasured}
diff --git a/editor.planx.uk/src/@planx/components/NumberInput/Public.tsx b/editor.planx.uk/src/@planx/components/NumberInput/Public.tsx
index deb154127a..25700a4219 100644
--- a/editor.planx.uk/src/@planx/components/NumberInput/Public.tsx
+++ b/editor.planx.uk/src/@planx/components/NumberInput/Public.tsx
@@ -1,5 +1,5 @@
 import Card from "@planx/components/shared/Preview/Card";
-import QuestionHeader from "@planx/components/shared/Preview/QuestionHeader";
+import CardHeader from "@planx/components/shared/Preview/CardHeader";
 import { PublicProps } from "@planx/components/ui";
 import { useFormik } from "formik";
 import isNil from "lodash/isNil";
@@ -65,7 +65,7 @@ export default function NumberInputComponent(props: Props): FCReturn {
 
   return (
     <Card handleSubmit={formik.handleSubmit} isValid>
-      <QuestionHeader
+      <CardHeader
         title={props.title}
         description={props.description}
         info={props.info}
diff --git a/editor.planx.uk/src/@planx/components/PlanningConstraints/Public.tsx b/editor.planx.uk/src/@planx/components/PlanningConstraints/Public.tsx
index 722ec7798e..00d7a6ed28 100644
--- a/editor.planx.uk/src/@planx/components/PlanningConstraints/Public.tsx
+++ b/editor.planx.uk/src/@planx/components/PlanningConstraints/Public.tsx
@@ -6,7 +6,7 @@ import type {
   GISResponse,
 } from "@opensystemslab/planx-core/types";
 import Card from "@planx/components/shared/Preview/Card";
-import QuestionHeader from "@planx/components/shared/Preview/QuestionHeader";
+import CardHeader from "@planx/components/shared/Preview/CardHeader";
 import type { PublicProps } from "@planx/components/ui";
 import DelayedLoadingIndicator from "components/DelayedLoadingIndicator";
 import capitalize from "lodash/capitalize";
@@ -15,6 +15,7 @@ import { handleSubmit } from "pages/Preview/Node";
 import React from "react";
 import useSWR, { Fetcher } from "swr";
 import { FONT_WEIGHT_SEMI_BOLD } from "theme";
+import ReactMarkdownOrHtml from "ui/shared/ReactMarkdownOrHtml";
 import { stringify } from "wkt";
 
 import { SiteAddress } from "../FindProperty/model";
@@ -27,7 +28,6 @@ import {
   type IntersectingConstraints,
   type PlanningConstraints,
 } from "./model";
-import ReactMarkdownOrHtml from "ui/shared/ReactMarkdownOrHtml";
 
 type Props = PublicProps<PlanningConstraints>;
 
@@ -181,7 +181,7 @@ function Component(props: Props) {
         />
       ) : (
         <Card handleSubmit={props.handleSubmit} isValid>
-          <QuestionHeader
+          <CardHeader
             title={props.title}
             description={props.description || ""}
           />
@@ -206,8 +206,14 @@ export type PlanningConstraintsContentProps = {
 export function PlanningConstraintsContent(
   props: PlanningConstraintsContentProps,
 ) {
-  const { title, description, constraints, metadata, refreshConstraints, disclaimer } =
-    props;
+  const {
+    title,
+    description,
+    constraints,
+    metadata,
+    refreshConstraints,
+    disclaimer,
+  } = props;
   const error = constraints.error || undefined;
   const showError = error || !Object.values(constraints)?.length;
 
@@ -221,7 +227,7 @@ export function PlanningConstraintsContent(
 
   return (
     <Card handleSubmit={props.handleSubmit}>
-      <QuestionHeader title={title} description={description} />
+      <CardHeader title={title} description={description} />
       {showError && (
         <ConstraintsFetchError
           error={error}
@@ -283,7 +289,10 @@ const Disclaimer = (props: { text: string }) => (
   <WarningContainer>
     <ErrorOutline />
     <Typography variant="body1" component="div" ml={2} mb={1}>
-      <ReactMarkdownOrHtml source={props.text || DEFAULT_PLANNING_CONDITIONS_DISCLAIMER} openLinksOnNewTab />
+      <ReactMarkdownOrHtml
+        source={props.text || DEFAULT_PLANNING_CONDITIONS_DISCLAIMER}
+        openLinksOnNewTab
+      />
     </Typography>
   </WarningContainer>
 );
@@ -324,7 +333,7 @@ interface ConstraintsGraphErrorProps {
 
 const ConstraintsGraphError = (props: ConstraintsGraphErrorProps) => (
   <Card handleSubmit={props.handleSubmit} isValid>
-    <QuestionHeader title={props.title} description={props.description || ""} />
+    <CardHeader title={props.title} description={props.description || ""} />
     <ErrorSummaryContainer
       role="status"
       data-testid="error-summary-invalid-graph"
diff --git a/editor.planx.uk/src/@planx/components/PropertyInformation/Public.tsx b/editor.planx.uk/src/@planx/components/PropertyInformation/Public.tsx
index d29c1f5a3a..622b7672de 100644
--- a/editor.planx.uk/src/@planx/components/PropertyInformation/Public.tsx
+++ b/editor.planx.uk/src/@planx/components/PropertyInformation/Public.tsx
@@ -5,7 +5,7 @@ import { styled } from "@mui/material/styles";
 import Typography from "@mui/material/Typography";
 import { visuallyHidden } from "@mui/utils";
 import Card from "@planx/components/shared/Preview/Card";
-import QuestionHeader from "@planx/components/shared/Preview/QuestionHeader";
+import CardHeader from "@planx/components/shared/Preview/CardHeader";
 import { SummaryListTable } from "@planx/components/shared/Preview/SummaryList";
 import type { PublicProps } from "@planx/components/ui";
 import { Feature } from "@turf/helpers";
@@ -130,7 +130,7 @@ export function Presentational(props: PresentationalProps) {
 
   return (
     <Card handleSubmit={handleSubmit}>
-      <QuestionHeader title={title} description={description} />
+      <CardHeader title={title} description={description} />
       <MapContainer>
         <p style={visuallyHidden}>
           A static map centred on the property address, showing the title
diff --git a/editor.planx.uk/src/@planx/components/Question/Public/Question.tsx b/editor.planx.uk/src/@planx/components/Question/Public/Question.tsx
index 42904a3cf0..9950bd496f 100644
--- a/editor.planx.uk/src/@planx/components/Question/Public/Question.tsx
+++ b/editor.planx.uk/src/@planx/components/Question/Public/Question.tsx
@@ -5,7 +5,7 @@ import RadioGroup from "@mui/material/RadioGroup";
 import { useTheme } from "@mui/material/styles";
 import { visuallyHidden } from "@mui/utils";
 import Card from "@planx/components/shared/Preview/Card";
-import QuestionHeader from "@planx/components/shared/Preview/QuestionHeader";
+import CardHeader from "@planx/components/shared/Preview/CardHeader";
 import BasicRadio from "@planx/components/shared/Radio/BasicRadio";
 import DescriptionRadio from "@planx/components/shared/Radio/DescriptionRadio";
 import ImageRadio from "@planx/components/shared/Radio/ImageRadio";
@@ -85,7 +85,7 @@ const Question: React.FC<IQuestion> = (props) => {
 
   return (
     <Card handleSubmit={formik.handleSubmit}>
-      <QuestionHeader
+      <CardHeader
         title={props.text}
         description={props.description}
         info={props.info}
diff --git a/editor.planx.uk/src/@planx/components/Review/Public/Presentational.tsx b/editor.planx.uk/src/@planx/components/Review/Public/Presentational.tsx
index 8a0a7e67af..15c006629c 100644
--- a/editor.planx.uk/src/@planx/components/Review/Public/Presentational.tsx
+++ b/editor.planx.uk/src/@planx/components/Review/Public/Presentational.tsx
@@ -1,5 +1,5 @@
 import Card from "@planx/components/shared/Preview/Card";
-import QuestionHeader from "@planx/components/shared/Preview/QuestionHeader";
+import CardHeader from "@planx/components/shared/Preview/CardHeader";
 import SummaryListsBySections from "@planx/components/shared/Preview/SummaryList";
 import { Store } from "pages/FlowEditor/lib/store";
 import { sortBreadcrumbs } from "pages/FlowEditor/lib/store/preview";
@@ -28,7 +28,7 @@ function Component(props: Props) {
 
   return (
     <Card isValid handleSubmit={props.handleSubmit}>
-      <QuestionHeader title={props.title} description={props.description} />
+      <CardHeader title={props.title} description={props.description} />
       <SummaryListsBySections
         breadcrumbs={sortedBreadcrumbs}
         flow={props.flow}
diff --git a/editor.planx.uk/src/@planx/components/Section/Public.tsx b/editor.planx.uk/src/@planx/components/Section/Public.tsx
index 5e55805ef1..2b7831c3db 100644
--- a/editor.planx.uk/src/@planx/components/Section/Public.tsx
+++ b/editor.planx.uk/src/@planx/components/Section/Public.tsx
@@ -12,7 +12,7 @@ import { SectionNode, SectionStatus } from "types";
 import ReactMarkdownOrHtml from "ui/shared/ReactMarkdownOrHtml";
 
 import Card from "../shared/Preview/Card";
-import QuestionHeader from "../shared/Preview/QuestionHeader";
+import CardHeader from "../shared/Preview/CardHeader";
 import type { Section } from "./model";
 import { computeSectionStatuses } from "./model";
 
@@ -78,7 +78,7 @@ export const Root = ({
   ...props
 }: RootProps) => (
   <Card isValid handleSubmit={handleSubmit}>
-    <QuestionHeader title={flowName} />
+    <CardHeader title={flowName} />
     <Box>
       <Typography variant="h3" component="h2" pb="0.25em">
         Application incomplete.
diff --git a/editor.planx.uk/src/@planx/components/TaskList/Public.tsx b/editor.planx.uk/src/@planx/components/TaskList/Public.tsx
index a90db30ea7..50a37eaab3 100644
--- a/editor.planx.uk/src/@planx/components/TaskList/Public.tsx
+++ b/editor.planx.uk/src/@planx/components/TaskList/Public.tsx
@@ -1,5 +1,5 @@
 import Card from "@planx/components/shared/Preview/Card";
-import QuestionHeader from "@planx/components/shared/Preview/QuestionHeader";
+import CardHeader from "@planx/components/shared/Preview/CardHeader";
 import type { TaskList } from "@planx/components/TaskList/model";
 import { PublicProps } from "@planx/components/ui";
 import React from "react";
@@ -10,7 +10,7 @@ export type Props = PublicProps<TaskList>;
 const TaskListComponent: React.FC<Props> = (props) => {
   return (
     <Card handleSubmit={props.handleSubmit} isValid>
-      <QuestionHeader
+      <CardHeader
         title={props.title}
         description={props.description}
         info={props.info}
diff --git a/editor.planx.uk/src/@planx/components/TextInput/Public.tsx b/editor.planx.uk/src/@planx/components/TextInput/Public.tsx
index 745cdb6bb9..6bf7ac1080 100644
--- a/editor.planx.uk/src/@planx/components/TextInput/Public.tsx
+++ b/editor.planx.uk/src/@planx/components/TextInput/Public.tsx
@@ -1,5 +1,5 @@
 import Card from "@planx/components/shared/Preview/Card";
-import QuestionHeader from "@planx/components/shared/Preview/QuestionHeader";
+import CardHeader from "@planx/components/shared/Preview/CardHeader";
 import { PublicProps } from "@planx/components/ui";
 import { useFormik } from "formik";
 import React from "react";
@@ -33,7 +33,7 @@ const TextInputComponent: React.FC<Props> = (props) => {
 
   return (
     <Card handleSubmit={formik.handleSubmit} isValid>
-      <QuestionHeader
+      <CardHeader
         title={props.title}
         description={props.description}
         info={props.info}
diff --git a/editor.planx.uk/src/@planx/components/shared/Preview/QuestionHeader.tsx b/editor.planx.uk/src/@planx/components/shared/Preview/CardHeader.tsx
similarity index 94%
rename from editor.planx.uk/src/@planx/components/shared/Preview/QuestionHeader.tsx
rename to editor.planx.uk/src/@planx/components/shared/Preview/CardHeader.tsx
index 99bb020d7b..5b8a178b87 100644
--- a/editor.planx.uk/src/@planx/components/shared/Preview/QuestionHeader.tsx
+++ b/editor.planx.uk/src/@planx/components/shared/Preview/CardHeader.tsx
@@ -12,7 +12,7 @@ import { DESCRIPTION_TEXT } from "../constants";
 import MoreInfo from "./MoreInfo";
 import MoreInfoSection from "./MoreInfoSection";
 
-interface IQuestionHeader {
+interface ICardHeader {
   title?: string;
   description?: string;
   info?: string;
@@ -27,7 +27,7 @@ const Description = styled(Box)(({ theme }) => ({
   },
 }));
 
-const QuestionHeaderWrapper = styled(Box)(({ theme }) => ({
+const CardHeaderWrapper = styled(Box)(({ theme }) => ({
   maxWidth: theme.breakpoints.values.formWrap,
   marginBottom: theme.spacing(1),
 }));
@@ -51,7 +51,7 @@ export const Image = styled("img")(() => ({
   maxWidth: "100%",
 }));
 
-const QuestionHeader: React.FC<IQuestionHeader> = ({
+const CardHeader: React.FC<ICardHeader> = ({
   title,
   description,
   info,
@@ -70,7 +70,7 @@ const QuestionHeader: React.FC<IQuestionHeader> = ({
 
   return (
     <>
-      <QuestionHeaderWrapper>
+      <CardHeaderWrapper>
         {title && (
           <TitleWrapper mr={1} pt={0.5}>
             <Typography
@@ -140,8 +140,8 @@ const QuestionHeader: React.FC<IQuestionHeader> = ({
           ) : undefined}
         </MoreInfo>
         {img && <Image src={img} alt="question" />}
-      </QuestionHeaderWrapper>
+      </CardHeaderWrapper>
     </>
   );
 };
-export default QuestionHeader;
+export default CardHeader;
diff --git a/editor.planx.uk/src/pages/Preview/ResumePage.tsx b/editor.planx.uk/src/pages/Preview/ResumePage.tsx
index 09510c7344..6f878f45e0 100644
--- a/editor.planx.uk/src/pages/Preview/ResumePage.tsx
+++ b/editor.planx.uk/src/pages/Preview/ResumePage.tsx
@@ -3,7 +3,7 @@ import Link from "@mui/material/Link";
 import Typography from "@mui/material/Typography";
 import { PaymentRequest } from "@opensystemslab/planx-core/types";
 import Card from "@planx/components/shared/Preview/Card";
-import QuestionHeader from "@planx/components/shared/Preview/QuestionHeader";
+import CardHeader from "@planx/components/shared/Preview/CardHeader";
 import axios from "axios";
 import DelayedLoadingIndicator from "components/DelayedLoadingIndicator";
 import { useFormik } from "formik";
@@ -62,10 +62,10 @@ export const EmailRequired: React.FC<{ setEmail: (email: string) => void }> = ({
   return (
     <Box width="100%">
       <Card handleSubmit={formik.handleSubmit}>
-        <QuestionHeader
+        <CardHeader
           title="Resume your application"
           description="Enter your email to resume your application."
-        ></QuestionHeader>
+        ></CardHeader>
         <InputRow>
           <InputLabel label={"Email address"} htmlFor={"email"}>
             <Input
diff --git a/editor.planx.uk/src/pages/Preview/SaveAndReturn.tsx b/editor.planx.uk/src/pages/Preview/SaveAndReturn.tsx
index c2636413fb..0b74658f0f 100644
--- a/editor.planx.uk/src/pages/Preview/SaveAndReturn.tsx
+++ b/editor.planx.uk/src/pages/Preview/SaveAndReturn.tsx
@@ -1,6 +1,6 @@
 import Box from "@mui/material/Box";
 import Card from "@planx/components/shared/Preview/Card";
-import QuestionHeader from "@planx/components/shared/Preview/QuestionHeader";
+import CardHeader from "@planx/components/shared/Preview/CardHeader";
 import { useFormik } from "formik";
 import { useStore } from "pages/FlowEditor/lib/store";
 import React from "react";
@@ -35,10 +35,10 @@ export const ConfirmEmail: React.FC<{
   return (
     <Box width="100%">
       <Card handleSubmit={formik.handleSubmit}>
-        <QuestionHeader
+        <CardHeader
           title="Enter your email address"
           description="We will use this to save your application so you can come back to it later. We will also email you updates about your application."
-        ></QuestionHeader>
+        ></CardHeader>
         <InputRow>
           <InputLabel label={"Email address"} htmlFor={"email"}>
             <Input