Index: /trunk/src/VBox/Frontends/VirtualBox/src/hostnetwork/UIHostNetworkDetailsDialog.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/hostnetwork/UIHostNetworkDetailsDialog.cpp	(revision 66696)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/hostnetwork/UIHostNetworkDetailsDialog.cpp	(revision 66697)
@@ -5,5 +5,5 @@
 
 /*
- * Copyright (C) 2009-2016 Oracle Corporation
+ * Copyright (C) 2009-2017 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -360,5 +360,5 @@
 
     /* Load 'DHCP server' data: */
-    m_pCheckBoxDHCP->setChecked(m_data.m_dhcpserver.m_fDhcpServerEnabled);
+    m_pCheckBoxDHCP->setChecked(m_data.m_dhcpserver.m_fEnabled);
     loadDataForDHCPServer();
 }
@@ -366,10 +366,10 @@
 void UIHostNetworkDetailsDialog::loadDataForInterface()
 {
-    /* IPv4 fields: */
-    m_pEditorIPv4->setText(m_data.m_interface.m_strInterfaceAddress);
-    m_pEditorNMv4->setText(m_data.m_interface.m_strInterfaceMask);
-
-    /* IPv6 fields: */
-    const bool fIsIpv6Supported = m_data.m_interface.m_fIpv6Supported;
+    /* Load IPv4 interface fields: */
+    m_pEditorIPv4->setText(m_data.m_interface.m_strAddress);
+    m_pEditorNMv4->setText(m_data.m_interface.m_strMask);
+
+    /* Toggle IPv6 interface fields availability: */
+    const bool fIsIpv6Supported = m_data.m_interface.m_fSupportedIPv6;
     m_pLabelIPv6->setEnabled(fIsIpv6Supported);
     m_pLabelNMv6->setEnabled(fIsIpv6Supported);
@@ -378,7 +378,7 @@
     if (fIsIpv6Supported)
     {
-        /* Load old values: */
-        m_pEditorIPv6->setText(m_data.m_interface.m_strInterfaceAddress6);
-        m_pEditorNMv6->setText(m_data.m_interface.m_strInterfaceMaskLength6);
+        /* Load IPv6 interface fields: */
+        m_pEditorIPv6->setText(m_data.m_interface.m_strAddress6);
+        m_pEditorNMv6->setText(m_data.m_interface.m_strMaskLength6);
     }
 }
@@ -386,5 +386,5 @@
 void UIHostNetworkDetailsDialog::loadDataForDHCPServer()
 {
-    /* DHCP server fields: */
+    /* Toggle DHCP server fields availability: */
     const bool fIsManual = m_pCheckBoxDHCP->isChecked();
     m_pLabelDHCPAddress->setEnabled(fIsManual);
@@ -398,13 +398,13 @@
     if (fIsManual)
     {
-        /* Load old values: */
-        m_pEditorDHCPAddress->setText(m_data.m_dhcpserver.m_strDhcpServerAddress);
-        m_pEditorDHCPMask->setText(m_data.m_dhcpserver.m_strDhcpServerMask);
-        m_pEditorDHCPLowerAddress->setText(m_data.m_dhcpserver.m_strDhcpLowerAddress);
-        m_pEditorDHCPUpperAddress->setText(m_data.m_dhcpserver.m_strDhcpUpperAddress);
+        /* Load DHCP server fields: */
+        m_pEditorDHCPAddress->setText(m_data.m_dhcpserver.m_strAddress);
+        m_pEditorDHCPMask->setText(m_data.m_dhcpserver.m_strMask);
+        m_pEditorDHCPLowerAddress->setText(m_data.m_dhcpserver.m_strLowerAddress);
+        m_pEditorDHCPUpperAddress->setText(m_data.m_dhcpserver.m_strUpperAddress);
 
         /* Invent default values where necessary: */
-        const quint32 uAddr = ipv4FromQStringToQuint32(m_data.m_interface.m_strInterfaceAddress);
-        const quint32 uMask = ipv4FromQStringToQuint32(m_data.m_interface.m_strInterfaceMask);
+        const quint32 uAddr = ipv4FromQStringToQuint32(m_data.m_interface.m_strAddress);
+        const quint32 uMask = ipv4FromQStringToQuint32(m_data.m_interface.m_strMask);
         const quint32 uProp = uAddr & uMask;
         const QString strMask = ipv4FromQuint32ToQString(uMask);
@@ -413,15 +413,15 @@
         //       strProp.toUtf8().constData(),
         //       strMask.toUtf8().constData());
-        if (   m_data.m_dhcpserver.m_strDhcpServerAddress.isEmpty()
-            || m_data.m_dhcpserver.m_strDhcpServerAddress == "0.0.0.0")
+        if (   m_data.m_dhcpserver.m_strAddress.isEmpty()
+            || m_data.m_dhcpserver.m_strAddress == "0.0.0.0")
             m_pEditorDHCPAddress->setText(strProp);
-        if (   m_data.m_dhcpserver.m_strDhcpServerMask.isEmpty()
-            || m_data.m_dhcpserver.m_strDhcpServerMask == "0.0.0.0")
+        if (   m_data.m_dhcpserver.m_strMask.isEmpty()
+            || m_data.m_dhcpserver.m_strMask == "0.0.0.0")
             m_pEditorDHCPMask->setText(strMask);
-        if (   m_data.m_dhcpserver.m_strDhcpLowerAddress.isEmpty()
-            || m_data.m_dhcpserver.m_strDhcpLowerAddress == "0.0.0.0")
+        if (   m_data.m_dhcpserver.m_strLowerAddress.isEmpty()
+            || m_data.m_dhcpserver.m_strLowerAddress == "0.0.0.0")
             m_pEditorDHCPLowerAddress->setText(strProp);
-        if (   m_data.m_dhcpserver.m_strDhcpUpperAddress.isEmpty()
-            || m_data.m_dhcpserver.m_strDhcpUpperAddress == "0.0.0.0")
+        if (   m_data.m_dhcpserver.m_strUpperAddress.isEmpty()
+            || m_data.m_dhcpserver.m_strUpperAddress == "0.0.0.0")
             m_pEditorDHCPUpperAddress->setText(strProp);
     }
@@ -437,21 +437,21 @@
 void UIHostNetworkDetailsDialog::save()
 {
-    /* Interface data: */
-    m_data.m_interface.m_strInterfaceAddress = m_pEditorIPv4->text();
-    m_data.m_interface.m_strInterfaceMask = m_pEditorNMv4->text();
-    if (m_data.m_interface.m_fIpv6Supported)
-    {
-        m_data.m_interface.m_strInterfaceAddress6 = m_pEditorIPv6->text();
-        m_data.m_interface.m_strInterfaceMaskLength6 = m_pEditorNMv6->text();
-    }
-
-    /* Server data: */
-    m_data.m_dhcpserver.m_fDhcpServerEnabled = m_pCheckBoxDHCP->isChecked();
-    if (m_data.m_dhcpserver.m_fDhcpServerEnabled)
-    {
-        m_data.m_dhcpserver.m_strDhcpServerAddress = m_pEditorDHCPAddress->text();
-        m_data.m_dhcpserver.m_strDhcpServerMask = m_pEditorDHCPMask->text();
-        m_data.m_dhcpserver.m_strDhcpLowerAddress = m_pEditorDHCPLowerAddress->text();
-        m_data.m_dhcpserver.m_strDhcpUpperAddress = m_pEditorDHCPUpperAddress->text();
+    /* Save interface data: */
+    m_data.m_interface.m_strAddress = m_pEditorIPv4->text();
+    m_data.m_interface.m_strMask = m_pEditorNMv4->text();
+    if (m_data.m_interface.m_fSupportedIPv6)
+    {
+        m_data.m_interface.m_strAddress6 = m_pEditorIPv6->text();
+        m_data.m_interface.m_strMaskLength6 = m_pEditorNMv6->text();
+    }
+
+    /* Save DHCP server data: */
+    m_data.m_dhcpserver.m_fEnabled = m_pCheckBoxDHCP->isChecked();
+    if (m_data.m_dhcpserver.m_fEnabled)
+    {
+        m_data.m_dhcpserver.m_strAddress = m_pEditorDHCPAddress->text();
+        m_data.m_dhcpserver.m_strMask = m_pEditorDHCPMask->text();
+        m_data.m_dhcpserver.m_strLowerAddress = m_pEditorDHCPLowerAddress->text();
+        m_data.m_dhcpserver.m_strUpperAddress = m_pEditorDHCPUpperAddress->text();
     }
 }
Index: /trunk/src/VBox/Frontends/VirtualBox/src/hostnetwork/UIHostNetworkDetailsDialog.h
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/hostnetwork/UIHostNetworkDetailsDialog.h	(revision 66696)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/hostnetwork/UIHostNetworkDetailsDialog.h	(revision 66697)
@@ -36,9 +36,9 @@
     UIDataHostNetworkInterface()
         : m_strName(QString())
-        , m_strInterfaceAddress(QString())
-        , m_strInterfaceMask(QString())
-        , m_fIpv6Supported(false)
-        , m_strInterfaceAddress6(QString())
-        , m_strInterfaceMaskLength6(QString())
+        , m_strAddress(QString())
+        , m_strMask(QString())
+        , m_fSupportedIPv6(false)
+        , m_strAddress6(QString())
+        , m_strMaskLength6(QString())
     {}
 
@@ -48,9 +48,9 @@
         return true
                && (m_strName == other.m_strName)
-               && (m_strInterfaceAddress == other.m_strInterfaceAddress)
-               && (m_strInterfaceMask == other.m_strInterfaceMask)
-               && (m_fIpv6Supported == other.m_fIpv6Supported)
-               && (m_strInterfaceAddress6 == other.m_strInterfaceAddress6)
-               && (m_strInterfaceMaskLength6 == other.m_strInterfaceMaskLength6)
+               && (m_strAddress == other.m_strAddress)
+               && (m_strMask == other.m_strMask)
+               && (m_fSupportedIPv6 == other.m_fSupportedIPv6)
+               && (m_strAddress6 == other.m_strAddress6)
+               && (m_strMaskLength6 == other.m_strMaskLength6)
                ;
     }
@@ -61,16 +61,16 @@
     bool operator!=(const UIDataHostNetworkInterface &other) const { return !equal(other); }
 
-    /** Holds host interface name. */
+    /** Holds interface name. */
     QString m_strName;
     /** Holds IPv4 interface address. */
-    QString m_strInterfaceAddress;
+    QString m_strAddress;
     /** Holds IPv4 interface mask. */
-    QString m_strInterfaceMask;
+    QString m_strMask;
     /** Holds whether IPv6 protocol supported. */
-    bool m_fIpv6Supported;
+    bool m_fSupportedIPv6;
     /** Holds IPv6 interface address. */
-    QString m_strInterfaceAddress6;
+    QString m_strAddress6;
     /** Holds IPv6 interface mask length. */
-    QString m_strInterfaceMaskLength6;
+    QString m_strMaskLength6;
 };
 
@@ -81,9 +81,9 @@
     /** Constructs data. */
     UIDataDHCPServer()
-        : m_fDhcpServerEnabled(false)
-        , m_strDhcpServerAddress(QString())
-        , m_strDhcpServerMask(QString())
-        , m_strDhcpLowerAddress(QString())
-        , m_strDhcpUpperAddress(QString())
+        : m_fEnabled(false)
+        , m_strAddress(QString())
+        , m_strMask(QString())
+        , m_strLowerAddress(QString())
+        , m_strUpperAddress(QString())
     {}
 
@@ -92,9 +92,9 @@
     {
         return true
-               && (m_fDhcpServerEnabled == other.m_fDhcpServerEnabled)
-               && (m_strDhcpServerAddress == other.m_strDhcpServerAddress)
-               && (m_strDhcpServerMask == other.m_strDhcpServerMask)
-               && (m_strDhcpLowerAddress == other.m_strDhcpLowerAddress)
-               && (m_strDhcpUpperAddress == other.m_strDhcpUpperAddress)
+               && (m_fEnabled == other.m_fEnabled)
+               && (m_strAddress == other.m_strAddress)
+               && (m_strMask == other.m_strMask)
+               && (m_strLowerAddress == other.m_strLowerAddress)
+               && (m_strUpperAddress == other.m_strUpperAddress)
                ;
     }
@@ -106,13 +106,13 @@
 
     /** Holds whether DHCP server enabled. */
-    bool m_fDhcpServerEnabled;
+    bool m_fEnabled;
     /** Holds DHCP server address. */
-    QString m_strDhcpServerAddress;
+    QString m_strAddress;
     /** Holds DHCP server mask. */
-    QString m_strDhcpServerMask;
+    QString m_strMask;
     /** Holds DHCP server lower address. */
-    QString m_strDhcpLowerAddress;
+    QString m_strLowerAddress;
     /** Holds DHCP server upper address. */
-    QString m_strDhcpUpperAddress;
+    QString m_strUpperAddress;
 };
 
Index: /trunk/src/VBox/Frontends/VirtualBox/src/hostnetwork/UIHostNetworkManager.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/hostnetwork/UIHostNetworkManager.cpp	(revision 66696)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/hostnetwork/UIHostNetworkManager.cpp	(revision 66697)
@@ -86,9 +86,9 @@
     /* Compose item fields: */
     setText(Column_Name, m_interface.m_strName);
-    setText(Column_IPv4, QString("%1/%2").arg(m_interface.m_strInterfaceAddress).arg(maskToCidr(m_interface.m_strInterfaceMask)));
-    setText(Column_IPv6, !m_interface.m_fIpv6Supported ? QString() :
-                         QString("%1/%2").arg(m_interface.m_strInterfaceAddress6).arg(maskToCidr(m_interface.m_strInterfaceMaskLength6)));
+    setText(Column_IPv4, QString("%1/%2").arg(m_interface.m_strAddress).arg(maskToCidr(m_interface.m_strMask)));
+    setText(Column_IPv6, !m_interface.m_fSupportedIPv6 ? QString() :
+                         QString("%1/%2").arg(m_interface.m_strAddress6).arg(maskToCidr(m_interface.m_strMaskLength6)));
     setText(Column_DHCP, UIHostNetworkManager::tr("Enable", "DHCP Server"));
-    setCheckState(Column_DHCP, m_dhcpserver.m_fDhcpServerEnabled ? Qt::Checked : Qt::Unchecked);
+    setCheckState(Column_DHCP, m_dhcpserver.m_fEnabled ? Qt::Checked : Qt::Unchecked);
 
     /* Compose item tool-tip: */
@@ -102,46 +102,46 @@
                            .arg(UIHostNetworkManager::tr("Manually configured", "interface"));
     strToolTip += strSubHeader.arg(UIHostNetworkManager::tr("IPv4 Address"))
-                              .arg(m_interface.m_strInterfaceAddress.isEmpty() ?
+                              .arg(m_interface.m_strAddress.isEmpty() ?
                                    UIHostNetworkManager::tr ("Not set", "address") :
-                                   m_interface.m_strInterfaceAddress) +
+                                   m_interface.m_strAddress) +
                   strSubHeader.arg(UIHostNetworkManager::tr("IPv4 Network Mask"))
-                              .arg(m_interface.m_strInterfaceMask.isEmpty() ?
+                              .arg(m_interface.m_strMask.isEmpty() ?
                                    UIHostNetworkManager::tr ("Not set", "mask") :
-                                   m_interface.m_strInterfaceMask);
-    if (m_interface.m_fIpv6Supported)
+                                   m_interface.m_strMask);
+    if (m_interface.m_fSupportedIPv6)
     {
         strToolTip += strSubHeader.arg(UIHostNetworkManager::tr("IPv6 Address"))
-                                  .arg(m_interface.m_strInterfaceAddress6.isEmpty() ?
+                                  .arg(m_interface.m_strAddress6.isEmpty() ?
                                        UIHostNetworkManager::tr("Not set", "address") :
-                                       m_interface.m_strInterfaceAddress6) +
+                                       m_interface.m_strAddress6) +
                       strSubHeader.arg(UIHostNetworkManager::tr("IPv6 Network Mask Length"))
-                                  .arg(m_interface.m_strInterfaceMaskLength6.isEmpty() ?
+                                  .arg(m_interface.m_strMaskLength6.isEmpty() ?
                                        UIHostNetworkManager::tr("Not set", "length") :
-                                       m_interface.m_strInterfaceMaskLength6);
+                                       m_interface.m_strMaskLength6);
     }
 
     /* DHCP server information: */
     strToolTip += strHeader.arg(UIHostNetworkManager::tr("DHCP Server"))
-                           .arg(m_dhcpserver.m_fDhcpServerEnabled ?
+                           .arg(m_dhcpserver.m_fEnabled ?
                                 UIHostNetworkManager::tr("Enabled", "server") :
                                 UIHostNetworkManager::tr("Disabled", "server"));
-    if (m_dhcpserver.m_fDhcpServerEnabled)
+    if (m_dhcpserver.m_fEnabled)
     {
         strToolTip += strSubHeader.arg(UIHostNetworkManager::tr("Address"))
-                                  .arg(m_dhcpserver.m_strDhcpServerAddress.isEmpty() ?
+                                  .arg(m_dhcpserver.m_strAddress.isEmpty() ?
                                        UIHostNetworkManager::tr("Not set", "address") :
-                                       m_dhcpserver.m_strDhcpServerAddress) +
+                                       m_dhcpserver.m_strAddress) +
                       strSubHeader.arg(UIHostNetworkManager::tr("Network Mask"))
-                                  .arg(m_dhcpserver.m_strDhcpServerMask.isEmpty() ?
+                                  .arg(m_dhcpserver.m_strMask.isEmpty() ?
                                        UIHostNetworkManager::tr("Not set", "mask") :
-                                       m_dhcpserver.m_strDhcpServerMask) +
+                                       m_dhcpserver.m_strMask) +
                       strSubHeader.arg(UIHostNetworkManager::tr("Lower Bound"))
-                                  .arg(m_dhcpserver.m_strDhcpLowerAddress.isEmpty() ?
+                                  .arg(m_dhcpserver.m_strLowerAddress.isEmpty() ?
                                        UIHostNetworkManager::tr("Not set", "bound") :
-                                       m_dhcpserver.m_strDhcpLowerAddress) +
+                                       m_dhcpserver.m_strLowerAddress) +
                       strSubHeader.arg(UIHostNetworkManager::tr("Upper Bound"))
-                                  .arg(m_dhcpserver.m_strDhcpUpperAddress.isEmpty() ?
+                                  .arg(m_dhcpserver.m_strUpperAddress.isEmpty() ?
                                        UIHostNetworkManager::tr("Not set", "bound") :
-                                       m_dhcpserver.m_strDhcpUpperAddress);
+                                       m_dhcpserver.m_strUpperAddress);
     }
 
@@ -378,13 +378,13 @@
         /* Save IPv4 interface configuration: */
         if (   comInterface.isOk()
-            && (   newData.m_interface.m_strInterfaceAddress != oldData.m_interface.m_strInterfaceAddress
-                || newData.m_interface.m_strInterfaceMask != oldData.m_interface.m_strInterfaceMask))
-            comInterface.EnableStaticIPConfig(newData.m_interface.m_strInterfaceAddress, newData.m_interface.m_strInterfaceMask);
+            && (   newData.m_interface.m_strAddress != oldData.m_interface.m_strAddress
+                || newData.m_interface.m_strMask != oldData.m_interface.m_strMask))
+            comInterface.EnableStaticIPConfig(newData.m_interface.m_strAddress, newData.m_interface.m_strMask);
         /* Save IPv6 interface configuration: */
         if (   comInterface.isOk()
-            && newData.m_interface.m_fIpv6Supported
-            && (   newData.m_interface.m_strInterfaceAddress6 != oldData.m_interface.m_strInterfaceAddress6
-                || newData.m_interface.m_strInterfaceMaskLength6 != oldData.m_interface.m_strInterfaceMaskLength6))
-            comInterface.EnableStaticIPConfigV6(newData.m_interface.m_strInterfaceAddress6, newData.m_interface.m_strInterfaceMaskLength6.toULong());
+            && newData.m_interface.m_fSupportedIPv6
+            && (   newData.m_interface.m_strAddress6 != oldData.m_interface.m_strAddress6
+                || newData.m_interface.m_strMaskLength6 != oldData.m_interface.m_strMaskLength6))
+            comInterface.EnableStaticIPConfigV6(newData.m_interface.m_strAddress6, newData.m_interface.m_strMaskLength6.toULong());
 
         /* Show error message if necessary: */
@@ -416,15 +416,15 @@
                     /* Save whether DHCP server is enabled: */
                     if (   comServer.isOk()
-                        && newData.m_dhcpserver.m_fDhcpServerEnabled != oldData.m_dhcpserver.m_fDhcpServerEnabled)
-                        comServer.SetEnabled(newData.m_dhcpserver.m_fDhcpServerEnabled);
+                        && newData.m_dhcpserver.m_fEnabled != oldData.m_dhcpserver.m_fEnabled)
+                        comServer.SetEnabled(newData.m_dhcpserver.m_fEnabled);
                     /* Save DHCP server configuration: */
                     if (   comServer.isOk()
-                        && newData.m_dhcpserver.m_fDhcpServerEnabled
-                        && (   newData.m_dhcpserver.m_strDhcpServerAddress != oldData.m_dhcpserver.m_strDhcpServerAddress
-                            || newData.m_dhcpserver.m_strDhcpServerMask != oldData.m_dhcpserver.m_strDhcpServerMask
-                            || newData.m_dhcpserver.m_strDhcpLowerAddress != oldData.m_dhcpserver.m_strDhcpLowerAddress
-                            || newData.m_dhcpserver.m_strDhcpUpperAddress != oldData.m_dhcpserver.m_strDhcpUpperAddress))
-                        comServer.SetConfiguration(newData.m_dhcpserver.m_strDhcpServerAddress, newData.m_dhcpserver.m_strDhcpServerMask,
-                                                   newData.m_dhcpserver.m_strDhcpLowerAddress, newData.m_dhcpserver.m_strDhcpUpperAddress);
+                        && newData.m_dhcpserver.m_fEnabled
+                        && (   newData.m_dhcpserver.m_strAddress != oldData.m_dhcpserver.m_strAddress
+                            || newData.m_dhcpserver.m_strMask != oldData.m_dhcpserver.m_strMask
+                            || newData.m_dhcpserver.m_strLowerAddress != oldData.m_dhcpserver.m_strLowerAddress
+                            || newData.m_dhcpserver.m_strUpperAddress != oldData.m_dhcpserver.m_strUpperAddress))
+                        comServer.SetConfiguration(newData.m_dhcpserver.m_strAddress, newData.m_dhcpserver.m_strMask,
+                                                   newData.m_dhcpserver.m_strLowerAddress, newData.m_dhcpserver.m_strUpperAddress);
 
                     /* Show error message if necessary: */
@@ -559,7 +559,7 @@
 
     /* Make sure dhcp server status changed: */
-    if (   (   data.m_dhcpserver.m_fDhcpServerEnabled
+    if (   (   data.m_dhcpserver.m_fEnabled
             && pChangedItem->checkState(Column_DHCP) == Qt::Checked)
-        || (   !data.m_dhcpserver.m_fDhcpServerEnabled
+        || (   !data.m_dhcpserver.m_fEnabled
             && pChangedItem->checkState(Column_DHCP) == Qt::Unchecked))
         return;
@@ -580,5 +580,5 @@
         /* Save whether DHCP server is enabled: */
         if (comServer.isOk())
-            comServer.SetEnabled(!data.m_dhcpserver.m_fDhcpServerEnabled);
+            comServer.SetEnabled(!data.m_dhcpserver.m_fEnabled);
 
         /* Show error message if necessary: */
@@ -587,5 +587,5 @@
         {
             /* Manually toggle the DHCP server status: */
-            data.m_dhcpserver.m_fDhcpServerEnabled = !data.m_dhcpserver.m_fDhcpServerEnabled;
+            data.m_dhcpserver.m_fEnabled = !data.m_dhcpserver.m_fEnabled;
 
             /* Update interface in the tree: */
@@ -884,13 +884,13 @@
         data.m_interface.m_strName = comInterface.GetName();
     if (comInterface.isOk())
-        data.m_interface.m_strInterfaceAddress = comInterface.GetIPAddress();
+        data.m_interface.m_strAddress = comInterface.GetIPAddress();
     if (comInterface.isOk())
-        data.m_interface.m_strInterfaceMask = comInterface.GetNetworkMask();
+        data.m_interface.m_strMask = comInterface.GetNetworkMask();
     if (comInterface.isOk())
-        data.m_interface.m_fIpv6Supported = comInterface.GetIPV6Supported();
+        data.m_interface.m_fSupportedIPv6 = comInterface.GetIPV6Supported();
     if (comInterface.isOk())
-        data.m_interface.m_strInterfaceAddress6 = comInterface.GetIPV6Address();
+        data.m_interface.m_strAddress6 = comInterface.GetIPV6Address();
     if (comInterface.isOk())
-        data.m_interface.m_strInterfaceMaskLength6 = QString::number(comInterface.GetIPV6NetworkMaskPrefixLength());
+        data.m_interface.m_strMaskLength6 = QString::number(comInterface.GetIPV6NetworkMaskPrefixLength());
 
     /* Get host interface network name for further activities: */
@@ -918,13 +918,13 @@
         /* Gather DHCP server settings: */
         if (comServer.isOk())
-            data.m_dhcpserver.m_fDhcpServerEnabled = comServer.GetEnabled();
+            data.m_dhcpserver.m_fEnabled = comServer.GetEnabled();
         if (comServer.isOk())
-            data.m_dhcpserver.m_strDhcpServerAddress = comServer.GetIPAddress();
+            data.m_dhcpserver.m_strAddress = comServer.GetIPAddress();
         if (comServer.isOk())
-            data.m_dhcpserver.m_strDhcpServerMask = comServer.GetNetworkMask();
+            data.m_dhcpserver.m_strMask = comServer.GetNetworkMask();
         if (comServer.isOk())
-            data.m_dhcpserver.m_strDhcpLowerAddress = comServer.GetLowerIP();
+            data.m_dhcpserver.m_strLowerAddress = comServer.GetLowerIP();
         if (comServer.isOk())
-            data.m_dhcpserver.m_strDhcpUpperAddress = comServer.GetUpperIP();
+            data.m_dhcpserver.m_strUpperAddress = comServer.GetUpperIP();
 
         /* Show error message if necessary: */
