diff --git a/LibOneM2M/OneM2M_Functions.ttcn b/LibOneM2M/OneM2M_Functions.ttcn
index 67734f0b6ae0b6a852cb3f994a02193bb0f3a6cb..57b7d02264ccf121985b2ef1938781de641f1419 100644
--- a/LibOneM2M/OneM2M_Functions.ttcn
+++ b/LibOneM2M/OneM2M_Functions.ttcn
@@ -5818,8 +5818,8 @@ module OneM2M_Functions {
 			if(ischosen(p_contentResource.timeSeriesInstanceAnnc)) {
 				return p_contentResource.timeSeriesInstanceAnnc.resourceID;
 			}
-			if(ischosen(p_contentResource.primitveProfile)) {
-				return p_contentResource.primitveProfile.resourceID;
+			if(ischosen(p_contentResource.primitiveProfile)) {
+				return p_contentResource.primitiveProfile.resourceID;
 			}
 
 			log(__SCOPE__&":WARNING: Primitive Content Kind not implemented");
diff --git a/LibOneM2M/OneM2M_Templates.ttcn b/LibOneM2M/OneM2M_Templates.ttcn
index a93d76a13513587f1cc7264ac4eab799f7f6b909..c54768ed19a1597fc19618ba91d97683463cfaaa 100644
--- a/LibOneM2M/OneM2M_Templates.ttcn
+++ b/LibOneM2M/OneM2M_Templates.ttcn
@@ -791,23 +791,23 @@ module OneM2M_Templates {
         	
 			template (value) RequestPrimitive m_updatePrimitiveProfileBase modifies m_update := {
 				requestIdentifier := "m_updatePrimitiveProfile",
-				primitiveContent:= {primitveProfile := m_contentUpdatePrimitiveProfile}
+				primitiveContent:= {primitiveProfile := m_contentUpdatePrimitiveProfile}
 			}
 			
 			template (value) RequestPrimitive m_updatePrimitiveProfileNonMutuallyExclusive modifies m_updatePrimitiveProfileBase := {
-				primitiveContent:= {primitveProfile := m_contentUpdatePrimitiveProfileNonMutuallyExclusive}
+				primitiveContent:= {primitiveProfile := m_contentUpdatePrimitiveProfileNonMutuallyExclusive}
 			}
 
 			template (value) RequestPrimitive m_updatePrimitiveProfileWithInvalidAdditionsOrDeletions modifies m_updatePrimitiveProfileBase := {
-				primitiveContent:= {primitveProfile := m_contentUpdatePrimitiveProfileWithInvalidAdditionsOrDeletions}
+				primitiveContent:= {primitiveProfile := m_contentUpdatePrimitiveProfileWithInvalidAdditionsOrDeletions}
 			}
 
 			template (value) RequestPrimitive m_updatePrimitiveProfileNonPermissibleParameters modifies m_updatePrimitiveProfileBase := {
-				primitiveContent:= {primitveProfile := m_contentUpdatePrimitiveProfileNonPermissibleParameters}
+				primitiveContent:= {primitiveProfile := m_contentUpdatePrimitiveProfileNonPermissibleParameters}
 			}
             
 			template (value) RequestPrimitive m_updatePrimitiveProfileAddContainerMaxByteNegative modifies m_updatePrimitiveProfileBase := {
-				primitiveContent:= {primitveProfile := m_contentUpdatePrimitiveProfileNegativeMaxByteSize}
+				primitiveContent:= {primitiveProfile := m_contentUpdatePrimitiveProfileNegativeMaxByteSize}
 			}            
         	
         	template (value) RequestPrimitive m_updateRemoteCSEBase modifies m_update := {
@@ -1736,193 +1736,193 @@ module OneM2M_Templates {
 			};
 			
 			/**
-			 * @desc Base CREATE request primitive for PrimitveProfile resource
+			 * @desc Base CREATE request primitive for PrimitiveProfile resource
 			 */
-			template (value) RequestPrimitive m_createPrimitveProfileBase modifies m_create:= {
-				requestIdentifier := testcasename() & "-m_createPrimitveProfile",
+			template (value) RequestPrimitive m_createPrimitiveProfileBase modifies m_create:= {
+				requestIdentifier := testcasename() & "-m_createPrimitiveProfile",
 				resourceType := int62,
-				primitiveContent := {primitveProfile := m_contentCreatePrimitveProfileBase }
+				primitiveContent := {primitiveProfile := m_contentCreatePrimitiveProfileBase }
 			};
 			
 			/**
-			 * @desc CREATE request primitive for PrimitveProfile resource with primitive Add for Content resource
+			 * @desc CREATE request primitive for PrimitiveProfile resource with primitive Add for Content resource
 			 */
-			template (value) RequestPrimitive m_createPrimitveProfileAddContainerMaxByte100(in template (omit) ListOfM2MID p_IDList := omit) modifies m_create:= {
-				requestIdentifier := testcasename() & "-m_createPrimitveProfile",
+			template (value) RequestPrimitive m_createPrimitiveProfileAddContainerMaxByte100(in template (omit) ListOfM2MID p_IDList := omit) modifies m_create:= {
+				requestIdentifier := testcasename() & "-m_createPrimitiveProfile",
 				resourceType := int62,
-				primitiveContent := {primitveProfile := m_contentCreatePrimitveProfileAddContainerMaxByte100(p_IDList) }
+				primitiveContent := {primitiveProfile := m_contentCreatePrimitiveProfileAddContainerMaxByte100(p_IDList) }
 			};
 
             /**
-             * @desc CREATE request primitive for PrimitveProfile resource with primitive Add for Content resource
+             * @desc CREATE request primitive for PrimitiveProfile resource with primitive Add for Content resource
              */
             template (value) RequestPrimitive m_createPrimitiveProfileAddContainerMaxByteNegative(in template (omit) ListOfM2MID p_IDList := omit) modifies m_create:= {
-                requestIdentifier := testcasename() & "-m_createPrimitveProfile",
+                requestIdentifier := testcasename() & "-m_createPrimitiveProfile",
                 resourceType := int62,
-                primitiveContent := {primitveProfile := m_contentCreatePrimitiveProfileAddContainerMaxByteNegative(p_IDList) }
+                primitiveContent := {primitiveProfile := m_contentCreatePrimitiveProfileAddContainerMaxByteNegative(p_IDList) }
             };           
         
 			/**
-			 * @desc CREATE request primitive for PrimitveProfile resource with primitive Add for Content resource
+			 * @desc CREATE request primitive for PrimitiveProfile resource with primitive Add for Content resource
 			 */
-			template (value) RequestPrimitive m_createPrimitveProfileAddContainerMaxByte100ToResponse(in template (omit) ListOfM2MID p_IDList := omit) modifies m_create:= {
-				requestIdentifier := testcasename() & "-m_createPrimitveProfile",
+			template (value) RequestPrimitive m_createPrimitiveProfileAddContainerMaxByte100ToResponse(in template (omit) ListOfM2MID p_IDList := omit) modifies m_create:= {
+				requestIdentifier := testcasename() & "-m_createPrimitiveProfile",
 				resourceType := int62,
-				primitiveContent := {primitveProfile := m_contentCreatePrimitveProfileAddContainerMaxByte100ToResponse(p_IDList) }
+				primitiveContent := {primitiveProfile := m_contentCreatePrimitiveProfileAddContainerMaxByte100ToResponse(p_IDList) }
 			};            
 			
 			/**
-			 * @desc CREATE request primitive for PrimitveProfile resource with primitive Add for ResultContent=4, attribute and child resources
+			 * @desc CREATE request primitive for PrimitiveProfile resource with primitive Add for ResultContent=4, attribute and child resources
 			 */
-			template (value) RequestPrimitive m_createPrimitveProfileAddResultContentTo4(in template (omit) ListOfM2MID p_IDList := omit) modifies m_create:= {
-				requestIdentifier := testcasename() & "-m_createPrimitveProfile",
+			template (value) RequestPrimitive m_createPrimitiveProfileAddResultContentTo4(in template (omit) ListOfM2MID p_IDList := omit) modifies m_create:= {
+				requestIdentifier := testcasename() & "-m_createPrimitiveProfile",
 				resourceType := int62,
-				primitiveContent := {primitveProfile := m_contentCreatePrimitveProfileAddResultContentTo4(p_IDList) }
+				primitiveContent := {primitiveProfile := m_contentCreatePrimitiveProfileAddResultContentTo4(p_IDList) }
 			};
 
 			/**
-			 * @desc CREATE request primitive for PrimitveProfile resource with primitive Add for ResultContent=4, attribute and child resources
+			 * @desc CREATE request primitive for PrimitiveProfile resource with primitive Add for ResultContent=4, attribute and child resources
 			 */
 			template (value) RequestPrimitive m_createPrimitiveProfileAddResultContentTo4ToResponse(in template (omit) ListOfM2MID p_IDList := omit) modifies m_create:= {
-				requestIdentifier := testcasename() & "-m_createPrimitveProfile",
+				requestIdentifier := testcasename() & "-m_createPrimitiveProfile",
 				resourceType := int62,
-				primitiveContent := {primitveProfile := m_contentCreatePrimitveProfileAddResultContentTo4ToResponse(p_IDList) }
+				primitiveContent := {primitiveProfile := m_contentCreatePrimitiveProfileAddResultContentTo4ToResponse(p_IDList) }
 			};
 
 			/**
 			 * @desc CREATE request primitive for PrimitiveProfile resource with primitive Add for ResultContent=4, attribute and child resources
 			 */
 			template (value) RequestPrimitive m_createPrimitiveProfileModifResultContentTo4ToResponse(in template (omit) ListOfM2MID p_IDList := omit) modifies m_create:= {
-				requestIdentifier := testcasename() & "-m_createPrimitveProfile",
+				requestIdentifier := testcasename() & "-m_createPrimitiveProfile",
 				resourceType := int62,
-				primitiveContent := {primitveProfile := m_contentCreatePrimitiveProfileModifResultContentTo4ToResponse(p_IDList) }
+				primitiveContent := {primitiveProfile := m_contentCreatePrimitiveProfileModifResultContentTo4ToResponse(p_IDList) }
 			};
 			
 			/**
-			 * @desc CREATE request primitive for PrimitveProfile resource with primitive Add for ResultContent=1, attribute and child resources
+			 * @desc CREATE request primitive for PrimitiveProfile resource with primitive Add for ResultContent=1, attribute and child resources
 			 */
-			template (value) RequestPrimitive m_createPrimitveProfileAddResultContentTo1(in template (omit) ListOfM2MID p_IDList := omit) modifies m_create:= {
-				requestIdentifier := testcasename() & "-m_createPrimitveProfile",
+			template (value) RequestPrimitive m_createPrimitiveProfileAddResultContentTo1(in template (omit) ListOfM2MID p_IDList := omit) modifies m_create:= {
+				requestIdentifier := testcasename() & "-m_createPrimitiveProfile",
 				resourceType := int62,
-				primitiveContent := {primitveProfile := m_contentCreatePrimitveProfileAddResultContentTo1(p_IDList) }
+				primitiveContent := {primitiveProfile := m_contentCreatePrimitiveProfileAddResultContentTo1(p_IDList) }
 			};
 			
 			/**
-			 * @desc CREATE request primitive for PrimitveProfile resource with primitive Add for ResultContent=1, attribute and child resources
+			 * @desc CREATE request primitive for PrimitiveProfile resource with primitive Add for ResultContent=1, attribute and child resources
 			 */
-			template (value) RequestPrimitive m_createPrimitveProfileAddResultContentTo1ToResponse(in template (omit) ListOfM2MID p_IDList := omit) modifies m_create:= {
-				requestIdentifier := testcasename() & "-m_createPrimitveProfile",
+			template (value) RequestPrimitive m_createPrimitiveProfileAddResultContentTo1ToResponse(in template (omit) ListOfM2MID p_IDList := omit) modifies m_create:= {
+				requestIdentifier := testcasename() & "-m_createPrimitiveProfile",
 				resourceType := int62,
-				primitiveContent := {primitveProfile := m_contentCreatePrimitveProfileAddResultContentTo1ToResponse(p_IDList) }
+				primitiveContent := {primitiveProfile := m_contentCreatePrimitiveProfileAddResultContentTo1ToResponse(p_IDList) }
 			};
             
 			/**
-			 * @desc CREATE request primitive for PrimitveProfile resource with primitive Delete for ResultContent
+			 * @desc CREATE request primitive for PrimitiveProfile resource with primitive Delete for ResultContent
 			 */
-			template (value) RequestPrimitive m_createPrimitveProfileDelteResultContent(in template (omit) ListOfM2MID p_IDList := omit) modifies m_create:= {
-				requestIdentifier := testcasename() & "-m_createPrimitveProfile",
+			template (value) RequestPrimitive m_createPrimitiveProfileDelteResultContent(in template (omit) ListOfM2MID p_IDList := omit) modifies m_create:= {
+				requestIdentifier := testcasename() & "-m_createPrimitiveProfile",
 				resourceType := int62,
-				primitiveContent := {primitveProfile := m_contentCreatePrimitveProfileDeleteResultContent(p_IDList) }
+				primitiveContent := {primitiveProfile := m_contentCreatePrimitiveProfileDeleteResultContent(p_IDList) }
 			};
 
 			/**
 			 * @desc CREATE request primitive for PrimitiveProfile resource with primitive Add for non permissible attribute
 			 */
 			template (value) RequestPrimitive m_createPrimitiveProfileAddgmty(in template (omit) ListOfM2MID p_IDList := omit) modifies m_create:= {
-				requestIdentifier := testcasename() & "-m_createPrimitveProfile",
+				requestIdentifier := testcasename() & "-m_createPrimitiveProfile",
 				resourceType := int62,
-				primitiveContent := {primitveProfile := m_contentCreatePrimitiveProfileAddgmty(p_IDList) }
+				primitiveContent := {primitiveProfile := m_contentCreatePrimitiveProfileAddgmty(p_IDList) }
 			};
 
 			/**
-			 * @desc CREATE request primitive for PrimitveProfile resource with primitive Add for non permissible attribute
+			 * @desc CREATE request primitive for PrimitiveProfile resource with primitive Add for non permissible attribute
 			 */
-			template (value) RequestPrimitive m_createPrimitveProfileAddNonPermissibleAttribute(in template (omit) ListOfM2MID p_IDList := omit) modifies m_create:= {
-				requestIdentifier := testcasename() & "-m_createPrimitveProfile",
+			template (value) RequestPrimitive m_createPrimitiveProfileAddNonPermissibleAttribute(in template (omit) ListOfM2MID p_IDList := omit) modifies m_create:= {
+				requestIdentifier := testcasename() & "-m_createPrimitiveProfile",
 				resourceType := int62,
-				primitiveContent := {primitveProfile := m_contentCreatePrimitveProfileAddNonPermissibleAttribute(p_IDList) }
+				primitiveContent := {primitiveProfile := m_contentCreatePrimitiveProfileAddNonPermissibleAttribute(p_IDList) }
 			};
 
 			/**
-			 * @desc CREATE request primitive for PrimitveProfile resource with primitive additions or deletions containing invalid attribute/parametres
+			 * @desc CREATE request primitive for PrimitiveProfile resource with primitive additions or deletions containing invalid attribute/parametres
 			 */
-			template (value) RequestPrimitive m_createPrimitveProfileWithInvalidAdditionsOrDeletions(in template (omit) ListOfM2MID p_IDList := omit) modifies m_create:= {
-				requestIdentifier := testcasename() & "-m_createPrimitveProfile",
+			template (value) RequestPrimitive m_createPrimitiveProfileWithInvalidAdditionsOrDeletions(in template (omit) ListOfM2MID p_IDList := omit) modifies m_create:= {
+				requestIdentifier := testcasename() & "-m_createPrimitiveProfile",
 				resourceType := int62,
-				primitiveContent := {primitveProfile := m_contentCreatePrimitveProfileWithInvalidAdditionsOrDeletions(p_IDList) }
+				primitiveContent := {primitiveProfile := m_contentCreatePrimitiveProfileWithInvalidAdditionsOrDeletions(p_IDList) }
 			};
 
 			
 			/**
-			 * @desc CREATE request primitive for PrimitveProfile resource with primitive Add for non permissible attribute
+			 * @desc CREATE request primitive for PrimitiveProfile resource with primitive Add for non permissible attribute
 			 */
-			template (value) RequestPrimitive m_createPrimitveProfileDeleteNonPermissibleAttribute(in template (omit) ListOfM2MID p_IDList := omit) modifies m_create:= {
-				requestIdentifier := testcasename() & "-m_createPrimitveProfile",
+			template (value) RequestPrimitive m_createPrimitiveProfileDeleteNonPermissibleAttribute(in template (omit) ListOfM2MID p_IDList := omit) modifies m_create:= {
+				requestIdentifier := testcasename() & "-m_createPrimitiveProfile",
 				resourceType := int62,
-				primitiveContent := {primitveProfile := m_contentCreatePrimitveProfileDeleteNonPermissibleAttribute(p_IDList) }
+				primitiveContent := {primitiveProfile := m_contentCreatePrimitiveProfileDeleteNonPermissibleAttribute(p_IDList) }
 			};
 			
 			/**
-			 * @desc CREATE request primitive for PrimitveProfile resource with primitive Add for Content resource with non mutually exclusive attributes
+			 * @desc CREATE request primitive for PrimitiveProfile resource with primitive Add for Content resource with non mutually exclusive attributes
 			 */
-			template (value) RequestPrimitive m_createPrimitveProfileAddNonMutuallyExclusive(in template (omit) ListOfM2MID p_IDList := omit) modifies m_create:= {
-				requestIdentifier := testcasename() & "-m_createPrimitveProfile",
+			template (value) RequestPrimitive m_createPrimitiveProfileAddNonMutuallyExclusive(in template (omit) ListOfM2MID p_IDList := omit) modifies m_create:= {
+				requestIdentifier := testcasename() & "-m_createPrimitiveProfile",
 				resourceType := int62,
-				primitiveContent := {primitveProfile := m_contentCreatePrimitveProfileAddNonMutuallyExclusive(p_IDList) }
+				primitiveContent := {primitiveProfile := m_contentCreatePrimitiveProfileAddNonMutuallyExclusive(p_IDList) }
 			};
 			
 			/**
-			 * @desc CREATE request primitive for PrimitveProfile resource with primitive Delete for Content resource
+			 * @desc CREATE request primitive for PrimitiveProfile resource with primitive Delete for Content resource
 			 */
-			template (value) RequestPrimitive m_createPrimitveProfileDeleteContainerMaxByte(in template (omit) ListOfM2MID p_IDList := omit) modifies m_create:= {
-				requestIdentifier := testcasename() & "-m_createPrimitveProfile",
+			template (value) RequestPrimitive m_createPrimitiveProfileDeleteContainerMaxByte(in template (omit) ListOfM2MID p_IDList := omit) modifies m_create:= {
+				requestIdentifier := testcasename() & "-m_createPrimitiveProfile",
 				resourceType := int62,
-				primitiveContent := {primitveProfile := m_contentCreatePrimitveProfileDeleteContainerMaxByte(p_IDList) }
+				primitiveContent := {primitiveProfile := m_contentCreatePrimitiveProfileDeleteContainerMaxByte(p_IDList) }
 			};
 			
 			/**
-			 * @desc CREATE request primitive for PrimitveProfile resource with primitive Delete from response.
+			 * @desc CREATE request primitive for PrimitiveProfile resource with primitive Delete from response.
 			 */
-			template (value) RequestPrimitive m_createPrimitveProfileAddMaxByte100ToResponse(in template (omit) ListOfM2MID p_IDList := omit) modifies m_create:= {
-				requestIdentifier := testcasename() & "-m_createPrimitveProfile",
+			template (value) RequestPrimitive m_createPrimitiveProfileAddMaxByte100ToResponse(in template (omit) ListOfM2MID p_IDList := omit) modifies m_create:= {
+				requestIdentifier := testcasename() & "-m_createPrimitiveProfile",
 				resourceType := int62,
-				primitiveContent := {primitveProfile := m_contentCreatePrimitveProfileAddMaxByte100ToResponse(p_IDList) }
+				primitiveContent := {primitiveProfile := m_contentCreatePrimitiveProfileAddMaxByte100ToResponse(p_IDList) }
 			};
 
 			/**
-			 * @desc CREATE request primitive for PrimitveProfile resource with primitive Add for ResultContent=1 from response.
+			 * @desc CREATE request primitive for PrimitiveProfile resource with primitive Add for ResultContent=1 from response.
 			 */
 			template (value) RequestPrimitive m_createPrimitiveProfileAddResultContentTo1FromResponse(in template (omit) ListOfM2MID p_IDList := omit) modifies m_create:= {
-				requestIdentifier := testcasename() & "-m_createPrimitveProfile",
+				requestIdentifier := testcasename() & "-m_createPrimitiveProfile",
 				resourceType := int62,
-				primitiveContent := {primitveProfile := m_contentCreatePrimitiveProfileAddResultContentTo1FromResponse(p_IDList) }
+				primitiveContent := {primitiveProfile := m_contentCreatePrimitiveProfileAddResultContentTo1FromResponse(p_IDList) }
 			};
             
 			/**
-			 * @desc CREATE request primitive for PrimitveProfile resource with primitive Add for ResultContent=1 from response.
+			 * @desc CREATE request primitive for PrimitiveProfile resource with primitive Add for ResultContent=1 from response.
 			 */
 			template (value) RequestPrimitive m_createPrimitiveProfileDeleteResultContentTo1FromResponse(in template (omit) ListOfM2MID p_IDList := omit) modifies m_create:= {
-				requestIdentifier := testcasename() & "-m_createPrimitveProfile",
+				requestIdentifier := testcasename() & "-m_createPrimitiveProfile",
 				resourceType := int62,
-				primitiveContent := {primitveProfile := m_contentCreatePrimitiveProfileDeleteResultContentTo1FromResponse(p_IDList) }
+				primitiveContent := {primitiveProfile := m_contentCreatePrimitiveProfileDeleteResultContentTo1FromResponse(p_IDList) }
 			};            
 			
 			/**
-			 * @desc CREATE request primitive for PrimitveProfile resource with primitive Delete from response.
+			 * @desc CREATE request primitive for PrimitiveProfile resource with primitive Delete from response.
 			 */
-			template (value) RequestPrimitive m_createPrimitveProfileDeleteFromResponse(in template (omit) ListOfM2MID p_IDList := omit) modifies m_create:= {
-				requestIdentifier := testcasename() & "-m_createPrimitveProfile",
+			template (value) RequestPrimitive m_createPrimitiveProfileDeleteFromResponse(in template (omit) ListOfM2MID p_IDList := omit) modifies m_create:= {
+				requestIdentifier := testcasename() & "-m_createPrimitiveProfile",
 				resourceType := int62,
-				primitiveContent := {primitveProfile := m_contentCreatePrimitveProfileDeleteFromResponse(p_IDList) }
+				primitiveContent := {primitiveProfile := m_contentCreatePrimitiveProfileDeleteFromResponse(p_IDList) }
 			};
 			
 			/**
-			 * @desc CREATE request primitive for PrimitveProfile resource with primitive Delete from response.
+			 * @desc CREATE request primitive for PrimitiveProfile resource with primitive Delete from response.
 			 */
-			template (value) RequestPrimitive m_createPrimitveProfileDeletePrimtiveContentFromResponse(in template (omit) ListOfM2MID p_IDList := omit) modifies m_create:= {
-				requestIdentifier := testcasename() & "-m_createPrimitveProfile",
+			template (value) RequestPrimitive m_createPrimitiveProfileDeletePrimtiveContentFromResponse(in template (omit) ListOfM2MID p_IDList := omit) modifies m_create:= {
+				requestIdentifier := testcasename() & "-m_createPrimitiveProfile",
 				resourceType := int62,
-				primitiveContent := {primitveProfile := m_contentCreatePrimitveProfileDeletePrimitiveContentFromResponse(p_IDList) }
+				primitiveContent := {primitiveProfile := m_contentCreatePrimitiveProfileDeletePrimitiveContentFromResponse(p_IDList) }
 			};
         	
 			/**
@@ -4062,9 +4062,9 @@ module OneM2M_Templates {
 		};   
 		
 		/**
-		 * @desc Base template primitiveContent for CREATE operation for PrimitveProfile resource
+		 * @desc Base template primitiveContent for CREATE operation for PrimitiveProfile resource
 		 */
-		template PrimitveProfile_optional m_contentCreatePrimitveProfileBase := {
+		template PrimitiveProfile_optional m_contentCreatePrimitiveProfileBase := {
 			resourceName := c_defaultPrimitiveProfileceResourceName, //O
 			resourceType := omit,//NP
 			resourceID := omit,//NP
@@ -4093,7 +4093,7 @@ module OneM2M_Templates {
 		/**
 		 * @desc Primitive Profile for adding MaxByte primitive of Content resource
 		 */
-		template PrimitveProfile_optional m_contentCreatePrimitveProfileAddContainerMaxByte100(in template ListOfM2MID p_IDList) modifies m_contentCreatePrimitveProfileBase := {
+		template PrimitiveProfile_optional m_contentCreatePrimitiveProfileAddContainerMaxByte100(in template ListOfM2MID p_IDList) modifies m_contentCreatePrimitiveProfileBase := {
 			resourceName := c_defaultPrimitiveProfileceResourceName, //O
 			iDList := p_IDList, //M
 			resourceTypes := {int3}, //O
@@ -4105,7 +4105,7 @@ module OneM2M_Templates {
         /**
 		 * @desc Primitive Profile for adding MaxByte primitive of Content resource
 		 */
-		template PrimitveProfile_optional m_contentCreatePrimitiveProfileAddContainerMaxByteNegative(in template ListOfM2MID p_IDList) modifies m_contentCreatePrimitveProfileBase := {
+		template PrimitiveProfile_optional m_contentCreatePrimitiveProfileAddContainerMaxByteNegative(in template ListOfM2MID p_IDList) modifies m_contentCreatePrimitiveProfileBase := {
 			resourceName := c_defaultPrimitiveProfileceResourceName, //O
 			iDList := p_IDList, //M
 			resourceTypes := {int3}, //O
@@ -4117,7 +4117,7 @@ module OneM2M_Templates {
         /**
 		 * @desc Primitive Profile for adding MaxByte primitive of Content resource
 		 */
-        template PrimitveProfile_optional m_contentCreatePrimitiveProfileAddgmty(in template ListOfM2MID p_IDList) modifies m_contentCreatePrimitveProfileBase := {
+        template PrimitiveProfile_optional m_contentCreatePrimitiveProfileAddgmty(in template ListOfM2MID p_IDList) modifies m_contentCreatePrimitiveProfileBase := {
 			resourceName := c_defaultPrimitiveProfileceResourceName, //O
 			iDList := p_IDList, //M
 			resourceTypes := {int3}, //O
@@ -4129,7 +4129,7 @@ module OneM2M_Templates {
 		/**
 		 * @desc Primitive Profile for adding MaxByte primitive of Content resource
 		 */
-		template PrimitveProfile_optional m_contentCreatePrimitveProfileAddContainerMaxByte100ToResponse(in template ListOfM2MID p_IDList) modifies m_contentCreatePrimitveProfileBase := {
+		template PrimitiveProfile_optional m_contentCreatePrimitiveProfileAddContainerMaxByte100ToResponse(in template ListOfM2MID p_IDList) modifies m_contentCreatePrimitiveProfileBase := {
 			resourceName := c_defaultPrimitiveProfileceResourceName, //O
 			iDList := p_IDList, //M
 			resourceTypes := {int3}, //O
@@ -4141,7 +4141,7 @@ module OneM2M_Templates {
 		/**
 		 * @desc Primitive Profile for adding resultContent primitive of container resource
 		 */
-		template PrimitveProfile_optional m_contentCreatePrimitveProfileAddResultContentTo4(in template ListOfM2MID p_IDList) modifies m_contentCreatePrimitveProfileBase := {
+		template PrimitiveProfile_optional m_contentCreatePrimitiveProfileAddResultContentTo4(in template ListOfM2MID p_IDList) modifies m_contentCreatePrimitiveProfileBase := {
 			resourceName := c_defaultPrimitiveProfileceResourceName, //O
 			iDList := p_IDList, //M
 			resourceTypes := {int3}, //O
@@ -4153,7 +4153,7 @@ module OneM2M_Templates {
 		/**
 		 * @desc Primitive Profile for adding resultContent primitive of container resource
 		 */
-		template PrimitveProfile_optional m_contentCreatePrimitveProfileAddResultContentTo4ToResponse(in template ListOfM2MID p_IDList) modifies m_contentCreatePrimitveProfileBase := {
+		template PrimitiveProfile_optional m_contentCreatePrimitiveProfileAddResultContentTo4ToResponse(in template ListOfM2MID p_IDList) modifies m_contentCreatePrimitiveProfileBase := {
 			resourceName := c_defaultPrimitiveProfileceResourceName, //O
 			iDList := p_IDList, //M
 			resourceTypes := {int3}, //O
@@ -4165,7 +4165,7 @@ module OneM2M_Templates {
 		/**
 		 * @desc Primitive Profile for modification of resultContent primitive of container resource
 		 */
-		template PrimitveProfile_optional m_contentCreatePrimitiveProfileModifResultContentTo4ToResponse(in template ListOfM2MID p_IDList) modifies m_contentCreatePrimitveProfileBase := {
+		template PrimitiveProfile_optional m_contentCreatePrimitiveProfileModifResultContentTo4ToResponse(in template ListOfM2MID p_IDList) modifies m_contentCreatePrimitiveProfileBase := {
 			resourceName := c_defaultPrimitiveProfileceResourceName, //O
 			iDList := p_IDList, //M
 			resourceTypes := {int3}, //O
@@ -4177,7 +4177,7 @@ module OneM2M_Templates {
 		/**
 		 * @desc Primitive Profile for adding resultContent primitive of container resource
 		 */
-		template PrimitveProfile_optional m_contentCreatePrimitveProfileAddResultContentTo1(in template ListOfM2MID p_IDList) modifies m_contentCreatePrimitveProfileBase := {
+		template PrimitiveProfile_optional m_contentCreatePrimitiveProfileAddResultContentTo1(in template ListOfM2MID p_IDList) modifies m_contentCreatePrimitiveProfileBase := {
 			resourceName := c_defaultPrimitiveProfileceResourceName, //O
 			iDList := p_IDList, //M
 			resourceTypes := {int3}, //O
@@ -4189,7 +4189,7 @@ module OneM2M_Templates {
 		/**
 		 * @desc Primitive Profile for adding resultContent primitive of container resource
 		 */
-		template PrimitveProfile_optional m_contentCreatePrimitveProfileAddResultContentTo1ToResponse(in template ListOfM2MID p_IDList) modifies m_contentCreatePrimitveProfileBase := {
+		template PrimitiveProfile_optional m_contentCreatePrimitiveProfileAddResultContentTo1ToResponse(in template ListOfM2MID p_IDList) modifies m_contentCreatePrimitiveProfileBase := {
 			resourceName := c_defaultPrimitiveProfileceResourceName, //O
 			iDList := p_IDList, //M
 			resourceTypes := {int3}, //O
@@ -4201,7 +4201,7 @@ module OneM2M_Templates {
 		/**
 		 * @desc Primitive Profile for removing resultContent primitive of container resource
 		 */
-		template PrimitveProfile_optional m_contentCreatePrimitveProfileDeleteResultContent(in template ListOfM2MID p_IDList) modifies m_contentCreatePrimitveProfileBase := {
+		template PrimitiveProfile_optional m_contentCreatePrimitiveProfileDeleteResultContent(in template ListOfM2MID p_IDList) modifies m_contentCreatePrimitiveProfileBase := {
 			resourceName := c_defaultPrimitiveProfileceResourceName, //O
 			iDList := p_IDList, //M
 			resourceTypes := {int3}, //O
@@ -4213,7 +4213,7 @@ module OneM2M_Templates {
 		/**
 		 * @desc Primitive Profile for adding a non permissible attribute
 		 */
-		template PrimitveProfile_optional m_contentCreatePrimitveProfileAddNonPermissibleAttribute(in template ListOfM2MID p_IDList) modifies m_contentCreatePrimitveProfileBase := {
+		template PrimitiveProfile_optional m_contentCreatePrimitiveProfileAddNonPermissibleAttribute(in template ListOfM2MID p_IDList) modifies m_contentCreatePrimitiveProfileBase := {
 			resourceName := c_defaultPrimitiveProfileceResourceName, //O
 			iDList := p_IDList, //M
 			resourceTypes := {int3}, //O
@@ -4225,7 +4225,7 @@ module OneM2M_Templates {
 		/**
 		 * @desc Primitive Profile for adding a invalid value in additions/deletions attribute
 		 */
-		template PrimitveProfile_optional m_contentCreatePrimitveProfileWithInvalidAdditionsOrDeletions(in template ListOfM2MID p_IDList) modifies m_contentCreatePrimitveProfileBase := {
+		template PrimitiveProfile_optional m_contentCreatePrimitiveProfileWithInvalidAdditionsOrDeletions(in template ListOfM2MID p_IDList) modifies m_contentCreatePrimitiveProfileBase := {
 			resourceName := c_defaultPrimitiveProfileceResourceName, //O
 			iDList := p_IDList, //M
 			resourceTypes := {int3}, //O
@@ -4238,7 +4238,7 @@ module OneM2M_Templates {
 		/**
 		 * @desc Primitive Profile for deleting a non permissible attribute
 		 */
-		template PrimitveProfile_optional m_contentCreatePrimitveProfileDeleteNonPermissibleAttribute(in template ListOfM2MID p_IDList) modifies m_contentCreatePrimitveProfileBase := {
+		template PrimitiveProfile_optional m_contentCreatePrimitiveProfileDeleteNonPermissibleAttribute(in template ListOfM2MID p_IDList) modifies m_contentCreatePrimitiveProfileBase := {
 			resourceName := c_defaultPrimitiveProfileceResourceName, //O
 			iDList := p_IDList, //M
 			resourceTypes := {int3}, //O
@@ -4250,7 +4250,7 @@ module OneM2M_Templates {
 		/**
 		 * @desc Primitive Profile for adding MaxByte primitive of Content resource in a non mutually exclusive way
 		 */
-		template PrimitveProfile_optional m_contentCreatePrimitveProfileAddNonMutuallyExclusive(in template ListOfM2MID p_IDList) modifies m_contentCreatePrimitveProfileBase := {
+		template PrimitiveProfile_optional m_contentCreatePrimitiveProfileAddNonMutuallyExclusive(in template ListOfM2MID p_IDList) modifies m_contentCreatePrimitiveProfileBase := {
 			resourceName := c_defaultPrimitiveProfileceResourceName, //O
 			iDList := p_IDList, //M
 			resourceTypes := {int3}, //O
@@ -4263,7 +4263,7 @@ module OneM2M_Templates {
 		/**
 		 * @desc Primitive Profile for deleting MaxByte primitive of Container resource
 		 */
-		template PrimitveProfile_optional m_contentCreatePrimitveProfileDeleteContainerMaxByte(in template ListOfM2MID p_IDList) modifies m_contentCreatePrimitveProfileBase := {
+		template PrimitiveProfile_optional m_contentCreatePrimitiveProfileDeleteContainerMaxByte(in template ListOfM2MID p_IDList) modifies m_contentCreatePrimitiveProfileBase := {
 			resourceName := c_defaultPrimitiveProfileceResourceName, //O
 			iDList := p_IDList, //M
 			resourceTypes := {int3}, //O
@@ -4275,7 +4275,7 @@ module OneM2M_Templates {
 		/**
 		 * @desc Primitive Profile for deleting MaxByte primitive of Resoponse Content
 		 */
-		template PrimitveProfile_optional m_contentCreatePrimitveProfileDeleteFromResponse(in template ListOfM2MID p_IDList) modifies m_contentCreatePrimitveProfileBase := {
+		template PrimitiveProfile_optional m_contentCreatePrimitiveProfileDeleteFromResponse(in template ListOfM2MID p_IDList) modifies m_contentCreatePrimitiveProfileBase := {
 			resourceName := c_defaultPrimitiveProfileceResourceName, //O
 			iDList := p_IDList, //M
 			resourceTypes := {int3}, //O
@@ -4287,7 +4287,7 @@ module OneM2M_Templates {
 		/**
 		 * @desc Primitive Profile for deleting MaxByte primitive of Resoponse Content
 		 */
-		template PrimitveProfile_optional m_contentCreatePrimitveProfileDeletePrimitiveContentFromResponse(in template ListOfM2MID p_IDList) modifies m_contentCreatePrimitveProfileBase := {
+		template PrimitiveProfile_optional m_contentCreatePrimitiveProfileDeletePrimitiveContentFromResponse(in template ListOfM2MID p_IDList) modifies m_contentCreatePrimitiveProfileBase := {
 			resourceName := c_defaultPrimitiveProfileceResourceName, //O
 			iDList := p_IDList, //M
 			resourceTypes := {int3}, //O
@@ -4299,7 +4299,7 @@ module OneM2M_Templates {
 		/**
 		 * @desc Primitive Profile for adding MaxByte primitive to Resoponse Content
 		 */
-		template PrimitveProfile_optional m_contentCreatePrimitveProfileAddMaxByte100ToResponse(in template ListOfM2MID p_IDList) modifies m_contentCreatePrimitveProfileBase := {
+		template PrimitiveProfile_optional m_contentCreatePrimitiveProfileAddMaxByte100ToResponse(in template ListOfM2MID p_IDList) modifies m_contentCreatePrimitiveProfileBase := {
 			resourceName := c_defaultPrimitiveProfileceResourceName, //O
 			iDList := p_IDList, //M
 			resourceTypes := {int3}, //O
@@ -4311,7 +4311,7 @@ module OneM2M_Templates {
         /**
          * @desc Primitive Profile for adding resultContent primitive to Resoponse Content
 		 */
-        template PrimitveProfile_optional m_contentCreatePrimitiveProfileAddResultContentTo1FromResponse(in template ListOfM2MID p_IDList) modifies m_contentCreatePrimitveProfileBase := {
+        template PrimitiveProfile_optional m_contentCreatePrimitiveProfileAddResultContentTo1FromResponse(in template ListOfM2MID p_IDList) modifies m_contentCreatePrimitiveProfileBase := {
             resourceName := c_defaultPrimitiveProfileceResourceName, //O
             iDList := p_IDList, //M
             resourceTypes := {int3}, //O
@@ -4323,7 +4323,7 @@ module OneM2M_Templates {
         /**
          * @desc Primitive Profile for deleting resultContent primitive to Response Content
 		 */
-        template PrimitveProfile_optional m_contentCreatePrimitiveProfileDeleteResultContentTo1FromResponse(in template ListOfM2MID p_IDList) modifies m_contentCreatePrimitveProfileBase := {
+        template PrimitiveProfile_optional m_contentCreatePrimitiveProfileDeleteResultContentTo1FromResponse(in template ListOfM2MID p_IDList) modifies m_contentCreatePrimitiveProfileBase := {
             resourceName := c_defaultPrimitiveProfileceResourceName, //O
             iDList := p_IDList, //M
             resourceTypes := {int3}, //O
@@ -7714,7 +7714,7 @@ module OneM2M_Templates {
 			choice := omit
     	}
     	
-    	template (value) PrimitveProfile_optional m_contentUpdatePrimitiveProfile := {
+    	template (value) PrimitiveProfile_optional m_contentUpdatePrimitiveProfile := {
     		resourceName := omit, //O
 			resourceType := omit,//NP
 			resourceID := omit,//NP
@@ -7740,22 +7740,22 @@ module OneM2M_Templates {
 			choice := omit//NP
     	}
     	
-		template (value) PrimitveProfile_optional m_contentUpdatePrimitiveProfileNonMutuallyExclusive modifies m_contentUpdatePrimitiveProfile := {
+		template (value) PrimitiveProfile_optional m_contentUpdatePrimitiveProfileNonMutuallyExclusive modifies m_contentUpdatePrimitiveProfile := {
 			additions := {{{"maxByteSize", "100"}}}, //O
 			deletions := {"maxByteSize"} //O
 		}
 
-		template (value) PrimitveProfile_optional m_contentUpdatePrimitiveProfileWithInvalidAdditionsOrDeletions modifies m_contentUpdatePrimitiveProfile := {
+		template (value) PrimitiveProfile_optional m_contentUpdatePrimitiveProfileWithInvalidAdditionsOrDeletions modifies m_contentUpdatePrimitiveProfile := {
 			additions := {{{"invalidAttributeAdd", "3"}}}, //O
 			deletions := {"invalidAttributedDelete"} //O
 		}
 
 		
-		template (value) PrimitveProfile_optional m_contentUpdatePrimitiveProfileNonPermissibleParameters modifies m_contentUpdatePrimitiveProfile := {
+		template (value) PrimitiveProfile_optional m_contentUpdatePrimitiveProfileNonPermissibleParameters modifies m_contentUpdatePrimitiveProfile := {
 			additions := {{{"releaseVersionIndicator", "3"}}} //O
 		}
         
-		template (value) PrimitveProfile_optional m_contentUpdatePrimitiveProfileNegativeMaxByteSize modifies m_contentUpdatePrimitiveProfile := {
+		template (value) PrimitiveProfile_optional m_contentUpdatePrimitiveProfileNegativeMaxByteSize modifies m_contentUpdatePrimitiveProfile := {
 			additions := {{{"maxByteSize", "-10"}}}
 		}        
     	
diff --git a/LibOneM2M/OneM2M_TypesAndValues.ttcn b/LibOneM2M/OneM2M_TypesAndValues.ttcn
index 1a9c397148df6b9fdb9606364828c5e8587a3aa8..b460b7cbc3f9fd1395511780069f427e4595e56f 100644
--- a/LibOneM2M/OneM2M_TypesAndValues.ttcn
+++ b/LibOneM2M/OneM2M_TypesAndValues.ttcn
@@ -1623,7 +1623,7 @@ group OptionalResourceTypes {
 	  variant (choice.choice_list[-]) "untagged";
 	};
 
-	type record PrimitveProfile_optional
+	type record PrimitiveProfile_optional
 	{
 		ResourceName resourceName optional,
 		ResourceType resourceType optional,
@@ -5158,7 +5158,7 @@ group OtherTypes {
 	OntologyRepository_optional ontologyRepository,
 	Ontology_optional ontology,
 	PollingChannel_optional pollingChannel,
-	PrimitveProfile_optional primitveProfile,
+	PrimitiveProfile_optional primitiveProfile,
     ProcessManagement_optional processManagement, //2021 added processManagement
     State_optional state,                         //2021 added state
     Action_optional action_,                      //2021 added action
diff --git a/OneM2M_Testcases_CSE_Release_4.ttcn b/OneM2M_Testcases_CSE_Release_4.ttcn
index 23f56df30eab27a1971febe1950ebaea5dcfbadb..0a935dc050a789639f3d5f1050dc2a9512d6d39e 100644
--- a/OneM2M_Testcases_CSE_Release_4.ttcn
+++ b/OneM2M_Testcases_CSE_Release_4.ttcn
@@ -4804,24 +4804,27 @@ module OneM2M_Testcases_CSE_Release_4 {
 													
 				function f_CSE_PP_001_CRE() runs on AeSimu system CseSystem {
 					// Local variables
-					var template RequestPrimitive v_createPrimitveProfile;
+					var template RequestPrimitive v_createPrimitiveProfile;
 					var RequestPrimitive v_requestContainerCreate;
 					var ResponsePrimitive v_responsePrimitive;
 					var integer v_aeIndex := -1;
 					var integer v_primitiveProfileIndex := -1;
 					var MsgIn v_response;
 					
+					// Test component configuration
+					f_cf01Up();
+					
 					// Preamble
 					f_cse_createAccessControlPolicyAux(-, -, int63);
 					v_aeIndex := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[vc_acpIndex].resource)}, -);
 					
 					// Primitive Profile with add atribute "maxByte" = "100" for content resource.
-					v_createPrimitveProfile := m_createPrimitveProfileAddContainerMaxByte100({f_getOriginator(v_aeIndex)});
-					v_primitiveProfileIndex := f_cse_createResource(int62, v_createPrimitveProfile, v_aeIndex);
+					v_createPrimitiveProfile := m_createPrimitiveProfileAddContainerMaxByte100({f_getOriginator(v_aeIndex)});
+					v_primitiveProfileIndex := f_cse_createResource(int62, v_createPrimitiveProfile, v_aeIndex);
 				
 					//Create container resource without "maxByte" primitive
 					v_requestContainerCreate := f_getCreateRequestPrimitive(int3, m_createContainerBase, v_aeIndex);
-					// Link Primitve Prifle created to this Request
+					// Link Primitive Prifle created to this Request
 					v_requestContainerCreate.primitiveProfileIdentifier := f_getResourceId(vc_resourcesList[v_primitiveProfileIndex].resource);
 				
 					f_send(e_mcaPort, m_request(v_requestContainerCreate));
@@ -4830,9 +4833,9 @@ module OneM2M_Testcases_CSE_Release_4 {
 						[] mcaPort.receive(mw_response(mw_responsePrimitive(int2001))) -> value v_response {
 							tc_ac.stop;
 						  	if(v_response.primitive.responsePrimitive.primitiveContent.container.maxByteSize == 100){
-								setverdict(pass, __SCOPE__ & ": maxByteSize primitive value in PrimitveProfile added to Create Container Request!");
+								setverdict(pass, __SCOPE__ & ": maxByteSize primitive value in PrimitiveProfile added to Create Container Request!");
 						    } else {
-						    	setverdict(fail, __SCOPE__ & ": maxByteSize primitive value in PrimitveProfile not added to Create Container Request!");
+						    	setverdict(fail, __SCOPE__ & ": maxByteSize primitive value in PrimitiveProfile not added to Create Container Request!");
 							}
 						}
 						[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
@@ -4868,7 +4871,7 @@ module OneM2M_Testcases_CSE_Release_4 {
 													
 				function f_CSE_PP_001_RET() runs on AeSimu system CseSystem {
 					// Local variables
-					var template RequestPrimitive v_createPrimitveProfile;
+					var template RequestPrimitive v_createPrimitiveProfile;
 					var integer v_aeIndex := -1;
 					var integer v_primitiveProfileIndex := -1;
 					var integer v_containerParentIndex := -1;
@@ -4876,13 +4879,16 @@ module OneM2M_Testcases_CSE_Release_4 {
 					var RequestPrimitive v_retrieveRequest;
 					var template PrimitiveContent v_retriveContentResponse;
 					
+					// Test component configuration
+					f_cf01Up();
+					
 					// Preamble
 					f_cse_createAccessControlPolicyAux(-, -, int63);
 					v_aeIndex := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[vc_acpIndex].resource)}, -);
 					
 					// Primitive Profile with add atribute resultContent=4(attribute and child resource) for content resource.
-					v_createPrimitveProfile := m_createPrimitveProfileAddResultContentTo4({f_getOriginator(v_aeIndex)});
-					v_primitiveProfileIndex := f_cse_createResource(int62, v_createPrimitveProfile, v_aeIndex);
+					v_createPrimitiveProfile := m_createPrimitiveProfileAddResultContentTo4({f_getOriginator(v_aeIndex)});
+					v_primitiveProfileIndex := f_cse_createResource(int62, v_createPrimitiveProfile, v_aeIndex);
 					
 					// Set expected response as per Result Content=4 (attribute and child resource)
 					v_retriveContentResponse.container := mw_contentContainer_rc4;
@@ -4892,7 +4898,7 @@ module OneM2M_Testcases_CSE_Release_4 {
 					//Create child Container resource
 					f_cse_createResource(int3, m_createContainerBase, v_containerParentIndex);
 					
-					//Retrieve container with link to Primitve Profile
+					//Retrieve container with link to Primitive Profile
 					v_retrieveRequest := valueof(m_retrieve(f_getResourceAddress(v_containerParentIndex), f_getOriginator(v_containerParentIndex)));
 					v_retrieveRequest.primitiveProfileIdentifier := f_getResourceId(vc_resourcesList[v_primitiveProfileIndex].resource);
 					f_send(e_mcaPort, m_request(v_retrieveRequest));
@@ -4940,7 +4946,7 @@ module OneM2M_Testcases_CSE_Release_4 {
 													
 				function f_CSE_PP_001_DEL() runs on AeSimu system CseSystem {
 					// Local variables
-					var template RequestPrimitive v_createPrimitveProfile;
+					var template RequestPrimitive v_createPrimitiveProfile;
 					var integer v_aeIndex := -1;
 					var integer v_primitiveProfileIndex := -1;
 					var integer v_containerIndex := -1;
@@ -4948,13 +4954,16 @@ module OneM2M_Testcases_CSE_Release_4 {
 					var RequestPrimitive v_deleteRequest;
 					var template PrimitiveContent v_deleteContentResponse;
 					
-					// Preambleo
+					// Test component configuration
+					f_cf01Up();
+					
+					// Preamble
 					f_cse_createAccessControlPolicyAux(-, -, int63);
 					v_aeIndex := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[vc_acpIndex].resource)}, -);
 					
 					// Primitive Profile with add atribute resultContent=1 (attribute) for content resource.
-					v_createPrimitveProfile := m_createPrimitveProfileAddResultContentTo1({f_getOriginator(v_aeIndex)});
-					v_primitiveProfileIndex := f_cse_createResource(int62, v_createPrimitveProfile, v_aeIndex);
+					v_createPrimitiveProfile := m_createPrimitiveProfileAddResultContentTo1({f_getOriginator(v_aeIndex)});
+					v_primitiveProfileIndex := f_cse_createResource(int62, v_createPrimitiveProfile, v_aeIndex);
 					
 					// Set expected container as per Result Content=1
 					v_deleteContentResponse.container := mw_contentContainer_rc1;
@@ -5011,7 +5020,7 @@ module OneM2M_Testcases_CSE_Release_4 {
 													
 				function f_CSE_PP_001_UPD() runs on AeSimu system CseSystem {
 					// Local variables
-					var template RequestPrimitive v_createPrimitveProfile;
+					var template RequestPrimitive v_createPrimitiveProfile;
 					var RequestPrimitive v_updateContainer;
 					var ResponsePrimitive v_responsePrimitive;
 					var integer v_aeIndex := -1;
@@ -5019,13 +5028,16 @@ module OneM2M_Testcases_CSE_Release_4 {
 					var integer v_createdContainerResource := -1;
 					var MsgIn v_response;
 					
+					// Test component configuration
+					f_cf01Up();
+					
 					// Preamble
 					f_cse_createAccessControlPolicyAux(-, -, int63);
 					v_aeIndex := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[vc_acpIndex].resource)}, -);
 					
 					// Primitive Profile with add atribute "maxByte" = "100" for content resource.
-					v_createPrimitveProfile := m_createPrimitveProfileAddContainerMaxByte100({f_getOriginator(v_aeIndex)});
-					v_primitiveProfileIndex := f_cse_createResource(int62, v_createPrimitveProfile, v_aeIndex);
+					v_createPrimitiveProfile := m_createPrimitiveProfileAddContainerMaxByte100({f_getOriginator(v_aeIndex)});
+					v_primitiveProfileIndex := f_cse_createResource(int62, v_createPrimitiveProfile, v_aeIndex);
 				
 					//Create container resource without Primtive Profile ID and no maxByte attribte
 					v_createdContainerResource := f_cse_createResource(int3, m_createContainerBase, v_aeIndex);
@@ -5033,7 +5045,7 @@ module OneM2M_Testcases_CSE_Release_4 {
 					//Update container request with Primitive Profile ID, and not including update for maxByte
 					v_updateContainer:= f_getUpdateRequestPrimitive(int3, v_aeIndex, m_updateContainerBase);
 
-					// Link Primitve Prifle created to this Request
+					// Link Primitive Prifle created to this Request
 					v_updateContainer.primitiveProfileIdentifier := f_getResourceId(vc_resourcesList[v_primitiveProfileIndex].resource);
 				
 					f_send(e_mcaPort, m_request(v_updateContainer));
@@ -5041,11 +5053,11 @@ module OneM2M_Testcases_CSE_Release_4 {
 					alt {
 						[] mcaPort.receive(mw_response(mw_responsePrimitive(int2004))) -> value v_response {
 							tc_ac.stop;
-							// Check that IUT applied the Primitve Profile
+							// Check that IUT applied the Primitive Profile
 						  	if(v_response.primitive.responsePrimitive.primitiveContent.container.maxByteSize == 100){
-						  		setverdict(pass, __SCOPE__ & ": maxByteSize primitive value in PrimitveProfile added correctly to Update Container Request!");
+						  		setverdict(pass, __SCOPE__ & ": maxByteSize primitive value in PrimitiveProfile added correctly to Update Container Request!");
 						    } else {
-								setverdict(fail, __SCOPE__ & ": maxByteSize primitive value in PrimitveProfile not added to Update Container Request!");
+								setverdict(fail, __SCOPE__ & ": maxByteSize primitive value in PrimitiveProfile not added to Update Container Request!");
 							}
 						}
 						[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
@@ -5084,7 +5096,7 @@ module OneM2M_Testcases_CSE_Release_4 {
 													
 				function f_CSE_PP_002_CRE() runs on AeSimu system CseSystem {
 					// Local variables
-					var template RequestPrimitive v_createPrimitveProfile;
+					var template RequestPrimitive v_createPrimitiveProfile;
 					var RequestPrimitive v_requestContainerCreate;
 					var ResponsePrimitive v_responsePrimitive;
 					var integer v_aeIndex := -1;
@@ -5092,20 +5104,23 @@ module OneM2M_Testcases_CSE_Release_4 {
 					var integer v_createdContainerResourceIndex := -1;
 					var MsgIn v_response;
 					
+					// Test component configuration
+					f_cf01Up();
+					
 					// Preamble
 					f_cse_createAccessControlPolicyAux(-, -, int63);
 					v_aeIndex := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[vc_acpIndex].resource)}, -);
 					
-					// Primitive Profile with primitve "maxByte" to be deleted
-					v_createPrimitveProfile := m_createPrimitveProfileDeleteContainerMaxByte({f_getOriginator(v_aeIndex)});
-					v_primitiveProfileIndex := f_cse_createResource(int62, v_createPrimitveProfile, v_aeIndex);
+					// Primitive Profile with primitive "maxByte" to be deleted
+					v_createPrimitiveProfile := m_createPrimitiveProfileDeleteContainerMaxByte({f_getOriginator(v_aeIndex)});
+					v_primitiveProfileIndex := f_cse_createResource(int62, v_createPrimitiveProfile, v_aeIndex);
 					
 					//Create container resource without Primtive Profile ID and no maxByte attribte
 					v_createdContainerResourceIndex := f_cse_createResource(int3, m_createContainerBase, v_aeIndex);
 				
 					//Create container resource with "maxByte" primitive
 					v_requestContainerCreate := f_getCreateRequestPrimitive(int3, m_createContainerMaxByte(100), v_aeIndex);
-					// Link Primitve Prifle created to this Request
+					// Link Primitive Prifle created to this Request
 					v_requestContainerCreate.primitiveProfileIdentifier := f_getResourceId(vc_resourcesList[v_primitiveProfileIndex].resource);
 				
 					f_send(e_mcaPort, m_request(v_requestContainerCreate));
@@ -5114,9 +5129,9 @@ module OneM2M_Testcases_CSE_Release_4 {
 						[] mcaPort.receive(mw_response(mw_responsePrimitive(int2001))) -> value v_response {
 							tc_ac.stop;
 							if(ispresent(v_response.primitive.responsePrimitive.primitiveContent.container.maxByteSize)){
-								setverdict(fail, __SCOPE__ & ": Delete maxByteSize primitive in PrimitveProfile not applied to Container resource!");
+								setverdict(fail, __SCOPE__ & ": Delete maxByteSize primitive in PrimitiveProfile not applied to Container resource!");
 							} else {
-								setverdict(pass, __SCOPE__ & ": Delete maxByteSize primitive value in PrimitveProfile applied correctly to Container resource!");
+								setverdict(pass, __SCOPE__ & ": Delete maxByteSize primitive value in PrimitiveProfile applied correctly to Container resource!");
 							}
 						}
 						[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
@@ -5152,7 +5167,7 @@ module OneM2M_Testcases_CSE_Release_4 {
 													
 				function f_CSE_PP_002_RET() runs on AeSimu system CseSystem {
 					// Local variables
-					var template RequestPrimitive v_createPrimitveProfile;
+					var template RequestPrimitive v_createPrimitiveProfile;
 					var RequestPrimitive v_requestContainerCreate;
 					var integer v_aeIndex := -1;
 					var integer v_primitiveProfileIndex := -1;
@@ -5161,13 +5176,16 @@ module OneM2M_Testcases_CSE_Release_4 {
 					var RequestPrimitive v_retrieveRequest;
 					var template PrimitiveContent v_retriveContentResponse;
 					
-					// Preambleo
+					// Test component configuration
+					f_cf01Up();
+					
+					// Preamble
 					f_cse_createAccessControlPolicyAux(-, -, int63);
 					v_aeIndex := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[vc_acpIndex].resource)}, -);
 					
 					// Primitive Profile with Delete atribute resultContent for container resource.
-					v_createPrimitveProfile := m_createPrimitveProfileDelteResultContent({f_getOriginator(v_aeIndex)});
-					v_primitiveProfileIndex := f_cse_createResource(int62, v_createPrimitveProfile, v_aeIndex);
+					v_createPrimitiveProfile := m_createPrimitiveProfileDelteResultContent({f_getOriginator(v_aeIndex)});
+					v_primitiveProfileIndex := f_cse_createResource(int62, v_createPrimitiveProfile, v_aeIndex);
 					
 					// Set expected container of retrieve request as per Result Content=1, the default value when RC is not present
 					v_retriveContentResponse.container := mw_contentContainer_rc1;
@@ -5178,7 +5196,7 @@ module OneM2M_Testcases_CSE_Release_4 {
 					//Create child Container resource
 					f_cse_createResource(int3, m_createContainerBase, v_aeIndex);
 					
-					//Retrieve container with link to Primitve Profile
+					//Retrieve container with link to Primitive Profile
 					v_retrieveRequest := valueof(m_retrieve(f_getResourceAddress(v_containerParentIndex), f_getOriginator(v_containerParentIndex)));
 					v_requestContainerCreate.primitiveProfileIdentifier := f_getResourceId(vc_resourcesList[v_primitiveProfileIndex].resource);
 					f_send(e_mcaPort, m_request(v_retrieveRequest));
@@ -5226,7 +5244,7 @@ module OneM2M_Testcases_CSE_Release_4 {
 													
 				function f_CSE_PP_002_DEL() runs on AeSimu system CseSystem {
 					// Local variables
-					var template RequestPrimitive v_createPrimitveProfile;
+					var template RequestPrimitive v_createPrimitiveProfile;
 					var integer v_aeIndex := -1;
 					var integer v_primitiveProfileIndex := -1;
 					var integer v_containerIndex := -1;
@@ -5234,13 +5252,16 @@ module OneM2M_Testcases_CSE_Release_4 {
 					var RequestPrimitive v_deleteRequest;
 					var template PrimitiveContent v_deleteContentResponse;
 					
-					// Preambleo
+					// Test component configuration
+					f_cf01Up();
+					
+					// Preamble
 					f_cse_createAccessControlPolicyAux(-, -, int63);
 					v_aeIndex := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[vc_acpIndex].resource)}, -);
 					
 					// Primitive Profile with delete atribute resultContent of content resource.
-					v_createPrimitveProfile := m_createPrimitveProfileDelteResultContent({f_getOriginator(v_aeIndex)});
-					v_primitiveProfileIndex := f_cse_createResource(int62, v_createPrimitveProfile, v_aeIndex);
+					v_createPrimitiveProfile := m_createPrimitiveProfileDelteResultContent({f_getOriginator(v_aeIndex)});
+					v_primitiveProfileIndex := f_cse_createResource(int62, v_createPrimitiveProfile, v_aeIndex);
 					
 					// Set expected container as per Result Content=1
 					v_deleteContentResponse.container := mw_contentContainer_rc1;
@@ -5294,7 +5315,7 @@ module OneM2M_Testcases_CSE_Release_4 {
 													
 				function f_CSE_PP_002_UPD() runs on AeSimu system CseSystem {
 					// Local variables
-					var template RequestPrimitive v_createPrimitveProfile;
+					var template RequestPrimitive v_createPrimitiveProfile;
 					var RequestPrimitive v_requestContainerUpdate;
 					var ResponsePrimitive v_responsePrimitive;
 					var integer v_aeIndex := -1;
@@ -5302,20 +5323,23 @@ module OneM2M_Testcases_CSE_Release_4 {
 					var integer v_createdContainerResourceIndex := -1;
 					var MsgIn v_response;
 					
+					// Test component configuration
+					f_cf01Up();
+					
 					// Preamble
 					f_cse_createAccessControlPolicyAux(-, -, int63);
 					v_aeIndex := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[vc_acpIndex].resource)}, -);
 					
-					// Primitive Profile with primitve "maxByte" to be deleted
-					v_createPrimitveProfile := m_createPrimitveProfileDeleteContainerMaxByte({f_getOriginator(v_aeIndex)});
-					v_primitiveProfileIndex := f_cse_createResource(int62, v_createPrimitveProfile, v_aeIndex);
+					// Primitive Profile with primitive "maxByte" to be deleted
+					v_createPrimitiveProfile := m_createPrimitiveProfileDeleteContainerMaxByte({f_getOriginator(v_aeIndex)});
+					v_primitiveProfileIndex := f_cse_createResource(int62, v_createPrimitiveProfile, v_aeIndex);
 					
 					//Create container resource without Primtive Profile ID and maxByte=100
 					v_createdContainerResourceIndex := f_cse_createResource(int3, m_createContainerMaxByte(100), v_aeIndex);
 				
 					//Update container resource with "maxByte" primitive - nothing to update as it is same as exising resource
 					v_requestContainerUpdate := f_getCreateRequestPrimitive(int3, m_updateContainerMaxByte(100), v_aeIndex);
-					// Link Primitve Prifle created to this Request
+					// Link Primitive Prifle created to this Request
 					v_requestContainerUpdate.primitiveProfileIdentifier := f_getResourceId(vc_resourcesList[v_primitiveProfileIndex].resource);
 				
 					f_send(e_mcaPort, m_request(v_requestContainerUpdate));
@@ -5324,9 +5348,9 @@ module OneM2M_Testcases_CSE_Release_4 {
 						[] mcaPort.receive(mw_response(mw_responsePrimitive(int2001))) -> value v_response {
 							tc_ac.stop;
 							if(ispresent(v_response.primitive.responsePrimitive.primitiveContent.container.maxByteSize)){
-								setverdict(fail, __SCOPE__ & ": Delete of maxByteSize primitive in PrimitveProfile not applied to Container resource!");
+								setverdict(fail, __SCOPE__ & ": Delete of maxByteSize primitive in PrimitiveProfile not applied to Container resource!");
 							} else {
-								setverdict(pass, __SCOPE__ & ": Delete of maxByteSize primitive value in PrimitveProfile applied correctly to Container resource!");
+								setverdict(pass, __SCOPE__ & ": Delete of maxByteSize primitive value in PrimitiveProfile applied correctly to Container resource!");
 							}
 						}
 						[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
@@ -5365,25 +5389,28 @@ module OneM2M_Testcases_CSE_Release_4 {
 													
 				function f_CSE_PP_003_CRE() runs on AeSimu system CseSystem {
 					// Local variables
-					var template RequestPrimitive v_createPrimitveProfile;
+					var template RequestPrimitive v_createPrimitiveProfile;
 					var RequestPrimitive v_requestContainerCreate;
 					var ResponsePrimitive v_responsePrimitive;
 					var integer v_aeIndex := -1;
 					var integer v_primitiveProfileIndex := -1;
 					var MsgIn v_response;
 					
-					// Preambleo
+					// Test component configuration
+					f_cf01Up();
+					
+					// Preamble
 					f_cse_createAccessControlPolicyAux(-, -, int63);
 					v_aeIndex := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[vc_acpIndex].resource)}, -);
 					
 					// Primitive Profile with add atribute "maxByte" = "100" for content resource.
-					v_createPrimitveProfile := m_createPrimitveProfileAddContainerMaxByte100({f_getOriginator(v_aeIndex)});
-					v_primitiveProfileIndex := f_cse_createResource(int62, v_createPrimitveProfile, v_aeIndex);
+					v_createPrimitiveProfile := m_createPrimitiveProfileAddContainerMaxByte100({f_getOriginator(v_aeIndex)});
+					v_primitiveProfileIndex := f_cse_createResource(int62, v_createPrimitiveProfile, v_aeIndex);
 				
 					//Create container resource with "maxByte"=1000 primitive
 					v_requestContainerCreate := f_getCreateRequestPrimitive(int3, m_createContainerMaxByte(1000), v_aeIndex);
 					
-					// Link Primitve Prifle created to this Request
+					// Link Primitive Prifle created to this Request
 					v_requestContainerCreate.primitiveProfileIdentifier := f_getResourceId(vc_resourcesList[v_primitiveProfileIndex].resource);
 				
 					f_send(e_mcaPort, m_request(v_requestContainerCreate));
@@ -5430,7 +5457,7 @@ module OneM2M_Testcases_CSE_Release_4 {
 													
 				function f_CSE_PP_003_RET() runs on AeSimu system CseSystem {
 					// Local variables
-					var template RequestPrimitive v_createPrimitveProfile;
+					var template RequestPrimitive v_createPrimitiveProfile;
 					var RequestPrimitive v_requestContainerCreate;
 					var integer v_aeIndex := -1;
 					var integer v_primitiveProfileIndex := -1;
@@ -5439,13 +5466,16 @@ module OneM2M_Testcases_CSE_Release_4 {
 					var RequestPrimitive v_retrieveRequest;
 					var template PrimitiveContent v_retriveContentResponse;
 					
-					// Preambleo
+					// Test component configuration
+					f_cf01Up();
+					
+					// Preamble
 					f_cse_createAccessControlPolicyAux(-, -, int63);
 					v_aeIndex := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[vc_acpIndex].resource)}, -);
 					
 					// Primitive Profile with Add atribute resultContent for container resource.
-					v_createPrimitveProfile := m_createPrimitveProfileAddResultContentTo4({f_getOriginator(v_aeIndex)});
-					v_primitiveProfileIndex := f_cse_createResource(int62, v_createPrimitveProfile, v_aeIndex);
+					v_createPrimitiveProfile := m_createPrimitiveProfileAddResultContentTo4({f_getOriginator(v_aeIndex)});
+					v_primitiveProfileIndex := f_cse_createResource(int62, v_createPrimitiveProfile, v_aeIndex);
 					
 					// Set expected container of retrieve request as per Result Content=1, the default value when RC is not present
 					v_retriveContentResponse.container := mw_contentContainer_rc4;
@@ -5456,7 +5486,7 @@ module OneM2M_Testcases_CSE_Release_4 {
 					//Create child Container resource
 					f_cse_createResource(int3, m_createContainerBase, v_aeIndex);
 					
-					//Retrieve container with link to Primitve Profile
+					//Retrieve container with link to Primitive Profile
 					v_retrieveRequest := valueof(m_retrieve(f_getResourceAddress(v_containerParentIndex), f_getOriginator(v_containerParentIndex)));
 					v_requestContainerCreate.primitiveProfileIdentifier := f_getResourceId(vc_resourcesList[v_primitiveProfileIndex].resource);
 					v_requestContainerCreate.resultContent := int1; // only attriubutes
@@ -5507,7 +5537,7 @@ module OneM2M_Testcases_CSE_Release_4 {
 													
 				function f_CSE_PP_003_DEL() runs on AeSimu system CseSystem {
 					// Local variables
-					var template RequestPrimitive v_createPrimitveProfile;
+					var template RequestPrimitive v_createPrimitiveProfile;
 					var integer v_aeIndex := -1;
 					var integer v_primitiveProfileIndex := -1;
 					var MsgIn v_response;
@@ -5515,13 +5545,16 @@ module OneM2M_Testcases_CSE_Release_4 {
 					var template PrimitiveContent v_deleteContentResponse;
 					var integer v_containerParentIndex := -1;
 					
-					// Preambleo
+					// Test component configuration
+					f_cf01Up();
+					
+					// Preamble
 					f_cse_createAccessControlPolicyAux(-, -, int63);
 					v_aeIndex := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[vc_acpIndex].resource)}, -);
 					
 					// Primitive Profile with Add atribute resultContent=1 for container resource.
-					v_createPrimitveProfile := m_createPrimitveProfileAddResultContentTo1({f_getOriginator(v_aeIndex)});
-					v_primitiveProfileIndex := f_cse_createResource(int62, v_createPrimitveProfile, v_aeIndex);
+					v_createPrimitiveProfile := m_createPrimitiveProfileAddResultContentTo1({f_getOriginator(v_aeIndex)});
+					v_primitiveProfileIndex := f_cse_createResource(int62, v_createPrimitiveProfile, v_aeIndex);
 					
 					// Set expected container as per Result Content=1
 					v_deleteContentResponse.container := mw_contentContainer_rc1;
@@ -5583,7 +5616,7 @@ module OneM2M_Testcases_CSE_Release_4 {
 													
 				function f_CSE_PP_003_UPD() runs on AeSimu system CseSystem {
 					// Local variables
-					var template RequestPrimitive v_createPrimitveProfile;
+					var template RequestPrimitive v_createPrimitiveProfile;
 					var RequestPrimitive v_updateContainer;
 					var ResponsePrimitive v_responsePrimitive;
 					var integer v_aeIndex := -1;
@@ -5591,13 +5624,16 @@ module OneM2M_Testcases_CSE_Release_4 {
 					var integer v_createdContainerResource := -1;
 					var MsgIn v_response;
 					
+					// Test component configuration
+					f_cf01Up();
+					
 					// Preamble
 					f_cse_createAccessControlPolicyAux(-, -, int63);
 					v_aeIndex := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[vc_acpIndex].resource)}, -);
 					
 					// Primitive Profile with add atribute "maxByte" = "100" for content resource.
-					v_createPrimitveProfile := m_createPrimitveProfileAddContainerMaxByte100({f_getOriginator(v_aeIndex)});
-					v_primitiveProfileIndex := f_cse_createResource(int62, v_createPrimitveProfile, v_aeIndex);
+					v_createPrimitiveProfile := m_createPrimitiveProfileAddContainerMaxByte100({f_getOriginator(v_aeIndex)});
+					v_primitiveProfileIndex := f_cse_createResource(int62, v_createPrimitiveProfile, v_aeIndex);
 				
 					//Create container resource with maxByte=1000 attribte
 					v_createdContainerResource := f_cse_createResource(int3, m_createContainerMaxByte(1000), v_aeIndex);
@@ -5605,7 +5641,7 @@ module OneM2M_Testcases_CSE_Release_4 {
 					//Update container request with maxByte=2000 and link to Primitive Profile
 					v_updateContainer:= f_getUpdateRequestPrimitive(int3, v_aeIndex, m_updateContainerMaxByte(2000));
 
-					// Link Primitve Prifle created to this Request
+					// Link Primitive Prifle created to this Request
 					v_updateContainer.primitiveProfileIdentifier := f_getResourceId(vc_resourcesList[v_primitiveProfileIndex].resource);
 				
 					f_send(e_mcaPort, m_request(v_updateContainer));
@@ -5613,11 +5649,11 @@ module OneM2M_Testcases_CSE_Release_4 {
 					alt {
 						[] mcaPort.receive(mw_response(mw_responsePrimitive(int2001))) -> value v_response {
 							tc_ac.stop;
-							// Check that IUT applied the Primitve Profile
+							// Check that IUT applied the Primitive Profile
 						  	if(v_response.primitive.responsePrimitive.primitiveContent.container.maxByteSize == 100){
-						  		setverdict(pass, __SCOPE__ & ": maxByteSize primitive value in PrimitveProfile is updated correctly to Update Container Request!");
+						  		setverdict(pass, __SCOPE__ & ": maxByteSize primitive value in PrimitiveProfile is updated correctly to Update Container Request!");
 						    } else {
-								setverdict(fail, __SCOPE__ & ": maxByteSize primitive value in PrimitveProfile is not updated to Update Container Request!");
+								setverdict(fail, __SCOPE__ & ": maxByteSize primitive value in PrimitiveProfile is not updated to Update Container Request!");
 							}
 						}
 						[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
@@ -5656,27 +5692,30 @@ module OneM2M_Testcases_CSE_Release_4 {
 													
 				function f_CSE_PP_004_CRE() runs on AeSimu system CseSystem {
 					// Local variables
-					var template RequestPrimitive v_createPrimitveProfile;
+					var template RequestPrimitive v_createPrimitiveProfile;
 					var RequestPrimitive v_requestContainerCreate;
 					var ResponsePrimitive v_responsePrimitive;
 					var integer v_aeIndex := -1;
 					var integer v_primitiveProfileIndex := -1;
 					var MsgIn v_response;
 					
-					// Preambleo
+					// Test component configuration
+					f_cf01Up();
+					
+					// Preamble
 					f_cse_createAccessControlPolicyAux(-, -, int63);
 					v_aeIndex := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[vc_acpIndex].resource)}, -);
 					
 					// Primitive Profile with add atribute "maxByte" = "100" for content resource.
-					v_createPrimitveProfile := m_createPrimitveProfileAddContainerMaxByte100({f_getOriginator(v_aeIndex)});
-					v_primitiveProfileIndex := f_cse_createResource(int62, v_createPrimitveProfile, v_aeIndex);
+					v_createPrimitiveProfile := m_createPrimitiveProfileAddContainerMaxByte100({f_getOriginator(v_aeIndex)});
+					v_primitiveProfileIndex := f_cse_createResource(int62, v_createPrimitiveProfile, v_aeIndex);
 
 					// Delete the Primitive Profile
 					f_cse_deleteResource(v_primitiveProfileIndex);
 				
 					//Create container resource without "maxByte" primitive
 					v_requestContainerCreate := f_getCreateRequestPrimitive(int3, m_createContainerBase, v_aeIndex);
-					// Link Primitve Prifle, which was deleted, to this Request
+					// Link Primitive Prifle, which was deleted, to this Request
 					v_requestContainerCreate.primitiveProfileIdentifier := f_getResourceId(vc_resourcesList[v_primitiveProfileIndex].resource);
 				
 					f_send(e_mcaPort, m_request(v_requestContainerCreate));
@@ -5689,9 +5728,9 @@ module OneM2M_Testcases_CSE_Release_4 {
 							// Commented out utnil TP is frozen - reject or accept.
 							/*
 							if(v_response.primitive.responsePrimitive.primitiveContent.container.maxByteSize == 100){
-								setverdict(fail, __SCOPE__ & ": maxByteSize primitive value in invalid PrimitveProfile applied to Create Container Request!");
+								setverdict(fail, __SCOPE__ & ": maxByteSize primitive value in invalid PrimitiveProfile applied to Create Container Request!");
 							} else {
-								setverdict(pass, __SCOPE__ & ": maxByteSize primitive value in invalid PrimitveProfile not applied to Create Container Request!");
+								setverdict(pass, __SCOPE__ & ": maxByteSize primitive value in invalid PrimitiveProfile not applied to Create Container Request!");
 							} */
 						}
 						[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) {
@@ -5727,7 +5766,7 @@ module OneM2M_Testcases_CSE_Release_4 {
 													
 				function f_CSE_PP_004_RET() runs on AeSimu system CseSystem {
 					// Local variables
-					var template RequestPrimitive v_createPrimitveProfile;
+					var template RequestPrimitive v_createPrimitiveProfile;
 					var RequestPrimitive v_requestContainerCreate;
 					var integer v_aeIndex := -1;
 					var integer v_primitiveProfileIndex := -1;
@@ -5736,13 +5775,16 @@ module OneM2M_Testcases_CSE_Release_4 {
 					var RequestPrimitive v_retrieveRequest;
 					var template PrimitiveContent v_retriveContentResponse;
 					
-					// Preambleo
+					// Test component configuration
+					f_cf01Up();
+					
+					// Preamble
 					f_cse_createAccessControlPolicyAux(-, -, int63);
 					v_aeIndex := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[vc_acpIndex].resource)}, -);
 					
 					// Primitive Profile with Add atribute resultContent for container resource.
-					v_createPrimitveProfile := m_createPrimitveProfileAddResultContentTo4({f_getOriginator(v_aeIndex)});
-					v_primitiveProfileIndex := f_cse_createResource(int62, v_createPrimitveProfile, v_aeIndex);
+					v_createPrimitiveProfile := m_createPrimitiveProfileAddResultContentTo4({f_getOriginator(v_aeIndex)});
+					v_primitiveProfileIndex := f_cse_createResource(int62, v_createPrimitiveProfile, v_aeIndex);
 					
 					//Create Container resource
 					v_containerParentIndex := f_cse_createResource(int3, m_createContainerBase, v_aeIndex);
@@ -5754,7 +5796,7 @@ module OneM2M_Testcases_CSE_Release_4 {
 					// Delete the Primitive Profile
 					f_cse_deleteResource(v_primitiveProfileIndex);
 					
-					//Retrieve container with link to Primitve Profile
+					//Retrieve container with link to Primitive Profile
 					v_retrieveRequest := valueof(m_retrieve(f_getResourceAddress(v_containerParentIndex), f_getOriginator(v_containerParentIndex)));
 					v_requestContainerCreate.primitiveProfileIdentifier := f_getResourceId(vc_resourcesList[v_primitiveProfileIndex].resource);
 					v_requestContainerCreate.resultContent := int1; // only attriubutes
@@ -5810,20 +5852,23 @@ module OneM2M_Testcases_CSE_Release_4 {
 													
 				function f_CSE_PP_004_DEL() runs on AeSimu system CseSystem {
 					// Local variables
-					var template RequestPrimitive v_createPrimitveProfile;
+					var template RequestPrimitive v_createPrimitiveProfile;
 					var integer v_aeIndex := -1;
 					var integer v_primitiveProfileIndex := -1;
 					var integer v_containerIndex := -1;
 					var MsgIn v_response;
 					var RequestPrimitive v_deleteRequest;
 					
-					// Preambleo
+					// Test component configuration
+					f_cf01Up();
+					
+					// Preamble
 					f_cse_createAccessControlPolicyAux(-, -, int63);
 					v_aeIndex := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[vc_acpIndex].resource)}, -);
 					
 					// Primitive Profile with Add atribute resultContent=1 for container resource.
-					v_createPrimitveProfile := m_createPrimitveProfileAddResultContentTo1({f_getOriginator(v_aeIndex)});
-					v_primitiveProfileIndex := f_cse_createResource(int62, v_createPrimitveProfile, v_aeIndex);
+					v_createPrimitiveProfile := m_createPrimitiveProfileAddResultContentTo1({f_getOriginator(v_aeIndex)});
+					v_primitiveProfileIndex := f_cse_createResource(int62, v_createPrimitiveProfile, v_aeIndex);
 					
 					// Delete the Primitive Profile
 					f_cse_deleteResource(v_primitiveProfileIndex);
@@ -5883,7 +5928,7 @@ module OneM2M_Testcases_CSE_Release_4 {
 													
 				function f_CSE_PP_004_UPD() runs on AeSimu system CseSystem {
 					// Local variables
-					var template RequestPrimitive v_createPrimitveProfile;
+					var template RequestPrimitive v_createPrimitiveProfile;
 					var RequestPrimitive v_updateContainer;
 					var ResponsePrimitive v_responsePrimitive;
 					var integer v_aeIndex := -1;
@@ -5891,13 +5936,16 @@ module OneM2M_Testcases_CSE_Release_4 {
 					var integer v_createdContainerResource := -1;
 					var MsgIn v_response;
 					
+					// Test component configuration
+					f_cf01Up();
+					
 					// Preamble
 					f_cse_createAccessControlPolicyAux(-, -, int63);
 					v_aeIndex := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[vc_acpIndex].resource)}, -);
 					
 					// Primitive Profile with add atribute "maxByte" = "100" for content resource.
-					v_createPrimitveProfile := m_createPrimitveProfileAddContainerMaxByte100({f_getOriginator(v_aeIndex)});
-					v_primitiveProfileIndex := f_cse_createResource(int62, v_createPrimitveProfile, v_aeIndex);
+					v_createPrimitiveProfile := m_createPrimitiveProfileAddContainerMaxByte100({f_getOriginator(v_aeIndex)});
+					v_primitiveProfileIndex := f_cse_createResource(int62, v_createPrimitiveProfile, v_aeIndex);
 					
 					// Delete the Primitive Profile
 					f_cse_deleteResource(v_primitiveProfileIndex);
@@ -5908,7 +5956,7 @@ module OneM2M_Testcases_CSE_Release_4 {
 					//Update container request with Primitive Profile ID, and not including update for maxByte
 					v_updateContainer:= f_getUpdateRequestPrimitive(int3, v_aeIndex, m_updateContainerBase);
 
-					// Link Primitve Prifle created to this Request
+					// Link Primitive Prifle created to this Request
 					v_updateContainer.primitiveProfileIdentifier := f_getResourceId(vc_resourcesList[v_primitiveProfileIndex].resource);
 				
 					f_send(e_mcaPort, m_request(v_updateContainer));
@@ -5918,11 +5966,11 @@ module OneM2M_Testcases_CSE_Release_4 {
 						/* commented out until TP is frozen-reject/accept
 						[] mcaPort.receive(mw_response(mw_responsePrimitive(int2001))) -> value v_response {
 							tc_ac.stop;
-							// Check that IUT applied the Primitve Profile
+							// Check that IUT applied the Primitive Profile
 							if(v_response.primitive.responsePrimitive.primitiveContent.container.maxByteSize == 100){
-								setverdict(fail, __SCOPE__ & ": maxByteSize primitive value in invalid PrimitveProfile applied  to Update Container Request!");
+								setverdict(fail, __SCOPE__ & ": maxByteSize primitive value in invalid PrimitiveProfile applied  to Update Container Request!");
 							} else {
-								setverdict(pass, __SCOPE__ & ": maxByteSize primitive value in invalid PrimitveProfile not applied to Update Container Request!");
+								setverdict(pass, __SCOPE__ & ": maxByteSize primitive value in invalid PrimitiveProfile not applied to Update Container Request!");
 							}
 						} */
 						[] mcaPort.receive(mw_response(mw_responsePrimitive(int4102))) -> value v_response {
@@ -5964,26 +6012,29 @@ module OneM2M_Testcases_CSE_Release_4 {
 													
 				function f_CSE_PP_005_CRE() runs on AeSimu system CseSystem {
 					// Local variables
-					var template RequestPrimitive v_createPrimitveProfile;
+					var template RequestPrimitive v_createPrimitiveProfile;
 					var RequestPrimitive v_requestContainerCreate;
 					var ResponsePrimitive v_responsePrimitive;
 					var integer v_aeIndex := -1;
 					var integer v_primitiveProfileIndex := -1;
 					var MsgIn v_response;
 					
+					// Test component configuration
+					f_cf01Up();
+					
 					// Preamble 
 					f_cse_createAccessControlPolicyAux(-, -, int61);//c_CUDNDi) //No resource retrieval privilege		
 					v_aeIndex := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[vc_acpIndex].resource)}, -);
 					
 					// Primitive Profile with add atribute "maxByte" = "100" for content resource.
-					v_createPrimitveProfile := m_createPrimitveProfileAddContainerMaxByte100({f_getOriginator(v_aeIndex)});
-					v_primitiveProfileIndex := f_cse_createResource(int62, v_createPrimitveProfile, v_aeIndex);
+					v_createPrimitiveProfile := m_createPrimitiveProfileAddContainerMaxByte100({f_getOriginator(v_aeIndex)});
+					v_primitiveProfileIndex := f_cse_createResource(int62, v_createPrimitiveProfile, v_aeIndex);
 
 
 				
 					//Create container resource without "maxByte" primitive
 					v_requestContainerCreate := f_getCreateRequestPrimitive(int3, m_createContainerBase, v_aeIndex);
-					// Link Primitve Prifle, which was created, to this Request
+					// Link Primitive Prifle, which was created, to this Request
 					v_requestContainerCreate.primitiveProfileIdentifier := f_getResourceId(vc_resourcesList[v_primitiveProfileIndex].resource);
 				
 					f_send(e_mcaPort, m_request(v_requestContainerCreate));
@@ -6027,7 +6078,7 @@ module OneM2M_Testcases_CSE_Release_4 {
 													
 				function f_CSE_PP_005_RET() runs on AeSimu system CseSystem {
 					// Local variables
-					var template RequestPrimitive v_createPrimitveProfile;
+					var template RequestPrimitive v_createPrimitiveProfile;
 					var RequestPrimitive v_requestContainerCreate;
 					var integer v_aeIndex := -1;
 					var integer v_primitiveProfileIndex := -1;
@@ -6036,13 +6087,16 @@ module OneM2M_Testcases_CSE_Release_4 {
 					var RequestPrimitive v_retrieveRequest;
 					var template PrimitiveContent v_retriveContentResponse;
 					
+					// Test component configuration
+					f_cf01Up();
+					
 					// Preamble 
 					f_cse_createAccessControlPolicyAux(-, -, int61);//c_CUDNDi) //No resource retrieval privilege		
 					v_aeIndex := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[vc_acpIndex].resource)}, -);
 
 					// Primitive Profile with Add atribute resultContent for container resource.
-					v_createPrimitveProfile := m_createPrimitveProfileAddResultContentTo4({f_getOriginator(v_aeIndex)});
-					v_primitiveProfileIndex := f_cse_createResource(int62, v_createPrimitveProfile, v_aeIndex);
+					v_createPrimitiveProfile := m_createPrimitiveProfileAddResultContentTo4({f_getOriginator(v_aeIndex)});
+					v_primitiveProfileIndex := f_cse_createResource(int62, v_createPrimitiveProfile, v_aeIndex);
 					
 					//Create Container resource
 					v_containerParentIndex := f_cse_createResource(int3, m_createContainerBase, v_aeIndex);
@@ -6050,7 +6104,7 @@ module OneM2M_Testcases_CSE_Release_4 {
 					//Create child Container resource
 					f_cse_createResource(int3, m_createContainerBase, v_aeIndex);
 					
-					//Retrieve container with link to Primitve Profile
+					//Retrieve container with link to Primitive Profile
 					v_retrieveRequest := valueof(m_retrieve(f_getResourceAddress(v_containerParentIndex), f_getOriginator(v_containerParentIndex)));
 					v_requestContainerCreate.primitiveProfileIdentifier := f_getResourceId(vc_resourcesList[v_primitiveProfileIndex].resource);
 					v_requestContainerCreate.resultContent := int1; // only attriubutes
@@ -6109,20 +6163,23 @@ module OneM2M_Testcases_CSE_Release_4 {
 													
 				function f_CSE_PP_005_DEL() runs on AeSimu system CseSystem {
 					// Local variables
-					var template RequestPrimitive v_createPrimitveProfile;
+					var template RequestPrimitive v_createPrimitiveProfile;
 					var integer v_aeIndex := -1;
 					var integer v_primitiveProfileIndex := -1;
 					var integer v_containerIndex := -1;
 					var MsgIn v_response;
 					var RequestPrimitive v_deleteRequest;
 					
+					// Test component configuration
+					f_cf01Up();
+					
 					// Preamble 
 					f_cse_createAccessControlPolicyAux(-, -, int61);//c_CUDNDi) //No resource retrieval privilege		
 					v_aeIndex := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[vc_acpIndex].resource)}, -);
 					
 					// Primitive Profile with Add atribute resultContent=1 for container resource.
-					v_createPrimitveProfile := m_createPrimitveProfileAddResultContentTo1({f_getOriginator(v_aeIndex)});
-					v_primitiveProfileIndex := f_cse_createResource(int62, v_createPrimitveProfile, v_aeIndex);
+					v_createPrimitiveProfile := m_createPrimitiveProfileAddResultContentTo1({f_getOriginator(v_aeIndex)});
+					v_primitiveProfileIndex := f_cse_createResource(int62, v_createPrimitiveProfile, v_aeIndex);
 					
 					//Create Container resource
 					v_containerIndex := f_cse_createResource(int3, m_createContainerBase, v_aeIndex);
@@ -6180,7 +6237,7 @@ module OneM2M_Testcases_CSE_Release_4 {
 													
 				function f_CSE_PP_005_UPD() runs on AeSimu system CseSystem {
 					// Local variables
-					var template RequestPrimitive v_createPrimitveProfile;
+					var template RequestPrimitive v_createPrimitiveProfile;
 					var RequestPrimitive v_updateContainer;
 					var ResponsePrimitive v_responsePrimitive;
 					var integer v_aeIndex := -1;
@@ -6188,13 +6245,16 @@ module OneM2M_Testcases_CSE_Release_4 {
 					var integer v_createdContainerResource := -1;
 					var MsgIn v_response;
 					
+					// Test component configuration
+					f_cf01Up();
+					
 					// Preamble 
 					f_cse_createAccessControlPolicyAux(-, -, int61);//c_CUDNDi) //No resource retrieval privilege		
 					v_aeIndex := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[vc_acpIndex].resource)}, -);
 					
 					// Primitive Profile with add atribute "maxByte" = "100" for content resource.
-					v_createPrimitveProfile := m_createPrimitveProfileAddContainerMaxByte100({f_getOriginator(v_aeIndex)});
-					v_primitiveProfileIndex := f_cse_createResource(int62, v_createPrimitveProfile, v_aeIndex);
+					v_createPrimitiveProfile := m_createPrimitiveProfileAddContainerMaxByte100({f_getOriginator(v_aeIndex)});
+					v_primitiveProfileIndex := f_cse_createResource(int62, v_createPrimitiveProfile, v_aeIndex);
 					
 				
 					//Create container resource without Primtive Profile ID and no maxByte attribte
@@ -6203,7 +6263,7 @@ module OneM2M_Testcases_CSE_Release_4 {
 					//Update container request with Primitive Profile ID, and not including update for maxByte
 					v_updateContainer:= f_getUpdateRequestPrimitive(int3, v_aeIndex, m_updateContainerBase);
 
-					// Link Primitve Prifle created to this Request
+					// Link Primitive Prifle created to this Request
 					v_updateContainer.primitiveProfileIdentifier := f_getResourceId(vc_resourcesList[v_primitiveProfileIndex].resource);
 				
 					f_send(e_mcaPort, m_request(v_updateContainer));
@@ -6213,11 +6273,11 @@ module OneM2M_Testcases_CSE_Release_4 {
 						/* commented out until TP is frozen-reject/accept
 						[] mcaPort.receive(mw_response(mw_responsePrimitive(int2001))) -> value v_response {
 							tc_ac.stop;
-							// Check that IUT applied the Primitve Profile
+							// Check that IUT applied the Primitive Profile
 							if(v_response.primitive.responsePrimitive.primitiveContent.container.maxByteSize == 100){
-								setverdict(fail, __SCOPE__ & ": maxByteSize primitive value in invalid PrimitveProfile applied  to Update Container Request!");
+								setverdict(fail, __SCOPE__ & ": maxByteSize primitive value in invalid PrimitiveProfile applied  to Update Container Request!");
 							} else {
-								setverdict(pass, __SCOPE__ & ": maxByteSize primitive value in invalid PrimitveProfile not applied to Update Container Request!");
+								setverdict(pass, __SCOPE__ & ": maxByteSize primitive value in invalid PrimitiveProfile not applied to Update Container Request!");
 							}
 						} */
 						[] mcaPort.receive(mw_response(mw_responsePrimitive(int4136))) -> value v_response {
@@ -6263,19 +6323,22 @@ module OneM2M_Testcases_CSE_Release_4 {
 													
 				function f_CSE_PP_006_CRE() runs on AeSimu system CseSystem {
 					// Local variables
-					var template RequestPrimitive v_createPrimitveProfile;
+					var template RequestPrimitive v_createPrimitiveProfile;
 					var RequestPrimitive v_request;
 					var integer v_aeIndex := -1;
 					var integer v_primitiveProfileIndex := -1;
 					var MsgIn v_response;
 					
-					// Preambleo
+					// Test component configuration
+					f_cf01Up();
+					
+					// Preamble
 					f_cse_createAccessControlPolicyAux(-, -, int63);
 					v_aeIndex := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[vc_acpIndex].resource)}, -);
 					
 					// Primitive Profile with add atribute "maxByte" = "100" for content resource.
-					v_createPrimitveProfile := m_createPrimitveProfileAddContainerMaxByte100({f_getOriginator(v_aeIndex)});
-					v_primitiveProfileIndex := f_cse_createResource(int62, v_createPrimitveProfile, v_aeIndex);
+					v_createPrimitiveProfile := m_createPrimitiveProfileAddContainerMaxByte100({f_getOriginator(v_aeIndex)});
+					v_primitiveProfileIndex := f_cse_createResource(int62, v_createPrimitiveProfile, v_aeIndex);
 				
 				    //Create ACP with link to Primitive Profile created
 				    v_request := valueof(m_createAcp(omit, -, int63));
@@ -6321,25 +6384,28 @@ module OneM2M_Testcases_CSE_Release_4 {
 													
 				function f_CSE_PP_006_RET() runs on AeSimu system CseSystem {
 					// Local variables
-					var template RequestPrimitive v_createPrimitveProfile;
+					var template RequestPrimitive v_createPrimitiveProfile;
 					var integer v_aeIndex := -1;
 					var integer v_primitiveProfileIndex := -1;
 					var integer v_acpResourceIndex := -1;
 					var MsgIn v_response;
 					var RequestPrimitive v_retrieveRequest;
 					
-					// Preambleo
+					// Test component configuration
+					f_cf01Up();
+					
+					// Preamble
 					f_cse_createAccessControlPolicyAux(-, -, int63);
 					v_aeIndex := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[vc_acpIndex].resource)}, -);
 					
 					// Primitive Profile with add atribute "maxByte" = "100" for content resource.
-					v_createPrimitveProfile := m_createPrimitveProfileAddContainerMaxByte100({f_getOriginator(v_aeIndex)});
-					v_primitiveProfileIndex := f_cse_createResource(int62, v_createPrimitveProfile, v_aeIndex);
+					v_createPrimitiveProfile := m_createPrimitiveProfileAddContainerMaxByte100({f_getOriginator(v_aeIndex)});
+					v_primitiveProfileIndex := f_cse_createResource(int62, v_createPrimitiveProfile, v_aeIndex);
 				
 					//Create ACP with link to Primitive Profile created
 					v_acpResourceIndex := f_cse_createResource(int1, m_createAcpBase, v_aeIndex);
 					
-					//Retrieve ACP resource with link to Primitve Profile
+					//Retrieve ACP resource with link to Primitive Profile
 					v_retrieveRequest := valueof(m_retrieve(f_getResourceAddress(v_acpResourceIndex), f_getOriginator(v_acpResourceIndex)));
 					v_retrieveRequest.primitiveProfileIdentifier := f_getResourceId(vc_resourcesList[v_primitiveProfileIndex].resource);
 					f_send(e_mcaPort, m_request(v_retrieveRequest));
@@ -6382,20 +6448,23 @@ module OneM2M_Testcases_CSE_Release_4 {
 													
 				function f_CSE_PP_006_DEL() runs on AeSimu system CseSystem {
 					// Local variables
-					var template RequestPrimitive v_createPrimitveProfile;
+					var template RequestPrimitive v_createPrimitiveProfile;
 					var integer v_aeIndex := -1;
 					var integer v_primitiveProfileIndex := -1;
 					var integer v_acpResourceIndex := -1;
 					var MsgIn v_response;
 					var RequestPrimitive v_deleteRequest;
 					
-					// Preambleo
+					// Test component configuration
+					f_cf01Up();
+					
+					// Preamble
 					f_cse_createAccessControlPolicyAux(-, -, int63);
 					v_aeIndex := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[vc_acpIndex].resource)}, -);
 					
 					// Primitive Profile with add atribute "maxByte" = "100" for content resource.
-					v_createPrimitveProfile := m_createPrimitveProfileAddContainerMaxByte100({f_getOriginator(v_aeIndex)});
-					v_primitiveProfileIndex := f_cse_createResource(int62, v_createPrimitveProfile, v_aeIndex);
+					v_createPrimitiveProfile := m_createPrimitiveProfileAddContainerMaxByte100({f_getOriginator(v_aeIndex)});
+					v_primitiveProfileIndex := f_cse_createResource(int62, v_createPrimitiveProfile, v_aeIndex);
 				
 					//Create ACP
 					v_acpResourceIndex := f_cse_createResource(int1, m_createAcpBase, v_aeIndex);
@@ -6444,20 +6513,23 @@ module OneM2M_Testcases_CSE_Release_4 {
 													
 				function f_CSE_PP_006_UPD() runs on AeSimu system CseSystem {
 					// Local variables
-					var template RequestPrimitive v_createPrimitveProfile;
+					var template RequestPrimitive v_createPrimitiveProfile;
 					var integer v_aeIndex := -1;
 					var integer v_primitiveProfileIndex := -1;
 					var integer v_acpResourceIndex := -1;
 					var MsgIn v_response;
 					var RequestPrimitive v_updateAcpRequest;
 					
+					// Test component configuration
+					f_cf01Up();
+					
 					// Preamble
 					f_cse_createAccessControlPolicyAux(-, -, int63);
 					v_aeIndex := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[vc_acpIndex].resource)}, -);
 					
 					// Primitive Profile with add atribute "maxByte" = "100" for content resource.
-					v_createPrimitveProfile := m_createPrimitveProfileAddContainerMaxByte100({f_getOriginator(v_aeIndex)});
-					v_primitiveProfileIndex := f_cse_createResource(int62, v_createPrimitveProfile, v_aeIndex);
+					v_createPrimitiveProfile := m_createPrimitiveProfileAddContainerMaxByte100({f_getOriginator(v_aeIndex)});
+					v_primitiveProfileIndex := f_cse_createResource(int62, v_createPrimitiveProfile, v_aeIndex);
 					
 				
 					//Create ACP resource
@@ -6467,7 +6539,7 @@ module OneM2M_Testcases_CSE_Release_4 {
 					v_updateAcpRequest := f_getUpdateRequestPrimitive(int1, v_aeIndex, m_updateAcpBase);
 					v_updateAcpRequest.primitiveContent.accessControlPolicy.labels := {"VALUE_1"};
 
-					// Link Primitve Prifle created to non matching Primitive Profile
+					// Link Primitive Prifle created to non matching Primitive Profile
 					v_updateAcpRequest.primitiveProfileIdentifier := f_getResourceId(vc_resourcesList[v_primitiveProfileIndex].resource);
 				
 					f_send(e_mcaPort, m_request(v_updateAcpRequest));
@@ -6511,7 +6583,7 @@ module OneM2M_Testcases_CSE_Release_4 {
 													
 			function f_CSE_PP_007() runs on AeSimu system CseSystem {
 				// Local variables
-				var RequestPrimitive v_createPrimitveProfile;
+				var RequestPrimitive v_createPrimitiveProfile;
 				var RequestPrimitive v_updateContainer;
 				var ResponsePrimitive v_responsePrimitive;
 				var integer v_aeIndex := -1;
@@ -6520,19 +6592,22 @@ module OneM2M_Testcases_CSE_Release_4 {
 				var MsgIn v_response;
 				var RequestPrimitive v_updateAcpRequest;
 					
+				// Test component configuration
+				f_cf01Up();
+					
 				// Preamble
 				f_cse_createAccessControlPolicyAux(-, -, int63);
 				v_aeIndex := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[vc_acpIndex].resource)}, -);
 					
 				// Primitive Profile With Invalid Additions Or Deletions attribute
-				v_createPrimitveProfile := valueof(m_createPrimitveProfileWithInvalidAdditionsOrDeletions({f_getOriginator(v_aeIndex)}));
+				v_createPrimitiveProfile := valueof(m_createPrimitiveProfileWithInvalidAdditionsOrDeletions({f_getOriginator(v_aeIndex)}));
 				
-				f_send(e_mcaPort, m_request(v_createPrimitveProfile));
+				f_send(e_mcaPort, m_request(v_createPrimitiveProfile));
 				tc_ac.start;
 				alt {
 					[] mcaPort.receive(mw_response(mw_responsePrimitive(int4137))) -> value v_response {
 						tc_ac.stop;
-						setverdict(pass, __SCOPE__ & ": IUT rejected Primitve Profile with PRIMITIVE_PROFILE_BAD REQUEST");
+						setverdict(pass, __SCOPE__ & ": IUT rejected Primitive Profile with PRIMITIVE_PROFILE_BAD REQUEST");
 					}
 					[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) {
 						tc_ac.stop;
@@ -6540,7 +6615,7 @@ module OneM2M_Testcases_CSE_Release_4 {
 					}
 					[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
 						tc_ac.stop;
-						setverdict(fail, __SCOPE__ & ": IUT accepted Primitve Profile with invalid parametres/attributes in additions/deletions!");
+						setverdict(fail, __SCOPE__ & ": IUT accepted Primitive Profile with invalid parametres/attributes in additions/deletions!");
 					}
 					[] tc_ac.timeout {
 						setverdict(fail, __SCOPE__ & ": No answer from IUT for the last Request!");
@@ -6568,19 +6643,22 @@ module OneM2M_Testcases_CSE_Release_4 {
 													
 			function f_CSE_PP_008() runs on AeSimu system CseSystem {
 				// Local variables
-				var template RequestPrimitive v_createPrimitveProfile;
+				var template RequestPrimitive v_createPrimitiveProfile;
 				var integer v_aeIndex := -1;
 				var integer v_primitiveProfileIndex := -1;
 				var MsgIn v_response;
 				var RequestPrimitive v_updatePrimitiveProfileRequest;
 					
+				// Test component configuration
+				f_cf01Up();
+					
 				// Preamble
 				f_cse_createAccessControlPolicyAux(-, -, int63);
 				v_aeIndex := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[vc_acpIndex].resource)}, -);
 					
 				// Primitive Profile with add atribute "maxByte" = "100" for content resource.
-			   	v_createPrimitveProfile := m_createPrimitveProfileAddContainerMaxByte100({f_getOriginator(v_aeIndex)});
-			   	v_primitiveProfileIndex := f_cse_createResource(int62, v_createPrimitveProfile, v_aeIndex);
+			   	v_createPrimitiveProfile := m_createPrimitiveProfileAddContainerMaxByte100({f_getOriginator(v_aeIndex)});
+			   	v_primitiveProfileIndex := f_cse_createResource(int62, v_createPrimitiveProfile, v_aeIndex);
 			    
 				v_updatePrimitiveProfileRequest := f_getUpdateRequestPrimitive(int62, v_primitiveProfileIndex, m_updatePrimitiveProfileWithInvalidAdditionsOrDeletions);
 				
@@ -6589,7 +6667,7 @@ module OneM2M_Testcases_CSE_Release_4 {
 				alt {
 					[] mcaPort.receive(mw_response(mw_responsePrimitive(int4137))) -> value v_response {
 						tc_ac.stop;
-						setverdict(pass, __SCOPE__ & ": IUT rejected Primitve Profile with PRIMITIVE_PROFILE_BAD REQUEST");
+						setverdict(pass, __SCOPE__ & ": IUT rejected Primitive Profile with PRIMITIVE_PROFILE_BAD REQUEST");
 					}
 					[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) {
 						tc_ac.stop;
@@ -6597,7 +6675,7 @@ module OneM2M_Testcases_CSE_Release_4 {
 					}
 					[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
 						tc_ac.stop;
-						setverdict(fail, __SCOPE__ & ": IUT accepted Primitve Profile with invalid parametres/attributes in additions/deletions!");
+						setverdict(fail, __SCOPE__ & ": IUT accepted Primitive Profile with invalid parametres/attributes in additions/deletions!");
 					}
 					[] tc_ac.timeout {
 						setverdict(fail, __SCOPE__ & ": No answer from IUT for the last Request!");
@@ -6625,26 +6703,29 @@ module OneM2M_Testcases_CSE_Release_4 {
 													
 			function f_CSE_PP_009() runs on AeSimu system CseSystem {
 				// Local variables
-				var RequestPrimitive v_createPrimitveProfile;
+				var RequestPrimitive v_createPrimitiveProfile;
 				var RequestPrimitive v_requestContainerCreate;
 				var ResponsePrimitive v_responsePrimitive;
 				var integer v_aeIndex := -1;
 				var integer v_primitiveProfileIndex := -1;
 				var MsgIn v_response;
 					
-				// Preambleo
+				// Test component configuration
+				f_cf01Up();
+					
+				// Preamble
 				f_cse_createAccessControlPolicyAux(-, -, int63);
 				v_aeIndex := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[vc_acpIndex].resource)}, -);
 					
 				// Primitive Profile with attribute of Container resource 'MaxByte' to be added and deleted simultaneously.
-				v_createPrimitveProfile := valueof(m_createPrimitveProfileAddNonMutuallyExclusive({f_getOriginator(v_aeIndex)}));
+				v_createPrimitiveProfile := valueof(m_createPrimitiveProfileAddNonMutuallyExclusive({f_getOriginator(v_aeIndex)}));
 				
-				f_send(e_mcaPort, m_request(v_createPrimitveProfile));
+				f_send(e_mcaPort, m_request(v_createPrimitiveProfile));
 				tc_ac.start;
 				alt {
 					[] mcaPort.receive(mw_response(mw_responsePrimitive(int4000))) -> value v_response {
 						tc_ac.stop;
-						setverdict(pass, __SCOPE__ & ": IUT rejected Primitve Profile with attributes that are not mutually exclusive!");
+						setverdict(pass, __SCOPE__ & ": IUT rejected Primitive Profile with attributes that are not mutually exclusive!");
 					}
 					[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) {
 						tc_ac.stop;
@@ -6652,7 +6733,7 @@ module OneM2M_Testcases_CSE_Release_4 {
 					}
 					[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
 						tc_ac.stop;
-						setverdict(fail, __SCOPE__ & ": IUT accepted Primitve Profile with attributes that are not mutually exclusive!");
+						setverdict(fail, __SCOPE__ & ": IUT accepted Primitive Profile with attributes that are not mutually exclusive!");
 					}
 					[] tc_ac.timeout {
 						setverdict(fail, __SCOPE__ & ": No answer from IUT for the last Request!");
@@ -6679,19 +6760,22 @@ module OneM2M_Testcases_CSE_Release_4 {
 													
 			function f_CSE_PP_010() runs on AeSimu system CseSystem {
 				// Local variables
-				var template RequestPrimitive v_createPrimitveProfile;
+				var template RequestPrimitive v_createPrimitiveProfile;
 				var integer v_aeIndex := -1;
 				var integer v_primitiveProfileIndex := -1;
 				var MsgIn v_response;
 				var RequestPrimitive v_updatePrimitiveProfileRequest;
 					
-				// Preambleo
+				// Test component configuration
+				f_cf01Up();
+					
+				// Preamble
 				f_cse_createAccessControlPolicyAux(-, -, int63);
 				v_aeIndex := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[vc_acpIndex].resource)}, -);
 					
 				// Primitive Profile with add atribute "maxByte" = "100" for content resource.
-			    v_createPrimitveProfile := m_createPrimitveProfileAddContainerMaxByte100({f_getOriginator(v_aeIndex)});
-			    v_primitiveProfileIndex := f_cse_createResource(int62, v_createPrimitveProfile, v_aeIndex);
+			    v_createPrimitiveProfile := m_createPrimitiveProfileAddContainerMaxByte100({f_getOriginator(v_aeIndex)});
+			    v_primitiveProfileIndex := f_cse_createResource(int62, v_createPrimitiveProfile, v_aeIndex);
 			    
 				v_updatePrimitiveProfileRequest := f_getUpdateRequestPrimitive(int62, v_primitiveProfileIndex, m_updatePrimitiveProfileNonMutuallyExclusive);
 				
@@ -6700,7 +6784,7 @@ module OneM2M_Testcases_CSE_Release_4 {
 				alt {
 					[] mcaPort.receive(mw_response(mw_responsePrimitive(int4000))) -> value v_response {
 						tc_ac.stop;
-						setverdict(pass, __SCOPE__ & ": IUT rejected Primitve Profile with attributes that are not mutually exclusive!");
+						setverdict(pass, __SCOPE__ & ": IUT rejected Primitive Profile with attributes that are not mutually exclusive!");
 					}
 					[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) {
 						tc_ac.stop;
@@ -6708,7 +6792,7 @@ module OneM2M_Testcases_CSE_Release_4 {
 					}
 					[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
 						tc_ac.stop;
-						setverdict(fail, __SCOPE__ & ": IUT accepted Primitve Profile with attributes that are not mutually exclusive!");
+						setverdict(fail, __SCOPE__ & ": IUT accepted Primitive Profile with attributes that are not mutually exclusive!");
 					}
 					[] tc_ac.timeout {
 						setverdict(fail, __SCOPE__ & ": No answer from IUT for the last Request!");
@@ -6735,7 +6819,7 @@ module OneM2M_Testcases_CSE_Release_4 {
 													
 			function f_CSE_PP_011() runs on AeSimu system CseSystem {
 				// Local variables
-				var RequestPrimitive v_createPrimitveProfile;
+				var RequestPrimitive v_createPrimitiveProfile;
 				var RequestPrimitive v_updateContainer;
 				var ResponsePrimitive v_responsePrimitive;
 				var integer v_aeIndex := -1;
@@ -6744,19 +6828,22 @@ module OneM2M_Testcases_CSE_Release_4 {
 				var MsgIn v_response;
 				var RequestPrimitive v_updateAcpRequest;
 					
+				// Test component configuration
+				f_cf01Up();
+					
 				// Preamble
 				f_cse_createAccessControlPolicyAux(-, -, int63);
 				v_aeIndex := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[vc_acpIndex].resource)}, -);
 					
 				// Primitive Profile for adding non permissible parameters.
-				v_createPrimitveProfile := valueof(m_createPrimitveProfileAddNonPermissibleAttribute({f_getOriginator(v_aeIndex)}));
+				v_createPrimitiveProfile := valueof(m_createPrimitiveProfileAddNonPermissibleAttribute({f_getOriginator(v_aeIndex)}));
 				
-				f_send(e_mcaPort, m_request(v_createPrimitveProfile));
+				f_send(e_mcaPort, m_request(v_createPrimitiveProfile));
 				tc_ac.start;
 				alt {
 					[] mcaPort.receive(mw_response(mw_responsePrimitive(int4000))) -> value v_response {
 						tc_ac.stop;
-						setverdict(pass, __SCOPE__ & ": IUT rejected Primitve Profile with non permissible parameters!");
+						setverdict(pass, __SCOPE__ & ": IUT rejected Primitive Profile with non permissible parameters!");
 					}
 					[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) {
 						tc_ac.stop;
@@ -6764,7 +6851,7 @@ module OneM2M_Testcases_CSE_Release_4 {
 					}
 					[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
 						tc_ac.stop;
-						setverdict(fail, __SCOPE__ & ": IUT accepted Primitve Profile with non permissible parameters!");
+						setverdict(fail, __SCOPE__ & ": IUT accepted Primitive Profile with non permissible parameters!");
 					}
 					[] tc_ac.timeout {
 						setverdict(fail, __SCOPE__ & ": No answer from IUT for the last Request!");
@@ -6791,19 +6878,22 @@ module OneM2M_Testcases_CSE_Release_4 {
 													
 			function f_CSE_PP_012() runs on AeSimu system CseSystem {
 				// Local variables
-				var template RequestPrimitive v_createPrimitveProfile;
+				var template RequestPrimitive v_createPrimitiveProfile;
 				var integer v_aeIndex := -1;
 				var integer v_primitiveProfileIndex := -1;
 				var MsgIn v_response;
 				var RequestPrimitive v_updatePrimitiveProfileRequest;
 					
-				// Preambleo
+				// Test component configuration
+				f_cf01Up();
+					
+				// Preamble
 				f_cse_createAccessControlPolicyAux(-, -, int63);
 				v_aeIndex := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[vc_acpIndex].resource)}, -);
 					
 				// Primitive Profile with add atribute "maxByte" = "100" for content resource.
-				v_createPrimitveProfile := m_createPrimitveProfileAddContainerMaxByte100({f_getOriginator(v_aeIndex)});
-				v_primitiveProfileIndex := f_cse_createResource(int62, v_createPrimitveProfile, v_aeIndex);
+				v_createPrimitiveProfile := m_createPrimitiveProfileAddContainerMaxByte100({f_getOriginator(v_aeIndex)});
+				v_primitiveProfileIndex := f_cse_createResource(int62, v_createPrimitiveProfile, v_aeIndex);
 			    
 				v_updatePrimitiveProfileRequest := f_getUpdateRequestPrimitive(int62, v_primitiveProfileIndex, m_updatePrimitiveProfileNonPermissibleParameters);
 				
@@ -6812,7 +6902,7 @@ module OneM2M_Testcases_CSE_Release_4 {
 				alt {
 					[] mcaPort.receive(mw_response(mw_responsePrimitive(int4000))) -> value v_response {
 						tc_ac.stop;
-						setverdict(pass, __SCOPE__ & ": IUT rejected Primitve Profile with non permissible parameters!");
+						setverdict(pass, __SCOPE__ & ": IUT rejected Primitive Profile with non permissible parameters!");
 					}
 					[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) {
 						tc_ac.stop;
@@ -6820,7 +6910,7 @@ module OneM2M_Testcases_CSE_Release_4 {
 					}
 					[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
 						tc_ac.stop;
-						setverdict(fail, __SCOPE__ & ": IUT accepted Primitve Profile with non permissible parameters!");
+						setverdict(fail, __SCOPE__ & ": IUT accepted Primitive Profile with non permissible parameters!");
 					}
 					[] tc_ac.timeout {
 						setverdict(fail, __SCOPE__ & ": No answer from IUT for the last Request!");
@@ -6855,7 +6945,7 @@ module OneM2M_Testcases_CSE_Release_4 {
 				var template PrimitiveContent v_contentResponse;
 				var RequestPrimitive v_requestContainerCreate;
 				var ResponsePrimitive v_responsePrimitive;
-				var template RequestPrimitive v_createPrimitveProfile;
+				var template RequestPrimitive v_createPrimitiveProfile;
    
 				// Test control
 				if(not PICS_NON_BLOCKING_REQUEST_SYNCH){
@@ -6863,15 +6953,16 @@ module OneM2M_Testcases_CSE_Release_4 {
 					stop;
 				}
 				
+				// Test component configuration
 				f_cf01Up();
-				
+								
 				// AE registration
 				v_aeIndex := f_cse_preamble_registerAe(-,  {f_getLocalPoA(vc_aeSimuDesc.mcaPortIn, "")});//c_CRUDNDi);
 				f_checkAeSimuStatus();
 				
 				// Primitive Profile with attribute of Container resource 'MaxByte' to be deleted from response.
-				v_createPrimitveProfile := m_createPrimitveProfileDeleteFromResponse({f_getOriginator(v_aeIndex)});
-				v_primitiveProfileIndex := f_cse_createResource(int62, v_createPrimitveProfile, v_aeIndex);
+				v_createPrimitiveProfile := m_createPrimitiveProfileDeleteFromResponse({f_getOriginator(v_aeIndex)});
+				v_primitiveProfileIndex := f_cse_createResource(int62, v_createPrimitiveProfile, v_aeIndex);
 				
 				// Container create with response type as nonBlockingRequestAsynch
 				v_requestContainerCreate := f_getCreateRequestPrimitive(int3, m_createContainerMaxByte(100), v_aeIndex);
@@ -6983,7 +7074,7 @@ module OneM2M_Testcases_CSE_Release_4 {
 				var OneM2M_Types.URI v_requestResourceURI;
 				var template PrimitiveContent v_primitiveContent;
 				var template RequestPrimitive v_createContainerRequest := m_createContainerBase;
-				var template RequestPrimitive v_createPrimitveProfile;
+				var template RequestPrimitive v_createPrimitiveProfile;
    
 				// Test control
 				if(not PICS_NON_BLOCKING_REQUEST_SYNCH){
@@ -7004,8 +7095,8 @@ module OneM2M_Testcases_CSE_Release_4 {
 				v_aeIndex := f_cse_preamble_registerAe();
 				
 				// Primitive Profile with attribute of Container resource 'MaxByte' to be added to response.
-				v_createPrimitveProfile := m_createPrimitveProfileAddMaxByte100ToResponse({f_getOriginator(v_aeIndex)});
-				v_primitiveProfileIndex := f_cse_createResource(int62, v_createPrimitveProfile, v_aeIndex);
+				v_createPrimitiveProfile := m_createPrimitiveProfileAddMaxByte100ToResponse({f_getOriginator(v_aeIndex)});
+				v_primitiveProfileIndex := f_cse_createResource(int62, v_createPrimitiveProfile, v_aeIndex);
 				
 				// Create resource with responseType as  nonBlockingRequestSynch
 				v_createContainerRequest.to_ := f_getResourceAddress(v_aeIndex);
@@ -7056,7 +7147,7 @@ module OneM2M_Testcases_CSE_Release_4 {
 								tc_ac.stop;
 									
 								if (valueof(v_response.primitive.responsePrimitive.primitiveContent.request.operationResult.responseStatusCode) == int2001){
-									// Check that IUT applied the Primitve Profile
+									// Check that IUT applied the Primitive Profile
 									if(v_response.primitive.responsePrimitive.primitiveContent.request.operationResult.primitiveContent.container.maxByteSize == 100){
 										setverdict(pass, __SCOPE__ & ": Primitive Profile applied to response primtive!");
 									} else {
@@ -7120,7 +7211,7 @@ module OneM2M_Testcases_CSE_Release_4 {
 				var template PrimitiveContent v_contentNotification := {container := mw_contentContainerWithoutMaxByteSize};// container without MaxByteSize
 				var RequestPrimitive v_request;
 				var integer v_ae2Index := -1;
-				var template RequestPrimitive v_createPrimitveProfile;
+				var template RequestPrimitive v_createPrimitiveProfile;
 			
 				// Test control
 
@@ -7133,8 +7224,8 @@ module OneM2M_Testcases_CSE_Release_4 {
 				v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
 				
 				// Primitive Profile with attribute of Container resource 'MaxByte' to be deleted from response.
-				v_createPrimitveProfile := m_createPrimitveProfileDeleteFromResponse({f_getOriginator(v_aeIndex)});
-				v_primitiveProfileIndex := f_cse_createResource(int62, v_createPrimitveProfile, v_aeIndex);
+				v_createPrimitiveProfile := m_createPrimitiveProfileDeleteFromResponse({f_getOriginator(v_aeIndex)});
+				v_primitiveProfileIndex := f_cse_createResource(int62, v_createPrimitiveProfile, v_aeIndex);
 				
 				//Subscription resource with notification to AE2 about container creation
 				v_createRequest := m_createSubscriptionAdvanced(f_getResourceAddress(v_aeIndex), -, {f_getResourceAddress(v_ae2Index)}, m_eventNotificationCriteria({int3}), -, omit, omit, omit, -, omit);
@@ -7196,13 +7287,14 @@ module OneM2M_Testcases_CSE_Release_4 {
 				}
 				
 				function f_CSE_PP_016_CRE() runs on CseSimu system CseSystem {
-					var template RequestPrimitive v_createPrimitveProfile;
+					var template RequestPrimitive v_createPrimitiveProfile;
 					var integer v_aeIndex := -1; 
 					var integer v_primitiveProfileIndex := -1; 
 					var integer v_remoteCseIndex := -1;
 					var XSD.ID v_targetResourceAddress;
 					var template RequestPrimitive v_createContainerRequest := m_createContainerBase;
 					
+					// Test component configuration
 					f_cf02UpCseSimuMaster();
 				
 					//Register remote CSE
@@ -7215,8 +7307,8 @@ module OneM2M_Testcases_CSE_Release_4 {
 					v_aeIndex := f_getLatestResourceIndex(vc_ae1);
 				
 					//Create Primitive Profile from AE1 to add MaxByte Primtive to container resource creation
-					v_createPrimitveProfile := m_createPrimitveProfileAddContainerMaxByte100({f_getOriginator(v_aeIndex)});
-					vc_ae1.start(f_cse_createResource(int62, v_createPrimitveProfile, v_aeIndex));
+					v_createPrimitiveProfile := m_createPrimitiveProfileAddContainerMaxByte100({f_getOriginator(v_aeIndex)});
+					vc_ae1.start(f_cse_createResource(int62, v_createPrimitiveProfile, v_aeIndex));
 					v_primitiveProfileIndex := f_getLatestResourceIndex(vc_ae1);
 					
 					//Create container resource from AE1 with To as ID of remoteCSE
@@ -7275,7 +7367,7 @@ module OneM2M_Testcases_CSE_Release_4 {
 				}
 				
 				function f_CSE_PP_016_RET() runs on CseSimu system CseSystem {
-					var template RequestPrimitive v_createPrimitveProfile;
+					var template RequestPrimitive v_createPrimitiveProfile;
 					var integer v_aeIndex := -1; 
 					var integer v_primitiveProfileIndex := -1; 
 					var integer v_remoteCseIndex := -1;
@@ -7284,6 +7376,7 @@ module OneM2M_Testcases_CSE_Release_4 {
 					var template RequestPrimitive v_createContainerRequest := m_createContainerBase;
 					var RequestPrimitive v_retrieveRequest;
 					
+					// Test component configuration
 					f_cf02UpCseSimuMaster();
 				
 					//Register remote CSE
@@ -7296,15 +7389,15 @@ module OneM2M_Testcases_CSE_Release_4 {
 					v_aeIndex := f_getLatestResourceIndex(vc_ae1);
 				
 					//Create Primitive Profile from AE1, to add primtive resultContent=4 for container resource retrieval
-					v_createPrimitveProfile := m_createPrimitveProfileAddResultContentTo4({f_getOriginator(v_aeIndex)});
-					vc_ae1.start(f_cse_createResource(int62, v_createPrimitveProfile, v_aeIndex));
+					v_createPrimitiveProfile := m_createPrimitiveProfileAddResultContentTo4({f_getOriginator(v_aeIndex)});
+					vc_ae1.start(f_cse_createResource(int62, v_createPrimitiveProfile, v_aeIndex));
 					v_primitiveProfileIndex := f_getLatestResourceIndex(vc_ae1);
 					
 					// Create local container resource at Hosting CSE
 					v_targetResourceIndex := f_generateAndSetLocalResource(valueof(m_primitiveContentContainer(m_contentCreateContainerBase)), vc_cSEBaseIndex, int3);
 					v_targetResourceAddress := f_getLocalResourceAddress(v_targetResourceIndex, PX_ADDRESSING_METHOD, e_spRelative);					
 					
-					//Retrieve the container resource from AE1, without any resultContent but with link to Primitve Profile created by AE1
+					//Retrieve the container resource from AE1, without any resultContent but with link to Primitive Profile created by AE1
 					v_retrieveRequest := valueof(m_retrieve(v_targetResourceAddress, f_getResourceAddress(v_aeIndex)));
 					v_retrieveRequest.primitiveProfileIdentifier := f_getResourceId(vc_resourcesList[v_primitiveProfileIndex].resource);
 					vc_ae1.start(f_cse_operationResource(v_retrieveRequest));
@@ -7357,7 +7450,7 @@ module OneM2M_Testcases_CSE_Release_4 {
 				}
 				
 				function f_CSE_PP_016_DEL() runs on CseSimu system CseSystem {
-					var template RequestPrimitive v_createPrimitveProfile;
+					var template RequestPrimitive v_createPrimitiveProfile;
 					var integer v_aeIndex := -1; 
 					var integer v_primitiveProfileIndex := -1; 
 					var integer v_remoteCseIndex := -1;
@@ -7366,6 +7459,7 @@ module OneM2M_Testcases_CSE_Release_4 {
 					var RequestPrimitive v_deleteRequest;
 					var integer v_targetResourceIndex := -1;
 					
+					// Test component configuration
 					f_cf02UpCseSimuMaster();
 				
 					//Register remote CSE
@@ -7378,8 +7472,8 @@ module OneM2M_Testcases_CSE_Release_4 {
 					v_aeIndex := f_getLatestResourceIndex(vc_ae1);
 
 					// Primitive Profile with Add atribute resultContent=4 for container resource delete request.
-					v_createPrimitveProfile := m_createPrimitveProfileAddResultContentTo4({f_getOriginator(v_aeIndex)});
-					vc_ae1.start(f_cse_createResource(int62, v_createPrimitveProfile, v_aeIndex));
+					v_createPrimitiveProfile := m_createPrimitiveProfileAddResultContentTo4({f_getOriginator(v_aeIndex)});
+					vc_ae1.start(f_cse_createResource(int62, v_createPrimitiveProfile, v_aeIndex));
 					v_primitiveProfileIndex := f_getLatestResourceIndex(vc_ae1);
 					
 					// Create local container resource at Hosting CSE
@@ -7441,7 +7535,7 @@ module OneM2M_Testcases_CSE_Release_4 {
 				}
 				
 				function f_CSE_PP_016_UPD() runs on CseSimu system CseSystem {
-					var template RequestPrimitive v_createPrimitveProfile;
+					var template RequestPrimitive v_createPrimitiveProfile;
 					var integer v_aeIndex := -1; 
 					var integer v_primitiveProfileIndex := -1; 
 					var integer v_remoteCseIndex := -1;
@@ -7449,6 +7543,7 @@ module OneM2M_Testcases_CSE_Release_4 {
 					var XSD.ID v_targetResourceAddress;
 					var template RequestPrimitive v_updateContainer := m_updateContainerBase;
 					
+					// Test component configuration
 					f_cf02UpCseSimuMaster();
 				
 					//Register remote CSE
@@ -7461,8 +7556,8 @@ module OneM2M_Testcases_CSE_Release_4 {
 					v_aeIndex := f_getLatestResourceIndex(vc_ae1);
 				
 					//Create Primitive Profile from AE1, to add MaByte primitive to create container request
-					v_createPrimitveProfile := m_createPrimitveProfileAddContainerMaxByte100({f_getOriginator(v_aeIndex)});
-					vc_ae1.start(f_cse_createResource(int62, v_createPrimitveProfile, v_aeIndex));
+					v_createPrimitiveProfile := m_createPrimitiveProfileAddContainerMaxByte100({f_getOriginator(v_aeIndex)});
+					vc_ae1.start(f_cse_createResource(int62, v_createPrimitiveProfile, v_aeIndex));
 					v_primitiveProfileIndex := f_getLatestResourceIndex(vc_ae1);
 					
 					// Create Local container resource in Hosting CSE
@@ -7536,8 +7631,9 @@ module OneM2M_Testcases_CSE_Release_4 {
 					var template PrimitiveContent v_contentResponse;
 					var RequestPrimitive v_requestContainerCreate;
 					var ResponsePrimitive v_responsePrimitive;
-					var template RequestPrimitive v_createPrimitveProfile;
+					var template RequestPrimitive v_createPrimitiveProfile;
 				
+					// Test component configuration
 					f_cf01Up();
 				
 					// AE registration
@@ -7545,8 +7641,8 @@ module OneM2M_Testcases_CSE_Release_4 {
 					f_checkAeSimuStatus();
 				
 					// Primitive Profile with attribute of Container resource 'MaxByte' to be added to response.
-					v_createPrimitveProfile := m_createPrimitveProfileAddMaxByte100ToResponse({f_getOriginator(v_aeIndex)});
-					v_primitiveProfileIndex := f_cse_createResource(int62, v_createPrimitveProfile, v_aeIndex);
+					v_createPrimitiveProfile := m_createPrimitiveProfileAddMaxByte100ToResponse({f_getOriginator(v_aeIndex)});
+					v_primitiveProfileIndex := f_cse_createResource(int62, v_createPrimitiveProfile, v_aeIndex);
 				
 					//Create container resource without "maxByte" primitive, but with link to Primitive Profile created
 					v_requestContainerCreate := f_getCreateRequestPrimitive(int3, m_createContainerBase, v_aeIndex);
@@ -7557,7 +7653,7 @@ module OneM2M_Testcases_CSE_Release_4 {
 					alt {
 						[] mcaPort.receive(mw_response(mw_responsePrimitive(int2001))) -> value v_response {
 							tc_ac.stop;
-							// Check that IUT applied the Primitve Profile
+							// Check that IUT applied the Primitive Profile
 							if(ispresent(v_response.primitive.responsePrimitive.primitiveContent.container.maxByteSize)){
 								if(v_response.primitive.responsePrimitive.primitiveContent.container.maxByteSize == 100) {
 									setverdict(pass, __SCOPE__ & ": Primitive Profile applied to response primtive!");
@@ -7605,10 +7701,11 @@ module OneM2M_Testcases_CSE_Release_4 {
 					var integer v_aeIndex := -1;
 					var integer v_containerIndex := -1;
 					var integer v_primitiveProfileIndex := -1;
-					var template RequestPrimitive v_createPrimitveProfile;
+					var template RequestPrimitive v_createPrimitiveProfile;
 					var template PrimitiveContent v_deleteContentResponse;
 					var RequestPrimitive v_deleteRequest;
 				
+					// Test component configuration
 					f_cf01Up();
 				
 					// AE registration
@@ -7616,8 +7713,8 @@ module OneM2M_Testcases_CSE_Release_4 {
 					f_checkAeSimuStatus();
 				
 					// Primitive Profile with attribute of Container resource 'MaxByte' to be added to response.
-					v_createPrimitveProfile := m_createPrimitveProfileAddMaxByte100ToResponse({f_getOriginator(v_aeIndex)});
-					v_primitiveProfileIndex := f_cse_createResource(int62, v_createPrimitveProfile, v_aeIndex);
+					v_createPrimitiveProfile := m_createPrimitiveProfileAddMaxByte100ToResponse({f_getOriginator(v_aeIndex)});
+					v_primitiveProfileIndex := f_cse_createResource(int62, v_createPrimitiveProfile, v_aeIndex);
 					
 					// Set expected container in response as per resultContent=1
 					v_deleteContentResponse.container := mw_contentContainer_rc1;
@@ -7635,7 +7732,7 @@ module OneM2M_Testcases_CSE_Release_4 {
 					alt {
 						[] mcaPort.receive(mw_response(mw_responsePrimitive(int2002, v_deleteContentResponse))) -> value v_response {
 							tc_ac.stop;
-							// Check that IUT applied the Primitve Profile
+							// Check that IUT applied the Primitive Profile
 							if(ispresent(v_response.primitive.responsePrimitive.primitiveContent.container.maxByteSize)){
 								if(v_response.primitive.responsePrimitive.primitiveContent.container.maxByteSize == 100) {
 									setverdict(pass, __SCOPE__ & ": Primitive Profile applied to response primtive!");
@@ -7688,10 +7785,11 @@ module OneM2M_Testcases_CSE_Release_4 {
 					var integer v_containerIndex := -1;
 					var integer v_aeIndex := -1;
 					var RequestPrimitive v_requestContainerCreate;
-					var template RequestPrimitive v_createPrimitveProfile;
+					var template RequestPrimitive v_createPrimitiveProfile;
 					var RequestPrimitive v_retrieveRequest;
 					var template PrimitiveContent v_retriveContentResponse;
 				
+					// Test component configuration
 					f_cf01Up();
 				
 					// AE registration
@@ -7699,8 +7797,8 @@ module OneM2M_Testcases_CSE_Release_4 {
 					f_checkAeSimuStatus();
 				
 					// Primitive Profile with attribute of Container resource 'MaxByte' to be added to response.
-					v_createPrimitveProfile := m_createPrimitveProfileAddMaxByte100ToResponse({f_getOriginator(v_aeIndex)});
-					v_primitiveProfileIndex := f_cse_createResource(int62, v_createPrimitveProfile, v_aeIndex);
+					v_createPrimitiveProfile := m_createPrimitiveProfileAddMaxByte100ToResponse({f_getOriginator(v_aeIndex)});
+					v_primitiveProfileIndex := f_cse_createResource(int62, v_createPrimitiveProfile, v_aeIndex);
 					
 					// Set expected container in response
 					v_retriveContentResponse.container := mw_contentContainerBase;
@@ -7708,7 +7806,7 @@ module OneM2M_Testcases_CSE_Release_4 {
 					//Create container resource without "maxByte" primitive
 					v_containerIndex := f_cse_createResource(int62, m_createContainerBase, v_aeIndex);
 					
-					//Retrieve container with link to Primitve Profile
+					//Retrieve container with link to Primitive Profile
 					v_retrieveRequest := valueof(m_retrieve(f_getResourceAddress(v_containerIndex), f_getOriginator(v_containerIndex)));
 					v_requestContainerCreate.primitiveProfileIdentifier := f_getResourceId(vc_resourcesList[v_primitiveProfileIndex].resource);
 					f_send(e_mcaPort, m_request(v_retrieveRequest));
@@ -7717,7 +7815,7 @@ module OneM2M_Testcases_CSE_Release_4 {
 					alt {
 						[] mcaPort.receive(mw_response(mw_responsePrimitive(int2000, v_retriveContentResponse))) -> value v_response {
 							tc_ac.stop;
-							// Check that IUT applied the Primitve Profile
+							// Check that IUT applied the Primitive Profile
 							if(ispresent(v_response.primitive.responsePrimitive.primitiveContent.container.maxByteSize)){
 								if(v_response.primitive.responsePrimitive.primitiveContent.container.maxByteSize == 100) {
 									setverdict(pass, __SCOPE__ & ": Primitive Profile applied to response primtive!");
@@ -7766,7 +7864,7 @@ module OneM2M_Testcases_CSE_Release_4 {
 			
 				function f_CSE_PP_017_UPD() runs on AeSimu system CseSystem {
 					// Local variables
-					var template RequestPrimitive v_createPrimitveProfile;
+					var template RequestPrimitive v_createPrimitiveProfile;
 					var RequestPrimitive v_updateContainer;
 					var ResponsePrimitive v_responsePrimitive;
 					var integer v_aeIndex := -1;
@@ -7774,13 +7872,16 @@ module OneM2M_Testcases_CSE_Release_4 {
 					var integer v_createdContainerResource := -1;
 					var MsgIn v_response;
 					
+					// Test component configuration
+					f_cf01Up();
+				
 					// Preamble
 					f_cse_createAccessControlPolicyAux(-, -, int63);
 					v_aeIndex := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[vc_acpIndex].resource)}, -);
 					
 					// Primitive Profile with attribute of Container resource 'MaxByte' to be deleted from response.
-					v_createPrimitveProfile := m_createPrimitveProfileAddMaxByte100ToResponse({f_getOriginator(v_aeIndex)});
-					v_primitiveProfileIndex := f_cse_createResource(int62, v_createPrimitveProfile, v_aeIndex);
+					v_createPrimitiveProfile := m_createPrimitiveProfileAddMaxByte100ToResponse({f_getOriginator(v_aeIndex)});
+					v_primitiveProfileIndex := f_cse_createResource(int62, v_createPrimitiveProfile, v_aeIndex);
 				
 					//Create container resource without Primtive Profile ID and no maxByte attribte
 					v_createdContainerResource := f_cse_createResource(int3, m_createContainerBase, v_aeIndex);
@@ -7788,7 +7889,7 @@ module OneM2M_Testcases_CSE_Release_4 {
 					//Update container request with Primitive Profile ID, and without including update for maxByte
 					v_updateContainer:= f_getUpdateRequestPrimitive(int3, v_aeIndex, m_createContainerBase);
 
-					// Link Primitve Prifle created to this Request
+					// Link Primitive Prifle created to this Request
 					v_updateContainer.primitiveProfileIdentifier := f_getResourceId(vc_resourcesList[v_primitiveProfileIndex].resource);
 				
 					f_send(e_mcaPort, m_request(v_updateContainer));
@@ -7796,7 +7897,7 @@ module OneM2M_Testcases_CSE_Release_4 {
 					alt {
 						[] mcaPort.receive(mw_response(mw_responsePrimitive(int2004))) -> value v_response {
 							tc_ac.stop;
-							// Check that IUT applied the Primitve Profile
+							// Check that IUT applied the Primitive Profile
 							if(ispresent(v_response.primitive.responsePrimitive.primitiveContent.container.maxByteSize)){
 								if(v_response.primitive.responsePrimitive.primitiveContent.container.maxByteSize == 100) {
 									setverdict(pass, __SCOPE__ & ": Primitive Profile applied to response primtive!");
@@ -7850,8 +7951,9 @@ module OneM2M_Testcases_CSE_Release_4 {
 					var template PrimitiveContent v_contentResponse;
 					var RequestPrimitive v_requestContainerCreate;
 					var ResponsePrimitive v_responsePrimitive;
-					var template RequestPrimitive v_createPrimitveProfile;
+					var template RequestPrimitive v_createPrimitiveProfile;
 				
+					// Test component configuration
 					f_cf01Up();
 				
 					// AE registration
@@ -7860,12 +7962,12 @@ module OneM2M_Testcases_CSE_Release_4 {
 					f_checkAeSimuStatus();
 				
 					// Primitive Profile with attribute of Container resource 'MaxByte' to be deleted from response.
-					v_createPrimitveProfile := m_createPrimitveProfileDeleteFromResponse({f_getOriginator(v_aeIndex)});
-					v_primitiveProfileIndex := f_cse_createResource(int62, v_createPrimitveProfile, v_aeIndex);
+					v_createPrimitiveProfile := m_createPrimitiveProfileDeleteFromResponse({f_getOriginator(v_aeIndex)});
+					v_primitiveProfileIndex := f_cse_createResource(int62, v_createPrimitiveProfile, v_aeIndex);
 				
 					//Create container resource with "maxByte" primitive
 					v_requestContainerCreate := f_getCreateRequestPrimitive(int3, m_createContainerMaxByte(100), v_aeIndex);
-					// Link Primitve Prifle, which was deleted, to this Request
+					// Link Primitive Prifle, which was deleted, to this Request
 					v_requestContainerCreate.primitiveProfileIdentifier := f_getResourceId(vc_resourcesList[v_primitiveProfileIndex].resource);
 				
 					f_send(e_mcaPort, m_request(v_request));
@@ -7873,7 +7975,7 @@ module OneM2M_Testcases_CSE_Release_4 {
 					alt {
 						[] mcaPort.receive(mw_response(mw_responsePrimitive(int2001))) -> value v_response {
 							tc_ac.stop;
-							// Check that IUT applied the Primitve Profile
+							// Check that IUT applied the Primitive Profile
 							if(ispresent(v_response.primitive.responsePrimitive.primitiveContent.container.maxByteSize)){
 								setverdict(fail, __SCOPE__ & ": Primitive Profile not applied to response primtive!");
 							} else {
@@ -7917,10 +8019,11 @@ module OneM2M_Testcases_CSE_Release_4 {
 					var integer v_aeIndex := -1;
 					var integer v_containerIndex := -1;
 					var integer v_primitiveProfileIndex := -1;
-					var template RequestPrimitive v_createPrimitveProfile;
+					var template RequestPrimitive v_createPrimitiveProfile;
 					var template PrimitiveContent v_deleteContentResponse;
 					var RequestPrimitive v_deleteRequest;
 				
+					// Test component configuration
 					f_cf01Up();
 				
 					// AE registration
@@ -7928,8 +8031,8 @@ module OneM2M_Testcases_CSE_Release_4 {
 					f_checkAeSimuStatus();
 				
 					// Primitive Profile with attribute of Container resource 'MaxByte' to be deleted from response.
-					v_createPrimitveProfile := m_createPrimitveProfileDeleteFromResponse({f_getOriginator(v_aeIndex)});
-					v_primitiveProfileIndex := f_cse_createResource(int62, v_createPrimitveProfile, v_aeIndex);
+					v_createPrimitiveProfile := m_createPrimitiveProfileDeleteFromResponse({f_getOriginator(v_aeIndex)});
+					v_primitiveProfileIndex := f_cse_createResource(int62, v_createPrimitiveProfile, v_aeIndex);
 					
 					// Set expected container in response as per resultContent=1
 					v_deleteContentResponse.container := mw_contentContainer_rc1;
@@ -7947,7 +8050,7 @@ module OneM2M_Testcases_CSE_Release_4 {
 					alt {
 						[] mcaPort.receive(mw_response(mw_responsePrimitive(int2002, v_deleteContentResponse))) -> value v_response {
 							tc_ac.stop;
-							// Check that IUT applied the Primitve Profile
+							// Check that IUT applied the Primitive Profile
 							if(ispresent(v_response.primitive.responsePrimitive.primitiveContent.container.maxByteSize)){
 								setverdict(fail, __SCOPE__ & ": IUT did not apply primtive profile to the response primtive!");
 							} else {
@@ -7987,7 +8090,7 @@ module OneM2M_Testcases_CSE_Release_4 {
 			
 				function f_CSE_PP_018_RET() runs on AeSimu system CseSystem {
 					// Local variables
-					var template RequestPrimitive v_createPrimitveProfile;
+					var template RequestPrimitive v_createPrimitiveProfile;
 					var RequestPrimitive v_updateContainer;
 					var ResponsePrimitive v_responsePrimitive;
 					var integer v_aeIndex := -1;
@@ -7997,13 +8100,16 @@ module OneM2M_Testcases_CSE_Release_4 {
 					var template PrimitiveContent v_retriveContentResponse;
 					var RequestPrimitive v_retrieveRequest;
 					
+					// Test component configuration
+					f_cf01Up();
+					
 					// Preamble
 					f_cse_createAccessControlPolicyAux(-, -, int63);
 					v_aeIndex := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[vc_acpIndex].resource)}, -);
 					
 					// Primitive Profile with attribute of Container resource 'MaxByte' to be deleted from response.
-					v_createPrimitveProfile := m_createPrimitveProfileDeleteFromResponse({f_getOriginator(v_aeIndex)});
-					v_primitiveProfileIndex := f_cse_createResource(int62, v_createPrimitveProfile, v_aeIndex);
+					v_createPrimitiveProfile := m_createPrimitiveProfileDeleteFromResponse({f_getOriginator(v_aeIndex)});
+					v_primitiveProfileIndex := f_cse_createResource(int62, v_createPrimitiveProfile, v_aeIndex);
 					
 					// Set expected container in response
 					v_retriveContentResponse.container := mw_contentContainerBase;
@@ -8011,7 +8117,7 @@ module OneM2M_Testcases_CSE_Release_4 {
 					//Create container resource with maxByte attribte
 					v_createdContainerResourceIndex := f_cse_createResource(int3, m_updateContainerMaxByte(100), v_aeIndex);
 
-					//Retrieve container with link to Primitve Profile
+					//Retrieve container with link to Primitive Profile
 					v_retrieveRequest := valueof(m_retrieve(f_getResourceAddress(v_createdContainerResourceIndex), f_getOriginator(v_createdContainerResourceIndex)));
 					v_retrieveRequest.primitiveProfileIdentifier := f_getResourceId(vc_resourcesList[v_primitiveProfileIndex].resource);
 					f_send(e_mcaPort, m_request(v_retrieveRequest));
@@ -8020,7 +8126,7 @@ module OneM2M_Testcases_CSE_Release_4 {
 					alt {
 						[] mcaPort.receive(mw_response(mw_responsePrimitive(int2000, v_retriveContentResponse))) -> value v_response {
 							tc_ac.stop;
-							// Check that IUT applied the Primitve Profile
+							// Check that IUT applied the Primitive Profile
 							if(ispresent(v_response.primitive.responsePrimitive.primitiveContent.container.maxByteSize)){
 								setverdict(fail, __SCOPE__ & ": Primitive Profile not applied to response primtive!");
 							} else {
@@ -8060,7 +8166,7 @@ module OneM2M_Testcases_CSE_Release_4 {
 			
 				function f_CSE_PP_018_UPD() runs on AeSimu system CseSystem {
 					// Local variables
-					var template RequestPrimitive v_createPrimitveProfile;
+					var template RequestPrimitive v_createPrimitiveProfile;
 					var RequestPrimitive v_updateContainer;
 					var ResponsePrimitive v_responsePrimitive;
 					var integer v_aeIndex := -1;
@@ -8068,13 +8174,16 @@ module OneM2M_Testcases_CSE_Release_4 {
 					var integer v_createdContainerResource := -1;
 					var MsgIn v_response;
 					
+					// Test component configuration
+					f_cf01Up();
+				
 					// Preamble
 					f_cse_createAccessControlPolicyAux(-, -, int63);
 					v_aeIndex := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[vc_acpIndex].resource)}, -);
 					
 					// Primitive Profile with attribute of Container resource 'MaxByte' to be deleted from response.
-					v_createPrimitveProfile := m_createPrimitveProfileDeleteFromResponse({f_getOriginator(v_aeIndex)});
-					v_primitiveProfileIndex := f_cse_createResource(int62, v_createPrimitveProfile, v_aeIndex);
+					v_createPrimitiveProfile := m_createPrimitiveProfileDeleteFromResponse({f_getOriginator(v_aeIndex)});
+					v_primitiveProfileIndex := f_cse_createResource(int62, v_createPrimitiveProfile, v_aeIndex);
 				
 					//Create container resource without Primtive Profile ID and no maxByte attribte
 					v_createdContainerResource := f_cse_createResource(int3, m_createContainerBase, v_aeIndex);
@@ -8082,7 +8191,7 @@ module OneM2M_Testcases_CSE_Release_4 {
 					//Update container request with Primitive Profile ID, and including update for maxByte
 					v_updateContainer:= f_getUpdateRequestPrimitive(int3, v_aeIndex, m_updateContainerMaxByte(100));
 
-					// Link Primitve Prifle created to this Request
+					// Link Primitive Prifle created to this Request
 					v_updateContainer.primitiveProfileIdentifier := f_getResourceId(vc_resourcesList[v_primitiveProfileIndex].resource);
 				
 					f_send(e_mcaPort, m_request(v_updateContainer));
@@ -8090,7 +8199,7 @@ module OneM2M_Testcases_CSE_Release_4 {
 					alt {
 						[] mcaPort.receive(mw_response(mw_responsePrimitive(int2004))) -> value v_response {
 							tc_ac.stop;
-							// Check that IUT applied the Primitve Profile
+							// Check that IUT applied the Primitive Profile
 							if(ispresent(v_response.primitive.responsePrimitive.primitiveContent.container.maxByteSize)){
 								setverdict(fail, __SCOPE__ & ": Primitive Profile to delete a primitive not applied to response!!");
 							} else {
@@ -8141,8 +8250,9 @@ module OneM2M_Testcases_CSE_Release_4 {
 					var template PrimitiveContent v_contentResponse;
 					var RequestPrimitive v_requestContainerCreate;
 					var ResponsePrimitive v_responsePrimitive;
-					var template RequestPrimitive v_createPrimitveProfile;
+					var template RequestPrimitive v_createPrimitiveProfile;
 				
+					// Test component configuration
 					f_cf01Up();
 				
 					// AE registration
@@ -8150,12 +8260,12 @@ module OneM2M_Testcases_CSE_Release_4 {
 					f_checkAeSimuStatus();
 				
 					// Primitive Profile with attribute of Container resource 'MaxByte'=100 to be added to response.
-					v_createPrimitveProfile := m_createPrimitveProfileAddMaxByte100ToResponse({f_getOriginator(v_aeIndex)});
-					v_primitiveProfileIndex := f_cse_createResource(int62, v_createPrimitveProfile, v_aeIndex);
+					v_createPrimitiveProfile := m_createPrimitiveProfileAddMaxByte100ToResponse({f_getOriginator(v_aeIndex)});
+					v_primitiveProfileIndex := f_cse_createResource(int62, v_createPrimitiveProfile, v_aeIndex);
 				
 					//Create container resource with "maxByte"=1000 
 					v_requestContainerCreate := f_getCreateRequestPrimitive(int3, m_createContainerMaxByte(1000), v_aeIndex);
-					// Link Primitve Prifle, which was deleted, to this Request
+					// Link Primitive Prifle, which was deleted, to this Request
 					v_requestContainerCreate.primitiveProfileIdentifier := f_getResourceId(vc_resourcesList[v_primitiveProfileIndex].resource);
 				
 					f_send(e_mcaPort, m_request(v_request));
@@ -8163,7 +8273,7 @@ module OneM2M_Testcases_CSE_Release_4 {
 					alt {
 						[] mcaPort.receive(mw_response(mw_responsePrimitive(int2001))) -> value v_response {
 							tc_ac.stop;
-							// Check that IUT applied the Primitve Profile
+							// Check that IUT applied the Primitive Profile
 							if(v_response.primitive.responsePrimitive.primitiveContent.container.maxByteSize == 100){
 								setverdict(pass, __SCOPE__ & ": Primitive Profile applied to response primtive!");
 							} else {
@@ -8207,9 +8317,10 @@ module OneM2M_Testcases_CSE_Release_4 {
 					var integer v_containerIndex := -1;
 					var template PrimitiveContent v_contentResponse;
 					var template PrimitiveContent v_deleteContentResponse;
-					var template RequestPrimitive v_createPrimitveProfile;
+					var template RequestPrimitive v_createPrimitiveProfile;
 					var RequestPrimitive v_deleteRequest;
 				
+					// Test component configuration
 					f_cf01Up();
 				
 					// AE registration
@@ -8217,8 +8328,8 @@ module OneM2M_Testcases_CSE_Release_4 {
 					f_checkAeSimuStatus();
 				
 					// Primitive Profile with attribute of Container resource 'MaxByte'=100 to be added to response.
-					v_createPrimitveProfile := m_createPrimitveProfileAddMaxByte100ToResponse({f_getOriginator(v_aeIndex)});
-					v_primitiveProfileIndex := f_cse_createResource(int62, v_createPrimitveProfile, v_aeIndex);
+					v_createPrimitiveProfile := m_createPrimitiveProfileAddMaxByte100ToResponse({f_getOriginator(v_aeIndex)});
+					v_primitiveProfileIndex := f_cse_createResource(int62, v_createPrimitiveProfile, v_aeIndex);
 					
 					// Set expected container in response as per resultContent=1
 					v_deleteContentResponse.container := mw_contentContainer_rc1;
@@ -8236,7 +8347,7 @@ module OneM2M_Testcases_CSE_Release_4 {
 					alt {
 						[] mcaPort.receive(mw_response(mw_responsePrimitive(int2002, v_deleteContentResponse))) -> value v_response {
 							tc_ac.stop;
-							// Check that IUT applied the Primitve Profile
+							// Check that IUT applied the Primitive Profile
 							if(v_response.primitive.responsePrimitive.primitiveContent.container.maxByteSize == 100){
 								setverdict(pass, __SCOPE__ & ": Primitive Profile applied to response primtive!");
 							} else {
@@ -8276,10 +8387,11 @@ module OneM2M_Testcases_CSE_Release_4 {
 					var integer v_aeIndex := -1;
 					var integer v_containerIndex := -1;
 					var integer v_primitiveProfileIndex := -1;
-					var template RequestPrimitive v_createPrimitveProfile;
+					var template RequestPrimitive v_createPrimitiveProfile;
 					var template PrimitiveContent v_retriveContentResponse;
 					var RequestPrimitive v_retrieveRequest;
 				
+					// Test component configuration
 					f_cf01Up();
 				
 					// AE registration
@@ -8287,8 +8399,8 @@ module OneM2M_Testcases_CSE_Release_4 {
 					f_checkAeSimuStatus();
 				
 					// Primitive Profile with attribute of Container resource 'MaxByte'=100 to be added to response.
-					v_createPrimitveProfile := m_createPrimitveProfileAddMaxByte100ToResponse({f_getOriginator(v_aeIndex)});
-					v_primitiveProfileIndex := f_cse_createResource(int62, v_createPrimitveProfile, v_aeIndex);
+					v_createPrimitiveProfile := m_createPrimitiveProfileAddMaxByte100ToResponse({f_getOriginator(v_aeIndex)});
+					v_primitiveProfileIndex := f_cse_createResource(int62, v_createPrimitiveProfile, v_aeIndex);
 					
 					// Set expected container in response
 					v_retriveContentResponse.container := mw_contentContainerBase;
@@ -8296,7 +8408,7 @@ module OneM2M_Testcases_CSE_Release_4 {
 					//Create container resource with "maxByte"=1000 
 					v_containerIndex := f_cse_createResource(int3, m_createContainerMaxByte(1000), v_aeIndex);
 
-					//Retrieve container with link to Primitve Profile
+					//Retrieve container with link to Primitive Profile
 					v_retrieveRequest := valueof(m_retrieve(f_getResourceAddress(v_containerIndex), f_getOriginator(v_containerIndex)));
 					v_retrieveRequest.primitiveProfileIdentifier := f_getResourceId(vc_resourcesList[v_primitiveProfileIndex].resource);
 					f_send(e_mcaPort, m_request(v_retrieveRequest));
@@ -8305,7 +8417,7 @@ module OneM2M_Testcases_CSE_Release_4 {
 					alt {
 						[] mcaPort.receive(mw_response(mw_responsePrimitive(int2001, v_retriveContentResponse))) -> value v_response {
 							tc_ac.stop;
-							// Check that IUT applied the Primitve Profile
+							// Check that IUT applied the Primitive Profile
 							if(v_response.primitive.responsePrimitive.primitiveContent.container.maxByteSize == 100){
 								setverdict(pass, __SCOPE__ & ": Primitive Profile applied to response primtive!");
 							} else {
@@ -8341,7 +8453,7 @@ module OneM2M_Testcases_CSE_Release_4 {
 			
 				function f_CSE_PP_019_UPD() runs on AeSimu system CseSystem {
 					// Local variables
-					var template RequestPrimitive v_createPrimitveProfile;
+					var template RequestPrimitive v_createPrimitiveProfile;
 					var RequestPrimitive v_updateContainer;
 					var ResponsePrimitive v_responsePrimitive;
 					var integer v_aeIndex := -1;
@@ -8349,13 +8461,16 @@ module OneM2M_Testcases_CSE_Release_4 {
 					var integer v_createdContainerResource := -1;
 					var MsgIn v_response;
 					
+					// Test component configuration
+					f_cf01Up();
+				
 					// Preamble
 					f_cse_createAccessControlPolicyAux(-, -, int63);
 					v_aeIndex := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[vc_acpIndex].resource)}, -);
 					
 					// Primitive Profile with attribute of Container resource 'MaxByte'=100 to be added to response.
-					v_createPrimitveProfile := m_createPrimitveProfileAddMaxByte100ToResponse({f_getOriginator(v_aeIndex)});
-					v_primitiveProfileIndex := f_cse_createResource(int62, v_createPrimitveProfile, v_aeIndex);
+					v_createPrimitiveProfile := m_createPrimitiveProfileAddMaxByte100ToResponse({f_getOriginator(v_aeIndex)});
+					v_primitiveProfileIndex := f_cse_createResource(int62, v_createPrimitiveProfile, v_aeIndex);
 				
 					//Create container resource without Primtive Profile ID and no maxByte attribte
 					v_createdContainerResource := f_cse_createResource(int3, m_createContainerMaxByte(1000), v_aeIndex);
@@ -8363,7 +8478,7 @@ module OneM2M_Testcases_CSE_Release_4 {
 					//Update container request with Primitive Profile ID, and without including update for maxByte
 					v_updateContainer:= f_getUpdateRequestPrimitive(int3, v_aeIndex, m_updateContainerMaxByte(2000));
 
-					// Link Primitve Prifle created to this Request
+					// Link Primitive Prifle created to this Request
 					v_updateContainer.primitiveProfileIdentifier := f_getResourceId(vc_resourcesList[v_primitiveProfileIndex].resource);
 				
 					f_send(e_mcaPort, m_request(v_updateContainer));
@@ -8371,7 +8486,7 @@ module OneM2M_Testcases_CSE_Release_4 {
 					alt {
 						[] mcaPort.receive(mw_response(mw_responsePrimitive(int2001))) -> value v_response {
 							tc_ac.stop;
-							// Check that IUT applied the Primitve Profile
+							// Check that IUT applied the Primitive Profile
 							if(v_response.primitive.responsePrimitive.primitiveContent.container.maxByteSize == 100){
 								setverdict(pass, __SCOPE__ & ": Primitive Profile to update a primitive applied to response!");
 							} else {
@@ -8595,7 +8710,7 @@ module OneM2M_Testcases_CSE_Release_4 {
                         }
                         [] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) {
                             tc_ac.stop;
-                            setverdict(fail, __SCOPE__ & ": IUT accepted Primitve Profile with attributes including complex data type definition");
+                            setverdict(fail, __SCOPE__ & ": IUT accepted Primitive Profile with attributes including complex data type definition");
                         }
                         [] tc_ac.timeout {
                             setverdict(fail, __SCOPE__ & ": No answer from IUT for the last Request!");
@@ -8692,7 +8807,7 @@ module OneM2M_Testcases_CSE_Release_4 {
                     v_aeIndex := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[vc_acpIndex].resource)}, -);
                         
                     // Primitive Profile with add atribute "maxByte" = "100" for content resource.
-                    v_createPrimitiveProfile := m_createPrimitveProfileAddContainerMaxByte100({f_getOriginator(v_aeIndex)});
+                    v_createPrimitiveProfile := m_createPrimitiveProfileAddContainerMaxByte100({f_getOriginator(v_aeIndex)});
                     v_primitiveProfileIndex := f_cse_createResource(int62, v_createPrimitiveProfile, v_aeIndex); // TS-004 Table 6.3.4.2.1-1 -> primitiveProfile = 62
                     
                     // Update Primitive Profile containing an invalid ADD_PARAMETER attribute