diff --git a/ttcn/CAM/LibItsCam_Functions.ttcn b/ttcn/CAM/LibItsCam_Functions.ttcn
index 4253ead5994c3a402cdb44d642249282bcf79b99..77aa90da5f02e682e1ee2bd04d9832d41ccdbd35 100644
--- a/ttcn/CAM/LibItsCam_Functions.ttcn
+++ b/ttcn/CAM/LibItsCam_Functions.ttcn
@@ -13,9 +13,10 @@ module LibItsCam_Functions {
       
     /**
      * @desc 	Create Facility component and map CAM port
+     * @remark	Only used when ItsFa is a PTC
      * @param	p_camPtc returned Facility component variable
      */    
-    function f_cfCamUp(out ItsFa p_ptcCam) {
+    function f_ptcCamUp(out ItsFa p_ptcCam) {
         
         // Create Facility component
         p_ptcCam := ItsFa.create("CAM Tester");
@@ -23,13 +24,14 @@ module LibItsCam_Functions {
         // map ports
         map(p_ptcCam:camPort, system:camPort);
         
-    } // end f_cfCamUp
+    } // end f_ptcCamUp
     
     /**
      * @desc 	Wait for component to finish and unmap CAM ports
+     * @remark	Only used when ItsFa is a PTC
      * @param	p_camPtc Facility component variable
      */    
-    function f_cfCamDown(in ItsFa p_ptcCam) runs on ItsMtc {
+    function f_ptcCamDown(in ItsFa p_ptcCam) runs on ItsMtc {
             
     	tc_guard.start;
         alt {
@@ -38,12 +40,12 @@ module LibItsCam_Functions {
             }
             
             [] tc_guard.timeout {
-             	log("*** f_cfCamDown: ERROR: Timeout while waiting for component ***");
+             	log("*** f_ptcCamDown: ERROR: Timeout while waiting for component ***");
              	setverdict(inconc);   
             }
         }
         unmap(p_ptcCam:camPort);
         
-    } // end f_cfCamDown
+    } // end f_ptcCamDown
         
 } // end LibItsCam_Functions
\ No newline at end of file
diff --git a/ttcn/DENM/LibItsDenm_Functions.ttcn b/ttcn/DENM/LibItsDenm_Functions.ttcn
index 9f55707084cd25f47f8a53cf7d80fcd58f118adf..0e0a309d6f70c10c680d01a982d6463e983f0de0 100644
--- a/ttcn/DENM/LibItsDenm_Functions.ttcn
+++ b/ttcn/DENM/LibItsDenm_Functions.ttcn
@@ -13,9 +13,10 @@ module LibItsDenm_Functions {
     
     /**
      * @desc 	Create Facility component and connects DENM port
+     * @remark	Only used when ItsFa is a PTC
      * @param	p_ptcDenm returned Facility component variable
      */    
-    function f_cfDenmUp(out ItsFa p_ptcDenm) {
+    function f_ptcDenmUp(out ItsFa p_ptcDenm) {
         
         // Create Facility component
         p_ptcDenm := ItsFa.create("DENM Tester");
@@ -23,13 +24,14 @@ module LibItsDenm_Functions {
         // map ports
         map(p_ptcDenm:denmPort, system:denmPort);
         
-    } // end f_cfDenmUp       
+    } // end f_ptcDenmUp       
     
     /**
      * @desc 	Wait for component to finish and unmap DENM ports
+     * @remark	Only used when ItsFa is a PTC
      * @param	p_camPtc Facility component variable
      */    
-    function f_cfDenmDown(in ItsFa p_ptcDenm) runs on ItsMtc {    
+    function f_ptcDenmDown(in ItsFa p_ptcDenm) runs on ItsMtc {    
     	tc_guard.start;
         alt {
         	[] p_ptcDenm.done {
@@ -37,12 +39,12 @@ module LibItsDenm_Functions {
             }
             
             [] tc_guard.timeout {
-             	log("*** f_cfDenmDown: ERROR: Timeout while waiting for component ***");
+             	log("*** f_ptcDenmDown: ERROR: Timeout while waiting for component ***");
              	setverdict(inconc);   
             }
         }
         unmap(p_ptcDenm:denmPort);
         
-    } // end f_cfDenmDown
+    } // end f_ptcDenmDown
     
 } // end LibItsDenm_Functions
\ No newline at end of file
diff --git a/ttcn/GeoNetworking/LibItsGeoNetworking_Functions.ttcn b/ttcn/GeoNetworking/LibItsGeoNetworking_Functions.ttcn
index 34740afb5478557b3a268a436a28ea249e7ffd07..147937b8e6a8022e1391d0f0db469374d7b1fd6a 100644
--- a/ttcn/GeoNetworking/LibItsGeoNetworking_Functions.ttcn
+++ b/ttcn/GeoNetworking/LibItsGeoNetworking_Functions.ttcn
@@ -13,9 +13,10 @@ module LibItsGeoNetworking_Functions {
     
     /**
      * @desc 	Create Facility component and connects GeoNetworking port
+     * @remark	Only used when ItsFa is a PTC
      * @param	p_ptcDenm returned Facility component variable
      */    
-    function f_cfGeoNetworkingUp(out ItsNt p_ptcGeoNetworking) {
+    function f_ptcGeoNetworkingUp(out ItsNt p_ptcGeoNetworking) {
         
         // Create Facility component
         p_ptcGeoNetworking := ItsNt.create("GeoNetworking Tester");
@@ -23,13 +24,14 @@ module LibItsGeoNetworking_Functions {
         // map ports
         map(p_ptcGeoNetworking:geoNetworkingPort, system:geoNetworkingPort);
         
-    } // end f_cfGeoNetworkingUp       
+    } // end f_ptcGeoNetworkingUp       
     
     /**
      * @desc 	Wait for component to finish and unmap GeoNetworking ports
+     * @remark	Only used when ItsFa is a PTC
      * @param	p_camPtc Facility component variable
      */    
-    function f_cfGeoNetworkingDown(in ItsNt p_ptcGeoNetworking) runs on ItsMtc {    
+    function f_ptcGeoNetworkingDown(in ItsNt p_ptcGeoNetworking) runs on ItsMtc {    
     	tc_guard.start;
         alt {
         	[] p_ptcGeoNetworking.done {
@@ -37,12 +39,12 @@ module LibItsGeoNetworking_Functions {
             }
             
             [] tc_guard.timeout {
-             	log("*** f_cfGeoNetworkingDown: ERROR: Timeout while waiting for component ***");
+             	log("*** f_ptcGeoNetworkingDown: ERROR: Timeout while waiting for component ***");
              	setverdict(inconc);   
             }
         }
         unmap(p_ptcGeoNetworking:geoNetworkingPort);
         
-    } // end f_cfGeoNetworkingDown
+    } // end f_ptcGeoNetworkingDown
     
 } // end LibItsGeoNetworking_Functions
\ No newline at end of file