diff --git a/src/plugins/android/androidavdmanager.cpp b/src/plugins/android/androidavdmanager.cpp
index db45fec60b0..0393b1d0a3a 100644
--- a/src/plugins/android/androidavdmanager.cpp
+++ b/src/plugins/android/androidavdmanager.cpp
@@ -322,7 +322,7 @@ QString AndroidAvdManager::findAvd(const QString &avdName) const
     foreach (AndroidDeviceInfo device, devices) {
         if (device.type != ProjectExplorer::IDevice::Emulator)
             continue;
-        if (device.avdname == avdName)
+        if (device.avdName == avdName)
             return device.serialNumber;
     }
     return QString();
diff --git a/src/plugins/android/androidconfigurations.cpp b/src/plugins/android/androidconfigurations.cpp
index 3b7fcdd2b1c..15f525a5592 100644
--- a/src/plugins/android/androidconfigurations.cpp
+++ b/src/plugins/android/androidconfigurations.cpp
@@ -669,9 +669,9 @@ QVector<AndroidDeviceInfo> AndroidConfig::connectedDevices(QString *error) const
             dev.state = IDevice::DeviceReadyToUse;
 
         if (dev.type == IDevice::Emulator) {
-            dev.avdname = getAvdName(dev.serialNumber);
-            if (dev.avdname.isEmpty())
-                dev.avdname = serialNo;
+            dev.avdName = getAvdName(dev.serialNumber);
+            if (dev.avdName.isEmpty())
+                dev.avdName = serialNo;
         }
 
         devices.push_back(dev);
diff --git a/src/plugins/android/androiddeployqtstep.cpp b/src/plugins/android/androiddeployqtstep.cpp
index 82273476be0..4bed100402d 100644
--- a/src/plugins/android/androiddeployqtstep.cpp
+++ b/src/plugins/android/androiddeployqtstep.cpp
@@ -208,7 +208,7 @@ bool AndroidDeployQtStep::init()
                 .arg(info.cpuAbi.first())));
     }
 
-    m_avdName = info.avdname;
+    m_avdName = info.avdName;
     m_serialNumber = info.serialNumber;
     qCDebug(deployStepLog) << "Selected device info:" << info;
 
