diff --git a/clients/opal/README.md b/clients/opal/README.md
index 629f87b1a..ee8f73aa3 100644
--- a/clients/opal/README.md
+++ b/clients/opal/README.md
@@ -1,14 +1,20 @@
 # Asynchronous Process interface to VILLASnode / GTNET-SKT
 
-To "models" folder of OPAL project folder copy:
-folder: include
-folder: src
-file: villas.mk
+## Add AsyncIP to new project
 
-----------------------------------------------
+#### Step 1
 
-.llm file should contain the following:
-note: path to libOpalAsyncApiCore.a depends on version of RT-Lab  
+Copy the following files to the _models_ folder of the RT-LAB project:
+
+- Folder: `include/`
+- Folder: `src/`
+- File: `Makefile.mk`
+
+#### Step 2
+
+The `.llm` file should contain the following lines:
+
+**Note:** path to libOpalAsyncApiCore.a depends on version of RT-Lab  
 
 ```
 [ExtraPutFilesComp]
@@ -18,27 +24,32 @@ include\msg.h=Ascii
 include\msg_format.h=Ascii
 include\socket.h=Ascii
 include\utils.h=Ascii
-villas.mk=Ascii
+Makefile.mk=Ascii
 src\msg.c=Ascii
 src\main.c=Ascii
 src\socket.c=Ascii
 src\utils.c=Ascii
+src\compat.c=Ascii
 ```
 
---------------------------------------------------
+#### Step 3
 
 In RT-Lab under Files tab, we should see the files listed above for .llm file
 
---------------------------------------------------
+#### Step 4
 
-Development tab -> Compiler -> Compiler Command (makefile) add the following command
+In RT-LAB model settings: Development tab -> Compiler -> Compiler Command (makefile) add the following command
+
+```
 /usr/bin/make -f /usr/opalrt/common/bin/opalmodelmk
+```
 
---------------------------------------------------
+#### Step 5
 
-max umber of values in UDP packets:
-there’s a „#define“ inside the implementation which must be changed accordingly.
-The #define is in file: model_directory/include/config.h There you will find a directive called MAX_VALUES.
+Maximum number of values in UDP packets:
+
+There’s a `#define` inside the implementation which must be changed accordingly.
+The #define is in file: `model_directory/include/config.h` There you will find a directive called MAX_VALUES.
 
 # Troubleshooting
 
diff --git a/clients/opal/udp/.project b/clients/opal/villas_udp/.project
similarity index 100%
rename from clients/opal/udp/.project
rename to clients/opal/villas_udp/.project
diff --git a/clients/opal/udp/.settings/com.opalrt.rtlab.ui.application.prefs b/clients/opal/villas_udp/.settings/com.opalrt.rtlab.ui.application.prefs
similarity index 100%
rename from clients/opal/udp/.settings/com.opalrt.rtlab.ui.application.prefs
rename to clients/opal/villas_udp/.settings/com.opalrt.rtlab.ui.application.prefs
diff --git a/clients/opal/udp/models/send_receive/.gitignore b/clients/opal/villas_udp/models/send_receive/.gitignore
similarity index 100%
rename from clients/opal/udp/models/send_receive/.gitignore
rename to clients/opal/villas_udp/models/send_receive/.gitignore
diff --git a/clients/opal/udp/models/send_receive/Makefile.mk b/clients/opal/villas_udp/models/send_receive/Makefile.mk
similarity index 100%
rename from clients/opal/udp/models/send_receive/Makefile.mk
rename to clients/opal/villas_udp/models/send_receive/Makefile.mk
diff --git a/clients/opal/udp/models/send_receive/include/config.h b/clients/opal/villas_udp/models/send_receive/include/config.h
similarity index 100%
rename from clients/opal/udp/models/send_receive/include/config.h
rename to clients/opal/villas_udp/models/send_receive/include/config.h
diff --git a/clients/opal/udp/models/send_receive/include/msg.h b/clients/opal/villas_udp/models/send_receive/include/msg.h
similarity index 100%
rename from clients/opal/udp/models/send_receive/include/msg.h
rename to clients/opal/villas_udp/models/send_receive/include/msg.h
diff --git a/clients/opal/udp/models/send_receive/include/msg_format.h b/clients/opal/villas_udp/models/send_receive/include/msg_format.h
similarity index 100%
rename from clients/opal/udp/models/send_receive/include/msg_format.h
rename to clients/opal/villas_udp/models/send_receive/include/msg_format.h
diff --git a/clients/opal/udp/models/send_receive/include/socket.h b/clients/opal/villas_udp/models/send_receive/include/socket.h
similarity index 100%
rename from clients/opal/udp/models/send_receive/include/socket.h
rename to clients/opal/villas_udp/models/send_receive/include/socket.h
diff --git a/clients/opal/udp/models/send_receive/include/utils.h b/clients/opal/villas_udp/models/send_receive/include/utils.h
similarity index 100%
rename from clients/opal/udp/models/send_receive/include/utils.h
rename to clients/opal/villas_udp/models/send_receive/include/utils.h
diff --git a/clients/opal/udp/models/send_receive/send_receive.llm b/clients/opal/villas_udp/models/send_receive/send_receive.llm
similarity index 92%
rename from clients/opal/udp/models/send_receive/send_receive.llm
rename to clients/opal/villas_udp/models/send_receive/send_receive.llm
index 8516670ae..a8165608c 100644
--- a/clients/opal/udp/models/send_receive/send_receive.llm
+++ b/clients/opal/villas_udp/models/send_receive/send_receive.llm
@@ -37,22 +37,23 @@ INTERNAL_IGN_SOURCE_FILE=sfun_gen_async_ctrl.c sfun_recv_async.c sfun_send_async
 INTERNAL_LIBRARY2=-lOpalAsyncApiR2013a
 INTERNAL_LIBRARY3=-lOpalAsyncApiCore
 [ExtraGetFilesComp_1_RT_LAB]
