diff --git a/addons/rose/addon/components/rose/form/errors.js b/addons/rose/addon/components/rose/form/errors.js
deleted file mode 100644
index bc13c3f56..000000000
--- a/addons/rose/addon/components/rose/form/errors.js
+++ /dev/null
@@ -1,10 +0,0 @@
-import Component from '@ember/component';
-import layout from '../../../templates/components/rose/form/errors';
-
-/**
- * A container for error messages.  Yields the error message component.
- */
-export default Component.extend({
-  layout,
-  tagName: '',
-});
diff --git a/addons/rose/addon/templates/components/rose/form/errors.hbs b/addons/rose/addon/components/rose/form/errors/index.hbs
similarity index 100%
rename from addons/rose/addon/templates/components/rose/form/errors.hbs
rename to addons/rose/addon/components/rose/form/errors/index.hbs
diff --git a/addons/rose/addon/components/rose/form/errors.stories.mdx b/addons/rose/addon/components/rose/form/errors/index.stories.mdx
similarity index 100%
rename from addons/rose/addon/components/rose/form/errors.stories.mdx
rename to addons/rose/addon/components/rose/form/errors/index.stories.mdx
diff --git a/addons/rose/addon/components/rose/form/errors/message.js b/addons/rose/addon/components/rose/form/errors/message.js
deleted file mode 100644
index 0f59c6b06..000000000
--- a/addons/rose/addon/components/rose/form/errors/message.js
+++ /dev/null
@@ -1,10 +0,0 @@
-import Component from '@ember/component';
-import layout from '../../../../templates/components/rose/form/errors/message';
-
-/**
- * A simple, styled error message.  Do not use directly.
- */
-export default Component.extend({
-  layout,
-  tagName: '',
-});
diff --git a/addons/rose/addon/templates/components/rose/form/errors/message.hbs b/addons/rose/addon/components/rose/form/errors/message/index.hbs
similarity index 100%
rename from addons/rose/addon/templates/components/rose/form/errors/message.hbs
rename to addons/rose/addon/components/rose/form/errors/message/index.hbs
diff --git a/addons/rose/addon/components/rose/form/errors/message.stories.mdx b/addons/rose/addon/components/rose/form/errors/message/index.stories.mdx
similarity index 100%
rename from addons/rose/addon/components/rose/form/errors/message.stories.mdx
rename to addons/rose/addon/components/rose/form/errors/message/index.stories.mdx