diff --git a/README.md b/README.md
index d81ec26..842b5e1 100644
--- a/README.md
+++ b/README.md
@@ -28,16 +28,18 @@ itteration of [widgetastic.patternfly4](https://github.com/RedHatQE/widgetastic.
 ### Components:
 - [alert](https://www.patternfly.org/components/alert)
 - [breadcrumb](https://www.patternfly.org/components/breadcrumb)
-- [clipboard-copy](https://www.patternfly.org/components/clipboard-copy)
 - [button](https://www.patternfly.org/components/button)
 - [card](https://www.patternfly.org/components/card)
 - [chip](https://www.patternfly.org/components/chip)
+- [clipboard-copy](https://www.patternfly.org/components/clipboard-copy)
 - date and time
   - [calendar-month](https://www.patternfly.org/components/date-and-time/calendar-month)
 - [description-list](https://www.patternfly.org/components/description-list)
+- [drawer](https://www.patternfly.org/components/drawer)
 - [dual-list-selector](https://www.patternfly.org/components/dual-list-selector)
-- [form-select](https://www.patternfly.org/components/forms/form-select)
-- [slider](https://www.patternfly.org/components/slider)
+- forms
+  - [form-select](https://www.patternfly.org/components/forms/form-select)
+  - [radio](https://www.patternfly.org/components/forms/radio)
 - menus
   - [dropdown](https://www.patternfly.org/components/menus/dropdown)
   - [menu](https://www.patternfly.org/components/menus/menu)
@@ -48,14 +50,12 @@ itteration of [widgetastic.patternfly4](https://github.com/RedHatQE/widgetastic.
 - [navigation](https://www.patternfly.org/components/navigation)
 - [pagination](https://www.patternfly.org/components/pagination/)
 - [popover](https://www.patternfly.org/components/popover)
-- forms
-  - [radio](https://www.patternfly.org/components/forms/radio)
 - [progress](https://www.patternfly.org/components/progress)
+- [slider](https://www.patternfly.org/components/slider)
 - [switch](https://www.patternfly.org/components/switch)
 - [table](https://www.patternfly.org/components/table)
 - [tabs](https://www.patternfly.org/components/tabs)
 - [title](https://www.patternfly.org/components/title)
-- [drawer](https://www.patternfly.org/components/drawer)
 
 
 ### Charts:
diff --git a/src/widgetastic_patternfly5/__init__.py b/src/widgetastic_patternfly5/__init__.py
index 59a0ceb..4da2029 100644
--- a/src/widgetastic_patternfly5/__init__.py
+++ b/src/widgetastic_patternfly5/__init__.py
@@ -9,23 +9,23 @@
 from .components.button import Button
 from .components.card import Card
 from .components.card import CardWithActions
-from .components.chipgroup import CategoryChipGroup
-from .components.chipgroup import Chip
-from .components.chipgroup import ChipGroup
-from .components.chipgroup import ChipGroupToolbar
-from .components.chipgroup import ChipGroupToolbarCategory
-from .components.chipgroup import ChipReadOnlyError
-from .components.chipgroup import StandAloneChipGroup
-from .components.clipboardcopy import ClipboardCopy
-from .components.date_and_time.calendarmonth import CalendarMonth
-from .components.descriptionlist import DescriptionList
+from .components.chip import CategoryChipGroup
+from .components.chip import Chip
+from .components.chip import ChipGroup
+from .components.chip import ChipGroupToolbar
+from .components.chip import ChipGroupToolbarCategory
+from .components.chip import ChipReadOnlyError
+from .components.chip import StandAloneChipGroup
+from .components.clipboard_copy import ClipboardCopy
+from .components.date_and_time.calendar_month import CalendarMonth
+from .components.description_list import DescriptionList
 from .components.drawer import Drawer
-from .components.duallistselector import DualListSelector
-from .components.duallistselector import SearchDualListSelector
-from .components.forms.formselect import FormSelect
-from .components.forms.formselect import FormSelectDisabled
-from .components.forms.formselect import FormSelectOptionDisabled
-from .components.forms.formselect import FormSelectOptionNotFound
+from .components.dual_list_selector import DualListSelector
+from .components.dual_list_selector import SearchDualListSelector
+from .components.forms.form_select import FormSelect
+from .components.forms.form_select import FormSelectDisabled
+from .components.forms.form_select import FormSelectOptionDisabled
+from .components.forms.form_select import FormSelectOptionNotFound
 from .components.forms.radio import Radio
 from .components.menus.dropdown import Dropdown
 from .components.menus.dropdown import DropdownDisabled
@@ -37,7 +37,7 @@
 from .components.menus.menu import MenuItemDisabled
 from .components.menus.menu import MenuItemNotFound
 from .components.menus.menu_toggle import SplitButtonDropdown
-from .components.menus.optionsmenu import OptionsMenu
+from .components.menus.options_menu import OptionsMenu
 from .components.menus.select import CheckboxSelect
 from .components.menus.select import Select
 from .components.menus.select import SelectItemDisabled
@@ -83,7 +83,6 @@
     "ClipboardCopy",
     "ColumnNotExpandable",
     "CompactPagination",
-    "CompactPagination",
     "CompoundExpandableTable",
     "DataPoint",
     "DescriptionList",
@@ -101,7 +100,6 @@
     "FormSelectOptionNotFound",
     "GroupDropdown",
     "InputSlider",
-    "InputSlider",
     "Legend",
     "LineChart",
     "Menu",
@@ -113,8 +111,6 @@
     "Navigation",
     "OptionsMenu",
     "Pagination",
-    "Pagination",
-    "PaginationNavDisabled",
     "PaginationNavDisabled",
     "PatternflyTable",
     "PieChart",
@@ -129,7 +125,6 @@
     "Slider",
     "SplitButtonDropdown",
     "StandAloneChipGroup",
-    "Radio",
     "Switch",
     "SwitchDisabled",
     "Tab",
diff --git a/src/widgetastic_patternfly5/components/chipgroup.py b/src/widgetastic_patternfly5/components/chip.py
similarity index 100%
rename from src/widgetastic_patternfly5/components/chipgroup.py
rename to src/widgetastic_patternfly5/components/chip.py
diff --git a/src/widgetastic_patternfly5/components/clipboardcopy.py b/src/widgetastic_patternfly5/components/clipboard_copy.py
similarity index 100%
rename from src/widgetastic_patternfly5/components/clipboardcopy.py
rename to src/widgetastic_patternfly5/components/clipboard_copy.py
diff --git a/src/widgetastic_patternfly5/components/date_and_time/calendarmonth.py b/src/widgetastic_patternfly5/components/date_and_time/calendar_month.py
similarity index 93%
rename from src/widgetastic_patternfly5/components/date_and_time/calendarmonth.py
rename to src/widgetastic_patternfly5/components/date_and_time/calendar_month.py
index 7dd7b76..d30fbe2 100644
--- a/src/widgetastic_patternfly5/components/date_and_time/calendarmonth.py
+++ b/src/widgetastic_patternfly5/components/date_and_time/calendar_month.py
@@ -18,11 +18,11 @@ class BaseCalendarMonth:
     """
 
     CALENDAR_HEADER = ".//div[contains(@class, '-c-calendar-month__header')]"
-    MONTH_SELECT_LOCATOR = (
-        f"{CALENDAR_HEADER}//div[contains(@class, 'header-month')]"
-    )
+    MONTH_SELECT_LOCATOR = f"{CALENDAR_HEADER}//div[contains(@class, 'header-month')]"
     _month_select_widget = Select(locator=MONTH_SELECT_LOCATOR)
-    YEAR_INPUT_LOCATOR = f"{CALENDAR_HEADER}//div[contains(@class, '-c-calendar-month__header-year')]//input"
+    YEAR_INPUT_LOCATOR = (
+        f"{CALENDAR_HEADER}//div[contains(@class, '-c-calendar-month__header-year')]//input"
+    )
     DATE_LOCATOR = ".//button[text()={date}]"
 
     PREV_BUTTON_LOCATOR = f"{CALENDAR_HEADER}//div[contains(@class, 'prev-month')]"
diff --git a/src/widgetastic_patternfly5/components/descriptionlist.py b/src/widgetastic_patternfly5/components/description_list.py
similarity index 100%
rename from src/widgetastic_patternfly5/components/descriptionlist.py
rename to src/widgetastic_patternfly5/components/description_list.py
diff --git a/src/widgetastic_patternfly5/components/duallistselector.py b/src/widgetastic_patternfly5/components/dual_list_selector.py
similarity index 100%
rename from src/widgetastic_patternfly5/components/duallistselector.py
rename to src/widgetastic_patternfly5/components/dual_list_selector.py
diff --git a/src/widgetastic_patternfly5/components/forms/formselect.py b/src/widgetastic_patternfly5/components/forms/form_select.py
similarity index 100%
rename from src/widgetastic_patternfly5/components/forms/formselect.py
rename to src/widgetastic_patternfly5/components/forms/form_select.py
diff --git a/src/widgetastic_patternfly5/components/menus/optionsmenu.py b/src/widgetastic_patternfly5/components/menus/options_menu.py
similarity index 100%
rename from src/widgetastic_patternfly5/components/menus/optionsmenu.py
rename to src/widgetastic_patternfly5/components/menus/options_menu.py
diff --git a/src/widgetastic_patternfly5/components/pagination.py b/src/widgetastic_patternfly5/components/pagination.py
index 62814e2..f8e6f49 100644
--- a/src/widgetastic_patternfly5/components/pagination.py
+++ b/src/widgetastic_patternfly5/components/pagination.py
@@ -8,7 +8,7 @@
 from widgetastic.widget import TextInput
 from widgetastic.widget import View
 
-from .menus.optionsmenu import OptionsMenu
+from .menus.options_menu import OptionsMenu
 
 
 class PaginationNavDisabled(Exception):
diff --git a/src/widgetastic_patternfly5/ouia.py b/src/widgetastic_patternfly5/ouia.py
index b74e7a7..def2ee6 100644
--- a/src/widgetastic_patternfly5/ouia.py
+++ b/src/widgetastic_patternfly5/ouia.py
@@ -9,7 +9,7 @@
 from widgetastic_patternfly5.components.breadcrumb import BaseBreadCrumb
 from widgetastic_patternfly5.components.button import BaseButton
 from widgetastic_patternfly5.components.card import BaseCard
-from widgetastic_patternfly5.components.forms.formselect import BaseFormSelect
+from widgetastic_patternfly5.components.forms.form_select import BaseFormSelect
 from widgetastic_patternfly5.components.menus.menu import BaseCheckboxMenu
 from widgetastic_patternfly5.components.menus.menu import BaseMenu
 from widgetastic_patternfly5.components.modal import BaseModal
diff --git a/testing/components/date_and_time/test_calendarmonth.py b/testing/components/date_and_time/test_calendar_month.py
similarity index 100%
rename from testing/components/date_and_time/test_calendarmonth.py
rename to testing/components/date_and_time/test_calendar_month.py
diff --git a/testing/components/forms/test_formselect.py b/testing/components/forms/test_form_select.py
similarity index 100%
rename from testing/components/forms/test_formselect.py
rename to testing/components/forms/test_form_select.py
diff --git a/testing/components/test_chipgroup.py b/testing/components/test_chip.py
similarity index 100%
rename from testing/components/test_chipgroup.py
rename to testing/components/test_chip.py
diff --git a/testing/components/test_clipboardcopy.py b/testing/components/test_clipboard_copy.py
similarity index 100%
rename from testing/components/test_clipboardcopy.py
rename to testing/components/test_clipboard_copy.py
diff --git a/testing/components/test_descriptionlist.py b/testing/components/test_description_list.py
similarity index 100%
rename from testing/components/test_descriptionlist.py
rename to testing/components/test_description_list.py
diff --git a/testing/components/test_duallistselector.py b/testing/components/test_dual_list_selector.py
similarity index 100%
rename from testing/components/test_duallistselector.py
rename to testing/components/test_dual_list_selector.py
diff --git a/testing/ouia/test_formselector_ouia.py b/testing/ouia/test_form_selector_ouia.py
similarity index 100%
rename from testing/ouia/test_formselector_ouia.py
rename to testing/ouia/test_form_selector_ouia.py