-s2ss=Binary|Async_Proc
+AsyncIP=Binary|Async_Proc
 [ExtraPutFilesComp]
 include\config.h=Ascii
 include\msg.h=Ascii
 include\msg_format.h=Ascii
 include\socket.h=Ascii
 include\utils.h=Ascii
-villas.mk=Ascii
+Makefile.mk=Ascii
 src\msg.c=Ascii
 src\main.c=Ascii
 src\socket.c=Ascii
 src\utils.c=Ascii
+src\compat.c=Ascii
 [ExtraPutFilesComp_1_RT_LAB]
 C:\OPAL-RT\RT-LAB\v11.0.2.410\common\lib\redhawk\libOpalAsyncApiCore.a=Binary|Other
 [ExtraPutFilesLoad_1_RT_LAB]
-.\send_receive_sm_model\OpREDHAWKtarget\s2ss=Binary|Async_Proc
+.\send_receive_sm_model\OpREDHAWKtarget\AsyncIP=Binary|Async_Proc
 [General]
 ATT_CHECKSUM1=1967915764
 ATT_CHECKSUM2=1071010712
@@ -71,7 +72,7 @@ AutoRetrieveRtlab=ON
 CompilerVersion=AUTOMATIC
 DESCRIPTION=
 DinamoFlag=OFF
-FILENAME=D:\svo\s2ss\clients\opal\udp\models\send_receive\send_receive.mdl
+FILENAME=D:\svo\s2ss\clients\opal\villas_udp\models\send_receive\send_receive.mdl
 FORCE_RECOMPILE=0
 IMPORTED_GLOBAL_VARIABLES=1
 LastCompileRtlabVersion=v11.0.2.410
diff --git a/clients/opal/udp/models/send_receive/send_receive.mdl b/clients/opal/villas_udp/models/send_receive/send_receive.mdl
similarity index 100%
rename from clients/opal/udp/models/send_receive/send_receive.mdl
rename to clients/opal/villas_udp/models/send_receive/send_receive.mdl
diff --git a/clients/opal/udp/models/send_receive/src/compat.c b/clients/opal/villas_udp/models/send_receive/src/compat.c
similarity index 100%
rename from clients/opal/udp/models/send_receive/src/compat.c
rename to clients/opal/villas_udp/models/send_receive/src/compat.c
diff --git a/clients/opal/udp/models/send_receive/src/main.c b/clients/opal/villas_udp/models/send_receive/src/main.c
similarity index 100%
rename from clients/opal/udp/models/send_receive/src/main.c
rename to clients/opal/villas_udp/models/send_receive/src/main.c
diff --git a/clients/opal/udp/models/send_receive/src/msg.c b/clients/opal/villas_udp/models/send_receive/src/msg.c
similarity index 100%
rename from clients/opal/udp/models/send_receive/src/msg.c
rename to clients/opal/villas_udp/models/send_receive/src/msg.c
diff --git a/clients/opal/udp/models/send_receive/src/socket.c b/clients/opal/villas_udp/models/send_receive/src/socket.c
similarity index 100%
rename from clients/opal/udp/models/send_receive/src/socket.c
rename to clients/opal/villas_udp/models/send_receive/src/socket.c
diff --git a/clients/opal/udp/models/send_receive/src/utils.c b/clients/opal/villas_udp/models/send_receive/src/utils.c
similarity index 100%
rename from clients/opal/udp/models/send_receive/src/utils.c
rename to clients/opal/villas_udp/models/send_receive/src/utils.c
diff --git a/clients/opal/udp/s2ss_tests.llp b/clients/opal/villas_udp/villas_udp.llp
similarity index 63%
rename from clients/opal/udp/s2ss_tests.llp
rename to clients/opal/villas_udp/villas_udp.llp
index ff62308f7..544f22ba7 100644
--- a/clients/opal/udp/s2ss_tests.llp
+++ b/clients/opal/villas_udp/villas_udp.llp
@@ -6,14 +6,14 @@
         <att_ip_address>134.130.169.90:25252</att_ip_address>
         <att_hashcode>C2357876-6DB6-422F-ABD4-AB47963523A2</att_hashcode>
         <att_autosave>ON</att_autosave>
-        <att_filename>D:\svo\s2ss\clients\opal\udp\s2ss_tests.llp</att_filename>
+        <att_filename>D:\svo\s2ss\clients\opal\villas_udp\villas_udp.llp</att_filename>
     </General>
     <Models>
         <Model>
             <Path>
                 <Relative>models/send_receive/send_receive.mdl</Relative>
-                <Absolute>D:/svo/s2ss/clients/opal/udp/models/send_receive/send_receive.mdl</Absolute>
-                <UNC>//E265/D/svo/s2ss/clients/opal/udp/models/send_receive/send_receive.mdl</UNC>
+                <Absolute>D:/svo/s2ss/clients/opal/villas_udp/models/send_receive/send_receive.mdl</Absolute>
+                <UNC>//E265/D/svo/s2ss/clients/opal/villas_udp/models/send_receive/send_receive.mdl</UNC>
             </Path>
         </Model>
     </Models>