diff --git a/clients/opal/udp/models/send_receive/include/config.h b/clients/opal/udp/models/send_receive/include/config.h
index cbf09b8af..3495d67f1 100644
--- a/clients/opal/udp/models/send_receive/include/config.h
+++ b/clients/opal/udp/models/send_receive/include/config.h
@@ -1,9 +1,9 @@
-/** Compiled-in settings
+/** Compile-time configuration.
  *
- * @author Steffen Vogel <stvogel@eonerc.rwth-aachen.de>
- * @copyright 2014, Institute for Automation of Complex Power Systems, EONERC
  * @file
- */
+ * @author Steffen Vogel <stvogel@eonerc.rwth-aachen.de>
+ * @copyright 2017, Institute for Automation of Complex Power Systems, EONERC
+ *********************************************************************************/
  
 #ifndef _CONFIG_H_
 #define _CONFIG_H_
diff --git a/clients/opal/udp/models/send_receive/include/socket.h b/clients/opal/udp/models/send_receive/include/socket.h
index 336e18eb2..ccc2c7718 100644
--- a/clients/opal/udp/models/send_receive/include/socket.h
+++ b/clients/opal/udp/models/send_receive/include/socket.h
@@ -1,16 +1,9 @@
-/** Helper functions for socket
+/** Helper functions for sockets.
  *
- *  Code example of an asynchronous program.  This program is started
- *  by the asynchronous controller and demonstrates how to send and 
- *  receive data to and from the asynchronous icons and a UDP or TCP
- *  port.
- *
- * @author Steffen Vogel <stvogel@eonerc.rwth-aachen.de>
- * @author Mathieu Dubé-Dallaire
- * @copyright 2014, Institute for Automation of Complex Power Systems, EONERC
- * @copyright 2003, OPAL-RT Technologies inc
  * @file
- */
+ * @author Steffen Vogel <stvogel@eonerc.rwth-aachen.de>
+ * @copyright 2017, Institute for Automation of Complex Power Systems, EONERC
+ *********************************************************************************/
 
 #ifndef _SOCKET_H_
 #define _SOCKET_H_
diff --git a/clients/opal/udp/models/send_receive/include/utils.h b/clients/opal/udp/models/send_receive/include/utils.h
index f1c387d50..61a094f1a 100644
--- a/clients/opal/udp/models/send_receive/include/utils.h
+++ b/clients/opal/udp/models/send_receive/include/utils.h
@@ -1,4 +1,4 @@
-/** Configure Scheduler
+/** Configure scheduler.
  *
  * @file
  * @author Steffen Vogel <stvogel@eonerc.rwth-aachen.de>
diff --git a/clients/opal/udp/models/send_receive/src/main.c b/clients/opal/udp/models/send_receive/src/main.c
index 2ecd769e3..273b5a5ff 100644
--- a/clients/opal/udp/models/send_receive/src/main.c
+++ b/clients/opal/udp/models/send_receive/src/main.c
@@ -1,16 +1,9 @@
-/** Main
+/** Main routine of AsyncIP.
  *
- *  Code example of an asynchronous program.  This program is started
- *  by the asynchronous controller and demonstrates how to send and 
- *  receive data to and from the asynchronous icons and a UDP or TCP
- *  port.
- *
- * @author Steffen Vogel <stvogel@eonerc.rwth-aachen.de>
- * @author Mathieu Dubé-Dallaire
- * @copyright 2014, Institute for Automation of Complex Power Systems, EONERC
- * @copyright 2003, OPAL-RT Technologies inc
  * @file
- */
+ * @author Steffen Vogel <stvogel@eonerc.rwth-aachen.de>
+ * @copyright 2017, Institute for Automation of Complex Power Systems, EONERC
+ *********************************************************************************/
 
 /* Standard ANSI C headers needed for this program */
 #include <errno.h>
diff --git a/clients/opal/udp/models/send_receive/src/socket.c b/clients/opal/udp/models/send_receive/src/socket.c
index f49cc022b..842f78056 100644
--- a/clients/opal/udp/models/send_receive/src/socket.c
+++ b/clients/opal/udp/models/send_receive/src/socket.c
@@ -1,15 +1,8 @@
-/** Helper functions for socket
- *
- *  Code example of an asynchronous program.  This program is started
- *  by the asynchronous controller and demonstrates how to send and 
- *  receive data to and from the asynchronous icons and a UDP port.
+/** Helper functions for sockets.
  *
  * @author Steffen Vogel <stvogel@eonerc.rwth-aachen.de>
- * @author Mathieu Dubé-Dallaire
- * @copyright 2014, Institute for Automation of Complex Power Systems, EONERC
- * @copyright 2003, OPAL-RT Technologies inc
- * @file
- */
+ * @copyright 2017, Institute for Automation of Complex Power Systems, EONERC
+ *********************************************************************************/
 
 #include <errno.h>
 #include <unistd.h>
diff --git a/clients/opal/udp/models/send_receive/src/utils.c b/clients/opal/udp/models/send_receive/src/utils.c
index 7a8e0ded3..192661dfc 100644
--- a/clients/opal/udp/models/send_receive/src/utils.c
+++ b/clients/opal/udp/models/send_receive/src/utils.c
@@ -1,6 +1,5 @@
-/** Configure Scheduler
+/** Configure scheduler.
  *
- * @file
  * @author Steffen Vogel <stvogel@eonerc.rwth-aachen.de>
  * @author Mathieu Dubé-Dallaire
  * @copyright 2003, OPAL-RT Technologies inc