diff --git a/example/src/components/FormCheckboxDemo.tsx b/example/src/components/FormCheckboxDemo.tsx
index 9a260467..9857f110 100644
--- a/example/src/components/FormCheckboxDemo.tsx
+++ b/example/src/components/FormCheckboxDemo.tsx
@@ -1,5 +1,5 @@
 import * as React from 'react';
-import { FormCheckbox, FormGroup } from '@capgeminiuk/dcx-react-library';
+import { FormCheckbox, CheckboxGroup } from '@capgeminiuk/dcx-react-library';
 
 export const FormCheckboxDemo = () => {
   const [value, setValue] = React.useState('');
@@ -48,9 +48,8 @@ export const FormCheckboxDemo = () => {
         disabled={true}
       />
       <h2>Group</h2>
-      <FormGroup
+      <CheckboxGroup
         name="name-of-group"
-        type="checkbox"
         onChange={handleFormChange}
         items={[
           {
@@ -133,9 +132,8 @@ export const FormCheckboxDemo = () => {
         }}
       />
       <h2>Group using string values</h2>
-      <FormGroup
+      <CheckboxGroup
         name="name-of-group-string"
-        type="checkbox"
         onChange={handleFormChange}
         items={['yes', 'no']}
       />
diff --git a/example/src/components/FormRadioDemo.tsx b/example/src/components/FormRadioDemo.tsx
index 9b414145..7f2d09f8 100644
--- a/example/src/components/FormRadioDemo.tsx
+++ b/example/src/components/FormRadioDemo.tsx
@@ -1,5 +1,5 @@
 import * as React from 'react';
-import { FormRadio, FormGroup } from '@capgeminiuk/dcx-react-library';
+import { FormRadio, RadioGroup } from '@capgeminiuk/dcx-react-library';
 
 export const FormRadioDemo = () => {
   const [selected, setSelected] = React.useState('single-2');
@@ -153,10 +153,9 @@ export const FormRadioDemo = () => {
         }}
       />
       <h4 id="basic-radio-group-tag">Basic Group Radios</h4>
-      <FormGroup
+      <RadioGroup
         ariaDescribedBy="basic-radio-group-tag"
         name="group3"
-        type="radio"
         items={[
           {
             id: 'radio-1',
@@ -212,10 +211,9 @@ export const FormRadioDemo = () => {
       <h4 id="basic-radio-group-with-string-tag">
         Basic Group Radios using string
       </h4>
-      <FormGroup
+      <RadioGroup
         ariaDescribedBy="basic-radio-group-tag"
         name="group4"
-        type="radio"
         items={['Option 1', 'Option 2', 'Option 3']}
         //@ts-ignore
         onChange={handleGroupConditionalChange}
diff --git a/example/src/pages/Register.tsx b/example/src/pages/Register.tsx
index 09844300..76f9f848 100644
--- a/example/src/pages/Register.tsx
+++ b/example/src/pages/Register.tsx
@@ -9,7 +9,7 @@ import {
   FormRadio,
   FormSelect,
   Toggle,
-  FormGroup,
+  RadioGroup,
   Autocomplete,
   FormDate,
   ErrorPosition,
@@ -462,9 +462,8 @@ export const Register = () => {
         </div>
 
         <div className="form-group">
-          <FormGroup
+          <RadioGroup
             name="heard-about"
-            type="radio"
             inputProps={{
               className: 'class-name',
             }}
@@ -517,8 +516,7 @@ export const Register = () => {
             fieldsetClasses="field-set-class"
             hint={{
               id: 'heard-about-hint',
-              text:
-                'Please select the one closest to where you first heard about us',
+              text: 'Please select the one closest to where you first heard about us',
               className: 'hint-class',
             }}
             itemsClasses="item-classes"
diff --git a/src/index.ts b/src/index.ts
index 1d27530b..cd8d0e5d 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -1,4 +1,4 @@
-export * from './formGroup';
+export * from './checkboxGroup';
 export * from './radioGroup';
 export * from './formInput';
 export * from './formRadio';