diff --git a/ttcn/CAM/LibItsCam_Functions.ttcn b/ttcn/CAM/LibItsCam_Functions.ttcn
index 8c91281ad545c3604b7705646f198bcc218c847e..4253ead5994c3a402cdb44d642249282bcf79b99 100644
--- a/ttcn/CAM/LibItsCam_Functions.ttcn
+++ b/ttcn/CAM/LibItsCam_Functions.ttcn
@@ -15,10 +15,10 @@ module LibItsCam_Functions {
      * @desc 	Create Facility component and map CAM port
      * @param	p_camPtc returned Facility component variable
      */    
-    function f_cfCamUp(out PtcFa p_ptcCam) {
+    function f_cfCamUp(out ItsFa p_ptcCam) {
         
         // Create Facility component
-        p_ptcCam := PtcFa.create("CAM Tester");
+        p_ptcCam := ItsFa.create("CAM Tester");
         
         // map ports
         map(p_ptcCam:camPort, system:camPort);
@@ -29,7 +29,7 @@ module LibItsCam_Functions {
      * @desc 	Wait for component to finish and unmap CAM ports
      * @param	p_camPtc Facility component variable
      */    
-    function f_cfCamDown(in PtcFa p_ptcCam) runs on ItsMtc {
+    function f_cfCamDown(in ItsFa p_ptcCam) runs on ItsMtc {
             
     	tc_guard.start;
         alt {
diff --git a/ttcn/DENM/LibItsDenm_Functions.ttcn b/ttcn/DENM/LibItsDenm_Functions.ttcn
index 1bc302eb2a010bbbcace66f2a1593fd919df3671..9f55707084cd25f47f8a53cf7d80fcd58f118adf 100644
--- a/ttcn/DENM/LibItsDenm_Functions.ttcn
+++ b/ttcn/DENM/LibItsDenm_Functions.ttcn
@@ -15,10 +15,10 @@ module LibItsDenm_Functions {
      * @desc 	Create Facility component and connects DENM port
      * @param	p_ptcDenm returned Facility component variable
      */    
-    function f_cfDenmUp(out PtcFa p_ptcDenm) {
+    function f_cfDenmUp(out ItsFa p_ptcDenm) {
         
         // Create Facility component
-        p_ptcDenm := PtcFa.create("DENM Tester");
+        p_ptcDenm := ItsFa.create("DENM Tester");
         
         // map ports
         map(p_ptcDenm:denmPort, system:denmPort);
@@ -29,7 +29,7 @@ module LibItsDenm_Functions {
      * @desc 	Wait for component to finish and unmap DENM ports
      * @param	p_camPtc Facility component variable
      */    
-    function f_cfDenmDown(in PtcFa p_ptcDenm) runs on ItsMtc {    
+    function f_cfDenmDown(in ItsFa p_ptcDenm) runs on ItsMtc {    
     	tc_guard.start;
         alt {
         	[] p_ptcDenm.done {
diff --git a/ttcn/LibIts_Interface.ttcn b/ttcn/LibIts_Interface.ttcn
index f963b504ad7a2750c7e22de7e52abf9a188b1efd..78f642a7d07cdfb64bb8f9c94d4298853998527e 100644
--- a/ttcn/LibIts_Interface.ttcn
+++ b/ttcn/LibIts_Interface.ttcn
@@ -19,7 +19,7 @@ module LibIts_Interface {
         /**
          * @desc Test component for ITS Access layer 
          */
-        type component PtcAc {
+        type component ItsAc {
             
             // AC1 ports
             port MacM5Port macM5Port;
@@ -31,7 +31,7 @@ module LibIts_Interface {
         /**
          * @desc Test component for ITS Facility layer 
          */
-        type component PtcFa {
+        type component ItsFa {
             
             // FA1 ports
             port CamPort camPort;
@@ -50,7 +50,7 @@ module LibIts_Interface {
         /**
          * @desc Test component for ITS Management layer 
          */
-        type component PtcMgt {
+        type component ItsMgt {
             
             // MGT1 ports
             port IiscPort iiscPort;
@@ -59,7 +59,7 @@ module LibIts_Interface {
         /**
          * @desc Test component for ITS Network and Transport layer 
          */
-        type component PtcNt {
+        type component ItsNt {
             
             // NT1 ports 
             port BtpPort btpPort;