diff --git a/src/modules/tracking/Config.cpp b/src/modules/tracking/Config.cpp
index 2dc91c2a9..a75522529 100644
--- a/src/modules/tracking/Config.cpp
+++ b/src/modules/tracking/Config.cpp
@@ -129,7 +129,7 @@ MachineTrackingConfig::MachineTrackingConfig( QObject* parent )
 static bool
 isValidMachineTrackingStyle( const QString& s )
 {
-    static QStringList knownStyles { "neon" };
+    static QStringList knownStyles { "updatemanager" };
     return knownStyles.contains( s );
 }
 
diff --git a/src/modules/tracking/Config.h b/src/modules/tracking/Config.h
index 26dcf2f4f..0bdff260a 100644
--- a/src/modules/tracking/Config.h
+++ b/src/modules/tracking/Config.h
@@ -118,7 +118,7 @@ private:
  *
  * When machine tracking is on, the installed system will report
  * back ("call home") at some point. This can mean Debian pop-con,
- * or KDE neon maching tracking, or something else. The kind
+ * or updatemanager maching tracking, or something else. The kind
  * of configuration depends on the style of tracking that is enabled.
  */
 class MachineTrackingConfig : public TrackingStyleConfig
diff --git a/src/modules/tracking/TrackingJobs.cpp b/src/modules/tracking/TrackingJobs.cpp
index 0b27eab05..70e45e2eb 100644
--- a/src/modules/tracking/TrackingJobs.cpp
+++ b/src/modules/tracking/TrackingJobs.cpp
@@ -101,9 +101,9 @@ TrackingMachineJob::addJob( Calamares::JobList& list, MachineTrackingConfig* con
     if ( config->isEnabled() )
     {
         const auto style = config->machineTrackingStyle();
-        if ( style == "neon" )
+        if ( style == "updatemanager" )
         {
-            list.append( Calamares::job_ptr( new TrackingMachineNeonJob() ) );
+            list.append( Calamares::job_ptr( new TrackingMachineUpdateManagerJob() ) );
         }
         else
         {
@@ -114,25 +114,25 @@ TrackingMachineJob::addJob( Calamares::JobList& list, MachineTrackingConfig* con
 
 
 QString
-TrackingMachineNeonJob::prettyName() const
+TrackingMachineUpdateManagerJob::prettyName() const
 {
     return tr( "Machine feedback" );
 }
 
 QString
-TrackingMachineNeonJob::prettyDescription() const
+TrackingMachineUpdateManagerJob::prettyDescription() const
 {
     return prettyName();
 }
 
 QString
-TrackingMachineNeonJob::prettyStatusMessage() const
+TrackingMachineUpdateManagerJob::prettyStatusMessage() const
 {
     return tr( "Configuring machine feedback." );
 }
 
 Calamares::JobResult
-TrackingMachineNeonJob::exec()
+TrackingMachineUpdateManagerJob::exec()
 {
     static const auto script = QStringLiteral(
         R"x(
diff --git a/src/modules/tracking/TrackingJobs.h b/src/modules/tracking/TrackingJobs.h
index 76e7dbed9..dd5ca6b92 100644
--- a/src/modules/tracking/TrackingJobs.h
+++ b/src/modules/tracking/TrackingJobs.h
@@ -76,13 +76,13 @@ public:
     static void addJob( Calamares::JobList& list, MachineTrackingConfig* config );
 };
 
-/** @brief Tracking machines, KDE neon style
+/** @brief Tracking machines, update-manager style
  *
  * The machine has a machine-id, and this is sed(1)'ed into the
  * update-manager configuration, to report the machine-id back
- * to KDE neon servers.
+ * to distro servers.
  */
-class TrackingMachineNeonJob : public TrackingMachineJob
+class TrackingMachineUpdateManagerJob : public TrackingMachineJob
 {
     Q_OBJECT
 public:
diff --git a/src/modules/tracking/TrackingViewStep.cpp b/src/modules/tracking/TrackingViewStep.cpp
index 491fef12a..2cbfe4ae2 100644
--- a/src/modules/tracking/TrackingViewStep.cpp
+++ b/src/modules/tracking/TrackingViewStep.cpp
@@ -34,14 +34,6 @@
 
 CALAMARES_PLUGIN_FACTORY_DEFINITION( TrackingViewStepFactory, registerPlugin< TrackingViewStep >(); )
 
-/** @brief Is @p s a valid machine-tracking style. */
-static bool
-isValidStyle( const QString& s )
-{
-    static QStringList knownStyles { "neon" };
-    return knownStyles.contains( s );
-}
-
 TrackingViewStep::TrackingViewStep( QObject* parent )
     : Calamares::ViewStep( parent )
     , m_config( new Config( this ) )
diff --git a/src/modules/tracking/tracking.conf b/src/modules/tracking/tracking.conf
index 46ba7fed6..8569f0935 100644
--- a/src/modules/tracking/tracking.conf
+++ b/src/modules/tracking/tracking.conf
@@ -77,11 +77,11 @@ install:
 # The machine area has one specific configuration key:
 #   style:  This string specifies what kind of tracking configuration
 #           needs to be done. There is currently only one valid
-#           style, "neon", which edits two files in the installed
+#           style, "updatemanager", which edits two files in the installed
 #           system to enable system-tracking.
 machine:
     enabled: false
-    style: neon
+    style: updatemanager
 
 # The user area is not yet implemented, and has no specific configuration.
 user: