diff --git a/src/libcalamaresui/widgets/ClickableLabel.cpp b/src/libcalamaresui/widgets/ClickableLabel.cpp
index be7b142f1..8475a5aea 100644
--- a/src/libcalamaresui/widgets/ClickableLabel.cpp
+++ b/src/libcalamaresui/widgets/ClickableLabel.cpp
@@ -13,7 +13,8 @@
 
 namespace Calamares
 {
-
+namespace Widgets
+{
 
 ClickableLabel::ClickableLabel( QWidget* parent )
     : QLabel( parent )
@@ -47,5 +48,5 @@ ClickableLabel::mouseReleaseEvent( QMouseEvent* event )
         emit clicked();
     }
 }
-
+}  // namespace Widgets
 }  // namespace Calamares
diff --git a/src/libcalamaresui/widgets/ClickableLabel.h b/src/libcalamaresui/widgets/ClickableLabel.h
index 8c5561677..259f4a71f 100644
--- a/src/libcalamaresui/widgets/ClickableLabel.h
+++ b/src/libcalamaresui/widgets/ClickableLabel.h
@@ -8,8 +8,8 @@
  *
  */
 
-#ifndef LIBCALAMARESUI_CLICKABLELABEL_H
-#define LIBCALAMARESUI_CLICKABLELABEL_H
+#ifndef LIBCALAMARESUI_WIDGETS_CLICKABLELABEL_H
+#define LIBCALAMARESUI_WIDGETS_CLICKABLELABEL_H
 
 #include <QElapsedTimer>
 #include <QLabel>
@@ -18,7 +18,8 @@
 
 namespace Calamares
 {
-
+namespace Widgets
+{
 /** @brief A Label where the whole label area is clickable
  *
  * When clicking anywhere on the Label (text, background, whatever)
@@ -44,7 +45,7 @@ protected:
 private:
     QElapsedTimer m_time;
 };
-
+}  // namespace Widgets
 }  // namespace Calamares
 
-#endif  // LIBCALAMARESUI_CLICKABLELABEL_H
+#endif  // LIBCALAMARESUI_WIDGETS_CLICKABLELABEL_H
diff --git a/src/libcalamaresui/widgets/PrettyRadioButton.cpp b/src/libcalamaresui/widgets/PrettyRadioButton.cpp
index b79f93a25..62e462a58 100644
--- a/src/libcalamaresui/widgets/PrettyRadioButton.cpp
+++ b/src/libcalamaresui/widgets/PrettyRadioButton.cpp
@@ -20,6 +20,8 @@
 
 namespace Calamares
 {
+namespace Widgets
+{
 
 PrettyRadioButton::PrettyRadioButton( QWidget* parent )
     : QWidget( parent )
@@ -124,5 +126,5 @@ PrettyRadioButton::toggleOptions( bool toggle )
         m_optionsLayout->parentWidget()->setVisible( toggle );
     }
 }
-
+}  // namespace Widgets
 }  // namespace Calamares
diff --git a/src/libcalamaresui/widgets/PrettyRadioButton.h b/src/libcalamaresui/widgets/PrettyRadioButton.h
index 1874457a8..fd00911e1 100644
--- a/src/libcalamaresui/widgets/PrettyRadioButton.h
+++ b/src/libcalamaresui/widgets/PrettyRadioButton.h
@@ -7,8 +7,8 @@
  *
  */
 
-#ifndef LIBCALAMARESUI_PRETTYRADIOBUTTON_H
-#define LIBCALAMARESUI_PRETTYRADIOBUTTON_H
+#ifndef LIBCALAMARESUI_WIDGETS_PRETTYRADIOBUTTON_H
+#define LIBCALAMARESUI_WIDGETS_PRETTYRADIOBUTTON_H
 
 #include "DllMacro.h"
 
@@ -21,6 +21,8 @@ class QHBoxLayout;
 
 namespace Calamares
 {
+namespace Widgets
+{
 class ClickableLabel;
 
 /** @brief A radio button with fancy label next to it.
@@ -72,6 +74,6 @@ protected:
     QGridLayout* m_mainLayout;
     QHBoxLayout* m_optionsLayout;
 };
-
+}  // namespace Widgets
 }  // namespace Calamares
-#endif  // LIBCALAMARESUI_PRETTYRADIOBUTTON_H
+#endif  // LIBCALAMARESUI_WIDGETS_PRETTYRADIOBUTTON_H
diff --git a/src/modules/partition/gui/ChoicePage.cpp b/src/modules/partition/gui/ChoicePage.cpp
index dd15fee7e..bf7c6e02c 100644
--- a/src/modules/partition/gui/ChoicePage.cpp
+++ b/src/modules/partition/gui/ChoicePage.cpp
@@ -54,7 +54,7 @@
 #include <QListView>
 #include <QtConcurrent/QtConcurrent>
 
-using Calamares::PrettyRadioButton;
+using Calamares::Widgets::PrettyRadioButton;
 using CalamaresUtils::Partition::findPartitionByPath;
 using CalamaresUtils::Partition::isPartitionFreeSpace;
 using CalamaresUtils::Partition::PartitionIterator;
diff --git a/src/modules/partition/gui/ChoicePage.h b/src/modules/partition/gui/ChoicePage.h
index d1699200a..ea346f5ad 100644
--- a/src/modules/partition/gui/ChoicePage.h
+++ b/src/modules/partition/gui/ChoicePage.h
@@ -30,8 +30,11 @@ class QListView;
 
 namespace Calamares
 {
+namespace Widgets
+{
 class PrettyRadioButton;
 }
+}  // namespace Calamares
 
 class Config;
 class DeviceInfoWidget;
@@ -142,10 +145,10 @@ private:
     QComboBox* m_drivesCombo;
 
     QButtonGroup* m_grp;
-    Calamares::PrettyRadioButton* m_alongsideButton;
-    Calamares::PrettyRadioButton* m_eraseButton;
-    Calamares::PrettyRadioButton* m_replaceButton;
-    Calamares::PrettyRadioButton* m_somethingElseButton;
+    Calamares::Widgets::PrettyRadioButton* m_alongsideButton;
+    Calamares::Widgets::PrettyRadioButton* m_eraseButton;
+    Calamares::Widgets::PrettyRadioButton* m_replaceButton;
+    Calamares::Widgets::PrettyRadioButton* m_somethingElseButton;
     QComboBox* m_eraseSwapChoiceComboBox = nullptr;  // UI, see also Config's swap choice
     QComboBox* m_eraseFsTypesChoiceComboBox = nullptr;  // UI, see also Config's erase-mode FS