diff --git a/src/plugins/android/androiddevice.cpp b/src/plugins/android/androiddevice.cpp
index 70c2ba2d807..3e78f43b329 100644
--- a/src/plugins/android/androiddevice.cpp
+++ b/src/plugins/android/androiddevice.cpp
@@ -231,7 +231,7 @@ AndroidDeviceInfo AndroidDevice::androidDeviceInfoFromIDevice(const IDevice *dev
 {
     AndroidDeviceInfo info;
     info.state = dev->deviceState();
-    info.avdname = dev->extraData(Constants::AndroidAvdName).toString();
+    info.avdName = dev->extraData(Constants::AndroidAvdName).toString();
     info.serialNumber = dev->extraData(Constants::AndroidSerialNumber).toString();
     info.cpuAbi = dev->extraData(Constants::AndroidCpuAbi).toStringList();
     const QString avdPath = dev->extraData(Constants::AndroidAvdPath).toString();
@@ -246,12 +246,12 @@ QString AndroidDevice::displayNameFromInfo(const AndroidDeviceInfo &info)
 {
     return info.type == IDevice::Hardware
             ? AndroidConfigurations::currentConfig().getProductModel(info.serialNumber)
-            : info.avdname;
+            : info.avdName;
 }
 
 Id AndroidDevice::idFromDeviceInfo(const AndroidDeviceInfo &info)
 {
-    const QString id = (info.type == IDevice::Hardware ? info.serialNumber : info.avdname);
+    const QString id = (info.type == IDevice::Hardware ? info.serialNumber : info.avdName);
     return  Id(Constants::ANDROID_DEVICE_ID).withSuffix(':' + id);
 }
 
@@ -640,7 +640,7 @@ void AndroidDeviceManager::HandleAvdsListChange()
                 devMgr->removeDevice(dev->id());
             } else {
                 // Find the state of the AVD retrieved from the AVD watcher
-                const QString serial = getRunningAvdsSerialNumber(item.avdname);
+                const QString serial = getRunningAvdsSerialNumber(item.avdName);
                 const IDevice::DeviceState state = getDeviceState(serial, IDevice::Emulator);
                 if (dev->deviceState() != state) {
                     devMgr->setDeviceState(dev->id(), state);
@@ -658,7 +658,7 @@ void AndroidDeviceManager::HandleAvdsListChange()
         newDev->setMachineType(item.type);
         newDev->setDeviceState(item.state);
 
-        newDev->setExtraData(Constants::AndroidAvdName, item.avdname);
+        newDev->setExtraData(Constants::AndroidAvdName, item.avdName);
         newDev->setExtraData(Constants::AndroidSerialNumber, item.serialNumber);
         newDev->setExtraData(Constants::AndroidCpuAbi, item.cpuAbi);
         newDev->setExtraData(Constants::AndroidSdk, item.sdk);
diff --git a/src/plugins/android/androiddeviceinfo.cpp b/src/plugins/android/androiddeviceinfo.cpp
index 9bea73ec962..30ac8c2f0f1 100644
--- a/src/plugins/android/androiddeviceinfo.cpp
+++ b/src/plugins/android/androiddeviceinfo.cpp
@@ -46,15 +46,15 @@ bool AndroidDeviceInfo::operator<(const AndroidDeviceInfo &other) const
         return type == ProjectExplorer::IDevice::Hardware;
     if (sdk != other.sdk)
         return sdk < other.sdk;
-    if (avdname != other.avdname)
-        return avdname < other.avdname;
+    if (avdName != other.avdName)
+        return avdName < other.avdName;
 
     return serialNumber < other.serialNumber;
 }
 
 bool AndroidDeviceInfo::operator==(const AndroidDeviceInfo &other) const
 {
-    return serialNumber == other.serialNumber && avdname == other.avdname
+    return serialNumber == other.serialNumber && avdName == other.avdName
             && avdPath == other.avdPath && cpuAbi == other.cpuAbi
             && sdk == other.sdk && state == other.state && type == other.type;
 }
@@ -63,7 +63,7 @@ QDebug &operator<<(QDebug &stream, const AndroidDeviceInfo &device)
 {
     stream << "Type:" << (device.type == ProjectExplorer::IDevice::Emulator ? "Emulator" : "Device")
            << ", ABI:" << device.cpuAbi << ", Serial:" << device.serialNumber
-           << ", Name:" << device.avdname << ", API:" << device.sdk
+           << ", Name:" << device.avdName << ", API:" << device.sdk
            << ", Authorised:" << (device.state == IDevice::DeviceReadyToUse);
     return stream;
 }
diff --git a/src/plugins/android/androiddeviceinfo.h b/src/plugins/android/androiddeviceinfo.h
index 5d6b6d78096..8b6e4c0e921 100644
--- a/src/plugins/android/androiddeviceinfo.h
+++ b/src/plugins/android/androiddeviceinfo.h
@@ -40,7 +40,7 @@ class AndroidDeviceInfo
 {
 public:
     QString serialNumber;
-    QString avdname;
+    QString avdName;
     QStringList cpuAbi;
     int sdk = -1;
     IDevice::DeviceState state = IDevice::DeviceDisconnected;
@@ -49,7 +49,7 @@ public:
 
     static QStringList adbSelector(const QString &serialNumber);
 
-    bool isValid() const { return !serialNumber.isEmpty() || !avdname.isEmpty(); }
+    bool isValid() const { return !serialNumber.isEmpty() || !avdName.isEmpty(); }
     bool operator<(const AndroidDeviceInfo &other) const;
     bool operator==(const AndroidDeviceInfo &other) const; // should be = default with C++20
     bool operator!=(const AndroidDeviceInfo &other) const { return !(*this == other); }
diff --git a/src/plugins/android/androidmanager.cpp b/src/plugins/android/androidmanager.cpp
index 0ac99f89c9b..ffa3d307916 100644
--- a/src/plugins/android/androidmanager.cpp
+++ b/src/plugins/android/androidmanager.cpp
@@ -573,7 +573,7 @@ void AndroidManager::installQASIPackage(Target *target, const FilePath &packageP
 
     QString deviceSerialNumber = info.serialNumber;
     if (info.type == IDevice::Emulator) {
-        deviceSerialNumber = AndroidAvdManager().startAvd(info.avdname);
+        deviceSerialNumber = AndroidAvdManager().startAvd(info.avdName);
         if (deviceSerialNumber.isEmpty())
             Core::MessageManager::writeDisrupting(tr("Starting Android virtual device failed."));
     }
diff --git a/src/plugins/android/androidqmlpreviewworker.cpp b/src/plugins/android/androidqmlpreviewworker.cpp
index cb809454015..f8dd04bd42d 100644
--- a/src/plugins/android/androidqmlpreviewworker.cpp
+++ b/src/plugins/android/androidqmlpreviewworker.cpp
@@ -250,7 +250,7 @@ bool AndroidQmlPreviewWorker::ensureAvdIsRunning()
         if (devInfoLocal.isValid()) {
             if (dev->machineType() == IDevice::Emulator) {
                 appendMessage(tr("Launching AVD."), NormalMessageFormat);
-                devInfoLocal.serialNumber = avdMananager.startAvd(devInfoLocal.avdname);
+                devInfoLocal.serialNumber = avdMananager.startAvd(devInfoLocal.avdName);
             }
             if (devInfoLocal.serialNumber.isEmpty()) {
                 appendMessage(tr("Could not start AVD."), ErrorMessageFormat);
diff --git a/src/plugins/android/androidrunner.cpp b/src/plugins/android/androidrunner.cpp
index b8be01ae808..3156ecda5c3 100644
--- a/src/plugins/android/androidrunner.cpp
+++ b/src/plugins/android/androidrunner.cpp
@@ -193,9 +193,9 @@ void AndroidRunner::launchAVD()
     emit androidDeviceInfoChanged(info);
     if (info.isValid()) {
         AndroidAvdManager avdManager;
-        if (!info.avdname.isEmpty() && avdManager.findAvd(info.avdname).isEmpty()) {
-            bool launched = avdManager.startAvdAsync(info.avdname);
-            m_launchedAVDName = launched ? info.avdname:"";
+        if (!info.avdName.isEmpty() && avdManager.findAvd(info.avdName).isEmpty()) {
+            bool launched = avdManager.startAvdAsync(info.avdName);
+            m_launchedAVDName = launched ? info.avdName:"";
         } else {
             m_launchedAVDName.clear();
         }
diff --git a/src/plugins/android/avdmanageroutputparser.cpp b/src/plugins/android/avdmanageroutputparser.cpp
index f9254cbd3d6..49652143348 100644
--- a/src/plugins/android/avdmanageroutputparser.cpp
+++ b/src/plugins/android/avdmanageroutputparser.cpp
@@ -74,7 +74,7 @@ static Utils::optional<AndroidDeviceInfo> parseAvd(const QStringList &deviceInfo
             qCDebug(avdOutputParserLog) << "Avd Parsing: Skip avd device. Error key found:" << line;
             return {};
         } else if (valueForKey(avdInfoNameKey, line, &value)) {
-            avd.avdname = value;
+            avd.avdName = value;
         } else if (valueForKey(avdInfoPathKey, line, &value)) {
             const Utils::FilePath avdPath = Utils::FilePath::fromUserInput(value);
             avd.avdPath = avdPath;
@@ -89,7 +89,7 @@ static Utils::optional<AndroidDeviceInfo> parseAvd(const QStringList &deviceInfo
                     qCDebug(avdOutputParserLog) << "Avd Parsing: Cannot find ABI:" << configFile;
 
                 // Get Target
-                const QString avdInfoFileName = avd.avdname + ".ini";
+                const QString avdInfoFileName = avd.avdName + ".ini";
                 const Utils::FilePath avdInfoFile = avdPath.parentDir().pathAppended(
                     avdInfoFileName);
                 QSettings avdInfo(avdInfoFile.toString(), QSettings::IniFormat);