diff --git a/features/netsocket/CellularBase.h b/features/netsocket/CellularBase.h
index 929771e8b2..e430653abb 100644
--- a/features/netsocket/CellularBase.h
+++ b/features/netsocket/CellularBase.h
@@ -15,7 +15,7 @@
 
 /* @file CellularBase.h CellularBase */
 
-/** @addtogroup netsocket
+/** @addtogroup netinterface
  * @{
  */
 
diff --git a/features/netsocket/DNS.h b/features/netsocket/DNS.h
index bdfa69705f..6ee876c7d2 100644
--- a/features/netsocket/DNS.h
+++ b/features/netsocket/DNS.h
@@ -14,9 +14,14 @@
  * limitations under the License.
  */
 
+/** @file DNS.h Domain Name Service */
+/** @\addtogroup netsocket
+ * @{ */
+
 #ifndef DNS_H
 #define DNS_H
 
+/** Base class for DNS provider */
 class DNS {
 public:
 
diff --git a/features/netsocket/EthInterface.h b/features/netsocket/EthInterface.h
index 0e856c99f6..6e6ff49fb4 100644
--- a/features/netsocket/EthInterface.h
+++ b/features/netsocket/EthInterface.h
@@ -1,7 +1,4 @@
-
-/** \addtogroup netsocket */
-/** @{*/
-/* EthInterface
+/*
  * Copyright (c) 2015 ARM Limited
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -17,6 +14,10 @@
  * limitations under the License.
  */
 
+/* @file EthInterface.h Common interface that is ahared between Ethernet hardware */
+/** \addtogroup netinterface */
+/** @{*/
+
 #ifndef ETH_INTERFACE_H
 #define ETH_INTERFACE_H
 
diff --git a/features/netsocket/MeshInterface.h b/features/netsocket/MeshInterface.h
index cd1c7af346..2c782e8669 100644
--- a/features/netsocket/MeshInterface.h
+++ b/features/netsocket/MeshInterface.h
@@ -1,7 +1,4 @@
-
-/** \addtogroup netsocket */
-/** @{*/
-/* MeshInterface
+/*
  * Copyright (c) 2015 ARM Limited
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -17,6 +14,10 @@
  * limitations under the License.
  */
 
+/* @file MeshInterface.h Mesh network interface */
+/** \addtogroup netinterface */
+/** @{*/
+
 #ifndef MESH_INTERFACE_H
 #define MESH_INTERFACE_H
 
diff --git a/features/netsocket/NetworkInterface.h b/features/netsocket/NetworkInterface.h
index 6fac582a57..5cc74aa41f 100644
--- a/features/netsocket/NetworkInterface.h
+++ b/features/netsocket/NetworkInterface.h
@@ -15,7 +15,8 @@
  */
 
 /** @file NetworkInterface.h Network Interface base class */
-/** @\addtogroup netsocket
+/** @addtogroup netinterface
+ * Network Interface classes
  * @{ */
 
 
diff --git a/features/netsocket/WiFiInterface.h b/features/netsocket/WiFiInterface.h
index f9d85cbcbf..e86245b824 100644
--- a/features/netsocket/WiFiInterface.h
+++ b/features/netsocket/WiFiInterface.h
@@ -1,5 +1,4 @@
-
-/* WiFiInterface
+/*
  * Copyright (c) 2015 - 2016 ARM Limited
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,6 +14,11 @@
  * limitations under the License.
  */
 
+/** @file WifiInterface.h Common interface that is shared between Wi-Fi devices */
+/** @addtogroup netinterface
+ * @{
+ */
+
 #ifndef WIFI_INTERFACE_H
 #define WIFI_INTERFACE_H
 
@@ -22,13 +26,7 @@
 #include "netsocket/NetworkInterface.h"
 #include "netsocket/WiFiAccessPoint.h"
 
-/** @file WifiInterface.h Common interface that is shared between Wi-Fi devices */
-/** @addtogroup netsocket
- * @{
- */
-
 /** Common interface that is shared between Wi-Fi devices.
- *
  */
 class WiFiInterface: public virtual NetworkInterface {
 public:
diff --git a/features/netsocket/nsapi_dns.h b/features/netsocket/nsapi_dns.h
index 4142a00b99..692d3d5b42 100644
--- a/features/netsocket/nsapi_dns.h
+++ b/features/netsocket/nsapi_dns.h
@@ -1,7 +1,4 @@
-
-/** \addtogroup netsocket */
-/** @{*/
-/* nsapi_dns.h
+/*
  * Original work Copyright (c) 2013 Henry Leinen (henry[dot]leinen [at] online [dot] de)
  * Modified work Copyright (c) 2015 ARM Limited
  *
@@ -17,6 +14,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
+/** \addtogroup netsocket */
+/** @{*/
+
 #ifndef NSAPI_DNS_H
 #define NSAPI_DNS_H