diff --git a/usrguide/apiguide/2-test_ports.adoc b/usrguide/apiguide/2-test_ports.adoc
index 8d388ab712e9170c7c66ef36cb99f821afdcab3b..6419452e5352fea7417bbdb6208489164bcc95bd 100644
--- a/usrguide/apiguide/2-test_ports.adoc
+++ b/usrguide/apiguide/2-test_ports.adoc
@@ -42,8 +42,8 @@ The generated skeleton header file (that is, `MyMessagePort.hh`) will look as fo
 [source]
 ----
 // This Test Port skeleton header file was generated by the
-// TTCN-3 Compiler of the TTCN-3 Test Executor version 1.7.pre4 build 4
-// for Csaba Feher (ecsafeh@ehubuux110) on Tue Jul 29 18:45:10 2008
+// TTCN-3 Compiler of the TTCN-3 Test Executor version CRL 113 200/6 R6B
+// for U-ERICSSON\ethbaat (ethbaat@HU-00000670) on Wed Mar 11 14:49:55 2020
 
 // Copyright (c) 2000-2020 Ericsson Telecom AB
 
@@ -53,34 +53,34 @@ The generated skeleton header file (that is, `MyMessagePort.hh`) will look as fo
 #ifndef MyMessagePort_HH
 #define MyMessagePort_HH
 
-#include "MyModule.hh"
+#include "MyExample.hh"
 
-namespace MyModule {
+namespace MyExample {
 
 class MyMessagePort : public MyMessagePort_BASE {
 public:
-	MyMessagePort(const char *par_port_name = NULL);
-	~MyMessagePort();
+        MyMessagePort(const char *par_port_name = NULL);
+        ~MyMessagePort();
 
-	void set_parameter(const char *parameter_name,
-		const char *parameter_value);
+        void set_parameter(const char *parameter_name,
+                const char *parameter_value);
 
 private:
-	/* void Handle_Fd_Event(int fd, boolean is_readable,
-		boolean is_writable, boolean is_error); */
-	void Handle_Fd_Event_Error(int fd);
-	void Handle_Fd_Event_Writable(int fd);
-	void Handle_Fd_Event_Readable(int fd);
-	/* void Handle_Timeout(double time_since_last_call); */
+        /* void Handle_Fd_Event(int fd, boolean is_readable,
+                boolean is_writable, boolean is_error); */
+        void Handle_Fd_Event_Error(int fd);
+        void Handle_Fd_Event_Writable(int fd);
+        void Handle_Fd_Event_Readable(int fd);
+        /* void Handle_Timeout(double time_since_last_call); */
 protected:
-	void user_map(const char *system_port, Map_Params& params);
-	void user_unmap(const char *system_port, Map_Params& params);
+        void user_map(const char *system_port, Map_Params& params);
+        void user_unmap(const char *system_port, Map_Params& params);
 
-	void user_start();
-	void user_stop();
+        void user_start();
+        void user_stop();
 
-	void outgoing_send(const INTEGER& send_par);
-	void outgoing_send(const CHARSTRING& send_par);
+        void outgoing_send(const INTEGER& send_par);
+        void outgoing_send(const CHARSTRING& send_par);
 };
 
 } /* end of namespace */
@@ -93,8 +93,8 @@ And the generated skeleton source file, that is, `MyMessagePort.cc`, will be the
 [source]
 ----
 // This Test Port skeleton source file was generated by the
-// TTCN-3 Compiler of the TTCN-3 Test Executor version 1.7.pre4 build 4
-// for Csaba Feher (ecsafeh@ehubuux110) on Tue Jul 29 18:45:10 2008
+// TTCN-3 Compiler of the TTCN-3 Test Executor version CRL 113 200/6 R6B
+// for U-ERICSSON\ethbaat (ethbaat@HU-00000670) on Wed Mar 11 14:49:55 2020
 
 // Copyright (c) 2000-2020 Ericsson Telecom AB
 
@@ -103,10 +103,10 @@ And the generated skeleton source file, that is, `MyMessagePort.cc`, will be the
 
 #include "MyMessagePort.hh"
 
-namespace MyModule {
+namespace MyExample {
 
 MyMessagePort::MyMessagePort(const char *par_port_name)
-	: MyMessagePort_BASE(par_port_name)
+        : MyMessagePort_BASE(par_port_name)
 {
 
 }
@@ -116,38 +116,38 @@ MyMessagePort::~MyMessagePort()
 
 }
 
-void MyMessagePort::set_parameter(const char *parameter_name,
-	const char *parameter_value)
+void MyMessagePort::set_parameter(const char * /*parameter_name*/,
+        const char * /*parameter_value*/)
 {
 
 }
 
 /*void MyMessagePort::Handle_Fd_Event(int fd, boolean is_readable,
-	boolean is_writable, boolean is_error) {}*/
+        boolean is_writable, boolean is_error) {}*/
 
-void MyMessagePort::Handle_Fd_Event_Error(int fd)
+void MyMessagePort::Handle_Fd_Event_Error(int /*fd*/)
 {
 
 }
 
-void MyMessagePort::Handle_Fd_Event_Writable(int fd)
+void MyMessagePort::Handle_Fd_Event_Writable(int /*fd*/)
 {
 
 }
 
-void MyMessagePort::Handle_Fd_Event_Readable(int fd)
+void MyMessagePort::Handle_Fd_Event_Readable(int /*fd*/)
 {
 
 }
 
 /*void MyMessagePort::Handle_Timeout(double time_since_last_call) {}*/
 
-void MyMessagePort::user_map(const char *system_port, Map_Params& params)
+void MyMessagePort::user_map(const char * /*system_port*/, Map_Params& /*params*/)
 {
 
 }
 
-void MyMessagePort::user_unmap(const char *system_port, Map_Params& params)
+void MyMessagePort::user_unmap(const char * /*system_port*/, Map_Params& /*params*/)
 {
 
 }
@@ -162,17 +162,19 @@ void MyMessagePort::user_stop()
 
 }
 
-void MyMessagePort::outgoing_send(const INTEGER& send_par)
+void MyMessagePort::outgoing_send(const INTEGER& /*send_par*/)
 {
 
 }
 
-void MyMessagePort::outgoing_send(const CHARSTRING& send_par)
+void MyMessagePort::outgoing_send(const CHARSTRING& /*send_par*/)
 {
 
 }
 
 } /* end of namespace */
+
+
 ----
 
 == Procedure-based Example