diff --git a/LibOneM2M/OneM2M_Functions.ttcn b/LibOneM2M/OneM2M_Functions.ttcn
index 7684a3906ac511f57efe6b287e86a6843763d109..f48f7c3246e800cd11bdbb651cb156d6e7c905e9 100644
--- a/LibOneM2M/OneM2M_Functions.ttcn
+++ b/LibOneM2M/OneM2M_Functions.ttcn
@@ -71,7 +71,7 @@ module OneM2M_Functions {
 	
 			//Initialze the IUT
 							
-		} // end f_cf01Up
+		} // end f_cf01UpAe2
 		
 		/**
 		 * @desc Ports mapping and default behaviour activation for Config 02
@@ -93,7 +93,7 @@ module OneM2M_Functions {
 			}
 			activate(a_default());
 			vc_aeSimu := activate(a_cse_cf02_ae1());
-			vc_cse1.start(f_cf02UpCse1());
+			vc_cse1.start(f_cf02UpCse1(p_cseType));
 			vc_cse1.done;
 				
 			// Connect
@@ -231,7 +231,7 @@ module OneM2M_Functions {
 			
 			//Initialize the IUT
 			
-		} // end f_cf03Up
+		} // end f_cf04Up
 
 		/**
 		 * @desc Ports unmapping
@@ -244,7 +244,7 @@ module OneM2M_Functions {
 				vc_ae2.start(f_cf01DownAe2());
 				vc_ae2.done;
 			}
-		}
+		}// end f_cf01Down
 		
 		/**
 		 * @desc Ports unmapping
@@ -254,7 +254,7 @@ module OneM2M_Functions {
 			unmap(self:mcaPort, system:mcaPort);
 			unmap(self:acPort, system:acPort);
 			unmap(self:mcaPortIn, system:mcaPortIn);
-		}
+		}// end f_cf01DownAe2
 		
 		/**
 		 * @desc Ports unmapping
@@ -269,7 +269,8 @@ module OneM2M_Functions {
 			unmap(vc_cse1:mccPort, system:mccPort);
 			unmap(vc_cse1:mccPortIn, system:mccPortIn);
 			unmap(vc_cse1:acPort, system:acPort);
-		}		
+		}// end f_cf02Down
+		
 		/**
 		 * @desc Ports unmapping
 		 */
@@ -280,7 +281,8 @@ module OneM2M_Functions {
 			unmap(self:acPort, system:acPort);
 			unmap(vc_ae1:mcaPort, system:mcaPort);
 			unmap(vc_ae1:acPort, system:acPort);
-		}		
+		}// end f_cf02DownCseSimuMaster
+		
 		/**
 		 * @desc Ports unmapping for Config 03
 		 */
@@ -291,7 +293,7 @@ module OneM2M_Functions {
 				unmap(self:utPort, system:utPort);
 			}
 			unmap(self:acPort, system:acPort);
-		}
+		}// end f_cf03Down
 		
 		/**
 		 * @desc Ports unmapping for Config 04
@@ -301,7 +303,7 @@ module OneM2M_Functions {
 			unmap(self:mccPort, system:mccPort);
 			unmap(self:mccPortIn, system:mccPortIn);
 			unmap(self:acPort, system:acPort);
-		}
+		}// end f_cf04Down
 
 	}//end group configFunctions