diff --git a/src/calamares/CalamaresApplication.cpp b/src/calamares/CalamaresApplication.cpp
index 67c239448..76af2806d 100644
--- a/src/calamares/CalamaresApplication.cpp
+++ b/src/calamares/CalamaresApplication.cpp
@@ -58,10 +58,9 @@ CalamaresApplication::CalamaresApplication( int& argc, char* argv[] )
     setApplicationVersion( QStringLiteral( CALAMARES_VERSION ) );
 
     QFont f = font();
-    CalamaresUtils::setDefaultFontSize( f.pointSize() );
+    Calamares::setDefaultFontSize( f.pointSize() );
 }
 
-
 void
 CalamaresApplication::init()
 {
@@ -77,7 +76,7 @@ CalamaresApplication::init()
     initQmlPath();
     initBranding();
 
-    CalamaresUtils::installTranslator();
+    Calamares::installTranslator();
 
     setQuitOnLastWindowClosed( false );
     setWindowIcon( QIcon( Calamares::Branding::instance()->imagePath( Calamares::Branding::ProductIcon ) ) );
@@ -89,35 +88,31 @@ CalamaresApplication::init()
     cDebug() << Logger::SubEntry << "STARTUP: initModuleManager: module init started";
 }
 
-
 CalamaresApplication::~CalamaresApplication()
 {
     Logger::CDebug( Logger::LOGVERBOSE ) << "Shutting down Calamares...";
     Logger::CDebug( Logger::LOGVERBOSE ) << Logger::SubEntry << "Finished shutdown.";
 }
 
-
 CalamaresApplication*
 CalamaresApplication::instance()
 {
     return qobject_cast< CalamaresApplication* >( QApplication::instance() );
 }
 
-
 CalamaresWindow*
 CalamaresApplication::mainWindow()
 {
     return m_mainwindow;
 }
 
-
 static QStringList
 brandingFileCandidates( bool assumeBuilddir, const QString& brandingFilename )
 {
     QStringList brandingPaths;
-    if ( CalamaresUtils::isAppDataDirOverridden() )
+    if ( Calamares::isAppDataDirOverridden() )
     {
-        brandingPaths << CalamaresUtils::appDataDir().absoluteFilePath( brandingFilename );
+        brandingPaths << Calamares::appDataDir().absoluteFilePath( brandingFilename );
     }
     else
     {
@@ -125,31 +120,29 @@ brandingFileCandidates( bool assumeBuilddir, const QString& brandingFilename )
         {
             brandingPaths << ( QDir::currentPath() + QStringLiteral( "/src/" ) + brandingFilename );
         }
-        if ( CalamaresUtils::haveExtraDirs() )
-            for ( auto s : CalamaresUtils::extraDataDirs() )
+        if ( Calamares::haveExtraDirs() )
+            for ( auto s : Calamares::extraDataDirs() )
             {
                 brandingPaths << ( s + brandingFilename );
             }
         brandingPaths << QDir( CMAKE_INSTALL_FULL_SYSCONFDIR "/calamares/" ).absoluteFilePath( brandingFilename );
-        brandingPaths << CalamaresUtils::appDataDir().absoluteFilePath( brandingFilename );
+        brandingPaths << Calamares::appDataDir().absoluteFilePath( brandingFilename );
     }
 
     return brandingPaths;
 }
 
-
 void
 CalamaresApplication::initQmlPath()
 {
 #ifdef WITH_QML
-    if ( !CalamaresUtils::initQmlModulesDir() )
+    if ( !Calamares::initQmlModulesDir() )
     {
         ::exit( EXIT_FAILURE );
     }
 #endif
 }
 
-
 void
 CalamaresApplication::initBranding()
 {
@@ -181,7 +174,7 @@ CalamaresApplication::initBranding()
     {
         cError() << "Cowardly refusing to continue startup without branding."
                  << Logger::DebugList( brandingFileCandidatesByPriority );
-        if ( CalamaresUtils::isAppDataDirOverridden() )
+        if ( Calamares::isAppDataDirOverridden() )
         {
             cError() << "FATAL: explicitly configured application data directory is missing" << brandingComponentName;
         }
@@ -195,7 +188,6 @@ CalamaresApplication::initBranding()
     new Calamares::Branding( brandingFile.absoluteFilePath(), this, devicePixelRatio() );
 }
 
-
 void
 CalamaresApplication::initModuleManager()
 {
@@ -262,7 +254,6 @@ CalamaresApplication::initView()
     cDebug() << "STARTUP: CalamaresWindow created; loadModules started";
 }
 
-
 void
 CalamaresApplication::initViewSteps()
 {
@@ -294,6 +285,6 @@ void
 CalamaresApplication::initJobQueue()
 {
     Calamares::JobQueue* jobQueue = new Calamares::JobQueue( this );
-    new CalamaresUtils::System( Calamares::Settings::instance()->doChroot(), this );
+    new Calamares::System( Calamares::Settings::instance()->doChroot(), this );
     Calamares::Branding::instance()->setGlobals( jobQueue->globalStorage() );
 }
diff --git a/src/calamares/CalamaresWindow.cpp b/src/calamares/CalamaresWindow.cpp
index e421de83c..ea14175f2 100644
--- a/src/calamares/CalamaresWindow.cpp
+++ b/src/calamares/CalamaresWindow.cpp
@@ -64,7 +64,7 @@ windowDimensionToPixels( const Calamares::Branding::WindowDimension& u )
     }
     if ( u.unit() == Calamares::Branding::WindowDimensionUnit::Fonties )
     {
-        return static_cast< int >( u.value() * CalamaresUtils::defaultFontHeight() );
+        return static_cast< int >( u.value() * Calamares::defaultFontHeight() );
     }
     return 0;
 }
@@ -145,15 +145,14 @@ getWidgetSidebar( Calamares::DebugWindowManager* debug,
     QHBoxLayout* extraButtons = new QHBoxLayout;
     sideLayout->addLayout( extraButtons );
 
-    const int defaultFontHeight = CalamaresUtils::defaultFontHeight();
+    const int defaultFontHeight = Calamares::defaultFontHeight();
 
     if ( /* About-Calamares Button enabled */ true )
     {
         QPushButton* aboutDialog = new QPushButton;
         aboutDialog->setObjectName( "aboutButton" );
-        aboutDialog->setIcon( CalamaresUtils::defaultPixmap( CalamaresUtils::Information,
-                                                             CalamaresUtils::Original,
-                                                             2 * QSize( defaultFontHeight, defaultFontHeight ) ) );
+        aboutDialog->setIcon( Calamares::defaultPixmap(
+            Calamares::Information, Calamares::Original, 2 * QSize( defaultFontHeight, defaultFontHeight ) ) );
         CALAMARES_RETRANSLATE_FOR(
             aboutDialog, aboutDialog->setText( QCoreApplication::translate( "calamares-sidebar", "About" ) );
             aboutDialog->setToolTip(
@@ -167,8 +166,8 @@ getWidgetSidebar( Calamares::DebugWindowManager* debug,
     {
         QPushButton* debugWindowBtn = new QPushButton;
         debugWindowBtn->setObjectName( "debugButton" );
-        debugWindowBtn->setIcon( CalamaresUtils::defaultPixmap(
-            CalamaresUtils::Bugs, CalamaresUtils::Original, 2 * QSize( defaultFontHeight, defaultFontHeight ) ) );
+        debugWindowBtn->setIcon( Calamares::defaultPixmap(
+            Calamares::Bugs, Calamares::Original, 2 * QSize( defaultFontHeight, defaultFontHeight ) ) );
         CALAMARES_RETRANSLATE_FOR(
             debugWindowBtn, debugWindowBtn->setText( QCoreApplication::translate( "calamares-sidebar", "Debug" ) );
             debugWindowBtn->setToolTip(
@@ -181,7 +180,7 @@ getWidgetSidebar( Calamares::DebugWindowManager* debug,
             debug, &Calamares::DebugWindowManager::visibleChanged, debugWindowBtn, &QPushButton::setChecked );
     }
 
-    CalamaresUtils::unmarginLayout( sideLayout );
+    Calamares::unmarginLayout( sideLayout );
     return sideBox;
 }
 
@@ -276,7 +275,6 @@ setDimension( QQuickWidget* w, Qt::Orientation o, int desiredWidth )
     w->setResizeMode( QQuickWidget::SizeRootObjectToView );
 }
 
-
 static QWidget*
 getQmlSidebar( Calamares::DebugWindowManager* debug,
                Calamares::ViewManager*,
@@ -284,15 +282,15 @@ getQmlSidebar( Calamares::DebugWindowManager* debug,
                Qt::Orientation o,
                int desiredWidth )
 {
-    CalamaresUtils::registerQmlModels();
+    Calamares::registerQmlModels();
     QQuickWidget* w = new QQuickWidget( parent );
     if ( debug )
     {
         w->engine()->rootContext()->setContextProperty( "debug", debug );
     }
 
-    w->setSource( QUrl(
-        CalamaresUtils::searchQmlFile( CalamaresUtils::QmlSearch::Both, QStringLiteral( "calamares-sidebar" ) ) ) );
+    w->setSource(
+        QUrl( Calamares::searchQmlFile( Calamares::QmlSearch::Both, QStringLiteral( "calamares-sidebar" ) ) ) );
     setDimension( w, o, desiredWidth );
     return w;
 }
@@ -304,14 +302,14 @@ getQmlNavigation( Calamares::DebugWindowManager* debug,
                   Qt::Orientation o,
                   int desiredWidth )
 {
-    CalamaresUtils::registerQmlModels();
+    Calamares::registerQmlModels();
     QQuickWidget* w = new QQuickWidget( parent );
     if ( debug )
     {
         w->engine()->rootContext()->setContextProperty( "debug", debug );
     }
-    w->setSource( QUrl(
-        CalamaresUtils::searchQmlFile( CalamaresUtils::QmlSearch::Both, QStringLiteral( "calamares-navigation" ) ) ) );
+    w->setSource(
+        QUrl( Calamares::searchQmlFile( Calamares::QmlSearch::Both, QStringLiteral( "calamares-navigation" ) ) ) );
     setDimension( w, o, desiredWidth );
     return w;
 }
@@ -392,7 +390,7 @@ CalamaresWindow::CalamaresWindow( QWidget* parent )
     , m_debugManager( new Calamares::DebugWindowManager( this ) )
     , m_viewManager( nullptr )
 {
-    installEventFilter( CalamaresUtils::Retranslator::instance() );
+    installEventFilter( Calamares::Retranslator::instance() );
 
     // If we can never cancel, don't show the window-close button
     if ( Calamares::Settings::instance()->disableCancel() )
@@ -408,10 +406,10 @@ CalamaresWindow::CalamaresWindow( QWidget* parent )
     const Calamares::Branding* const branding = Calamares::Branding::instance();
     using ImageEntry = Calamares::Branding::ImageEntry;
 
-    using CalamaresUtils::windowMinimumHeight;
-    using CalamaresUtils::windowMinimumWidth;
-    using CalamaresUtils::windowPreferredHeight;
-    using CalamaresUtils::windowPreferredWidth;
+    using Calamares::windowMinimumHeight;
+    using Calamares::windowMinimumWidth;
+    using Calamares::windowPreferredHeight;
+    using Calamares::windowPreferredWidth;
 
     using PanelSide = Calamares::Branding::PanelSide;
 
@@ -438,7 +436,7 @@ CalamaresWindow::CalamaresWindow( QWidget* parent )
     {
         QWidget* label = new QWidget( this );
         QVBoxLayout* l = new QVBoxLayout;
-        CalamaresUtils::unmarginLayout( l );
+        Calamares::unmarginLayout( l );
         l->addWidget( label );
         setLayout( l );
         label->setObjectName( "backgroundWidget" );
@@ -467,14 +465,14 @@ CalamaresWindow::CalamaresWindow( QWidget* parent )
     QBoxLayout* contentsLayout = new QVBoxLayout;
     contentsLayout->setSpacing( 0 );
 
-    QWidget* sideBox = flavoredWidget(
-        branding->sidebarFlavor(),
-        ::orientation( branding->sidebarSide() ),
-        m_debugManager,
-        baseWidget,
-        ::getWidgetSidebar,
-        ::getQmlSidebar,
-        qBound( 100, CalamaresUtils::defaultFontHeight() * 12, w < windowPreferredWidth ? 100 : 190 ) );
+    QWidget* sideBox
+        = flavoredWidget( branding->sidebarFlavor(),
+                          ::orientation( branding->sidebarSide() ),
+                          m_debugManager,
+                          baseWidget,
+                          ::getWidgetSidebar,
+                          ::getQmlSidebar,
+                          qBound( 100, Calamares::defaultFontHeight() * 12, w < windowPreferredWidth ? 100 : 190 ) );
     QWidget* navigation = flavoredWidget( branding->navigationFlavor(),
                                           ::orientation( branding->navigationSide() ),
                                           m_debugManager,
@@ -506,8 +504,8 @@ CalamaresWindow::CalamaresWindow( QWidget* parent )
         ( contentsLayout->count() > 1 ? Qt::Orientations( Qt::Horizontal ) : Qt::Orientations() )
         | ( mainLayout->count() > 1 ? Qt::Orientations( Qt::Vertical ) : Qt::Orientations() ) );
 
-    CalamaresUtils::unmarginLayout( mainLayout );
-    CalamaresUtils::unmarginLayout( contentsLayout );
+    Calamares::unmarginLayout( mainLayout );
+    Calamares::unmarginLayout( contentsLayout );
     baseWidget->setLayout( mainLayout );
     setStyleSheet( Calamares::Branding::instance()->stylesheet() );
 }
diff --git a/src/calamares/DebugWindow.cpp b/src/calamares/DebugWindow.cpp
index 826696b4f..7be761ea1 100644
--- a/src/calamares/DebugWindow.cpp
+++ b/src/calamares/DebugWindow.cpp
@@ -158,13 +158,12 @@ DebugWindow::DebugWindow()
              } );
 
     // Send Log button only if it would be useful
-    m_ui->sendLogButton->setVisible( CalamaresUtils::Paste::isEnabled() );
-    connect( m_ui->sendLogButton, &QPushButton::clicked, [ this ]() { CalamaresUtils::Paste::doLogUploadUI( this ); } );
+    m_ui->sendLogButton->setVisible( Calamares::Paste::isEnabled() );
+    connect( m_ui->sendLogButton, &QPushButton::clicked, [ this ]() { Calamares::Paste::doLogUploadUI( this ); } );
 
     CALAMARES_RETRANSLATE( m_ui->retranslateUi( this ); setWindowTitle( tr( "Debug information" ) ); );
 }
 
-
 void
 DebugWindow::closeEvent( QCloseEvent* e )
 {
@@ -172,13 +171,11 @@ DebugWindow::closeEvent( QCloseEvent* e )
     emit closed();
 }
 
-
 DebugWindowManager::DebugWindowManager( QObject* parent )
     : QObject( parent )
 {
 }
 
-
 bool
 DebugWindowManager::enabled() const
 {
@@ -186,7 +183,6 @@ DebugWindowManager::enabled() const
     return ( Logger::logLevel() >= Logger::LOGVERBOSE ) || ( s ? s->debugMode() : false );
 }
 
-
 void
 DebugWindowManager::show( bool visible )
 {
@@ -244,14 +240,14 @@ DebugWindowManager::about()
                     QMessageBox::Ok,
                     nullptr );
     Calamares::fixButtonLabels( &mb );
-    mb.setIconPixmap( CalamaresUtils::defaultPixmap(
-        CalamaresUtils::Squid,
-        CalamaresUtils::Original,
-        QSize( CalamaresUtils::defaultFontHeight() * 6, CalamaresUtils::defaultFontHeight() * 6 ) ) );
+    mb.setIconPixmap(
+        Calamares::defaultPixmap( Calamares::Squid,
+                                  Calamares::Original,
+                                  QSize( Calamares::defaultFontHeight() * 6, Calamares::defaultFontHeight() * 6 ) ) );
     QGridLayout* layout = reinterpret_cast< QGridLayout* >( mb.layout() );
     if ( layout )
     {
-        layout->setColumnMinimumWidth( 2, CalamaresUtils::defaultFontHeight() * 24 );
+        layout->setColumnMinimumWidth( 2, Calamares::defaultFontHeight() * 24 );
     }
     mb.exec();
 }
diff --git a/src/calamares/main.cpp b/src/calamares/main.cpp
index 2b049bdd1..e0491e5f9 100644
--- a/src/calamares/main.cpp
+++ b/src/calamares/main.cpp
@@ -8,7 +8,6 @@
  *
  */
 
-
 #include "CalamaresApplication.h"
 
 #include "Settings.h"
@@ -93,13 +92,13 @@ handle_args( CalamaresApplication& a )
     Logger::setupLogLevel( parser.isSet( debugOption ) ? Logger::LOGVERBOSE : debug_level( parser, debugLevelOption ) );
     if ( parser.isSet( configOption ) )
     {
-        CalamaresUtils::setAppDataDir( QDir( parser.value( configOption ) ) );
+        Calamares::setAppDataDir( QDir( parser.value( configOption ) ) );
     }
     if ( parser.isSet( xdgOption ) )
     {
-        CalamaresUtils::setXdgDirs();
+        Calamares::setXdgDirs();
     }
-    CalamaresUtils::setAllowLocalTranslation( parser.isSet( debugOption ) || parser.isSet( debugTxOption ) );
+    Calamares::setAllowLocalTranslation( parser.isSet( debugOption ) || parser.isSet( debugTxOption ) );
 
     return parser.isSet( debugOption );
 }
diff --git a/src/calamares/progresstree/ProgressTreeDelegate.cpp b/src/calamares/progresstree/ProgressTreeDelegate.cpp
index 2117a28ae..3b6ae518c 100644
--- a/src/calamares/progresstree/ProgressTreeDelegate.cpp
+++ b/src/calamares/progresstree/ProgressTreeDelegate.cpp
@@ -22,7 +22,7 @@ static constexpr int const item_margin = 8;
 static inline int
 item_fontsize()
 {
-    return CalamaresUtils::defaultFontSize() + 4;
+    return Calamares::defaultFontSize() + 4;
 }
 
 static void
@@ -49,7 +49,6 @@ paintViewStep( QPainter* painter, const QStyleOptionViewItem& option, const QMod
         }
     }
 
-
     // Draw the text at least once. If it doesn't fit, then shrink the font
     // being used by 1 pt on each iteration, up to a maximum of maximumShrink
     // times. On each loop, we'll have to blank out the rectangle again, so this
@@ -100,7 +99,6 @@ ProgressTreeDelegate::sizeHint( const QStyleOptionViewItem& option, const QModel
     return QSize( option.rect.width(), height );
 }
 
-
 void
 ProgressTreeDelegate::paint( QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index ) const
 {
diff --git a/src/calamares/testmain.cpp b/src/calamares/testmain.cpp
index 87d90c882..a2175b7d4 100644
--- a/src/calamares/testmain.cpp
+++ b/src/calamares/testmain.cpp
@@ -38,7 +38,6 @@
 #include "utils/Qml.h"
 #endif
 
-
 #include <QApplication>
 #include <QCommandLineOption>
 #include <QCommandLineParser>
@@ -241,7 +240,6 @@ ExecViewModule::type() const
     return Module::Type::View;
 }
 
-
 Calamares::Module::Interface
 ExecViewModule::interface() const
 {
@@ -304,7 +302,7 @@ load_module( const ModuleConfig& moduleConfig )
         fi = QFileInfo( prefix + moduleName );
         if ( fi.exists() && fi.isFile() )
         {
-            descriptor = CalamaresUtils::loadYaml( fi, &ok );
+            descriptor = Calamares::YAML::load( fi, &ok );
         }
         if ( ok )
         {
@@ -318,7 +316,7 @@ load_module( const ModuleConfig& moduleConfig )
             fi = QFileInfo( prefix + moduleName + "/module.desc" );
             if ( fi.exists() && fi.isFile() )
             {
-                descriptor = CalamaresUtils::loadYaml( fi, &ok );
+                descriptor = Calamares::YAML::load( fi, &ok );
             }
             if ( ok )
             {
@@ -478,7 +476,7 @@ main( int argc, char* argv[] )
     }
 #endif
 #ifdef WITH_QML
-    CalamaresUtils::initQmlModulesDir();  // don't care if failed
+    Calamares::initQmlModulesDir();  // don't care if failed
 #endif
 
     cDebug() << "Calamares module-loader testing" << module.moduleName();
@@ -505,7 +503,7 @@ main( int argc, char* argv[] )
         mw = module.m_ui ? new QMainWindow() : nullptr;
         if ( mw )
         {
-            mw->installEventFilter( CalamaresUtils::Retranslator::instance() );
+            mw->installEventFilter( Calamares::Retranslator::instance() );
         }
 
         (void)new Calamares::Branding( module.m_branding );
diff --git a/src/libcalamares/GlobalStorage.cpp b/src/libcalamares/GlobalStorage.cpp
index 6064a9fdb..717b8fff7 100644
--- a/src/libcalamares/GlobalStorage.cpp
+++ b/src/libcalamares/GlobalStorage.cpp
@@ -20,7 +20,7 @@
 #include <QFile>
 #include <QJsonDocument>
 
-using namespace CalamaresUtils::Units;
+using namespace Calamares::Units;
 
 namespace Calamares
 {
@@ -52,7 +52,6 @@ GlobalStorage::GlobalStorage( QObject* parent )
 {
 }
 
-
 bool
 GlobalStorage::contains( const QString& key ) const
 {
@@ -60,7 +59,6 @@ GlobalStorage::contains( const QString& key ) const
     return m.contains( key );
 }
 
-
 int
 GlobalStorage::count() const
 {
@@ -68,7 +66,6 @@ GlobalStorage::count() const
     return m.count();
 }
 
-
 void
 GlobalStorage::insert( const QString& key, const QVariant& value )
 {
@@ -76,7 +73,6 @@ GlobalStorage::insert( const QString& key, const QVariant& value )
     m.insert( key, value );
 }
 
-
 QStringList
 GlobalStorage::keys() const
 {
@@ -84,7 +80,6 @@ GlobalStorage::keys() const
     return m.keys();
 }
 
-
 int
 GlobalStorage::remove( const QString& key )
 {
@@ -93,7 +88,6 @@ GlobalStorage::remove( const QString& key )
     return nItems;
 }
 
-
 QVariant
 GlobalStorage::value( const QString& key ) const
 {
@@ -166,14 +160,14 @@ bool
 GlobalStorage::saveYaml( const QString& filename ) const
 {
     ReadLock l( this );
-    return CalamaresUtils::saveYaml( filename, m );
+    return Calamares::YAML::save( filename, m );
 }
 
 bool
 GlobalStorage::loadYaml( const QString& filename )
 {
     bool ok = false;
-    auto map = CalamaresUtils::loadYaml( filename, &ok );
+    auto map = Calamares::YAML::load( filename, &ok );
     if ( ok )
     {
         WriteLock l( this );
@@ -189,5 +183,4 @@ GlobalStorage::loadYaml( const QString& filename )
     return false;
 }
 
-
 }  // namespace Calamares
diff --git a/src/libcalamares/ProcessJob.cpp b/src/libcalamares/ProcessJob.cpp
index da4edd7c2..1dbc087cf 100644
--- a/src/libcalamares/ProcessJob.cpp
+++ b/src/libcalamares/ProcessJob.cpp
@@ -18,7 +18,6 @@
 namespace Calamares
 {
 
-
 ProcessJob::ProcessJob( const QString& command,
                         const QString& workingPath,
                         bool runInChroot,
@@ -32,31 +31,27 @@ ProcessJob::ProcessJob( const QString& command,
 {
 }
 
-
 ProcessJob::~ProcessJob() {}
 
-
 QString
 ProcessJob::prettyName() const
 {
     return ( m_runInChroot ? tr( "Run command '%1' in target system." ) : tr( " Run command '%1'." ) ).arg( m_command );
 }
 
-
 QString
 ProcessJob::prettyStatusMessage() const
 {
     return tr( "Running command %1 %2" ).arg( m_command ).arg( m_runInChroot ? "in chroot." : " ." );
 }
 
-
 JobResult
 ProcessJob::exec()
 {
-    using CalamaresUtils::System;
+    using Calamares::System;
 
     if ( m_runInChroot )
-        return CalamaresUtils::System::instance()
+        return Calamares::System::instance()
             ->targetEnvCommand( { m_command }, m_workingPath, QString(), m_timeoutSec )
             .explainProcess( m_command, m_timeoutSec );
     else
diff --git a/src/libcalamares/PythonHelper.cpp b/src/libcalamares/PythonHelper.cpp
index e9e2b136c..5a8b5fadb 100644
--- a/src/libcalamares/PythonHelper.cpp
+++ b/src/libcalamares/PythonHelper.cpp
@@ -23,7 +23,6 @@ namespace bp = boost::python;
 namespace CalamaresPython
 {
 
-
 boost::python::object
 variantToPyObject( const QVariant& variant )
 {
@@ -86,7 +85,6 @@ variantToPyObject( const QVariant& variant )
 #endif
 }
 
-
 QVariant
 variantFromPyObject( const boost::python::object& pyObject )
 {
@@ -127,7 +125,6 @@ variantFromPyObject( const boost::python::object& pyObject )
     }
 }
 
-
 boost::python::list
 variantListToPyList( const QVariantList& variantList )
 {
@@ -139,7 +136,6 @@ variantListToPyList( const QVariantList& variantList )
     return pyList;
 }
 
-
 QVariantList
 variantListFromPyList( const boost::python::list& pyList )
 {
@@ -151,7 +147,6 @@ variantListFromPyList( const boost::python::list& pyList )
     return list;
 }
 
-
 boost::python::dict
 variantMapToPyDict( const QVariantMap& variantMap )
 {
@@ -163,7 +158,6 @@ variantMapToPyDict( const QVariantMap& variantMap )
     return pyDict;
 }
 
-
 QVariantMap
 variantMapFromPyDict( const boost::python::dict& pyDict )
 {
@@ -198,7 +192,6 @@ variantHashToPyDict( const QVariantHash& variantHash )
     return pyDict;
 }
 
-
 QVariantHash
 variantHashFromPyDict( const boost::python::dict& pyDict )
 {
@@ -222,7 +215,6 @@ variantHashFromPyDict( const boost::python::dict& pyDict )
     return hash;
 }
 
-
 static inline void
 add_if_lib_exists( const QDir& dir, const char* name, QStringList& list )
 {
@@ -253,7 +245,7 @@ Helper::Helper()
     // If we're running from the build dir
     add_if_lib_exists( QDir::current(), "libcalamares.so", m_pythonPaths );
 
-    QDir calaPythonPath( CalamaresUtils::systemLibDir().absolutePath() + QDir::separator() + "calamares" );
+    QDir calaPythonPath( Calamares::systemLibDir().absolutePath() + QDir::separator() + "calamares" );
     add_if_lib_exists( calaPythonPath, "libcalamares.so", m_pythonPaths );
 
     bp::object sys = bp::import( "sys" );
@@ -290,7 +282,6 @@ Helper::createCleanNamespace()
     return scriptNamespace;
 }
 
-
 QString
 Helper::handleLastError()
 {
@@ -385,7 +376,6 @@ Helper::handleLastError()
         return tr( "Unfetchable Python error." );
     }
 
-
     QStringList msgList;
     if ( !typeMsg.isEmpty() )
     {
@@ -429,14 +419,12 @@ GlobalStoragePythonWrapper::contains( const std::string& key ) const
     return m_gs->contains( QString::fromStdString( key ) );
 }
 
-
 int
 GlobalStoragePythonWrapper::count() const
 {
     return m_gs->count();
 }
 
-
 void
 GlobalStoragePythonWrapper::insert( const std::string& key, const bp::object& value )
 {
@@ -455,7 +443,6 @@ GlobalStoragePythonWrapper::keys() const
     return pyList;
 }
 
-
 int
 GlobalStoragePythonWrapper::remove( const std::string& key )
 {
@@ -467,7 +454,6 @@ GlobalStoragePythonWrapper::remove( const std::string& key )
     return m_gs->remove( gsKey );
 }
 
-
 bp::object
 GlobalStoragePythonWrapper::value( const std::string& key ) const
 {
diff --git a/src/libcalamares/PythonJobApi.cpp b/src/libcalamares/PythonJobApi.cpp
index 50a8e82aa..53f905014 100644
--- a/src/libcalamares/PythonJobApi.cpp
+++ b/src/libcalamares/PythonJobApi.cpp
@@ -29,7 +29,7 @@
 namespace bp = boost::python;
 
 static int
-handle_check_target_env_call_error( const CalamaresUtils::ProcessResult& ec, const QString& cmd )
+handle_check_target_env_call_error( const Calamares::ProcessResult& ec, const QString& cmd )
 {
     if ( !ec.first )
     {
@@ -61,12 +61,12 @@ bp_list_to_qstringlist( const bp::list& args )
     return list;
 }
 
-static inline CalamaresUtils::ProcessResult
+static inline Calamares::ProcessResult
 target_env_command( const QStringList& args, const std::string& input, int timeout )
 {
     // Since Python doesn't give us the type system for distinguishing
     // seconds from other integral types, massage to seconds here.
-    return CalamaresUtils::System::instance()->targetEnvCommand(
+    return Calamares::System::instance()->targetEnvCommand(
         args, QString(), QString::fromStdString( input ), std::chrono::seconds( timeout ) );
 }
 
@@ -80,9 +80,9 @@ mount( const std::string& device_path,
        const std::string& options )
 {
     return Calamares::Partition::mount( QString::fromStdString( device_path ),
-                                             QString::fromStdString( mount_point ),
-                                             QString::fromStdString( filesystem_name ),
-                                             QString::fromStdString( options ) );
+                                        QString::fromStdString( mount_point ),
+                                        QString::fromStdString( filesystem_name ),
+                                        QString::fromStdString( options ) );
 }
 
 int
@@ -91,14 +91,12 @@ target_env_call( const std::string& command, const std::string& input, int timeo
     return target_env_command( QStringList { QString::fromStdString( command ) }, input, timeout ).first;
 }
 
-
 int
 target_env_call( const bp::list& args, const std::string& input, int timeout )
 {
     return target_env_command( bp_list_to_qstringlist( args ), input, timeout ).first;
 }
 
-
 int
 check_target_env_call( const std::string& command, const std::string& input, int timeout )
 {
@@ -106,7 +104,6 @@ check_target_env_call( const std::string& command, const std::string& input, int
     return handle_check_target_env_call_error( ec, QString::fromStdString( command ) );
 }
 
-
 int
 check_target_env_call( const bp::list& args, const std::string& input, int timeout )
 {
@@ -120,7 +117,6 @@ check_target_env_call( const bp::list& args, const std::string& input, int timeo
     return handle_check_target_env_call_error( ec, failedCmdList.join( ' ' ) );
 }
 
-
 std::string
 check_target_env_output( const std::string& command, const std::string& input, int timeout )
 {
@@ -129,7 +125,6 @@ check_target_env_output( const std::string& command, const std::string& input, i
     return ec.second.toStdString();
 }
 
-
 std::string
 check_target_env_output( const bp::list& args, const std::string& input, int timeout )
 {
@@ -169,7 +164,7 @@ load_yaml( const std::string& path )
 {
     const QString filePath = QString::fromStdString( path );
     bool ok = false;
-    auto map = CalamaresUtils::loadYaml( filePath, &ok );
+    auto map = Calamares::YAML::load( filePath, &ok );
     if ( !ok )
     {
         cWarning() << "Loading YAML from" << filePath << "failed.";
@@ -177,7 +172,6 @@ load_yaml( const std::string& path )
     return variantMapToPyDict( map );
 }
 
-
 PythonJobInterface::PythonJobInterface( Calamares::PythonJob* parent )
     : m_parent( parent )
 {
@@ -188,7 +182,6 @@ PythonJobInterface::PythonJobInterface( Calamares::PythonJob* parent )
     configuration = CalamaresPython::variantMapToPyDict( m_parent->m_configurationMap );
 }
 
-
 void
 PythonJobInterface::setprogress( qreal progress )
 {
@@ -259,7 +252,6 @@ host_env_process_output( const boost::python::list& args,
     return _process_output( Calamares::Utils::RunLocation::RunInHost, args, callback, input, timeout );
 }
 
-
 std::string
 obscure( const std::string& string )
 {
@@ -369,5 +361,4 @@ gettext_path()
     return bp::object();  // None
 }
 
-
 }  // namespace CalamaresPython
diff --git a/src/libcalamares/Settings.cpp b/src/libcalamares/Settings.cpp
index 897bc9daa..7b5f85376 100644
--- a/src/libcalamares/Settings.cpp
+++ b/src/libcalamares/Settings.cpp
@@ -31,7 +31,7 @@ hasValue( const YAML::Node& v )
 
 /** @brief Helper function to grab a QString out of the config, and to warn if not present. */
 static QString
-requireString( const YAML::Node& config, const char* key )
+requireString( const ::YAML::Node& config, const char* key )
 {
     auto v = config[ key ];
     if ( hasValue( v ) )
@@ -47,7 +47,7 @@ requireString( const YAML::Node& config, const char* key )
 
 /** @brief Helper function to grab a bool out of the config, and to warn if not present. */
 static bool
-requireBool( const YAML::Node& config, const char* key, bool d )
+requireBool( const ::YAML::Node& config, const char* key, bool d )
 {
     auto v = config[ key ];
     if ( hasValue( v ) )
@@ -133,7 +133,7 @@ interpretModulesSearch( const bool debugMode, const QStringList& rawPaths, QStri
             }
 
             // Install path is set in CalamaresAddPlugin.cmake
-            output.append( CalamaresUtils::systemLibDir().absolutePath() + QDir::separator() + "calamares"
+            output.append( Calamares::systemLibDir().absolutePath() + QDir::separator() + "calamares"
                            + QDir::separator() + "modules" );
         }
         else
@@ -152,12 +152,12 @@ interpretModulesSearch( const bool debugMode, const QStringList& rawPaths, QStri
 }
 
 static void
-interpretInstances( const YAML::Node& node, Settings::InstanceDescriptionList& customInstances )
+interpretInstances( const ::YAML::Node& node, Settings::InstanceDescriptionList& customInstances )
 {
     // Parse the custom instances section
     if ( node )
     {
-        QVariant instancesV = CalamaresUtils::yamlToVariant( node ).toList();
+        QVariant instancesV = Calamares::YAML::toVariant( node ).toList();
         if ( typeOf( instancesV ) == ListVariantType )
         {
             const auto instances = instancesV.toList();
@@ -180,15 +180,15 @@ interpretInstances( const YAML::Node& node, Settings::InstanceDescriptionList& c
 }
 
 static void
-interpretSequence( const YAML::Node& node, Settings::ModuleSequence& moduleSequence )
+interpretSequence( const ::YAML::Node& node, Settings::ModuleSequence& moduleSequence )
 {
     // Parse the modules sequence section
     if ( node )
     {
-        QVariant sequenceV = CalamaresUtils::yamlToVariant( node );
+        QVariant sequenceV = Calamares::YAML::toVariant( node );
         if ( typeOf( sequenceV ) != ListVariantType )
         {
-            throw YAML::Exception( YAML::Mark(), "sequence key does not have a list-value" );
+            throw ::YAML::Exception( ::YAML::Mark(), "sequence key does not have a list-value" );
         }
 
         const auto sequence = sequenceV.toList();
@@ -231,7 +231,7 @@ interpretSequence( const YAML::Node& node, Settings::ModuleSequence& moduleSeque
     }
     else
     {
-        throw YAML::Exception( YAML::Mark(), "sequence key is missing" );
+        throw ::YAML::Exception( ::YAML::Mark(), "sequence key is missing" );
     }
 }
 
@@ -317,11 +317,12 @@ Settings::setConfiguration( const QByteArray& ba, const QString& explainName )
 {
     try
     {
-        YAML::Node config = YAML::Load( ba.constData() );
+        // Not using Calamares::YAML:: convenience methods because we **want** the exception here
+        auto config = ::YAML::Load( ba.constData() );
         Q_ASSERT( config.IsMap() );
 
         interpretModulesSearch(
-            debugMode(), CalamaresUtils::yamlToStringList( config[ "modules-search" ] ), m_modulesSearchPaths );
+            debugMode(), Calamares::YAML::toStringList( config[ "modules-search" ] ), m_modulesSearchPaths );
         interpretInstances( config[ "instances" ], m_moduleInstances );
         interpretSequence( config[ "sequence" ], m_modulesSequence );
 
@@ -336,9 +337,9 @@ Settings::setConfiguration( const QByteArray& ba, const QString& explainName )
 
         reconcileInstancesAndSequence();
     }
-    catch ( YAML::Exception& e )
+    catch ( ::YAML::Exception& e )
     {
-        CalamaresUtils::explainYamlException( e, ba, explainName );
+        Calamares::YAML::explainException( e, ba, explainName );
     }
 }
 
@@ -348,21 +349,18 @@ Settings::modulesSearchPaths() const
     return m_modulesSearchPaths;
 }
 
-
 Settings::InstanceDescriptionList
 Settings::moduleInstances() const
 {
     return m_moduleInstances;
 }
 
-
 Settings::ModuleSequence
 Settings::modulesSequence() const
 {
     return m_modulesSequence;
 }
 
-
 QString
 Settings::brandingComponentName() const
 {
@@ -375,9 +373,9 @@ settingsFileCandidates( bool assumeBuilddir )
     static const char settings[] = "settings.conf";
 
     QStringList settingsPaths;
-    if ( CalamaresUtils::isAppDataDirOverridden() )
+    if ( Calamares::isAppDataDirOverridden() )
     {
-        settingsPaths << CalamaresUtils::appDataDir().absoluteFilePath( settings );
+        settingsPaths << Calamares::appDataDir().absoluteFilePath( settings );
     }
     else
     {
@@ -385,13 +383,13 @@ settingsFileCandidates( bool assumeBuilddir )
         {
             settingsPaths << QDir::current().absoluteFilePath( settings );
         }
-        if ( CalamaresUtils::haveExtraDirs() )
-            for ( auto s : CalamaresUtils::extraConfigDirs() )
+        if ( Calamares::haveExtraDirs() )
+            for ( auto s : Calamares::extraConfigDirs() )
             {
                 settingsPaths << ( s + settings );
             }
         settingsPaths << CMAKE_INSTALL_FULL_SYSCONFDIR "/calamares/settings.conf";  // String concat
-        settingsPaths << CalamaresUtils::appDataDir().absoluteFilePath( settings );
+        settingsPaths << Calamares::appDataDir().absoluteFilePath( settings );
     }
 
     return settingsPaths;
@@ -426,7 +424,7 @@ Settings::init( bool debugMode )
     {
         cError() << "Cowardly refusing to continue startup without settings."
                  << Logger::DebugList( settingsFileCandidatesByPriority );
-        if ( CalamaresUtils::isAppDataDirOverridden() )
+        if ( Calamares::isAppDataDirOverridden() )
         {
             cError() << "FATAL: explicitly configured application data directory is missing settings.conf";
         }
diff --git a/src/libcalamares/geoip/GeoIPJSON.cpp b/src/libcalamares/geoip/GeoIPJSON.cpp
index 36788176f..6c75bff9a 100644
--- a/src/libcalamares/geoip/GeoIPJSON.cpp
+++ b/src/libcalamares/geoip/GeoIPJSON.cpp
@@ -44,14 +44,14 @@ selectMap( const QVariantMap& m, const QStringList& l, int index )
     QString attributeName = l[ index ];
     if ( index == l.count() - 1 )
     {
-        return CalamaresUtils::getString( m, attributeName );
+        return Calamares::getString( m, attributeName );
     }
     else
     {
         bool success = false;  // bogus
         if ( m.contains( attributeName ) )
         {
-            return selectMap( CalamaresUtils::getSubMap( m, attributeName, success ), l, index + 1 );
+            return selectMap( Calamares::getSubMap( m, attributeName, success ), l, index + 1 );
         }
         return QString();
     }
@@ -62,9 +62,9 @@ GeoIPJSON::rawReply( const QByteArray& data )
 {
     try
     {
-        YAML::Node doc = YAML::Load( data );
+        auto doc = ::YAML::Load( data );
 
-        QVariant var = CalamaresUtils::yamlToVariant( doc );
+        QVariant var = Calamares::YAML::toVariant( doc );
         if ( !var.isNull() && var.isValid() && Calamares::typeOf( var ) == Calamares::MapVariantType )
         {
             return selectMap( var.toMap(), m_element.split( '.' ), 0 );
@@ -74,9 +74,9 @@ GeoIPJSON::rawReply( const QByteArray& data )
             cWarning() << "Invalid YAML data for GeoIPJSON";
         }
     }
-    catch ( YAML::Exception& e )
+    catch ( ::YAML::Exception& e )
     {
-        CalamaresUtils::explainYamlException( e, data, "GeoIP data" );
+        Calamares::YAML::explainException( e, data, "GeoIP data" );
     }
 
     return QString();
diff --git a/src/libcalamares/locale/TranslatableConfiguration.cpp b/src/libcalamares/locale/TranslatableConfiguration.cpp
index c4742d6c2..937202c4d 100644
--- a/src/libcalamares/locale/TranslatableConfiguration.cpp
+++ b/src/libcalamares/locale/TranslatableConfiguration.cpp
@@ -38,7 +38,7 @@ TranslatedString::TranslatedString( const QVariantMap& map, const QString& key,
     : m_context( context )
 {
     // Get the un-decorated value for the key
-    QString value = CalamaresUtils::getString( map, key );
+    QString value = Calamares::getString( map, key );
     m_strings[ QString() ] = value;
 
     for ( auto it = map.constBegin(); it != map.constEnd(); ++it )
diff --git a/src/libcalamares/modulesystem/Config.cpp b/src/libcalamares/modulesystem/Config.cpp
index 68d7b6514..1294c8db0 100644
--- a/src/libcalamares/modulesystem/Config.cpp
+++ b/src/libcalamares/modulesystem/Config.cpp
@@ -18,14 +18,12 @@ namespace Calamares
 namespace ModuleSystem
 {
 
-
 class Config::Private
 {
 public:
     std::unique_ptr< Presets > m_presets;
 };
 
-
 Config::Config( QObject* parent )
     : QObject( parent )
     , d( std::make_unique< Private >() )
@@ -55,7 +53,7 @@ Config::isEditable( const QString& fieldName ) const
 Config::ApplyPresets::ApplyPresets( Calamares::ModuleSystem::Config& c, const QVariantMap& configurationMap )
     : m_c( c )
     , m_bogus( true )
-    , m_map( CalamaresUtils::getSubMap( configurationMap, "presets", m_bogus ) )
+    , m_map( Calamares::getSubMap( configurationMap, "presets", m_bogus ) )
 {
     c.m_unlocked = true;
     if ( !c.d->m_presets )
@@ -113,9 +111,9 @@ Config::ApplyPresets::apply( const char* fieldName )
     if ( m_map.contains( key ) )
     {
         // Key has an explicit setting
-        QVariantMap m = CalamaresUtils::getSubMap( m_map, key, m_bogus );
+        QVariantMap m = Calamares::getSubMap( m_map, key, m_bogus );
         QVariant value = m[ "value" ];
-        bool editable = CalamaresUtils::getBool( m, "editable", true );
+        bool editable = Calamares::getBool( m, "editable", true );
 
         if ( value.isValid() )
         {
diff --git a/src/libcalamares/modulesystem/Descriptor.cpp b/src/libcalamares/modulesystem/Descriptor.cpp
index 14fee0371..38c7bd08c 100644
--- a/src/libcalamares/modulesystem/Descriptor.cpp
+++ b/src/libcalamares/modulesystem/Descriptor.cpp
@@ -92,21 +92,21 @@ Descriptor::fromDescriptorData( const QVariantMap& moduleDesc, const QString& de
         return d;
     }
 
-    d.m_isEmergeny = CalamaresUtils::getBool( moduleDesc, "emergency", false );
-    d.m_hasConfig = !CalamaresUtils::getBool( moduleDesc, "noconfig", false );  // Inverted logic during load
-    d.m_requiredModules = CalamaresUtils::getStringList( moduleDesc, "requiredModules" );
-    d.m_weight = int( CalamaresUtils::getInteger( moduleDesc, "weight", -1 ) );
+    d.m_isEmergeny = Calamares::getBool( moduleDesc, "emergency", false );
+    d.m_hasConfig = !Calamares::getBool( moduleDesc, "noconfig", false );  // Inverted logic during load
+    d.m_requiredModules = Calamares::getStringList( moduleDesc, "requiredModules" );
+    d.m_weight = int( Calamares::getInteger( moduleDesc, "weight", -1 ) );
 
     QStringList consumedKeys { "type", "interface", "name", "emergency", "noconfig", "requiredModules", "weight" };
 
     switch ( d.interface() )
     {
     case Interface::QtPlugin:
-        d.m_script = CalamaresUtils::getString( moduleDesc, "load" );
+        d.m_script = Calamares::getString( moduleDesc, "load" );
         consumedKeys << "load";
         break;
     case Interface::Python:
-        d.m_script = CalamaresUtils::getString( moduleDesc, "script" );
+        d.m_script = Calamares::getString( moduleDesc, "script" );
         if ( d.m_script.isEmpty() )
         {
             if ( o )
@@ -119,9 +119,9 @@ Descriptor::fromDescriptorData( const QVariantMap& moduleDesc, const QString& de
         consumedKeys << "script";
         break;
     case Interface::Process:
-        d.m_script = CalamaresUtils::getString( moduleDesc, "command" );
-        d.m_processTimeout = int( CalamaresUtils::getInteger( moduleDesc, "timeout", 30 ) );
-        d.m_processChroot = CalamaresUtils::getBool( moduleDesc, "chroot", false );
+        d.m_script = Calamares::getString( moduleDesc, "command" );
+        d.m_processTimeout = int( Calamares::getInteger( moduleDesc, "timeout", 30 ) );
+        d.m_processChroot = Calamares::getBool( moduleDesc, "chroot", false );
         if ( d.m_processTimeout < 0 )
         {
             d.m_processTimeout = 0;
diff --git a/src/libcalamares/modulesystem/Module.cpp b/src/libcalamares/modulesystem/Module.cpp
index 8fbb05300..0950f0f47 100644
--- a/src/libcalamares/modulesystem/Module.cpp
+++ b/src/libcalamares/modulesystem/Module.cpp
@@ -51,9 +51,9 @@ moduleConfigurationCandidates( bool assumeBuildDir, const QString& moduleName, c
 {
     QStringList paths;
 
-    if ( CalamaresUtils::isAppDataDirOverridden() )
+    if ( Calamares::isAppDataDirOverridden() )
     {
-        paths << CalamaresUtils::appDataDir().absoluteFilePath( QString( "modules/%1" ).arg( configFileName ) );
+        paths << Calamares::appDataDir().absoluteFilePath( QString( "modules/%1" ).arg( configFileName ) );
     }
     else
     {
@@ -73,14 +73,14 @@ moduleConfigurationCandidates( bool assumeBuildDir, const QString& moduleName, c
             paths << QDir().absoluteFilePath( configFileName );
         }
 
-        if ( CalamaresUtils::haveExtraDirs() )
-            for ( auto s : CalamaresUtils::extraConfigDirs() )
+        if ( Calamares::haveExtraDirs() )
+            for ( auto s : Calamares::extraConfigDirs() )
             {
                 paths << ( s + QString( "modules/%1" ).arg( configFileName ) );
             }
 
         paths << QString( "/etc/calamares/modules/%1" ).arg( configFileName );
-        paths << CalamaresUtils::appDataDir().absoluteFilePath( QString( "modules/%1" ).arg( configFileName ) );
+        paths << Calamares::appDataDir().absoluteFilePath( QString( "modules/%1" ).arg( configFileName ) );
     }
 
     return paths;
@@ -98,7 +98,7 @@ Module::loadConfigurationFile( const QString& configFileName )  //throws YAML::E
         {
             QByteArray ba = configFile.readAll();
 
-            YAML::Node doc = YAML::Load( ba.constData() );
+            auto doc = ::YAML::Load( ba.constData() );  // Throws on error
             if ( doc.IsNull() )
             {
                 cWarning() << "Found empty module configuration" << path;
@@ -112,7 +112,7 @@ Module::loadConfigurationFile( const QString& configFileName )  //throws YAML::E
                 return;
             }
 
-            m_configurationMap = CalamaresUtils::yamlMapToVariant( doc );
+            m_configurationMap = Calamares::YAML::mapToVariant( doc );
             m_emergency = m_maybe_emergency && m_configurationMap.contains( EMERGENCY )
                 && m_configurationMap[ EMERGENCY ].toBool();
             return;
@@ -121,7 +121,6 @@ Module::loadConfigurationFile( const QString& configFileName )  //throws YAML::E
     cWarning() << "No config file for" << name() << "found anywhere at" << Logger::DebugList( configCandidates );
 }
 
-
 QString
 Module::typeString() const
 {
@@ -130,7 +129,6 @@ Module::typeString() const
     return ok ? v : QString();
 }
 
-
 QString
 Module::interfaceString() const
 {
@@ -139,14 +137,12 @@ Module::interfaceString() const
     return ok ? v : QString();
 }
 
-
 QVariantMap
 Module::configurationMap()
 {
     return m_configurationMap;
 }
 
-
 RequirementsList
 Module::checkRequirements()
 {
diff --git a/src/libcalamares/modulesystem/Preset.cpp b/src/libcalamares/modulesystem/Preset.cpp
index 1c5779afe..e980aae08 100644
--- a/src/libcalamares/modulesystem/Preset.cpp
+++ b/src/libcalamares/modulesystem/Preset.cpp
@@ -23,8 +23,8 @@ loadPresets( Calamares::ModuleSystem::Presets& preset,
         if ( !it.key().isEmpty() && pred( it.key() ) )
         {
             QVariantMap m = it.value().toMap();
-            QString value = CalamaresUtils::getString( m, "value" );
-            bool editable = CalamaresUtils::getBool( m, "editable", true );
+            QString value = Calamares::getString( m, "value" );
+            bool editable = Calamares::getBool( m, "editable", true );
 
             preset.append( Calamares::ModuleSystem::PresetField { it.key(), value, editable } );
 
diff --git a/src/libcalamares/partition/Mount.cpp b/src/libcalamares/partition/Mount.cpp
index 18ec5a935..ee4aa4898 100644
--- a/src/libcalamares/partition/Mount.cpp
+++ b/src/libcalamares/partition/Mount.cpp
@@ -38,7 +38,7 @@ mount( const QString& devicePath, const QString& mountPoint, const QString& file
             cWarning() << "Can't mount on an empty mountpoint.";
         }
 
-        return static_cast< int >( CalamaresUtils::ProcessResult::Code::NoWorkingDirectory );
+        return static_cast< int >( Calamares::ProcessResult::Code::NoWorkingDirectory );
     }
 
     QDir mountPointDir( mountPoint );
@@ -48,7 +48,7 @@ mount( const QString& devicePath, const QString& mountPoint, const QString& file
         if ( !ok )
         {
             cWarning() << "Could not create mountpoint" << mountPoint;
-            return static_cast< int >( CalamaresUtils::ProcessResult::Code::NoWorkingDirectory );
+            return static_cast< int >( Calamares::ProcessResult::Code::NoWorkingDirectory );
         }
     }
 
@@ -71,7 +71,7 @@ mount( const QString& devicePath, const QString& mountPoint, const QString& file
     }
     args << devicePath << mountPoint;
 
-    auto r = CalamaresUtils::System::runCommand( args, std::chrono::seconds( 10 ) );
+    auto r = Calamares::System::runCommand( args, std::chrono::seconds( 10 ) );
     sync();
     return r.getExitCode();
 }
@@ -79,8 +79,7 @@ mount( const QString& devicePath, const QString& mountPoint, const QString& file
 int
 unmount( const QString& path, const QStringList& options )
 {
-    auto r
-        = CalamaresUtils::System::runCommand( QStringList { "umount" } << options << path, std::chrono::seconds( 10 ) );
+    auto r = Calamares::System::runCommand( QStringList { "umount" } << options << path, std::chrono::seconds( 10 ) );
     sync();
     return r.getExitCode();
 }
@@ -91,7 +90,6 @@ struct TemporaryMount::Private
     QTemporaryDir m_mountDir;
 };
 
-
 TemporaryMount::TemporaryMount( const QString& devicePath, const QString& filesystemName, const QString& options )
     : m_d( std::make_unique< Private >() )
 {
diff --git a/src/libcalamares/partition/PartitionSize.cpp b/src/libcalamares/partition/PartitionSize.cpp
index b49198afe..184e8b0b6 100644
--- a/src/libcalamares/partition/PartitionSize.cpp
+++ b/src/libcalamares/partition/PartitionSize.cpp
@@ -9,7 +9,6 @@
  *
  */
 
-
 #include "partition/PartitionSize.h"
 #include "utils/Logger.h"
 #include "utils/Units.h"
@@ -99,7 +98,7 @@ PartitionSize::toSectors( qint64 totalSectors, qint64 sectorSize ) const
     case SizeUnit::MiB:
     case SizeUnit::GB:
     case SizeUnit::GiB:
-        return CalamaresUtils::bytesToSectors( toBytes(), sectorSize );
+        return Calamares::bytesToSectors( toBytes(), sectorSize );
     }
 
     return -1;
@@ -195,17 +194,17 @@ PartitionSize::toBytes() const
     case SizeUnit::Byte:
         return value();
     case SizeUnit::KB:
-        return CalamaresUtils::KBtoBytes( static_cast< unsigned long long >( value() ) );
+        return Calamares::KBtoBytes( static_cast< unsigned long long >( value() ) );
     case SizeUnit::KiB:
-        return CalamaresUtils::KiBtoBytes( static_cast< unsigned long long >( value() ) );
+        return Calamares::KiBtoBytes( static_cast< unsigned long long >( value() ) );
     case SizeUnit::MB:
-        return CalamaresUtils::MBtoBytes( static_cast< unsigned long long >( value() ) );
+        return Calamares::MBtoBytes( static_cast< unsigned long long >( value() ) );
     case SizeUnit::MiB:
-        return CalamaresUtils::MiBtoBytes( static_cast< unsigned long long >( value() ) );
+        return Calamares::MiBtoBytes( static_cast< unsigned long long >( value() ) );
     case SizeUnit::GB:
-        return CalamaresUtils::GBtoBytes( static_cast< unsigned long long >( value() ) );
+        return Calamares::GBtoBytes( static_cast< unsigned long long >( value() ) );
     case SizeUnit::GiB:
-        return CalamaresUtils::GiBtoBytes( static_cast< unsigned long long >( value() ) );
+        return Calamares::GiBtoBytes( static_cast< unsigned long long >( value() ) );
     }
     __builtin_unreachable();
 }
diff --git a/src/libcalamares/partition/Sync.cpp b/src/libcalamares/partition/Sync.cpp
index 99e1c544f..3ba144a85 100644
--- a/src/libcalamares/partition/Sync.cpp
+++ b/src/libcalamares/partition/Sync.cpp
@@ -23,7 +23,7 @@ Calamares::Partition::sync()
      * either chroot(8) or env(1) is used to run the command,
      * and they do suitable lookup.
      */
-    auto r = CalamaresUtils::System::runCommand( { "udevadm", "settle" }, std::chrono::seconds( 10 ) );
+    auto r = Calamares::System::runCommand( { "udevadm", "settle" }, std::chrono::seconds( 10 ) );
 
     if ( r.getExitCode() != 0 )
     {
@@ -31,5 +31,5 @@ Calamares::Partition::sync()
         r.explainProcess( "udevadm", std::chrono::seconds( 10 ) );
     }
 
-    CalamaresUtils::System::runCommand( { "sync" }, std::chrono::seconds( 10 ) );
+    Calamares::System::runCommand( { "sync" }, std::chrono::seconds( 10 ) );
 }
diff --git a/src/libcalamares/utils/CalamaresUtilsSystem.cpp b/src/libcalamares/utils/CalamaresUtilsSystem.cpp
index 7622b006d..b5d8535d6 100644
--- a/src/libcalamares/utils/CalamaresUtilsSystem.cpp
+++ b/src/libcalamares/utils/CalamaresUtilsSystem.cpp
@@ -32,12 +32,11 @@
 // clang-format on
 #endif
 
-namespace CalamaresUtils
+namespace Calamares
 {
 
 System* System::s_instance = nullptr;
 
-
 System::System( bool doChroot, QObject* parent )
     : QObject( parent )
     , m_doChroot( doChroot )
@@ -50,10 +49,8 @@ System::System( bool doChroot, QObject* parent )
     }
 }
 
-
 System::~System() {}
 
-
 System*
 System::instance()
 {
@@ -66,7 +63,6 @@ System::instance()
     return s_instance;
 }
 
-
 ProcessResult
 System::runCommand( System::RunLocation location,
                     const QStringList& args,
@@ -229,7 +225,6 @@ System::createTargetParentDirs( const QString& filePath ) const
     return createTargetDirs( QFileInfo( filePath ).dir().path() );
 }
 
-
 QPair< quint64, qreal >
 System::getTotalMemoryB() const
 {
@@ -259,7 +254,6 @@ System::getTotalMemoryB() const
 #endif
 }
 
-
 QString
 System::getCpuDescription() const
 {
@@ -342,4 +336,4 @@ ProcessResult::explainProcess( int ec, const QString& command, const QString& ou
             + outputMessage );
 }
 
-}  // namespace CalamaresUtils
+}  // namespace Calamares
diff --git a/src/libcalamares/utils/CalamaresUtilsSystem.h b/src/libcalamares/utils/CalamaresUtilsSystem.h
index f4f5257c4..8385287cf 100644
--- a/src/libcalamares/utils/CalamaresUtilsSystem.h
+++ b/src/libcalamares/utils/CalamaresUtilsSystem.h
@@ -21,7 +21,7 @@
 
 #include <chrono>
 
-namespace CalamaresUtils
+namespace Calamares
 {
 class ProcessResult : public QPair< int, QString >
 {
@@ -234,7 +234,6 @@ public:
         return targetEnvOutput( QStringList { command }, output, workingPath, stdInput, timeoutSec );
     }
 
-
     /** @brief Gets a path to a file in the target system, from the host.
      *
      * @param path Path to the file; this is interpreted
@@ -361,6 +360,6 @@ private:
     bool m_doChroot;
 };
 
-}  // namespace CalamaresUtils
+}  // namespace Calamares
 
 #endif
diff --git a/src/libcalamares/utils/CommandList.cpp b/src/libcalamares/utils/CommandList.cpp
index 4d1b3bd0e..a66eb8319 100644
--- a/src/libcalamares/utils/CommandList.cpp
+++ b/src/libcalamares/utils/CommandList.cpp
@@ -22,14 +22,14 @@
 #include <QCoreApplication>
 #include <QVariantList>
 
-namespace CalamaresUtils
+namespace Calamares
 {
 
 static CommandLine
 get_variant_object( const QVariantMap& m )
 {
-    QString command = CalamaresUtils::getString( m, "command" );
-    qint64 timeout = CalamaresUtils::getInteger( m, "timeout", -1 );
+    QString command = Calamares::getString( m, "command" );
+    qint64 timeout = Calamares::getInteger( m, "timeout", -1 );
 
     if ( !command.isEmpty() )
     {
@@ -102,14 +102,13 @@ CommandLine::expand( KMacroExpanderBase& expander ) const
     return { c, second };
 }
 
-CalamaresUtils::CommandLine
+Calamares::CommandLine
 CommandLine::expand() const
 {
     auto expander = get_gs_expander( System::RunLocation::RunInHost );
     return expand( expander );
 }
 
-
 CommandList::CommandList( bool doChroot, std::chrono::seconds timeout )
     : m_doChroot( doChroot )
     , m_timeout( timeout )
@@ -220,5 +219,4 @@ CommandList::expand() const
     return expand( expander );
 }
 
-
-}  // namespace CalamaresUtils
+}  // namespace Calamares
diff --git a/src/libcalamares/utils/CommandList.h b/src/libcalamares/utils/CommandList.h
index af23a1f2f..574db489a 100644
--- a/src/libcalamares/utils/CommandList.h
+++ b/src/libcalamares/utils/CommandList.h
@@ -21,7 +21,7 @@
 
 class KMacroExpanderBase;
 
-namespace CalamaresUtils
+namespace Calamares
 {
 using CommandLineBase = std::pair< QString, std::chrono::seconds >;
 
@@ -119,5 +119,5 @@ private:
     std::chrono::seconds m_timeout;
 };
 
-}  // namespace CalamaresUtils
+}  // namespace Calamares
 #endif
diff --git a/src/libcalamares/utils/Dirs.cpp b/src/libcalamares/utils/Dirs.cpp
index f333d6e64..c42768a08 100644
--- a/src/libcalamares/utils/Dirs.cpp
+++ b/src/libcalamares/utils/Dirs.cpp
@@ -30,7 +30,7 @@
 
 using std::cerr;
 
-namespace CalamaresUtils
+namespace Calamares
 {
 
 static QDir s_appDataDir( CMAKE_INSTALL_FULL_DATADIR );
@@ -69,7 +69,6 @@ isWritableDir( const QDir& dir )
     return true;
 }
 
-
 void
 setAppDataDir( const QDir& dir )
 {
@@ -147,14 +146,12 @@ isAppDataDirOverridden()
     return s_isAppDataDirOverridden;
 }
 
-
 QDir
 appDataDir()
 {
     return s_appDataDir;
 }
 
-
 QDir
 systemLibDir()
 {
@@ -162,7 +159,6 @@ systemLibDir()
     return path;
 }
 
-
 QDir
 appLogDir()
 {
@@ -184,4 +180,4 @@ appLogDir()
     return QDir::temp();
 }
 
-}  // namespace CalamaresUtils
+}  // namespace Calamares
diff --git a/src/libcalamares/utils/Dirs.h b/src/libcalamares/utils/Dirs.h
index 445cbe1f1..d0edd7a4f 100644
--- a/src/libcalamares/utils/Dirs.h
+++ b/src/libcalamares/utils/Dirs.h
@@ -21,7 +21,7 @@
 
 #include <QDir>
 
-namespace CalamaresUtils
+namespace Calamares
 {
 /**
  * @brief appDataDir returns the directory with common application data.
@@ -56,6 +56,6 @@ DLLEXPORT bool haveExtraDirs();
 DLLEXPORT QStringList extraConfigDirs();
 /** @brief XDG_DATA_DIRS, each guaranteed to end with / */
 DLLEXPORT QStringList extraDataDirs();
-}  // namespace CalamaresUtils
+}  // namespace Calamares
 
 #endif
diff --git a/src/libcalamares/utils/Entropy.cpp b/src/libcalamares/utils/Entropy.cpp
index 67a0718f5..4d1400c97 100644
--- a/src/libcalamares/utils/Entropy.cpp
+++ b/src/libcalamares/utils/Entropy.cpp
@@ -15,8 +15,10 @@
 
 #include <random>
 
-CalamaresUtils::EntropySource
-CalamaresUtils::getEntropy( int size, QByteArray& b )
+namespace Calamares
+{
+EntropySource
+getEntropy( int size, QByteArray& b )
 {
     constexpr const char filler = char( 0xcb );
 
@@ -73,8 +75,8 @@ CalamaresUtils::getEntropy( int size, QByteArray& b )
     return EntropySource::Twister;
 }
 
-CalamaresUtils::EntropySource
-CalamaresUtils::getPrintableEntropy( int size, QString& s )
+EntropySource
+getPrintableEntropy( int size, QString& s )
 {
     s.clear();
     if ( size < 1 )
@@ -117,3 +119,4 @@ CalamaresUtils::getPrintableEntropy( int size, QString& s )
 
     return r;
 }
+}  // namespace Calamares
diff --git a/src/libcalamares/utils/Entropy.h b/src/libcalamares/utils/Entropy.h
index 1ca40a68f..a28c95ce0 100644
--- a/src/libcalamares/utils/Entropy.h
+++ b/src/libcalamares/utils/Entropy.h
@@ -16,7 +16,7 @@
 
 #include <QByteArray>
 
-namespace CalamaresUtils
+namespace Calamares
 {
 /// @brief Which entropy source was actually used for the entropy.
 enum class EntropySource
@@ -41,6 +41,6 @@ DLLEXPORT EntropySource getEntropy( int size, QByteArray& b );
  * @see getEntropy
  */
 DLLEXPORT EntropySource getPrintableEntropy( int size, QString& s );
-}  // namespace CalamaresUtils
+}  // namespace Calamares
 
 #endif
diff --git a/src/libcalamares/utils/Logger.cpp b/src/libcalamares/utils/Logger.cpp
index 33a67f59d..15b6d65d0 100644
--- a/src/libcalamares/utils/Logger.cpp
+++ b/src/libcalamares/utils/Logger.cpp
@@ -44,7 +44,6 @@ static QMutex s_mutex;
 static const char s_Continuation[] = "\n    ";
 static const char s_SubEntry[] = "    .. ";
 
-
 namespace Logger
 {
 
@@ -109,7 +108,6 @@ log_implementation( const char* msg, unsigned int debugLevel, const bool withTim
     }
 }
 
-
 static void
 CalamaresLogHandler( QtMsgType type, const QMessageLogContext&, const QString& msg )
 {
@@ -139,14 +137,12 @@ CalamaresLogHandler( QtMsgType type, const QMessageLogContext&, const QString& m
     log_implementation( msg.toUtf8().constData(), level, true );
 }
 
-
 QString
 logFile()
 {
-    return CalamaresUtils::appLogDir().filePath( "session.log" );
+    return Calamares::appLogDir().filePath( "session.log" );
 }
 
-
 void
 setupLogfile()
 {
@@ -202,7 +198,6 @@ CDebug::CDebug( unsigned int debugLevel, const char* func )
     }
 }
 
-
 CDebug::~CDebug()
 {
     if ( log_enabled( m_debugLevel ) )
diff --git a/src/libcalamares/utils/NamedSuffix.h b/src/libcalamares/utils/NamedSuffix.h
index 84094e90c..85ce11f2c 100644
--- a/src/libcalamares/utils/NamedSuffix.h
+++ b/src/libcalamares/utils/NamedSuffix.h
@@ -73,7 +73,6 @@ public:
             }
     }
 
-
     /** @brief Construct value from string.
      *
      * This is not defined in the template, because it should probably
diff --git a/src/libcalamares/utils/Permissions.cpp b/src/libcalamares/utils/Permissions.cpp
index 789746843..be50dc63c 100644
--- a/src/libcalamares/utils/Permissions.cpp
+++ b/src/libcalamares/utils/Permissions.cpp
@@ -15,7 +15,7 @@
 
 #include <sys/stat.h>
 
-namespace CalamaresUtils
+namespace Calamares
 {
 
 Permissions::Permissions()
@@ -26,7 +26,6 @@ Permissions::Permissions()
 {
 }
 
-
 Permissions::Permissions( QString const& p )
     : Permissions()
 {
@@ -91,7 +90,7 @@ Permissions::apply( const QString& path, int mode )
 }
 
 bool
-Permissions::apply( const QString& path, const CalamaresUtils::Permissions& p )
+Permissions::apply( const QString& path, const Calamares::Permissions& p )
 {
     if ( !p.isValid() )
     {
@@ -105,8 +104,8 @@ Permissions::apply( const QString& path, const CalamaresUtils::Permissions& p )
         // uid_t and gid_t values to pass to that system call.
         //
         // Do a lame cop-out and let the chown(8) utility do the heavy lifting.
-        if ( CalamaresUtils::System::runCommand( { "chown", p.username() + ':' + p.group(), path },
-                                                 std::chrono::seconds( 3 ) )
+        if ( Calamares::System::runCommand( { "chown", p.username() + ':' + p.group(), path },
+                                            std::chrono::seconds( 3 ) )
                  .getExitCode() )
         {
             r = false;
@@ -121,5 +120,4 @@ Permissions::apply( const QString& path, const CalamaresUtils::Permissions& p )
     return r;
 }
 
-
-}  // namespace CalamaresUtils
+}  // namespace Calamares
diff --git a/src/libcalamares/utils/Permissions.h b/src/libcalamares/utils/Permissions.h
index 11d1d4bab..90f94179d 100644
--- a/src/libcalamares/utils/Permissions.h
+++ b/src/libcalamares/utils/Permissions.h
@@ -12,7 +12,7 @@
 
 #include <QString>
 
-namespace CalamaresUtils
+namespace Calamares
 {
 
 /**
@@ -90,6 +90,6 @@ private:
     bool m_valid;
 };
 
-}  // namespace CalamaresUtils
+}  // namespace Calamares
 
 #endif  // LIBCALAMARES_PERMISSIONS_H
diff --git a/src/libcalamares/utils/Retranslator.cpp b/src/libcalamares/utils/Retranslator.cpp
index 5af975002..cb71c4ea9 100644
--- a/src/libcalamares/utils/Retranslator.cpp
+++ b/src/libcalamares/utils/Retranslator.cpp
@@ -88,7 +88,6 @@ BrandingLoader::tryLoad( QTranslator* translator )
     QString filenameBase( m_prefix );
     filenameBase.remove( 0, lastDirSeparator + 1 );
 
-
     if ( QDir( brandingTranslationsDirPath ).exists() )
     {
         const QString fileName = QStringLiteral( "%1_%2" ).arg( filenameBase, m_localeName );
@@ -119,7 +118,7 @@ tryLoad( QTranslator* translator, const QString& prefix, const QString& localeNa
     }
 
     // Or load from appDataDir -- often /usr/share/calamares -- subdirectory land/
-    QDir localeData( CalamaresUtils::appDataDir() );
+    QDir localeData( Calamares::appDataDir() );
     if ( localeData.exists()
          && translator->load( localeData.absolutePath() + QStringLiteral( "/lang/" ) + prefix + localeName ) )
     {
@@ -170,7 +169,7 @@ loadSingletonTranslator( TranslationLoader&& loader, QTranslator*& translator_p
 
 }  // namespace
 
-namespace CalamaresUtils
+namespace Calamares
 {
 static QTranslator* s_brandingTranslator = nullptr;
 static QTranslator* s_translator = nullptr;
@@ -241,5 +240,4 @@ setAllowLocalTranslation( bool allow )
     s_allowLocalTranslations = allow;
 }
 
-
-}  // namespace CalamaresUtils
+}  // namespace Calamares
diff --git a/src/libcalamares/utils/Retranslator.h b/src/libcalamares/utils/Retranslator.h
index 33106d4c8..ac2b022cb 100644
--- a/src/libcalamares/utils/Retranslator.h
+++ b/src/libcalamares/utils/Retranslator.h
@@ -23,7 +23,7 @@ class QEvent;
 class QLocale;
 class QTranslator;
 
-namespace CalamaresUtils
+namespace Calamares
 {
 /** @brief changes the application language.
  * @param locale the new locale (names as defined by Calamares).
@@ -69,7 +69,6 @@ loadTranslator( const Calamares::Locale::Translation::Id& locale, const QString&
  */
 DLLEXPORT void setAllowLocalTranslation( bool allow );
 
-
 /** @brief Handles change-of-language events
  *
  * There is one single Retranslator object. Use `instance()` to get it.
@@ -102,8 +101,7 @@ private:
     explicit Retranslator( QObject* parent );
 };
 
-
-}  // namespace CalamaresUtils
+}  // namespace Calamares
 
 /** @brief Call code for this object when language changes
  *
@@ -116,7 +114,7 @@ private:
  *       immediately after setting up the connection. This allows
  *       setup and translation code to be mixed together.
  */
-#define CALAMARES_RETRANSLATE( body ) CalamaresUtils::Retranslator::attach( this, [ = ] { body } )
+#define CALAMARES_RETRANSLATE( body ) Calamares::Retranslator::attach( this, [ = ] { body } )
 /** @brief Call code for the given object (widget) when language changes
  *
  * This is identical to CALAMARES_RETRANSLATE, except the @p body is called
@@ -126,7 +124,7 @@ private:
  *       immediately after setting up the connection. This allows
  *       setup and translation code to be mixed together.
  */
-#define CALAMARES_RETRANSLATE_FOR( object, body ) CalamaresUtils::Retranslator::attach( object, [ = ] { body } )
+#define CALAMARES_RETRANSLATE_FOR( object, body ) Calamares::Retranslator::attach( object, [ = ] { body } )
 /** @brief Call a slot in this object when language changes
  *
  * Given a slot (in method-function-pointer notation), call that slot when the
@@ -140,10 +138,7 @@ private:
 #define CALAMARES_RETRANSLATE_SLOT( slotfunc ) \
     do \
     { \
-        connect( CalamaresUtils::Retranslator::instance(), \
-                 &CalamaresUtils::Retranslator::languageChanged, \
-                 this, \
-                 slotfunc ); \
+        connect( Calamares::Retranslator::instance(), &Calamares::Retranslator::languageChanged, this, slotfunc ); \
         ( this->*slotfunc )(); \
     } while ( false )
 
diff --git a/src/libcalamares/utils/Runner.cpp b/src/libcalamares/utils/Runner.cpp
index d45836334..632f32028 100644
--- a/src/libcalamares/utils/Runner.cpp
+++ b/src/libcalamares/utils/Runner.cpp
@@ -41,7 +41,6 @@ relativeChangeDirectory( QDir& directory, const QString& subdir )
     return directory.cd( relPath );
 }
 
-
 STATICTEST std::pair< bool, QDir >
 calculateWorkingDirectory( Calamares::Utils::RunLocation location, const QString& directory )
 {
@@ -98,11 +97,9 @@ namespace Utils
 
 Runner::Runner() {}
 
-
 }  // namespace Utils
 }  // namespace Calamares
 
-
 Calamares::Utils::Runner::Runner( const QStringList& command )
 {
     setCommand( command );
diff --git a/src/libcalamares/utils/Runner.h b/src/libcalamares/utils/Runner.h
index 155375bbe..171b28e76 100644
--- a/src/libcalamares/utils/Runner.h
+++ b/src/libcalamares/utils/Runner.h
@@ -26,8 +26,8 @@ namespace Calamares
 namespace Utils
 {
 
-using RunLocation = CalamaresUtils::System::RunLocation;
-using ProcessResult = CalamaresUtils::ProcessResult;
+using RunLocation = Calamares::System::RunLocation;
+using ProcessResult = Calamares::ProcessResult;
 
 /** @brief A Runner wraps a process and handles running it and processing output
  *
diff --git a/src/libcalamares/utils/String.cpp b/src/libcalamares/utils/String.cpp
index f1708d5a3..88583f5e8 100644
--- a/src/libcalamares/utils/String.cpp
+++ b/src/libcalamares/utils/String.cpp
@@ -86,8 +86,7 @@ removeDiacritics( const QString& string )
     return output;
 }
 
-
-// Function CalamaresUtils::obscure based on KStringHandler::obscure,
+// Function Calamares::obscure based on KStringHandler::obscure,
 // part of KDElibs by KDE, file kstringhandler.cpp.
 // Original copyright statement follows.
 /* This file is part of the KDE libraries
@@ -124,7 +123,6 @@ obscure( const QString& string )
     return result;
 }
 
-
 QString
 truncateMultiLine( const QString& string, LinesStartEnd lines, CharCount chars )
 {
diff --git a/src/libcalamares/utils/StringExpander.cpp b/src/libcalamares/utils/StringExpander.cpp
index 38093869d..321ae2110 100644
--- a/src/libcalamares/utils/StringExpander.cpp
+++ b/src/libcalamares/utils/StringExpander.cpp
@@ -34,10 +34,8 @@ DictionaryExpander::DictionaryExpander( Calamares::String::DictionaryExpander&&
 {
 }
 
-
 DictionaryExpander::~DictionaryExpander() {}
 
-
 void
 DictionaryExpander::insert( const QString& key, const QString& value )
 {
diff --git a/src/libcalamares/utils/StringExpander.h b/src/libcalamares/utils/StringExpander.h
index 4cea6756d..e0b21bee8 100644
--- a/src/libcalamares/utils/StringExpander.h
+++ b/src/libcalamares/utils/StringExpander.h
@@ -25,7 +25,6 @@ namespace Calamares
 namespace String
 {
 
-
 /** @brief Expand variables in a string against a dictionary.
  *
  * This class provides a convenience API for building up a dictionary
diff --git a/src/libcalamares/utils/TestPaths.cpp b/src/libcalamares/utils/TestPaths.cpp
index 54c5fa859..d7eb77a99 100644
--- a/src/libcalamares/utils/TestPaths.cpp
+++ b/src/libcalamares/utils/TestPaths.cpp
@@ -41,7 +41,7 @@ private Q_SLOTS:
     void testCreateTargetBasedirs();
 
 private:
-    CalamaresUtils::System* m_system = nullptr;  // Points to singleton instance, not owned
+    Calamares::System* m_system = nullptr;  // Points to singleton instance, not owned
     Calamares::GlobalStorage* m_gs = nullptr;
 };
 
@@ -54,7 +54,7 @@ TestPaths::initTestCase()
     Logger::setupLogLevel( Logger::LOGDEBUG );
 
     // Ensure we have a system object, expect it to be a "bogus" one
-    CalamaresUtils::System* system = CalamaresUtils::System::instance();
+    Calamares::System* system = Calamares::System::instance();
     QVERIFY( system );
     QVERIFY( system->doChroot() );
 
@@ -88,11 +88,11 @@ TestPaths::init()
 void
 TestPaths::testCreationResult()
 {
-    using Code = CalamaresUtils::CreationResult::Code;
+    using Code = Calamares::CreationResult::Code;
 
     for ( auto c : { Code::OK, Code::AlreadyExists, Code::Failed, Code::Invalid } )
     {
-        auto r = CalamaresUtils::CreationResult( c );
+        auto r = Calamares::CreationResult( c );
         QVERIFY( r.path().isEmpty() );
         QCOMPARE( r.path(), QString() );
         // Get a warning from Clang if we're not covering everything
@@ -115,14 +115,13 @@ TestPaths::testCreationResult()
     }
 
     QString path( "/etc/os-release" );
-    auto r = CalamaresUtils::CreationResult( path );
+    auto r = Calamares::CreationResult( path );
     QVERIFY( !r.failed() );
     QVERIFY( r );
     QCOMPARE( r.code(), Code::OK );
     QCOMPARE( r.path(), path );
 }
 
-
 void
 TestPaths::testTargetPath()
 {
@@ -140,7 +139,6 @@ TestPaths::testTargetPath()
     QCOMPARE( m_system->targetPath( QString() ), QString() );  // Without root, no path
 }
 
-
 void
 TestPaths::testCreateTarget()
 {
@@ -170,7 +168,6 @@ struct GSRollback
     QVariant m_value;
 };
 
-
 void
 TestPaths::testCreateTargetExists()
 {
@@ -211,14 +208,14 @@ TestPaths::testCreateTargetOverwrite()
     QVERIFY( r.path().endsWith( QString( ltestFile ) ) );
     QCOMPARE( QFileInfo( d.filePath( QString( ltestFile ) ) ).size(), 5 );
 
-    r = m_system->createTargetFile( ltestFile, "Goodbye", CalamaresUtils::System::WriteMode::KeepExisting );
+    r = m_system->createTargetFile( ltestFile, "Goodbye", Calamares::System::WriteMode::KeepExisting );
     QVERIFY( !r.failed() );  // It didn't fail!
     QVERIFY( !r );  // But not unqualified success, either
 
     QVERIFY( r.path().isEmpty() );
     QCOMPARE( QFileInfo( d.filePath( QString( ltestFile ) ) ).size(), 5 );  // Unchanged!
 
-    r = m_system->createTargetFile( ltestFile, "Goodbye", CalamaresUtils::System::WriteMode::Overwrite );
+    r = m_system->createTargetFile( ltestFile, "Goodbye", Calamares::System::WriteMode::Overwrite );
     QVERIFY( !r.failed() );  // It didn't fail!
     QVERIFY( r );  // Total success
 
@@ -226,7 +223,6 @@ TestPaths::testCreateTargetOverwrite()
     QCOMPARE( QFileInfo( d.filePath( QString( ltestFile ) ) ).size(), 7 );
 }
 
-
 struct DirRemover
 {
     DirRemover( const QString& base, const QString& dir )
diff --git a/src/libcalamares/utils/Tests.cpp b/src/libcalamares/utils/Tests.cpp
index 544652398..79629ff6a 100644
--- a/src/libcalamares/utils/Tests.cpp
+++ b/src/libcalamares/utils/Tests.cpp
@@ -150,7 +150,7 @@ LibCalamaresTests::testLoadSaveYaml()
     cDebug() << QDir().absolutePath() << f.fileName() << f.exists();
     QVERIFY( f.exists() );
 
-    auto map = CalamaresUtils::loadYaml( f.fileName() );
+    auto map = Calamares::YAML::load( f.fileName() );
     QVERIFY( map.contains( "sequence" ) );
     QCOMPARE( Calamares::typeOf( map[ "sequence" ] ), Calamares::ListVariantType );
 
@@ -164,10 +164,10 @@ LibCalamaresTests::testLoadSaveYaml()
         QVERIFY( v.toMap().contains( "show" ) || v.toMap().contains( "exec" ) );
     }
 
-    CalamaresUtils::saveYaml( "out.yaml", map );
+    Calamares::YAML::save( "out.yaml", map );
 
-    auto other_map = CalamaresUtils::loadYaml( "out.yaml" );
-    CalamaresUtils::saveYaml( "out2.yaml", other_map );
+    auto other_map = Calamares::YAML::load( "out.yaml" );
+    Calamares::YAML::save( "out2.yaml", other_map );
     QCOMPARE( map, other_map );
 
     QFile::remove( "out.yaml" );
@@ -222,7 +222,6 @@ LibCalamaresTests::recursiveCompareMap( const QVariantMap& a, const QVariantMap&
     }
 }
 
-
 void
 LibCalamaresTests::testLoadSaveYamlExtended()
 {
@@ -232,10 +231,10 @@ LibCalamaresTests::testLoadSaveYamlExtended()
     {
         loaded_ok = true;
         cDebug() << "Testing" << confname;
-        auto map = CalamaresUtils::loadYaml( confname, &loaded_ok );
+        auto map = Calamares::YAML::load( confname, &loaded_ok );
         QVERIFY( loaded_ok );
-        QVERIFY( CalamaresUtils::saveYaml( "out.yaml", map ) );
-        auto othermap = CalamaresUtils::loadYaml( "out.yaml", &loaded_ok );
+        QVERIFY( Calamares::YAML::save( "out.yaml", map ) );
+        auto othermap = Calamares::YAML::load( "out.yaml", &loaded_ok );
         QVERIFY( loaded_ok );
         QCOMPARE( map.keys(), othermap.keys() );
         recursiveCompareMap( map, othermap, 0 );
@@ -247,7 +246,7 @@ LibCalamaresTests::testLoadSaveYamlExtended()
 void
 LibCalamaresTests::testCommands()
 {
-    using CalamaresUtils::System;
+    using Calamares::System;
     auto r = System::runCommand( System::RunLocation::RunInHost, { "/bin/ls", "/tmp" } );
 
     QVERIFY( r.getExitCode() == 0 );
@@ -292,8 +291,8 @@ LibCalamaresTests::testCommandExpansion()
 
     QFETCH( QString, command );
     QFETCH( QString, expected );
-    CalamaresUtils::CommandLine c( command, std::chrono::seconds( 0 ) );
-    CalamaresUtils::CommandLine e = c.expand();
+    Calamares::CommandLine c( command, std::chrono::seconds( 0 ) );
+    Calamares::CommandLine e = c.expand();
 
     QCOMPARE( c.command(), command );
     QCOMPARE( e.command(), expected );
@@ -309,13 +308,13 @@ LibCalamaresTests::testUmask()
 
     // m gets the previous value of the mask (depends on the environment the
     // test is run in, might be 002, might be 077), ..
-    mode_t m = CalamaresUtils::setUMask( 022 );
-    QCOMPARE( CalamaresUtils::setUMask( m ), mode_t( 022 ) );  // But now most recently set was 022
+    mode_t m = Calamares::setUMask( 022 );
+    QCOMPARE( Calamares::setUMask( m ), mode_t( 022 ) );  // But now most recently set was 022
 
     for ( mode_t i = 0; i <= 0777 /* octal! */; ++i )
     {
         QByteArray name = ( ft.fileName() + QChar( '.' ) + QString::number( i, 8 ) ).toLatin1();
-        CalamaresUtils::UMask um( i );
+        Calamares::UMask um( i );
         int fd = creat( name, 0777 );
         QVERIFY( fd >= 0 );
         close( fd );
@@ -325,8 +324,8 @@ LibCalamaresTests::testUmask()
         QCOMPARE( mystat.st_mode & 0777, 0777 & ~i );
         QCOMPARE( unlink( name ), 0 );
     }
-    QCOMPARE( CalamaresUtils::setUMask( 022 ), m );
-    QCOMPARE( CalamaresUtils::setUMask( m ), mode_t( 022 ) );
+    QCOMPARE( Calamares::setUMask( 022 ), m );
+    QCOMPARE( Calamares::setUMask( m ), mode_t( 022 ) );
 }
 
 void
@@ -334,18 +333,18 @@ LibCalamaresTests::testEntropy()
 {
     QByteArray data;
 
-    auto r0 = CalamaresUtils::getEntropy( 0, data );
-    QCOMPARE( CalamaresUtils::EntropySource::None, r0 );
+    auto r0 = Calamares::getEntropy( 0, data );
+    QCOMPARE( Calamares::EntropySource::None, r0 );
     QCOMPARE( data.size(), 0 );
 
-    auto r1 = CalamaresUtils::getEntropy( 16, data );
-    QVERIFY( r1 != CalamaresUtils::EntropySource::None );
+    auto r1 = Calamares::getEntropy( 16, data );
+    QVERIFY( r1 != Calamares::EntropySource::None );
     QCOMPARE( data.size(), 16 );
     // This can randomly fail (but not often)
     QVERIFY( data.at( data.size() - 1 ) != char( 0xcb ) );
 
-    auto r2 = CalamaresUtils::getEntropy( 8, data );
-    QVERIFY( r2 != CalamaresUtils::EntropySource::None );
+    auto r2 = Calamares::getEntropy( 8, data );
+    QVERIFY( r2 != Calamares::EntropySource::None );
     QCOMPARE( data.size(), 8 );
     QCOMPARE( r1, r2 );
     // This can randomly fail (but not often)
@@ -357,12 +356,12 @@ LibCalamaresTests::testPrintableEntropy()
 {
     QString s;
 
-    auto r0 = CalamaresUtils::getPrintableEntropy( 0, s );
-    QCOMPARE( CalamaresUtils::EntropySource::None, r0 );
+    auto r0 = Calamares::getPrintableEntropy( 0, s );
+    QCOMPARE( Calamares::EntropySource::None, r0 );
     QCOMPARE( s.length(), 0 );
 
-    auto r1 = CalamaresUtils::getPrintableEntropy( 16, s );
-    QVERIFY( r1 != CalamaresUtils::EntropySource::None );
+    auto r1 = Calamares::getPrintableEntropy( 16, s );
+    QVERIFY( r1 != Calamares::EntropySource::None );
     QCOMPARE( s.length(), 16 );
     for ( QChar c : s )
     {
@@ -379,14 +378,14 @@ LibCalamaresTests::testOddSizedPrintable()
     QString s;
     for ( int l = 0; l <= 37; ++l )
     {
-        auto r = CalamaresUtils::getPrintableEntropy( l, s );
+        auto r = Calamares::getPrintableEntropy( l, s );
         if ( l == 0 )
         {
-            QCOMPARE( r, CalamaresUtils::EntropySource::None );
+            QCOMPARE( r, Calamares::EntropySource::None );
         }
         else
         {
-            QVERIFY( r != CalamaresUtils::EntropySource::None );
+            QVERIFY( r != Calamares::EntropySource::None );
         }
         QCOMPARE( s.length(), l );
 
@@ -443,7 +442,6 @@ LibCalamaresTests::testPointerSetter()
     QCOMPARE( special, 34 );
 }
 
-
 /* Demonstration of Traits support for has-a-method or not.
  *
  * We have two classes, c1 and c2; one has a method do_the_thing() and the
@@ -484,7 +482,6 @@ public:
     }
 };
 
-
 void
 LibCalamaresTests::testTraits()
 {
@@ -507,7 +504,7 @@ LibCalamaresTests::testTraits()
 void
 LibCalamaresTests::testVariantStringListCode()
 {
-    using namespace CalamaresUtils;
+    using namespace Calamares;
     const QString key( "strings" );
     {
         // Things that are not stringlists
@@ -547,7 +544,7 @@ LibCalamaresTests::testVariantStringListCode()
 void
 LibCalamaresTests::testVariantStringListYAMLDashed()
 {
-    using namespace CalamaresUtils;
+    using namespace Calamares;
     const QString key( "strings" );
 
     // Looks like a stringlist to me
@@ -561,7 +558,7 @@ LibCalamaresTests::testVariantStringListYAMLDashed()
            )" );
     f.close();
     bool ok = false;
-    QVariantMap m = loadYaml( f.fileName(), &ok );
+    QVariantMap m = Calamares::YAML::load( f.fileName(), &ok );
 
     QVERIFY( ok );
     QCOMPARE( m.count(), 1 );
@@ -575,7 +572,7 @@ LibCalamaresTests::testVariantStringListYAMLDashed()
 void
 LibCalamaresTests::testVariantStringListYAMLBracketed()
 {
-    using namespace CalamaresUtils;
+    using namespace Calamares;
     const QString key( "strings" );
 
     // Looks like a stringlist to me
@@ -586,7 +583,7 @@ LibCalamaresTests::testVariantStringListYAMLBracketed()
            )" );
     f.close();
     bool ok = false;
-    QVariantMap m = loadYaml( f.fileName(), &ok );
+    QVariantMap m = Calamares::YAML::load( f.fileName(), &ok );
 
     QVERIFY( ok );
     QCOMPARE( m.count(), 1 );
@@ -686,7 +683,6 @@ LibCalamaresTests::testStringTruncationShorter()
 
     using namespace Calamares::String;
 
-
     // *INDENT-OFF*
     const QString longString( R"(Some strange string artifacts appeared, leading to `{1?}` being
 displayed in various user-facing messages. These have been removed
@@ -1034,24 +1030,24 @@ LibCalamaresTests::testCalculateWorkingDirectory()
     gs->insert( "rootMountPoint", tempRoot.path() );
 
     {
-        auto [ ok, d ] = calculateWorkingDirectory( CalamaresUtils::System::RunLocation::RunInHost, QString() );
+        auto [ ok, d ] = calculateWorkingDirectory( Calamares::System::RunLocation::RunInHost, QString() );
         QVERIFY( ok );
         QCOMPARE( d, QDir::current() );
     }
     {
-        auto [ ok, d ] = calculateWorkingDirectory( CalamaresUtils::System::RunLocation::RunInTarget, QString() );
+        auto [ ok, d ] = calculateWorkingDirectory( Calamares::System::RunLocation::RunInTarget, QString() );
         QVERIFY( ok );
         QCOMPARE( d.absolutePath(), tempRoot.path() );
     }
 
     gs->remove( "rootMountPoint" );
     {
-        auto [ ok, d ] = calculateWorkingDirectory( CalamaresUtils::System::RunLocation::RunInHost, QString() );
+        auto [ ok, d ] = calculateWorkingDirectory( Calamares::System::RunLocation::RunInHost, QString() );
         QVERIFY( ok );
         QCOMPARE( d, QDir::current() );
     }
     {
-        auto [ ok, d ] = calculateWorkingDirectory( CalamaresUtils::System::RunLocation::RunInTarget, QString() );
+        auto [ ok, d ] = calculateWorkingDirectory( Calamares::System::RunLocation::RunInTarget, QString() );
         QVERIFY( !ok );
         QCOMPARE( d, QDir::current() );
     }
@@ -1121,14 +1117,13 @@ LibCalamaresTests::testRunnerOutput()
     }
 }
 
-
-CalamaresUtils::System*
+Calamares::System*
 file_setup( const QTemporaryDir& tempRoot )
 {
-    CalamaresUtils::System* ss = CalamaresUtils::System::instance();
+    Calamares::System* ss = Calamares::System::instance();
     if ( !ss )
     {
-        ss = new CalamaresUtils::System( true );
+        ss = new Calamares::System( true );
     }
 
     Calamares::GlobalStorage* gs
@@ -1157,7 +1152,7 @@ LibCalamaresTests::testReadWriteFile()
 
     QVERIFY( ss );
     {
-        auto fullPath = ss->createTargetFile( "test0", QByteArray(), CalamaresUtils::System::WriteMode::Overwrite );
+        auto fullPath = ss->createTargetFile( "test0", QByteArray(), Calamares::System::WriteMode::Overwrite );
         QVERIFY( fullPath );
         QVERIFY( !fullPath.path().isEmpty() );
 
@@ -1180,7 +1175,7 @@ LibCalamaresTests::testReadWriteFile()
     }
     // But it will if you say so explicitly
     {
-        auto fullPath = ss->createTargetFile( "test0", otherContents, CalamaresUtils::System::WriteMode::Overwrite );
+        auto fullPath = ss->createTargetFile( "test0", otherContents, Calamares::System::WriteMode::Overwrite );
         QVERIFY( fullPath );
         QVERIFY( !fullPath.path().isEmpty() );
 
@@ -1200,7 +1195,6 @@ LibCalamaresTests::testReadWriteFile()
     }
 }
 
-
 QTEST_GUILESS_MAIN( LibCalamaresTests )
 
 #include "utils/moc-warnings.h"
diff --git a/src/libcalamares/utils/Traits.h b/src/libcalamares/utils/Traits.h
index 8d7eda4a9..9c0282b78 100644
--- a/src/libcalamares/utils/Traits.h
+++ b/src/libcalamares/utils/Traits.h
@@ -13,8 +13,7 @@
 
 #include <type_traits>
 
-
-namespace CalamaresUtils
+namespace Calamares
 {
 
 /** @brief Traits machinery lives in this namespace
@@ -54,10 +53,10 @@ struct sfinae_true : std::true_type
 {
 };
 }  // namespace Traits
-}  // namespace CalamaresUtils
+}  // namespace Calamares
 
 #define DECLARE_HAS_METHOD( m ) \
-    namespace CalamaresUtils \
+    namespace Calamares \
     { \
     namespace Traits \
     { \
@@ -73,6 +72,6 @@ struct sfinae_true : std::true_type
     } \
     } \
     template < class T > \
-    using has_##m = CalamaresUtils::Traits::has_##m ::t< T >;
+    using has_##m = Calamares::Traits::has_##m ::t< T >;
 
 #endif
diff --git a/src/libcalamares/utils/UMask.cpp b/src/libcalamares/utils/UMask.cpp
index 3dd7e84f0..19e1493b8 100644
--- a/src/libcalamares/utils/UMask.cpp
+++ b/src/libcalamares/utils/UMask.cpp
@@ -14,7 +14,7 @@
 #include <sys/stat.h>
 #include <sys/types.h>
 
-namespace CalamaresUtils
+namespace Calamares
 {
 mode_t
 setUMask( mode_t u )
@@ -34,4 +34,4 @@ UMask::~UMask()
 
 static_assert( UMask::Safe == ( S_IRGRP | S_IWGRP | S_IXGRP | S_IROTH | S_IWOTH | S_IXOTH ), "Bad permissions." );
 
-}  // namespace CalamaresUtils
+}  // namespace Calamares
diff --git a/src/libcalamares/utils/UMask.h b/src/libcalamares/utils/UMask.h
index aea79fbc3..552445cb6 100644
--- a/src/libcalamares/utils/UMask.h
+++ b/src/libcalamares/utils/UMask.h
@@ -15,7 +15,7 @@
 
 #include <sys/types.h>
 
-namespace CalamaresUtils
+namespace Calamares
 {
 /** @brief Wrapper for umask(2)
  *
@@ -45,6 +45,6 @@ public:
 private:
     mode_t m_mode;
 };
-}  // namespace CalamaresUtils
+}  // namespace Calamares
 
 #endif
diff --git a/src/libcalamares/utils/Units.h b/src/libcalamares/utils/Units.h
index 3b909dc02..173f83a24 100644
--- a/src/libcalamares/utils/Units.h
+++ b/src/libcalamares/utils/Units.h
@@ -15,7 +15,7 @@
 
 #include <QtCore/QIntegerForSize>
 
-namespace CalamaresUtils
+namespace Calamares
 {
 /// @brief Type for expressing units
 using intunit_t = quint64;
@@ -170,6 +170,6 @@ bytesToSectors( qint64 bytes, qint64 blocksize )
     return alignBytesToBlockSize( alignBytesToBlockSize( bytes, blocksize ), MiBtoBytes( 1ULL ) ) / blocksize;
 }
 
-}  // namespace CalamaresUtils
+}  // namespace Calamares
 
 #endif
diff --git a/src/libcalamares/utils/Variant.cpp b/src/libcalamares/utils/Variant.cpp
index e2df5f669..98cb7efce 100644
--- a/src/libcalamares/utils/Variant.cpp
+++ b/src/libcalamares/utils/Variant.cpp
@@ -22,7 +22,7 @@
 #include <QString>
 #include <QVariantMap>
 
-namespace CalamaresUtils
+namespace Calamares
 {
 bool
 getBool( const QVariantMap& map, const QString& key, bool d )
@@ -136,4 +136,4 @@ getSubMap( const QVariantMap& map, const QString& key, bool& success, const QVar
     return d;
 }
 
-}  // namespace CalamaresUtils
+}  // namespace Calamares
diff --git a/src/libcalamares/utils/Variant.h b/src/libcalamares/utils/Variant.h
index 6bd7b8def..1c1784f44 100644
--- a/src/libcalamares/utils/Variant.h
+++ b/src/libcalamares/utils/Variant.h
@@ -19,7 +19,7 @@
 #include <QString>
 #include <QVariantMap>
 
-namespace CalamaresUtils
+namespace Calamares
 {
 /**
  * Get a bool value from a mapping with a given key; returns @p d if no value.
@@ -73,6 +73,6 @@ DLLEXPORT QVariantMap getSubMap( const QVariantMap& map,
                                  const QString& key,
                                  bool& success,
                                  const QVariantMap& d = QVariantMap() );
-}  // namespace CalamaresUtils
+}  // namespace Calamares
 
 #endif
diff --git a/src/libcalamares/utils/Yaml.cpp b/src/libcalamares/utils/Yaml.cpp
index 25077e985..cc3fd079c 100644
--- a/src/libcalamares/utils/Yaml.cpp
+++ b/src/libcalamares/utils/Yaml.cpp
@@ -21,7 +21,7 @@
 #include <QRegularExpression>
 
 void
-operator>>( const YAML::Node& node, QStringList& v )
+operator>>( const ::YAML::Node& node, QStringList& v )
 {
     for ( size_t i = 0; i < node.size(); ++i )
     {
@@ -29,33 +29,33 @@ operator>>( const YAML::Node& node, QStringList& v )
     }
 }
 
-namespace CalamaresUtils
+namespace Calamares
+{
+namespace YAML
 {
-
 QVariant
-yamlToVariant( const YAML::Node& node )
+toVariant( const ::YAML::Node& node )
 {
     switch ( node.Type() )
     {
-    case YAML::NodeType::Scalar:
-        return yamlScalarToVariant( node );
+    case ::YAML::NodeType::Scalar:
+        return scalarToVariant( node );
 
-    case YAML::NodeType::Sequence:
-        return yamlSequenceToVariant( node );
+    case ::YAML::NodeType::Sequence:
+        return sequenceToVariant( node );
 
-    case YAML::NodeType::Map:
-        return yamlMapToVariant( node );
+    case ::YAML::NodeType::Map:
+        return mapToVariant( node );
 
-    case YAML::NodeType::Null:
-    case YAML::NodeType::Undefined:
+    case ::YAML::NodeType::Null:
+    case ::YAML::NodeType::Undefined:
         return QVariant();
     }
     __builtin_unreachable();
 }
 
-
 QVariant
-yamlScalarToVariant( const YAML::Node& scalarNode )
+scalarToVariant( const ::YAML::Node& scalarNode )
 {
     static const auto yamlScalarTrueValues = QRegularExpression( "^(true|True|TRUE|on|On|ON)$" );
     static const auto yamlScalarFalseValues = QRegularExpression( "^(false|False|FALSE|off|Off|OFF)$" );
@@ -83,32 +83,30 @@ yamlScalarToVariant( const YAML::Node& scalarNode )
     return QVariant( scalarString );
 }
 
-
 QVariantList
-yamlSequenceToVariant( const YAML::Node& sequenceNode )
+sequenceToVariant( const ::YAML::Node& sequenceNode )
 {
     QVariantList vl;
-    for ( YAML::const_iterator it = sequenceNode.begin(); it != sequenceNode.end(); ++it )
+    for ( ::YAML::const_iterator it = sequenceNode.begin(); it != sequenceNode.end(); ++it )
     {
-        vl << yamlToVariant( *it );
+        vl << toVariant( *it );
     }
     return vl;
 }
 
-
 QVariantMap
-yamlMapToVariant( const YAML::Node& mapNode )
+mapToVariant( const ::YAML::Node& mapNode )
 {
     QVariantMap vm;
-    for ( YAML::const_iterator it = mapNode.begin(); it != mapNode.end(); ++it )
+    for ( ::YAML::const_iterator it = mapNode.begin(); it != mapNode.end(); ++it )
     {
-        vm.insert( QString::fromStdString( it->first.as< std::string >() ), yamlToVariant( it->second ) );
+        vm.insert( QString::fromStdString( it->first.as< std::string >() ), toVariant( it->second ) );
     }
     return vm;
 }
 
 QStringList
-yamlToStringList( const YAML::Node& listNode )
+toStringList( const ::YAML::Node& listNode )
 {
     QStringList l;
     listNode >> l;
@@ -116,21 +114,21 @@ yamlToStringList( const YAML::Node& listNode )
 }
 
 void
-explainYamlException( const YAML::Exception& e, const QByteArray& yamlData, const char* label )
+explainException( const ::YAML::Exception& e, const QByteArray& yamlData, const char* label )
 {
     cWarning() << "YAML error " << e.what() << "in" << label << '.';
-    explainYamlException( e, yamlData );
+    explainException( e, yamlData );
 }
 
 void
-explainYamlException( const YAML::Exception& e, const QByteArray& yamlData, const QString& label )
+explainException( const ::YAML::Exception& e, const QByteArray& yamlData, const QString& label )
 {
     cWarning() << "YAML error " << e.what() << "in" << label << '.';
-    explainYamlException( e, yamlData );
+    explainException( e, yamlData );
 }
 
 void
-explainYamlException( const YAML::Exception& e, const QByteArray& yamlData )
+explainException( const ::YAML::Exception& e, const QByteArray& yamlData )
 {
     if ( ( e.mark.line >= 0 ) && ( e.mark.column >= 0 ) )
     {
@@ -176,13 +174,13 @@ explainYamlException( const YAML::Exception& e, const QByteArray& yamlData )
 }
 
 QVariantMap
-loadYaml( const QFileInfo& fi, bool* ok )
+load( const QFileInfo& fi, bool* ok )
 {
-    return loadYaml( fi.absoluteFilePath(), ok );
+    return load( fi.absoluteFilePath(), ok );
 }
 
 QVariantMap
-loadYaml( const QString& filename, bool* ok )
+load( const QString& filename, bool* ok )
 {
     if ( ok )
     {
@@ -196,17 +194,16 @@ loadYaml( const QString& filename, bool* ok )
         QByteArray ba = yamlFile.readAll();
         try
         {
-            YAML::Node doc = YAML::Load( ba.constData() );
-            yamlContents = CalamaresUtils::yamlToVariant( doc );
+            ::YAML::Node doc = ::YAML::Load( ba.constData() );
+            yamlContents = toVariant( doc );
         }
-        catch ( YAML::Exception& e )
+        catch ( ::YAML::Exception& e )
         {
-            explainYamlException( e, ba, filename );
+            explainException( e, ba, filename );
             return QVariantMap();
         }
     }
 
-
     if ( yamlContents.isValid() && !yamlContents.isNull()
          && Calamares::typeOf( yamlContents ) == Calamares::MapVariantType )
     {
@@ -317,7 +314,7 @@ dumpYaml( QFile& f, const QVariantMap& map, int indent )
 }
 
 bool
-saveYaml( const QString& filename, const QVariantMap& map )
+save( const QString& filename, const QVariantMap& map )
 {
     QFile f( filename );
     if ( !f.open( QFile::WriteOnly ) )
@@ -329,5 +326,5 @@ saveYaml( const QString& filename, const QVariantMap& map )
     return dumpYaml( f, map, 0 );
 }
 
-
-}  // namespace CalamaresUtils
+}  // namespace YAML
+}  // namespace Calamares
diff --git a/src/libcalamares/utils/Yaml.h b/src/libcalamares/utils/Yaml.h
index fa2121b75..4e626eb5d 100644
--- a/src/libcalamares/utils/Yaml.h
+++ b/src/libcalamares/utils/Yaml.h
@@ -48,9 +48,11 @@ class QFileInfo;
 #endif
 
 /// @brief Appends all the elements of @p node to the string list @p v
-void operator>>( const YAML::Node& node, QStringList& v );
+void operator>>( const ::YAML::Node& node, QStringList& v );
 
-namespace CalamaresUtils
+namespace Calamares
+{
+namespace YAML
 {
 /**
  * Loads a given @p filename and returns the YAML data
@@ -58,30 +60,31 @@ namespace CalamaresUtils
  * malformed in some way, returns an empty map and sets
  * @p *ok to false. Otherwise sets @p *ok to true.
  */
-QVariantMap loadYaml( const QString& filename, bool* ok = nullptr );
+QVariantMap load( const QString& filename, bool* ok = nullptr );
 /** Convenience overload. */
-QVariantMap loadYaml( const QFileInfo&, bool* ok = nullptr );
+QVariantMap load( const QFileInfo&, bool* ok = nullptr );
 
-QVariant yamlToVariant( const YAML::Node& node );
-QVariant yamlScalarToVariant( const YAML::Node& scalarNode );
-QVariantList yamlSequenceToVariant( const YAML::Node& sequenceNode );
-QVariantMap yamlMapToVariant( const YAML::Node& mapNode );
+QVariant toVariant( const ::YAML::Node& node );
+QVariant scalarToVariant( const ::YAML::Node& scalarNode );
+QVariantList sequenceToVariant( const ::YAML::Node& sequenceNode );
+QVariantMap mapToVariant( const ::YAML::Node& mapNode );
 
 /// @brief Returns all the elements of @p listNode in a StringList
-QStringList yamlToStringList( const YAML::Node& listNode );
+QStringList toStringList( const ::YAML::Node& listNode );
 
 /// @brief Save a @p map to @p filename as YAML
-bool saveYaml( const QString& filename, const QVariantMap& map );
+bool save( const QString& filename, const QVariantMap& map );
 
 /**
  * Given an exception from the YAML parser library, explain
  * what is going on in terms of the data passed to the parser.
  * Uses @p label when labeling the data source (e.g. "netinstall data")
  */
-void explainYamlException( const YAML::Exception& e, const QByteArray& data, const char* label );
-void explainYamlException( const YAML::Exception& e, const QByteArray& data, const QString& label );
-void explainYamlException( const YAML::Exception& e, const QByteArray& data );
+void explainException( const ::YAML::Exception& e, const QByteArray& data, const char* label );
+void explainException( const ::YAML::Exception& e, const QByteArray& data, const QString& label );
+void explainException( const ::YAML::Exception& e, const QByteArray& data );
 
-}  // namespace CalamaresUtils
+}  // namespace YAML
+}  // namespace Calamares
 
 #endif
diff --git a/src/libcalamaresui/Branding.cpp b/src/libcalamaresui/Branding.cpp
index 1a79d124d..f790a9c62 100644
--- a/src/libcalamaresui/Branding.cpp
+++ b/src/libcalamaresui/Branding.cpp
@@ -57,7 +57,6 @@ Branding::instance()
     return s_instance;
 }
 
-
 // *INDENT-OFF*
 // clang-format off
 const QStringList Branding::s_stringEntryStrings =
@@ -76,7 +75,6 @@ const QStringList Branding::s_stringEntryStrings =
     "donateUrl"
 };
 
-
 const QStringList Branding::s_imageEntryStrings =
 {
     "productBanner",
@@ -150,16 +148,16 @@ Branding::WindowDimension::suffixes()
  */
 static void
 loadStrings( QMap< QString, QString >& map,
-             const YAML::Node& doc,
+             const ::YAML::Node& doc,
              const std::string& key,
              const std::function< QString( const QString& ) >& transform )
 {
     if ( !doc[ key ].IsMap() )
     {
-        throw YAML::Exception( YAML::Mark(), std::string( "Branding configuration is not a map: " ) + key );
+        throw ::YAML::Exception( ::YAML::Mark(), std::string( "Branding configuration is not a map: " ) + key );
     }
 
-    const QVariantMap config = CalamaresUtils::yamlMapToVariant( doc[ key ] );
+    const QVariantMap config = Calamares::YAML::mapToVariant( doc[ key ] );
     for ( auto it = config.constBegin(); it != config.constEnd(); ++it )
     {
         map.insert( it.key(), transform( it.value().toString() ) );
@@ -189,11 +187,11 @@ uploadServerFromMap( const QVariantMap& map )
     }
 
     bool bogus = false;  // we don't care about type-name lookup success here
-    return Branding::UploadServerInfo {
-        names.find( typestring, bogus ),
-        QUrl( urlstring, QUrl::ParsingMode::StrictMode ),
-        sizeLimitKiB >= 0 ? CalamaresUtils::KiBtoBytes( static_cast< unsigned long long >( sizeLimitKiB ) ) : -1
-    };
+    return Branding::UploadServerInfo { names.find( typestring, bogus ),
+                                        QUrl( urlstring, QUrl::ParsingMode::StrictMode ),
+                                        sizeLimitKiB >= 0
+                                            ? Calamares::KiBtoBytes( static_cast< unsigned long long >( sizeLimitKiB ) )
+                                            : -1 };
 }
 
 /** @brief Load the @p map with strings from @p config
@@ -226,7 +224,7 @@ Branding::Branding( const QString& brandingFilePath, QObject* parent, qreal devi
 
         try
         {
-            YAML::Node doc = YAML::Load( ba.constData() );
+            auto doc = ::YAML::Load( ba.constData() );
             Q_ASSERT( doc.IsMap() );
 
             m_componentName = QString::fromStdString( doc[ "componentName" ].as< std::string >() );
@@ -290,11 +288,11 @@ Branding::Branding( const QString& brandingFilePath, QObject* parent, qreal devi
                          } );
             loadStrings( m_style, doc, "style", []( const QString& s ) -> QString { return s; } );
 
-            m_uploadServer = uploadServerFromMap( CalamaresUtils::yamlMapToVariant( doc[ "uploadServer" ] ) );
+            m_uploadServer = uploadServerFromMap( Calamares::YAML::mapToVariant( doc[ "uploadServer" ] ) );
         }
-        catch ( YAML::Exception& e )
+        catch ( ::YAML::Exception& e )
         {
-            CalamaresUtils::explainYamlException( e, ba, file.fileName() );
+            Calamares::YAML::explainException( e, ba, file.fileName() );
             bail( m_descriptorPath, e.what() );
         }
 
@@ -323,7 +321,6 @@ Branding::Branding( const QString& brandingFilePath, QObject* parent, qreal devi
     validateStyleEntries( m_style );
 }
 
-
 QString
 Branding::componentDirectory() const
 {
@@ -331,14 +328,12 @@ Branding::componentDirectory() const
     return fi.absoluteDir().absolutePath();
 }
 
-
 QString
 Branding::string( Branding::StringEntry stringEntry ) const
 {
     return m_strings.value( s_stringEntryStrings.value( stringEntry ) );
 }
 
-
 QString
 Branding::styleString( Branding::StyleEntry styleEntry ) const
 {
@@ -346,7 +341,6 @@ Branding::styleString( Branding::StyleEntry styleEntry ) const
     return m_style.value( meta.valueToKey( styleEntry ) );
 }
 
-
 QString
 Branding::imagePath( Branding::ImageEntry imageEntry ) const
 {
@@ -410,7 +404,6 @@ Branding::image( const QStringList& list, const QSize& size ) const
     return QPixmap();
 }
 
-
 static QString
 _stylesheet( const QDir& dir )
 {
@@ -451,10 +444,9 @@ Branding::WindowDimension::isValid() const
     return ( unit() != none ) && ( value() > 0 );
 }
 
-
 /// @brief Get a string (empty is @p key doesn't exist) from @p key in @p doc
 static inline QString
-getString( const YAML::Node& doc, const char* key )
+getString( const ::YAML::Node& doc, const char* key )
 {
     if ( doc[ key ] )
     {
@@ -464,19 +456,19 @@ getString( const YAML::Node& doc, const char* key )
 }
 
 /// @brief Get a node (throws if @p key doesn't exist) from @p key in @p doc
-static inline YAML::Node
-get( const YAML::Node& doc, const char* key )
+static inline ::YAML::Node
+get( const ::YAML::Node& doc, const char* key )
 {
     auto r = doc[ key ];
     if ( !r.IsDefined() )
     {
-        throw YAML::KeyNotFound( YAML::Mark::null_mark(), std::string( key ) );
+        throw ::YAML::KeyNotFound( ::YAML::Mark::null_mark(), std::string( key ) );
     }
     return r;
 }
 
 static inline void
-flavorAndSide( const YAML::Node& doc, const char* key, Branding::PanelFlavor& flavor, Branding::PanelSide& side )
+flavorAndSide( const ::YAML::Node& doc, const char* key, Branding::PanelFlavor& flavor, Branding::PanelSide& side )
 {
     using PanelFlavor = Branding::PanelFlavor;
     using PanelSide = Branding::PanelSide;
@@ -552,7 +544,7 @@ flavorAndSide( const YAML::Node& doc, const char* key, Branding::PanelFlavor& fl
 }
 
 void
-Branding::initSimpleSettings( const YAML::Node& doc )
+Branding::initSimpleSettings( const ::YAML::Node& doc )
 {
     // *INDENT-OFF*
     // clang-format off
@@ -598,16 +590,16 @@ Branding::initSimpleSettings( const YAML::Node& doc )
     }
     if ( !m_windowWidth.isValid() )
     {
-        m_windowWidth = WindowDimension( CalamaresUtils::windowPreferredWidth, WindowDimensionUnit::Pixies );
+        m_windowWidth = WindowDimension( Calamares::windowPreferredWidth, WindowDimensionUnit::Pixies );
     }
     if ( !m_windowHeight.isValid() )
     {
-        m_windowHeight = WindowDimension( CalamaresUtils::windowPreferredHeight, WindowDimensionUnit::Pixies );
+        m_windowHeight = WindowDimension( Calamares::windowPreferredHeight, WindowDimensionUnit::Pixies );
     }
 }
 
 void
-Branding::initSlideshowSettings( const YAML::Node& doc )
+Branding::initSlideshowSettings( const ::YAML::Node& doc )
 {
     QDir componentDir( componentDirectory() );
 
@@ -666,5 +658,4 @@ Branding::initSlideshowSettings( const YAML::Node& doc )
     }
 }
 
-
 }  // namespace Calamares
diff --git a/src/libcalamaresui/ViewManager.cpp b/src/libcalamaresui/ViewManager.cpp
index 3daddc0dc..2cd7a9fc5 100644
--- a/src/libcalamaresui/ViewManager.cpp
+++ b/src/libcalamaresui/ViewManager.cpp
@@ -93,21 +93,18 @@ ViewManager::ViewManager( QObject* parent )
 #endif
 }
 
-
 ViewManager::~ViewManager()
 {
     m_widget->deleteLater();
     s_instance = nullptr;
 }
 
-
 QWidget*
 ViewManager::centralWidget()
 {
     return m_widget;
 }
 
-
 void
 ViewManager::addViewStep( ViewStep* step )
 {
@@ -120,7 +117,6 @@ ViewManager::addViewStep( ViewStep* step )
     }
 }
 
-
 void
 ViewManager::insertViewStep( int before, ViewStep* step )
 {
@@ -174,13 +170,12 @@ ViewManager::onInstallationFailed( const QString& message, const QString& detail
              {
                  if ( result == QDialog::Accepted && errorDialog->shouldOfferWebPaste() )
                  {
-                     CalamaresUtils::Paste::doLogUploadUI( errorDialog );
+                     Calamares::Paste::doLogUploadUI( errorDialog );
                  }
                  QApplication::quit();
              } );
 }
 
-
 void
 ViewManager::onInitFailed( const QStringList& modules )
 {
@@ -237,21 +232,18 @@ ViewManager::updateNextStatus( bool status )
     }
 }
 
-
 ViewStepList
 ViewManager::viewSteps() const
 {
     return m_steps;
 }
 
-
 ViewStep*
 ViewManager::currentStep() const
 {
     return currentStepValid() ? m_steps.value( m_currentStep ) : nullptr;
 }
 
-
 int
 ViewManager::currentStepIndex() const
 {
@@ -487,7 +479,6 @@ ViewManager::back()
     updateButtonLabels();
 }
 
-
 void
 ViewManager::quit()
 {
@@ -594,7 +585,6 @@ ViewManager::data( const QModelIndex& index, int role ) const
     }
 }
 
-
 int
 ViewManager::rowCount( const QModelIndex& parent ) const
 {
diff --git a/src/libcalamaresui/modulesystem/ModuleFactory.cpp b/src/libcalamaresui/modulesystem/ModuleFactory.cpp
index 7f44a0052..eecc85f14 100644
--- a/src/libcalamaresui/modulesystem/ModuleFactory.cpp
+++ b/src/libcalamaresui/modulesystem/ModuleFactory.cpp
@@ -29,7 +29,6 @@
 #include <QFileInfo>
 #include <QString>
 
-
 namespace Calamares
 {
 
@@ -126,7 +125,7 @@ moduleFromDescriptor( const Calamares::ModuleSystem::Descriptor& moduleDescripto
         {
             m->loadConfigurationFile( configFileName );
         }
-        catch ( YAML::Exception& e )
+        catch ( ::YAML::Exception& e )
         {
             cError() << "YAML parser error " << e.what();
             return nullptr;
@@ -135,5 +134,4 @@ moduleFromDescriptor( const Calamares::ModuleSystem::Descriptor& moduleDescripto
     return m.release();
 }
 
-
 }  // namespace Calamares
diff --git a/src/libcalamaresui/modulesystem/ModuleManager.cpp b/src/libcalamaresui/modulesystem/ModuleManager.cpp
index beca304a5..0e1a3b07e 100644
--- a/src/libcalamaresui/modulesystem/ModuleManager.cpp
+++ b/src/libcalamaresui/modulesystem/ModuleManager.cpp
@@ -34,7 +34,6 @@ ModuleManager::instance()
     return s_instance;
 }
 
-
 ModuleManager::ModuleManager( const QStringList& paths, QObject* parent )
     : QObject( parent )
     , m_paths( paths )
@@ -44,7 +43,6 @@ ModuleManager::ModuleManager( const QStringList& paths, QObject* parent )
     s_instance = this;
 }
 
-
 ModuleManager::~ModuleManager()
 {
     // The map is populated with Module::fromDescriptor(), which allocates on the heap.
@@ -54,7 +52,6 @@ ModuleManager::~ModuleManager()
     }
 }
 
-
 void
 ModuleManager::init()
 {
@@ -98,7 +95,7 @@ ModuleManager::doInit()
                     }
 
                     bool ok = false;
-                    QVariantMap moduleDescriptorMap = CalamaresUtils::loadYaml( descriptorFileInfo, &ok );
+                    QVariantMap moduleDescriptorMap = Calamares::YAML::load( descriptorFileInfo, &ok );
                     QString moduleName = ok ? moduleDescriptorMap.value( "name" ).toString() : QString();
 
                     if ( ok && !moduleName.isEmpty() && ( moduleName == currentDir.dirName() )
@@ -136,14 +133,12 @@ ModuleManager::doInit()
     QTimer::singleShot( 10, this, &ModuleManager::initDone );
 }
 
-
 QList< ModuleSystem::InstanceKey >
 ModuleManager::loadedInstanceKeys()
 {
     return m_loadedModulesByInstanceKey.keys();
 }
 
-
 Calamares::ModuleSystem::Descriptor
 ModuleManager::moduleDescriptor( const QString& name )
 {
@@ -156,7 +151,6 @@ ModuleManager::moduleInstance( const ModuleSystem::InstanceKey& instanceKey )
     return m_loadedModulesByInstanceKey.value( instanceKey );
 }
 
-
 /** @brief Returns the config file name for the given @p instanceKey
  *
  * Custom instances have custom config files, non-custom ones
@@ -185,7 +179,6 @@ getConfigFileName( const Settings::InstanceDescriptionList& descriptorList,
         }
     }
 
-
     // This should already have been checked and failed the module already
     return QString();
 }
diff --git a/src/libcalamaresui/utils/CalamaresUtilsGui.cpp b/src/libcalamaresui/utils/CalamaresUtilsGui.cpp
index a1030d03e..d3d520b35 100644
--- a/src/libcalamaresui/utils/CalamaresUtilsGui.cpp
+++ b/src/libcalamaresui/utils/CalamaresUtilsGui.cpp
@@ -22,13 +22,12 @@
 
 #define RESPATH ":/data/"
 
-namespace CalamaresUtils
+namespace Calamares
 {
 
 static int s_defaultFontSize = 0;
 static int s_defaultFontHeight = 0;
 
-
 QPixmap
 defaultPixmap( ImageType type, ImageMode mode, const QSize& size )
 {
@@ -127,7 +126,6 @@ defaultPixmap( ImageType type, ImageMode mode, const QSize& size )
     return pixmap;
 }
 
-
 void
 unmarginLayout( QLayout* layout )
 {
@@ -148,7 +146,6 @@ unmarginLayout( QLayout* layout )
     }
 }
 
-
 int
 defaultFontSize()
 {
@@ -159,7 +156,6 @@ defaultFontSize()
     return s_defaultFontSize;
 }
 
-
 int
 defaultFontHeight()
 {
@@ -173,7 +169,6 @@ defaultFontHeight()
     return s_defaultFontHeight;
 }
 
-
 QFont
 largeFont()
 {
@@ -182,7 +177,6 @@ largeFont()
     return f;
 }
 
-
 void
 setDefaultFontSize( int points )
 {
@@ -190,7 +184,6 @@ setDefaultFontSize( int points )
     s_defaultFontHeight = 0;  // Recalculate on next call to defaultFontHeight()
 }
 
-
 QSize
 defaultIconSize()
 {
@@ -198,4 +191,4 @@ defaultIconSize()
     return QSize( w, w );
 }
 
-}  // namespace CalamaresUtils
+}  // namespace Calamares
diff --git a/src/libcalamaresui/utils/CalamaresUtilsGui.h b/src/libcalamaresui/utils/CalamaresUtilsGui.h
index 5a0ee336f..1264bc129 100644
--- a/src/libcalamaresui/utils/CalamaresUtilsGui.h
+++ b/src/libcalamaresui/utils/CalamaresUtilsGui.h
@@ -19,7 +19,7 @@
 
 class QLayout;
 
-namespace CalamaresUtils
+namespace Calamares
 {
 
 /**
@@ -74,7 +74,7 @@ enum ImageMode
  * @return the new pixmap.
  */
 UIDLLEXPORT QPixmap defaultPixmap( ImageType type,
-                                   ImageMode mode = CalamaresUtils::Original,
+                                   ImageMode mode = Calamares::Original,
                                    const QSize& size = QSize( 0, 0 ) );
 
 /**
@@ -97,6 +97,6 @@ constexpr int windowMinimumHeight = 520;
 constexpr int windowPreferredWidth = 1024;
 constexpr int windowPreferredHeight = 520;
 
-}  // namespace CalamaresUtils
+}  // namespace Calamares
 
 #endif  // CALAMARESUTILSGUI_H
diff --git a/src/libcalamaresui/utils/ImageRegistry.cpp b/src/libcalamaresui/utils/ImageRegistry.cpp
index 96dd79e78..46fda0c01 100644
--- a/src/libcalamaresui/utils/ImageRegistry.cpp
+++ b/src/libcalamaresui/utils/ImageRegistry.cpp
@@ -15,7 +15,6 @@
 
 static QHash< QString, QHash< int, QHash< qint64, QPixmap > > > s_cache;
 
-
 ImageRegistry*
 ImageRegistry::instance()
 {
@@ -23,26 +22,22 @@ ImageRegistry::instance()
     return s_instance;
 }
 
-
 ImageRegistry::ImageRegistry() {}
 
-
 QIcon
-ImageRegistry::icon( const QString& image, CalamaresUtils::ImageMode mode )
+ImageRegistry::icon( const QString& image, Calamares::ImageMode mode )
 {
-    return pixmap( image, CalamaresUtils::defaultIconSize(), mode );
+    return pixmap( image, Calamares::defaultIconSize(), mode );
 }
 
-
 qint64
 ImageRegistry::cacheKey( const QSize& size )
 {
     return size.width() * 100 + size.height() * 10;
 }
 
-
 QPixmap
-ImageRegistry::pixmap( const QString& image, const QSize& size, CalamaresUtils::ImageMode mode )
+ImageRegistry::pixmap( const QString& image, const QSize& size, Calamares::ImageMode mode )
 {
     Q_ASSERT( !( size.width() < 0 || size.height() < 0 ) );
     if ( size.width() < 0 || size.height() < 0 )
@@ -112,12 +107,8 @@ ImageRegistry::pixmap( const QString& image, const QSize& size, CalamaresUtils::
     return pixmap;
 }
 
-
 void
-ImageRegistry::putInCache( const QString& image,
-                           const QSize& size,
-                           CalamaresUtils::ImageMode mode,
-                           const QPixmap& pixmap )
+ImageRegistry::putInCache( const QString& image, const QSize& size, Calamares::ImageMode mode, const QPixmap& pixmap )
 {
     QHash< qint64, QPixmap > subsubcache;
     QHash< int, QHash< qint64, QPixmap > > subcache;
diff --git a/src/libcalamaresui/utils/ImageRegistry.h b/src/libcalamaresui/utils/ImageRegistry.h
index 513fd254c..7e485baa4 100644
--- a/src/libcalamaresui/utils/ImageRegistry.h
+++ b/src/libcalamaresui/utils/ImageRegistry.h
@@ -21,13 +21,12 @@ public:
 
     explicit ImageRegistry();
 
-    QIcon icon( const QString& image, CalamaresUtils::ImageMode mode = CalamaresUtils::Original );
-    QPixmap
-    pixmap( const QString& image, const QSize& size, CalamaresUtils::ImageMode mode = CalamaresUtils::Original );
+    QIcon icon( const QString& image, Calamares::ImageMode mode = Calamares::Original );
+    QPixmap pixmap( const QString& image, const QSize& size, Calamares::ImageMode mode = Calamares::Original );
 
 private:
     qint64 cacheKey( const QSize& size );
-    void putInCache( const QString& image, const QSize& size, CalamaresUtils::ImageMode mode, const QPixmap& pixmap );
+    void putInCache( const QString& image, const QSize& size, Calamares::ImageMode mode, const QPixmap& pixmap );
 };
 
 #endif  // IMAGE_REGISTRY_H
diff --git a/src/libcalamaresui/utils/Paste.cpp b/src/libcalamaresui/utils/Paste.cpp
index d782d138e..bcabc7152 100644
--- a/src/libcalamaresui/utils/Paste.cpp
+++ b/src/libcalamaresui/utils/Paste.cpp
@@ -24,7 +24,7 @@
 #include <QUrl>
 #include <QWidget>
 
-using namespace CalamaresUtils::Units;
+using namespace Calamares::Units;
 
 /** @brief Reads the logfile, returns its contents.
  *
@@ -64,7 +64,6 @@ logFileContents( const qint64 sizeLimitBytes )
     return pasteSourceFile.read( sizeLimitBytes );
 }
 
-
 STATICTEST QString
 ficheLogUpload( const QByteArray& pasteData, const QUrl& serverUrl, QObject* parent )
 {
@@ -117,7 +116,7 @@ ficheLogUpload( const QByteArray& pasteData, const QUrl& serverUrl, QObject* par
 }
 
 QString
-CalamaresUtils::Paste::doLogUpload( QObject* parent )
+Calamares::Paste::doLogUpload( QObject* parent )
 {
     auto [ type, serverUrl, sizeLimitBytes ] = Calamares::Branding::instance()->uploadServer();
     if ( !serverUrl.isValid() )
@@ -156,10 +155,10 @@ CalamaresUtils::Paste::doLogUpload( QObject* parent )
 }
 
 QString
-CalamaresUtils::Paste::doLogUploadUI( QWidget* parent )
+Calamares::Paste::doLogUploadUI( QWidget* parent )
 {
     // These strings originated in the ViewManager class
-    QString pasteUrl = CalamaresUtils::Paste::doLogUpload( parent );
+    QString pasteUrl = Calamares::Paste::doLogUpload( parent );
     QString pasteUrlMessage;
     if ( pasteUrl.isEmpty() )
     {
@@ -189,9 +188,8 @@ CalamaresUtils::Paste::doLogUploadUI( QWidget* parent )
     return pasteUrl;
 }
 
-
 bool
-CalamaresUtils::Paste::isEnabled()
+Calamares::Paste::isEnabled()
 {
     auto [ type, serverUrl, sizeLimitBytes ] = Calamares::Branding::instance()->uploadServer();
     return type != Calamares::Branding::UploadServerType::None && sizeLimitBytes != 0;
diff --git a/src/libcalamaresui/utils/Paste.h b/src/libcalamaresui/utils/Paste.h
index c77625415..6bdcec0d6 100644
--- a/src/libcalamaresui/utils/Paste.h
+++ b/src/libcalamaresui/utils/Paste.h
@@ -15,7 +15,7 @@
 class QObject;
 class QWidget;
 
-namespace CalamaresUtils
+namespace Calamares
 {
 namespace Paste
 {
@@ -39,6 +39,6 @@ QString doLogUploadUI( QWidget* parent );
 bool isEnabled();
 }  // namespace Paste
 
-}  // namespace CalamaresUtils
+}  // namespace Calamares
 
 #endif
diff --git a/src/libcalamaresui/utils/Qml.cpp b/src/libcalamaresui/utils/Qml.cpp
index 7f3df6ee8..d731838a5 100644
--- a/src/libcalamaresui/utils/Qml.cpp
+++ b/src/libcalamaresui/utils/Qml.cpp
@@ -26,7 +26,7 @@
 
 static QDir s_qmlModulesDir( QString( CMAKE_INSTALL_FULL_DATADIR ) + "/qml" );
 
-namespace CalamaresUtils
+namespace Calamares
 {
 QDir
 qmlModulesDir()
@@ -46,9 +46,9 @@ qmlDirCandidates( bool assumeBuilddir )
     static const char QML[] = "qml";
 
     QStringList qmlDirs;
-    if ( CalamaresUtils::isAppDataDirOverridden() )
+    if ( Calamares::isAppDataDirOverridden() )
     {
-        qmlDirs << CalamaresUtils::appDataDir().absoluteFilePath( QML );
+        qmlDirs << Calamares::appDataDir().absoluteFilePath( QML );
     }
     else
     {
@@ -56,12 +56,12 @@ qmlDirCandidates( bool assumeBuilddir )
         {
             qmlDirs << QDir::current().absoluteFilePath( "src/qml" );  // In build-dir
         }
-        if ( CalamaresUtils::haveExtraDirs() )
-            for ( auto s : CalamaresUtils::extraDataDirs() )
+        if ( Calamares::haveExtraDirs() )
+            for ( auto s : Calamares::extraDataDirs() )
             {
                 qmlDirs << ( s + QML );
             }
-        qmlDirs << CalamaresUtils::appDataDir().absoluteFilePath( QML );
+        qmlDirs << Calamares::appDataDir().absoluteFilePath( QML );
     }
 
     return qmlDirs;
@@ -79,14 +79,14 @@ initQmlModulesDir()
         if ( dir.exists() && dir.isReadable() )
         {
             cDebug() << "Using Calamares QML directory" << dir.absolutePath();
-            CalamaresUtils::setQmlModulesDir( dir );
+            Calamares::setQmlModulesDir( dir );
             return true;
         }
     }
 
     cError() << "Cowardly refusing to continue startup without a QML directory."
              << Logger::DebugList( qmlDirCandidatesByPriority );
-    if ( CalamaresUtils::isAppDataDirOverridden() )
+    if ( Calamares::isAppDataDirOverridden() )
     {
         cError() << "FATAL: explicitly configured application data directory is missing qml/";
     }
@@ -240,13 +240,13 @@ registerQmlModels()
             0,
             "Global",
             []( QQmlEngine*, QJSEngine* ) -> QObject* { return Calamares::JobQueue::instance()->globalStorage(); } );
-        qmlRegisterSingletonType< Calamares::Network::Manager >(
-            "io.calamares.core",
-            1,
-            0,
-            "Network",
-            []( QQmlEngine*, QJSEngine* ) -> QObject* { return &Calamares::Network::Manager::instance(); } );
+        qmlRegisterSingletonType< Calamares::Network::Manager >( "io.calamares.core",
+                                                                 1,
+                                                                 0,
+                                                                 "Network",
+                                                                 []( QQmlEngine*, QJSEngine* ) -> QObject*
+                                                                 { return &Calamares::Network::Manager::instance(); } );
     }
 }
 
-}  // namespace CalamaresUtils
+}  // namespace Calamares
diff --git a/src/libcalamaresui/utils/Qml.h b/src/libcalamaresui/utils/Qml.h
index 2d6655e9e..6f44bc36c 100644
--- a/src/libcalamaresui/utils/Qml.h
+++ b/src/libcalamaresui/utils/Qml.h
@@ -19,7 +19,7 @@
 
 class QQuickItem;
 
-namespace CalamaresUtils
+namespace Calamares
 {
 /// @brief the extra directory where Calamares searches for QML files
 UIDLLEXPORT QDir qmlModulesDir();
@@ -85,6 +85,6 @@ UIDLLEXPORT QString searchQmlFile( QmlSearch method,
                                    const Calamares::ModuleSystem::InstanceKey& i );
 UIDLLEXPORT QString searchQmlFile( QmlSearch method, const QString& fileNameNoSuffix );
 
-}  // namespace CalamaresUtils
+}  // namespace Calamares
 
 #endif
diff --git a/src/libcalamaresui/viewpages/BlankViewStep.cpp b/src/libcalamaresui/viewpages/BlankViewStep.cpp
index ea51e3f02..c382a8edf 100644
--- a/src/libcalamaresui/viewpages/BlankViewStep.cpp
+++ b/src/libcalamaresui/viewpages/BlankViewStep.cpp
@@ -31,7 +31,7 @@ BlankViewStep::BlankViewStep( const QString& title,
 
     auto* label = new QLabel( title );
     label->setAlignment( Qt::AlignHCenter );
-    label->setFont( CalamaresUtils::largeFont() );
+    label->setFont( Calamares::largeFont() );
     layout->addWidget( label );
 
     label = new QLabel( description );
diff --git a/src/libcalamaresui/viewpages/ExecutionViewStep.cpp b/src/libcalamaresui/viewpages/ExecutionViewStep.cpp
index 7eae78cbc..0e118cde2 100644
--- a/src/libcalamaresui/viewpages/ExecutionViewStep.cpp
+++ b/src/libcalamaresui/viewpages/ExecutionViewStep.cpp
@@ -73,7 +73,7 @@ ExecutionViewStep::ExecutionViewStep( QObject* parent )
 {
     m_widget->setObjectName( "slideshow" );
     m_progressBar->setObjectName( "exec-progress" );
-    m_progressBar->setFormat(tr("%p%", "Progress percentage indicator: %p is where the number 0..100 is placed"));
+    m_progressBar->setFormat( tr( "%p%", "Progress percentage indicator: %p is where the number 0..100 is placed" ) );
     m_label->setObjectName( "exec-message" );
 
     QVBoxLayout* layout = new QVBoxLayout( m_widget );
@@ -87,10 +87,10 @@ ExecutionViewStep::ExecutionViewStep( QObject* parent )
     m_tab_widget->tabBar()->hide();
 
     layout->addWidget( m_tab_widget );
-    CalamaresUtils::unmarginLayout( layout );
+    Calamares::unmarginLayout( layout );
     layout->addLayout( bottomLayout );
 
-    bottomLayout->addSpacing( CalamaresUtils::defaultFontHeight() / 2 );
+    bottomLayout->addSpacing( Calamares::defaultFontHeight() / 2 );
     bottomLayout->addLayout( barLayout );
     bottomLayout->addWidget( m_label );
 
@@ -104,62 +104,52 @@ ExecutionViewStep::ExecutionViewStep( QObject* parent )
     auto toggleLogButton = dynamic_cast< QToolButton* >( toolBar->widgetForAction( toggleLogAction ) );
     connect( toggleLogButton, &QToolButton::clicked, this, &ExecutionViewStep::toggleLog );
 
-
     barLayout->addWidget( m_progressBar );
     barLayout->addWidget( toolBar );
 
-
     connect( JobQueue::instance(), &JobQueue::progress, this, &ExecutionViewStep::updateFromJobQueue );
 }
 
-
 QString
 ExecutionViewStep::prettyName() const
 {
     return Calamares::Settings::instance()->isSetupMode() ? tr( "Set up" ) : tr( "Install" );
 }
 
-
 QWidget*
 ExecutionViewStep::widget()
 {
     return m_widget;
 }
 
-
 void
 ExecutionViewStep::next()
 {
 }
 
-
 void
 ExecutionViewStep::back()
 {
 }
 
-
 bool
 ExecutionViewStep::isNextEnabled() const
 {
     return false;
 }
 
-
 bool
 ExecutionViewStep::isBackEnabled() const
 {
     return false;
 }
 
-
 bool
 ExecutionViewStep::isAtBeginning() const
 {
     return true;
 }
 
-
 bool
 ExecutionViewStep::isAtEnd() const
 {
@@ -206,21 +196,18 @@ ExecutionViewStep::onActivate()
     queue->start();
 }
 
-
 JobList
 ExecutionViewStep::jobs() const
 {
     return JobList();
 }
 
-
 void
 ExecutionViewStep::appendJobModuleInstanceKey( const ModuleSystem::InstanceKey& instanceKey )
 {
     m_jobInstanceKeys.append( instanceKey );
 }
 
-
 void
 ExecutionViewStep::updateFromJobQueue( qreal percent, const QString& message )
 {
@@ -253,5 +240,4 @@ ExecutionViewStep::onLeave()
     m_slideshow->changeSlideShowState( Slideshow::Stop );
 }
 
-
 }  // namespace Calamares
diff --git a/src/libcalamaresui/viewpages/QmlViewStep.cpp b/src/libcalamaresui/viewpages/QmlViewStep.cpp
index aa034ca7e..2af237c43 100644
--- a/src/libcalamaresui/viewpages/QmlViewStep.cpp
+++ b/src/libcalamaresui/viewpages/QmlViewStep.cpp
@@ -28,7 +28,6 @@
 #include <QVBoxLayout>
 #include <QWidget>
 
-
 /// @brief State-change of the QML, for changeQMLState()
 enum class QMLAction
 {
@@ -50,7 +49,7 @@ changeQMLState( QMLAction action, QQuickItem* item )
     static const char propertyName[] = "activatedInCalamares";
 
     bool activate = action == QMLAction::Start;
-    CalamaresUtils::callQmlFunction( item, activate ? "onActivate" : "onLeave" );
+    Calamares::callQmlFunction( item, activate ? "onActivate" : "onLeave" );
 
     auto property = item->property( propertyName );
     if ( property.isValid() && ( Calamares::typeOf( property ) == Calamares::BoolVariantType )
@@ -69,14 +68,14 @@ QmlViewStep::QmlViewStep( QObject* parent )
     , m_spinner( new WaitingWidget( tr( "Loading ..." ) ) )
     , m_qmlWidget( new QQuickWidget )
 {
-    CalamaresUtils::registerQmlModels();
+    Calamares::registerQmlModels();
 
     QVBoxLayout* layout = new QVBoxLayout( m_widget );
     layout->addWidget( m_spinner );
 
     m_qmlWidget->setSizePolicy( QSizePolicy::Expanding, QSizePolicy::Expanding );
     m_qmlWidget->setResizeMode( QQuickWidget::SizeRootObjectToView );
-    m_qmlWidget->engine()->addImportPath( CalamaresUtils::qmlModulesDir().absolutePath() );
+    m_qmlWidget->engine()->addImportPath( Calamares::qmlModulesDir().absolutePath() );
 
     // QML Loading starts when the configuration for the module is set.
 }
@@ -90,7 +89,6 @@ QmlViewStep::prettyName() const
     return tr( "QML Step <i>%1</i>." ).arg( moduleInstanceKey().module() );
 }
 
-
 bool
 QmlViewStep::isAtBeginning() const
 {
@@ -221,19 +219,17 @@ QmlViewStep::showQml()
     }
 }
 
-
 void
 QmlViewStep::setConfigurationMap( const QVariantMap& configurationMap )
 {
     bool ok = false;
-    m_searchMethod
-        = CalamaresUtils::qmlSearchNames().find( CalamaresUtils::getString( configurationMap, "qmlSearch" ), ok );
+    m_searchMethod = Calamares::qmlSearchNames().find( Calamares::getString( configurationMap, "qmlSearch" ), ok );
     if ( !ok )
     {
         cWarning() << "Bad QML search mode set for" << moduleInstanceKey();
     }
 
-    QString qmlFile = CalamaresUtils::getString( configurationMap, "qmlFilename" );
+    QString qmlFile = Calamares::getString( configurationMap, "qmlFilename" );
     if ( !m_qmlComponent )
     {
         m_qmlFileName = searchQmlFile( m_searchMethod, qmlFile, moduleInstanceKey() );
diff --git a/src/libcalamaresui/viewpages/QmlViewStep.h b/src/libcalamaresui/viewpages/QmlViewStep.h
index 9817851b6..eed1003ce 100644
--- a/src/libcalamaresui/viewpages/QmlViewStep.h
+++ b/src/libcalamaresui/viewpages/QmlViewStep.h
@@ -102,7 +102,7 @@ private:
     void showFailedQml();
 
     /// @brief Controls where m_name is searched
-    CalamaresUtils::QmlSearch m_searchMethod;
+    Calamares::QmlSearch m_searchMethod;
 
     QString m_name;
     QString m_qmlFileName;
diff --git a/src/libcalamaresui/viewpages/Slideshow.cpp b/src/libcalamaresui/viewpages/Slideshow.cpp
index 2aa5060b1..66a1afaaf 100644
--- a/src/libcalamaresui/viewpages/Slideshow.cpp
+++ b/src/libcalamaresui/viewpages/Slideshow.cpp
@@ -47,11 +47,11 @@ SlideshowQML::SlideshowQML( QWidget* parent )
 {
     m_qmlShow->setObjectName( "qml" );
 
-    CalamaresUtils::registerQmlModels();
+    Calamares::registerQmlModels();
 
     m_qmlShow->setSizePolicy( QSizePolicy::Expanding, QSizePolicy::Expanding );
     m_qmlShow->setResizeMode( QQuickWidget::SizeRootObjectToView );
-    m_qmlShow->engine()->addImportPath( CalamaresUtils::qmlModulesDir().absolutePath() );
+    m_qmlShow->engine()->addImportPath( Calamares::qmlModulesDir().absolutePath() );
 
     cDebug() << "QML import paths:" << Logger::DebugList( m_qmlShow->engine()->importPathList() );
 #if QT_VERSION >= QT_VERSION_CHECK( 5, 10, 0 )
@@ -149,7 +149,6 @@ SlideshowQML::startSlideShow()
     changeSlideShowState( Slideshow::Start );
 }
 
-
 /*
  * Applies V1 and V2 QML activation / deactivation:
  *  - V1 loads the QML in @p widget on activation. Sets root object property
@@ -166,7 +165,7 @@ SlideshowQML::changeSlideShowState( Action state )
     if ( Branding::instance()->slideshowAPI() == 2 )
     {
         // The QML was already loaded in the constructor, need to start it
-        CalamaresUtils::callQmlFunction( m_qmlObject, activate ? "onActivate" : "onLeave" );
+        Calamares::callQmlFunction( m_qmlObject, activate ? "onActivate" : "onLeave" );
     }
     else if ( !Calamares::Branding::instance()->slideshowPath().isEmpty() )
     {
@@ -184,7 +183,8 @@ SlideshowQML::changeSlideShowState( Action state )
     {
         static const char propertyName[] = "activatedInCalamares";
         auto property = m_qmlObject->property( propertyName );
-        if ( property.isValid() && ( Calamares::typeOf( property ) == Calamares::BoolVariantType ) && ( property.toBool() != activate ) )
+        if ( property.isValid() && ( Calamares::typeOf( property ) == Calamares::BoolVariantType )
+             && ( property.toBool() != activate ) )
         {
             m_qmlObject->setProperty( propertyName, activate );
         }
@@ -282,5 +282,4 @@ SlideshowPictures::next()
     m_label->setPixmap( QPixmap( m_images.at( m_imageIndex ) ) );
 }
 
-
 }  // namespace Calamares
diff --git a/src/libcalamaresui/widgets/WaitingWidget.cpp b/src/libcalamaresui/widgets/WaitingWidget.cpp
index 18acc11b7..1024d76ec 100644
--- a/src/libcalamaresui/widgets/WaitingWidget.cpp
+++ b/src/libcalamaresui/widgets/WaitingWidget.cpp
@@ -19,7 +19,7 @@
 WaitingWidget::WaitingWidget( const QString& text, QWidget* parent )
     : WaitingSpinnerWidget( parent, false, false )
 {
-    int spnrSize = CalamaresUtils::defaultFontHeight() * 4;
+    int spnrSize = Calamares::defaultFontHeight() * 4;
     setFixedSize( spnrSize, spnrSize );
     setInnerRadius( spnrSize / 2 );
     setLineLength( spnrSize / 2 );
@@ -51,7 +51,7 @@ CountdownWaitingWidget::CountdownWaitingWidget( std::chrono::seconds duration, Q
     , d( std::make_unique< Private >( duration, this ) )
 {
     // Set up the label first for sizing
-    const int labelHeight = qBound( 16, CalamaresUtils::defaultFontHeight() * 3 / 2, 64 );
+    const int labelHeight = qBound( 16, Calamares::defaultFontHeight() * 3 / 2, 64 );
 
     // Set up the spinner
     setFixedSize( labelHeight, labelHeight );
diff --git a/src/modules/contextualprocess/Binding.h b/src/modules/contextualprocess/Binding.h
index 77a966caf..186118ff8 100644
--- a/src/modules/contextualprocess/Binding.h
+++ b/src/modules/contextualprocess/Binding.h
@@ -19,19 +19,16 @@
 #include <QPair>
 #include <QString>
 
-namespace CalamaresUtils
-{
-class CommandList;
-}  // namespace CalamaresUtils
 namespace Calamares
 {
+class CommandList;
 class GlobalStorage;
 }  // namespace Calamares
 
-struct ValueCheck : public QPair< QString, CalamaresUtils::CommandList* >
+struct ValueCheck : public QPair< QString, Calamares::CommandList* >
 {
-    ValueCheck( const QString& value, CalamaresUtils::CommandList* commands )
-        : QPair< QString, CalamaresUtils::CommandList* >( value, commands )
+    ValueCheck( const QString& value, Calamares::CommandList* commands )
+        : QPair< QString, Calamares::CommandList* >( value, commands )
     {
     }
 
@@ -44,7 +41,7 @@ struct ValueCheck : public QPair< QString, CalamaresUtils::CommandList* >
     // by) pass-by-value in QList::append().
 
     QString value() const { return first; }
-    CalamaresUtils::CommandList* commands() const { return second; }
+    Calamares::CommandList* commands() const { return second; }
 };
 
 class ContextualProcessBinding
@@ -65,7 +62,7 @@ public:
      *
      * Ownership of the CommandList passes to this binding.
      */
-    void append( const QString& value, CalamaresUtils::CommandList* commands );
+    void append( const QString& value, Calamares::CommandList* commands );
 
     ///@brief The bound variable has @p value , run the associated commands.
     Calamares::JobResult run( const QString& value ) const;
@@ -81,8 +78,7 @@ public:
 private:
     QString m_variable;
     QList< ValueCheck > m_checks;
-    CalamaresUtils::CommandList* m_wildcard = nullptr;
+    Calamares::CommandList* m_wildcard = nullptr;
 };
 
-
 #endif
diff --git a/src/modules/contextualprocess/ContextualProcessJob.cpp b/src/modules/contextualprocess/ContextualProcessJob.cpp
index 74b259114..84f9dc69a 100644
--- a/src/modules/contextualprocess/ContextualProcessJob.cpp
+++ b/src/modules/contextualprocess/ContextualProcessJob.cpp
@@ -20,7 +20,6 @@
 #include "utils/Logger.h"
 #include "utils/Variant.h"
 
-
 ContextualProcessBinding::~ContextualProcessBinding()
 {
     m_wildcard = nullptr;
@@ -31,7 +30,7 @@ ContextualProcessBinding::~ContextualProcessBinding()
 }
 
 void
-ContextualProcessBinding::append( const QString& value, CalamaresUtils::CommandList* commands )
+ContextualProcessBinding::append( const QString& value, Calamares::CommandList* commands )
 {
     m_checks.append( ValueCheck( value, commands ) );
     if ( value == QString( "*" ) )
@@ -80,7 +79,6 @@ fetch( QString& value, QStringList& selector, int index, const QVariant& v )
     }
 }
 
-
 bool
 ContextualProcessBinding::fetch( Calamares::GlobalStorage* storage, QString& value ) const
 {
@@ -101,26 +99,22 @@ ContextualProcessBinding::fetch( Calamares::GlobalStorage* storage, QString& val
     }
 }
 
-
 ContextualProcessJob::ContextualProcessJob( QObject* parent )
     : Calamares::CppJob( parent )
 {
 }
 
-
 ContextualProcessJob::~ContextualProcessJob()
 {
     qDeleteAll( m_commands );
 }
 
-
 QString
 ContextualProcessJob::prettyName() const
 {
     return tr( "Contextual Processes Job" );
 }
 
-
 Calamares::JobResult
 ContextualProcessJob::exec()
 {
@@ -145,12 +139,11 @@ ContextualProcessJob::exec()
     return Calamares::JobResult::ok();
 }
 
-
 void
 ContextualProcessJob::setConfigurationMap( const QVariantMap& configurationMap )
 {
-    bool dontChroot = CalamaresUtils::getBool( configurationMap, "dontChroot", false );
-    qint64 timeout = CalamaresUtils::getInteger( configurationMap, "timeout", 10 );
+    bool dontChroot = Calamares::getBool( configurationMap, "dontChroot", false );
+    qint64 timeout = Calamares::getInteger( configurationMap, "timeout", 10 );
     if ( timeout < 1 )
     {
         timeout = 10;
@@ -183,8 +176,8 @@ ContextualProcessJob::setConfigurationMap( const QVariantMap& configurationMap )
                 continue;
             }
 
-            CalamaresUtils::CommandList* commands
-                = new CalamaresUtils::CommandList( valueiter.value(), !dontChroot, std::chrono::seconds( timeout ) );
+            Calamares::CommandList* commands
+                = new Calamares::CommandList( valueiter.value(), !dontChroot, std::chrono::seconds( timeout ) );
 
             binding->append( valueString, commands );
         }
diff --git a/src/modules/contextualprocess/Tests.cpp b/src/modules/contextualprocess/Tests.cpp
index aa51e1192..6679eed37 100644
--- a/src/modules/contextualprocess/Tests.cpp
+++ b/src/modules/contextualprocess/Tests.cpp
@@ -26,7 +26,7 @@
 
 QTEST_GUILESS_MAIN( ContextualProcessTests )
 
-using CommandList = CalamaresUtils::CommandList;
+using CommandList = Calamares::CommandList;
 
 ContextualProcessTests::ContextualProcessTests() {}
 
@@ -38,7 +38,7 @@ ContextualProcessTests::initTestCase()
     Logger::setupLogLevel( Logger::LOGDEBUG );
 
     // Ensure we have a system object, expect it to be a "bogus" one
-    CalamaresUtils::System* system = CalamaresUtils::System::instance();
+    Calamares::System* system = Calamares::System::instance();
     QVERIFY( system );
     QVERIFY( system->doChroot() );
 
@@ -70,7 +70,7 @@ ContextualProcessTests::testProcessListSampleConfig()
     }
 
     ContextualProcessJob job;
-    job.setConfigurationMap( CalamaresUtils::yamlMapToVariant( doc ) );
+    job.setConfigurationMap( Calamares::YAML::mapToVariant( doc ) );
 
     QCOMPARE( job.count(), 2 );  // Only "firmwareType" and "branding.shortVersion"
     QCOMPARE( job.count( "firmwareType" ), 4 );
diff --git a/src/modules/dummycpp/DummyCppJob.cpp b/src/modules/dummycpp/DummyCppJob.cpp
index 6f2e0ab0e..ab95b1056 100644
--- a/src/modules/dummycpp/DummyCppJob.cpp
+++ b/src/modules/dummycpp/DummyCppJob.cpp
@@ -27,22 +27,18 @@ DummyCppJob::DummyCppJob( QObject* parent )
 {
 }
 
-
 DummyCppJob::~DummyCppJob() {}
 
-
 QString
 DummyCppJob::prettyName() const
 {
     return tr( "Dummy C++ Job" );
 }
 
-
 static QString variantListToString( const QVariantList& variantList );
 static QString variantMapToString( const QVariantMap& variantMap );
 static QString variantHashToString( const QVariantHash& variantHash );
 
-
 static QString
 variantToString( const QVariant& variant )
 {
@@ -65,7 +61,6 @@ variantToString( const QVariant& variant )
     }
 }
 
-
 static QString
 variantListToString( const QVariantList& variantList )
 {
@@ -77,7 +72,6 @@ variantListToString( const QVariantList& variantList )
     return '{' + result.join( ',' ) + '}';
 }
 
-
 static QString
 variantMapToString( const QVariantMap& variantMap )
 {
@@ -89,7 +83,6 @@ variantMapToString( const QVariantMap& variantMap )
     return '[' + result.join( ',' ) + ']';
 }
 
-
 static QString
 variantHashToString( const QVariantHash& variantHash )
 {
@@ -101,15 +94,14 @@ variantHashToString( const QVariantHash& variantHash )
     return '<' + result.join( ',' ) + '>';
 }
 
-
 Calamares::JobResult
 DummyCppJob::exec()
 {
     // Ported from dummypython
-    CalamaresUtils::System::runCommand( CalamaresUtils::System::RunLocation::RunInHost,
-                                        QStringList() << "/bin/sh"
-                                                      << "-c"
-                                                      << "touch ~/calamares-dummycpp" );
+    Calamares::System::runCommand( Calamares::System::RunLocation::RunInHost,
+                                   QStringList() << "/bin/sh"
+                                                 << "-c"
+                                                 << "touch ~/calamares-dummycpp" );
     QString accumulator = QDateTime::currentDateTimeUtc().toString( Qt::ISODate ) + '\n';
     accumulator += QStringLiteral( "Calamares version: " ) + CALAMARES_VERSION_SHORT + '\n';
     accumulator += QStringLiteral( "This job's name: " ) + prettyName() + '\n';
@@ -141,7 +133,6 @@ DummyCppJob::exec()
     return Calamares::JobResult::ok();
 }
 
-
 void
 DummyCppJob::setConfigurationMap( const QVariantMap& configurationMap )
 {
diff --git a/src/modules/finished/Config.cpp b/src/modules/finished/Config.cpp
index d6d602db0..36f4a0bae 100644
--- a/src/modules/finished/Config.cpp
+++ b/src/modules/finished/Config.cpp
@@ -34,7 +34,6 @@ restartModes()
     return table;
 }
 
-
 Config::Config( QObject* parent )
     : QObject( parent )
 {
@@ -107,7 +106,6 @@ Config::onInstallationFailed( const QString& message, const QString& details )
     }
 }
 
-
 void
 Config::doRestart( bool restartAnyway )
 {
@@ -120,7 +118,6 @@ Config::doRestart( bool restartAnyway )
     }
 }
 
-
 void
 Config::doNotify( bool hasFailed, bool sendAnyway )
 {
@@ -176,14 +173,13 @@ Config::doNotify( bool hasFailed, bool sendAnyway )
     }
 }
 
-
 void
 Config::setConfigurationMap( const QVariantMap& configurationMap )
 {
     RestartMode mode = RestartMode::Never;
 
     //TODO:3.3 remove deprecated restart settings
-    QString restartMode = CalamaresUtils::getString( configurationMap, "restartNowMode" );
+    QString restartMode = Calamares::getString( configurationMap, "restartNowMode" );
     if ( restartMode.isEmpty() )
     {
         if ( configurationMap.contains( "restartNowEnabled" ) )
@@ -191,8 +187,8 @@ Config::setConfigurationMap( const QVariantMap& configurationMap )
             cWarning() << "Configuring the finished module with deprecated restartNowEnabled settings";
         }
 
-        bool restartNowEnabled = CalamaresUtils::getBool( configurationMap, "restartNowEnabled", false );
-        bool restartNowChecked = CalamaresUtils::getBool( configurationMap, "restartNowChecked", false );
+        bool restartNowEnabled = Calamares::getBool( configurationMap, "restartNowEnabled", false );
+        bool restartNowChecked = Calamares::getBool( configurationMap, "restartNowChecked", false );
 
         if ( !restartNowEnabled )
         {
@@ -220,7 +216,7 @@ Config::setConfigurationMap( const QVariantMap& configurationMap )
 
     if ( mode != RestartMode::Never )
     {
-        QString restartNowCommand = CalamaresUtils::getString( configurationMap, "restartNowCommand" );
+        QString restartNowCommand = Calamares::getString( configurationMap, "restartNowCommand" );
         if ( restartNowCommand.isEmpty() )
         {
             restartNowCommand = QStringLiteral( "shutdown -r now" );
@@ -228,5 +224,5 @@ Config::setConfigurationMap( const QVariantMap& configurationMap )
         m_restartNowCommand = restartNowCommand;
     }
 
-    m_notifyOnFinished = CalamaresUtils::getBool( configurationMap, "notifyOnFinished", false );
+    m_notifyOnFinished = Calamares::getBool( configurationMap, "notifyOnFinished", false );
 }
diff --git a/src/modules/fsresizer/ResizeFSJob.cpp b/src/modules/fsresizer/ResizeFSJob.cpp
index e17d30ebb..98e1e8253 100644
--- a/src/modules/fsresizer/ResizeFSJob.cpp
+++ b/src/modules/fsresizer/ResizeFSJob.cpp
@@ -35,10 +35,8 @@ ResizeFSJob::ResizeFSJob( QObject* parent )
 {
 }
 
-
 ResizeFSJob::~ResizeFSJob() {}
 
-
 QString
 ResizeFSJob::prettyName() const
 {
@@ -155,7 +153,6 @@ ResizeFSJob::findGrownEnd( ResizeFSJob::PartitionMatch m )
     return last_available;
 }
 
-
 Calamares::JobResult
 ResizeFSJob::exec()
 {
@@ -230,7 +227,6 @@ ResizeFSJob::exec()
     return Calamares::JobResult::ok();
 }
 
-
 void
 ResizeFSJob::setConfigurationMap( const QVariantMap& configurationMap )
 {
@@ -246,7 +242,7 @@ ResizeFSJob::setConfigurationMap( const QVariantMap& configurationMap )
     m_size = PartitionSize( configurationMap[ "size" ].toString() );
     m_atleast = PartitionSize( configurationMap[ "atleast" ].toString() );
 
-    m_required = CalamaresUtils::getBool( configurationMap, "required", false );
+    m_required = Calamares::getBool( configurationMap, "required", false );
 }
 
 CALAMARES_PLUGIN_FACTORY_DEFINITION( ResizeFSJobFactory, registerPlugin< ResizeFSJob >(); )
diff --git a/src/modules/fsresizer/Tests.cpp b/src/modules/fsresizer/Tests.cpp
index 3a3e5ef30..ff12310d9 100644
--- a/src/modules/fsresizer/Tests.cpp
+++ b/src/modules/fsresizer/Tests.cpp
@@ -49,10 +49,10 @@ FSResizerTests::testConfigurationRobust()
 
     // Config is missing fs and dev, so it isn't valid
     YAML::Node doc0 = YAML::Load( R"(---
-size: 100%
-atleast: 600MiB
-)" );
-    j.setConfigurationMap( CalamaresUtils::yamlMapToVariant( doc0 ) );
+                                  size: 100%
+                                  atleast: 600MiB
+                                )" );
+    j.setConfigurationMap( Calamares::YAML::mapToVariant( doc0 ) );
     QVERIFY( j.name().isEmpty() );
     QCOMPARE( j.size().unit(), SizeUnit::None );
     QCOMPARE( j.minimumSize().unit(), SizeUnit::None );
@@ -67,11 +67,11 @@ FSResizerTests::testConfigurationValues()
 
     // Check both
     YAML::Node doc0 = YAML::Load( R"(---
-fs: /
-size: 100%
-atleast: 600MiB
-)" );
-    j.setConfigurationMap( CalamaresUtils::yamlMapToVariant( doc0 ) );
+                                  fs: /
+                                  size: 100%
+                                  atleast: 600MiB
+                                )" );
+    j.setConfigurationMap( Calamares::YAML::mapToVariant( doc0 ) );
     QVERIFY( !j.name().isEmpty() );
     QCOMPARE( j.name(), QString( "/" ) );
     QCOMPARE( j.size().unit(), SizeUnit::Percent );
@@ -81,12 +81,12 @@ atleast: 600MiB
 
     // Silly config has bad atleast value
     doc0 = YAML::Load( R"(---
-fs: /
-dev: /dev/m00
-size: 72  MiB
-atleast: 127 %
-)" );
-    j.setConfigurationMap( CalamaresUtils::yamlMapToVariant( doc0 ) );
+                       fs: /
+                       dev: /dev/m00
+                       size: 72  MiB
+                       atleast: 127 %
+                     )" );
+    j.setConfigurationMap( Calamares::YAML::mapToVariant( doc0 ) );
     QVERIFY( !j.name().isEmpty() );
     QCOMPARE( j.name(), QString( "/" ) );
     QCOMPARE( j.size().unit(), SizeUnit::MiB );
@@ -96,11 +96,11 @@ atleast: 127 %
 
     // Silly config has bad atleast value
     doc0 = YAML::Load( R"(---
-dev: /dev/m00
-size: 72  MiB
-atleast: 127 %
-)" );
-    j.setConfigurationMap( CalamaresUtils::yamlMapToVariant( doc0 ) );
+                       dev: /dev/m00
+                       size: 72  MiB
+                       atleast: 127 %
+                     )" );
+    j.setConfigurationMap( Calamares::YAML::mapToVariant( doc0 ) );
     QVERIFY( !j.name().isEmpty() );
     QCOMPARE( j.name(), QString( "/dev/m00" ) );
     QCOMPARE( j.size().unit(), SizeUnit::MiB );
@@ -110,12 +110,12 @@ atleast: 127 %
 
     // Normal config
     doc0 = YAML::Load( R"(---
-fs: /
+                       fs: /
 # dev: /dev/m00
-size: 71MiB
+                       size: 71MiB
 # atleast: 127%
-)" );
-    j.setConfigurationMap( CalamaresUtils::yamlMapToVariant( doc0 ) );
+                     )" );
+    j.setConfigurationMap( Calamares::YAML::mapToVariant( doc0 ) );
     QVERIFY( !j.name().isEmpty() );
     QCOMPARE( j.name(), QString( "/" ) );
     QCOMPARE( j.size().unit(), SizeUnit::MiB );
diff --git a/src/modules/hostinfo/HostInfoJob.cpp b/src/modules/hostinfo/HostInfoJob.cpp
index 0be419978..300c4cabd 100644
--- a/src/modules/hostinfo/HostInfoJob.cpp
+++ b/src/modules/hostinfo/HostInfoJob.cpp
@@ -35,7 +35,6 @@ HostInfoJob::HostInfoJob( QObject* parent )
 
 HostInfoJob::~HostInfoJob() {}
 
-
 QString
 HostInfoJob::prettyName() const
 {
@@ -172,7 +171,6 @@ hostCPU()
 #endif
 }
 
-
 Calamares::JobResult
 HostInfoJob::exec()
 {
@@ -184,7 +182,7 @@ HostInfoJob::exec()
     gs->insert( "hostCPU", hostCPU() );
 
     // Memory can't be negative, so it's reported as unsigned long.
-    auto ram = CalamaresUtils::BytesToMiB( qint64( CalamaresUtils::System::instance()->getTotalMemoryB().first ) );
+    auto ram = Calamares::BytesToMiB( qint64( Calamares::System::instance()->getTotalMemoryB().first ) );
     if ( ram )
     {
         gs->insert( "hostRAMMiB", ram );
diff --git a/src/modules/initcpio/InitcpioJob.cpp b/src/modules/initcpio/InitcpioJob.cpp
index df995ccbf..39e9a8bc5 100644
--- a/src/modules/initcpio/InitcpioJob.cpp
+++ b/src/modules/initcpio/InitcpioJob.cpp
@@ -25,7 +25,6 @@ InitcpioJob::InitcpioJob( QObject* parent )
 
 InitcpioJob::~InitcpioJob() {}
 
-
 QString
 InitcpioJob::prettyName() const
 {
@@ -56,7 +55,7 @@ fixPermissions( const QDir& d )
 Calamares::JobResult
 InitcpioJob::exec()
 {
-    CalamaresUtils::UMask m( CalamaresUtils::UMask::Safe );
+    Calamares::UMask m( Calamares::UMask::Safe );
 
     if ( m_unsafe )
     {
@@ -64,7 +63,7 @@ InitcpioJob::exec()
     }
     else
     {
-        QDir d( CalamaresUtils::System::instance()->targetPath( "/boot" ) );
+        QDir d( Calamares::System::instance()->targetPath( "/boot" ) );
         if ( d.exists() )
         {
             fixPermissions( d );
@@ -83,16 +82,16 @@ InitcpioJob::exec()
     }
 
     cDebug() << "Updating initramfs with kernel" << m_kernel;
-    auto r = CalamaresUtils::System::instance()->targetEnvCommand( command, QString(), QString() /* no timeout , 0 */ );
+    auto r = Calamares::System::instance()->targetEnvCommand( command, QString(), QString() /* no timeout , 0 */ );
     return r.explainProcess( "mkinitcpio", std::chrono::seconds( 10 ) /* fake timeout */ );
 }
 
 void
 InitcpioJob::setConfigurationMap( const QVariantMap& configurationMap )
 {
-    m_kernel = CalamaresUtils::getString( configurationMap, "kernel" );
+    m_kernel = Calamares::getString( configurationMap, "kernel" );
 
-    m_unsafe = CalamaresUtils::getBool( configurationMap, "be_unsafe", false );
+    m_unsafe = Calamares::getBool( configurationMap, "be_unsafe", false );
 }
 
 CALAMARES_PLUGIN_FACTORY_DEFINITION( InitcpioJobFactory, registerPlugin< InitcpioJob >(); )
diff --git a/src/modules/initramfs/InitramfsJob.cpp b/src/modules/initramfs/InitramfsJob.cpp
index d83b4673c..aa4eec097 100644
--- a/src/modules/initramfs/InitramfsJob.cpp
+++ b/src/modules/initramfs/InitramfsJob.cpp
@@ -21,18 +21,16 @@ InitramfsJob::InitramfsJob( QObject* parent )
 
 InitramfsJob::~InitramfsJob() {}
 
-
 QString
 InitramfsJob::prettyName() const
 {
     return tr( "Creating initramfs." );
 }
 
-
 Calamares::JobResult
 InitramfsJob::exec()
 {
-    CalamaresUtils::UMask m( CalamaresUtils::UMask::Safe );
+    Calamares::UMask m( Calamares::UMask::Safe );
 
     cDebug() << "Updating initramfs with kernel" << m_kernel;
 
@@ -45,7 +43,7 @@ InitramfsJob::exec()
         // First make sure we generate a safe initramfs with suitable permissions.
         static const char confFile[] = "/etc/initramfs-tools/conf.d/calamares-safe-initramfs.conf";
         static const char contents[] = "UMASK=0077\n";
-        if ( CalamaresUtils::System::instance()->createTargetFile( confFile, QByteArray( contents ) ).failed() )
+        if ( Calamares::System::instance()->createTargetFile( confFile, QByteArray( contents ) ).failed() )
         {
             cWarning() << Logger::SubEntry << "Could not configure safe UMASK for initramfs.";
             // But continue anyway.
@@ -53,27 +51,26 @@ InitramfsJob::exec()
     }
 
     // And then do the ACTUAL work.
-    auto r = CalamaresUtils::System::instance()->targetEnvCommand(
+    auto r = Calamares::System::instance()->targetEnvCommand(
         { "update-initramfs", "-k", m_kernel, "-c", "-t" }, QString(), QString() /* no timeout, 0 */ );
     return r.explainProcess( "update-initramfs", std::chrono::seconds( 10 ) /* fake timeout */ );
 }
 
-
 void
 InitramfsJob::setConfigurationMap( const QVariantMap& configurationMap )
 {
-    m_kernel = CalamaresUtils::getString( configurationMap, "kernel" );
+    m_kernel = Calamares::getString( configurationMap, "kernel" );
     if ( m_kernel.isEmpty() )
     {
         m_kernel = QStringLiteral( "all" );
     }
     else if ( m_kernel == "$uname" )
     {
-        auto r = CalamaresUtils::System::runCommand( CalamaresUtils::System::RunLocation::RunInHost,
-                                                     { "/bin/uname", "-r" },
-                                                     QString(),
-                                                     QString(),
-                                                     std::chrono::seconds( 3 ) );
+        auto r = Calamares::System::runCommand( Calamares::System::RunLocation::RunInHost,
+                                                { "/bin/uname", "-r" },
+                                                QString(),
+                                                QString(),
+                                                std::chrono::seconds( 3 ) );
         if ( r.getExitCode() == 0 )
         {
             m_kernel = r.getOutput();
@@ -87,7 +84,7 @@ InitramfsJob::setConfigurationMap( const QVariantMap& configurationMap )
         }
     }
 
-    m_unsafe = CalamaresUtils::getBool( configurationMap, "be_unsafe", false );
+    m_unsafe = Calamares::getBool( configurationMap, "be_unsafe", false );
 }
 
 CALAMARES_PLUGIN_FACTORY_DEFINITION( InitramfsJobFactory, registerPlugin< InitramfsJob >(); )
diff --git a/src/modules/initramfs/Tests.cpp b/src/modules/initramfs/Tests.cpp
index f1c9b5e24..6f9639db7 100644
--- a/src/modules/initramfs/Tests.cpp
+++ b/src/modules/initramfs/Tests.cpp
@@ -34,7 +34,7 @@ InitramfsTests::initTestCase()
     Logger::setupLogLevel( Logger::LOGDEBUG );
 
     (void)new Calamares::JobQueue();
-    (void)new CalamaresUtils::System( true );
+    (void)new Calamares::System( true );
 }
 
 static const char contents[] = "UMASK=0077\n";
@@ -51,7 +51,7 @@ InitramfsTests::testCreateTargetFile()
 {
     static const char short_confFile[] = "/calamares-safe-umask";
 
-    auto* s = CalamaresUtils::System::instance();
+    auto* s = Calamares::System::instance();
     auto r = s->createTargetFile( short_confFile, QByteArray( contents ) );
     QVERIFY( r.failed() );
     QVERIFY( !r );
diff --git a/src/modules/keyboard/Config.cpp b/src/modules/keyboard/Config.cpp
index c158efcbf..8fa549bf9 100644
--- a/src/modules/keyboard/Config.cpp
+++ b/src/modules/keyboard/Config.cpp
@@ -43,7 +43,6 @@ xkbmap_model_args( const QString& model )
     return r;
 }
 
-
 /* Returns stringlist with suitable setxkbmap command-line arguments
  * to set the given @p layout and @p variant.
  */
@@ -213,7 +212,10 @@ Config::Config( QObject* parent )
     connect( m_keyboardModelsModel, &KeyboardModelsModel::currentIndexChanged, this, &Config::selectionChange );
     connect( m_keyboardLayoutsModel, &KeyboardLayoutModel::currentIndexChanged, this, &Config::selectionChange );
     connect( m_keyboardVariantsModel, &KeyboardVariantsModel::currentIndexChanged, this, &Config::selectionChange );
-    connect( m_KeyboardGroupSwitcherModel, &KeyboardGroupsSwitchersModel::currentIndexChanged, this, &Config::selectionChange );
+    connect( m_KeyboardGroupSwitcherModel,
+             &KeyboardGroupsSwitchersModel::currentIndexChanged,
+             this,
+             &Config::selectionChange );
 
     m_selectedModel = m_keyboardModelsModel->key( m_keyboardModelsModel->currentIndex() );
     m_selectedLayout = m_keyboardLayoutsModel->item( m_keyboardLayoutsModel->currentIndex() ).first;
@@ -306,7 +308,6 @@ Config::xkbApply()
                                                { m_additionalLayoutInfo.additionalVariant, m_selectedVariant },
                                                m_additionalLayoutInfo.groupSwitcher ) );
 
-
         cDebug() << "xkbmap selection changed to: " << m_selectedLayout << '-' << m_selectedVariant << "(added "
                  << m_additionalLayoutInfo.additionalLayout << "-" << m_additionalLayoutInfo.additionalVariant
                  << " since current layout is not ASCII-capable)";
@@ -319,7 +320,6 @@ Config::xkbApply()
     m_setxkbmapTimer.disconnect( this );
 }
 
-
 KeyboardModelsModel*
 Config::keyboardModels() const
 {
@@ -706,7 +706,7 @@ Config::updateVariants( const QPersistentModelIndex& currentItem, QString curren
 void
 Config::setConfigurationMap( const QVariantMap& configurationMap )
 {
-    using namespace CalamaresUtils;
+    using namespace Calamares;
     bool isX11 = QGuiApplication::platformName() == "xcb";
 
     const auto xorgConfDefault = QStringLiteral( "00-keyboard.conf" );
diff --git a/src/modules/keyboard/KeyboardLayoutModel.cpp b/src/modules/keyboard/KeyboardLayoutModel.cpp
index 8ba30b02e..c3a8104f7 100644
--- a/src/modules/keyboard/KeyboardLayoutModel.cpp
+++ b/src/modules/keyboard/KeyboardLayoutModel.cpp
@@ -27,11 +27,9 @@ retranslateKeyboardModels()
     {
         s_kbtranslator = new QTranslator;
     }
-    (void)CalamaresUtils::loadTranslator(
-        CalamaresUtils::translatorLocaleName(), QStringLiteral( "kb_" ), s_kbtranslator );
+    (void)Calamares::loadTranslator( Calamares::translatorLocaleName(), QStringLiteral( "kb_" ), s_kbtranslator );
 }
 
-
 XKBListModel::XKBListModel( QObject* parent )
     : QAbstractListModel( parent )
 {
@@ -141,7 +139,6 @@ KeyboardModelsModel::KeyboardModelsModel( QObject* parent )
     setCurrentIndex();  // If pc105 was seen, select it now
 }
 
-
 KeyboardLayoutModel::KeyboardLayoutModel( QObject* parent )
     : QAbstractListModel( parent )
 {
@@ -155,7 +152,6 @@ KeyboardLayoutModel::rowCount( const QModelIndex& parent ) const
     return m_layouts.count();
 }
 
-
 QVariant
 KeyboardLayoutModel::data( const QModelIndex& index, int role ) const
 {
@@ -252,7 +248,6 @@ KeyboardLayoutModel::currentIndex() const
     return m_currentIndex;
 }
 
-
 KeyboardVariantsModel::KeyboardVariantsModel( QObject* parent )
     : XKBListModel( parent )
 {
diff --git a/src/modules/license/LicensePage.cpp b/src/modules/license/LicensePage.cpp
index eb609b2da..df035adfb 100644
--- a/src/modules/license/LicensePage.cpp
+++ b/src/modules/license/LicensePage.cpp
@@ -67,8 +67,8 @@ LicenseEntry::LicenseEntry( const QVariantMap& conf )
     m_prettyVendor = conf.value( "vendor" ).toString();
     m_url = QUrl( conf[ "url" ].toString() );
 
-    m_required = CalamaresUtils::getBool( conf, "required", false );
-    m_expand = CalamaresUtils::getBool( conf, "expand", false );
+    m_required = Calamares::getBool( conf, "required", false );
+    m_expand = Calamares::getBool( conf, "expand", false );
 
     bool ok = false;
     QString typeString = conf.value( "type", "software" ).toString();
@@ -85,7 +85,6 @@ LicenseEntry::isLocal() const
     return m_url.isLocalFile();
 }
 
-
 LicensePage::LicensePage( QWidget* parent )
     : QWidget( parent )
     , m_isNextEnabled( false )
@@ -94,14 +93,14 @@ LicensePage::LicensePage( QWidget* parent )
 {
     ui->setupUi( this );
 
-    // ui->verticalLayout->insertSpacing( 1, CalamaresUtils::defaultFontHeight() );
-    CalamaresUtils::unmarginLayout( ui->verticalLayout );
+    // ui->verticalLayout->insertSpacing( 1, Calamares::defaultFontHeight() );
+    Calamares::unmarginLayout( ui->verticalLayout );
 
     ui->acceptFrame->setStyleSheet( mustAccept );
     {
         // The inner frame was unmargined (above), reinstate margins so all are
         // the same *x* (an x-height, approximately).
-        const auto x = CalamaresUtils::defaultFontHeight() / 2;
+        const auto x = Calamares::defaultFontHeight() / 2;
         ui->acceptFrame->layout()->setContentsMargins( x, x, x, x );
     }
 
@@ -172,7 +171,6 @@ LicensePage::retranslate()
     }
 }
 
-
 bool
 LicensePage::isNextEnabled() const
 {
diff --git a/src/modules/locale/Config.cpp b/src/modules/locale/Config.cpp
index 2a0ea79c5..d8489eccd 100644
--- a/src/modules/locale/Config.cpp
+++ b/src/modules/locale/Config.cpp
@@ -395,7 +395,6 @@ Config::currentTimezoneName() const
     return QString();
 }
 
-
 static inline QString
 localeLabel( const QString& s )
 {
@@ -429,7 +428,7 @@ Config::prettyStatus() const
 static inline void
 getLocaleGenLines( const QVariantMap& configurationMap, QStringList& localeGenLines )
 {
-    QString localeGenPath = CalamaresUtils::getString( configurationMap, "localeGenPath" );
+    QString localeGenPath = Calamares::getString( configurationMap, "localeGenPath" );
     if ( localeGenPath.isEmpty() )
     {
         localeGenPath = QStringLiteral( "/etc/locale.gen" );
@@ -440,8 +439,8 @@ getLocaleGenLines( const QVariantMap& configurationMap, QStringList& localeGenLi
 static inline void
 getAdjustLiveTimezone( const QVariantMap& configurationMap, bool& adjustLiveTimezone )
 {
-    adjustLiveTimezone = CalamaresUtils::getBool(
-        configurationMap, "adjustLiveTimezone", Calamares::Settings::instance()->doChroot() );
+    adjustLiveTimezone
+        = Calamares::getBool( configurationMap, "adjustLiveTimezone", Calamares::Settings::instance()->doChroot() );
 #ifdef DEBUG_TIMEZONES
     if ( adjustLiveTimezone )
     {
@@ -461,8 +460,8 @@ getAdjustLiveTimezone( const QVariantMap& configurationMap, bool& adjustLiveTime
 static inline void
 getStartingTimezone( const QVariantMap& configurationMap, Calamares::GeoIP::RegionZonePair& startingTimezone )
 {
-    QString region = CalamaresUtils::getString( configurationMap, "region" );
-    QString zone = CalamaresUtils::getString( configurationMap, "zone" );
+    QString region = Calamares::getString( configurationMap, "region" );
+    QString zone = Calamares::getString( configurationMap, "zone" );
     if ( !region.isEmpty() && !zone.isEmpty() )
     {
         startingTimezone = Calamares::GeoIP::RegionZonePair( region, zone );
@@ -473,7 +472,7 @@ getStartingTimezone( const QVariantMap& configurationMap, Calamares::GeoIP::Regi
             = Calamares::GeoIP::RegionZonePair( QStringLiteral( "America" ), QStringLiteral( "New_York" ) );
     }
 
-    if ( CalamaresUtils::getBool( configurationMap, "useSystemTimezone", false ) )
+    if ( Calamares::getBool( configurationMap, "useSystemTimezone", false ) )
     {
         auto systemtz = Calamares::GeoIP::splitTZString( QTimeZone::systemTimeZoneId() );
         if ( systemtz.isValid() )
@@ -488,12 +487,12 @@ static inline void
 getGeoIP( const QVariantMap& configurationMap, std::unique_ptr< Calamares::GeoIP::Handler >& geoip )
 {
     bool ok = false;
-    QVariantMap map = CalamaresUtils::getSubMap( configurationMap, "geoip", ok );
+    QVariantMap map = Calamares::getSubMap( configurationMap, "geoip", ok );
     if ( ok )
     {
-        QString url = CalamaresUtils::getString( map, "url" );
-        QString style = CalamaresUtils::getString( map, "style" );
-        QString selector = CalamaresUtils::getString( map, "selector" );
+        QString url = Calamares::getString( map, "url" );
+        QString style = Calamares::getString( map, "style" );
+        QString selector = Calamares::getString( map, "selector" );
 
         geoip = std::make_unique< Calamares::GeoIP::Handler >( style, url, selector );
         if ( !geoip->isValid() )
@@ -543,7 +542,6 @@ Config::finalizeGlobalStorage() const
     updateGSLocation( gs, currentLocation() );
 }
 
-
 void
 Config::startGeoIP()
 {
diff --git a/src/modules/locale/LocaleViewStep.cpp b/src/modules/locale/LocaleViewStep.cpp
index 03d1d4f5e..c2183e3ab 100644
--- a/src/modules/locale/LocaleViewStep.cpp
+++ b/src/modules/locale/LocaleViewStep.cpp
@@ -25,7 +25,6 @@
 #include <QBoxLayout>
 #include <QLabel>
 
-
 CALAMARES_PLUGIN_FACTORY_DEFINITION( LocaleViewStepFactory, registerPlugin< LocaleViewStep >(); )
 
 LocaleViewStep::LocaleViewStep( QObject* parent )
@@ -37,12 +36,11 @@ LocaleViewStep::LocaleViewStep( QObject* parent )
 {
     QBoxLayout* mainLayout = new QHBoxLayout;
     m_widget->setLayout( mainLayout );
-    CalamaresUtils::unmarginLayout( mainLayout );
+    Calamares::unmarginLayout( mainLayout );
 
     emit nextStatusChanged( m_nextEnabled );
 }
 
-
 LocaleViewStep::~LocaleViewStep()
 {
     if ( m_widget && m_widget->parent() == nullptr )
@@ -51,7 +49,6 @@ LocaleViewStep::~LocaleViewStep()
     }
 }
 
-
 void
 LocaleViewStep::setUpPage()
 {
@@ -68,63 +65,54 @@ LocaleViewStep::setUpPage()
     emit nextStatusChanged( m_nextEnabled );
 }
 
-
 QString
 LocaleViewStep::prettyName() const
 {
     return tr( "Location" );
 }
 
-
 QString
 LocaleViewStep::prettyStatus() const
 {
     return m_config->prettyStatus();
 }
 
-
 QWidget*
 LocaleViewStep::widget()
 {
     return m_widget;
 }
 
-
 bool
 LocaleViewStep::isNextEnabled() const
 {
     return m_nextEnabled;
 }
 
-
 bool
 LocaleViewStep::isBackEnabled() const
 {
     return true;
 }
 
-
 bool
 LocaleViewStep::isAtBeginning() const
 {
     return true;
 }
 
-
 bool
 LocaleViewStep::isAtEnd() const
 {
     return true;
 }
 
-
 Calamares::JobList
 LocaleViewStep::jobs() const
 {
     return m_config->createJobs();
 }
 
-
 void
 LocaleViewStep::onActivate()
 {
@@ -136,14 +124,12 @@ LocaleViewStep::onActivate()
     m_actualWidget->onActivate();
 }
 
-
 void
 LocaleViewStep::onLeave()
 {
     m_config->finalizeGlobalStorage();
 }
 
-
 void
 LocaleViewStep::setConfigurationMap( const QVariantMap& configurationMap )
 {
diff --git a/src/modules/locale/SetTimezoneJob.cpp b/src/modules/locale/SetTimezoneJob.cpp
index 675cca8af..075a4db96 100644
--- a/src/modules/locale/SetTimezoneJob.cpp
+++ b/src/modules/locale/SetTimezoneJob.cpp
@@ -19,7 +19,6 @@
 #include <QDir>
 #include <QFileInfo>
 
-
 SetTimezoneJob::SetTimezoneJob( const QString& region, const QString& zone )
     : Calamares::Job()
     , m_region( region )
@@ -27,14 +26,12 @@ SetTimezoneJob::SetTimezoneJob( const QString& region, const QString& zone )
 {
 }
 
-
 QString
 SetTimezoneJob::prettyName() const
 {
     return tr( "Set timezone to %1/%2" ).arg( m_region ).arg( m_zone );
 }
 
-
 Calamares::JobResult
 SetTimezoneJob::exec()
 {
@@ -42,7 +39,7 @@ SetTimezoneJob::exec()
     // to a running timedated over D-Bus), and we have code that works
     if ( !Calamares::Settings::instance()->doChroot() )
     {
-        int ec = CalamaresUtils::System::instance()->targetEnvCall(
+        int ec = Calamares::System::instance()->targetEnvCall(
             { "timedatectl", "set-timezone", m_region + '/' + m_zone } );
 
         if ( !ec )
@@ -63,9 +60,9 @@ SetTimezoneJob::exec()
                                             tr( "Bad path: %1" ).arg( zoneFile.absolutePath() ) );
 
     // Make sure /etc/localtime doesn't exist, otherwise symlinking will fail
-    CalamaresUtils::System::instance()->targetEnvCall( { "rm", "-f", localtimeSlink } );
+    Calamares::System::instance()->targetEnvCall( { "rm", "-f", localtimeSlink } );
 
-    int ec = CalamaresUtils::System::instance()->targetEnvCall( { "ln", "-s", zoneinfoPath, localtimeSlink } );
+    int ec = Calamares::System::instance()->targetEnvCall( { "ln", "-s", zoneinfoPath, localtimeSlink } );
     if ( ec )
         return Calamares::JobResult::error(
             tr( "Cannot set timezone." ),
diff --git a/src/modules/luksbootkeyfile/LuksBootKeyFileJob.cpp b/src/modules/luksbootkeyfile/LuksBootKeyFileJob.cpp
index b8999de50..59167532a 100644
--- a/src/modules/luksbootkeyfile/LuksBootKeyFileJob.cpp
+++ b/src/modules/luksbootkeyfile/LuksBootKeyFileJob.cpp
@@ -106,19 +106,19 @@ static const char keyfile[] = "/crypto_keyfile.bin";
 static bool
 generateTargetKeyfile()
 {
-    CalamaresUtils::UMask m( CalamaresUtils::UMask::Safe );
+    Calamares::UMask m( Calamares::UMask::Safe );
 
     // Get the data
     QByteArray entropy;
-    auto entropySource = CalamaresUtils::getEntropy( 2048, entropy );
-    if ( entropySource != CalamaresUtils::EntropySource::URandom )
+    auto entropySource = Calamares::getEntropy( 2048, entropy );
+    if ( entropySource != Calamares::EntropySource::URandom )
     {
         cWarning() << "Could not get entropy from /dev/urandom for LUKS.";
         return false;
     }
 
-    auto fileResult = CalamaresUtils::System::instance()->createTargetFile(
-        keyfile, entropy, CalamaresUtils::System::WriteMode::Overwrite );
+    auto fileResult
+        = Calamares::System::instance()->createTargetFile( keyfile, entropy, Calamares::System::WriteMode::Overwrite );
     entropy.fill( 'A' );
     if ( !fileResult )
     {
@@ -128,7 +128,7 @@ generateTargetKeyfile()
 
     // Give ample time to check that the file was created correctly;
     // we actually expect ls to return pretty-much-instantly.
-    auto r = CalamaresUtils::System::instance()->targetEnvCommand(
+    auto r = Calamares::System::instance()->targetEnvCommand(
         { "ls", "-la", "/" }, QString(), QString(), std::chrono::seconds( 5 ) );
     cDebug() << "In target system after creating LUKS file" << r.getOutput();
     return true;
@@ -138,7 +138,7 @@ static bool
 setupLuks( const LuksDevice& d, const QString& luks2Hash )
 {
     // Get luksDump for this device
-    auto luks_dump = CalamaresUtils::System::instance()->targetEnvCommand(
+    auto luks_dump = Calamares::System::instance()->targetEnvCommand(
         { QStringLiteral( "cryptsetup" ), QStringLiteral( "luksDump" ), d.device },
         QString(),
         QString(),
@@ -187,8 +187,8 @@ setupLuks( const LuksDevice& d, const QString& luks2Hash )
         args.insert( 2, "--pbkdf" );
         args.insert( 3, luks2Hash );
     }
-    auto r = CalamaresUtils::System::instance()->targetEnvCommand(
-        args, QString(), d.passphrase, std::chrono::seconds( 60 ) );
+    auto r
+        = Calamares::System::instance()->targetEnvCommand( args, QString(), d.passphrase, std::chrono::seconds( 60 ) );
     if ( r.getExitCode() != 0 )
     {
         cWarning() << "Could not configure LUKS keyfile on" << d.device << ':' << r.getOutput() << "(exit code"
@@ -337,7 +337,7 @@ LuksBootKeyFileJob::setConfigurationMap( const QVariantMap& configurationMap )
             return QString();  // Empty is used internally for "default from cryptsetup"
         }
         return value.toLower();
-    }( CalamaresUtils::getString( configurationMap, QStringLiteral( "luks2Hash" ), QString() ) );
+    }( Calamares::getString( configurationMap, QStringLiteral( "luks2Hash" ), QString() ) );
 }
 
 CALAMARES_PLUGIN_FACTORY_DEFINITION( LuksBootKeyFileJobFactory, registerPlugin< LuksBootKeyFileJob >(); )
diff --git a/src/modules/luksopenswaphookcfg/LOSHJob.cpp b/src/modules/luksopenswaphookcfg/LOSHJob.cpp
index 219c89b49..6a54074cb 100644
--- a/src/modules/luksopenswaphookcfg/LOSHJob.cpp
+++ b/src/modules/luksopenswaphookcfg/LOSHJob.cpp
@@ -29,7 +29,6 @@ LOSHJob::LOSHJob( QObject* parent )
 
 LOSHJob::~LOSHJob() {}
 
-
 QString
 LOSHJob::prettyName() const
 {
@@ -69,8 +68,8 @@ write_openswap_conf( const QString& path, QStringList& contents, const LOSHInfo&
         }
         cDebug() << "Writing" << contents.length() << "line configuration to" << path;
         // \n between each two lines, and a \n at the end
-        CalamaresUtils::System::instance()->createTargetFile(
-            path, contents.join( '\n' ).append( '\n' ).toUtf8(), CalamaresUtils::System::WriteMode::Overwrite );
+        Calamares::System::instance()->createTargetFile(
+            path, contents.join( '\n' ).append( '\n' ).toUtf8(), Calamares::System::WriteMode::Overwrite );
     }
     else
     {
@@ -81,7 +80,7 @@ write_openswap_conf( const QString& path, QStringList& contents, const LOSHInfo&
 Calamares::JobResult
 LOSHJob::exec()
 {
-    const auto* sys = CalamaresUtils::System::instance();
+    const auto* sys = Calamares::System::instance();
     if ( !sys )
     {
         return Calamares::JobResult::internalError(
@@ -116,7 +115,7 @@ LOSHJob::exec()
 void
 LOSHJob::setConfigurationMap( const QVariantMap& configurationMap )
 {
-    m_configFilePath = CalamaresUtils::getString(
+    m_configFilePath = Calamares::getString(
         configurationMap, QStringLiteral( "configFilePath" ), QStringLiteral( "/etc/openswap.conf" ) );
 }
 
@@ -164,8 +163,7 @@ globalStoragePartitionInfo( Calamares::GlobalStorage* gs, LOSHInfo& info )
     if ( !btrfsRootSubvolume.isEmpty() )
     {
         Calamares::String::removeLeading( btrfsRootSubvolume, '/' );
-        info.keyfile_device_mount_options
-            = QStringLiteral( "--options=subvol=" ) + btrfsRootSubvolume;
+        info.keyfile_device_mount_options = QStringLiteral( "--options=subvol=" ) + btrfsRootSubvolume;
     }
 }
 
diff --git a/src/modules/luksopenswaphookcfg/Tests.cpp b/src/modules/luksopenswaphookcfg/Tests.cpp
index 840bd9355..ae2a407a9 100644
--- a/src/modules/luksopenswaphookcfg/Tests.cpp
+++ b/src/modules/luksopenswaphookcfg/Tests.cpp
@@ -48,7 +48,6 @@ LOSHTests::initTestCase()
     cDebug() << "LOSH test started.";
 }
 
-
 void
 LOSHTests::testAssignmentExtraction_data()
 {
@@ -65,7 +64,6 @@ LOSHTests::testAssignmentExtraction_data()
     // We look for assignments, but only for single-words
     QTest::newRow( "comment-space-eq" ) << QStringLiteral( "# Check that a = b" ) << QString();
 
-
     QTest::newRow( "assignment1" ) << QStringLiteral( "a=1" ) << QStringLiteral( "a" );
     QTest::newRow( "assignment2" ) << QStringLiteral( "a = 1" ) << QStringLiteral( "a" );
     QTest::newRow( "assignment3" ) << QStringLiteral( "#   a=1" ) << QStringLiteral( "a" );
@@ -90,13 +88,13 @@ LOSHTests::testAssignmentExtraction()
     QCOMPARE( get_assignment_part( line ), match );
 }
 
-static CalamaresUtils::System*
+static Calamares::System*
 file_setup( const QTemporaryDir& tempRoot )
 {
-    CalamaresUtils::System* ss = CalamaresUtils::System::instance();
+    Calamares::System* ss = Calamares::System::instance();
     if ( !ss )
     {
-        ss = new CalamaresUtils::System( true );
+        ss = new Calamares::System( true );
     }
 
     Calamares::GlobalStorage* gs
@@ -136,7 +134,6 @@ LOSHTests::testLOSHInfo()
     QCOMPARE( i.replacementFor( QStringLiteral( "duck" ) ), QString() );
 }
 
-
 void
 LOSHTests::testConfigWriting()
 {
@@ -199,7 +196,6 @@ LOSHTests::testConfigWriting()
     QCOMPARE( contents.at( 1 ), QStringLiteral( "swap_device=/dev/zram/0.zram" ) );  // expected line
 }
 
-
 void
 LOSHTests::testJob()
 {
@@ -245,7 +241,6 @@ LOSHTests::testJob()
     }
 }
 
-
 QTEST_GUILESS_MAIN( LOSHTests )
 
 #include "utils/moc-warnings.h"
diff --git a/src/modules/machineid/MachineIdJob.cpp b/src/modules/machineid/MachineIdJob.cpp
index fef63828a..7114391a9 100644
--- a/src/modules/machineid/MachineIdJob.cpp
+++ b/src/modules/machineid/MachineIdJob.cpp
@@ -27,10 +27,8 @@ MachineIdJob::MachineIdJob( QObject* parent )
 {
 }
 
-
 MachineIdJob::~MachineIdJob() {}
 
-
 QString
 MachineIdJob::prettyName() const
 {
@@ -58,7 +56,7 @@ MachineIdJob::exec()
     QString target_systemd_machineid_file = QStringLiteral( "/etc/machine-id" );
     QString target_dbus_machineid_file = QStringLiteral( "/var/lib/dbus/machine-id" );
 
-    const CalamaresUtils::System* system = CalamaresUtils::System::instance();
+    const Calamares::System* system = Calamares::System::instance();
 
     // Clear existing files
     for ( const auto& entropy_file : m_entropy_files )
@@ -77,7 +75,7 @@ MachineIdJob::exec()
     //Create new files
     for ( const auto& entropy_file : m_entropy_files )
     {
-        if ( !CalamaresUtils::System::instance()->createTargetParentDirs( entropy_file ) )
+        if ( !Calamares::System::instance()->createTargetParentDirs( entropy_file ) )
         {
             return Calamares::JobResult::error(
                 QObject::tr( "Directory not found" ),
@@ -131,20 +129,19 @@ MachineIdJob::exec()
     return Calamares::JobResult::ok();
 }
 
-
 void
 MachineIdJob::setConfigurationMap( const QVariantMap& map )
 {
-    m_systemd = CalamaresUtils::getBool( map, "systemd", false );
+    m_systemd = Calamares::getBool( map, "systemd", false );
 
-    m_dbus = CalamaresUtils::getBool( map, "dbus", false );
+    m_dbus = Calamares::getBool( map, "dbus", false );
     if ( map.contains( "dbus-symlink" ) )
     {
-        m_dbus_symlink = CalamaresUtils::getBool( map, "dbus-symlink", false );
+        m_dbus_symlink = Calamares::getBool( map, "dbus-symlink", false );
     }
     else if ( map.contains( "symlink" ) )
     {
-        m_dbus_symlink = CalamaresUtils::getBool( map, "symlink", false );
+        m_dbus_symlink = Calamares::getBool( map, "symlink", false );
         cWarning() << "MachineId: configuration setting *symlink* is deprecated, use *dbus-symlink*.";
     }
     // else it's still false from the constructor
@@ -152,9 +149,9 @@ MachineIdJob::setConfigurationMap( const QVariantMap& map )
     // ignore it, though, if dbus is false
     m_dbus_symlink = m_dbus && m_dbus_symlink;
 
-    m_entropy_copy = CalamaresUtils::getBool( map, "entropy-copy", false );
-    m_entropy_files = CalamaresUtils::getStringList( map, "entropy-files" );
-    if ( CalamaresUtils::getBool( map, "entropy", false ) )
+    m_entropy_copy = Calamares::getBool( map, "entropy-copy", false );
+    m_entropy_files = Calamares::getStringList( map, "entropy-files" );
+    if ( Calamares::getBool( map, "entropy", false ) )
     {
         cWarning() << "MachineId:: configuration setting *entropy* is deprecated, use *entropy-files* instead.";
         m_entropy_files.append( QStringLiteral( "/var/lib/urandom/random-seed" ) );
diff --git a/src/modules/machineid/Tests.cpp b/src/modules/machineid/Tests.cpp
index 0ad3e9e8b..14c358c87 100644
--- a/src/modules/machineid/Tests.cpp
+++ b/src/modules/machineid/Tests.cpp
@@ -104,7 +104,6 @@ MachineIdTests::testConfigEntropyFiles()
     }
 }
 
-
 void
 MachineIdTests::testCopyFile()
 {
@@ -165,7 +164,7 @@ MachineIdTests::testJob()
     cDebug() << "Temporary files as" << QDir::tempPath();
 
     // Ensure we have a system object, expect it to be a "bogus" one
-    CalamaresUtils::System* system = CalamaresUtils::System::instance();
+    Calamares::System* system = Calamares::System::instance();
     QVERIFY( system );
     QVERIFY( system->doChroot() );
 
diff --git a/src/modules/machineid/Workers.cpp b/src/modules/machineid/Workers.cpp
index 79d075c86..2e8776f43 100644
--- a/src/modules/machineid/Workers.cpp
+++ b/src/modules/machineid/Workers.cpp
@@ -95,7 +95,7 @@ createNewEntropy( int poolSize, const QString& rootMountPoint, const QString& fi
     }
 
     QByteArray data;
-    CalamaresUtils::EntropySource source = CalamaresUtils::getEntropy( poolSize, data );
+    Calamares::EntropySource source = Calamares::getEntropy( poolSize, data );
     entropyFile.write( data );
     entropyFile.close();
     if ( entropyFile.size() < data.length() )
@@ -106,14 +106,13 @@ createNewEntropy( int poolSize, const QString& rootMountPoint, const QString& fi
     {
         cWarning() << "Entropy data is" << data.length() << "bytes, rather than poolSize" << poolSize;
     }
-    if ( source != CalamaresUtils::EntropySource::URandom )
+    if ( source != Calamares::EntropySource::URandom )
     {
         cWarning() << "Entropy data for pool is low-quality.";
     }
     return Calamares::JobResult::ok();
 }
 
-
 Calamares::JobResult
 createEntropy( const EntropyGeneration kind, const QString& rootMountPoint, const QString& fileName )
 {
@@ -144,7 +143,7 @@ createEntropy( const EntropyGeneration kind, const QString& rootMountPoint, cons
 static Calamares::JobResult
 runCmd( const QStringList& cmd )
 {
-    auto r = CalamaresUtils::System::instance()->targetEnvCommand( cmd );
+    auto r = Calamares::System::instance()->targetEnvCommand( cmd );
     if ( r.getExitCode() )
     {
         return r.explainProcess( cmd, std::chrono::seconds( 0 ) );
diff --git a/src/modules/netinstall/Config.cpp b/src/modules/netinstall/Config.cpp
index 40ba73f71..36b357c1e 100644
--- a/src/modules/netinstall/Config.cpp
+++ b/src/modules/netinstall/Config.cpp
@@ -42,7 +42,6 @@ Config::retranslate()
     emit titleLabelChanged( titleLabel() );
 }
 
-
 QString
 Config::status() const
 {
@@ -64,7 +63,6 @@ Config::status() const
     __builtin_unreachable();
 }
 
-
 void
 Config::setStatus( Status s )
 {
@@ -84,7 +82,6 @@ Config::titleLabel() const
     return m_titleLabel ? m_titleLabel->get() : QString();
 }
 
-
 void
 Config::loadGroupList( const QVariantList& groupData )
 {
@@ -111,15 +108,14 @@ Config::loadingDone()
     emit statusReady();
 }
 
-
 void
 Config::setConfigurationMap( const QVariantMap& configurationMap )
 {
-    setRequired( CalamaresUtils::getBool( configurationMap, "required", false ) );
+    setRequired( Calamares::getBool( configurationMap, "required", false ) );
 
     // Get the translations, if any
     bool bogus = false;
-    auto label = CalamaresUtils::getSubMap( configurationMap, "label", bogus );
+    auto label = Calamares::getSubMap( configurationMap, "label", bogus );
     // Use a different class name for translation lookup because the
     // .. table of strings lives in NetInstallViewStep.cpp and moving them
     // .. around is annoying for translators.
diff --git a/src/modules/netinstall/LoaderQueue.cpp b/src/modules/netinstall/LoaderQueue.cpp
index 97ddd11b8..d10e45f81 100644
--- a/src/modules/netinstall/LoaderQueue.cpp
+++ b/src/modules/netinstall/LoaderQueue.cpp
@@ -92,7 +92,6 @@ LoaderQueue::load()
     QMetaObject::invokeMethod( this, "fetchNext", Qt::QueuedConnection );
 }
 
-
 void
 LoaderQueue::fetchNext()
 {
@@ -180,16 +179,16 @@ LoaderQueue::dataArrived()
     QByteArray yamlData = m_reply->readAll();
     try
     {
-        YAML::Node groups = YAML::Load( yamlData.constData() );
+        auto groups = ::YAML::Load( yamlData.constData() );
 
         if ( groups.IsSequence() )
         {
-            m_config->loadGroupList( CalamaresUtils::yamlSequenceToVariant( groups ) );
+            m_config->loadGroupList( Calamares::YAML::sequenceToVariant( groups ) );
             next.done( m_config->statusCode() == Config::Status::Ok );
         }
         else if ( groups.IsMap() )
         {
-            auto map = CalamaresUtils::yamlMapToVariant( groups );
+            auto map = Calamares::YAML::mapToVariant( groups );
             m_config->loadGroupList( map.value( "groups" ).toList() );
             next.done( m_config->statusCode() == Config::Status::Ok );
         }
@@ -198,9 +197,9 @@ LoaderQueue::dataArrived()
             cWarning() << "NetInstall groups data does not form a sequence.";
         }
     }
-    catch ( YAML::Exception& e )
+    catch ( ::YAML::Exception& e )
     {
-        CalamaresUtils::explainYamlException( e, yamlData, "netinstall groups data" );
+        Calamares::YAML::explainException( e, yamlData, "netinstall groups data" );
         m_config->setStatus( Config::Status::FailedBadData );
     }
 }
diff --git a/src/modules/netinstall/PackageModel.cpp b/src/modules/netinstall/PackageModel.cpp
index 68ed784d6..01a0205e7 100644
--- a/src/modules/netinstall/PackageModel.cpp
+++ b/src/modules/netinstall/PackageModel.cpp
@@ -274,7 +274,7 @@ PackageModel::setupModelData( const QVariantList& groupList, PackageTreeItem* pa
         PackageTreeItem* item = new PackageTreeItem( groupMap, PackageTreeItem::GroupTag { parent } );
         if ( groupMap.contains( "selected" ) )
         {
-            item->setSelected( CalamaresUtils::getBool( groupMap, "selected", false ) ? Qt::Checked : Qt::Unchecked );
+            item->setSelected( Calamares::getBool( groupMap, "selected", false ) ? Qt::Checked : Qt::Unchecked );
         }
         if ( groupMap.contains( "packages" ) )
         {
diff --git a/src/modules/netinstall/PackageTreeItem.cpp b/src/modules/netinstall/PackageTreeItem.cpp
index d5b680ea0..ddb08c5c7 100644
--- a/src/modules/netinstall/PackageTreeItem.cpp
+++ b/src/modules/netinstall/PackageTreeItem.cpp
@@ -37,7 +37,7 @@ parentCriticality( const QVariantMap& groupData, PackageTreeItem* parent )
 {
     if ( groupData.contains( "critical" ) )
     {
-        return CalamaresUtils::getBool( groupData, "critical", false );
+        return Calamares::getBool( groupData, "critical", false );
     }
     return parent ? parent->isCritical() : false;
 }
@@ -55,9 +55,9 @@ PackageTreeItem::PackageTreeItem( const QString& packageName, PackageTreeItem* p
 
 PackageTreeItem::PackageTreeItem( const QVariantMap& groupData, PackageTag&& parent )
     : m_parentItem( parent.parent )
-    , m_packageName( CalamaresUtils::getString( groupData, "name" ) )
+    , m_packageName( Calamares::getString( groupData, "name" ) )
     , m_selected( parentCheckState( parent.parent ) )
-    , m_description( CalamaresUtils::getString( groupData, "description" ) )
+    , m_description( Calamares::getString( groupData, "description" ) )
     , m_isGroup( false )
     , m_isCritical( parent.parent ? parent.parent->isCritical() : false )
     , m_showReadOnly( parent.parent ? parent.parent->isImmutable() : false )
@@ -67,18 +67,18 @@ PackageTreeItem::PackageTreeItem( const QVariantMap& groupData, PackageTag&& par
 
 PackageTreeItem::PackageTreeItem( const QVariantMap& groupData, GroupTag&& parent )
     : m_parentItem( parent.parent )
-    , m_name( CalamaresUtils::getString( groupData, "name" ) )
+    , m_name( Calamares::getString( groupData, "name" ) )
     , m_selected( parentCheckState( parent.parent ) )
-    , m_description( CalamaresUtils::getString( groupData, "description" ) )
-    , m_preScript( CalamaresUtils::getString( groupData, "pre-install" ) )
-    , m_postScript( CalamaresUtils::getString( groupData, "post-install" ) )
-    , m_source( CalamaresUtils::getString( groupData, "source" ) )
+    , m_description( Calamares::getString( groupData, "description" ) )
+    , m_preScript( Calamares::getString( groupData, "pre-install" ) )
+    , m_postScript( Calamares::getString( groupData, "post-install" ) )
+    , m_source( Calamares::getString( groupData, "source" ) )
     , m_isGroup( true )
     , m_isCritical( parentCriticality( groupData, parent.parent ) )
-    , m_isHidden( CalamaresUtils::getBool( groupData, "hidden", false ) )
-    , m_showReadOnly( CalamaresUtils::getBool( groupData, "immutable", false ) )
-    , m_showNoncheckable( CalamaresUtils::getBool( groupData, "noncheckable", false ) )
-    , m_startExpanded( CalamaresUtils::getBool( groupData, "expanded", false ) )
+    , m_isHidden( Calamares::getBool( groupData, "hidden", false ) )
+    , m_showReadOnly( Calamares::getBool( groupData, "immutable", false ) )
+    , m_showNoncheckable( Calamares::getBool( groupData, "noncheckable", false ) )
+    , m_startExpanded( Calamares::getBool( groupData, "expanded", false ) )
 {
 }
 
@@ -151,7 +151,6 @@ PackageTreeItem::parentItem() const
     return m_parentItem;
 }
 
-
 bool
 PackageTreeItem::hiddenSelected() const
 {
@@ -179,7 +178,6 @@ PackageTreeItem::hiddenSelected() const
     return m_selected != Qt::Unchecked;
 }
 
-
 void
 PackageTreeItem::setSelected( Qt::CheckState isSelected )
 {
@@ -239,7 +237,6 @@ PackageTreeItem::updateSelected()
     }
 }
 
-
 void
 PackageTreeItem::setChildrenSelected( Qt::CheckState isSelected )
 {
diff --git a/src/modules/netinstall/Tests.cpp b/src/modules/netinstall/Tests.cpp
index 6b1db020c..8e93322bc 100644
--- a/src/modules/netinstall/Tests.cpp
+++ b/src/modules/netinstall/Tests.cpp
@@ -131,8 +131,8 @@ static const char doc_with_expanded[] =
 void
 ItemTests::testExtendedPackage()
 {
-    YAML::Node yamldoc = YAML::Load( doc );
-    QVariantList yamlContents = CalamaresUtils::yamlSequenceToVariant( yamldoc );
+    auto yamldoc = ::YAML::Load( doc );
+    QVariantList yamlContents = Calamares::YAML::sequenceToVariant( yamldoc );
 
     QCOMPARE( yamlContents.length(), 1 );
 
@@ -154,12 +154,11 @@ ItemTests::testExtendedPackage()
     QVERIFY( p == p );
 }
 
-
 void
 ItemTests::testGroup()
 {
-    YAML::Node yamldoc = YAML::Load( doc );
-    QVariantList yamlContents = CalamaresUtils::yamlSequenceToVariant( yamldoc );
+    auto yamldoc = ::YAML::Load( doc );
+    QVariantList yamlContents = Calamares::YAML::sequenceToVariant( yamldoc );
 
     QCOMPARE( yamlContents.length(), 1 );
 
@@ -209,8 +208,8 @@ ItemTests::testCompare()
     PackageTreeItem r3( "<root>", nullptr );
     QVERIFY( r3 == r2 );
 
-    YAML::Node yamldoc = YAML::Load( doc );  // See testGroup()
-    QVariantList yamlContents = CalamaresUtils::yamlSequenceToVariant( yamldoc );
+    auto yamldoc = ::YAML::Load( doc );  // See testGroup()
+    QVariantList yamlContents = Calamares::YAML::sequenceToVariant( yamldoc );
     QCOMPARE( yamlContents.length(), 1 );
 
     PackageTreeItem p3( yamlContents[ 0 ].toMap(), PackageTreeItem::GroupTag { nullptr } );
@@ -219,10 +218,10 @@ ItemTests::testCompare()
     QVERIFY( p1 != p3 );
     QCOMPARE( p3.childCount(), 0 );  // Doesn't load the packages: list
 
-    PackageTreeItem p4( CalamaresUtils::yamlSequenceToVariant( YAML::Load( doc ) )[ 0 ].toMap(),
+    PackageTreeItem p4( Calamares::YAML::sequenceToVariant( YAML::Load( doc ) )[ 0 ].toMap(),
                         PackageTreeItem::GroupTag { nullptr } );
     QVERIFY( p3 == p4 );
-    PackageTreeItem p5( CalamaresUtils::yamlSequenceToVariant( YAML::Load( doc_no_packages ) )[ 0 ].toMap(),
+    PackageTreeItem p5( Calamares::YAML::sequenceToVariant( YAML::Load( doc_no_packages ) )[ 0 ].toMap(),
                         PackageTreeItem::GroupTag { nullptr } );
     QVERIFY( p3 == p5 );
 }
@@ -257,12 +256,11 @@ ItemTests::recursiveCompare( PackageModel& l, PackageModel& r )
     return recursiveCompare( l.m_rootItem, r.m_rootItem );
 }
 
-
 void
 ItemTests::testModel()
 {
-    YAML::Node yamldoc = YAML::Load( doc );  // See testGroup()
-    QVariantList yamlContents = CalamaresUtils::yamlSequenceToVariant( yamldoc );
+    auto yamldoc = ::YAML::Load( doc );  // See testGroup()
+    QVariantList yamlContents = Calamares::YAML::sequenceToVariant( yamldoc );
     QCOMPARE( yamlContents.length(), 1 );
 
     PackageModel m0( nullptr );
@@ -275,7 +273,7 @@ ItemTests::testModel()
     checkAllSelected( m0.m_rootItem );
 
     PackageModel m2( nullptr );
-    m2.setupModelData( CalamaresUtils::yamlSequenceToVariant( YAML::Load( doc_with_expanded ) ) );
+    m2.setupModelData( Calamares::YAML::sequenceToVariant( YAML::Load( doc_with_expanded ) ) );
     QCOMPARE( m2.m_hiddenItems.count(), 0 );
     QCOMPARE( m2.rowCount(), 1 );  // Group, now the packages expanded but not counted
     QCOMPARE( m2.rowCount( m2.index( 0, 0 ) ), 3 );  // The packages
@@ -324,7 +322,7 @@ ItemTests::testExampleFiles()
         QVERIFY( !contents.isEmpty() );
 
         YAML::Node yamldoc = YAML::Load( contents.constData() );
-        QVariantList yamlContents = CalamaresUtils::yamlSequenceToVariant( yamldoc );
+        QVariantList yamlContents = Calamares::YAML::sequenceToVariant( yamldoc );
 
         PackageModel m1( nullptr );
         m1.setupModelData( yamlContents );
@@ -388,7 +386,7 @@ ItemTests::testUrlFallback()
         try
         {
             YAML::Node yamldoc = YAML::Load( correctedDocument.toUtf8() );
-            auto map = CalamaresUtils::yamlToVariant( yamldoc ).toMap();
+            auto map = Calamares::YAML::toVariant( yamldoc ).toMap();
             QVERIFY( map.count() > 0 );
             c.setConfigurationMap( map );
         }
@@ -420,7 +418,6 @@ ItemTests::testUrlFallback()
     QCOMPARE( c.model()->rowCount(), count );
 }
 
-
 QTEST_GUILESS_MAIN( ItemTests )
 
 #include "utils/moc-warnings.h"
diff --git a/src/modules/notesqml/NotesQmlViewStep.cpp b/src/modules/notesqml/NotesQmlViewStep.cpp
index cacd932b0..ff346bd62 100644
--- a/src/modules/notesqml/NotesQmlViewStep.cpp
+++ b/src/modules/notesqml/NotesQmlViewStep.cpp
@@ -27,7 +27,7 @@ void
 NotesQmlViewStep::setConfigurationMap( const QVariantMap& configurationMap )
 {
     bool qmlLabel_ok = false;
-    auto qmlLabel = CalamaresUtils::getSubMap( configurationMap, "qmlLabel", qmlLabel_ok );
+    auto qmlLabel = Calamares::getSubMap( configurationMap, "qmlLabel", qmlLabel_ok );
 
     if ( qmlLabel.contains( "notes" ) )
     {
diff --git a/src/modules/oemid/OEMViewStep.cpp b/src/modules/oemid/OEMViewStep.cpp
index 0663efdbd..bf3700164 100644
--- a/src/modules/oemid/OEMViewStep.cpp
+++ b/src/modules/oemid/OEMViewStep.cpp
@@ -40,7 +40,6 @@ public:
 
 OEMPage::~OEMPage() {}
 
-
 OEMViewStep::OEMViewStep( QObject* parent )
     : Calamares::ViewStep( parent )
     , m_widget( nullptr )
@@ -125,7 +124,6 @@ OEMViewStep::prettyStatus() const
     return tr( "Set the OEM Batch Identifier to <code>%1</code>." ).arg( m_user_batchIdentifier );
 }
 
-
 QWidget*
 OEMViewStep::widget()
 {
@@ -145,7 +143,7 @@ OEMViewStep::jobs() const
 void
 OEMViewStep::setConfigurationMap( const QVariantMap& configurationMap )
 {
-    m_conf_batchIdentifier = CalamaresUtils::getString( configurationMap, "batch-identifier" );
+    m_conf_batchIdentifier = Calamares::getString( configurationMap, "batch-identifier" );
     m_user_batchIdentifier = substitute( m_conf_batchIdentifier );
 }
 
diff --git a/src/modules/packagechooser/Config.cpp b/src/modules/packagechooser/Config.cpp
index 6a064dcd2..1d5b74f2c 100644
--- a/src/modules/packagechooser/Config.cpp
+++ b/src/modules/packagechooser/Config.cpp
@@ -20,7 +20,6 @@
 #include <memory>
 #endif
 
-
 #include "GlobalStorage.h"
 #include "JobQueue.h"
 #include "compat/Variant.h"
@@ -223,7 +222,6 @@ Config::updateGlobalStorage() const
     }
 }
 
-
 void
 Config::setPackageChoice( const QString& packageChoice )
 {
@@ -312,9 +310,9 @@ fillModel( PackageListModel* model, const QVariantList& items )
 void
 Config::setConfigurationMap( const QVariantMap& configurationMap )
 {
-    m_mode = packageChooserModeNames().find( CalamaresUtils::getString( configurationMap, "mode" ),
+    m_mode = packageChooserModeNames().find( Calamares::getString( configurationMap, "mode" ),
                                              PackageChooserMode::Required );
-    m_method = PackageChooserMethodNames().find( CalamaresUtils::getString( configurationMap, "method" ),
+    m_method = PackageChooserMethodNames().find( Calamares::getString( configurationMap, "method" ),
                                                  PackageChooserMethod::Legacy );
 
     if ( m_method == PackageChooserMethod::Legacy )
@@ -326,7 +324,7 @@ Config::setConfigurationMap( const QVariantMap& configurationMap )
     {
         fillModel( m_model, configurationMap.value( "items" ).toList() );
 
-        QString default_item_id = CalamaresUtils::getString( configurationMap, "default" );
+        QString default_item_id = Calamares::getString( configurationMap, "default" );
         if ( !default_item_id.isEmpty() )
         {
             for ( int item_n = 0; item_n < m_model->packageCount(); ++item_n )
@@ -344,7 +342,7 @@ Config::setConfigurationMap( const QVariantMap& configurationMap )
     }
     else
     {
-        setPackageChoice( CalamaresUtils::getString( configurationMap, "packageChoice" ) );
+        setPackageChoice( Calamares::getString( configurationMap, "packageChoice" ) );
         if ( m_method != PackageChooserMethod::Legacy )
         {
             cWarning() << "Single-selection QML module must use 'Legacy' method.";
@@ -352,7 +350,7 @@ Config::setConfigurationMap( const QVariantMap& configurationMap )
     }
 
     bool labels_ok = false;
-    auto labels = CalamaresUtils::getSubMap( configurationMap, "labels", labels_ok );
+    auto labels = Calamares::getSubMap( configurationMap, "labels", labels_ok );
     if ( labels_ok )
     {
         if ( labels.contains( "step" ) )
diff --git a/src/modules/packagechooser/ItemAppData.cpp b/src/modules/packagechooser/ItemAppData.cpp
index dd1eb1fb7..0986230f5 100644
--- a/src/modules/packagechooser/ItemAppData.cpp
+++ b/src/modules/packagechooser/ItemAppData.cpp
@@ -179,7 +179,7 @@ getNameAndSummary( const QDomNode& n )
 PackageItem
 fromAppData( const QVariantMap& item_map )
 {
-    QString fileName = CalamaresUtils::getString( item_map, "appdata" );
+    QString fileName = Calamares::getString( item_map, "appdata" );
     if ( fileName.isEmpty() )
     {
         cWarning() << "Can't load AppData without a suitable key.";
@@ -197,7 +197,7 @@ fromAppData( const QVariantMap& item_map )
     if ( !componentNode.isNull() && componentNode.tagName() == "component" )
     {
         // An "id" entry in the Calamares config overrides ID in the AppData
-        QString id = CalamaresUtils::getString( item_map, "id" );
+        QString id = Calamares::getString( item_map, "id" );
         if ( id.isEmpty() )
         {
             id = getChildText( componentNode, "id" );
@@ -208,7 +208,7 @@ fromAppData( const QVariantMap& item_map )
         }
 
         // A "screenshot" entry in the Calamares config overrides AppData
-        QString screenshotPath = CalamaresUtils::getString( item_map, "screenshot" );
+        QString screenshotPath = Calamares::getString( item_map, "screenshot" );
         if ( screenshotPath.isEmpty() )
         {
             screenshotPath = getScreenshotPath( componentNode );
diff --git a/src/modules/packagechooser/ItemAppStream.cpp b/src/modules/packagechooser/ItemAppStream.cpp
index e286bd1ff..d83af6f91 100644
--- a/src/modules/packagechooser/ItemAppStream.cpp
+++ b/src/modules/packagechooser/ItemAppStream.cpp
@@ -112,7 +112,7 @@ fromComponent( AppStream::Component& component )
 PackageItem
 fromAppStream( AppStream::Pool& pool, const QVariantMap& item_map )
 {
-    QString appstreamId = CalamaresUtils::getString( item_map, "appstream" );
+    QString appstreamId = Calamares::getString( item_map, "appstream" );
     if ( appstreamId.isEmpty() )
     {
         cWarning() << "Can't load AppStream without a suitable appstreamId.";
@@ -134,8 +134,8 @@ fromAppStream( AppStream::Pool& pool, const QVariantMap& item_map )
     auto r = fromComponent( itemList.first() );
     if ( r.isValid() )
     {
-        QString id = CalamaresUtils::getString( item_map, "id" );
-        QString screenshotPath = CalamaresUtils::getString( item_map, "screenshot" );
+        QString id = Calamares::getString( item_map, "id" );
+        QString screenshotPath = Calamares::getString( item_map, "screenshot" );
         if ( !id.isEmpty() )
         {
             r.id = id;
diff --git a/src/modules/packagechooser/PackageChooserPage.cpp b/src/modules/packagechooser/PackageChooserPage.cpp
index 721329c1b..eeffbfe12 100644
--- a/src/modules/packagechooser/PackageChooserPage.cpp
+++ b/src/modules/packagechooser/PackageChooserPage.cpp
@@ -43,7 +43,7 @@ PackageChooserPage::PackageChooserPage( PackageChooserMode mode, QWidget* parent
         ui->products->setSelectionMode( QAbstractItemView::ExtendedSelection );
     }
 
-    ui->products->setMinimumWidth( 10 * CalamaresUtils::defaultFontHeight() );
+    ui->products->setMinimumWidth( 10 * Calamares::defaultFontHeight() );
 }
 
 void
diff --git a/src/modules/packagechooser/PackageModel.cpp b/src/modules/packagechooser/PackageModel.cpp
index 10eaf05db..d183680b0 100644
--- a/src/modules/packagechooser/PackageModel.cpp
+++ b/src/modules/packagechooser/PackageModel.cpp
@@ -15,14 +15,14 @@
 
 #include <QFileInfo>
 
-/** @brief A wrapper for CalamaresUtils::getSubMap that excludes the success param
+/** @brief A wrapper for Calamares::getSubMap that excludes the success param
  */
 static QVariantMap
 getSubMap( const QVariantMap& map, const QString& key )
 {
     bool success;
 
-    return CalamaresUtils::getSubMap( map, key, success );
+    return Calamares::getSubMap( map, key, success );
 }
 
 static QPixmap
@@ -62,11 +62,11 @@ PackageItem::PackageItem( const QString& a_id,
 }
 
 PackageItem::PackageItem( const QVariantMap& item_map )
-    : id( CalamaresUtils::getString( item_map, "id" ) )
+    : id( Calamares::getString( item_map, "id" ) )
     , name( Calamares::Locale::TranslatedString( item_map, "name" ) )
     , description( Calamares::Locale::TranslatedString( item_map, "description" ) )
-    , screenshot( loadScreenshot( CalamaresUtils::getString( item_map, "screenshot" ) ) )
-    , packageNames( CalamaresUtils::getStringList( item_map, "packages" ) )
+    , screenshot( loadScreenshot( Calamares::getString( item_map, "screenshot" ) ) )
+    , packageNames( Calamares::getStringList( item_map, "packages" ) )
     , netinstallData( getSubMap( item_map, "netinstall" ) )
 {
     if ( name.isEmpty() && id.isEmpty() )
diff --git a/src/modules/partition/Config.cpp b/src/modules/partition/Config.cpp
index 083fe3685..4a84046b3 100644
--- a/src/modules/partition/Config.cpp
+++ b/src/modules/partition/Config.cpp
@@ -94,7 +94,6 @@ pickOne( const Config::SwapChoiceSet& s )
     return *( s.begin() );
 }
 
-
 static Config::SwapChoiceSet
 getSwapChoices( const QVariantMap& configurationMap )
 {
@@ -112,13 +111,13 @@ getSwapChoices( const QVariantMap& configurationMap )
     {
         cWarning() << "Partition-module setting *ensureSuspendToDisk* is deprecated.";
     }
-    bool ensureSuspendToDisk = CalamaresUtils::getBool( configurationMap, "ensureSuspendToDisk", true );
+    bool ensureSuspendToDisk = Calamares::getBool( configurationMap, "ensureSuspendToDisk", true );
 
     if ( configurationMap.contains( "neverCreateSwap" ) )
     {
         cWarning() << "Partition-module setting *neverCreateSwap* is deprecated.";
     }
-    bool neverCreateSwap = CalamaresUtils::getBool( configurationMap, "neverCreateSwap", false );
+    bool neverCreateSwap = Calamares::getBool( configurationMap, "neverCreateSwap", false );
 
     Config::SwapChoiceSet choices;  // Available swap choices
     if ( configurationMap.contains( "userSwapChoices" ) )
@@ -268,7 +267,6 @@ Config::acceptPartitionTableType( PartitionTable::TableType tableType ) const
         || m_requiredPartitionTableType.contains( PartitionTable::tableTypeToName( tableType ) );
 }
 
-
 static void
 fillGSConfigurationEFI( Calamares::GlobalStorage* gs, const QVariantMap& configurationMap )
 {
@@ -277,12 +275,12 @@ fillGSConfigurationEFI( Calamares::GlobalStorage* gs, const QVariantMap& configu
     gs->insert( "firmwareType", firmwareType );
 
     gs->insert( "efiSystemPartition",
-                CalamaresUtils::getString( configurationMap, "efiSystemPartition", QStringLiteral( "/boot/efi" ) ) );
+                Calamares::getString( configurationMap, "efiSystemPartition", QStringLiteral( "/boot/efi" ) ) );
 
     // Read and parse key efiSystemPartitionSize
     if ( configurationMap.contains( "efiSystemPartitionSize" ) )
     {
-        const QString sizeString = CalamaresUtils::getString( configurationMap, "efiSystemPartitionSize" );
+        const QString sizeString = Calamares::getString( configurationMap, "efiSystemPartitionSize" );
         Calamares::Partition::PartitionSize part_size = Calamares::Partition::PartitionSize( sizeString );
         if ( part_size.isValid() )
         {
@@ -308,7 +306,7 @@ fillGSConfigurationEFI( Calamares::GlobalStorage* gs, const QVariantMap& configu
     // Read and parse key efiSystemPartitionName
     if ( configurationMap.contains( "efiSystemPartitionName" ) )
     {
-        gs->insert( "efiSystemPartitionName", CalamaresUtils::getString( configurationMap, "efiSystemPartitionName" ) );
+        gs->insert( "efiSystemPartitionName", Calamares::getString( configurationMap, "efiSystemPartitionName" ) );
     }
 }
 
@@ -317,10 +315,9 @@ Config::fillConfigurationFSTypes( const QVariantMap& configurationMap )
 {
     Calamares::GlobalStorage* gs = Calamares::JobQueue::instance()->globalStorage();
 
-
     // The defaultFileSystemType setting needs a bit more processing,
     // as we want to cover various cases (such as different cases)
-    QString fsName = CalamaresUtils::getString( configurationMap, "defaultFileSystemType" );
+    QString fsName = Calamares::getString( configurationMap, "defaultFileSystemType" );
     QString fsRealName;
     FileSystem::Type fsType = FileSystem::Type::Unknown;
     if ( fsName.isEmpty() )
@@ -347,7 +344,7 @@ Config::fillConfigurationFSTypes( const QVariantMap& configurationMap )
     gs->insert( "defaultFileSystemType", fsRealName );
 
     // TODO: canonicalize the names? How is translation supposed to work?
-    m_eraseFsTypes = CalamaresUtils::getStringList( configurationMap, "availableFileSystemTypes" );
+    m_eraseFsTypes = Calamares::getStringList( configurationMap, "availableFileSystemTypes" );
     if ( !m_eraseFsTypes.contains( fsRealName ) )
     {
         if ( !m_eraseFsTypes.isEmpty() )
@@ -366,7 +363,7 @@ Config::fillConfigurationFSTypes( const QVariantMap& configurationMap )
     // Set LUKS file system based on luksGeneration provided, defaults to 'luks'.
     bool nameFound = false;
     Config::LuksGeneration luksGeneration
-        = luksGenerationNames().find( CalamaresUtils::getString( configurationMap, "luksGeneration" ), nameFound );
+        = luksGenerationNames().find( Calamares::getString( configurationMap, "luksGeneration" ), nameFound );
     if ( !nameFound )
     {
         cWarning() << "Partition-module setting *luksGeneration* not found or invalid. Defaulting to luks1.";
@@ -387,16 +384,16 @@ void
 Config::setConfigurationMap( const QVariantMap& configurationMap )
 {
     // Settings that overlap with the Welcome module
-    m_requiredStorageGiB = CalamaresUtils::getDouble( configurationMap, "requiredStorage", -1.0 );
+    m_requiredStorageGiB = Calamares::getDouble( configurationMap, "requiredStorage", -1.0 );
     m_swapChoices = getSwapChoices( configurationMap );
 
     bool nameFound = false;  // In the name table (ignored, falls back to first entry in table)
-    m_initialInstallChoice = installChoiceNames().find(
-        CalamaresUtils::getString( configurationMap, "initialPartitioningChoice" ), nameFound );
+    m_initialInstallChoice
+        = installChoiceNames().find( Calamares::getString( configurationMap, "initialPartitioningChoice" ), nameFound );
     setInstallChoice( m_initialInstallChoice );
 
     m_initialSwapChoice
-        = swapChoiceNames().find( CalamaresUtils::getString( configurationMap, "initialSwapChoice" ), nameFound );
+        = swapChoiceNames().find( Calamares::getString( configurationMap, "initialSwapChoice" ), nameFound );
     if ( !m_swapChoices.contains( m_initialSwapChoice ) )
     {
         cWarning() << "Configuration for *initialSwapChoice* is not one of the *userSwapChoices*";
@@ -409,14 +406,14 @@ Config::setConfigurationMap( const QVariantMap& configurationMap )
     }
     setSwapChoice( m_initialSwapChoice );
 
-    m_allowZfsEncryption = CalamaresUtils::getBool( configurationMap, "allowZfsEncryption", true );
+    m_allowZfsEncryption = Calamares::getBool( configurationMap, "allowZfsEncryption", true );
 
-    m_allowManualPartitioning = CalamaresUtils::getBool( configurationMap, "allowManualPartitioning", true );
-    m_showNotEncryptedBootMessage = CalamaresUtils::getBool( configurationMap, "showNotEncryptedBootMessage", true );
-    m_requiredPartitionTableType = CalamaresUtils::getStringList( configurationMap, "requiredPartitionTableType" );
+    m_allowManualPartitioning = Calamares::getBool( configurationMap, "allowManualPartitioning", true );
+    m_showNotEncryptedBootMessage = Calamares::getBool( configurationMap, "showNotEncryptedBootMessage", true );
+    m_requiredPartitionTableType = Calamares::getStringList( configurationMap, "requiredPartitionTableType" );
 
     Calamares::GlobalStorage* gs = Calamares::JobQueue::instance()->globalStorage();
-    gs->insert( "armInstall", CalamaresUtils::getBool( configurationMap, "armInstall", false ) );
+    gs->insert( "armInstall", Calamares::getBool( configurationMap, "armInstall", false ) );
     fillGSConfigurationEFI( gs, configurationMap );
     fillConfigurationFSTypes( configurationMap );
 }
diff --git a/src/modules/partition/PartitionViewStep.cpp b/src/modules/partition/PartitionViewStep.cpp
index b653af716..2ce46378c 100644
--- a/src/modules/partition/PartitionViewStep.cpp
+++ b/src/modules/partition/PartitionViewStep.cpp
@@ -59,7 +59,6 @@ PartitionViewStep::PartitionViewStep( QObject* parent )
     // We're not done loading, but we need the configuration map first.
 }
 
-
 void
 PartitionViewStep::initPartitionCoreModule()
 {
@@ -67,7 +66,6 @@ PartitionViewStep::initPartitionCoreModule()
     m_core->init();
 }
 
-
 void
 PartitionViewStep::continueLoading()
 {
@@ -90,7 +88,6 @@ PartitionViewStep::continueLoading()
     connect( m_choicePage, &ChoicePage::nextStatusChanged, this, &PartitionViewStep::nextPossiblyChanged );
 }
 
-
 PartitionViewStep::~PartitionViewStep()
 {
     if ( m_choicePage && m_choicePage->parent() == nullptr )
@@ -104,7 +101,6 @@ PartitionViewStep::~PartitionViewStep()
     delete m_core;
 }
 
-
 QString
 PartitionViewStep::prettyName() const
 {
@@ -233,31 +229,31 @@ PartitionViewStep::createSummaryWidget() const
     QWidget* widget = new QWidget;
     QVBoxLayout* mainLayout = new QVBoxLayout;
     widget->setLayout( mainLayout );
-    CalamaresUtils::unmarginLayout( mainLayout );
+    Calamares::unmarginLayout( mainLayout );
 
     Config::InstallChoice choice = m_config->installChoice();
 
     QFormLayout* formLayout = new QFormLayout( widget );
-    const int MARGIN = CalamaresUtils::defaultFontHeight() / 2;
+    const int MARGIN = Calamares::defaultFontHeight() / 2;
     formLayout->setContentsMargins( MARGIN, 0, MARGIN, MARGIN );
     mainLayout->addLayout( formLayout );
 
 #if defined( DEBUG_PARTITION_UNSAFE ) || defined( DEBUG_PARTITION_BAIL_OUT ) || defined( DEBUG_PARTITION_SKIP )
-    auto specialRow = [ = ]( CalamaresUtils::ImageType t, const QString& s )
+    auto specialRow = [ = ]( Calamares::ImageType t, const QString& s )
     {
         QLabel* icon = new QLabel;
-        icon->setPixmap( CalamaresUtils::defaultPixmap( t ) );
+        icon->setPixmap( Calamares::defaultPixmap( t ) );
         formLayout->addRow( icon, new QLabel( s ) );
     };
 #endif
 #if defined( DEBUG_PARTITION_UNSAFE )
-    specialRow( CalamaresUtils::ImageType::StatusWarning, tr( "Unsafe partition actions are enabled." ) );
+    specialRow( Calamares::ImageType::StatusWarning, tr( "Unsafe partition actions are enabled." ) );
 #endif
 #if defined( DEBUG_PARTITION_BAIL_OUT )
-    specialRow( CalamaresUtils::ImageType::Information, tr( "Partitioning is configured to <b>always</b> fail." ) );
+    specialRow( Calamares::ImageType::Information, tr( "Partitioning is configured to <b>always</b> fail." ) );
 #endif
 #if defined( DEBUG_PARTITION_SKIP )
-    specialRow( CalamaresUtils::ImageType::Information, tr( "No partitions will be changed." ) );
+    specialRow( Calamares::ImageType::Information, tr( "No partitions will be changed." ) );
 #endif
 
     const QList< PartitionCoreModule::SummaryInfo > list = m_core->createSummaryInfo();
@@ -293,7 +289,7 @@ PartitionViewStep::createSummaryWidget() const
         previewLabels->setSelectionMode( QAbstractItemView::NoSelection );
         info.partitionModelBefore->setParent( widget );
         field = new QVBoxLayout;
-        CalamaresUtils::unmarginLayout( field );
+        Calamares::unmarginLayout( field );
         field->setSpacing( 6 );
         field->addWidget( preview );
         field->addWidget( previewLabels );
@@ -311,7 +307,7 @@ PartitionViewStep::createSummaryWidget() const
             Calamares::Branding::instance()->string( Calamares::Branding::BootloaderEntryName ) );
         info.partitionModelAfter->setParent( widget );
         field = new QVBoxLayout;
-        CalamaresUtils::unmarginLayout( field );
+        Calamares::unmarginLayout( field );
         field->setSpacing( 6 );
         field->addWidget( preview );
         field->addWidget( previewLabels );
@@ -323,7 +319,7 @@ PartitionViewStep::createSummaryWidget() const
         QLabel* jobsLabel = new QLabel( widget );
         mainLayout->addWidget( jobsLabel );
         jobsLabel->setText( jobsLines.join( "<br/>" ) );
-        jobsLabel->setMargin( CalamaresUtils::defaultFontHeight() / 2 );
+        jobsLabel->setMargin( Calamares::defaultFontHeight() / 2 );
         QPalette pal;
         pal.setColor( WindowBackground, pal.window().color().lighter( 108 ) );
         jobsLabel->setAutoFillBackground( true );
@@ -362,7 +358,6 @@ PartitionViewStep::next()
     }
 }
 
-
 void
 PartitionViewStep::back()
 {
@@ -379,7 +374,6 @@ PartitionViewStep::back()
     }
 }
 
-
 bool
 PartitionViewStep::isNextEnabled() const
 {
@@ -408,7 +402,6 @@ PartitionViewStep::isBackEnabled() const
     return true;
 }
 
-
 bool
 PartitionViewStep::isAtBeginning() const
 {
@@ -419,7 +412,6 @@ PartitionViewStep::isAtBeginning() const
     return true;
 }
 
-
 bool
 PartitionViewStep::isAtEnd() const
 {
@@ -436,7 +428,6 @@ PartitionViewStep::isAtEnd() const
     return true;
 }
 
-
 void
 PartitionViewStep::onActivate()
 {
@@ -471,7 +462,7 @@ shouldWarnForGPTOnBIOS( const PartitionCoreModule* core )
             // So this is a BIOS system, and the bootloader will be installed on a GPT system
             for ( const auto& partition : qAsConst( table->children() ) )
             {
-                using CalamaresUtils::Units::operator""_MiB;
+                using Calamares::Units::operator""_MiB;
                 if ( ( partition->activeFlags() & KPM_PARTITION_FLAG( BiosGrub ) )
                      && ( partition->fileSystem().type() == FileSystem::Unformatted )
                      && ( partition->capacity() >= 8_MiB ) )
@@ -492,7 +483,7 @@ shouldWarnForGPTOnBIOS( const PartitionCoreModule* core )
 }
 
 static bool
-shouldWarnForNotEncryptedBoot( const Config* config, const PartitionCoreModule* core)
+shouldWarnForNotEncryptedBoot( const Config* config, const PartitionCoreModule* core )
 {
     if ( config->showNotEncryptedBootMessage() )
     {
@@ -501,8 +492,7 @@ shouldWarnForNotEncryptedBoot( const Config* config, const PartitionCoreModule*
 
         if ( root_p and boot_p )
         {
-            if ( ( root_p->fileSystem().type() == FileSystem::Luks
-                   && boot_p->fileSystem().type() != FileSystem::Luks )
+            if ( ( root_p->fileSystem().type() == FileSystem::Luks && boot_p->fileSystem().type() != FileSystem::Luks )
                  || ( root_p->fileSystem().type() == FileSystem::Luks2
                       && boot_p->fileSystem().type() != FileSystem::Luks2 ) )
             {
@@ -574,7 +564,7 @@ PartitionViewStep::onLeave()
             {
                 cDebug() << o << "ESP too small";
                 const qint64 atLeastBytes = static_cast< qint64 >( PartUtils::efiFilesystemMinimumSize() );
-                const auto atLeastMiB = CalamaresUtils::BytesToMiB( atLeastBytes );
+                const auto atLeastMiB = Calamares::BytesToMiB( atLeastBytes );
                 description.append( ' ' );
                 description.append( tr( "The filesystem must be at least %1 MiB in size." ).arg( atLeastMiB ) );
             }
@@ -631,20 +621,19 @@ PartitionViewStep::onLeave()
         {
             QString message = tr( "Boot partition not encrypted" );
             QString description = tr( "A separate boot partition was set up together with "
-                                         "an encrypted root partition, but the boot partition "
-                                         "is not encrypted."
-                                         "<br/><br/>"
-                                         "There are security concerns with this kind of "
-                                         "setup, because important system files are kept "
-                                         "on an unencrypted partition.<br/>"
-                                         "You may continue if you wish, but filesystem "
-                                         "unlocking will happen later during system startup."
-                                         "<br/>To encrypt the boot partition, go back and "
-                                         "recreate it, selecting <strong>Encrypt</strong> "
-                                         "in the partition creation window." );
+                                      "an encrypted root partition, but the boot partition "
+                                      "is not encrypted."
+                                      "<br/><br/>"
+                                      "There are security concerns with this kind of "
+                                      "setup, because important system files are kept "
+                                      "on an unencrypted partition.<br/>"
+                                      "You may continue if you wish, but filesystem "
+                                      "unlocking will happen later during system startup."
+                                      "<br/>To encrypt the boot partition, go back and "
+                                      "recreate it, selecting <strong>Encrypt</strong> "
+                                      "in the partition creation window." );
 
-            QMessageBox mb(
-                QMessageBox::Warning, message, description, QMessageBox::Ok, m_manualPartitionPage );
+            QMessageBox mb( QMessageBox::Warning, message, description, QMessageBox::Ok, m_manualPartitionPage );
             Calamares::fixButtonLabels( &mb );
             mb.exec();
         }
@@ -663,18 +652,18 @@ PartitionViewStep::setConfigurationMap( const QVariantMap& configurationMap )
     // Read and parse key swapPartitionName
     if ( configurationMap.contains( "swapPartitionName" ) )
     {
-        gs->insert( "swapPartitionName", CalamaresUtils::getString( configurationMap, "swapPartitionName" ) );
+        gs->insert( "swapPartitionName", Calamares::getString( configurationMap, "swapPartitionName" ) );
     }
 
     // OTHER SETTINGS
     //
-    gs->insert( "drawNestedPartitions", CalamaresUtils::getBool( configurationMap, "drawNestedPartitions", false ) );
+    gs->insert( "drawNestedPartitions", Calamares::getBool( configurationMap, "drawNestedPartitions", false ) );
     gs->insert( "alwaysShowPartitionLabels",
-                CalamaresUtils::getBool( configurationMap, "alwaysShowPartitionLabels", true ) );
+                Calamares::getBool( configurationMap, "alwaysShowPartitionLabels", true ) );
     gs->insert( "enableLuksAutomatedPartitioning",
-                CalamaresUtils::getBool( configurationMap, "enableLuksAutomatedPartitioning", true ) );
+                Calamares::getBool( configurationMap, "enableLuksAutomatedPartitioning", true ) );
 
-    QString partitionTableName = CalamaresUtils::getString( configurationMap, "defaultPartitionTableType" );
+    QString partitionTableName = Calamares::getString( configurationMap, "defaultPartitionTableType" );
     if ( partitionTableName.isEmpty() )
     {
         cWarning() << "Partition-module setting *defaultPartitionTableType* is unset, "
@@ -706,7 +695,6 @@ PartitionViewStep::setConfigurationMap( const QVariantMap& configurationMap )
     m_core->partitionLayout().init( m_config->defaultFsType(), configurationMap.value( "partitionLayout" ).toList() );
 }
 
-
 Calamares::JobList
 PartitionViewStep::jobs() const
 {
@@ -737,5 +725,4 @@ PartitionViewStep::checkRequirements()
     return l;
 }
 
-
 CALAMARES_PLUGIN_FACTORY_DEFINITION( PartitionViewStepFactory, registerPlugin< PartitionViewStep >(); )
diff --git a/src/modules/partition/core/DeviceList.cpp b/src/modules/partition/core/DeviceList.cpp
index b81c28be6..ceaa94af6 100644
--- a/src/modules/partition/core/DeviceList.cpp
+++ b/src/modules/partition/core/DeviceList.cpp
@@ -49,7 +49,7 @@ static bool
 blkIdCheckIso9660( const QString& path )
 {
     // If blkid fails, there's no output, but we don't care
-    auto r = CalamaresUtils::System::runCommand( { "blkid", path }, std::chrono::seconds( 30 ) );
+    auto r = Calamares::System::runCommand( { "blkid", path }, std::chrono::seconds( 30 ) );
     return r.getOutput().contains( "iso9660" );
 }
 
diff --git a/src/modules/partition/core/DeviceModel.cpp b/src/modules/partition/core/DeviceModel.cpp
index 6959ac9c2..06029eac2 100644
--- a/src/modules/partition/core/DeviceModel.cpp
+++ b/src/modules/partition/core/DeviceModel.cpp
@@ -94,16 +94,15 @@ DeviceModel::data( const QModelIndex& index, int role ) const
             }
         }
     case Qt::DecorationRole:
-        return CalamaresUtils::defaultPixmap(
-            CalamaresUtils::PartitionDisk,
-            CalamaresUtils::Original,
-            QSize( CalamaresUtils::defaultIconSize().width() * 2, CalamaresUtils::defaultIconSize().height() * 2 ) );
+        return Calamares::defaultPixmap(
+            Calamares::PartitionDisk,
+            Calamares::Original,
+            QSize( Calamares::defaultIconSize().width() * 2, Calamares::defaultIconSize().height() * 2 ) );
     default:
         return QVariant();
     }
 }
 
-
 Device*
 DeviceModel::deviceForIndex( const QModelIndex& index ) const
 {
@@ -115,7 +114,6 @@ DeviceModel::deviceForIndex( const QModelIndex& index ) const
     return m_devices.at( row );
 }
 
-
 void
 DeviceModel::swapDevice( Device* oldDevice, Device* newDevice )
 {
diff --git a/src/modules/partition/core/PartUtils.cpp b/src/modules/partition/core/PartUtils.cpp
index e3bb40a00..9bf78933b 100644
--- a/src/modules/partition/core/PartUtils.cpp
+++ b/src/modules/partition/core/PartUtils.cpp
@@ -97,7 +97,7 @@ canBeReplaced( Partition* candidate, const Logger::Once& o )
     }
 
     qint64 availableStorageB = candidate->capacity();
-    qint64 requiredStorageB = CalamaresUtils::GiBtoBytes( requiredStorageGiB + 0.5 );
+    qint64 requiredStorageB = Calamares::GiBtoBytes( requiredStorageGiB + 0.5 );
 
     if ( availableStorageB > requiredStorageB )
     {
@@ -111,12 +111,11 @@ canBeReplaced( Partition* candidate, const Logger::Once& o )
         deb << Logger::Continuation << "Required  storage B:" << requiredStorageB
             << QString( "(%1GiB)" ).arg( requiredStorageGiB );
         deb << Logger::Continuation << "Available storage B:" << availableStorageB
-            << QString( "(%1GiB)" ).arg( CalamaresUtils::BytesToGiB( availableStorageB ) );
+            << QString( "(%1GiB)" ).arg( Calamares::BytesToGiB( availableStorageB ) );
         return false;
     }
 }
 
-
 bool
 canBeResized( Partition* candidate, const Logger::Once& o )
 {
@@ -174,7 +173,7 @@ canBeResized( Partition* candidate, const Logger::Once& o )
     // We require a little more for partitioning overhead and swap file
     double advisedStorageGiB = requiredStorageGiB + 0.5 + 2.0;
     qint64 availableStorageB = candidate->available();
-    qint64 advisedStorageB = CalamaresUtils::GiBtoBytes( advisedStorageGiB );
+    qint64 advisedStorageB = Calamares::GiBtoBytes( advisedStorageGiB );
 
     if ( availableStorageB > advisedStorageB )
     {
@@ -189,14 +188,13 @@ canBeResized( Partition* candidate, const Logger::Once& o )
         deb << Logger::Continuation << "Required  storage B:" << advisedStorageB
             << QString( "(%1GiB)" ).arg( advisedStorageGiB );
         deb << Logger::Continuation << "Available storage B:" << availableStorageB
-            << QString( "(%1GiB)" ).arg( CalamaresUtils::BytesToGiB( availableStorageB ) ) << "for"
+            << QString( "(%1GiB)" ).arg( Calamares::BytesToGiB( availableStorageB ) ) << "for"
             << convenienceName( candidate ) << "length:" << candidate->length()
             << "sectorsUsed:" << candidate->sectorsUsed() << "fsType:" << candidate->fileSystem().name();
         return false;
     }
 }
 
-
 bool
 canBeResized( DeviceModel* dm, const QString& partitionPath, const Logger::Once& o )
 {
@@ -221,14 +219,13 @@ canBeResized( DeviceModel* dm, const QString& partitionPath, const Logger::Once&
     }
 }
 
-
 static FstabEntryList
 lookForFstabEntries( const QString& partitionPath )
 {
     QStringList mountOptions { "ro" };
 
-    auto r = CalamaresUtils::System::runCommand( CalamaresUtils::System::RunLocation::RunInHost,
-                                                 { "blkid", "-s", "TYPE", "-o", "value", partitionPath } );
+    auto r = Calamares::System::runCommand( Calamares::System::RunLocation::RunInHost,
+                                            { "blkid", "-s", "TYPE", "-o", "value", partitionPath } );
     if ( r.getExitCode() )
     {
         cWarning() << "blkid on" << partitionPath << "failed.";
@@ -279,7 +276,6 @@ lookForFstabEntries( const QString& partitionPath )
     return fstabEntries;
 }
 
-
 static QString
 findPartitionPathForMountPoint( const FstabEntryList& fstab, const QString& mountPoint )
 {
@@ -355,7 +351,6 @@ findPartitionPathForMountPoint( const FstabEntryList& fstab, const QString& moun
     return QString();
 }
 
-
 OsproberEntryList
 runOsprober( DeviceModel* dm )
 {
@@ -495,7 +490,6 @@ isEfiFilesystemSuitableSize( const Partition* candidate )
     }
 }
 
-
 bool
 isEfiBootable( const Partition* candidate )
 {
@@ -510,7 +504,7 @@ isEfiBootable( const Partition* candidate )
 qint64
 efiFilesystemMinimumSize()
 {
-    using CalamaresUtils::Units::operator""_MiB;
+    using Calamares::Units::operator""_MiB;
 
     qint64 uefisys_part_sizeB = 300_MiB;
 
@@ -530,7 +524,6 @@ efiFilesystemMinimumSize()
     return uefisys_part_sizeB;
 }
 
-
 QString
 canonicalFilesystemName( const QString& fsName, FileSystem::Type* fsType )
 {
diff --git a/src/modules/partition/core/PartitionActions.cpp b/src/modules/partition/core/PartitionActions.cpp
index 801cb1e75..a17ca79dd 100644
--- a/src/modules/partition/core/PartitionActions.cpp
+++ b/src/modules/partition/core/PartitionActions.cpp
@@ -28,7 +28,7 @@
 
 #include <QDir>
 
-using namespace CalamaresUtils::Units;
+using namespace Calamares::Units;
 
 static quint64
 swapSuggestion( const quint64 availableSpaceB, Config::SwapChoice swap )
@@ -40,7 +40,7 @@ swapSuggestion( const quint64 availableSpaceB, Config::SwapChoice swap )
 
     // See partition.conf for explanation
     quint64 suggestedSwapSizeB = 0;
-    auto [ availableRamB, overestimationFactor ] = CalamaresUtils::System::instance()->getTotalMemoryB();
+    auto [ availableRamB, overestimationFactor ] = Calamares::System::instance()->getTotalMemoryB();
 
     bool ensureSuspendToDisk = swap == Config::SwapChoice::FullSwap;
 
@@ -65,7 +65,6 @@ swapSuggestion( const quint64 availableSpaceB, Config::SwapChoice swap )
         suggestedSwapSizeB = qMin( quint64( 8_GiB ), suggestedSwapSizeB );
     }
 
-
     // Allow for a fudge factor
     suggestedSwapSizeB = quint64( qRound64( qreal( suggestedSwapSizeB ) * overestimationFactor ) );
 
@@ -76,7 +75,7 @@ swapSuggestion( const quint64 availableSpaceB, Config::SwapChoice swap )
     }
 
     // TODO: make Units functions work on unsigned
-    cDebug() << "Suggested swap size:" << CalamaresUtils::BytesToGiB( suggestedSwapSizeB ) << "GiB";
+    cDebug() << "Suggested swap size:" << Calamares::BytesToGiB( suggestedSwapSizeB ) << "GiB";
 
     return suggestedSwapSizeB;
 }
@@ -101,7 +100,7 @@ doAutopartition( PartitionCoreModule* core, Device* dev, Choices::AutoPartitionO
     // Since sectors count from 0, if the space is 2048 sectors in size,
     // the first free sector has number 2048 (and there are 2048 sectors
     // before that one, numbered 0..2047).
-    qint64 firstFreeSector = CalamaresUtils::bytesToSectors( empty_space_sizeB, dev->logicalSize() );
+    qint64 firstFreeSector = Calamares::bytesToSectors( empty_space_sizeB, dev->logicalSize() );
 
     PartitionTable::TableType partType = PartitionTable::nameToTableType( o.defaultPartitionTableType );
     if ( partType == PartitionTable::unknownTableType )
@@ -120,7 +119,7 @@ doAutopartition( PartitionCoreModule* core, Device* dev, Choices::AutoPartitionO
     if ( isEfi )
     {
         qint64 uefisys_part_sizeB = PartUtils::efiFilesystemMinimumSize();
-        qint64 efiSectorCount = CalamaresUtils::bytesToSectors( uefisys_part_sizeB, dev->logicalSize() );
+        qint64 efiSectorCount = Calamares::bytesToSectors( uefisys_part_sizeB, dev->logicalSize() );
         Q_ASSERT( efiSectorCount > 0 );
 
         // Since sectors count from 0, and this partition is created starting
@@ -210,7 +209,6 @@ doAutopartition( PartitionCoreModule* core, Device* dev, Choices::AutoPartitionO
     core->dumpQueue();
 }
 
-
 void
 doReplacePartition( PartitionCoreModule* core, Device* dev, Partition* partition, Choices::ReplacePartitionOptions o )
 {
diff --git a/src/modules/partition/core/PartitionLayout.cpp b/src/modules/partition/core/PartitionLayout.cpp
index 38d1e9fd0..4575a68af 100644
--- a/src/modules/partition/core/PartitionLayout.cpp
+++ b/src/modules/partition/core/PartitionLayout.cpp
@@ -78,7 +78,6 @@ PartitionLayout::PartitionEntry::PartitionEntry( const QString& label,
     PartUtils::canonicalFilesystemName( fs, &partFileSystem );
 }
 
-
 bool
 PartitionLayout::addEntry( const PartitionEntry& entry )
 {
@@ -111,16 +110,16 @@ PartitionLayout::init( FileSystem::Type defaultFsType, const QVariantList& confi
             break;
         }
 
-        if ( !addEntry( { CalamaresUtils::getString( pentry, "name" ),
-                          CalamaresUtils::getString( pentry, "uuid" ),
-                          CalamaresUtils::getString( pentry, "type" ),
-                          CalamaresUtils::getUnsignedInteger( pentry, "attributes", 0 ),
-                          CalamaresUtils::getString( pentry, "mountPoint" ),
-                          CalamaresUtils::getString( pentry, "filesystem", "unformatted" ),
-                          CalamaresUtils::getSubMap( pentry, "features", ok ),
-                          CalamaresUtils::getString( pentry, "size", QStringLiteral( "0" ) ),
-                          CalamaresUtils::getString( pentry, "minSize", QStringLiteral( "0" ) ),
-                          CalamaresUtils::getString( pentry, "maxSize", QStringLiteral( "0" ) ) } ) )
+        if ( !addEntry( { Calamares::getString( pentry, "name" ),
+                          Calamares::getString( pentry, "uuid" ),
+                          Calamares::getString( pentry, "type" ),
+                          Calamares::getUnsignedInteger( pentry, "attributes", 0 ),
+                          Calamares::getString( pentry, "mountPoint" ),
+                          Calamares::getString( pentry, "filesystem", "unformatted" ),
+                          Calamares::getSubMap( pentry, "features", ok ),
+                          Calamares::getString( pentry, "size", QStringLiteral( "0" ) ),
+                          Calamares::getString( pentry, "minSize", QStringLiteral( "0" ) ),
+                          Calamares::getString( pentry, "maxSize", QStringLiteral( "0" ) ) } ) )
         {
             cError() << "Partition layout entry #" << config.indexOf( r ) << "is invalid, switching to default layout.";
             m_partLayout.clear();
@@ -199,7 +198,6 @@ PartitionLayout::setDefaultFsType( FileSystem::Type defaultFsType )
     m_defaultFsType = defaultFsType;
 }
 
-
 QList< Partition* >
 PartitionLayout::createPartitions( Device* dev,
                                    qint64 firstSector,
diff --git a/src/modules/partition/gui/BootInfoWidget.cpp b/src/modules/partition/gui/BootInfoWidget.cpp
index 4bfa6f8f4..b62328d2e 100644
--- a/src/modules/partition/gui/BootInfoWidget.cpp
+++ b/src/modules/partition/gui/BootInfoWidget.cpp
@@ -7,7 +7,6 @@
  *
  */
 
-
 #include "BootInfoWidget.h"
 #include "core/PartUtils.h"
 
@@ -29,20 +28,19 @@ BootInfoWidget::BootInfoWidget( QWidget* parent )
     QHBoxLayout* mainLayout = new QHBoxLayout;
     setLayout( mainLayout );
 
-    CalamaresUtils::unmarginLayout( mainLayout );
+    Calamares::unmarginLayout( mainLayout );
 
     mainLayout->addWidget( m_bootIcon );
     mainLayout->addWidget( m_bootLabel );
 
-    QSize iconSize = CalamaresUtils::defaultIconSize();
+    QSize iconSize = Calamares::defaultIconSize();
 
     m_bootIcon->setMargin( 0 );
     m_bootIcon->setFixedSize( iconSize );
-    m_bootIcon->setPixmap(
-        CalamaresUtils::defaultPixmap( CalamaresUtils::BootEnvironment, CalamaresUtils::Original, iconSize ) );
+    m_bootIcon->setPixmap( Calamares::defaultPixmap( Calamares::BootEnvironment, Calamares::Original, iconSize ) );
 
     QFontMetrics fm = QFontMetrics( QFont() );
-    m_bootLabel->setMinimumWidth( fm.boundingRect( "BIOS" ).width() + CalamaresUtils::defaultFontHeight() / 2 );
+    m_bootLabel->setMinimumWidth( fm.boundingRect( "BIOS" ).width() + Calamares::defaultFontHeight() / 2 );
     m_bootLabel->setAlignment( Qt::AlignCenter );
 
     QPalette palette;
diff --git a/src/modules/partition/gui/ChoicePage.cpp b/src/modules/partition/gui/ChoicePage.cpp
index f397a39be..310a1dce3 100644
--- a/src/modules/partition/gui/ChoicePage.cpp
+++ b/src/modules/partition/gui/ChoicePage.cpp
@@ -54,10 +54,10 @@
 #include <QListView>
 #include <QtConcurrent/QtConcurrent>
 
-using Calamares::Widgets::PrettyRadioButton;
 using Calamares::Partition::findPartitionByPath;
 using Calamares::Partition::isPartitionFreeSpace;
 using Calamares::Partition::PartitionIterator;
+using Calamares::Widgets::PrettyRadioButton;
 using InstallChoice = Config::InstallChoice;
 using SwapChoice = Config::SwapChoice;
 
@@ -96,7 +96,7 @@ ChoicePage::ChoicePage( Config* config, QWidget* parent )
 
     BootInfoWidget* bootInfoWidget = new BootInfoWidget( this );
     m_drivesLayout->insertWidget( 0, bootInfoWidget );
-    m_drivesLayout->insertSpacing( 1, CalamaresUtils::defaultFontHeight() / 2 );
+    m_drivesLayout->insertSpacing( 1, Calamares::defaultFontHeight() / 2 );
 
     m_drivesCombo = new QComboBox( this );
     m_mainLayout->setStretchFactor( m_drivesLayout, 0 );
@@ -112,7 +112,7 @@ ChoicePage::ChoicePage( Config* config, QWidget* parent )
     m_messageLabel->setWordWrap( true );
     m_messageLabel->hide();
 
-    CalamaresUtils::unmarginLayout( m_itemsLayout );
+    Calamares::unmarginLayout( m_itemsLayout );
 
     // Drive selector + preview
     CALAMARES_RETRANSLATE_SLOT( &ChoicePage::retranslate );
@@ -128,7 +128,6 @@ ChoicePage::ChoicePage( Config* config, QWidget* parent )
     updateNextEnabled();
 }
 
-
 ChoicePage::~ChoicePage() {}
 
 void
@@ -143,7 +142,6 @@ ChoicePage::retranslate()
     updateChoiceButtonsTr();
 }
 
-
 /** @brief Sets the @p model for the given @p box and adjusts UI sizes to match.
  *
  * The model provides data for drawing the items in the model; the
@@ -175,7 +173,6 @@ ChoicePage::init( PartitionCoreModule* core )
 
     setupChoices();
 
-
     // We need to do this because a PCM revert invalidates the deviceModel.
     connect( core,
              &PartitionCoreModule::reverted,
@@ -195,7 +192,6 @@ ChoicePage::init( PartitionCoreModule* core )
     ChoicePage::applyDeviceChoice();
 }
 
-
 /** @brief Creates a combobox with the given choices in it.
  *
  * Pre-selects the choice given by @p dflt.
@@ -251,26 +247,25 @@ ChoicePage::setupChoices()
     //  3) Manual
     //  TBD: upgrade option?
 
-    QSize iconSize( CalamaresUtils::defaultIconSize().width() * 2, CalamaresUtils::defaultIconSize().height() * 2 );
+    QSize iconSize( Calamares::defaultIconSize().width() * 2, Calamares::defaultIconSize().height() * 2 );
     m_grp = new QButtonGroup( this );
 
     m_alongsideButton = new PrettyRadioButton;
     m_alongsideButton->setIconSize( iconSize );
     m_alongsideButton->setIcon(
-        CalamaresUtils::defaultPixmap( CalamaresUtils::PartitionAlongside, CalamaresUtils::Original, iconSize ) );
+        Calamares::defaultPixmap( Calamares::PartitionAlongside, Calamares::Original, iconSize ) );
     m_alongsideButton->addToGroup( m_grp, InstallChoice::Alongside );
 
     m_eraseButton = new PrettyRadioButton;
     m_eraseButton->setIconSize( iconSize );
-    m_eraseButton->setIcon(
-        CalamaresUtils::defaultPixmap( CalamaresUtils::PartitionEraseAuto, CalamaresUtils::Original, iconSize ) );
+    m_eraseButton->setIcon( Calamares::defaultPixmap( Calamares::PartitionEraseAuto, Calamares::Original, iconSize ) );
     m_eraseButton->addToGroup( m_grp, InstallChoice::Erase );
 
     m_replaceButton = new PrettyRadioButton;
 
     m_replaceButton->setIconSize( iconSize );
     m_replaceButton->setIcon(
-        CalamaresUtils::defaultPixmap( CalamaresUtils::PartitionReplaceOs, CalamaresUtils::Original, iconSize ) );
+        Calamares::defaultPixmap( Calamares::PartitionReplaceOs, Calamares::Original, iconSize ) );
     m_replaceButton->addToGroup( m_grp, InstallChoice::Replace );
 
     // Fill up swap options
@@ -307,7 +302,7 @@ ChoicePage::setupChoices()
     m_somethingElseButton = new PrettyRadioButton;
     m_somethingElseButton->setIconSize( iconSize );
     m_somethingElseButton->setIcon(
-        CalamaresUtils::defaultPixmap( CalamaresUtils::PartitionManual, CalamaresUtils::Original, iconSize ) );
+        Calamares::defaultPixmap( Calamares::PartitionManual, Calamares::Original, iconSize ) );
     m_itemsLayout->addWidget( m_somethingElseButton );
     m_somethingElseButton->addToGroup( m_grp, InstallChoice::Manual );
 
@@ -355,7 +350,6 @@ ChoicePage::setupChoices()
     updateChoiceButtonsTr();
 }
 
-
 /**
  * @brief ChoicePage::selectedDevice queries the device picker (which may be a combo or
  *      a list view) to get a pointer to the currently selected Device.
@@ -372,7 +366,6 @@ ChoicePage::selectedDevice()
     return currentDevice;
 }
 
-
 void
 ChoicePage::hideButtons()
 {
@@ -395,7 +388,6 @@ ChoicePage::checkInstallChoiceRadioButton( InstallChoice c )
     m_grp->setExclusive( true );
 }
 
-
 /**
  * @brief ChoicePage::applyDeviceChoice handler for the selected event of the device
  *      picker. Calls ChoicePage::selectedDevice() to get the current Device*, then
@@ -430,7 +422,6 @@ ChoicePage::applyDeviceChoice()
     }
 }
 
-
 void
 ChoicePage::continueApplyDeviceChoice()
 {
@@ -515,7 +506,7 @@ ChoicePage::applyActionChoice( InstallChoice choice )
                                                                   m_config->luksFileSystemType(),
                                                                   m_encryptWidget->passphrase(),
                                                                   gs->value( "efiSystemPartition" ).toString(),
-                                                                  CalamaresUtils::GiBtoBytes(
+                                                                  Calamares::GiBtoBytes(
                                                                       gs->value( "requiredStorageGiB" ).toDouble() ),
                                                                   m_config->swapChoice() };
 
@@ -602,7 +593,6 @@ ChoicePage::applyActionChoice( InstallChoice choice )
     updateActionChoicePreview( choice );
 }
 
-
 void
 ChoicePage::doAlongsideSetupSplitter( const QModelIndex& current, const QModelIndex& previous )
 {
@@ -633,7 +623,7 @@ ChoicePage::doAlongsideSetupSplitter( const QModelIndex& current, const QModelIn
     double requiredStorageGB
         = Calamares::JobQueue::instance()->globalStorage()->value( "requiredStorageGiB" ).toDouble();
 
-    qint64 requiredStorageB = CalamaresUtils::GiBtoBytes( requiredStorageGB + 0.1 + 2.0 );
+    qint64 requiredStorageB = Calamares::GiBtoBytes( requiredStorageGB + 0.1 + 2.0 );
 
     m_afterPartitionSplitterWidget->setSplitPartition( part->partitionPath(),
                                                        qRound64( part->used() * 1.1 ),
@@ -650,7 +640,6 @@ ChoicePage::doAlongsideSetupSplitter( const QModelIndex& current, const QModelIn
     updateNextEnabled();
 }
 
-
 void
 ChoicePage::onEncryptWidgetStateChanged()
 {
@@ -673,7 +662,6 @@ ChoicePage::onEncryptWidgetStateChanged()
     updateNextEnabled();
 }
 
-
 void
 ChoicePage::onHomeCheckBoxStateChanged()
 {
@@ -684,7 +672,6 @@ ChoicePage::onHomeCheckBoxStateChanged()
     }
 }
 
-
 void
 ChoicePage::onLeave()
 {
@@ -745,7 +732,6 @@ ChoicePage::onLeave()
     }
 }
 
-
 void
 ChoicePage::doAlongsideApply()
 {
@@ -786,7 +772,6 @@ ChoicePage::doAlongsideApply()
     }
 }
 
-
 void
 ChoicePage::onPartitionToReplaceSelected( const QModelIndex& current, const QModelIndex& previous )
 {
@@ -802,7 +787,6 @@ ChoicePage::onPartitionToReplaceSelected( const QModelIndex& current, const QMod
     doReplaceSelectedPartition( current );
 }
 
-
 void
 ChoicePage::doReplaceSelectedPartition( const QModelIndex& current )
 {
@@ -919,7 +903,6 @@ ChoicePage::doReplaceSelectedPartition( const QModelIndex& current )
         this );
 }
 
-
 /**
  * @brief clear and then rebuild the contents of the preview widget
  *
@@ -947,7 +930,7 @@ ChoicePage::updateDeviceStatePreview()
 
     layout = new QVBoxLayout;
     m_previewBeforeFrame->setLayout( layout );
-    CalamaresUtils::unmarginLayout( layout );
+    Calamares::unmarginLayout( layout );
     layout->setSpacing( 6 );
 
     PartitionBarsView::NestedPartitionsMode mode
@@ -993,7 +976,6 @@ ChoicePage::updateDeviceStatePreview()
     layout->addWidget( m_beforePartitionLabelsView );
 }
 
-
 /**
  * @brief rebuild the contents of the preview for the PCM-proposed state.
  *
@@ -1020,7 +1002,7 @@ ChoicePage::updateActionChoicePreview( InstallChoice choice )
 
     QVBoxLayout* layout = new QVBoxLayout;
     m_previewAfterFrame->setLayout( layout );
-    CalamaresUtils::unmarginLayout( layout );
+    Calamares::unmarginLayout( layout );
     layout->setSpacing( 6 );
 
     PartitionBarsView::NestedPartitionsMode mode
@@ -1067,8 +1049,8 @@ ChoicePage::updateActionChoicePreview( InstallChoice choice )
                          tr( "%1 will be shrunk to %2MiB and a new "
                              "%3MiB partition will be created for %4." )
                              .arg( m_beforePartitionBarsView->selectionModel()->currentIndex().data().toString() )
-                             .arg( CalamaresUtils::BytesToMiB( size ) )
-                             .arg( CalamaresUtils::BytesToMiB( sizeNext ) )
+                             .arg( Calamares::BytesToMiB( size ) )
+                             .arg( Calamares::BytesToMiB( sizeNext ) )
                              .arg( Calamares::Branding::instance()->shortProductName() ) );
                  } );
 
@@ -1184,7 +1166,6 @@ ChoicePage::updateActionChoicePreview( InstallChoice choice )
     updateNextEnabled();
 }
 
-
 void
 ChoicePage::setupEfiSystemPartitionSelector()
 {
@@ -1386,7 +1367,6 @@ ChoicePage::setupActions()
                                             "This will <font color=\"red\">delete</font> all data "
                                             "currently present on the selected storage device." ) );
 
-
                 m_replaceButton->setText( tr( "<strong>Replace a partition</strong><br/>"
                                               "Replaces a partition with %1." )
                                               .arg( Calamares::Branding::instance()->shortVersionedName() ) ); );
@@ -1530,7 +1510,6 @@ ChoicePage::setupActions()
     }
 }
 
-
 OsproberEntryList
 ChoicePage::getOsproberEntriesForDevice( Device* device ) const
 {
@@ -1545,14 +1524,12 @@ ChoicePage::getOsproberEntriesForDevice( Device* device ) const
     return eList;
 }
 
-
 bool
 ChoicePage::isNextEnabled() const
 {
     return m_nextEnabled;
 }
 
-
 bool
 ChoicePage::calculateNextEnabled() const
 {
@@ -1605,7 +1582,6 @@ ChoicePage::calculateNextEnabled() const
     return true;
 }
 
-
 void
 ChoicePage::updateNextEnabled()
 {
diff --git a/src/modules/partition/gui/DeviceInfoWidget.cpp b/src/modules/partition/gui/DeviceInfoWidget.cpp
index 05a8c4b63..f9af6e32c 100644
--- a/src/modules/partition/gui/DeviceInfoWidget.cpp
+++ b/src/modules/partition/gui/DeviceInfoWidget.cpp
@@ -29,21 +29,20 @@ DeviceInfoWidget::DeviceInfoWidget( QWidget* parent )
     QHBoxLayout* mainLayout = new QHBoxLayout;
     setLayout( mainLayout );
 
-    CalamaresUtils::unmarginLayout( mainLayout );
+    Calamares::unmarginLayout( mainLayout );
     m_ptLabel->setObjectName( "deviceInfoLabel" );
     m_ptIcon->setObjectName( "deviceInfoIcon" );
     mainLayout->addWidget( m_ptIcon );
     mainLayout->addWidget( m_ptLabel );
 
-    QSize iconSize = CalamaresUtils::defaultIconSize();
+    QSize iconSize = Calamares::defaultIconSize();
 
     m_ptIcon->setMargin( 0 );
     m_ptIcon->setFixedSize( iconSize );
-    m_ptIcon->setPixmap(
-        CalamaresUtils::defaultPixmap( CalamaresUtils::PartitionTable, CalamaresUtils::Original, iconSize ) );
+    m_ptIcon->setPixmap( Calamares::defaultPixmap( Calamares::PartitionTable, Calamares::Original, iconSize ) );
 
     QFontMetrics fm = QFontMetrics( QFont() );
-    m_ptLabel->setMinimumWidth( fm.boundingRect( "Amiga" ).width() + CalamaresUtils::defaultFontHeight() / 2 );
+    m_ptLabel->setMinimumWidth( fm.boundingRect( "Amiga" ).width() + Calamares::defaultFontHeight() / 2 );
     m_ptLabel->setAlignment( Qt::AlignCenter );
 
     QPalette palette;
@@ -57,7 +56,6 @@ DeviceInfoWidget::DeviceInfoWidget( QWidget* parent )
     CALAMARES_RETRANSLATE_SLOT( &DeviceInfoWidget::retranslateUi );
 }
 
-
 void
 DeviceInfoWidget::setPartitionTableType( PartitionTable::TableType type )
 {
diff --git a/src/modules/partition/gui/EncryptWidget.cpp b/src/modules/partition/gui/EncryptWidget.cpp
index f2ed1d17e..9c085ce2c 100644
--- a/src/modules/partition/gui/EncryptWidget.cpp
+++ b/src/modules/partition/gui/EncryptWidget.cpp
@@ -9,7 +9,6 @@
  *
  */
 
-
 #include "EncryptWidget.h"
 
 #include "ui_EncryptWidget.h"
@@ -71,7 +70,6 @@ EncryptWidget::EncryptWidget( QWidget* parent )
     CALAMARES_RETRANSLATE_SLOT( &EncryptWidget::retranslate );
 }
 
-
 void
 EncryptWidget::reset( bool checkVisible )
 {
@@ -110,14 +108,12 @@ EncryptWidget::state() const
     return newState;
 }
 
-
 void
 EncryptWidget::setText( const QString& text )
 {
     m_ui->m_encryptCheckBox->setText( text );
 }
 
-
 QString
 EncryptWidget::passphrase() const
 {
@@ -128,7 +124,6 @@ EncryptWidget::passphrase() const
     return QString();
 }
 
-
 void
 EncryptWidget::retranslate()
 {
@@ -136,13 +131,12 @@ EncryptWidget::retranslate()
     onPassphraseEdited();  // For the tooltip
 }
 
-
 ///@brief Give @p label the @p pixmap from the standard-pixmaps
 static void
-applyPixmap( QLabel* label, CalamaresUtils::ImageType pixmap )
+applyPixmap( QLabel* label, Calamares::ImageType pixmap )
 {
     label->setFixedWidth( label->height() );
-    label->setPixmap( CalamaresUtils::defaultPixmap( pixmap, CalamaresUtils::Original, label->size() ) );
+    label->setPixmap( Calamares::defaultPixmap( pixmap, Calamares::Original, label->size() ) );
 }
 
 void
@@ -155,22 +149,22 @@ EncryptWidget::updateState( const bool notify )
 
         if ( p1.isEmpty() && p2.isEmpty() )
         {
-            applyPixmap( m_ui->m_iconLabel, CalamaresUtils::StatusWarning );
+            applyPixmap( m_ui->m_iconLabel, Calamares::StatusWarning );
             m_ui->m_iconLabel->setToolTip( tr( "Please enter the same passphrase in both boxes." ) );
         }
         else if ( m_filesystem == FileSystem::Zfs && p1.length() < ZFS_MIN_LENGTH )
         {
-            applyPixmap( m_ui->m_iconLabel, CalamaresUtils::StatusError );
+            applyPixmap( m_ui->m_iconLabel, Calamares::StatusError );
             m_ui->m_iconLabel->setToolTip( tr( "Password must be a minimum of %1 characters" ).arg( ZFS_MIN_LENGTH ) );
         }
         else if ( p1 == p2 )
         {
-            applyPixmap( m_ui->m_iconLabel, CalamaresUtils::StatusOk );
+            applyPixmap( m_ui->m_iconLabel, Calamares::StatusOk );
             m_ui->m_iconLabel->setToolTip( QString() );
         }
         else
         {
-            applyPixmap( m_ui->m_iconLabel, CalamaresUtils::StatusError );
+            applyPixmap( m_ui->m_iconLabel, Calamares::StatusError );
             m_ui->m_iconLabel->setToolTip( tr( "Please enter the same passphrase in both boxes." ) );
         }
     }
@@ -198,7 +192,6 @@ EncryptWidget::onPassphraseEdited()
     updateState();
 }
 
-
 void
 EncryptWidget::onCheckBoxStateChanged( int checked )
 {
diff --git a/src/modules/partition/gui/PartitionBarsView.cpp b/src/modules/partition/gui/PartitionBarsView.cpp
index 305184b13..fd331a9af 100644
--- a/src/modules/partition/gui/PartitionBarsView.cpp
+++ b/src/modules/partition/gui/PartitionBarsView.cpp
@@ -22,10 +22,8 @@
 #include <QMouseEvent>
 #include <QPainter>
 
-
-static const int VIEW_HEIGHT
-    = qMax( CalamaresUtils::defaultFontHeight() + 8,  // wins out with big fonts
-            int( CalamaresUtils::defaultFontHeight() * 0.6 ) + 22 );  // wins out with small fonts
+static const int VIEW_HEIGHT = qMax( Calamares::defaultFontHeight() + 8,  // wins out with big fonts
+                                     int( Calamares::defaultFontHeight() * 0.6 ) + 22 );  // wins out with small fonts
 static constexpr int CORNER_RADIUS = 3;
 static const int EXTENDED_PARTITION_MARGIN = qMax( 4, VIEW_HEIGHT / 6 );
 
@@ -40,7 +38,6 @@ static const int EXTENDED_PARTITION_MARGIN = qMax( 4, VIEW_HEIGHT / 6 );
 static const int SELECTION_MARGIN
     = qMin( ( EXTENDED_PARTITION_MARGIN - 2 ) / 2, ( EXTENDED_PARTITION_MARGIN - 2 ) - 2 );
 
-
 PartitionBarsView::PartitionBarsView( QWidget* parent )
     : QAbstractItemView( parent )
     , m_nestedPartitionsMode( NoNestedPartitions )
@@ -61,10 +58,8 @@ PartitionBarsView::PartitionBarsView( QWidget* parent )
     setMouseTracking( true );
 }
 
-
 PartitionBarsView::~PartitionBarsView() {}
 
-
 void
 PartitionBarsView::setNestedPartitionsMode( PartitionBarsView::NestedPartitionsMode mode )
 {
@@ -72,21 +67,18 @@ PartitionBarsView::setNestedPartitionsMode( PartitionBarsView::NestedPartitionsM
     viewport()->repaint();
 }
 
-
 QSize
 PartitionBarsView::minimumSizeHint() const
 {
     return sizeHint();
 }
 
-
 QSize
 PartitionBarsView::sizeHint() const
 {
     return QSize( -1, VIEW_HEIGHT );
 }
 
-
 void
 PartitionBarsView::paintEvent( QPaintEvent* event )
 {
@@ -102,7 +94,6 @@ PartitionBarsView::paintEvent( QPaintEvent* event )
     painter.restore();
 }
 
-
 void
 PartitionBarsView::drawSection( QPainter* painter, const QRect& rect_, int x, int width, const QModelIndex& index )
 {
@@ -119,7 +110,6 @@ PartitionBarsView::drawSection( QPainter* painter, const QRect& rect_, int x, in
 
     rect.adjust( 0, 0, -1, -1 );
 
-
     if ( selectionMode() != QAbstractItemView::NoSelection &&  // no hover without selection
          m_hoveredIndex.isValid() && index == m_hoveredIndex )
     {
@@ -191,7 +181,6 @@ PartitionBarsView::drawSection( QPainter* painter, const QRect& rect_, int x, in
     painter->translate( -0.5, -0.5 );
 }
 
-
 void
 PartitionBarsView::drawPartitions( QPainter* painter, const QRect& rect, const QModelIndex& parent )
 {
@@ -240,14 +229,12 @@ PartitionBarsView::drawPartitions( QPainter* painter, const QRect& rect, const Q
     }
 }
 
-
 QModelIndex
 PartitionBarsView::indexAt( const QPoint& point ) const
 {
     return indexAt( point, rect(), QModelIndex() );
 }
 
-
 QModelIndex
 PartitionBarsView::indexAt( const QPoint& point, const QRect& rect, const QModelIndex& parent ) const
 {
@@ -303,14 +290,12 @@ PartitionBarsView::indexAt( const QPoint& point, const QRect& rect, const QModel
     return QModelIndex();
 }
 
-
 QRect
 PartitionBarsView::visualRect( const QModelIndex& index ) const
 {
     return visualRect( index, rect(), QModelIndex() );
 }
 
-
 QRect
 PartitionBarsView::visualRect( const QModelIndex& index, const QRect& rect, const QModelIndex& parent ) const
 {
@@ -366,28 +351,24 @@ PartitionBarsView::visualRect( const QModelIndex& index, const QRect& rect, cons
     return QRect();
 }
 
-
 QRegion
 PartitionBarsView::visualRegionForSelection( const QItemSelection& selection ) const
 {
     return QRegion();
 }
 
-
 int
 PartitionBarsView::horizontalOffset() const
 {
     return 0;
 }
 
-
 int
 PartitionBarsView::verticalOffset() const
 {
     return 0;
 }
 
-
 void
 PartitionBarsView::scrollTo( const QModelIndex& index, ScrollHint hint )
 {
@@ -395,7 +376,6 @@ PartitionBarsView::scrollTo( const QModelIndex& index, ScrollHint hint )
     Q_UNUSED( hint )
 }
 
-
 void
 PartitionBarsView::setSelectionModel( QItemSelectionModel* selectionModel )
 {
@@ -403,28 +383,24 @@ PartitionBarsView::setSelectionModel( QItemSelectionModel* selectionModel )
     connect( selectionModel, &QItemSelectionModel::selectionChanged, this, [ = ] { viewport()->repaint(); } );
 }
 
-
 void
 PartitionBarsView::setSelectionFilter( std::function< bool( const QModelIndex& ) > canBeSelected )
 {
     this->canBeSelected = canBeSelected;
 }
 
-
 QModelIndex
 PartitionBarsView::moveCursor( CursorAction, Qt::KeyboardModifiers )
 {
     return QModelIndex();
 }
 
-
 bool
 PartitionBarsView::isIndexHidden( const QModelIndex& ) const
 {
     return false;
 }
 
-
 void
 PartitionBarsView::setSelection( const QRect& rect, QItemSelectionModel::SelectionFlags flags )
 {
@@ -454,7 +430,6 @@ PartitionBarsView::setSelection( const QRect& rect, QItemSelectionModel::Selecti
     viewport()->repaint();
 }
 
-
 void
 PartitionBarsView::mouseMoveEvent( QMouseEvent* event )
 {
@@ -485,7 +460,6 @@ PartitionBarsView::mouseMoveEvent( QMouseEvent* event )
     }
 }
 
-
 void
 PartitionBarsView::leaveEvent( QEvent* )
 {
@@ -497,7 +471,6 @@ PartitionBarsView::leaveEvent( QEvent* )
     }
 }
 
-
 void
 PartitionBarsView::mousePressEvent( QMouseEvent* event )
 {
@@ -512,14 +485,12 @@ PartitionBarsView::mousePressEvent( QMouseEvent* event )
     }
 }
 
-
 void
 PartitionBarsView::updateGeometries()
 {
     updateGeometry();  //get a new rect() for redrawing all the labels
 }
 
-
 QPair< QVector< PartitionBarsView::Item >, qreal >
 PartitionBarsView::computeItemsVector( const QModelIndex& parent ) const
 {
diff --git a/src/modules/partition/gui/PartitionLabelsView.cpp b/src/modules/partition/gui/PartitionLabelsView.cpp
index 66b1ba62a..d44ebb105 100644
--- a/src/modules/partition/gui/PartitionLabelsView.cpp
+++ b/src/modules/partition/gui/PartitionLabelsView.cpp
@@ -26,14 +26,13 @@
 #include <QMouseEvent>
 #include <QPainter>
 
-using namespace CalamaresUtils::Units;
+using namespace Calamares::Units;
 
 static const int LAYOUT_MARGIN = 4;
-static const int LABEL_PARTITION_SQUARE_MARGIN = qMax( CalamaresUtils::defaultFontHeight() - 2, 18 );
+static const int LABEL_PARTITION_SQUARE_MARGIN = qMax( Calamares::defaultFontHeight() - 2, 18 );
 static const int LABELS_MARGIN = LABEL_PARTITION_SQUARE_MARGIN;
 static const int CORNER_RADIUS = 2;
 
-
 static QStringList
 buildUnknownDisklabelTexts( Device* dev )
 {
@@ -42,7 +41,6 @@ buildUnknownDisklabelTexts( Device* dev )
     return texts;
 }
 
-
 PartitionLabelsView::PartitionLabelsView( QWidget* parent )
     : QAbstractItemView( parent )
     , m_canBeSelected( []( const QModelIndex& ) { return true; } )
@@ -56,17 +54,14 @@ PartitionLabelsView::PartitionLabelsView( QWidget* parent )
     setMouseTracking( true );
 }
 
-
 PartitionLabelsView::~PartitionLabelsView() {}
 
-
 QSize
 PartitionLabelsView::minimumSizeHint() const
 {
     return sizeHint();
 }
 
-
 QSize
 PartitionLabelsView::sizeHint() const
 {
@@ -78,7 +73,6 @@ PartitionLabelsView::sizeHint() const
     return QSize();
 }
 
-
 void
 PartitionLabelsView::paintEvent( QPaintEvent* event )
 {
@@ -93,14 +87,12 @@ PartitionLabelsView::paintEvent( QPaintEvent* event )
     drawLabels( &painter, lRect, QModelIndex() );
 }
 
-
 QRect
 PartitionLabelsView::labelsRect() const
 {
     return rect().adjusted( 0, LAYOUT_MARGIN, 0, 0 );
 }
 
-
 static void
 drawPartitionSquare( QPainter* painter, const QRect& rect, const QBrush& brush )
 {
@@ -112,7 +104,6 @@ drawPartitionSquare( QPainter* painter, const QRect& rect, const QBrush& brush )
     painter->translate( -.5, -.5 );
 }
 
-
 static void
 drawSelectionSquare( QPainter* painter, const QRect& rect, const QBrush& brush )
 {
@@ -128,7 +119,6 @@ drawSelectionSquare( QPainter* painter, const QRect& rect, const QBrush& brush )
     painter->restore();
 }
 
-
 QModelIndexList
 PartitionLabelsView::getIndexesToDraw( const QModelIndex& parent ) const
 {
@@ -167,7 +157,6 @@ PartitionLabelsView::getIndexesToDraw( const QModelIndex& parent ) const
     return list;
 }
 
-
 QStringList
 PartitionLabelsView::buildTexts( const QModelIndex& index ) const
 {
@@ -242,7 +231,6 @@ PartitionLabelsView::buildTexts( const QModelIndex& index ) const
     return { firstLine, secondLine };
 }
 
-
 void
 PartitionLabelsView::drawLabels( QPainter* painter, const QRect& rect, const QModelIndex& parent )
 {
@@ -304,7 +292,6 @@ PartitionLabelsView::drawLabels( QPainter* painter, const QRect& rect, const QMo
     }
 }
 
-
 QSize
 PartitionLabelsView::sizeForAllLabels( int maxLineWidth ) const
 {
@@ -348,7 +335,6 @@ PartitionLabelsView::sizeForAllLabels( int maxLineWidth ) const
     return QSize( maxLineWidth, totalHeight );
 }
 
-
 QSize
 PartitionLabelsView::sizeForLabel( const QStringList& text ) const
 {
@@ -365,7 +351,6 @@ PartitionLabelsView::sizeForLabel( const QStringList& text ) const
     return QSize( width, vertOffset );
 }
 
-
 void
 PartitionLabelsView::drawLabel( QPainter* painter,
                                 const QStringList& text,
@@ -398,7 +383,6 @@ PartitionLabelsView::drawLabel( QPainter* painter,
     painter->setPen( Qt::black );
 }
 
-
 QModelIndex
 PartitionLabelsView::indexAt( const QPoint& point ) const
 {
@@ -437,7 +421,6 @@ PartitionLabelsView::indexAt( const QPoint& point ) const
     return QModelIndex();
 }
 
-
 QRect
 PartitionLabelsView::visualRect( const QModelIndex& idx ) const
 {
@@ -475,7 +458,6 @@ PartitionLabelsView::visualRect( const QModelIndex& idx ) const
     return QRect();
 }
 
-
 QRegion
 PartitionLabelsView::visualRegionForSelection( const QItemSelection& selection ) const
 {
@@ -484,21 +466,18 @@ PartitionLabelsView::visualRegionForSelection( const QItemSelection& selection )
     return QRegion();
 }
 
-
 int
 PartitionLabelsView::horizontalOffset() const
 {
     return 0;
 }
 
-
 int
 PartitionLabelsView::verticalOffset() const
 {
     return 0;
 }
 
-
 void
 PartitionLabelsView::scrollTo( const QModelIndex& index, ScrollHint hint )
 {
@@ -506,7 +485,6 @@ PartitionLabelsView::scrollTo( const QModelIndex& index, ScrollHint hint )
     Q_UNUSED( hint )
 }
 
-
 void
 PartitionLabelsView::setCustomNewRootLabel( const QString& text )
 {
@@ -514,7 +492,6 @@ PartitionLabelsView::setCustomNewRootLabel( const QString& text )
     viewport()->repaint();
 }
 
-
 void
 PartitionLabelsView::setSelectionModel( QItemSelectionModel* selectionModel )
 {
@@ -522,21 +499,18 @@ PartitionLabelsView::setSelectionModel( QItemSelectionModel* selectionModel )
     connect( selectionModel, &QItemSelectionModel::selectionChanged, this, [ = ] { viewport()->repaint(); } );
 }
 
-
 void
 PartitionLabelsView::setSelectionFilter( SelectionFilter canBeSelected )
 {
     m_canBeSelected = canBeSelected;
 }
 
-
 void
 PartitionLabelsView::setExtendedPartitionHidden( bool hidden )
 {
     m_extendedPartitionHidden = hidden;
 }
 
-
 QModelIndex
 PartitionLabelsView::moveCursor( CursorAction cursorAction, Qt::KeyboardModifiers modifiers )
 {
@@ -546,7 +520,6 @@ PartitionLabelsView::moveCursor( CursorAction cursorAction, Qt::KeyboardModifier
     return QModelIndex();
 }
 
-
 bool
 PartitionLabelsView::isIndexHidden( const QModelIndex& index ) const
 {
@@ -555,7 +528,6 @@ PartitionLabelsView::isIndexHidden( const QModelIndex& index ) const
     return false;
 }
 
-
 void
 PartitionLabelsView::setSelection( const QRect& rect, QItemSelectionModel::SelectionFlags flags )
 {
@@ -566,7 +538,6 @@ PartitionLabelsView::setSelection( const QRect& rect, QItemSelectionModel::Selec
     }
 }
 
-
 void
 PartitionLabelsView::mouseMoveEvent( QMouseEvent* event )
 {
@@ -597,7 +568,6 @@ PartitionLabelsView::mouseMoveEvent( QMouseEvent* event )
     }
 }
 
-
 void
 PartitionLabelsView::leaveEvent( QEvent* event )
 {
@@ -611,7 +581,6 @@ PartitionLabelsView::leaveEvent( QEvent* event )
     }
 }
 
-
 void
 PartitionLabelsView::mousePressEvent( QMouseEvent* event )
 {
@@ -626,7 +595,6 @@ PartitionLabelsView::mousePressEvent( QMouseEvent* event )
     }
 }
 
-
 void
 PartitionLabelsView::updateGeometries()
 {
diff --git a/src/modules/partition/gui/PartitionSizeController.cpp b/src/modules/partition/gui/PartitionSizeController.cpp
index b7757c32d..c21ebd1c4 100644
--- a/src/modules/partition/gui/PartitionSizeController.cpp
+++ b/src/modules/partition/gui/PartitionSizeController.cpp
@@ -192,7 +192,7 @@ PartitionSizeController::doUpdateSpinBox()
     {
         return;
     }
-    int mbSize = CalamaresUtils::BytesToMiB( m_partition->length() * m_device->logicalSize() );
+    int mbSize = Calamares::BytesToMiB( m_partition->length() * m_device->logicalSize() );
     m_spinBox->setValue( mbSize );
     if ( m_currentSpinBoxValue != -1 &&  //if it's not the first time we're setting it
          m_currentSpinBoxValue != mbSize )  //and the operation changes the SB value
diff --git a/src/modules/partition/gui/PartitionSplitterWidget.cpp b/src/modules/partition/gui/PartitionSplitterWidget.cpp
index ea97761fb..898475d40 100644
--- a/src/modules/partition/gui/PartitionSplitterWidget.cpp
+++ b/src/modules/partition/gui/PartitionSplitterWidget.cpp
@@ -29,9 +29,8 @@
 
 using Calamares::Partition::PartitionIterator;
 
-static const int VIEW_HEIGHT
-    = qMax( CalamaresUtils::defaultFontHeight() + 8,  // wins out with big fonts
-            int( CalamaresUtils::defaultFontHeight() * 0.6 ) + 22 );  // wins out with small fonts
+static const int VIEW_HEIGHT = qMax( Calamares::defaultFontHeight() + 8,  // wins out with big fonts
+                                     int( Calamares::defaultFontHeight() * 0.6 ) + 22 );  // wins out with small fonts
 static const int CORNER_RADIUS = 3;
 static const int EXTENDED_PARTITION_MARGIN = qMax( 4, VIEW_HEIGHT / 6 );
 
@@ -92,7 +91,6 @@ PartitionSplitterWidget::PartitionSplitterWidget( QWidget* parent )
     setMouseTracking( true );
 }
 
-
 void
 PartitionSplitterWidget::init( Device* dev, bool drawNestedPartitions )
 {
@@ -153,7 +151,6 @@ PartitionSplitterWidget::setupItems( const QVector< PartitionSplitterItem >& ite
     }
 }
 
-
 void
 PartitionSplitterWidget::setSplitPartition( const QString& path, qint64 minSize, qint64 maxSize, qint64 preferredSize )
 {
@@ -285,7 +282,6 @@ PartitionSplitterWidget::setSplitPartition( const QString& path, qint64 minSize,
     repaint();
 }
 
-
 qint64
 PartitionSplitterWidget::splitPartitionSize() const
 {
@@ -296,7 +292,6 @@ PartitionSplitterWidget::splitPartitionSize() const
     return m_itemToResize.size;
 }
 
-
 qint64
 PartitionSplitterWidget::newPartitionSize() const
 {
@@ -307,21 +302,18 @@ PartitionSplitterWidget::newPartitionSize() const
     return m_itemToResizeNext.size;
 }
 
-
 QSize
 PartitionSplitterWidget::sizeHint() const
 {
     return QSize( -1, VIEW_HEIGHT );
 }
 
-
 QSize
 PartitionSplitterWidget::minimumSizeHint() const
 {
     return sizeHint();
 }
 
-
 void
 PartitionSplitterWidget::paintEvent( QPaintEvent* event )
 {
@@ -334,7 +326,6 @@ PartitionSplitterWidget::paintEvent( QPaintEvent* event )
     drawPartitions( &painter, rect(), m_items );
 }
 
-
 void
 PartitionSplitterWidget::mousePressEvent( QMouseEvent* event )
 {
@@ -351,7 +342,6 @@ PartitionSplitterWidget::mousePressEvent( QMouseEvent* event )
     }
 }
 
-
 void
 PartitionSplitterWidget::mouseMoveEvent( QMouseEvent* event )
 {
@@ -452,7 +442,6 @@ PartitionSplitterWidget::mouseMoveEvent( QMouseEvent* event )
     }
 }
 
-
 void
 PartitionSplitterWidget::mouseReleaseEvent( QMouseEvent* event )
 {
@@ -461,7 +450,6 @@ PartitionSplitterWidget::mouseReleaseEvent( QMouseEvent* event )
     m_resizing = false;
 }
 
-
 void
 PartitionSplitterWidget::drawSection( QPainter* painter,
                                       const QRect& rect_,
@@ -555,7 +543,6 @@ PartitionSplitterWidget::drawResizeHandle( QPainter* painter, const QRect& rect_
     painter->drawLine( x, 0, x, int( h ) - 1 );
 }
 
-
 void
 PartitionSplitterWidget::drawPartitions( QPainter* painter,
                                          const QRect& rect,
diff --git a/src/modules/partition/jobs/CreatePartitionJob.cpp b/src/modules/partition/jobs/CreatePartitionJob.cpp
index a43724eec..1ac9daf27 100644
--- a/src/modules/partition/jobs/CreatePartitionJob.cpp
+++ b/src/modules/partition/jobs/CreatePartitionJob.cpp
@@ -43,7 +43,7 @@ using Calamares::Partition::userVisibleFS;
 static Calamares::JobResult
 createZfs( Partition* partition, Device* device )
 {
-    auto r = CalamaresUtils::System::instance()->runCommand(
+    auto r = Calamares::System::instance()->runCommand(
         { "sh",
           "-c",
           "echo start=" + QString::number( partition->firstSector() ) + " size="
@@ -83,7 +83,7 @@ createZfs( Partition* partition, Device* device )
     // If it is a gpt device, set the partition UUID
     if ( device->partitionTable()->type() == PartitionTable::gpt && partition->uuid().isEmpty() )
     {
-        r = CalamaresUtils::System::instance()->runCommand(
+        r = Calamares::System::instance()->runCommand(
             { "sfdisk", "--list", "--output", "Device,UUID", partition->devicePath() }, std::chrono::seconds( 5 ) );
         if ( r.getExitCode() == 0 )
         {
@@ -100,14 +100,12 @@ createZfs( Partition* partition, Device* device )
     return Calamares::JobResult::ok();
 }
 
-
 CreatePartitionJob::CreatePartitionJob( Device* device, Partition* partition )
     : PartitionJob( partition )
     , m_device( device )
 {
 }
 
-
 static QString
 prettyGptType( const Partition* partition )
 {
@@ -181,7 +179,7 @@ CreatePartitionJob::prettyName() const
         if ( !entries.isEmpty() )
         {
             return tr( "Create new %1MiB partition on %3 (%2) with entries %4." )
-                .arg( CalamaresUtils::BytesToMiB( m_partition->capacity() ) )
+                .arg( Calamares::BytesToMiB( m_partition->capacity() ) )
                 .arg( m_device->name() )
                 .arg( m_device->deviceNode() )
                 .arg( entries );
@@ -189,7 +187,7 @@ CreatePartitionJob::prettyName() const
         else
         {
             return tr( "Create new %1MiB partition on %3 (%2)." )
-                .arg( CalamaresUtils::BytesToMiB( m_partition->capacity() ) )
+                .arg( Calamares::BytesToMiB( m_partition->capacity() ) )
                 .arg( m_device->name() )
                 .arg( m_device->deviceNode() );
         }
@@ -197,12 +195,11 @@ CreatePartitionJob::prettyName() const
 
     return tr( "Create new %2MiB partition on %4 (%3) with file system %1." )
         .arg( userVisibleFS( m_partition->fileSystem() ) )
-        .arg( CalamaresUtils::BytesToMiB( m_partition->capacity() ) )
+        .arg( Calamares::BytesToMiB( m_partition->capacity() ) )
         .arg( m_device->name() )
         .arg( m_device->deviceNode() );
 }
 
-
 QString
 CreatePartitionJob::prettyDescription() const
 {
@@ -214,7 +211,7 @@ CreatePartitionJob::prettyDescription() const
         {
             return tr( "Create new <strong>%1MiB</strong> partition on <strong>%3</strong> (%2) with entries "
                        "<em>%4</em>." )
-                .arg( CalamaresUtils::BytesToMiB( m_partition->capacity() ) )
+                .arg( Calamares::BytesToMiB( m_partition->capacity() ) )
                 .arg( m_device->name() )
                 .arg( m_device->deviceNode() )
                 .arg( entries );
@@ -222,7 +219,7 @@ CreatePartitionJob::prettyDescription() const
         else
         {
             return tr( "Create new <strong>%1MiB</strong> partition on <strong>%3</strong> (%2)." )
-                .arg( CalamaresUtils::BytesToMiB( m_partition->capacity() ) )
+                .arg( Calamares::BytesToMiB( m_partition->capacity() ) )
                 .arg( m_device->name() )
                 .arg( m_device->deviceNode() );
         }
@@ -231,12 +228,11 @@ CreatePartitionJob::prettyDescription() const
     return tr( "Create new <strong>%2MiB</strong> partition on <strong>%4</strong> "
                "(%3) with file system <strong>%1</strong>." )
         .arg( userVisibleFS( m_partition->fileSystem() ) )
-        .arg( CalamaresUtils::BytesToMiB( m_partition->capacity() ) )
+        .arg( Calamares::BytesToMiB( m_partition->capacity() ) )
         .arg( m_device->name() )
         .arg( m_device->deviceNode() );
 }
 
-
 QString
 CreatePartitionJob::prettyStatusMessage() const
 {
diff --git a/src/modules/partition/jobs/CreatePartitionTableJob.cpp b/src/modules/partition/jobs/CreatePartitionTableJob.cpp
index 9ee293705..5de0ed1ea 100644
--- a/src/modules/partition/jobs/CreatePartitionTableJob.cpp
+++ b/src/modules/partition/jobs/CreatePartitionTableJob.cpp
@@ -52,7 +52,6 @@ CreatePartitionTableJob::prettyDescription() const
         .arg( m_device->name() );
 }
 
-
 QString
 CreatePartitionTableJob::prettyStatusMessage() const
 {
@@ -61,7 +60,6 @@ CreatePartitionTableJob::prettyStatusMessage() const
         .arg( m_device->deviceNode() );
 }
 
-
 Calamares::JobResult
 CreatePartitionTableJob::exec()
 {
@@ -76,10 +74,10 @@ CreatePartitionTableJob::exec()
             cDebug() << Logger::SubEntry << ( ( *it ) ? ( *it )->deviceNode() : QString( "<null device>" ) );
         }
 
-        auto lsblkResult = CalamaresUtils::System::runCommand( { "lsblk" }, std::chrono::seconds( 30 ) );
+        auto lsblkResult = Calamares::System::runCommand( { "lsblk" }, std::chrono::seconds( 30 ) );
         cDebug() << Logger::SubEntry << "lsblk output:\n" << Logger::NoQuote << lsblkResult.getOutput();
 
-        auto mountResult = CalamaresUtils::System::runCommand( { "mount" }, std::chrono::seconds( 30 ) );
+        auto mountResult = Calamares::System::runCommand( { "mount" }, std::chrono::seconds( 30 ) );
         cDebug() << Logger::SubEntry << "mount output:\n" << Logger::NoQuote << mountResult.getOutput();
     }
 
diff --git a/src/modules/partition/jobs/DeletePartitionJob.cpp b/src/modules/partition/jobs/DeletePartitionJob.cpp
index d61bb955e..7411abfe0 100644
--- a/src/modules/partition/jobs/DeletePartitionJob.cpp
+++ b/src/modules/partition/jobs/DeletePartitionJob.cpp
@@ -44,7 +44,7 @@ isZfs( Partition* partition )
 static Calamares::JobResult
 removePartition( Partition* partition )
 {
-    auto r = CalamaresUtils::System::instance()->runCommand(
+    auto r = Calamares::System::instance()->runCommand(
         { "sfdisk", "--delete", "--force", partition->devicePath(), QString::number( partition->number() ) },
         std::chrono::seconds( 5 ) );
     if ( r.getExitCode() != 0 || r.getOutput().contains( "failed" ) )
@@ -73,21 +73,18 @@ DeletePartitionJob::prettyName() const
     return tr( "Delete partition %1." ).arg( m_partition->partitionPath() );
 }
 
-
 QString
 DeletePartitionJob::prettyDescription() const
 {
     return tr( "Delete partition <strong>%1</strong>." ).arg( m_partition->partitionPath() );
 }
 
-
 QString
 DeletePartitionJob::prettyStatusMessage() const
 {
     return tr( "Deleting partition %1." ).arg( m_partition->partitionPath() );
 }
 
-
 Calamares::JobResult
 DeletePartitionJob::exec()
 {
diff --git a/src/modules/partition/jobs/FormatPartitionJob.cpp b/src/modules/partition/jobs/FormatPartitionJob.cpp
index 5b72d749c..45a644234 100644
--- a/src/modules/partition/jobs/FormatPartitionJob.cpp
+++ b/src/modules/partition/jobs/FormatPartitionJob.cpp
@@ -43,7 +43,6 @@ FormatPartitionJob::prettyName() const
         .arg( m_device->name() );
 }
 
-
 QString
 FormatPartitionJob::prettyDescription() const
 {
@@ -54,7 +53,6 @@ FormatPartitionJob::prettyDescription() const
         .arg( m_partition->capacity() / 1024 / 1024 );
 }
 
-
 QString
 FormatPartitionJob::prettyStatusMessage() const
 {
@@ -67,7 +65,6 @@ FormatPartitionJob::prettyStatusMessage() const
         .arg( partitionLabel, userVisibleFS( m_partition->fileSystem() ) );
 }
 
-
 Calamares::JobResult
 FormatPartitionJob::exec()
 {
@@ -81,8 +78,8 @@ FormatPartitionJob::exec()
         // (ignoring whether this succeeds). Requires a sufficiently-new
         // xfs_admin and xfs_repair and might be made obsolete by newer
         // kpmcore releases.
-        CalamaresUtils::System::runCommand( { "xfs_admin", "-O", "bigtime=1", m_partition->partitionPath() },
-                                            std::chrono::seconds( 60 ) );
+        Calamares::System::runCommand( { "xfs_admin", "-O", "bigtime=1", m_partition->partitionPath() },
+                                       std::chrono::seconds( 60 ) );
     }
     return r;
 }
diff --git a/src/modules/partition/jobs/ResizePartitionJob.cpp b/src/modules/partition/jobs/ResizePartitionJob.cpp
index fe1ceca4c..0ef715496 100644
--- a/src/modules/partition/jobs/ResizePartitionJob.cpp
+++ b/src/modules/partition/jobs/ResizePartitionJob.cpp
@@ -19,7 +19,7 @@
 #include <kpmcore/ops/resizeoperation.h>
 #include <kpmcore/util/report.h>
 
-using CalamaresUtils::BytesToMiB;
+using Calamares::BytesToMiB;
 
 //- ResizePartitionJob ---------------------------------------------------------
 ResizePartitionJob::ResizePartitionJob( Device* device, Partition* partition, qint64 firstSector, qint64 lastSector )
@@ -41,7 +41,6 @@ ResizePartitionJob::prettyName() const
     return tr( "Resize partition %1." ).arg( partition()->partitionPath() );
 }
 
-
 QString
 ResizePartitionJob::prettyDescription() const
 {
@@ -52,7 +51,6 @@ ResizePartitionJob::prettyDescription() const
         .arg( ( BytesToMiB( m_newLastSector - m_newFirstSector + 1 ) * partition()->sectorSize() ) );
 }
 
-
 QString
 ResizePartitionJob::prettyStatusMessage() const
 {
@@ -63,7 +61,6 @@ ResizePartitionJob::prettyStatusMessage() const
         .arg( ( BytesToMiB( m_newLastSector - m_newFirstSector + 1 ) * partition()->sectorSize() ) );
 }
 
-
 Calamares::JobResult
 ResizePartitionJob::exec()
 {
@@ -90,7 +87,6 @@ ResizePartitionJob::updatePreview()
     m_device->partitionTable()->updateUnallocated( *m_device );
 }
 
-
 Device*
 ResizePartitionJob::device() const
 {
diff --git a/src/modules/partition/jobs/SetPartitionFlagsJob.cpp b/src/modules/partition/jobs/SetPartitionFlagsJob.cpp
index 1da3097ff..c00ba1d2a 100644
--- a/src/modules/partition/jobs/SetPartitionFlagsJob.cpp
+++ b/src/modules/partition/jobs/SetPartitionFlagsJob.cpp
@@ -25,7 +25,7 @@
 #include <kpmcore/ops/setpartflagsoperation.h>
 #include <kpmcore/util/report.h>
 
-using CalamaresUtils::BytesToMiB;
+using Calamares::BytesToMiB;
 using Calamares::Partition::untranslatedFS;
 using Calamares::Partition::userVisibleFS;
 
@@ -36,7 +36,6 @@ SetPartFlagsJob::SetPartFlagsJob( Device* device, Partition* partition, Partitio
 {
 }
 
-
 QString
 SetPartFlagsJob::prettyName() const
 {
@@ -55,7 +54,6 @@ SetPartFlagsJob::prettyName() const
     return tr( "Set flags on new partition." );
 }
 
-
 QString
 SetPartFlagsJob::prettyDescription() const
 {
@@ -98,7 +96,6 @@ SetPartFlagsJob::prettyDescription() const
     return tr( "Flag new partition as <strong>%1</strong>." ).arg( flagsList.join( ", " ) );
 }
 
-
 QString
 SetPartFlagsJob::prettyStatusMessage() const
 {
@@ -142,7 +139,6 @@ SetPartFlagsJob::prettyStatusMessage() const
     return tr( "Setting flags <strong>%1</strong> on new partition." ).arg( flagsList.join( ", " ) );
 }
 
-
 Calamares::JobResult
 SetPartFlagsJob::exec()
 {
diff --git a/src/modules/partition/tests/CreateLayoutsTests.cpp b/src/modules/partition/tests/CreateLayoutsTests.cpp
index 4fb3c886a..87a1ea484 100644
--- a/src/modules/partition/tests/CreateLayoutsTests.cpp
+++ b/src/modules/partition/tests/CreateLayoutsTests.cpp
@@ -19,7 +19,7 @@
 
 #include <QtTest/QtTest>
 
-using namespace CalamaresUtils::Units;
+using namespace Calamares::Units;
 
 class PartitionTable;
 class SmartStatus;
diff --git a/src/modules/partition/tests/PartitionJobTests.cpp b/src/modules/partition/tests/PartitionJobTests.cpp
index 0646dacdf..82c93a854 100644
--- a/src/modules/partition/tests/PartitionJobTests.cpp
+++ b/src/modules/partition/tests/PartitionJobTests.cpp
@@ -29,7 +29,7 @@ QTEST_GUILESS_MAIN( PartitionJobTests )
 
 using Calamares::job_ptr;
 using Calamares::JobList;
-using namespace CalamaresUtils::Units;
+using namespace Calamares::Units;
 
 class PartitionMounter
 {
@@ -365,7 +365,7 @@ PartitionJobTests::testResizePartition()
     // Make the test data file smaller than the full size of the partition to
     // accomodate for the file system overhead
     const unsigned long long minSizeMiB = qMin( oldSizeMiB, newSizeMiB );
-    const QByteArray testData = generateTestData( CalamaresUtils::MiBtoBytes( minSizeMiB ) * 3 / 4 );
+    const QByteArray testData = generateTestData( Calamares::MiBtoBytes( minSizeMiB ) * 3 / 4 );
     const QString testName = "test.data";
 
     // Setup: create the test partition
@@ -427,7 +427,6 @@ PartitionJobTests::testResizePartition()
         QCOMPARE( partition->fileSystem().firstSector(), newFirst );
         QCOMPARE( partition->fileSystem().lastSector(), newLast );
 
-
         PartitionMounter mounter( partition->partitionPath() );
         QString mountPoint = mounter.mountPoint();
         QVERIFY( !mountPoint.isEmpty() );
diff --git a/src/modules/plasmalnf/Config.cpp b/src/modules/plasmalnf/Config.cpp
index e022109b4..4922dceaa 100644
--- a/src/modules/plasmalnf/Config.cpp
+++ b/src/modules/plasmalnf/Config.cpp
@@ -52,16 +52,16 @@ Config::Config( QObject* parent )
 void
 Config::setConfigurationMap( const QVariantMap& configurationMap )
 {
-    m_lnfPath = CalamaresUtils::getString( configurationMap, "lnftool" );
+    m_lnfPath = Calamares::getString( configurationMap, "lnftool" );
 
     if ( m_lnfPath.isEmpty() )
     {
         cWarning() << "no lnftool given for plasmalnf module.";
     }
 
-    m_liveUser = CalamaresUtils::getString( configurationMap, "liveuser" );
+    m_liveUser = Calamares::getString( configurationMap, "liveuser" );
 
-    QString preselect = CalamaresUtils::getString( configurationMap, "preselect" );
+    QString preselect = Calamares::getString( configurationMap, "preselect" );
     if ( preselect == QStringLiteral( "*" ) )
     {
         preselect = currentPlasmaTheme();
@@ -92,7 +92,7 @@ Config::setConfigurationMap( const QVariantMap& configurationMap )
         }
         m_themeModel->setThemeImage( listedThemes );
 
-        bool showAll = CalamaresUtils::getBool( configurationMap, "showAll", false );
+        bool showAll = Calamares::getBool( configurationMap, "showAll", false );
         if ( !listedThemes.isEmpty() && !showAll )
         {
             m_themeModel->showOnlyThemes( listedThemes );
@@ -122,7 +122,6 @@ Config::createJobs() const
     return l;
 }
 
-
 void
 Config::setTheme( const QString& id )
 {
@@ -148,7 +147,7 @@ Config::setTheme( const QString& id )
         }
         command << lnfToolPath() << "--resetLayout"
                 << "--apply" << id;
-        auto r = CalamaresUtils::System::instance()->runCommand( command, std::chrono::seconds( 10 ) );
+        auto r = Calamares::System::instance()->runCommand( command, std::chrono::seconds( 10 ) );
 
         if ( r.getExitCode() )
         {
diff --git a/src/modules/plasmalnf/PlasmaLnfJob.cpp b/src/modules/plasmalnf/PlasmaLnfJob.cpp
index 3b550d50a..9c0449e86 100644
--- a/src/modules/plasmalnf/PlasmaLnfJob.cpp
+++ b/src/modules/plasmalnf/PlasmaLnfJob.cpp
@@ -36,7 +36,7 @@ PlasmaLnfJob::prettyName() const
 Calamares::JobResult
 PlasmaLnfJob::exec()
 {
-    auto* system = CalamaresUtils::System::instance();
+    auto* system = Calamares::System::instance();
     auto* gs = Calamares::JobQueue::instance()->globalStorage();
 
     QStringList command( { "sudo",
diff --git a/src/modules/plasmalnf/ThemeInfo.cpp b/src/modules/plasmalnf/ThemeInfo.cpp
index 8e7aa13b9..7678bb151 100644
--- a/src/modules/plasmalnf/ThemeInfo.cpp
+++ b/src/modules/plasmalnf/ThemeInfo.cpp
@@ -80,7 +80,6 @@ public:
         return { i, const_cast< ThemeInfo* >( p ) };
     }
 
-
     /** @brief Looks for a given @p id in the list of themes, returns nullptr if not found. */
     ThemeInfo* findById( const QString& id )
     {
@@ -222,8 +221,7 @@ ThemesModel::showOnlyThemes( const QMap< QString, QString >& onlyThese )
 QSize
 ThemesModel::imageSize()
 {
-    return { qMax( 12 * CalamaresUtils::defaultFontHeight(), 120 ),
-             qMax( 8 * CalamaresUtils::defaultFontHeight(), 80 ) };
+    return { qMax( 12 * Calamares::defaultFontHeight(), 120 ), qMax( 8 * Calamares::defaultFontHeight(), 80 ) };
 }
 
 void
@@ -246,7 +244,6 @@ ThemesModel::select( const QString& themeId )
     }
 }
 
-
 /**
  * Massage the given @p path to the most-likely
  * path that actually contains a screenshot. For
diff --git a/src/modules/preservefiles/Item.cpp b/src/modules/preservefiles/Item.cpp
index 98488f951..d1f163583 100644
--- a/src/modules/preservefiles/Item.cpp
+++ b/src/modules/preservefiles/Item.cpp
@@ -17,7 +17,7 @@
 
 #include <QFile>
 
-using namespace CalamaresUtils::Units;
+using namespace Calamares::Units;
 
 static bool
 copy_file( const QString& source, const QString& dest )
@@ -51,7 +51,7 @@ copy_file( const QString& source, const QString& dest )
 }
 
 Item
-Item::fromVariant( const QVariant& v, const CalamaresUtils::Permissions& defaultPermissions )
+Item::fromVariant( const QVariant& v, const Calamares::Permissions& defaultPermissions )
 {
     if ( Calamares::typeOf( v ) == Calamares::StringVariantType )
     {
@@ -70,15 +70,15 @@ Item::fromVariant( const QVariant& v, const CalamaresUtils::Permissions& default
     {
         const auto map = v.toMap();
 
-        CalamaresUtils::Permissions perm( defaultPermissions );
+        Calamares::Permissions perm( defaultPermissions );
         ItemType t = ItemType::None;
-        bool optional = CalamaresUtils::getBool( map, "optional", false );
+        bool optional = Calamares::getBool( map, "optional", false );
 
         {
             QString perm_string = map[ "perm" ].toString();
             if ( !perm_string.isEmpty() )
             {
-                perm = CalamaresUtils::Permissions( perm_string );
+                perm = Calamares::Permissions( perm_string );
             }
         }
 
@@ -116,12 +116,11 @@ Item::fromVariant( const QVariant& v, const CalamaresUtils::Permissions& default
     return {};
 }
 
-
 bool
 Item::exec( const std::function< QString( QString ) >& replacements ) const
 {
     QString expanded_dest = replacements( dest );
-    QString full_dest = CalamaresUtils::System::instance()->targetPath( expanded_dest );
+    QString full_dest = Calamares::System::instance()->targetPath( expanded_dest );
 
     bool success = false;
     switch ( m_type )
@@ -150,7 +149,7 @@ Item::exec( const std::function< QString( QString ) >& replacements ) const
     }
     if ( !success )
     {
-        CalamaresUtils::System::instance()->removeTargetFile( expanded_dest );
+        Calamares::System::instance()->removeTargetFile( expanded_dest );
         return false;
     }
     else
diff --git a/src/modules/preservefiles/Item.h b/src/modules/preservefiles/Item.h
index 896b9471f..8707d8db2 100644
--- a/src/modules/preservefiles/Item.h
+++ b/src/modules/preservefiles/Item.h
@@ -34,12 +34,12 @@ class Item
 {
     QString source;
     QString dest;
-    CalamaresUtils::Permissions perm;
+    Calamares::Permissions perm;
     ItemType m_type = ItemType::None;
     bool m_optional = false;
 
 public:
-    Item( const QString& src, const QString& d, CalamaresUtils::Permissions p, ItemType t, bool optional )
+    Item( const QString& src, const QString& d, Calamares::Permissions p, ItemType t, bool optional )
         : source( src )
         , dest( d )
         , perm( std::move( p ) )
@@ -59,7 +59,6 @@ public:
 
     bool exec( const std::function< QString( QString ) >& replacements ) const;
 
-
     /** @brief Create an Item -- or one of its subclasses -- from @p v
      *
      * Depending on the structure and contents of @p v, a pointer
@@ -69,8 +68,7 @@ public:
      * When the entry contains a *perm* key, use that permission, otherwise
      * apply @p defaultPermissions to the item.
      */
-    static Item fromVariant( const QVariant& v, const CalamaresUtils::Permissions& defaultPermissions );
+    static Item fromVariant( const QVariant& v, const Calamares::Permissions& defaultPermissions );
 };
 
-
 #endif
diff --git a/src/modules/preservefiles/PreserveFiles.cpp b/src/modules/preservefiles/PreserveFiles.cpp
index 15d588182..6ab061741 100644
--- a/src/modules/preservefiles/PreserveFiles.cpp
+++ b/src/modules/preservefiles/PreserveFiles.cpp
@@ -21,7 +21,7 @@
 
 #include <QFile>
 
-using namespace CalamaresUtils::Units;
+using namespace Calamares::Units;
 
 QString
 atReplacements( QString s )
@@ -109,7 +109,7 @@ PreserveFiles::setConfigurationMap( const QVariantMap& configurationMap )
     {
         defaultPermissions = QStringLiteral( "root:root:0400" );
     }
-    CalamaresUtils::Permissions perm( defaultPermissions );
+    Calamares::Permissions perm( defaultPermissions );
 
     for ( const auto& li : files.toList() )
     {
diff --git a/src/modules/preservefiles/Tests.cpp b/src/modules/preservefiles/Tests.cpp
index 4bd6f138f..a47da5415 100644
--- a/src/modules/preservefiles/Tests.cpp
+++ b/src/modules/preservefiles/Tests.cpp
@@ -40,7 +40,7 @@ PreserveFilesTests::initTestCase()
     cDebug() << "PreserveFiles test started.";
 
     // Ensure we have a system object, expect it to be a "bogus" one
-    CalamaresUtils::System* system = CalamaresUtils::System::instance();
+    Calamares::System* system = Calamares::System::instance();
     QVERIFY( system );
     cDebug() << Logger::SubEntry << "System @" << Logger::Pointer( system );
 
@@ -77,10 +77,10 @@ PreserveFilesTests::testItems()
     QVERIFY( fi.exists() );
 
     bool config_file_ok = false;
-    const auto map = CalamaresUtils::loadYaml( fi, &config_file_ok );
+    const auto map = Calamares::YAML::load( fi, &config_file_ok );
     QVERIFY( config_file_ok );
 
-    CalamaresUtils::Permissions perm( QStringLiteral( "adridg:adridg:0750" ) );
+    Calamares::Permissions perm( QStringLiteral( "adridg:adridg:0750" ) );
     auto i = Item::fromVariant( map[ "item" ], perm );
     QCOMPARE( bool( i ), ok );
     QCOMPARE( smash( i.type() ), type_i );
diff --git a/src/modules/removeuser/RemoveUserJob.cpp b/src/modules/removeuser/RemoveUserJob.cpp
index 9475b9bea..bb70305f5 100644
--- a/src/modules/removeuser/RemoveUserJob.cpp
+++ b/src/modules/removeuser/RemoveUserJob.cpp
@@ -24,10 +24,8 @@ RemoveUserJob::RemoveUserJob( QObject* parent )
 {
 }
 
-
 RemoveUserJob::~RemoveUserJob() {}
 
-
 QString
 RemoveUserJob::prettyName() const
 {
@@ -43,7 +41,7 @@ RemoveUserJob::exec()
         return Calamares::JobResult::ok();
     }
 
-    auto* s = CalamaresUtils::System::instance();
+    auto* s = Calamares::System::instance();
     auto r = s->targetEnvCommand( { QStringLiteral( "userdel" ),
                                     QStringLiteral( "-f" ),  // force
                                     QStringLiteral( "-r" ),  // remove home-dir and mail
@@ -55,11 +53,10 @@ RemoveUserJob::exec()
     return Calamares::JobResult::ok();
 }
 
-
 void
 RemoveUserJob::setConfigurationMap( const QVariantMap& map )
 {
-    m_username = CalamaresUtils::getString( map, "username" );
+    m_username = Calamares::getString( map, "username" );
 }
 
 CALAMARES_PLUGIN_FACTORY_DEFINITION( RemoveUserJobFactory, registerPlugin< RemoveUserJob >(); )
diff --git a/src/modules/shellprocess/ShellProcessJob.cpp b/src/modules/shellprocess/ShellProcessJob.cpp
index b30af9a29..779871895 100644
--- a/src/modules/shellprocess/ShellProcessJob.cpp
+++ b/src/modules/shellprocess/ShellProcessJob.cpp
@@ -26,10 +26,8 @@ ShellProcessJob::ShellProcessJob( QObject* parent )
 {
 }
 
-
 ShellProcessJob::~ShellProcessJob() {}
 
-
 QString
 ShellProcessJob::prettyName() const
 {
@@ -40,7 +38,6 @@ ShellProcessJob::prettyName() const
     return tr( "Shell Processes Job" );
 }
 
-
 Calamares::JobResult
 ShellProcessJob::exec()
 {
@@ -54,12 +51,11 @@ ShellProcessJob::exec()
     return m_commands->run();
 }
 
-
 void
 ShellProcessJob::setConfigurationMap( const QVariantMap& configurationMap )
 {
-    bool dontChroot = CalamaresUtils::getBool( configurationMap, "dontChroot", false );
-    qint64 timeout = CalamaresUtils::getInteger( configurationMap, "timeout", 30 );
+    bool dontChroot = Calamares::getBool( configurationMap, "dontChroot", false );
+    qint64 timeout = Calamares::getInteger( configurationMap, "timeout", 30 );
     if ( timeout < 1 )
     {
         timeout = 30;
@@ -67,7 +63,7 @@ ShellProcessJob::setConfigurationMap( const QVariantMap& configurationMap )
 
     if ( configurationMap.contains( "script" ) )
     {
-        m_commands = std::make_unique< CalamaresUtils::CommandList >(
+        m_commands = std::make_unique< Calamares::CommandList >(
             configurationMap.value( "script" ), !dontChroot, std::chrono::seconds( timeout ) );
         if ( m_commands->isEmpty() )
         {
@@ -80,7 +76,7 @@ ShellProcessJob::setConfigurationMap( const QVariantMap& configurationMap )
     }
 
     bool labels_ok = false;
-    auto labels = CalamaresUtils::getSubMap( configurationMap, "i18n", labels_ok );
+    auto labels = Calamares::getSubMap( configurationMap, "i18n", labels_ok );
     if ( labels_ok )
     {
         if ( labels.contains( "name" ) )
diff --git a/src/modules/shellprocess/ShellProcessJob.h b/src/modules/shellprocess/ShellProcessJob.h
index eb61fe801..79886e3b3 100644
--- a/src/modules/shellprocess/ShellProcessJob.h
+++ b/src/modules/shellprocess/ShellProcessJob.h
@@ -37,7 +37,7 @@ public:
     void setConfigurationMap( const QVariantMap& configurationMap ) override;
 
 private:
-    std::unique_ptr< CalamaresUtils::CommandList > m_commands;
+    std::unique_ptr< Calamares::CommandList > m_commands;
     std::unique_ptr< Calamares::Locale::TranslatedString > m_name;
 };
 
diff --git a/src/modules/shellprocess/Tests.cpp b/src/modules/shellprocess/Tests.cpp
index f8727ab36..d37fb42ab 100644
--- a/src/modules/shellprocess/Tests.cpp
+++ b/src/modules/shellprocess/Tests.cpp
@@ -24,10 +24,9 @@
 
 QTEST_GUILESS_MAIN( ShellProcessTests )
 
-using CommandList = CalamaresUtils::CommandList;
+using CommandList = Calamares::CommandList;
 using std::operator""s;
 
-
 ShellProcessTests::ShellProcessTests() {}
 
 ShellProcessTests::~ShellProcessTests() {}
@@ -40,43 +39,43 @@ ShellProcessTests::initTestCase()
 void
 ShellProcessTests::testProcessListSampleConfig()
 {
-    YAML::Node doc;
+    ::YAML::Node doc;
 
     QString filename = QStringLiteral( "shellprocess.conf" );
     QFile fi( QString( "%1/%2" ).arg( BUILD_AS_TEST, filename ) );
 
     QVERIFY( fi.exists() );
-    doc = YAML::LoadFile( fi.fileName().toStdString() );
+    doc = ::YAML::LoadFile( fi.fileName().toStdString() );
 
-    CommandList cl( CalamaresUtils::yamlMapToVariant( doc ).value( "script" ) );
+    CommandList cl( Calamares::YAML::mapToVariant( doc ).value( "script" ) );
     QVERIFY( !cl.isEmpty() );
     QCOMPARE( cl.count(), 3 );
 
-    QCOMPARE( cl.at( 0 ).timeout(), CalamaresUtils::CommandLine::TimeoutNotSet() );
+    QCOMPARE( cl.at( 0 ).timeout(), Calamares::CommandLine::TimeoutNotSet() );
     QCOMPARE( cl.at( 2 ).timeout(), 3600s );  // slowloris
 }
 
 void
 ShellProcessTests::testProcessListFromList()
 {
-    YAML::Node doc = YAML::Load( R"(---
-script:
-    - "ls /tmp"
-    - "ls /nonexistent"
-    - "/bin/false"
-)" );
-    CommandList cl( CalamaresUtils::yamlMapToVariant( doc ).value( "script" ) );
+    ::YAML::Node doc = ::YAML::Load( R"(---
+                                     script:
+                                     - "ls /tmp"
+                                     - "ls /nonexistent"
+                                     - "/bin/false"
+                                   )" );
+    CommandList cl( Calamares::YAML::mapToVariant( doc ).value( "script" ) );
     QVERIFY( !cl.isEmpty() );
     QCOMPARE( cl.count(), 3 );
 
     // Contains 1 bad element
-    doc = YAML::Load( R"(---
-script:
-    - "ls /tmp"
-    - false
-    - "ls /nonexistent"
-)" );
-    CommandList cl1( CalamaresUtils::yamlMapToVariant( doc ).value( "script" ) );
+    doc = ::YAML::Load( R"(---
+                        script:
+                        - "ls /tmp"
+                        - false
+                        - "ls /nonexistent"
+                      )" );
+    CommandList cl1( Calamares::YAML::mapToVariant( doc ).value( "script" ) );
     QVERIFY( !cl1.isEmpty() );
     QCOMPARE( cl1.count(), 2 );  // One element ignored
 }
@@ -85,9 +84,9 @@ void
 ShellProcessTests::testProcessListFromString()
 {
     YAML::Node doc = YAML::Load( R"(---
-script: "ls /tmp"
-)" );
-    CommandList cl( CalamaresUtils::yamlMapToVariant( doc ).value( "script" ) );
+                                 script: "ls /tmp"
+                               )" );
+    CommandList cl( Calamares::YAML::mapToVariant( doc ).value( "script" ) );
 
     QVERIFY( !cl.isEmpty() );
     QCOMPARE( cl.count(), 1 );
@@ -96,9 +95,9 @@ script: "ls /tmp"
 
     // Not a string
     doc = YAML::Load( R"(---
-script: false
-)" );
-    CommandList cl1( CalamaresUtils::yamlMapToVariant( doc ).value( "script" ) );
+                      script: false
+                    )" );
+    CommandList cl1( Calamares::YAML::mapToVariant( doc ).value( "script" ) );
     QVERIFY( cl1.isEmpty() );
     QCOMPARE( cl1.count(), 0 );
 }
@@ -107,11 +106,11 @@ void
 ShellProcessTests::testProcessFromObject()
 {
     YAML::Node doc = YAML::Load( R"(---
-script:
-    command: "ls /tmp"
-    timeout: 20
-)" );
-    CommandList cl( CalamaresUtils::yamlMapToVariant( doc ).value( "script" ) );
+                                 script:
+                                 command: "ls /tmp"
+                                 timeout: 20
+                               )" );
+    CommandList cl( Calamares::YAML::mapToVariant( doc ).value( "script" ) );
 
     QVERIFY( !cl.isEmpty() );
     QCOMPARE( cl.count(), 1 );
@@ -123,44 +122,48 @@ void
 ShellProcessTests::testProcessListFromObject()
 {
     YAML::Node doc = YAML::Load( R"(---
-script:
-    - command: "ls /tmp"
-      timeout: 12
-    - "-/bin/false"
-)" );
-    CommandList cl( CalamaresUtils::yamlMapToVariant( doc ).value( "script" ) );
+                                 script:
+                                 - command: "ls /tmp"
+                                 timeout: 12
+                                 - "-/bin/false"
+                               )" );
+    CommandList cl( Calamares::YAML::mapToVariant( doc ).value( "script" ) );
     QVERIFY( !cl.isEmpty() );
     QCOMPARE( cl.count(), 2 );
     QCOMPARE( cl.at( 0 ).timeout(), 12s );
     QCOMPARE( cl.at( 0 ).command(), QStringLiteral( "ls /tmp" ) );
-    QCOMPARE( cl.at( 1 ).timeout(), CalamaresUtils::CommandLine::TimeoutNotSet() );  // not set
+    QCOMPARE( cl.at( 1 ).timeout(), Calamares::CommandLine::TimeoutNotSet() );  // not set
 }
 
 void
 ShellProcessTests::testRootSubstitution()
 {
     YAML::Node doc = YAML::Load( R"(---
-script:
-    - "ls /tmp"
-)" );
-    QVariant plainScript = CalamaresUtils::yamlMapToVariant( doc ).value( "script" );
-    QVariant rootScript = CalamaresUtils::yamlMapToVariant( YAML::Load( R"(---
-script:
-    - "ls ${ROOT}"
-)" ) )
+                                 script:
+                                 - "ls /tmp"
+                               )" );
+    QVariant plainScript = Calamares::YAML::mapToVariant( doc ).value( "script" );
+    QVariant rootScript = Calamares::YAML::mapToVariant( YAML::Load( R"(---
+                          script:
+                          - "ls ${ROOT}"
+                                                                   )" ) )
                               .value( "script" );
-    QVariant userScript = CalamaresUtils::yamlMapToVariant( YAML::Load( R"(---
-script:
-    - mktemp -d ${ROOT}/calatestXXXXXXXX
-    - "chown ${USER} ${ROOT}/calatest*"
-    - rm -rf ${ROOT}/calatest*
-)" ) )
+    QVariant userScript = Calamares::YAML::mapToVariant( YAML::Load( R"(---
+                                  script:
+                                  - mktemp -d ${ROOT}/calatestXXXXXXXX
+                                  - "chown ${USER} ${ROOT}/calatest*"
+                                  - rm -rf ${ROOT}/calatest*
+                                                                                         )" ) )
                               .value( "script" );
 
     if ( !Calamares::JobQueue::instance() )
+    {
         (void)new Calamares::JobQueue( nullptr );
+    }
     if ( !Calamares::Settings::instance() )
+    {
         (void)Calamares::Settings::init( QString() );
+    }
 
     Calamares::GlobalStorage* gs = Calamares::JobQueue::instance()->globalStorage();
     QVERIFY( gs != nullptr );
@@ -193,7 +196,7 @@ script:
     // Show that shell expansion is now quoted.
     gs->insert( "username", "`id -u`" );
     {
-        CalamaresUtils::CommandLine c { QStringLiteral( "chown ${USER}" ), std::chrono::seconds( 0 ) };
+        Calamares::CommandLine c { QStringLiteral( "chown ${USER}" ), std::chrono::seconds( 0 ) };
         QCOMPARE( c.expand().command(), QStringLiteral( "chown '`id -u`'" ) );
     }
     // Now play dangerous games with shell expansion -- except the internal command is now
diff --git a/src/modules/summary/SummaryPage.cpp b/src/modules/summary/SummaryPage.cpp
index e156d473e..a66710822 100644
--- a/src/modules/summary/SummaryPage.cpp
+++ b/src/modules/summary/SummaryPage.cpp
@@ -55,7 +55,6 @@ SummaryPage::SummaryPage( Config* config, QWidget* parent )
     m_scrollArea->setContentsMargins( 0, 0, 0, 0 );
 }
 
-
 static QLabel*
 createTitleLabel( const QString& text, const QFont& titleFont )
 {
@@ -72,7 +71,7 @@ createBodyLabel( const QString& text, const QPalette& bodyPalette )
 {
     QLabel* label = new QLabel;
     label->setObjectName( "summaryItemBody" );
-    label->setMargin( CalamaresUtils::defaultFontHeight() / 2 );
+    label->setMargin( Calamares::defaultFontHeight() / 2 );
     label->setAutoFillBackground( true );
     label->setPalette( bodyPalette );
     label->setText( text );
@@ -87,12 +86,12 @@ createStepWidget( const QString& description, QWidget* innerWidget, const QPalet
     w->setLayout( itemBodyLayout );
 
     // Indent the inner box by a bit
-    itemBodyLayout->addSpacing( CalamaresUtils::defaultFontHeight() * 2 );
+    itemBodyLayout->addSpacing( Calamares::defaultFontHeight() * 2 );
     QVBoxLayout* itemBodyCoreLayout = new QVBoxLayout;
     itemBodyLayout->addLayout( itemBodyCoreLayout );
-    CalamaresUtils::unmarginLayout( itemBodyLayout );
+    Calamares::unmarginLayout( itemBodyLayout );
 
-    itemBodyCoreLayout->addSpacing( CalamaresUtils::defaultFontHeight() / 2 );
+    itemBodyCoreLayout->addSpacing( Calamares::defaultFontHeight() / 2 );
     if ( innerWidget )
     {
         itemBodyCoreLayout->addWidget( innerWidget );
@@ -131,11 +130,11 @@ SummaryPage::buildWidgets( Config* config, SummaryViewStep* viewstep )
     delete m_contentWidget;  // It might have been created previously
     m_contentWidget = new QWidget;
     m_layout = new QVBoxLayout( m_contentWidget );
-    CalamaresUtils::unmarginLayout( m_layout );
+    Calamares::unmarginLayout( m_layout );
 
     QFont titleFont = font();
     titleFont.setWeight( QFont::Light );
-    titleFont.setPointSize( CalamaresUtils::defaultFontSize() * 2 );
+    titleFont.setPointSize( Calamares::defaultFontSize() * 2 );
 
     QPalette bodyPalette( palette() );
     bodyPalette.setColor( WindowBackground, palette().window().color().lighter( 108 ) );
diff --git a/src/modules/tracking/Config.cpp b/src/modules/tracking/Config.cpp
index 0d9778c6a..58c4f63ae 100644
--- a/src/modules/tracking/Config.cpp
+++ b/src/modules/tracking/Config.cpp
@@ -86,12 +86,11 @@ TrackingStyleConfig::validateUrl( QString& urlString )
     }
 }
 
-
 void
 TrackingStyleConfig::setConfigurationMap( const QVariantMap& config )
 {
-    m_state = CalamaresUtils::getBool( config, "enabled", false ) ? DisabledByUser : DisabledByConfig;
-    m_policy = CalamaresUtils::getString( config, "policy" );
+    m_state = Calamares::getBool( config, "enabled", false ) ? DisabledByUser : DisabledByConfig;
+    m_policy = Calamares::getString( config, "policy" );
     validateUrl( m_policy );
     emit policyChanged( m_policy );
     emit trackingChanged();
@@ -110,7 +109,7 @@ InstallTrackingConfig::setConfigurationMap( const QVariantMap& configurationMap
 {
     TrackingStyleConfig::setConfigurationMap( configurationMap );
 
-    m_installTrackingUrl = CalamaresUtils::getString( configurationMap, "url" );
+    m_installTrackingUrl = Calamares::getString( configurationMap, "url" );
     validateUrl( m_installTrackingUrl );
 }
 
@@ -135,11 +134,10 @@ MachineTrackingConfig::setConfigurationMap( const QVariantMap& configurationMap
 {
     TrackingStyleConfig::setConfigurationMap( configurationMap );
 
-    m_machineTrackingStyle = CalamaresUtils::getString( configurationMap, "style" );
+    m_machineTrackingStyle = Calamares::getString( configurationMap, "style" );
     validate( m_machineTrackingStyle, isValidMachineTrackingStyle );
 }
 
-
 UserTrackingConfig::UserTrackingConfig( QObject* parent )
     : TrackingStyleConfig( parent )
 {
@@ -160,13 +158,12 @@ UserTrackingConfig::setConfigurationMap( const QVariantMap& configurationMap )
 {
     TrackingStyleConfig::setConfigurationMap( configurationMap );
 
-    m_userTrackingStyle = CalamaresUtils::getString( configurationMap, "style" );
+    m_userTrackingStyle = Calamares::getString( configurationMap, "style" );
     validate( m_userTrackingStyle, isValidUserTrackingStyle );
 
-    m_userTrackingAreas = CalamaresUtils::getStringList( configurationMap, "areas" );
+    m_userTrackingAreas = Calamares::getStringList( configurationMap, "areas" );
 }
 
-
 Config::Config( QObject* parent )
     : QObject( parent )
     , m_installTracking( new InstallTrackingConfig( this ) )
@@ -198,7 +195,7 @@ enableLevelsBelow( Config* config, TrackingType level )
 void
 Config::setConfigurationMap( const QVariantMap& configurationMap )
 {
-    m_generalPolicy = CalamaresUtils::getString( configurationMap, "policy" );
+    m_generalPolicy = Calamares::getString( configurationMap, "policy" );
 
     if ( !QUrl( m_generalPolicy ).isValid() )
     {
@@ -207,28 +204,28 @@ Config::setConfigurationMap( const QVariantMap& configurationMap )
     emit generalPolicyChanged( m_generalPolicy );
 
     bool success = false;
-    auto subconfig = CalamaresUtils::getSubMap( configurationMap, "install", success );
+    auto subconfig = Calamares::getSubMap( configurationMap, "install", success );
     if ( success )
     {
         m_installTracking->setConfigurationMap( subconfig );
     }
 
-    subconfig = CalamaresUtils::getSubMap( configurationMap, "machine", success );
+    subconfig = Calamares::getSubMap( configurationMap, "machine", success );
     if ( success )
     {
         m_machineTracking->setConfigurationMap( subconfig );
     }
 
-    subconfig = CalamaresUtils::getSubMap( configurationMap, "user", success );
+    subconfig = Calamares::getSubMap( configurationMap, "user", success );
     if ( success )
     {
         m_userTracking->setConfigurationMap( subconfig );
     }
 
-    auto level = trackingNames().find( CalamaresUtils::getString( configurationMap, "default" ), success );
+    auto level = trackingNames().find( Calamares::getString( configurationMap, "default" ), success );
     if ( !success )
     {
-        cWarning() << "Default tracking level unknown:" << CalamaresUtils::getString( configurationMap, "default" );
+        cWarning() << "Default tracking level unknown:" << Calamares::getString( configurationMap, "default" );
         level = TrackingType::NoTracking;
     }
     enableLevelsBelow( this, level );
diff --git a/src/modules/tracking/TrackingJobs.cpp b/src/modules/tracking/TrackingJobs.cpp
index 70b68de45..e764750b8 100644
--- a/src/modules/tracking/TrackingJobs.cpp
+++ b/src/modules/tracking/TrackingJobs.cpp
@@ -23,7 +23,6 @@
 
 #include <chrono>
 
-
 // Namespace keeps all the actual jobs anonymous, the
 // public API is the addJob() functions below the namespace.
 namespace
@@ -148,11 +147,11 @@ TrackingMachineUpdateManagerJob::exec()
     static const auto script = QStringLiteral(
         "sed -i '/^URI/s,${MACHINE_ID},'`cat /etc/machine-id`',' /etc/update-manager/meta-release || true" );
 
-    auto res = CalamaresUtils::System::instance()->runCommand( CalamaresUtils::System::RunLocation::RunInTarget,
-                                                               QStringList { QStringLiteral( "/bin/sh" ) },
-                                                               QString(),  // Working dir
-                                                               script,  // standard input
-                                                               std::chrono::seconds( 1 ) );
+    auto res = Calamares::System::instance()->runCommand( Calamares::System::RunLocation::RunInTarget,
+                                                          QStringList { QStringLiteral( "/bin/sh" ) },
+                                                          QString(),  // Working dir
+                                                          script,  // standard input
+                                                          std::chrono::seconds( 1 ) );
     int r = res.first;
 
     if ( r == 0 )
@@ -214,7 +213,7 @@ FeedbackLevel=16
         QString path = QStringLiteral( "/home/%1/.config/%2" ).arg( m_username, area );
         cDebug() << "Configuring KUserFeedback" << path;
 
-        int r = CalamaresUtils::System::instance()->createTargetFile( path, config );
+        int r = Calamares::System::instance()->createTargetFile( path, config );
         if ( r > 0 )
         {
             return Calamares::JobResult::error(
@@ -243,7 +242,7 @@ addJob( Calamares::JobList& list, InstallTrackingConfig* config )
 {
     if ( config->isEnabled() )
     {
-        const auto* s = CalamaresUtils::System::instance();
+        const auto* s = Calamares::System::instance();
         QHash< QString, QString > map { std::initializer_list< std::pair< QString, QString > > {
             { QStringLiteral( "CPU" ), s->getCpuDescription() },
             { QStringLiteral( "MEMORY" ), QString::number( s->getTotalMemoryB().first ) },
diff --git a/src/modules/umount/UmountJob.cpp b/src/modules/umount/UmountJob.cpp
index 2fd549348..b7d879bd8 100644
--- a/src/modules/umount/UmountJob.cpp
+++ b/src/modules/umount/UmountJob.cpp
@@ -103,7 +103,7 @@ exportZFSPools()
 
     for ( const auto& poolName : poolNames )
     {
-        auto result = CalamaresUtils::System::runCommand( { "zpool", "export", poolName }, std::chrono::seconds( 30 ) );
+        auto result = Calamares::System::runCommand( { "zpool", "export", poolName }, std::chrono::seconds( 30 ) );
         if ( result.getExitCode() )
         {
             cWarning() << "Failed to export pool" << result.getOutput();
@@ -113,11 +113,10 @@ exportZFSPools()
     return Calamares::JobResult::ok();
 }
 
-
 Calamares::JobResult
 UmountJob::exec()
 {
-    const auto* sys = CalamaresUtils::System::instance();
+    const auto* sys = Calamares::System::instance();
     if ( !sys )
     {
         return Calamares::JobResult::internalError(
diff --git a/src/modules/users/Config.cpp b/src/modules/users/Config.cpp
index 7251f6ff2..8927fb4ed 100644
--- a/src/modules/users/Config.cpp
+++ b/src/modules/users/Config.cpp
@@ -201,7 +201,6 @@ Config::setSudoersGroup( const QString& group )
     }
 }
 
-
 void
 Config::setLoginName( const QString& login )
 {
@@ -492,7 +491,6 @@ Config::setFullName( const QString& name )
                                       .toLower()
                                       .simplified();
 
-
         QStringList cleanParts = cleanName.split( ' ' );
 
         if ( !m_customLoginName )
@@ -614,7 +612,6 @@ Config::passwordStatus( const QString& pw1, const QString& pw2 ) const
     return qMakePair( PasswordValidity::Valid, tr( "OK!" ) );
 }
 
-
 Config::PasswordStatus
 Config::userPasswordStatus() const
 {
@@ -635,7 +632,6 @@ Config::userPasswordMessage() const
     return p.second;
 }
 
-
 void
 Config::setRootPassword( const QString& s )
 {
@@ -742,7 +738,6 @@ Config::checkReady()
     }
 }
 
-
 STATICTEST void
 setConfigurationDefaultGroups( const QVariantMap& map, QList< GroupDescription >& defaultGroups )
 {
@@ -780,12 +775,12 @@ setConfigurationDefaultGroups( const QVariantMap& map, QList< GroupDescription >
             else if ( Calamares::typeOf( v ) == Calamares::MapVariantType )
             {
                 const auto innermap = v.toMap();
-                QString name = CalamaresUtils::getString( innermap, "name" );
+                QString name = Calamares::getString( innermap, "name" );
                 if ( !name.isEmpty() )
                 {
                     defaultGroups.append( GroupDescription( name,
-                                                            CalamaresUtils::getBool( innermap, "must_exist", false ),
-                                                            CalamaresUtils::getBool( innermap, "system", false ) ) );
+                                                            Calamares::getBool( innermap, "must_exist", false ),
+                                                            Calamares::getBool( innermap, "system", false ) ) );
                 }
                 else
                 {
@@ -804,7 +799,7 @@ STATICTEST HostNameAction
 getHostNameAction( const QVariantMap& configurationMap )
 {
     HostNameAction setHostName = HostNameAction::EtcHostname;
-    QString hostnameActionString = CalamaresUtils::getString( configurationMap, "location" );
+    QString hostnameActionString = Calamares::getString( configurationMap, "location" );
     if ( !hostnameActionString.isEmpty() )
     {
         bool ok = false;
@@ -907,39 +902,38 @@ Config::setConfigurationMap( const QVariantMap& configurationMap )
     // Handle *user* key and subkeys and legacy settings
     {
         bool ok = false;  // Ignored
-        QVariantMap userSettings = CalamaresUtils::getSubMap( configurationMap, "user", ok );
+        QVariantMap userSettings = Calamares::getSubMap( configurationMap, "user", ok );
 
         QString shell( QLatin1String( "/bin/bash" ) );  // as if it's not set at all
         if ( userSettings.contains( "shell" ) )
         {
-            shell = CalamaresUtils::getString( userSettings, "shell" );
+            shell = Calamares::getString( userSettings, "shell" );
         }
         // Now it might be explicitly set to empty, which is ok
         setUserShell( shell );
 
-        m_forbiddenLoginNames = CalamaresUtils::getStringList( userSettings, "forbidden_names" );
+        m_forbiddenLoginNames = Calamares::getStringList( userSettings, "forbidden_names" );
         m_forbiddenLoginNames << alwaysForbiddenLoginNames();
         tidy( m_forbiddenLoginNames );
     }
 
     setAutoLoginGroup( either< QString, const QString& >(
-        CalamaresUtils::getString, configurationMap, "autologinGroup", "autoLoginGroup", QString() ) );
-    setSudoersGroup( CalamaresUtils::getString( configurationMap, "sudoersGroup" ) );
-    m_sudoStyle = CalamaresUtils::getBool( configurationMap, "sudoersConfigureWithGroup", false )
-        ? SudoStyle::UserAndGroup
-        : SudoStyle::UserOnly;
+        Calamares::getString, configurationMap, "autologinGroup", "autoLoginGroup", QString() ) );
+    setSudoersGroup( Calamares::getString( configurationMap, "sudoersGroup" ) );
+    m_sudoStyle = Calamares::getBool( configurationMap, "sudoersConfigureWithGroup", false ) ? SudoStyle::UserAndGroup
+                                                                                             : SudoStyle::UserOnly;
 
     // Handle *hostname* key and subkeys and legacy settings
     {
         bool ok = false;  // Ignored
-        QVariantMap hostnameSettings = CalamaresUtils::getSubMap( configurationMap, "hostname", ok );
+        QVariantMap hostnameSettings = Calamares::getSubMap( configurationMap, "hostname", ok );
 
         m_hostnameAction = getHostNameAction( hostnameSettings );
-        m_writeEtcHosts = CalamaresUtils::getBool( hostnameSettings, "writeHostsFile", true );
+        m_writeEtcHosts = Calamares::getBool( hostnameSettings, "writeHostsFile", true );
         m_hostnameTemplate
-            = CalamaresUtils::getString( hostnameSettings, "template", QStringLiteral( "${first}-${product}" ) );
+            = Calamares::getString( hostnameSettings, "template", QStringLiteral( "${first}-${product}" ) );
 
-        m_forbiddenHostNames = CalamaresUtils::getStringList( hostnameSettings, "forbidden_names" );
+        m_forbiddenHostNames = Calamares::getStringList( hostnameSettings, "forbidden_names" );
         m_forbiddenHostNames << alwaysForbiddenHostNames();
         tidy( m_forbiddenHostNames );
     }
@@ -948,20 +942,17 @@ Config::setConfigurationMap( const QVariantMap& configurationMap )
 
     // Renaming of Autologin -> AutoLogin in 4ffa79d4cf also affected
     // configuration keys, which was not intended. Accept both.
-    m_doAutoLogin = either( CalamaresUtils::getBool,
-                            configurationMap,
-                            QStringLiteral( "doAutologin" ),
-                            QStringLiteral( "doAutoLogin" ),
-                            false );
+    m_doAutoLogin = either(
+        Calamares::getBool, configurationMap, QStringLiteral( "doAutologin" ), QStringLiteral( "doAutoLogin" ), false );
 
-    m_writeRootPassword = CalamaresUtils::getBool( configurationMap, "setRootPassword", true );
+    m_writeRootPassword = Calamares::getBool( configurationMap, "setRootPassword", true );
     Calamares::JobQueue::instance()->globalStorage()->insert( "setRootPassword", m_writeRootPassword );
 
-    m_reuseUserPasswordForRoot = CalamaresUtils::getBool( configurationMap, "doReusePassword", false );
+    m_reuseUserPasswordForRoot = Calamares::getBool( configurationMap, "doReusePassword", false );
 
-    m_permitWeakPasswords = CalamaresUtils::getBool( configurationMap, "allowWeakPasswords", false );
+    m_permitWeakPasswords = Calamares::getBool( configurationMap, "allowWeakPasswords", false );
     m_requireStrongPasswords
-        = !m_permitWeakPasswords || !CalamaresUtils::getBool( configurationMap, "allowWeakPasswordsDefault", false );
+        = !m_permitWeakPasswords || !Calamares::getBool( configurationMap, "allowWeakPasswordsDefault", false );
 
     // If the value doesn't exist, or isn't a map, this gives an empty map -- no problem
     auto pr_checks( configurationMap.value( "passwordRequirements" ).toMap() );
diff --git a/src/modules/users/CreateUserJob.cpp b/src/modules/users/CreateUserJob.cpp
index b7b0f2f4b..94f51b5cd 100644
--- a/src/modules/users/CreateUserJob.cpp
+++ b/src/modules/users/CreateUserJob.cpp
@@ -21,28 +21,24 @@
 #include <QFileInfo>
 #include <QTextStream>
 
-
 CreateUserJob::CreateUserJob( const Config* config )
     : Calamares::Job()
     , m_config( config )
 {
 }
 
-
 QString
 CreateUserJob::prettyName() const
 {
     return tr( "Create user %1" ).arg( m_config->loginName() );
 }
 
-
 QString
 CreateUserJob::prettyDescription() const
 {
     return tr( "Create user <strong>%1</strong>." ).arg( m_config->loginName() );
 }
 
-
 QString
 CreateUserJob::prettyStatusMessage() const
 {
@@ -74,7 +70,7 @@ createUser( const QString& loginName, const QString& fullName, const QString& sh
     useraddCommand << loginName;
 #endif
 
-    auto commandResult = CalamaresUtils::System::instance()->targetEnvCommand( useraddCommand );
+    auto commandResult = Calamares::System::instance()->targetEnvCommand( useraddCommand );
     if ( commandResult.getExitCode() )
     {
         cError() << "useradd failed" << commandResult.getExitCode();
@@ -96,7 +92,7 @@ setUserGroups( const QString& loginName, const QStringList& groups )
                      << "-aG" << groups.join( ',' ) << loginName;
 #endif
 
-    auto commandResult = CalamaresUtils::System::instance()->targetEnvCommand( setgroupsCommand );
+    auto commandResult = Calamares::System::instance()->targetEnvCommand( setgroupsCommand );
     if ( commandResult.getExitCode() )
     {
         cError() << "usermod failed" << commandResult.getExitCode();
@@ -105,7 +101,6 @@ setUserGroups( const QString& loginName, const QStringList& groups )
     return Calamares::JobResult::ok();
 }
 
-
 Calamares::JobResult
 CreateUserJob::exec()
 {
@@ -132,7 +127,7 @@ CreateUserJob::exec()
             existingHome.mkdir( backupDirName );
 
             // We need the extra `sh -c` here to ensure that we can expand the shell globs
-            CalamaresUtils::System::instance()->targetEnvCall(
+            Calamares::System::instance()->targetEnvCall(
                 { "sh", "-c", "mv -f " + shellFriendlyHome + "/.* " + shellFriendlyHome + "/" + backupDirName } );
         }
     }
@@ -159,7 +154,7 @@ CreateUserJob::exec()
     emit progress( 0.9 );
     QString userGroup = QString( "%1:%2" ).arg( m_config->loginName() ).arg( m_config->loginName() );
     QString homeDir = QString( "/home/%1" ).arg( m_config->loginName() );
-    auto commandResult = CalamaresUtils::System::instance()->targetEnvCommand( { "chown", "-R", userGroup, homeDir } );
+    auto commandResult = Calamares::System::instance()->targetEnvCommand( { "chown", "-R", userGroup, homeDir } );
     if ( commandResult.getExitCode() )
     {
         cError() << "chown failed" << commandResult.getExitCode();
diff --git a/src/modules/users/MiscJobs.cpp b/src/modules/users/MiscJobs.cpp
index fec546d96..740901808 100644
--- a/src/modules/users/MiscJobs.cpp
+++ b/src/modules/users/MiscJobs.cpp
@@ -59,14 +59,13 @@ SetupSudoJob::exec()
     // One % for the sudo format, keep it outside of the string to avoid accidental replacement
     QString sudoersLine
         = QChar( '%' ) + QString( "%1 ALL=%2 ALL\n" ).arg( m_sudoGroup, designatorForStyle( m_sudoStyle ) );
-    auto fileResult
-        = CalamaresUtils::System::instance()->createTargetFile( QStringLiteral( "/etc/sudoers.d/10-installer" ),
-                                                                sudoersLine.toUtf8().constData(),
-                                                                CalamaresUtils::System::WriteMode::Overwrite );
+    auto fileResult = Calamares::System::instance()->createTargetFile( QStringLiteral( "/etc/sudoers.d/10-installer" ),
+                                                                       sudoersLine.toUtf8().constData(),
+                                                                       Calamares::System::WriteMode::Overwrite );
 
     if ( fileResult )
     {
-        if ( !CalamaresUtils::Permissions::apply( fileResult.path(), 0440 ) )
+        if ( !Calamares::Permissions::apply( fileResult.path(), 0440 ) )
         {
             return Calamares::JobResult::error( tr( "Cannot chmod sudoers file." ) );
         }
@@ -157,7 +156,7 @@ ensureGroupsExistInTarget( const QList< GroupDescription >& wantedGroups,
             }
             cmd << group.name();
 #endif
-            if ( CalamaresUtils::System::instance()->targetEnvCall( cmd ) )
+            if ( Calamares::System::instance()->targetEnvCall( cmd ) )
             {
                 failureCount++;
                 missingGroups.append( group.name() + QChar( '*' ) );
diff --git a/src/modules/users/SetHostNameJob.cpp b/src/modules/users/SetHostNameJob.cpp
index 452f6a962..f09bba6ed 100644
--- a/src/modules/users/SetHostNameJob.cpp
+++ b/src/modules/users/SetHostNameJob.cpp
@@ -22,7 +22,7 @@
 #include <QDir>
 #include <QFile>
 
-using WriteMode = CalamaresUtils::System::WriteMode;
+using WriteMode = Calamares::System::WriteMode;
 
 SetHostNameJob::SetHostNameJob( const Config* c )
     : Calamares::Job()
@@ -36,14 +36,12 @@ SetHostNameJob::prettyName() const
     return tr( "Set hostname %1" ).arg( m_config->hostname() );
 }
 
-
 QString
 SetHostNameJob::prettyDescription() const
 {
     return tr( "Set hostname <strong>%1</strong>." ).arg( m_config->hostname() );
 }
 
-
 QString
 SetHostNameJob::prettyStatusMessage() const
 {
@@ -53,7 +51,7 @@ SetHostNameJob::prettyStatusMessage() const
 STATICTEST bool
 setFileHostname( const QString& hostname )
 {
-    return CalamaresUtils::System::instance()->createTargetFile(
+    return Calamares::System::instance()->createTargetFile(
         QStringLiteral( "/etc/hostname" ), ( hostname + '\n' ).toUtf8(), WriteMode::Overwrite );
 }
 
@@ -62,17 +60,17 @@ writeFileEtcHosts( const QString& hostname )
 {
     // The actual hostname gets substituted in at %1
     const QString standard_hosts = QStringLiteral( R"(# Standard host addresses
-127.0.0.1  localhost
-::1        localhost ip6-localhost ip6-loopback
-ff02::1    ip6-allnodes
-ff02::2    ip6-allrouters
-)" );
+                                   127.0.0.1  localhost
+                                   ::1        localhost ip6-localhost ip6-loopback
+                                   ff02::1    ip6-allnodes
+                                   ff02::2    ip6-allrouters
+                                                 )" );
     const QString this_host = QStringLiteral( R"(# This host address
-127.0.1.1  %1
-)" );
+                                           127.0.1.1  %1
+                                                                           )" );
 
     const QString etc_hosts = standard_hosts + ( hostname.isEmpty() ? QString() : this_host.arg( hostname ) );
-    return CalamaresUtils::System::instance()->createTargetFile(
+    return Calamares::System::instance()->createTargetFile(
         QStringLiteral( "/etc/hosts" ), etc_hosts.toUtf8(), WriteMode::Overwrite );
 }
 
@@ -112,7 +110,6 @@ setSystemdHostname( const QString& hostname )
     return success;
 }
 
-
 Calamares::JobResult
 SetHostNameJob::exec()
 {
@@ -147,7 +144,7 @@ SetHostNameJob::exec()
         setSystemdHostname( m_config->hostname() );
         break;
     case HostNameAction::Transient:
-        CalamaresUtils::System::instance()->removeTargetFile( QStringLiteral( "/etc/hostname" ) );
+        Calamares::System::instance()->removeTargetFile( QStringLiteral( "/etc/hostname" ) );
         break;
     }
 
@@ -160,6 +157,5 @@ SetHostNameJob::exec()
         }
     }
 
-
     return Calamares::JobResult::ok();
 }
diff --git a/src/modules/users/SetPasswordJob.cpp b/src/modules/users/SetPasswordJob.cpp
index b854ede26..64db318f2 100644
--- a/src/modules/users/SetPasswordJob.cpp
+++ b/src/modules/users/SetPasswordJob.cpp
@@ -25,7 +25,6 @@
 #endif
 #include <unistd.h>
 
-
 SetPasswordJob::SetPasswordJob( const QString& userName, const QString& newPassword )
     : Calamares::Job()
     , m_userName( userName )
@@ -33,21 +32,18 @@ SetPasswordJob::SetPasswordJob( const QString& userName, const QString& newPassw
 {
 }
 
-
 QString
 SetPasswordJob::prettyName() const
 {
     return tr( "Set password for user %1" ).arg( m_userName );
 }
 
-
 QString
 SetPasswordJob::prettyStatusMessage() const
 {
     return tr( "Setting password for user %1." ).arg( m_userName );
 }
 
-
 /// Returns a modular hashing salt for method 6 (SHA512) with a 16 character random salt.
 QString
 SetPasswordJob::make_salt( int length )
@@ -56,13 +52,13 @@ SetPasswordJob::make_salt( int length )
     Q_ASSERT( length <= 128 );
 
     QString salt_string;
-    CalamaresUtils::EntropySource source = CalamaresUtils::getPrintableEntropy( length, salt_string );
+    Calamares::EntropySource source = Calamares::getPrintableEntropy( length, salt_string );
     if ( salt_string.length() != length )
     {
         cWarning() << "getPrintableEntropy returned string of length" << salt_string.length() << "expected" << length;
         salt_string.truncate( length );
     }
-    if ( source != CalamaresUtils::EntropySource::URandom )
+    if ( source != Calamares::EntropySource::URandom )
     {
         cWarning() << "Entropy data for salt is low-quality.";
     }
@@ -83,7 +79,7 @@ SetPasswordJob::exec()
 
     if ( m_userName == "root" && m_newPassword.isEmpty() )  //special case for disabling root account
     {
-        int ec = CalamaresUtils::System::instance()->targetEnvCall( { "usermod", "-p", "!", m_userName } );
+        int ec = Calamares::System::instance()->targetEnvCall( { "usermod", "-p", "!", m_userName } );
         if ( ec )
             return Calamares::JobResult::error( tr( "Cannot disable root account." ),
                                                 tr( "usermod terminated with error code %1." ).arg( ec ) );
@@ -92,7 +88,7 @@ SetPasswordJob::exec()
 
     QString encrypted = QString::fromLatin1( crypt( m_newPassword.toUtf8(), make_salt( 16 ).toUtf8() ) );
 
-    int ec = CalamaresUtils::System::instance()->targetEnvCall( { "usermod", "-p", encrypted, m_userName } );
+    int ec = Calamares::System::instance()->targetEnvCall( { "usermod", "-p", encrypted, m_userName } );
     if ( ec )
         return Calamares::JobResult::error( tr( "Cannot set password for user %1." ).arg( m_userName ),
                                             tr( "usermod terminated with error code %1." ).arg( ec ) );
diff --git a/src/modules/users/TestGroupInformation.cpp b/src/modules/users/TestGroupInformation.cpp
index 41b7c6238..d5bd88f2c 100644
--- a/src/modules/users/TestGroupInformation.cpp
+++ b/src/modules/users/TestGroupInformation.cpp
@@ -83,7 +83,7 @@ GroupTests::testCreateGroup()
     QVERIFY( fi.exists() );
 
     bool ok = false;
-    const auto map = CalamaresUtils::loadYaml( fi, &ok );
+    const auto map = Calamares::YAML::load( fi, &ok );
     QVERIFY( ok );
     QVERIFY( map.count() > 0 );  // Just that it loaded, one key *defaultGroups*
 
@@ -120,7 +120,6 @@ GroupTests::testSudoGroup()
         QCOMPARE( spy.count(), 2 );
     }
 
-
     // Test config loading
     {
         Config c;
@@ -171,7 +170,6 @@ GroupTests::testJobCreation()
     QCOMPARE( c.createJobs().count(), expectedJobs + 1 );
 }
 
-
 QTEST_GUILESS_MAIN( GroupTests )
 
 #include "utils/moc-warnings.h"
diff --git a/src/modules/users/TestSetHostNameJob.cpp b/src/modules/users/TestSetHostNameJob.cpp
index 8ddc0ade9..edf8d134c 100644
--- a/src/modules/users/TestSetHostNameJob.cpp
+++ b/src/modules/users/TestSetHostNameJob.cpp
@@ -59,7 +59,7 @@ UsersTests::initTestCase()
     cDebug() << "Test dir" << m_dir.path();
 
     // Ensure we have a system object, expect it to be a "bogus" one
-    CalamaresUtils::System* system = CalamaresUtils::System::instance();
+    Calamares::System* system = Calamares::System::instance();
     QVERIFY( system );
     QVERIFY( system->doChroot() );
 
@@ -96,7 +96,7 @@ UsersTests::testEtcHostname()
     // Doesn't create intermediate directories
     QVERIFY( !setFileHostname( testHostname ) );
 
-    QVERIFY( CalamaresUtils::System::instance()->createTargetDirs( "/etc" ) );
+    QVERIFY( Calamares::System::instance()->createTargetDirs( "/etc" ) );
     QVERIFY( QFile::exists( m_dir.filePath( "etc" ) ) );
 
     // Does write the file
@@ -147,7 +147,6 @@ UsersTests::testHostnamed()
     }
 }
 
-
 void
 UsersTests::cleanup()
 {
@@ -157,7 +156,6 @@ UsersTests::cleanup()
     }
 }
 
-
 QTEST_GUILESS_MAIN( UsersTests )
 
 #include "utils/moc-warnings.h"
diff --git a/src/modules/users/Tests.cpp b/src/modules/users/Tests.cpp
index 0039037ae..791a5b8b1 100644
--- a/src/modules/users/Tests.cpp
+++ b/src/modules/users/Tests.cpp
@@ -130,7 +130,6 @@ UserTests::testGetSet()
     }
 }
 
-
 void
 UserTests::testDefaultGroups()
 {
@@ -218,7 +217,7 @@ UserTests::testDefaultGroupsYAML()
     QVERIFY( fi.exists() );
 
     bool ok = false;
-    const auto map = CalamaresUtils::loadYaml( fi, &ok );
+    const auto map = Calamares::YAML::load( fi, &ok );
     QVERIFY( ok );
     QVERIFY( map.count() > 0 );
 
@@ -229,7 +228,6 @@ UserTests::testDefaultGroupsYAML()
     QVERIFY( c.defaultGroups().contains( group ) );
 }
 
-
 void
 UserTests::testHostActions_data()
 {
@@ -293,7 +291,6 @@ UserTests::testHostActions2()
     QCOMPARE( c.writeEtcHosts(), false );
 }
 
-
 void
 UserTests::testHostSuggestions_data()
 {
@@ -335,7 +332,6 @@ UserTests::testHostSuggestions()
     QCOMPARE( makeHostnameSuggestion( templateString, fullName, login ), result );
 }
 
-
 void
 UserTests::testPasswordChecks()
 {
@@ -454,7 +450,7 @@ UserTests::testAutoLogin()
     QVERIFY( fi.exists() );
 
     bool ok = false;
-    const auto map = CalamaresUtils::loadYaml( fi, &ok );
+    const auto map = Calamares::YAML::load( fi, &ok );
     QVERIFY( ok );
     QVERIFY( map.count() > 0 );
 
@@ -506,7 +502,7 @@ UserTests::testUserYAML()
     QVERIFY( fi.exists() );
 
     bool ok = false;
-    const auto map = CalamaresUtils::loadYaml( fi, &ok );
+    const auto map = Calamares::YAML::load( fi, &ok );
     QVERIFY( ok );
     QVERIFY( map.count() > 0 );
 
@@ -515,7 +511,6 @@ UserTests::testUserYAML()
     QCOMPARE( c.userShell(), shell );
 }
 
-
 QTEST_GUILESS_MAIN( UserTests )
 
 #include "utils/moc-warnings.h"
diff --git a/src/modules/users/UsersPage.cpp b/src/modules/users/UsersPage.cpp
index 7936e9fc0..6e370852d 100644
--- a/src/modules/users/UsersPage.cpp
+++ b/src/modules/users/UsersPage.cpp
@@ -34,10 +34,10 @@
 
 /** @brief Add an error message and pixmap to a label. */
 static inline void
-labelError( QLabel* pix, QLabel* label, CalamaresUtils::ImageType icon, const QString& message )
+labelError( QLabel* pix, QLabel* label, Calamares::ImageType icon, const QString& message )
 {
     label->setText( message );
-    pix->setPixmap( CalamaresUtils::defaultPixmap( icon, CalamaresUtils::Original, label->size() ) );
+    pix->setPixmap( Calamares::defaultPixmap( icon, Calamares::Original, label->size() ) );
 }
 
 /** @brief Clear error, set happy pixmap on a label to indicate "ok". */
@@ -45,8 +45,7 @@ static inline void
 labelOk( QLabel* pix, QLabel* label )
 {
     label->clear();
-    pix->setPixmap(
-        CalamaresUtils::defaultPixmap( CalamaresUtils::StatusOk, CalamaresUtils::Original, label->size() ) );
+    pix->setPixmap( Calamares::defaultPixmap( Calamares::StatusOk, Calamares::Original, label->size() ) );
 }
 
 /** @brief Sets error or ok on a label depending on @p status and @p value
@@ -73,7 +72,7 @@ labelStatus( QLabel* pix, QLabel* label, const QString& value, const QString& st
     }
     else
     {
-        labelError( pix, label, CalamaresUtils::ImageType::StatusError, status );
+        labelError( pix, label, Calamares::ImageType::StatusError, status );
     }
 }
 
@@ -204,7 +203,6 @@ UsersPage::retranslate()
     reportRootPasswordStatus( rp.first, rp.second );
 }
 
-
 void
 UsersPage::onActivate()
 {
@@ -215,7 +213,6 @@ UsersPage::onActivate()
     reportRootPasswordStatus( rp.first, rp.second );
 }
 
-
 void
 UsersPage::onFullNameTextEdited( const QString& fullName )
 {
@@ -243,11 +240,11 @@ passwordStatus( QLabel* iconLabel, QLabel* messageLabel, int validity, const QSt
         labelOk( iconLabel, messageLabel );
         break;
     case Config::PasswordValidity::Weak:
-        labelError( iconLabel, messageLabel, CalamaresUtils::StatusWarning, message );
+        labelError( iconLabel, messageLabel, Calamares::StatusWarning, message );
         break;
     case Config::PasswordValidity::Invalid:
     default:
-        labelError( iconLabel, messageLabel, CalamaresUtils::StatusError, message );
+        labelError( iconLabel, messageLabel, Calamares::StatusError, message );
         break;
     }
 }
@@ -264,7 +261,6 @@ UsersPage::reportUserPasswordStatus( int validity, const QString& message )
     passwordStatus( ui->labelUserPassword, ui->labelUserPasswordError, validity, message );
 }
 
-
 void
 UsersPage::onReuseUserPasswordChanged( const int checked )
 {
diff --git a/src/modules/welcome/Config.cpp b/src/modules/welcome/Config.cpp
index 17f37a091..2bce564f6 100644
--- a/src/modules/welcome/Config.cpp
+++ b/src/modules/welcome/Config.cpp
@@ -110,7 +110,6 @@ Config::unsatisfiedRequirements() const
     return m_filtermodel.get();
 }
 
-
 QString
 Config::languageIcon() const
 {
@@ -200,13 +199,12 @@ Config::setLocaleIndex( int index )
 
     QLocale::setDefault( selectedTranslation.locale() );
     const auto* branding = Calamares::Branding::instance();
-    CalamaresUtils::installTranslator( selectedTranslation.id(),
-                                       branding ? branding->translationsDirectory() : QString() );
+    Calamares::installTranslator( selectedTranslation.id(), branding ? branding->translationsDirectory() : QString() );
     if ( Calamares::JobQueue::instance() && Calamares::JobQueue::instance()->globalStorage() )
     {
         Calamares::Locale::insertGS( *Calamares::JobQueue::instance()->globalStorage(),
-                                          QStringLiteral( "LANG" ),
-                                          CalamaresUtils::translatorLocaleName().name );
+                                     QStringLiteral( "LANG" ),
+                                     Calamares::translatorLocaleName().name );
     }
     emit localeIndexChanged( m_localeIndex );
 }
@@ -252,7 +250,6 @@ Config::aboutMessage() const
     return Calamares::aboutString();
 }
 
-
 QString
 Config::genericWelcomeMessage() const
 {
@@ -317,7 +314,7 @@ jobOrBrandingSetting( Calamares::Branding::StringEntry e, const QVariantMap& map
 static inline void
 setLanguageIcon( Config* c, const QVariantMap& configurationMap )
 {
-    QString language = CalamaresUtils::getString( configurationMap, "languageIcon" );
+    QString language = Calamares::getString( configurationMap, "languageIcon" );
     if ( !language.isEmpty() )
     {
         auto icon = Calamares::Branding::instance()->image( language, QSize( 48, 48 ) );
@@ -373,14 +370,14 @@ static inline void
 setGeoIP( Config* config, const QVariantMap& configurationMap )
 {
     bool ok = false;
-    QVariantMap geoip = CalamaresUtils::getSubMap( configurationMap, "geoip", ok );
+    QVariantMap geoip = Calamares::getSubMap( configurationMap, "geoip", ok );
     if ( ok )
     {
         using FWString = QFutureWatcher< QString >;
 
-        auto* handler = new Calamares::GeoIP::Handler( CalamaresUtils::getString( geoip, "style" ),
-                                                            CalamaresUtils::getString( geoip, "url" ),
-                                                            CalamaresUtils::getString( geoip, "selector" ) );
+        auto* handler = new Calamares::GeoIP::Handler( Calamares::getString( geoip, "style" ),
+                                                       Calamares::getString( geoip, "url" ),
+                                                       Calamares::getString( geoip, "selector" ) );
         if ( handler->type() != Calamares::GeoIP::Handler::Type::None )
         {
             auto* future = new FWString();
diff --git a/src/modules/welcome/Tests.cpp b/src/modules/welcome/Tests.cpp
index 51495830d..a0532aac4 100644
--- a/src/modules/welcome/Tests.cpp
+++ b/src/modules/welcome/Tests.cpp
@@ -44,7 +44,7 @@ WelcomeTests::initTestCase()
     cDebug() << "Welcome test started.";
 
     // Ensure we have a system object, expect it to be a "bogus" one
-    CalamaresUtils::System* system = CalamaresUtils::System::instance();
+    Calamares::System* system = Calamares::System::instance();
     QVERIFY( system );
     cDebug() << Logger::SubEntry << "System @" << Logger::Pointer( system );
 
@@ -66,7 +66,7 @@ WelcomeTests::testOneUrl()
     QVERIFY( fi.exists() );
 
     bool ok = false;
-    const auto map = CalamaresUtils::loadYaml( QFileInfo( fi ), &ok );
+    const auto map = Calamares::YAML::load( QFileInfo( fi ), &ok );
     QVERIFY( ok );
     QVERIFY( map.count() > 0 );
     QVERIFY( map.contains( "requirements" ) );
@@ -104,7 +104,7 @@ WelcomeTests::testUrls()
     QVERIFY( fi.exists() );
 
     bool ok = false;
-    const auto map = CalamaresUtils::loadYaml( fi, &ok );
+    const auto map = Calamares::YAML::load( fi, &ok );
     QVERIFY( ok );
 
     Calamares::Network::Manager::instance().setCheckHasInternetUrl( QVector< QUrl > {} );
@@ -134,7 +134,7 @@ WelcomeTests::testBadConfigDoesNotResetUrls()
         QVERIFY( fi.exists() );
 
         bool ok = false;
-        const auto map = CalamaresUtils::loadYaml( fi, &ok );
+        const auto map = Calamares::YAML::load( fi, &ok );
         QVERIFY( ok );
 
         c.setConfigurationMap( map );
@@ -151,7 +151,7 @@ WelcomeTests::testBadConfigDoesNotResetUrls()
         QVERIFY( fi.exists() );
 
         bool ok = false;
-        const auto map = CalamaresUtils::loadYaml( fi, &ok );
+        const auto map = Calamares::YAML::load( fi, &ok );
         QVERIFY( ok );
 
         c.setConfigurationMap( map );
@@ -159,7 +159,6 @@ WelcomeTests::testBadConfigDoesNotResetUrls()
     QCOMPARE( nam.getCheckInternetUrls().count(), 1 );
 }
 
-
 QTEST_GUILESS_MAIN( WelcomeTests )
 
 #include "utils/moc-warnings.h"
diff --git a/src/modules/welcome/WelcomePage.cpp b/src/modules/welcome/WelcomePage.cpp
index 96675261b..71cb13792 100644
--- a/src/modules/welcome/WelcomePage.cpp
+++ b/src/modules/welcome/WelcomePage.cpp
@@ -45,7 +45,7 @@ WelcomePage::WelcomePage( Config* config, QWidget* parent )
 {
     using Branding = Calamares::Branding;
 
-    const int defaultFontHeight = CalamaresUtils::defaultFontHeight();
+    const int defaultFontHeight = Calamares::defaultFontHeight();
     ui->setupUi( this );
 
     // insert system-check widget below welcome text
@@ -124,25 +124,25 @@ void
 WelcomePage::setupButton( Button role, const QString& url )
 {
     QPushButton* button = nullptr;
-    CalamaresUtils::ImageType icon = CalamaresUtils::Information;
+    Calamares::ImageType icon = Calamares::Information;
 
     switch ( role )
     {
     case Button::Donate:
         button = ui->donateButton;
-        icon = CalamaresUtils::Donate;
+        icon = Calamares::Donate;
         break;
     case Button::KnownIssues:
         button = ui->knownIssuesButton;
-        icon = CalamaresUtils::Bugs;
+        icon = Calamares::Bugs;
         break;
     case Button::ReleaseNotes:
         button = ui->releaseNotesButton;
-        icon = CalamaresUtils::Release;
+        icon = Calamares::Release;
         break;
     case Button::Support:
         button = ui->supportButton;
-        icon = CalamaresUtils::Help;
+        icon = Calamares::Help;
         break;
     }
     if ( !button )
@@ -160,8 +160,8 @@ WelcomePage::setupButton( Button role, const QString& url )
     QUrl u( url );
     if ( u.isValid() )
     {
-        auto size = 2 * QSize( CalamaresUtils::defaultFontHeight(), CalamaresUtils::defaultFontHeight() );
-        button->setIcon( CalamaresUtils::defaultPixmap( icon, CalamaresUtils::Original, size ) );
+        auto size = 2 * QSize( Calamares::defaultFontHeight(), Calamares::defaultFontHeight() );
+        button->setIcon( Calamares::defaultPixmap( icon, Calamares::Original, size ) );
         connect( button, &QPushButton::clicked, [ u ]() { QDesktopServices::openUrl( u ); } );
     }
     else
diff --git a/src/modules/welcome/checker/CheckerContainer.cpp b/src/modules/welcome/checker/CheckerContainer.cpp
index 99b0f6375..2062471df 100644
--- a/src/modules/welcome/checker/CheckerContainer.cpp
+++ b/src/modules/welcome/checker/CheckerContainer.cpp
@@ -31,7 +31,7 @@ CheckerContainer::CheckerContainer( Config* config, QWidget* parent )
 {
     QBoxLayout* mainLayout = new QHBoxLayout;
     setLayout( mainLayout );
-    CalamaresUtils::unmarginLayout( mainLayout );
+    Calamares::unmarginLayout( mainLayout );
 
     mainLayout->addWidget( m_waitingWidget );
     CALAMARES_RETRANSLATE( if ( m_waitingWidget )
diff --git a/src/modules/welcome/checker/GeneralRequirements.cpp b/src/modules/welcome/checker/GeneralRequirements.cpp
index ca9e0f6d7..aa1fb805b 100644
--- a/src/modules/welcome/checker/GeneralRequirements.cpp
+++ b/src/modules/welcome/checker/GeneralRequirements.cpp
@@ -104,16 +104,16 @@ GeneralRequirements::checkRequirements()
     MaybeChecked hasPower;
     MaybeChecked hasInternet;
     MaybeChecked isRoot;
-    bool enoughScreen = availableSize.isValid() && ( availableSize.width() >= CalamaresUtils::windowMinimumWidth )
-        && ( availableSize.height() >= CalamaresUtils::windowMinimumHeight );
+    bool enoughScreen = availableSize.isValid() && ( availableSize.width() >= Calamares::windowMinimumWidth )
+        && ( availableSize.height() >= Calamares::windowMinimumHeight );
 
-    qint64 requiredStorageB = CalamaresUtils::GiBtoBytes( m_requiredStorageGiB );
+    qint64 requiredStorageB = Calamares::GiBtoBytes( m_requiredStorageGiB );
     if ( m_entriesToCheck.contains( "storage" ) )
     {
         enoughStorage = checkEnoughStorage( requiredStorageB );
     }
 
-    qint64 requiredRamB = CalamaresUtils::GiBtoBytes( m_requiredRamGiB );
+    qint64 requiredRamB = Calamares::GiBtoBytes( m_requiredRamGiB );
     if ( m_entriesToCheck.contains( "ram" ) )
     {
         enoughRam = checkEnoughRam( requiredRamB );
@@ -284,7 +284,7 @@ getCheckInternetUrls( const QVariantMap& configurationMap )
     const QString exampleUrl = QStringLiteral( "http://example.com" );
 
     bool incomplete = false;
-    QStringList checkInternetSetting = CalamaresUtils::getStringList( configurationMap, "internetCheckUrl" );
+    QStringList checkInternetSetting = Calamares::getStringList( configurationMap, "internetCheckUrl" );
     if ( !checkInternetSetting.isEmpty() )
     {
         QVector< QUrl > urls;
@@ -325,7 +325,6 @@ getCheckInternetUrls( const QVariantMap& configurationMap )
     return incomplete;
 }
 
-
 void
 GeneralRequirements::setConfigurationMap( const QVariantMap& configurationMap )
 {
@@ -422,7 +421,6 @@ GeneralRequirements::setConfigurationMap( const QVariantMap& configurationMap )
     }
 }
 
-
 bool
 GeneralRequirements::checkEnoughStorage( qint64 requiredSpace )
 {
@@ -435,17 +433,15 @@ GeneralRequirements::checkEnoughStorage( qint64 requiredSpace )
 #endif
 }
 
-
 bool
 GeneralRequirements::checkEnoughRam( qint64 requiredRam )
 {
     // Ignore the guesstimate-factor; we get an under-estimate
     // which is probably the usable RAM for programs.
-    quint64 availableRam = CalamaresUtils::System::instance()->getTotalMemoryB().first;
+    quint64 availableRam = Calamares::System::instance()->getTotalMemoryB().first;
     return double( availableRam ) >= double( requiredRam ) * 0.95;  // cast to silence 64-bit-int conversion to double
 }
 
-
 bool
 GeneralRequirements::checkBatteryExists()
 {
@@ -474,7 +470,6 @@ GeneralRequirements::checkBatteryExists()
     return false;
 }
 
-
 bool
 GeneralRequirements::checkHasPower()
 {
@@ -504,7 +499,6 @@ GeneralRequirements::checkHasPower()
     return !onBattery;
 }
 
-
 bool
 GeneralRequirements::checkHasInternet()
 {
@@ -514,7 +508,6 @@ GeneralRequirements::checkHasInternet()
     return hasInternet;
 }
 
-
 bool
 GeneralRequirements::checkIsRoot()
 {
diff --git a/src/modules/welcome/checker/ResultDelegate.cpp b/src/modules/welcome/checker/ResultDelegate.cpp
index 420ece812..7844153be 100644
--- a/src/modules/welcome/checker/ResultDelegate.cpp
+++ b/src/modules/welcome/checker/ResultDelegate.cpp
@@ -19,7 +19,7 @@ static constexpr int const item_margin = 8;
 static inline int
 item_fontsize()
 {
-    return CalamaresUtils::defaultFontSize() + 4;
+    return Calamares::defaultFontSize() + 4;
 }
 
 static void
@@ -33,7 +33,7 @@ paintRequirement( QPainter* painter, const QStyleOptionViewItem& option, const Q
     font.setBold( false );
     painter->setFont( font );
 
-    CalamaresUtils::ImageType statusImage = CalamaresUtils::StatusOk;
+    Calamares::ImageType statusImage = Calamares::StatusOk;
 
     painter->setPen( QColorConstants::Black );
     if ( index.data( Calamares::RequirementsModel::Satisfied ).toBool() )
@@ -47,20 +47,19 @@ paintRequirement( QPainter* painter, const QStyleOptionViewItem& option, const Q
             QColor bgColor = option.palette.window().color();
             bgColor.setHsv( 0, 64, bgColor.value() );
             painter->fillRect( option.rect, bgColor );
-            statusImage = CalamaresUtils::StatusError;
+            statusImage = Calamares::StatusError;
         }
         else
         {
             QColor bgColor = option.palette.window().color();
             bgColor.setHsv( 60, 64, bgColor.value() );
             painter->fillRect( option.rect, bgColor );
-            statusImage = CalamaresUtils::StatusWarning;
+            statusImage = Calamares::StatusWarning;
         }
     }
 
     auto image
-        = CalamaresUtils::defaultPixmap( statusImage, CalamaresUtils::Original, QSize( 2 * fontsize, 2 * fontsize ) )
-              .toImage();
+        = Calamares::defaultPixmap( statusImage, Calamares::Original, QSize( 2 * fontsize, 2 * fontsize ) ).toImage();
     painter->drawImage( textRect.topLeft(), image );
 
     // Leave space for that image (already drawn)
@@ -87,7 +86,6 @@ ResultDelegate::sizeHint( const QStyleOptionViewItem& option, const QModelIndex&
     return QSize( qMax( option.rect.width(), textwidth ), height );
 }
 
-
 void
 ResultDelegate::paint( QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index ) const
 {
diff --git a/src/modules/welcome/checker/ResultsListWidget.cpp b/src/modules/welcome/checker/ResultsListWidget.cpp
index b3371cee1..af88cc9cf 100644
--- a/src/modules/welcome/checker/ResultsListWidget.cpp
+++ b/src/modules/welcome/checker/ResultsListWidget.cpp
@@ -49,7 +49,7 @@ ResultsListWidget::ResultsListWidget( Config* config, QWidget* parent )
     explanationLayout->addWidget( m_countdown );
 
     mainLayout->addLayout( explanationLayout );
-    mainLayout->addSpacing( CalamaresUtils::defaultFontHeight() / 2 );
+    mainLayout->addSpacing( Calamares::defaultFontHeight() / 2 );
 
     auto* listview = new QListView( this );
     listview->setSelectionMode( QAbstractItemView::NoSelection );
@@ -108,7 +108,7 @@ ResultsListWidget::requirementsComplete()
                     imageLabel->setPixmap( theImage );
                 }
 
-                imageLabel->setContentsMargins( 4, CalamaresUtils::defaultFontHeight() * 3 / 4, 4, 4 );
+                imageLabel->setContentsMargins( 4, Calamares::defaultFontHeight() * 3 / 4, 4, 4 );
                 imageLabel->setAlignment( Qt::AlignCenter );
                 imageLabel->setSizePolicy( QSizePolicy::Expanding, QSizePolicy::Expanding );
                 imageLabel->setObjectName( "welcomeLogo" );
diff --git a/src/modules/zfs/ZfsJob.cpp b/src/modules/zfs/ZfsJob.cpp
index cc2af7482..9203da721 100644
--- a/src/modules/zfs/ZfsJob.cpp
+++ b/src/modules/zfs/ZfsJob.cpp
@@ -132,7 +132,6 @@ ZfsJob::isMountpointOverlapping( const QString& targetMountpoint ) const
     return false;
 }
 
-
 ZfsResult
 ZfsJob::createZpool( QString deviceName, QString poolName, QString poolOptions, bool encrypt, QString passphrase ) const
 {
@@ -154,8 +153,8 @@ ZfsJob::createZpool( QString deviceName, QString poolName, QString poolOptions,
                                 << "create" << poolOptions.split( ' ' ) << poolName << deviceName;
     }
 
-    auto r = CalamaresUtils::System::instance()->runCommand(
-        CalamaresUtils::System::RunLocation::RunInHost, command, QString(), passphrase, std::chrono::seconds( 10 ) );
+    auto r = Calamares::System::instance()->runCommand(
+        Calamares::System::RunLocation::RunInHost, command, QString(), passphrase, std::chrono::seconds( 10 ) );
 
     if ( r.getExitCode() != 0 )
     {
@@ -183,7 +182,7 @@ ZfsJob::exec()
                                                     Calamares::JobResult::InvalidConfiguration );
     }
 
-    const CalamaresUtils::System* system = CalamaresUtils::System::instance();
+    const Calamares::System* system = Calamares::System::instance();
 
     QVariantList poolNames;
 
@@ -359,15 +358,14 @@ ZfsJob::exec()
     return Calamares::JobResult::ok();
 }
 
-
 void
 ZfsJob::setConfigurationMap( const QVariantMap& map )
 {
-    m_poolName = CalamaresUtils::getString( map, "poolName" );
-    m_poolOptions = CalamaresUtils::getString( map, "poolOptions" );
-    m_datasetOptions = CalamaresUtils::getString( map, "datasetOptions" );
+    m_poolName = Calamares::getString( map, "poolName" );
+    m_poolOptions = Calamares::getString( map, "poolOptions" );
+    m_datasetOptions = Calamares::getString( map, "datasetOptions" );
 
-    m_datasets = CalamaresUtils::getList( map, "datasets" );
+    m_datasets = Calamares::getList( map, "datasets" );
 }
 
 CALAMARES_PLUGIN_FACTORY_DEFINITION( ZfsJobFactory, registerPlugin< ZfsJob >(); )