diff --git a/ui/src/reusable_ui/components/wizard/WizardCloak.tsx b/ui/src/reusable_ui/components/wizard/WizardCloak.tsx
index 045c19ea9..93b6f1544 100644
--- a/ui/src/reusable_ui/components/wizard/WizardCloak.tsx
+++ b/ui/src/reusable_ui/components/wizard/WizardCloak.tsx
@@ -1,26 +1,7 @@
-import React, {PureComponent, ReactElement, ReactNode} from 'react'
+import React, {PureComponent, ReactElement} from 'react'
 import WizardProgressBar from 'src/reusable_ui/components/wizard/WizardProgressBar'
 
-interface WizardStepProps {
-  children: ReactNode
-  title: string
-  isComplete: () => boolean
-  onPrevious: () => void
-  onNext: () => void
-  increment?: () => void
-  decrement?: () => void
-}
-
-enum StepStatus {
-  Incomplete = 'circle-thick',
-  Complete = 'checkmark',
-  Error = 'remove',
-}
-
-interface Step {
-  title: string
-  stepStatus: StepStatus
-}
+import {WizardStepProps, StepStatus, Step} from 'src/types/wizard'
 
 interface State {
   steps: Step[]
diff --git a/ui/src/reusable_ui/components/wizard/WizardOverlay.tsx b/ui/src/reusable_ui/components/wizard/WizardOverlay.tsx
index 043af31b6..22b83fb7a 100644
--- a/ui/src/reusable_ui/components/wizard/WizardOverlay.tsx
+++ b/ui/src/reusable_ui/components/wizard/WizardOverlay.tsx
@@ -1,19 +1,11 @@
-import React, {PureComponent, ReactElement, ReactNode} from 'react'
+import React, {PureComponent, ReactElement} from 'react'
 import OverlayBody from 'src/reusable_ui/components/overlays/OverlayBody'
 import OverlayContainer from 'src/reusable_ui/components/overlays/OverlayContainer'
 import OverlayTechnology from 'src/reusable_ui/components/overlays/OverlayTechnology'
 import WizardCloak from 'src/reusable_ui/components/wizard/WizardCloak'
 import OverlayHeading from 'src/reusable_ui/components/overlays/OverlayHeading'
-interface WizardStepProps {
-  children: ReactNode
-  title: string
-  isComplete: () => boolean
-  onPrevious: () => void
-  onNext: () => void
-  increment?: () => void
-  decrement?: () => void
-}
-// import {} from 'src/types'
+
+import {WizardStepProps} from 'src/types/wizard'
 
 interface Props {
   children: Array<ReactElement<WizardStepProps>>
diff --git a/ui/src/reusable_ui/components/wizard/WizardProgressBar.tsx b/ui/src/reusable_ui/components/wizard/WizardProgressBar.tsx
index a04259730..0f23cfd71 100644
--- a/ui/src/reusable_ui/components/wizard/WizardProgressBar.tsx
+++ b/ui/src/reusable_ui/components/wizard/WizardProgressBar.tsx
@@ -1,27 +1,10 @@
 import React, {PureComponent} from 'react'
 import ProgressConnector from 'src/reusable_ui/components/wizard/ProgressConnector'
 
+import {Step, connectorState, StepStatus} from 'src/types/wizard'
+
 import 'src/reusable_ui/components/wizard/WizardProgressBar.scss'
 
-// import {} from 'src/types'
-
-enum statusStates {
-  None = 'none',
-  Some = 'some',
-  Full = 'full',
-}
-
-enum StepStatus {
-  Incomplete = 'circle-thick',
-  Complete = 'checkmark',
-  Error = 'remove',
-}
-
-interface Step {
-  title: string
-  stepStatus: StepStatus
-}
-
 interface Props {
   steps: Step[]
   currentStepIndex: number
@@ -53,10 +36,10 @@ class WizardProgressBar extends PureComponent<Props> {
       // CONNECTION ELE
       let connectorStatus
       if (i > 0 && steps[i - 1].stepStatus === StepStatus.Complete) {
-        connectorStatus = statusStates.Some
+        connectorStatus = connectorState.Some
 
         if (stepStatus === StepStatus.Complete) {
-          connectorStatus = statusStates.Full
+          connectorStatus = connectorState.Full
         }
       }
 
diff --git a/ui/src/reusable_ui/components/wizard/WizardStep.tsx b/ui/src/reusable_ui/components/wizard/WizardStep.tsx
index fffee5e75..98a749ec4 100644
--- a/ui/src/reusable_ui/components/wizard/WizardStep.tsx
+++ b/ui/src/reusable_ui/components/wizard/WizardStep.tsx
@@ -2,8 +2,6 @@ import React, {PureComponent, ReactNode} from 'react'
 
 import 'src/reusable_ui/components/wizard/WizardStep.scss'
 
-// import {} from 'src/types'
-
 interface Props {
   children: ReactNode
   title: string
diff --git a/ui/src/sources/components/GrandWizard.tsx b/ui/src/sources/components/GrandWizard.tsx
index 04ed2fe10..3d5fe6791 100644
--- a/ui/src/sources/components/GrandWizard.tsx
+++ b/ui/src/sources/components/GrandWizard.tsx
@@ -2,8 +2,6 @@ import React, {PureComponent} from 'react'
 import WizardOverlay from 'src/reusable_ui/components/wizard/WizardOverlay'
 import WizardStep from 'src/reusable_ui/components/wizard/WizardStep'
 
-// import {} from 'src/types'
-
 interface Props {
   wizardVisibility: boolean
   toggleVisibility: (isVisible: boolean) => () => void
@@ -13,7 +11,7 @@ interface State {
   completion: object
 }
 
-class WizardWithSteps extends PureComponent<Props, State> {
+class GrandWizard extends PureComponent<Props, State> {
   constructor(props: Props) {
     super(props)
     this.state = {
@@ -108,4 +106,4 @@ class WizardWithSteps extends PureComponent<Props, State> {
   }
 }
 
-export default WizardWithSteps
+export default GrandWizard
diff --git a/ui/src/types/wizard.ts b/ui/src/types/wizard.ts
new file mode 100644
index 000000000..fff11f8f2
--- /dev/null
+++ b/ui/src/types/wizard.ts
@@ -0,0 +1,28 @@
+import {ReactNode} from 'react'
+
+export interface WizardStepProps {
+  children: ReactNode
+  title: string
+  isComplete: () => boolean
+  onPrevious: () => void
+  onNext: () => void
+  increment?: () => void
+  decrement?: () => void
+}
+
+export enum connectorState {
+  None = 'none',
+  Some = 'some',
+  Full = 'full',
+}
+
+export enum StepStatus {
+  Incomplete = 'circle-thick',
+  Complete = 'checkmark',
+  Error = 'remove',
+}
+
+export interface Step {
+  title: string
+  stepStatus: StepStatus
+}