diff --git a/src/modules/users/Config.cpp b/src/modules/users/Config.cpp
index 7aa1cb65c..be87ad93b 100644
--- a/src/modules/users/Config.cpp
+++ b/src/modules/users/Config.cpp
@@ -59,11 +59,11 @@ updateGSAutoLogin( bool doAutoLogin, const QString& login )
 
     if ( doAutoLogin && !login.isEmpty() )
     {
-        gs->insert( "autologinUser", login );
+        gs->insert( "autoLoginUser", login );
     }
     else
     {
-        gs->remove( "autologinUser" );
+        gs->remove( "autoLoginUser" );
     }
 
     if ( login.isEmpty() )
@@ -142,13 +142,13 @@ insertInGlobalStorage( const QString& key, const QString& group )
 }
 
 void
-Config::setAutologinGroup( const QString& group )
+Config::setAutoLoginGroup( const QString& group )
 {
-    if ( group != m_autologinGroup )
+    if ( group != m_autoLoginGroup )
     {
-        m_autologinGroup = group;
-        insertInGlobalStorage( QStringLiteral( "autologinGroup" ), group );
-        emit autologinGroupChanged( group );
+        m_autoLoginGroup = group;
+        insertInGlobalStorage( QStringLiteral( "autoLoginGroup" ), group );
+        emit autoLoginGroupChanged( group );
     }
 }
 
@@ -162,9 +162,9 @@ Config::groupsForThisUser() const
     {
         l << g.name();
     }
-    if ( doAutoLogin() && !autologinGroup().isEmpty() )
+    if ( doAutoLogin() && !autoLoginGroup().isEmpty() )
     {
-        l << autologinGroup();
+        l << autoLoginGroup();
     }
 
     return l;
@@ -814,13 +814,13 @@ Config::setConfigurationMap( const QVariantMap& configurationMap )
     // Now it might be explicitly set to empty, which is ok
     setUserShell( shell );
 
-    setAutologinGroup( CalamaresUtils::getString( configurationMap, "autologinGroup" ) );
+    setAutoLoginGroup( CalamaresUtils::getString( configurationMap, "autoLoginGroup" ) );
     setSudoersGroup( CalamaresUtils::getString( configurationMap, "sudoersGroup" ) );
 
     m_hostNameActions = getHostNameActions( configurationMap );
 
     setConfigurationDefaultGroups( configurationMap, m_defaultGroups );
-    m_doAutoLogin = CalamaresUtils::getBool( configurationMap, "doAutologin", false );
+    m_doAutoLogin = CalamaresUtils::getBool( configurationMap, "doAutoLogin", false );
 
     m_writeRootPassword = CalamaresUtils::getBool( configurationMap, "setRootPassword", true );
     Calamares::JobQueue::instance()->globalStorage()->insert( "setRootPassword", m_writeRootPassword );
diff --git a/src/modules/users/Config.h b/src/modules/users/Config.h
index 28f0c73d7..d9fce4f60 100644
--- a/src/modules/users/Config.h
+++ b/src/modules/users/Config.h
@@ -92,7 +92,7 @@ class PLUGINDLLEXPORT Config : public Calamares::ModuleSystem::Config
 
     Q_PROPERTY( QString userShell READ userShell WRITE setUserShell NOTIFY userShellChanged )
 
-    Q_PROPERTY( QString autologinGroup READ autologinGroup WRITE setAutologinGroup NOTIFY autologinGroupChanged )
+    Q_PROPERTY( QString autoLoginGroup READ autoLoginGroup WRITE setAutoLoginGroup NOTIFY autoLoginGroupChanged )
     Q_PROPERTY( QString sudoersGroup READ sudoersGroup WRITE setSudoersGroup NOTIFY sudoersGroupChanged )
 
     Q_PROPERTY( bool doAutoLogin READ doAutoLogin WRITE setAutoLogin NOTIFY autoLoginChanged )
@@ -185,7 +185,7 @@ public:
     QString userShell() const { return m_userShell; }
 
     /// The group of which auto-login users must be a member
