diff --git a/packages/eslint-plugin-smarthr/rules/best-practice-for-interactive-element/README.md b/packages/eslint-plugin-smarthr/rules/best-practice-for-interactive-element/README.md
index bb790648d..49060bb58 100644
--- a/packages/eslint-plugin-smarthr/rules/best-practice-for-interactive-element/README.md
+++ b/packages/eslint-plugin-smarthr/rules/best-practice-for-interactive-element/README.md
@@ -34,7 +34,7 @@
 
 #### smarthr-uiの対象要素
 
-- AccordionPanel
+- Accordion
 - Anchor
 - Checkbox
 - Date
diff --git a/packages/eslint-plugin-smarthr/rules/best-practice-for-interactive-element/index.js b/packages/eslint-plugin-smarthr/rules/best-practice-for-interactive-element/index.js
index 52f5389a8..9f6acc0c0 100644
--- a/packages/eslint-plugin-smarthr/rules/best-practice-for-interactive-element/index.js
+++ b/packages/eslint-plugin-smarthr/rules/best-practice-for-interactive-element/index.js
@@ -8,7 +8,7 @@ const INTERACTIVE_COMPONENT_NAMES = `(${[
   '(L|l)egend(s)$',
   '(S|s)elect(s)?',
   '(T|t)extarea(s)?',
-  'AccordionPanel(s)?',
+  'Accordion(Panel)?(s)?',
   'Anchor',
   'DisclosureTrigger?',
   'DropZone(s)?',
diff --git a/packages/eslint-plugin-smarthr/rules/component-name/index.js b/packages/eslint-plugin-smarthr/rules/component-name/index.js
index ac325a08f..c3b9625fc 100644
--- a/packages/eslint-plugin-smarthr/rules/component-name/index.js
+++ b/packages/eslint-plugin-smarthr/rules/component-name/index.js
@@ -73,7 +73,8 @@ const EXPECTED_NAMES = {
   '(S|^s)ection$': 'Section$',
   '(S|^s)elect$': 'Select$',
   '(T|^t)extarea$': 'Textarea$',
-  'AccordionPanel$': 'AccordionPanel$',
+  'Accordion$': 'Accordion$',
+  'AccordionPanel$': 'AccordionPanel$',  // 後方互換性のために残す
   'ActionDialogWithTrigger$': 'ActionDialogWithTrigger$',
   'Anchor$': 'Anchor$',
   'AnchorButton$': 'AnchorButton$',
diff --git a/packages/eslint-plugin-smarthr/test/best-practice-for-interactive-element.js b/packages/eslint-plugin-smarthr/test/best-practice-for-interactive-element.js
index 1cb5245a3..0c23b630b 100644
--- a/packages/eslint-plugin-smarthr/test/best-practice-for-interactive-element.js
+++ b/packages/eslint-plugin-smarthr/test/best-practice-for-interactive-element.js
@@ -21,7 +21,7 @@ const INTERACTIVE_COMPONENT_NAMES = `(${[
   '(L|l)egend(s)$',
   '(S|s)elect(s)?',
   '(T|t)extarea(s)?',
-  'AccordionPanel(s)?',
+  'Accordion(Panel)?(s)?',
   'Anchor',
   'DisclosureTrigger?',
   'DropZone(s)?',
diff --git a/packages/eslint-plugin-smarthr/test/component-name.js b/packages/eslint-plugin-smarthr/test/component-name.js
index e4f51f25d..2a6dea4f6 100644
--- a/packages/eslint-plugin-smarthr/test/component-name.js
+++ b/packages/eslint-plugin-smarthr/test/component-name.js
@@ -178,6 +178,7 @@ ruleTester.run('component-name', rule, {
     { code: `import { FormDialog as HogeDialog } from './hoge'`, errors: [ { message: messageImportAs({ extended: 'HogeDialog', matcher: /FormDialog$/, base: 'FormDialog' }) } ] },
     { code: 'const PaginationFuga = styled(FugaPagination)``', errors: [ { message: messageInheritance({ extended: 'PaginationFuga', matcher: /Pagination$/ }) } ]  },
     { code: `import { HogeSideNav as Hoge } from './hoge'`, errors: [ { message: messageImportAs({ extended: 'Hoge', matcher: /Nav$/, base: 'HogeSideNav' }) }, { message: messageImportAs({ extended: 'Hoge', matcher: /SideNav$/, base: 'HogeSideNav' }) } ] },
+    { code: 'const AccordionAny = styled(FugaAccordion)``', errors: [ { message: messageInheritance({ extended: 'AccordionAny', matcher: /Accordion$/ }) } ]  },
     { code: 'const AccordionPanelAny = styled(FugaAccordionPanel)``', errors: [ { message: messageInheritance({ extended: 'AccordionPanelAny', matcher: /AccordionPanel$/ }) } ]  },
     { code: `import { HogeFilterDropdown as Hoge } from './hoge'`, errors: [ { message: messageImportAs({ extended: 'Hoge', matcher: /FilterDropdown$/, base: 'HogeFilterDropdown' }) } ] },
     { code: `const Hoge = styled.fieldset`, errors: [ { message: messageInheritance({ extended: 'Hoge', matcher: /Fieldset$/ }) } ] },