diff --git a/editor.planx.uk/src/@planx/components/AddressInput/Editor.tsx b/editor.planx.uk/src/@planx/components/AddressInput/Editor.tsx
index 7620175b83..d41fc325b6 100644
--- a/editor.planx.uk/src/@planx/components/AddressInput/Editor.tsx
+++ b/editor.planx.uk/src/@planx/components/AddressInput/Editor.tsx
@@ -1,4 +1,4 @@
-import { TYPES } from "@planx/components/types";
+import { ComponentType as TYPES } from "@opensystemslab/planx-core/types";
 import {
   EditorProps,
   ICONS,
diff --git a/editor.planx.uk/src/@planx/components/Calculate/Editor.tsx b/editor.planx.uk/src/@planx/components/Calculate/Editor.tsx
index b6664bcaca..80821ae57d 100644
--- a/editor.planx.uk/src/@planx/components/Calculate/Editor.tsx
+++ b/editor.planx.uk/src/@planx/components/Calculate/Editor.tsx
@@ -1,6 +1,6 @@
 import { styled } from "@mui/material/styles";
 import Typography from "@mui/material/Typography";
-import { TYPES } from "@planx/components/types";
+import { ComponentType as TYPES } from "@opensystemslab/planx-core/types";
 import {
   EditorProps,
   ICONS,
diff --git a/editor.planx.uk/src/@planx/components/Calculate/logic.test.ts b/editor.planx.uk/src/@planx/components/Calculate/logic.test.ts
index e2d4427c38..6d27065ed8 100644
--- a/editor.planx.uk/src/@planx/components/Calculate/logic.test.ts
+++ b/editor.planx.uk/src/@planx/components/Calculate/logic.test.ts
@@ -1,8 +1,8 @@
-import { TYPES } from "@planx/components/types";
+import { ComponentType as TYPES } from "@opensystemslab/planx-core/types";
 import { Store, vanillaStore } from "pages/FlowEditor/lib/store";
 
 const { getState, setState } = vanillaStore;
-const { upcomingCardIds, resetPreview, record, currentCard } = getState();
+const { upcomingCardIds, resetPreview, record } = getState();
 
 // Helper method
 const visitedNodes = () => Object.keys(getState().breadcrumbs);
@@ -74,7 +74,7 @@ const flowWithAutomation: Store.flow = {
       val: "1",
       text: "1",
     },
-    type: TYPES.Response,
+    type: TYPES.Answer,
     edges: ["Group1Notice"],
   },
   Question: {
@@ -82,7 +82,7 @@ const flowWithAutomation: Store.flow = {
       fn: "testGroup",
       text: "Which test group? ",
     },
-    type: TYPES.Statement,
+    type: TYPES.Question,
     edges: ["Group1Response", "Group2Response"],
   },
   Group2Response: {
@@ -90,7 +90,7 @@ const flowWithAutomation: Store.flow = {
       val: "2",
       text: "2",
     },
-    type: TYPES.Response,
+    type: TYPES.Answer,
     edges: ["Group2Notice"],
   },
 };
@@ -128,7 +128,7 @@ const flowWithoutAutomation: Store.flow = {
       val: "1",
       text: "1",
     },
-    type: TYPES.Response,
+    type: TYPES.Answer,
     edges: ["Group1Notice"],
   },
   Question: {
@@ -136,7 +136,7 @@ const flowWithoutAutomation: Store.flow = {
       fn: "testGroup",
       text: "Which test group? ",
     },
-    type: TYPES.Statement,
+    type: TYPES.Question,
     edges: ["Group1Response", "Group2Response"],
   },
   Group2Response: {
@@ -144,7 +144,7 @@ const flowWithoutAutomation: Store.flow = {
       val: "2",
       text: "2",
     },
-    type: TYPES.Response,
+    type: TYPES.Answer,
     edges: ["Group2Notice"],
   },
 };
diff --git a/editor.planx.uk/src/@planx/components/Checklist/Editor.tsx b/editor.planx.uk/src/@planx/components/Checklist/Editor.tsx
index 1931f8463c..f33aa5ac4d 100644
--- a/editor.planx.uk/src/@planx/components/Checklist/Editor.tsx
+++ b/editor.planx.uk/src/@planx/components/Checklist/Editor.tsx
@@ -2,6 +2,7 @@ import Delete from "@mui/icons-material/Delete";
 import Box from "@mui/material/Box";
 import Button from "@mui/material/Button";
 import IconButton from "@mui/material/IconButton";
+import { ComponentType as TYPES } from "@opensystemslab/planx-core/types";
 import { useFormik } from "formik";
 import adjust from "ramda/src/adjust";
 import compose from "ramda/src/compose";
@@ -22,7 +23,6 @@ import InputRowItem from "ui/shared/InputRowItem";
 
 import { Option, parseMoreInformation } from "../shared";
 import PermissionSelect from "../shared/PermissionSelect";
-import { TYPES } from "../types";
 import { ICONS, InternalNotes, MoreInformation } from "../ui";
 import type { Checklist, Group } from "./model";
 import { toggleExpandableChecklist } from "./model";