-    QString autologinGroup() const { return m_autologinGroup; }
+    QString autoLoginGroup() const { return m_autoLoginGroup; }
     /// The group of which users who can "sudo" must be a member
     QString sudoersGroup() const { return m_sudoersGroup; }
 
@@ -217,7 +217,7 @@ public:
     const QList< GroupDescription >& defaultGroups() const { return m_defaultGroups; }
     /** @brief the names of all the groups for the current user
      *
-     * Takes into account defaultGroups and autologin behavior.
+     * Takes into account defaultGroups and autoLogin behavior.
      */
     QStringList groupsForThisUser() const;
 
@@ -253,8 +253,8 @@ public Q_SLOTS:
      */
     void setUserShell( const QString& path );
 
-    /// Sets the autologin group; empty is ignored
-    void setAutologinGroup( const QString& group );
+    /// Sets the autoLogin group; empty is ignored
+    void setAutoLoginGroup( const QString& group );
     /// Sets the sudoer group; empty is ignored
     void setSudoersGroup( const QString& group );
 
@@ -266,7 +266,7 @@ public Q_SLOTS:
     /// Sets the host name (flags it as "custom")
     void setHostName( const QString& host );
 
-    /// Sets the autologin flag
+    /// Sets the autoLogin flag
     void setAutoLogin( bool b );
 
     /// Set to true to use the user password, unchanged, for root too
@@ -281,7 +281,7 @@ public Q_SLOTS:
 
 signals:
     void userShellChanged( const QString& );
-    void autologinGroupChanged( const QString& );
+    void autoLoginGroupChanged( const QString& );
     void sudoersGroupChanged( const QString& );
     void fullNameChanged( const QString& );
     void loginNameChanged( const QString& );
@@ -305,7 +305,7 @@ private:
 
     QList< GroupDescription > m_defaultGroups;
     QString m_userShell;
-    QString m_autologinGroup;
+    QString m_autoLoginGroup;
     QString m_sudoersGroup;
     QString m_fullName;
     QString m_loginName;
diff --git a/src/modules/users/MiscJobs.cpp b/src/modules/users/MiscJobs.cpp
index c1c1d5d25..34fb08863 100644
--- a/src/modules/users/MiscJobs.cpp
+++ b/src/modules/users/MiscJobs.cpp
@@ -184,11 +184,11 @@ SetupGroupsJob::exec()
             tr( "These groups are missing in the target system: %1" ).arg( missingGroups.join( ',' ) ) );
     }
 
-    if ( m_config->doAutoLogin() && !m_config->autologinGroup().isEmpty() )
+    if ( m_config->doAutoLogin() && !m_config->autoLoginGroup().isEmpty() )
     {
-        const QString autologinGroup = m_config->autologinGroup();
+        const QString autoLoginGroup = m_config->autoLoginGroup();
         (void)ensureGroupsExistInTarget(
-            QList< GroupDescription >() << GroupDescription( autologinGroup ), availableGroups, missingGroups );
+            QList< GroupDescription >() << GroupDescription( autoLoginGroup ), availableGroups, missingGroups );
     }
 
     return Calamares::JobResult::ok();
diff --git a/src/modules/users/Tests.cpp b/src/modules/users/Tests.cpp
index b687a6434..4106cd785 100644
--- a/src/modules/users/Tests.cpp
+++ b/src/modules/users/Tests.cpp
@@ -83,13 +83,13 @@ UserTests::testGetSet()
     }
     {
         const QString al( "autolg" );
-        QCOMPARE( c.autologinGroup(), QString() );
-        c.setAutologinGroup( al );
-        QCOMPARE( c.autologinGroup(), al );
+        QCOMPARE( c.autoLoginGroup(), QString() );
+        c.setAutoLoginGroup( al );
+        QCOMPARE( c.autoLoginGroup(), al );
         QVERIFY( !c.doAutoLogin() );
         c.setAutoLogin( true );
         QVERIFY( c.doAutoLogin() );
-        QCOMPARE( c.autologinGroup(), al );
+        QCOMPARE( c.autoLoginGroup(), al );
     }
     {
         const QString su( "sudogrp" );