diff --git a/src/components/forms/forms.stories.js b/src/components/forms/forms.stories.js
index 4120060..bfe975e 100644
--- a/src/components/forms/forms.stories.js
+++ b/src/components/forms/forms.stories.js
@@ -3,7 +3,7 @@ import radio from './radio/radio.twig';
 import select from './select/select.twig';
 import textfields from './textfields/textfields.twig';
 
-import { props } from './forms.component.yml';
+import { props } from './forms.yml';
 
 const checkboxData = props.properties.checkboxes.data;
 const radioData = props.properties.radios.data;
diff --git a/src/components/forms/forms.component.yml b/src/components/forms/forms.yml
similarity index 100%
rename from src/components/forms/forms.component.yml
rename to src/components/forms/forms.yml
diff --git a/src/components/navigation/pager/pager-both-ellipses.component.yml b/src/components/navigation/pager/pager-both-ellipses.yml
similarity index 100%
rename from src/components/navigation/pager/pager-both-ellipses.component.yml
rename to src/components/navigation/pager/pager-both-ellipses.yml
diff --git a/src/components/navigation/pager/pager-first-last.component.yml b/src/components/navigation/pager/pager-first-last.yml
similarity index 100%
rename from src/components/navigation/pager/pager-first-last.component.yml
rename to src/components/navigation/pager/pager-first-last.yml
diff --git a/src/components/navigation/pager/pager-next-ellipses.component.yml b/src/components/navigation/pager/pager-next-ellipses.yml
similarity index 100%
rename from src/components/navigation/pager/pager-next-ellipses.component.yml
rename to src/components/navigation/pager/pager-next-ellipses.yml
diff --git a/src/components/navigation/pager/pager-prev-ellipses.component.yml b/src/components/navigation/pager/pager-prev-ellipses.yml
similarity index 100%
rename from src/components/navigation/pager/pager-prev-ellipses.component.yml
rename to src/components/navigation/pager/pager-prev-ellipses.yml
diff --git a/src/components/navigation/pager/pager.stories.js b/src/components/navigation/pager/pager.stories.js
index 392e7af..8b4ea2b 100644
--- a/src/components/navigation/pager/pager.stories.js
+++ b/src/components/navigation/pager/pager.stories.js
@@ -2,10 +2,10 @@ import pagerTwig from './pager.twig';
 import { mapDataToTwig } from '../../../util/dataTransformers.js';
 
 import { props as pagerProps } from './pager.component.yml';
-import { props as pagerNextEllipsesProps } from './pager-next-ellipses.component.yml';
-import { props as pagerPrevEllipsesProps } from './pager-prev-ellipses.component.yml';
-import { props as pagerBothEllipsesProps } from './pager-both-ellipses.component.yml';
-import { props as pagerFirstLastProps } from './pager-first-last.component.yml';
+import { props as pagerNextEllipsesProps } from './pager-next-ellipses.yml';
+import { props as pagerPrevEllipsesProps } from './pager-prev-ellipses.yml';
+import { props as pagerBothEllipsesProps } from './pager-both-ellipses.yml';
+import { props as pagerFirstLastProps } from './pager-first-last.yml';
 
 const pagerData = mapDataToTwig(pagerProps.properties);
 const pagerNextEllipsesData = mapDataToTwig(pagerNextEllipsesProps.properties);
diff --git a/src/components/video/video-embed.component.yml b/src/components/video/video-embed.yml
similarity index 100%
rename from src/components/video/video-embed.component.yml
rename to src/components/video/video-embed.yml
diff --git a/src/components/video/video-html5.component.yml b/src/components/video/video-html5.yml
similarity index 100%
rename from src/components/video/video-html5.component.yml
rename to src/components/video/video-html5.yml
diff --git a/src/components/video/video.stories.js b/src/components/video/video.stories.js
index 26b8eb8..4c57fd0 100644
--- a/src/components/video/video.stories.js
+++ b/src/components/video/video.stories.js
@@ -1,7 +1,7 @@
 import video from './video.twig';
 
-import { props as videoEmbedProps } from './video-embed.component.yml';
-import { props as videoHTML5Props } from './video-html5.component.yml';
+import { props as videoEmbedProps } from './video-embed.yml';
+import { props as videoHTML5Props } from './video-html5.yml';
 
 import { mapDataToTwig } from '../../util/dataTransformers';
 import './video-embed';