@@ -319,7 +319,7 @@ export const ChecklistComponent: React.FC<ChecklistProps> = (props) => {
                 .map((o) => ({
                   ...o,
                   id: o.id || undefined,
-                  type: TYPES.Response,
+                  type: TYPES.Answer,
                 }))
             : groupedOptions
             ? groupedOptions
@@ -328,7 +328,7 @@ export const ChecklistComponent: React.FC<ChecklistProps> = (props) => {
                 .map((o) => ({
                   ...o,
                   id: o.id || undefined,
-                  type: TYPES.Response,
+                  type: TYPES.Answer,
                 }))
             : [],
         );
diff --git a/editor.planx.uk/src/@planx/components/Confirmation/Editor.tsx b/editor.planx.uk/src/@planx/components/Confirmation/Editor.tsx
index e5d58c870a..099361c90f 100644
--- a/editor.planx.uk/src/@planx/components/Confirmation/Editor.tsx
+++ b/editor.planx.uk/src/@planx/components/Confirmation/Editor.tsx
@@ -1,4 +1,5 @@
 import Box from "@mui/material/Box";
+import { ComponentType as TYPES } from "@opensystemslab/planx-core/types";
 import { EditorProps, ICONS } from "@planx/components/ui";
 import { useFormik } from "formik";
 import React, { ChangeEvent } from "react";
@@ -11,7 +12,6 @@ import RichTextInput from "ui/editor/RichTextInput";
 import Input from "ui/shared/Input";
 import InputRow from "ui/shared/InputRow";
 
-import { TYPES } from "../types";
 import { Confirmation, parseNextSteps, Step } from "./model";
 
 export type Props = EditorProps<TYPES.Confirmation, Confirmation>;
diff --git a/editor.planx.uk/src/@planx/components/ContactInput/Editor.tsx b/editor.planx.uk/src/@planx/components/ContactInput/Editor.tsx
index 52108eb439..8bd7a6632c 100644
--- a/editor.planx.uk/src/@planx/components/ContactInput/Editor.tsx
+++ b/editor.planx.uk/src/@planx/components/ContactInput/Editor.tsx
@@ -1,4 +1,4 @@
-import { TYPES } from "@planx/components/types";
+import { ComponentType as TYPES } from "@opensystemslab/planx-core/types";
 import {
   EditorProps,
   ICONS,
diff --git a/editor.planx.uk/src/@planx/components/Content/Editor.tsx b/editor.planx.uk/src/@planx/components/Content/Editor.tsx
index 58436bdb55..048b380e20 100644
--- a/editor.planx.uk/src/@planx/components/Content/Editor.tsx
+++ b/editor.planx.uk/src/@planx/components/Content/Editor.tsx
@@ -1,6 +1,6 @@
+import { ComponentType as TYPES } from "@opensystemslab/planx-core/types";
 import type { Content } from "@planx/components/Content/model";
 import { parseContent } from "@planx/components/Content/model";
-import { TYPES } from "@planx/components/types";
 import {
   EditorProps,
   ICONS,
diff --git a/editor.planx.uk/src/@planx/components/DateInput/Editor.tsx b/editor.planx.uk/src/@planx/components/DateInput/Editor.tsx
index 78c53f8a9c..a0db680f5f 100644
--- a/editor.planx.uk/src/@planx/components/DateInput/Editor.tsx
+++ b/editor.planx.uk/src/@planx/components/DateInput/Editor.tsx
@@ -1,11 +1,11 @@
 import Box from "@mui/material/Box";
+import { ComponentType as TYPES } from "@opensystemslab/planx-core/types";
 import {
   DateInput,
   editorValidationSchema,
   paddedDate,
 } from "@planx/components/DateInput/model";
 import { parseDateInput } from "@planx/components/DateInput/model";
-import { TYPES } from "@planx/components/types";
 import {
   EditorProps,
   ICONS,
diff --git a/editor.planx.uk/src/@planx/components/DrawBoundary/Editor.tsx b/editor.planx.uk/src/@planx/components/DrawBoundary/Editor.tsx
index 2ce16c912e..b85054d325 100644
--- a/editor.planx.uk/src/@planx/components/DrawBoundary/Editor.tsx
+++ b/editor.planx.uk/src/@planx/components/DrawBoundary/Editor.tsx
@@ -1,4 +1,4 @@
-import { TYPES } from "@planx/components/types";
+import { ComponentType as TYPES } from "@opensystemslab/planx-core/types";
 import {
   EditorProps,
   ICONS,
diff --git a/editor.planx.uk/src/@planx/components/ExternalPortal/Editor.test.tsx b/editor.planx.uk/src/@planx/components/ExternalPortal/Editor.test.tsx
index a1b1468ac0..b12b764c9e 100644
--- a/editor.planx.uk/src/@planx/components/ExternalPortal/Editor.test.tsx
+++ b/editor.planx.uk/src/@planx/components/ExternalPortal/Editor.test.tsx
@@ -1,8 +1,8 @@
+import { ComponentType as TYPES } from "@opensystemslab/planx-core/types";
 import { fireEvent, screen, waitFor } from "@testing-library/react";
 import React from "react";
 import { setup } from "testUtils";
 
-import { TYPES } from "../types";
 import ExternalPortalForm from "./Editor";
 
 test("adding an external portal", async () => {
diff --git a/editor.planx.uk/src/@planx/components/ExternalPortal/Editor.tsx b/editor.planx.uk/src/@planx/components/ExternalPortal/Editor.tsx
index 9c7a6d1483..9e8d44e52c 100644
--- a/editor.planx.uk/src/@planx/components/ExternalPortal/Editor.tsx
+++ b/editor.planx.uk/src/@planx/components/ExternalPortal/Editor.tsx
@@ -1,4 +1,4 @@
-import { TYPES } from "@planx/components/types";
+import { ComponentType as TYPES } from "@opensystemslab/planx-core/types";
 import { useFormik } from "formik";
 import React from "react";
 import ModalSection from "ui/editor/ModalSection";
diff --git a/editor.planx.uk/src/@planx/components/FileUpload/Editor.tsx b/editor.planx.uk/src/@planx/components/FileUpload/Editor.tsx
index 2b94223742..24f915f73d 100644
--- a/editor.planx.uk/src/@planx/components/FileUpload/Editor.tsx
+++ b/editor.planx.uk/src/@planx/components/FileUpload/Editor.tsx
@@ -1,4 +1,4 @@
-import { TYPES } from "@planx/components/types";
+import { ComponentType as TYPES } from "@opensystemslab/planx-core/types";
 import { ICONS, InternalNotes, MoreInformation } from "@planx/components/ui";
 import { useFormik } from "formik";
 import React from "react";
diff --git a/editor.planx.uk/src/@planx/components/FileUploadAndLabel/Editor.tsx b/editor.planx.uk/src/@planx/components/FileUploadAndLabel/Editor.tsx
index 08850fd666..6f4c3f8a01 100644
--- a/editor.planx.uk/src/@planx/components/FileUploadAndLabel/Editor.tsx
+++ b/editor.planx.uk/src/@planx/components/FileUploadAndLabel/Editor.tsx
@@ -4,7 +4,7 @@ import Divider from "@mui/material/Divider";
 import MenuItem from "@mui/material/MenuItem";
 import { styled } from "@mui/material/styles";
 import Typography from "@mui/material/Typography";
-import { TYPES } from "@planx/components/types";
+import { ComponentType as TYPES } from "@opensystemslab/planx-core/types";
 import {
   EditorProps,
   ICONS,
diff --git a/editor.planx.uk/src/@planx/components/Filter/Editor.tsx b/editor.planx.uk/src/@planx/components/Filter/Editor.tsx
index eeb83b0f6a..5d2f3f2b03 100644
--- a/editor.planx.uk/src/@planx/components/Filter/Editor.tsx
+++ b/editor.planx.uk/src/@planx/components/Filter/Editor.tsx
@@ -2,7 +2,7 @@ import {
   DEFAULT_FLAG_CATEGORY,
   flatFlags,
 } from "@opensystemslab/planx-core/types";
-import { TYPES } from "@planx/components/types";
+import { ComponentType as TYPES } from "@opensystemslab/planx-core/types";
 import { useFormik } from "formik";
 import React from "react";
 
@@ -29,7 +29,7 @@ const Filter: React.FC<Props> = (props) => {
             ]
               .filter((f) => f.category === DEFAULT_FLAG_CATEGORY)
               .map((f) => ({
-                type: TYPES.Response,
+                type: TYPES.Answer,
                 data: {
                   text: f.text,
                   val: f.value,
diff --git a/editor.planx.uk/src/@planx/components/FindProperty/Editor.tsx b/editor.planx.uk/src/@planx/components/FindProperty/Editor.tsx
index 5598b4bec4..d9edf981b7 100644
--- a/editor.planx.uk/src/@planx/components/FindProperty/Editor.tsx
+++ b/editor.planx.uk/src/@planx/components/FindProperty/Editor.tsx
@@ -1,4 +1,4 @@
-import { TYPES } from "@planx/components/types";
+import { ComponentType as TYPES } from "@opensystemslab/planx-core/types";
 import {
   EditorProps,
   ICONS,
diff --git a/editor.planx.uk/src/@planx/components/InternalPortal/Editor.test.tsx b/editor.planx.uk/src/@planx/components/InternalPortal/Editor.test.tsx
index 63249b5fa4..de8b61bd57 100644
--- a/editor.planx.uk/src/@planx/components/InternalPortal/Editor.test.tsx
+++ b/editor.planx.uk/src/@planx/components/InternalPortal/Editor.test.tsx
@@ -1,8 +1,8 @@
+import { ComponentType as TYPES } from "@opensystemslab/planx-core/types";
 import { fireEvent, screen, waitFor } from "@testing-library/react";
 import React from "react";
 import { axe, setup } from "testUtils";
 
-import { TYPES } from "../types";
 import InternalPortalForm from "./Editor";
 
 describe("adding an internal portal", () => {
diff --git a/editor.planx.uk/src/@planx/components/InternalPortal/Editor.tsx b/editor.planx.uk/src/@planx/components/InternalPortal/Editor.tsx
index 966c5658fe..40adb18eab 100644
--- a/editor.planx.uk/src/@planx/components/InternalPortal/Editor.tsx
+++ b/editor.planx.uk/src/@planx/components/InternalPortal/Editor.tsx
@@ -1,8 +1,8 @@
+import { ComponentType as TYPES } from "@opensystemslab/planx-core/types";
 import { useFormik } from "formik";
 import React from "react";
 import InputField from "ui/editor/InputField";
 
-import { TYPES } from "../types";
 import { FormError } from "../ui";
 
 interface Flow {
diff --git a/editor.planx.uk/src/@planx/components/NextSteps/Editor.tsx b/editor.planx.uk/src/@planx/components/NextSteps/Editor.tsx
index 7f32e3f2a4..ebe8b31d59 100644
--- a/editor.planx.uk/src/@planx/components/NextSteps/Editor.tsx
+++ b/editor.planx.uk/src/@planx/components/NextSteps/Editor.tsx
@@ -1,7 +1,7 @@
 import Box from "@mui/material/Box";
+import { ComponentType as TYPES } from "@opensystemslab/planx-core/types";
 import type { NextSteps, Step } from "@planx/components/NextSteps/model";
 import { parseNextSteps } from "@planx/components/NextSteps/model";
-import { TYPES } from "@planx/components/types";
 import {
   EditorProps,
   ICONS,
diff --git a/editor.planx.uk/src/@planx/components/Notice/Editor.tsx b/editor.planx.uk/src/@planx/components/Notice/Editor.tsx
index 9b2c24322b..b8a8d3ee2e 100644
--- a/editor.planx.uk/src/@planx/components/Notice/Editor.tsx
+++ b/editor.planx.uk/src/@planx/components/Notice/Editor.tsx
@@ -1,6 +1,6 @@
+import { ComponentType as TYPES } from "@opensystemslab/planx-core/types";
 import type { Notice } from "@planx/components/Notice/model";
 import { parseNotice } from "@planx/components/Notice/model";
-import { TYPES } from "@planx/components/types";
 import { ICONS, InternalNotes, MoreInformation } from "@planx/components/ui";
 import { useFormik } from "formik";
 import React from "react";
diff --git a/editor.planx.uk/src/@planx/components/NumberInput/Editor.tsx b/editor.planx.uk/src/@planx/components/NumberInput/Editor.tsx
index 066a49a876..f2f960acce 100644
--- a/editor.planx.uk/src/@planx/components/NumberInput/Editor.tsx
+++ b/editor.planx.uk/src/@planx/components/NumberInput/Editor.tsx
@@ -1,6 +1,6 @@
+import { ComponentType as TYPES } from "@opensystemslab/planx-core/types";
 import type { NumberInput } from "@planx/components/NumberInput/model";
 import { parseNumberInput } from "@planx/components/NumberInput/model";
-import { TYPES } from "@planx/components/types";
 import {
   EditorProps,
   ICONS,
diff --git a/editor.planx.uk/src/@planx/components/Pay/Editor.tsx b/editor.planx.uk/src/@planx/components/Pay/Editor.tsx
index 6881fce76e..239135624c 100644
--- a/editor.planx.uk/src/@planx/components/Pay/Editor.tsx
+++ b/editor.planx.uk/src/@planx/components/Pay/Editor.tsx
@@ -1,7 +1,7 @@
 import Box from "@mui/material/Box";
+import { ComponentType as TYPES } from "@opensystemslab/planx-core/types";
 import { Pay, validationSchema } from "@planx/components/Pay/model";
 import { parseMoreInformation } from "@planx/components/shared";
-import { TYPES } from "@planx/components/types";
 import { ICONS, InternalNotes, MoreInformation } from "@planx/components/ui";
 import { useFormik } from "formik";
 import React from "react";
diff --git a/editor.planx.uk/src/@planx/components/Pay/Public/Pay.test.tsx b/editor.planx.uk/src/@planx/components/Pay/Public/Pay.test.tsx
index df133bf213..b9762918e8 100644
--- a/editor.planx.uk/src/@planx/components/Pay/Public/Pay.test.tsx
+++ b/editor.planx.uk/src/@planx/components/Pay/Public/Pay.test.tsx
@@ -1,5 +1,5 @@
 import { PaymentStatus } from "@opensystemslab/planx-core/types";
-import { TYPES } from "@planx/components/types";
+import { ComponentType as TYPES } from "@opensystemslab/planx-core/types";
 import { screen } from "@testing-library/react";
 import { FullStore, Store, vanillaStore } from "pages/FlowEditor/lib/store";
 import React from "react";
diff --git a/editor.planx.uk/src/@planx/components/PlanningConstraints/Editor.tsx b/editor.planx.uk/src/@planx/components/PlanningConstraints/Editor.tsx
index 02029f382b..59f2584d05 100644
--- a/editor.planx.uk/src/@planx/components/PlanningConstraints/Editor.tsx
+++ b/editor.planx.uk/src/@planx/components/PlanningConstraints/Editor.tsx
@@ -1,4 +1,4 @@
-import { TYPES } from "@planx/components/types";
+import { ComponentType as TYPES } from "@opensystemslab/planx-core/types";
 import { EditorProps, ICONS, InternalNotes } from "@planx/components/ui";
 import { useFormik } from "formik";
 import React from "react";
diff --git a/editor.planx.uk/src/@planx/components/PropertyInformation/Editor.tsx b/editor.planx.uk/src/@planx/components/PropertyInformation/Editor.tsx
index e8c0fa88b7..e35fe88c36 100644
--- a/editor.planx.uk/src/@planx/components/PropertyInformation/Editor.tsx
+++ b/editor.planx.uk/src/@planx/components/PropertyInformation/Editor.tsx
@@ -1,4 +1,4 @@
-import { TYPES } from "@planx/components/types";
+import { ComponentType as TYPES } from "@opensystemslab/planx-core/types";
 import {
   EditorProps,
   ICONS,
diff --git a/editor.planx.uk/src/@planx/components/Question/Editor.tsx b/editor.planx.uk/src/@planx/components/Question/Editor.tsx
index b70bb5b299..c92e0aaf55 100644
--- a/editor.planx.uk/src/@planx/components/Question/Editor.tsx
+++ b/editor.planx.uk/src/@planx/components/Question/Editor.tsx
@@ -1,3 +1,4 @@
+import { ComponentType as TYPES } from "@opensystemslab/planx-core/types";
 import { useFormik } from "formik";
 import React, { useEffect, useRef } from "react";
 import ImgInput from "ui/editor/ImgInput";
@@ -12,7 +13,6 @@ import InputRowItem from "ui/shared/InputRowItem";
 
 import { Option, parseMoreInformation } from "../shared";
 import PermissionSelect from "../shared/PermissionSelect";
-import { TYPES } from "../types";
 import { ICONS, InternalNotes, MoreInformation } from "../ui";
 
 interface Props {
@@ -126,7 +126,7 @@ const OptionEditor: React.FC<{
 );
 
 export const Question: React.FC<Props> = (props) => {
-  const type = TYPES.Statement;
+  const type = TYPES.Question;
 
   const formik = useFormik({
     initialValues: {
@@ -142,7 +142,7 @@ export const Question: React.FC<Props> = (props) => {
         .filter((o) => o.data.text)
         .map((o) => ({
           id: o.id || undefined,
-          type: TYPES.Response,
+          type: TYPES.Answer,
           data: o.data,
         }));
 
diff --git a/editor.planx.uk/src/@planx/components/Result/Editor.tsx b/editor.planx.uk/src/@planx/components/Result/Editor.tsx
index 0ab4a04994..da1006eb2a 100644
--- a/editor.planx.uk/src/@planx/components/Result/Editor.tsx
+++ b/editor.planx.uk/src/@planx/components/Result/Editor.tsx
@@ -2,6 +2,7 @@ import Box from "@mui/material/Box";
 import Collapse from "@mui/material/Collapse";
 import Typography from "@mui/material/Typography";
 import { Flag, FlagSet, flatFlags } from "@opensystemslab/planx-core/types";
+import { ComponentType as TYPES } from "@opensystemslab/planx-core/types";
 import { useFormik } from "formik";
 import groupBy from "lodash/groupBy";
 import React, { useState } from "react";
@@ -10,7 +11,6 @@ import ModalSectionContent from "ui/editor/ModalSectionContent";
 import Input from "ui/shared/Input";
 import InputRow from "ui/shared/InputRow";
 
-import { TYPES } from "../types";
 import { ICONS } from "../ui";
 import type { Result } from "./model";
 
diff --git a/editor.planx.uk/src/@planx/components/Review/Editor.tsx b/editor.planx.uk/src/@planx/components/Review/Editor.tsx
index 3ebeda3d69..38cec10acd 100644
--- a/editor.planx.uk/src/@planx/components/Review/Editor.tsx
+++ b/editor.planx.uk/src/@planx/components/Review/Editor.tsx
@@ -1,3 +1,4 @@
+import { ComponentType as TYPES } from "@opensystemslab/planx-core/types";
 import { useFormik } from "formik";
 import React from "react";
 import ModalSection from "ui/editor/ModalSection";
@@ -6,7 +7,6 @@ import RichTextInput from "ui/editor/RichTextInput";
 import Input from "ui/shared/Input";
 import InputRow from "ui/shared/InputRow";
 
-import { TYPES } from "../types";
 import { EditorProps, ICONS, InternalNotes } from "../ui";
 import { parseContent, Review } from "./model";
 
diff --git a/editor.planx.uk/src/@planx/components/Section/Editor.tsx b/editor.planx.uk/src/@planx/components/Section/Editor.tsx
index 9948271441..84294365dc 100644
--- a/editor.planx.uk/src/@planx/components/Section/Editor.tsx
+++ b/editor.planx.uk/src/@planx/components/Section/Editor.tsx
@@ -1,4 +1,4 @@
-import { TYPES } from "@planx/components/types";
+import { ComponentType as TYPES } from "@opensystemslab/planx-core/types";
 import { EditorProps, ICONS, InternalNotes } from "@planx/components/ui";
 import { useFormik } from "formik";
 import React from "react";
diff --git a/editor.planx.uk/src/@planx/components/Section/Section.stories.tsx b/editor.planx.uk/src/@planx/components/Section/Section.stories.tsx
index 0195e40443..1ca25dabd0 100644
--- a/editor.planx.uk/src/@planx/components/Section/Section.stories.tsx
+++ b/editor.planx.uk/src/@planx/components/Section/Section.stories.tsx
@@ -1,8 +1,8 @@
+import { ComponentType as TYPES } from "@opensystemslab/planx-core/types";
 import { Meta, StoryObj } from "@storybook/react";
 import { ComponentProps } from "react";
 import { SectionNode } from "types";
 
-import { TYPES } from "../types";
 import { Root as Public } from "./Public";
 
 const meta = {
diff --git a/editor.planx.uk/src/@planx/components/Section/model.test.ts b/editor.planx.uk/src/@planx/components/Section/model.test.ts
index cd08eb7f0e..03fbde13fd 100644
--- a/editor.planx.uk/src/@planx/components/Section/model.test.ts
+++ b/editor.planx.uk/src/@planx/components/Section/model.test.ts
@@ -1,4 +1,4 @@
-import { TYPES } from "@planx/components/types";
+import { ComponentType as TYPES } from "@opensystemslab/planx-core/types";
 import { SectionNode, SectionStatus } from "types";
 
 import { computeSectionStatuses } from "./model";
diff --git a/editor.planx.uk/src/@planx/components/Send/Editor.tsx b/editor.planx.uk/src/@planx/components/Send/Editor.tsx
index 188a637bc6..b9e26605f1 100644
--- a/editor.planx.uk/src/@planx/components/Send/Editor.tsx
+++ b/editor.planx.uk/src/@planx/components/Send/Editor.tsx
@@ -2,6 +2,7 @@ import Warning from "@mui/icons-material/Warning";
 import Box from "@mui/material/Box";
 import Grid from "@mui/material/Grid";
 import Typography from "@mui/material/Typography";
+import { ComponentType as TYPES } from "@opensystemslab/planx-core/types";
 import { getIn, useFormik } from "formik";
 import React from "react";
 import ModalSection from "ui/editor/ModalSection";
@@ -12,7 +13,6 @@ import Input from "ui/shared/Input";
 import InputRow from "ui/shared/InputRow";
 import { array, object } from "yup";
 
-import { TYPES } from "../types";
 import { EditorProps, ICONS } from "../ui";
 import { Destination, Send } from "./model";
 import { parseContent } from "./model";
diff --git a/editor.planx.uk/src/@planx/components/Send/bops/index.ts b/editor.planx.uk/src/@planx/components/Send/bops/index.ts
index 2c479979f5..415e06773c 100644
--- a/editor.planx.uk/src/@planx/components/Send/bops/index.ts
+++ b/editor.planx.uk/src/@planx/components/Send/bops/index.ts
@@ -9,6 +9,7 @@ import {
   GOV_PAY_PASSPORT_KEY,
   GovUKPayment,
 } from "@opensystemslab/planx-core/types";
+import { ComponentType as TYPES } from "@opensystemslab/planx-core/types";
 import { logger } from "airbrake";
 import { isEmpty } from "lodash";
 import { useStore } from "pages/FlowEditor/lib/store";
@@ -18,7 +19,6 @@ import striptags from "striptags";
 import { Store } from "../../../../pages/FlowEditor/lib/store";
 import { toPence } from "../../Pay/model";
 import { removeNilValues } from "../../shared/utils";
-import { TYPES } from "../../types";
 import { findGeoJSON } from "../helpers";
 import {
   BOPSFullPayload,
@@ -69,7 +69,7 @@ function isTypeForBopsPayload(type?: TYPES) {
     case TYPES.Pay:
     case TYPES.PlanningConstraints:
     case TYPES.PropertyInformation:
-    case TYPES.Response:
+    case TYPES.Answer:
     case TYPES.Result:
     case TYPES.Review:
     case TYPES.Section:
@@ -82,7 +82,7 @@ function isTypeForBopsPayload(type?: TYPES) {
     case TYPES.Checklist:
     case TYPES.DateInput:
     case TYPES.NumberInput:
-    case TYPES.Statement:
+    case TYPES.Question:
     case TYPES.TextInput:
     case TYPES.ContactInput:
       return true;
@@ -193,7 +193,7 @@ export const makePayload = (
           case TYPES.TextInput:
             return Object.values(bc.data ?? {}).map((x) => String(x));
           case TYPES.Checklist:
-          case TYPES.Statement:
+          case TYPES.Question:
           default:
             return bc.answers ?? [];
         }
diff --git a/editor.planx.uk/src/@planx/components/Send/helpers.test.ts b/editor.planx.uk/src/@planx/components/Send/helpers.test.ts
index e07debecf4..baa5629792 100644
--- a/editor.planx.uk/src/@planx/components/Send/helpers.test.ts
+++ b/editor.planx.uk/src/@planx/components/Send/helpers.test.ts
@@ -1,4 +1,4 @@
-import { TYPES } from "@planx/components/types";
+import { ComponentType as TYPES } from "@opensystemslab/planx-core/types";
 import { Store } from "pages/FlowEditor/lib/store";
 
 import { findGeoJSON } from "./helpers";
diff --git a/editor.planx.uk/src/@planx/components/Send/helpers.ts b/editor.planx.uk/src/@planx/components/Send/helpers.ts
index dc180fa9f8..3749bd8714 100644
--- a/editor.planx.uk/src/@planx/components/Send/helpers.ts
+++ b/editor.planx.uk/src/@planx/components/Send/helpers.ts
@@ -1,4 +1,4 @@
-import { TYPES } from "@planx/components/types";
+import { ComponentType as TYPES } from "@opensystemslab/planx-core/types";
 import { Store } from "pages/FlowEditor/lib/store";
 
 export function findGeoJSON(
diff --git a/editor.planx.uk/src/@planx/components/SetValue/Editor.tsx b/editor.planx.uk/src/@planx/components/SetValue/Editor.tsx
index 48484e147c..766d094b39 100644
--- a/editor.planx.uk/src/@planx/components/SetValue/Editor.tsx
+++ b/editor.planx.uk/src/@planx/components/SetValue/Editor.tsx
@@ -1,4 +1,4 @@
-import { TYPES } from "@planx/components/types";
+import { ComponentType as TYPES } from "@opensystemslab/planx-core/types";
 import { EditorProps, InternalNotes } from "@planx/components/ui";
 import { useFormik } from "formik";
 import React from "react";
diff --git a/editor.planx.uk/src/@planx/components/TaskList/Editor.tsx b/editor.planx.uk/src/@planx/components/TaskList/Editor.tsx
index 5e08168a89..f869005888 100644
--- a/editor.planx.uk/src/@planx/components/TaskList/Editor.tsx
+++ b/editor.planx.uk/src/@planx/components/TaskList/Editor.tsx
@@ -1,7 +1,7 @@
 import Box from "@mui/material/Box";
+import { ComponentType as TYPES } from "@opensystemslab/planx-core/types";
 import type { Task, TaskList } from "@planx/components/TaskList/model";
 import { parseTaskList } from "@planx/components/TaskList/model";
-import { TYPES } from "@planx/components/types";
 import {
   EditorProps,
   ICONS,
diff --git a/editor.planx.uk/src/@planx/components/TextInput/Editor.tsx b/editor.planx.uk/src/@planx/components/TextInput/Editor.tsx
index d5e0ac39f0..e5a36631de 100644
--- a/editor.planx.uk/src/@planx/components/TextInput/Editor.tsx
+++ b/editor.planx.uk/src/@planx/components/TextInput/Editor.tsx
@@ -1,4 +1,4 @@
-import { TYPES } from "@planx/components/types";
+import { ComponentType as TYPES } from "@opensystemslab/planx-core/types";
 import {
   EditorProps,
   ICONS,
diff --git a/editor.planx.uk/src/@planx/components/shared/Preview/SummaryList.tsx b/editor.planx.uk/src/@planx/components/shared/Preview/SummaryList.tsx
index e5a20bd827..12acb8cf6e 100644
--- a/editor.planx.uk/src/@planx/components/shared/Preview/SummaryList.tsx
+++ b/editor.planx.uk/src/@planx/components/shared/Preview/SummaryList.tsx
@@ -3,8 +3,8 @@ import Link from "@mui/material/Link";
 import { styled } from "@mui/material/styles";
 import Typography from "@mui/material/Typography";
 import { visuallyHidden } from "@mui/utils";
+import { ComponentType as TYPES } from "@opensystemslab/planx-core/types";
 import { PASSPORT_UPLOAD_KEY } from "@planx/components/DrawBoundary/model";
-import { TYPES } from "@planx/components/types";
 import format from "date-fns/format";
 import { useAnalyticsTracking } from "pages/FlowEditor/lib/analyticsProvider";
 import { Store, useStore } from "pages/FlowEditor/lib/store";
@@ -71,13 +71,13 @@ const presentationalComponents: {
   [TYPES.Pay]: undefined,
   [TYPES.PlanningConstraints]: undefined,
   [TYPES.PropertyInformation]: undefined,
-  [TYPES.Response]: Debug,
+  [TYPES.Answer]: Debug,
   [TYPES.Result]: undefined,
   [TYPES.Review]: undefined,
   [TYPES.Section]: undefined,
   [TYPES.Send]: undefined,
   [TYPES.SetValue]: undefined,
-  [TYPES.Statement]: Question,
+  [TYPES.Question]: Question,
   [TYPES.TaskList]: undefined,
   [TYPES.TextInput]: TextInput,
 } as const;
diff --git a/editor.planx.uk/src/@planx/components/types.ts b/editor.planx.uk/src/@planx/components/types.ts
deleted file mode 100644
index 6ad41564d4..0000000000
--- a/editor.planx.uk/src/@planx/components/types.ts
+++ /dev/null
@@ -1,33 +0,0 @@
-export enum TYPES {
-  Flow = 1,
-  Result = 3,
-  TaskList = 7,
-  Notice = 8,
-  FindProperty = 9,
-  DrawBoundary = 10,
-  PlanningConstraints = 11,
-  PropertyInformation = 12,
-  Statement = 100, // Question/DropDown
-  Checklist = 105,
-  TextInput = 110,
-  DateInput = 120,
-  AddressInput = 130,
-  ContactInput = 135,
-  FileUpload = 140,
-  FileUploadAndLabel = 145,
-  NumberInput = 150,
-  Response = 200,
-  Content = 250,
-  InternalPortal = 300,
-  ExternalPortal = 310,
-  // Page = 350,
-  Section = 360,
-  SetValue = 380,
-  Pay = 400,
-  Filter = 500,
-  Review = 600,
-  Send = 650,
-  Calculate = 700,
-  Confirmation = 725,
-  NextSteps = 730,
-}
diff --git a/editor.planx.uk/src/@planx/components/ui.tsx b/editor.planx.uk/src/@planx/components/ui.tsx
index 0ae728dde4..8996f8e15a 100644
--- a/editor.planx.uk/src/@planx/components/ui.tsx
+++ b/editor.planx.uk/src/@planx/components/ui.tsx
@@ -24,7 +24,7 @@ import Send from "@mui/icons-material/Send";
 import SquareFoot from "@mui/icons-material/SquareFoot";
 import TextFields from "@mui/icons-material/TextFields";
 import ViewAgenda from "@mui/icons-material/ViewAgenda";
-import { TYPES } from "@planx/components/types";
+import { ComponentType as TYPES } from "@opensystemslab/planx-core/types";
 import { Store } from "pages/FlowEditor/lib/store";
 import type { handleSubmit } from "pages/Preview/Node";
 import React, { ChangeEvent } from "react";
@@ -78,13 +78,13 @@ export const ICONS: {
   [TYPES.Pay]: PaymentOutlined,
   [TYPES.PlanningConstraints]: Map,
   [TYPES.PropertyInformation]: LocationOnOutlined,
-  [TYPES.Response]: undefined,
+  [TYPES.Answer]: undefined,
   [TYPES.Result]: PlaylistAddCheck,
   [TYPES.Review]: RateReview,
   [TYPES.Section]: ViewAgenda,
   [TYPES.Send]: Send,
   [TYPES.SetValue]: PlaylistAdd,
-  [TYPES.Statement]: CallSplit,
+  [TYPES.Question]: CallSplit,
   [TYPES.TaskList]: List,
   [TYPES.TextInput]: Create,
 } as const;
diff --git a/editor.planx.uk/src/@planx/graph/index.ts b/editor.planx.uk/src/@planx/graph/index.ts
index a45bc780b6..4eb69594ad 100644
--- a/editor.planx.uk/src/@planx/graph/index.ts
+++ b/editor.planx.uk/src/@planx/graph/index.ts
@@ -1,4 +1,4 @@
-import { TYPES } from "@planx/components/types";
+import { ComponentType as TYPES } from "@opensystemslab/planx-core/types";
 import { enablePatches, produceWithPatches } from "immer";
 import { isEqual } from "lodash";
 import difference from "lodash/difference";
diff --git a/editor.planx.uk/src/components/Header.tsx b/editor.planx.uk/src/components/Header.tsx
index 4a45b0425b..b2989e3364 100644
--- a/editor.planx.uk/src/components/Header.tsx
+++ b/editor.planx.uk/src/components/Header.tsx
@@ -18,7 +18,7 @@ import { styled, Theme } from "@mui/material/styles";
 import MuiToolbar from "@mui/material/Toolbar";
 import Typography from "@mui/material/Typography";
 import useMediaQuery from "@mui/material/useMediaQuery";
-import { TYPES } from "@planx/components/types";
+import { ComponentType as TYPES } from "@opensystemslab/planx-core/types";
 import { hasFeatureFlag } from "lib/featureFlags";
 import { clearLocalFlow } from "lib/local";
 import { capitalize } from "lodash";
@@ -415,14 +415,12 @@ const EditorToolbar: React.FC<{
     setOpen(!open);
   };
 
-  const isFlowSettingsVisible =
-    route.data.flow && canUserEditTeam(team.slug);
+  const isFlowSettingsVisible = route.data.flow && canUserEditTeam(team.slug);
 
   const isTeamSettingsVisible =
     route.data.team && !route.data.flow && canUserEditTeam(team.slug);
 
-  const isGlobalSettingsVisible =
-    !route.data.team && user?.isPlatformAdmin;
+  const isGlobalSettingsVisible = !route.data.team && user?.isPlatformAdmin;
 
   return (
     <>
diff --git a/editor.planx.uk/src/lib/dataMergedHotfix.ts b/editor.planx.uk/src/lib/dataMergedHotfix.ts
index 48228f173c..ad5c60e1a8 100644
--- a/editor.planx.uk/src/lib/dataMergedHotfix.ts
+++ b/editor.planx.uk/src/lib/dataMergedHotfix.ts
@@ -1,4 +1,4 @@
-import { TYPES } from "@planx/components/types";
+import { ComponentType as TYPES } from "@opensystemslab/planx-core/types";
 import gql from "graphql-tag";
 
 import { publicClient } from "../lib/graphql";
diff --git a/editor.planx.uk/src/lib/feedback.ts b/editor.planx.uk/src/lib/feedback.ts
index b90bd96e5e..4f724ce036 100644
--- a/editor.planx.uk/src/lib/feedback.ts
+++ b/editor.planx.uk/src/lib/feedback.ts
@@ -1,5 +1,5 @@
 import { gql } from "@apollo/client";
-import { TYPES } from "@planx/components/types";
+import { ComponentType as TYPES } from "@opensystemslab/planx-core/types";
 import Bowser from "bowser";
 import { Store, useStore } from "pages/FlowEditor/lib/store";
 
diff --git a/editor.planx.uk/src/pages/FlowEditor/components/Flow/components/Checklist.tsx b/editor.planx.uk/src/pages/FlowEditor/components/Flow/components/Checklist.tsx
index 639c2266e2..bb60498034 100644
--- a/editor.planx.uk/src/pages/FlowEditor/components/Flow/components/Checklist.tsx
+++ b/editor.planx.uk/src/pages/FlowEditor/components/Flow/components/Checklist.tsx
@@ -1,4 +1,4 @@
-import { TYPES } from "@planx/components/types";
+import { ComponentType as TYPES } from "@opensystemslab/planx-core/types";
 import { ICONS } from "@planx/components/ui";
 import classNames from "classnames";
 import mapAccum from "ramda/src/mapAccum";
diff --git a/editor.planx.uk/src/pages/FlowEditor/components/Flow/components/Filter.tsx b/editor.planx.uk/src/pages/FlowEditor/components/Flow/components/Filter.tsx
index 90e0183c31..9103188b5f 100644
--- a/editor.planx.uk/src/pages/FlowEditor/components/Flow/components/Filter.tsx
+++ b/editor.planx.uk/src/pages/FlowEditor/components/Flow/components/Filter.tsx
@@ -1,4 +1,4 @@
-import { TYPES } from "@planx/components/types";
+import { ComponentType as TYPES } from "@opensystemslab/planx-core/types";
 import { ICONS } from "@planx/components/ui";
 import classNames from "classnames";
 import React from "react";
diff --git a/editor.planx.uk/src/pages/FlowEditor/components/Flow/components/Node.tsx b/editor.planx.uk/src/pages/FlowEditor/components/Flow/components/Node.tsx
index 3165540ad9..1bc1094455 100644
--- a/editor.planx.uk/src/pages/FlowEditor/components/Flow/components/Node.tsx
+++ b/editor.planx.uk/src/pages/FlowEditor/components/Flow/components/Node.tsx
@@ -1,4 +1,4 @@
-import { TYPES } from "@planx/components/types";
+import { ComponentType as TYPES } from "@opensystemslab/planx-core/types";
 import React from "react";
 import { ErrorBoundary } from "react-error-boundary";
 
@@ -122,9 +122,9 @@ const Node: React.FC<any> = (props) => {
         <Question {...allProps} text={node?.data?.title ?? "Text input"} />
       );
 
-    case TYPES.Response:
+    case TYPES.Answer:
       return <Option {...allProps} />;
-    case TYPES.Statement:
+    case TYPES.Question:
     case TYPES.Checklist:
       return (
         <Checklist
diff --git a/editor.planx.uk/src/pages/FlowEditor/components/Flow/components/Question.tsx b/editor.planx.uk/src/pages/FlowEditor/components/Flow/components/Question.tsx
index 765ac6b605..d3f0ae5e39 100644
--- a/editor.planx.uk/src/pages/FlowEditor/components/Flow/components/Question.tsx
+++ b/editor.planx.uk/src/pages/FlowEditor/components/Flow/components/Question.tsx
@@ -1,5 +1,5 @@
 import ErrorIcon from "@mui/icons-material/Error";
-import { TYPES } from "@planx/components/types";
+import { ComponentType as TYPES } from "@opensystemslab/planx-core/types";
 import { ICONS } from "@planx/components/ui";
 import classNames from "classnames";
 import React from "react";
diff --git a/editor.planx.uk/src/pages/FlowEditor/components/PreviewBrowser.tsx b/editor.planx.uk/src/pages/FlowEditor/components/PreviewBrowser.tsx
index c860495f02..94d27731a1 100644
--- a/editor.planx.uk/src/pages/FlowEditor/components/PreviewBrowser.tsx
+++ b/editor.planx.uk/src/pages/FlowEditor/components/PreviewBrowser.tsx
@@ -13,12 +13,12 @@ import Link from "@mui/material/Link";
 import { styled } from "@mui/material/styles";
 import Tooltip from "@mui/material/Tooltip";
 import Typography from "@mui/material/Typography";
+import { ComponentType as TYPES } from "@opensystemslab/planx-core/types";
 import formatDistanceToNow from "date-fns/formatDistanceToNow";
 import React, { useState } from "react";
 import { useAsync } from "react-use";
 import Input from "ui/shared/Input";
 
-import { TYPES } from "../../../@planx/components/types";
 import Questions from "../../Preview/Questions";
 import { useStore } from "../lib/store";
 
diff --git a/editor.planx.uk/src/pages/FlowEditor/components/forms/FormModal.tsx b/editor.planx.uk/src/pages/FlowEditor/components/forms/FormModal.tsx
index b6f0a0b063..7c9fe0f2c4 100644
--- a/editor.planx.uk/src/pages/FlowEditor/components/forms/FormModal.tsx
+++ b/editor.planx.uk/src/pages/FlowEditor/components/forms/FormModal.tsx
@@ -7,8 +7,8 @@ import DialogTitle from "@mui/material/DialogTitle";
 import Grid from "@mui/material/Grid";
 import IconButton from "@mui/material/IconButton";
 import { styled } from "@mui/material/styles";
+import { ComponentType as TYPES } from "@opensystemslab/planx-core/types";
 import { parseFormValues } from "@planx/components/shared";
-import { TYPES } from "@planx/components/types";
 import ErrorFallback from "components/ErrorFallback";
 import React from "react";
 import { ErrorBoundary } from "react-error-boundary";
@@ -48,7 +48,7 @@ const NodeTypeSelect: React.FC<{
       }}
     >
       <optgroup label="Question">
-        <option value={TYPES.Statement}>Question</option>
+        <option value={TYPES.Question}>Question</option>
         <option value={TYPES.Checklist}>Checklist</option>
         <option value={TYPES.NextSteps}>Next steps</option>
       </optgroup>
diff --git a/editor.planx.uk/src/pages/FlowEditor/components/forms/index.ts b/editor.planx.uk/src/pages/FlowEditor/components/forms/index.ts
index a8fd24421e..97a3085793 100644
--- a/editor.planx.uk/src/pages/FlowEditor/components/forms/index.ts
+++ b/editor.planx.uk/src/pages/FlowEditor/components/forms/index.ts
@@ -1,3 +1,4 @@
+import { ComponentType as TYPES } from "@opensystemslab/planx-core/types";
 import AddressInput from "@planx/components/AddressInput/Editor";
 import Calculate from "@planx/components/Calculate/Editor";
 import Checklist from "@planx/components/Checklist/Editor";
@@ -26,7 +27,6 @@ import Send from "@planx/components/Send/Editor";
 import SetValue from "@planx/components/SetValue/Editor";
 import TaskList from "@planx/components/TaskList/Editor";
 import TextInput from "@planx/components/TextInput/Editor";
-import { TYPES } from "@planx/components/types";
 import React from "react";
 
 import { SLUGS } from "../../data/types";
diff --git a/editor.planx.uk/src/pages/FlowEditor/data/types.ts b/editor.planx.uk/src/pages/FlowEditor/data/types.ts
index 330327ff4b..7672021d03 100644
--- a/editor.planx.uk/src/pages/FlowEditor/data/types.ts
+++ b/editor.planx.uk/src/pages/FlowEditor/data/types.ts
@@ -1,4 +1,4 @@
-import { TYPES } from "@planx/components/types";
+import { ComponentType as TYPES } from "@opensystemslab/planx-core/types";
 
 export const SLUGS: {
   [key in TYPES]: string;
@@ -24,13 +24,13 @@ export const SLUGS: {
   [TYPES.Pay]: "pay",
   [TYPES.PlanningConstraints]: "planning-constraints",
   [TYPES.PropertyInformation]: "property-information",
-  [TYPES.Response]: "question",
+  [TYPES.Answer]: "question",
   [TYPES.Result]: "result",
   [TYPES.Review]: "review",
   [TYPES.Section]: "section",
   [TYPES.Send]: "send",
   [TYPES.SetValue]: "set-value",
-  [TYPES.Statement]: "question",
+  [TYPES.Question]: "question",
   [TYPES.TaskList]: "task-list",
   [TYPES.TextInput]: "text-input",
 } as const;
diff --git a/editor.planx.uk/src/pages/FlowEditor/lib/__tests__/advancedAutomations.test.ts b/editor.planx.uk/src/pages/FlowEditor/lib/__tests__/advancedAutomations.test.ts
index 94bfc432d6..e0df4e2696 100644
--- a/editor.planx.uk/src/pages/FlowEditor/lib/__tests__/advancedAutomations.test.ts
+++ b/editor.planx.uk/src/pages/FlowEditor/lib/__tests__/advancedAutomations.test.ts
@@ -1,4 +1,4 @@
-import { TYPES } from "@planx/components/types";
+import { ComponentType as TYPES } from "@opensystemslab/planx-core/types";
 
 import { Store, vanillaStore } from "../store";
 
@@ -19,14 +19,14 @@ const flow: Store.flow = {
       val: "food.bread",
       text: "bread",
     },
-    type: TYPES.Response,
+    type: TYPES.Answer,
   },
   "0vojjvJ6rP": {
     data: {
       val: "food",
       text: "food",
     },
-    type: TYPES.Response,
+    type: TYPES.Answer,
     edges: ["mOPogpQa7V"],
   },
   "2PT6bTPTqj": {
@@ -34,7 +34,7 @@ const flow: Store.flow = {
       fn: "item",
       text: "contains",
     },
-    type: TYPES.Statement,
+    type: TYPES.Question,
     edges: ["oB2vfxQs4D", "ykhO0drpaY", "U9S73zxy9n", "LwozLZdXCA"],
   },
   "3H2bGdzpIN": {
@@ -42,7 +42,7 @@ const flow: Store.flow = {
       fn: "item",
       text: "Does the basket contain apples?",
     },
-    type: TYPES.Statement,
+    type: TYPES.Question,
     edges: ["BJpKurp49I", "hKebzlFQDa"],
   },
   "4JPWSgnGtI": {
@@ -50,7 +50,7 @@ const flow: Store.flow = {
       val: "tool",
       text: "tools",
     },
-    type: TYPES.Response,
+    type: TYPES.Answer,
     edges: ["KcLGMm3UWw"],
   },
   "52ZNXBMLDP": {
@@ -74,14 +74,14 @@ const flow: Store.flow = {
       val: "tool.spanner",
       text: "spanner",
     },
-    type: TYPES.Response,
+    type: TYPES.Answer,
   },
   AFX3QwbOCd: {
     data: {
       fn: "item",
       text: "Which does the basket contain?",
     },
-    type: TYPES.Statement,
+    type: TYPES.Question,
     edges: ["4JPWSgnGtI", "0vojjvJ6rP"],
   },
   BJpKurp49I: {
@@ -89,21 +89,21 @@ const flow: Store.flow = {
       val: "food.fruit.apple",
       text: "Yes",
     },
-    type: TYPES.Response,
+    type: TYPES.Answer,
   },
   BloOMLvLJK: {
     data: {
       val: "food.fruit.banana",
       text: "banana",
     },
-    type: TYPES.Response,
+    type: TYPES.Answer,
   },
   EqfqaqZ6CH: {
     data: {
       val: "food.fruit.apple",
       text: "apple",
     },
-    type: TYPES.Response,
+    type: TYPES.Answer,
   },
   HV0gV8DOil: {
     data: {
@@ -119,7 +119,7 @@ const flow: Store.flow = {
       val: "food.fruit.banana",
       text: "banana",
     },
-    type: TYPES.Response,
+    type: TYPES.Answer,
   },
   Imks7j68BD: {
     data: {
@@ -142,7 +142,7 @@ const flow: Store.flow = {
     data: {
       text: "neither apples nor bread",
     },
-    type: TYPES.Response,
+    type: TYPES.Answer,
     edges: ["52ZNXBMLDP"],
   },
   OvNhSiRfdL: {
@@ -150,14 +150,14 @@ const flow: Store.flow = {
       val: "tool.spanner",
       text: "spanner",
     },
-    type: TYPES.Response,
+    type: TYPES.Answer,
   },
   U9S73zxy9n: {
     data: {
       val: "food.fruit.apple,food.bread",
       text: "apples and bread",
     },
-    type: TYPES.Response,
+    type: TYPES.Answer,
     edges: ["t3SCqQKeUK"],
   },
   g0IAKsBVPQ: {
@@ -172,14 +172,14 @@ const flow: Store.flow = {
     data: {
       text: "No",
     },
-    type: TYPES.Response,
+    type: TYPES.Answer,
   },
   lTosE7Xo1j: {
     data: {
       val: "food.fruit.apple",
       text: "apple",
     },
-    type: TYPES.Response,
+    type: TYPES.Answer,
   },
   mOPogpQa7V: {
     data: {
@@ -194,7 +194,7 @@ const flow: Store.flow = {
       val: "food.fruit.apple",
       text: "apples",
     },
-    type: TYPES.Response,
+    type: TYPES.Answer,
     edges: ["6RR1J1lmrM"],
   },
   pXFKKRG6lE: {
@@ -202,7 +202,7 @@ const flow: Store.flow = {
       val: "food.bread",
       text: "bread",
     },
-    type: TYPES.Response,
+    type: TYPES.Answer,
   },
   t3SCqQKeUK: {
     data: {
@@ -217,7 +217,7 @@ const flow: Store.flow = {
       val: "food.bread",
       text: "bread",
     },
-    type: TYPES.Response,
+    type: TYPES.Answer,
     edges: ["g0IAKsBVPQ"],
   },
 };
diff --git a/editor.planx.uk/src/pages/FlowEditor/lib/__tests__/automations.test.ts b/editor.planx.uk/src/pages/FlowEditor/lib/__tests__/automations.test.ts
index cc4fe311d3..de0c6a3ae2 100644
--- a/editor.planx.uk/src/pages/FlowEditor/lib/__tests__/automations.test.ts
+++ b/editor.planx.uk/src/pages/FlowEditor/lib/__tests__/automations.test.ts
@@ -1,4 +1,4 @@
-import { TYPES } from "@planx/components/types";
+import { ComponentType as TYPES } from "@opensystemslab/planx-core/types";
 import shuffle from "lodash/shuffle";
 
 import { vanillaStore } from "../store";
@@ -23,20 +23,20 @@ describe("(basic) if the passport contains", () => {
           },
           _setter: {},
           item: {
-            type: TYPES.Statement,
+            type: TYPES.Question,
             data: { fn: "item" },
             edges: ["food", "hardware", "other"],
           },
           food: {
-            type: TYPES.Response,
+            type: TYPES.Answer,
             data: { val: "food" },
           },
           hardware: {
-            type: TYPES.Response,
+            type: TYPES.Answer,
             data: { val: "hardware" },
           },
           other: {
-            type: TYPES.Response,
+            type: TYPES.Answer,
           },
         },
       });
@@ -76,20 +76,20 @@ describe("(more advanced) if the passport contains", () => {
           },
           _setter: {},
           item: {
-            type: TYPES.Statement,
+            type: TYPES.Question,
             data: { fn: "item" },
             edges: ["food.fruit", "food", "other"],
           },
           "food.fruit": {
-            type: TYPES.Response,
+            type: TYPES.Answer,
             data: { val: "food.fruit" },
           },
           food: {
-            type: TYPES.Response,
+            type: TYPES.Answer,
             data: { val: "food" },
           },
           other: {
-            type: TYPES.Response,
+            type: TYPES.Answer,
           },
         },
       });
@@ -144,7 +144,7 @@ describe("(advanced) if the passport contains", () => {
           },
           _setter: {},
           contains: {
-            type: TYPES.Statement,
+            type: TYPES.Answer,
             data: { fn: "item" },
             edges: shuffle([
               "apples",
@@ -154,19 +154,19 @@ describe("(advanced) if the passport contains", () => {
             ]),
           },
           apples: {
-            type: TYPES.Response,
+            type: TYPES.Answer,
             data: { val: "food.fruit.apple" },
           },
           bread: {
-            type: TYPES.Response,
+            type: TYPES.Answer,
             data: { val: "food.bread" },
           },
           apples_and_bread: {
-            type: TYPES.Response,
+            type: TYPES.Answer,
             data: { val: "food.fruit.apple,food.bread" },
           },
           neither_apples_nor_bread: {
-            type: TYPES.Response,
+            type: TYPES.Answer,
           },
         },
       });
diff --git a/editor.planx.uk/src/pages/FlowEditor/lib/__tests__/flags.test.ts b/editor.planx.uk/src/pages/FlowEditor/lib/__tests__/flags.test.ts
index b5b1ccc625..857ba71305 100644
--- a/editor.planx.uk/src/pages/FlowEditor/lib/__tests__/flags.test.ts
+++ b/editor.planx.uk/src/pages/FlowEditor/lib/__tests__/flags.test.ts
@@ -1,4 +1,4 @@
-import { TYPES } from "@planx/components/types";
+import { ComponentType as TYPES } from "@opensystemslab/planx-core/types";
 
 import { vanillaStore } from "../store";
 
@@ -14,44 +14,44 @@ describe("in a flow with no collected flags, the user", () => {
           edges: ["question", "filter"],
         },
         question: {
-          type: TYPES.Statement,
+          type: TYPES.Question,
           edges: ["missing_info_answer", "immune_answer", "noflag_answer"],
         },
         missing_info_answer: {
-          type: TYPES.Response,
+          type: TYPES.Answer,
           data: {
             flag: "MISSING_INFO",
           },
         },
         immune_answer: {
-          type: TYPES.Response,
+          type: TYPES.Answer,
           data: {
             flag: "IMMUNE",
           },
         },
         noflag_answer: {
-          type: TYPES.Response,
+          type: TYPES.Answer,
         },
         filter: {
           type: TYPES.Filter,
           edges: ["missing_info_flag", "immune_flag", "no_flag"],
         },
         missing_info_flag: {
-          type: TYPES.Response,
+          type: TYPES.Answer,
           data: {
             val: "MISSING_INFO",
           },
           edges: ["missing_info_followup"],
         },
         immune_flag: {
-          type: TYPES.Response,
+          type: TYPES.Answer,
           data: {
             val: "IMMUNE",
           },
           edges: ["immune_followup"],
         },
         no_flag: {
-          type: TYPES.Response,
+          type: TYPES.Answer,
           edges: ["noflag_followup"],
         },
         missing_info_followup: { type: TYPES.Content },
@@ -94,14 +94,14 @@ describe("changing flag inside flag filter doesn't affect the filter's behaviour
             val: "MISSING_INFO",
             text: "Missing information",
           },
-          type: TYPES.Response,
+          type: TYPES.Answer,
           edges: ["missing_info_content"],
         },
         q2: {
           data: {
             text: "another",
           },
-          type: TYPES.Statement,
+          type: TYPES.Question,
           edges: ["missing_2", "nothing_2"],
         },
         missing_info_content: {
@@ -114,13 +114,13 @@ describe("changing flag inside flag filter doesn't affect the filter's behaviour
           data: {
             text: "nothing",
           },
-          type: TYPES.Response,
+          type: TYPES.Answer,
         },
         no_result: {
           data: {
             text: "(No Result)",
           },
-          type: TYPES.Response,
+          type: TYPES.Answer,
           edges: ["q2"],
         },
         missing_2: {
@@ -128,14 +128,14 @@ describe("changing flag inside flag filter doesn't affect the filter's behaviour
             flag: "MISSING_INFO",
             text: "missing",
           },
-          type: TYPES.Response,
+          type: TYPES.Answer,
         },
         immune: {
           data: {
             val: "IMMUNE",
             text: "Immune",
           },
-          type: TYPES.Response,
+          type: TYPES.Answer,
         },
         filter: {
           data: {
@@ -145,21 +145,21 @@ describe("changing flag inside flag filter doesn't affect the filter's behaviour
           edges: ["missing_info", "immune", "no_result"],
         },
         q1: {
-          type: TYPES.Statement,
+          type: TYPES.Question,
           data: {
             text: "q",
           },
           edges: ["missing_1", "nothing_1"],
         },
         missing_1: {
-          type: TYPES.Response,
+          type: TYPES.Answer,
           data: {
             text: "missing",
             flag: "MISSING_INFO",
           },
         },
         nothing_1: {
-          type: TYPES.Response,
+          type: TYPES.Answer,
           data: {
             text: "nothing",
           },
diff --git a/editor.planx.uk/src/pages/FlowEditor/lib/__tests__/granularity.test.ts b/editor.planx.uk/src/pages/FlowEditor/lib/__tests__/granularity.test.ts
index b096ed1710..aaf4e7201f 100644
--- a/editor.planx.uk/src/pages/FlowEditor/lib/__tests__/granularity.test.ts
+++ b/editor.planx.uk/src/pages/FlowEditor/lib/__tests__/granularity.test.ts
@@ -1,4 +1,4 @@
-import { TYPES } from "@planx/components/types";
+import { ComponentType as TYPES } from "@opensystemslab/planx-core/types";
 
 import { Store, vanillaStore } from "../store";
 
@@ -9,40 +9,40 @@ const flow: Store.flow = {
     edges: ["whatisit"],
   },
   whatisit: {
-    type: TYPES.Statement,
+    type: TYPES.Question,
     edges: ["food", "tool"],
     data: {
       fn: "item",
     },
   },
   food: {
-    type: TYPES.Response,
+    type: TYPES.Answer,
     data: {
       val: "food",
     },
     edges: ["whichfood"],
   },
   tool: {
-    type: TYPES.Response,
+    type: TYPES.Answer,
     data: {
       val: "tool",
     },
   },
   whichfood: {
-    type: TYPES.Statement,
+    type: TYPES.Question,
     edges: ["fruit", "cake"],
     data: {
       fn: "item",
     },
   },
   fruit: {
-    type: TYPES.Response,
+    type: TYPES.Answer,
     data: {
       val: "food.fruit",
     },
   },
   cake: {
-    type: TYPES.Response,
+    type: TYPES.Answer,
     data: {
       val: "food.cake",
     },
diff --git a/editor.planx.uk/src/pages/FlowEditor/lib/__tests__/navigation.test.ts b/editor.planx.uk/src/pages/FlowEditor/lib/__tests__/navigation.test.ts
index 61a8ec91ec..21a56af59f 100644
--- a/editor.planx.uk/src/pages/FlowEditor/lib/__tests__/navigation.test.ts
+++ b/editor.planx.uk/src/pages/FlowEditor/lib/__tests__/navigation.test.ts
@@ -1,4 +1,4 @@
-import { TYPES } from "@planx/components/types";
+import { ComponentType as TYPES } from "@opensystemslab/planx-core/types";
 
 import { FullStore, vanillaStore } from "../store";
 import flowWithoutSections from "./mocks/flowWithClones.json";
@@ -25,7 +25,7 @@ test("filterFlowByType() correctly returns a filtered view of the given flow", (
   );
 
   // Three Statements in test flow
-  const statementResult = filterFlowByType(TYPES.Statement);
+  const statementResult = filterFlowByType(TYPES.Question);
   expect(Object.keys(statementResult)).toEqual(
     expect.arrayContaining([
       "firstQuestion",
diff --git a/editor.planx.uk/src/pages/FlowEditor/lib/__tests__/ordering.test.ts b/editor.planx.uk/src/pages/FlowEditor/lib/__tests__/ordering.test.ts
index 2cc7c77c8b..43f1fdb515 100644
--- a/editor.planx.uk/src/pages/FlowEditor/lib/__tests__/ordering.test.ts
+++ b/editor.planx.uk/src/pages/FlowEditor/lib/__tests__/ordering.test.ts
@@ -1,4 +1,4 @@
-import { TYPES } from "@planx/components/types";
+import { ComponentType as TYPES } from "@opensystemslab/planx-core/types";
 
 import { Store, vanillaStore } from "../store";
 
@@ -22,7 +22,7 @@ const flow: Store.flow = {
       text: "apple",
       val: "food.fruit.apple",
     },
-    type: TYPES.Response,
+    type: TYPES.Answer,
     edges: [
       "AppleQuestionWithoutFn",
       "AutoAnsweredBananaQuestion",
@@ -34,10 +34,10 @@ const flow: Store.flow = {
       text: "banana",
       val: "food.fruit.banana",
     },
-    type: TYPES.Response,
+    type: TYPES.Answer,
   },
   AutoAnsweredBananaQuestion: {
-    type: TYPES.Statement,
+    type: TYPES.Question,
     data: {
       text: "did you choose the banana?",
       fn: "item",
@@ -45,14 +45,14 @@ const flow: Store.flow = {
     edges: ["YesBanana", "NoBanana"],
   },
   YesBanana: {
-    type: TYPES.Response,
+    type: TYPES.Answer,
     data: {
       text: "yes",
       val: "food.fruit.banana",
     },
   },
   NoBanana: {
-    type: TYPES.Response,
+    type: TYPES.Answer,
     data: {
       text: "no",
     },
@@ -65,39 +65,39 @@ const flow: Store.flow = {
     },
   },
   BananaQuestionWithoutFn: {
-    type: TYPES.Statement,
+    type: TYPES.Question,
     data: {
       text: "will you be eating the banana today?",
     },
     edges: ["YesEatingBanana", "NoEatingBanana"],
   },
   YesEatingBanana: {
-    type: TYPES.Response,
+    type: TYPES.Answer,
     data: {
       text: "yes",
     },
   },
   NoEatingBanana: {
-    type: TYPES.Response,
+    type: TYPES.Answer,
     data: {
       text: "no",
     },
   },
   AppleQuestionWithoutFn: {
-    type: TYPES.Statement,
+    type: TYPES.Question,
     data: {
       text: "you chose apple",
     },
     edges: ["YesApple"],
   },
   YesApple: {
-    type: TYPES.Response,
+    type: TYPES.Answer,
     data: {
       text: "i did",
     },
   },
   QuestionTrolley: {
-    type: TYPES.Statement,
+    type: TYPES.Question,
     data: {
       fn: "item",
       text: "shopping trolley 1",
@@ -105,14 +105,14 @@ const flow: Store.flow = {
     edges: ["AppleQuestionResponse", "BananaQuestionResponse"],
   },
   AppleQuestionResponse: {
-    type: TYPES.Response,
+    type: TYPES.Answer,
     data: {
       text: "apple",
       val: "food.fruit.apple",
     },
   },
   BananaQuestionResponse: {
-    type: TYPES.Response,
+    type: TYPES.Answer,
     data: {
       text: "banana",
       val: "food.fruit.banana",
diff --git a/editor.planx.uk/src/pages/FlowEditor/lib/__tests__/preview/canGoBack.test.ts b/editor.planx.uk/src/pages/FlowEditor/lib/__tests__/preview/canGoBack.test.ts
index 6a2c20e97a..be23cda4d3 100644
--- a/editor.planx.uk/src/pages/FlowEditor/lib/__tests__/preview/canGoBack.test.ts
+++ b/editor.planx.uk/src/pages/FlowEditor/lib/__tests__/preview/canGoBack.test.ts
@@ -1,4 +1,4 @@
-import { TYPES } from "@planx/components/types";
+import { ComponentType as TYPES } from "@opensystemslab/planx-core/types";
 
 import { Store, vanillaStore } from "../../store";
 
@@ -10,20 +10,20 @@ const flow: Store.flow = {
     edges: ["Question", "Pay", "Content", "Confirmation"],
   },
   Question: {
-    type: TYPES.Statement,
+    type: TYPES.Question,
     data: {
       text: "first question",
     },
     edges: ["NoFeeAnswerPath", "FeeAnswerPath"],
   },
   NoFeeAnswerPath: {
-    type: TYPES.Response,
+    type: TYPES.Answer,
     data: {
       text: "no fee",
     },
   },
   FeeAnswerPath: {
-    type: TYPES.Response,
+    type: TYPES.Answer,
     data: {
       text: "fee",
     },
diff --git a/editor.planx.uk/src/pages/FlowEditor/lib/__tests__/preview/hasPaid.test.ts b/editor.planx.uk/src/pages/FlowEditor/lib/__tests__/preview/hasPaid.test.ts
index e82bf9e5ae..a32b6cce32 100644
--- a/editor.planx.uk/src/pages/FlowEditor/lib/__tests__/preview/hasPaid.test.ts
+++ b/editor.planx.uk/src/pages/FlowEditor/lib/__tests__/preview/hasPaid.test.ts
@@ -1,4 +1,4 @@
-import { TYPES } from "@planx/components/types";
+import { ComponentType as TYPES } from "@opensystemslab/planx-core/types";
 
 import { vanillaStore } from "../../store";
 
@@ -12,17 +12,17 @@ test("hasPaid is updated if a Pay component has been recorded", () => {
         edges: ["a", "b"],
       },
       a: {
-        type: TYPES.Statement,
+        type: TYPES.Question,
         edges: ["c"],
       },
       b: {
-        type: TYPES.Statement,
+        type: TYPES.Question,
       },
       c: {
         type: TYPES.Pay,
       },
 
-      d: { type: TYPES.Response },
+      d: { type: TYPES.Answer },
       e: { type: TYPES.Review },
     },
   });
diff --git a/editor.planx.uk/src/pages/FlowEditor/lib/__tests__/preview/record.test.ts b/editor.planx.uk/src/pages/FlowEditor/lib/__tests__/preview/record.test.ts
index 7444a7c312..1d5ac7782d 100644
--- a/editor.planx.uk/src/pages/FlowEditor/lib/__tests__/preview/record.test.ts
+++ b/editor.planx.uk/src/pages/FlowEditor/lib/__tests__/preview/record.test.ts
@@ -1,4 +1,4 @@
-import { TYPES } from "@planx/components/types";
+import { ComponentType as TYPES } from "@opensystemslab/planx-core/types";
 
 import { vanillaStore } from "../../store";
 
@@ -37,22 +37,22 @@ test("record(id, undefined) clears up breadcrumbs", () => {
         edges: ["a", "b"],
       },
       a: {
-        type: TYPES.Statement,
+        type: TYPES.Question,
         edges: ["c"],
       },
       b: {
-        type: TYPES.Statement,
+        type: TYPES.Question,
       },
       c: {
-        type: TYPES.Response,
+        type: TYPES.Answer,
         edges: ["d"],
       },
       d: {
-        type: TYPES.Statement,
+        type: TYPES.Question,
         edges: ["e", "f"],
       },
-      e: { type: TYPES.Response },
-      f: { type: TYPES.Response },
+      e: { type: TYPES.Answer },
+      f: { type: TYPES.Answer },
     },
   });
   record("a", { answers: ["c"] });
diff --git a/editor.planx.uk/src/pages/FlowEditor/lib/__tests__/preview/upcomingCardIds.test.ts b/editor.planx.uk/src/pages/FlowEditor/lib/__tests__/preview/upcomingCardIds.test.ts
index d25dc63df9..a72b347792 100644
--- a/editor.planx.uk/src/pages/FlowEditor/lib/__tests__/preview/upcomingCardIds.test.ts
+++ b/editor.planx.uk/src/pages/FlowEditor/lib/__tests__/preview/upcomingCardIds.test.ts
@@ -1,4 +1,4 @@
-import { TYPES } from "@planx/components/types";
+import { ComponentType as TYPES } from "@opensystemslab/planx-core/types";
 
 import { Store, vanillaStore } from "../../store";
 
@@ -14,14 +14,14 @@ const flow: Store.flow = {
       val: "apple",
       text: "Apple",
     },
-    type: TYPES.Response,
+    type: TYPES.Answer,
   },
   ResponsePear: {
     data: {
       val: "pear",
       text: "Pear",
     },
-    type: TYPES.Response,
+    type: TYPES.Answer,
   },
   SetValue: {
     data: {
@@ -35,7 +35,7 @@ const flow: Store.flow = {
       fn: "fruit",
       text: "Which fruit?",
     },
-    type: TYPES.Statement,
+    type: TYPES.Question,
     edges: ["ResponseApple", "ResponsePear"],
   },
   Content: {
@@ -97,22 +97,22 @@ test("it lists upcoming cards", () => {
         edges: ["a", "b"],
       },
       a: {
-        type: TYPES.Statement,
+        type: TYPES.Question,
         edges: ["c"],
       },
       b: {
-        type: TYPES.Statement,
+        type: TYPES.Question,
       },
       c: {
-        type: TYPES.Response,
+        type: TYPES.Answer,
         edges: ["d"],
       },
       d: {
-        type: TYPES.Statement,
+        type: TYPES.Question,
         edges: ["e", "f"],
       },
-      e: { type: TYPES.Response },
-      f: { type: TYPES.Response },
+      e: { type: TYPES.Answer },
+      f: { type: TYPES.Answer },
     },
   });
 
diff --git a/editor.planx.uk/src/pages/FlowEditor/lib/analyticsProvider.tsx b/editor.planx.uk/src/pages/FlowEditor/lib/analyticsProvider.tsx
index b06a42fe6a..1aa5a23cde 100644
--- a/editor.planx.uk/src/pages/FlowEditor/lib/analyticsProvider.tsx
+++ b/editor.planx.uk/src/pages/FlowEditor/lib/analyticsProvider.tsx
@@ -4,7 +4,7 @@ import {
   Flag,
   FlagSet,
 } from "@opensystemslab/planx-core/types";
-import { TYPES } from "@planx/components/types";
+import { ComponentType as TYPES } from "@opensystemslab/planx-core/types";
 import Bowser from "bowser";
 import { publicClient } from "lib/graphql";
 import React, { createContext, useContext, useEffect } from "react";
diff --git a/editor.planx.uk/src/pages/FlowEditor/lib/store/index.ts b/editor.planx.uk/src/pages/FlowEditor/lib/store/index.ts
index a2e0199329..213e9bd12e 100644
--- a/editor.planx.uk/src/pages/FlowEditor/lib/store/index.ts
+++ b/editor.planx.uk/src/pages/FlowEditor/lib/store/index.ts
@@ -1,4 +1,4 @@
-import { TYPES } from "@planx/components/types";
+import { ComponentType as TYPES } from "@opensystemslab/planx-core/types";
 import { isPreviewOnlyDomain } from "routes/utils";
 import { create, UseBoundStore } from "zustand";
 import { createStore, StoreApi } from "zustand/vanilla";
diff --git a/editor.planx.uk/src/pages/FlowEditor/lib/store/navigation.ts b/editor.planx.uk/src/pages/FlowEditor/lib/store/navigation.ts
index 10207bb5ab..6e764b075b 100644
--- a/editor.planx.uk/src/pages/FlowEditor/lib/store/navigation.ts
+++ b/editor.planx.uk/src/pages/FlowEditor/lib/store/navigation.ts
@@ -1,4 +1,4 @@
-import { TYPES } from "@planx/components/types";
+import { ComponentType as TYPES } from "@opensystemslab/planx-core/types";
 import { findLast, pick } from "lodash";
 import { Store } from "pages/FlowEditor/lib/store";
 import type { StateCreator } from "zustand";
diff --git a/editor.planx.uk/src/pages/FlowEditor/lib/store/preview.ts b/editor.planx.uk/src/pages/FlowEditor/lib/store/preview.ts
index 0b4502213c..9c20a4170c 100644
--- a/editor.planx.uk/src/pages/FlowEditor/lib/store/preview.ts
+++ b/editor.planx.uk/src/pages/FlowEditor/lib/store/preview.ts
@@ -8,7 +8,7 @@ import {
   DEFAULT_FLAG_CATEGORY,
   flatFlags,
 } from "@opensystemslab/planx-core/types";
-import { TYPES } from "@planx/components/types";
+import { ComponentType as TYPES } from "@opensystemslab/planx-core/types";
 import { sortIdsDepthFirst } from "@planx/graph";
 import { logger } from "airbrake";
 import { objectWithoutNullishValues } from "lib/objectHelpers";
@@ -28,7 +28,7 @@ import type { Store } from ".";
 import { NavigationStore } from "./navigation";
 import type { SharedStore } from "./shared";
 
-const SUPPORTED_DECISION_TYPES = [TYPES.Checklist, TYPES.Statement];
+const SUPPORTED_DECISION_TYPES = [TYPES.Checklist, TYPES.Question];
 let memoizedPreviousCardId: string | undefined = undefined;
 let memoizedBreadcrumb: Store.breadcrumbs | undefined = undefined;
 export interface PreviewStore extends Store.Store {
diff --git a/editor.planx.uk/src/pages/Preview/Node.tsx b/editor.planx.uk/src/pages/Preview/Node.tsx
index 0f8a43531a..2a0a4a6f41 100644
--- a/editor.planx.uk/src/pages/Preview/Node.tsx
+++ b/editor.planx.uk/src/pages/Preview/Node.tsx
@@ -3,6 +3,7 @@ import {
   GOV_PAY_PASSPORT_KEY,
   GovUKPayment,
 } from "@opensystemslab/planx-core/types";
+import { ComponentType as TYPES } from "@opensystemslab/planx-core/types";
 import AddressInput from "@planx/components/AddressInput/Public";
 import Calculate from "@planx/components/Calculate/Public";
 import Checklist from "@planx/components/Checklist/Public";
@@ -29,7 +30,6 @@ import Send from "@planx/components/Send/Public";
 import SetValue from "@planx/components/SetValue/Public";
 import TaskList from "@planx/components/TaskList/Public";
 import TextInput from "@planx/components/TextInput/Public";
-import { TYPES } from "@planx/components/types";
 import { objectWithoutNullishValues } from "lib/objectHelpers";
 import mapAccum from "ramda/src/mapAccum";
 import React from "react";
@@ -212,7 +212,7 @@ const Node: React.FC<any> = (props: Props) => {
     case TYPES.SetValue:
       return <SetValue {...allProps} />;
 
-    case TYPES.Statement:
+    case TYPES.Question:
       return (
         <Question
           {...allProps}
@@ -255,7 +255,7 @@ const Node: React.FC<any> = (props: Props) => {
     case TYPES.Filter:
     case TYPES.Flow:
     case TYPES.InternalPortal:
-    case TYPES.Response:
+    case TYPES.Answer:
     case undefined:
       return null;
     default:
diff --git a/editor.planx.uk/src/pages/Preview/Questions.tsx b/editor.planx.uk/src/pages/Preview/Questions.tsx
index 5f83ef110a..36e9885f3e 100644
--- a/editor.planx.uk/src/pages/Preview/Questions.tsx
+++ b/editor.planx.uk/src/pages/Preview/Questions.tsx
@@ -3,7 +3,7 @@ import Box from "@mui/material/Box";
 import ButtonBase from "@mui/material/ButtonBase";
 import Container from "@mui/material/Container";
 import { styled } from "@mui/material/styles";
-import { TYPES } from "@planx/components/types";
+import { ComponentType as TYPES } from "@opensystemslab/planx-core/types";
 import { getLocalFlow, setLocalFlow } from "lib/local";
 import * as NEW from "lib/local.new";
 import { useAnalyticsTracking } from "pages/FlowEditor/lib/analyticsProvider";
diff --git a/editor.planx.uk/src/pages/Preview/ReconciliationPage.tsx b/editor.planx.uk/src/pages/Preview/ReconciliationPage.tsx
index c2f6589e29..75d13added 100644
--- a/editor.planx.uk/src/pages/Preview/ReconciliationPage.tsx
+++ b/editor.planx.uk/src/pages/Preview/ReconciliationPage.tsx
@@ -3,10 +3,10 @@ import Box from "@mui/material/Box";
 import Button from "@mui/material/Button";
 import { useTheme } from "@mui/material/styles";
 import Typography from "@mui/material/Typography";
+import { ComponentType as TYPES } from "@opensystemslab/planx-core/types";
 import { SectionsOverviewList } from "@planx/components/Section/Public";
 import Card from "@planx/components/shared/Preview/Card";
 import SummaryListsBySections from "@planx/components/shared/Preview/SummaryList";
-import { TYPES } from "@planx/components/types";
 import { useStore } from "pages/FlowEditor/lib/store";
 import { sortBreadcrumbs } from "pages/FlowEditor/lib/store/preview";
 import React from "react";
diff --git a/editor.planx.uk/src/routes/flow.tsx b/editor.planx.uk/src/routes/flow.tsx
index df97bbc770..e156e37749 100644
--- a/editor.planx.uk/src/routes/flow.tsx
+++ b/editor.planx.uk/src/routes/flow.tsx
@@ -1,5 +1,5 @@
 import { gql } from "@apollo/client";
-import { TYPES } from "@planx/components/types";
+import { ComponentType as TYPES } from "@opensystemslab/planx-core/types";
 import ErrorFallback from "components/ErrorFallback";
 import TestEnvironmentBanner from "components/TestEnvironmentBanner";
 import natsort from "natsort";
diff --git a/editor.planx.uk/src/routes/utils.ts b/editor.planx.uk/src/routes/utils.ts
index f69e07d185..9f8afdc0b4 100644
--- a/editor.planx.uk/src/routes/utils.ts
+++ b/editor.planx.uk/src/routes/utils.ts
@@ -1,4 +1,4 @@
-import { TYPES as NodeTypes } from "@planx/components/types";
+import { ComponentType as NodeTypes } from "@opensystemslab/planx-core/types";
 import gql from "graphql-tag";
 import { hasFeatureFlag } from "lib/featureFlags";
 import { NaviRequest, NotFoundError } from "navi";