diff --git a/openair2/LAYER2/PDCP_v10.1.0/pdcp.c b/openair2/LAYER2/PDCP_v10.1.0/pdcp.c
index d1beaa5d4b..28cd37f3af 100644
--- a/openair2/LAYER2/PDCP_v10.1.0/pdcp.c
+++ b/openair2/LAYER2/PDCP_v10.1.0/pdcp.c
@@ -2128,8 +2128,8 @@ pdcp_config_set_security(
     kRRCint != NULL ? memcpy(pdcp_pP->kRRCint, kRRCint+16, 16) : memset(pdcp_pP->kRRCint, 0, 16);
     kUPenc != NULL ? memcpy(pdcp_pP->kUPenc, kUPenc+16, 16) : memset(pdcp_pP->kUPenc, 0, 16);
 
-    pdcp_pP->security_container_rrc = stream_security_container_create(pdcp_pP->cipheringAlgorithm, pdcp_pP->integrityProtAlgorithm, pdcp_pP->kRRCenc, pdcp_pP->kRRCint);
-    pdcp_pP->security_container_up = stream_security_container_create(pdcp_pP->cipheringAlgorithm, 0, pdcp_pP->kUPenc, NULL);
+    pdcp_pP->security_container_rrc = stream_security_container_init(pdcp_pP->cipheringAlgorithm, pdcp_pP->integrityProtAlgorithm, pdcp_pP->kRRCenc, pdcp_pP->kRRCint);
+    pdcp_pP->security_container_up = stream_security_container_init(pdcp_pP->cipheringAlgorithm, 0, pdcp_pP->kUPenc, NULL);
 
     /* Activate security */
     pdcp_pP->security_activated = 1;
diff --git a/openair3/NAS/NR_UE/nr_nas_msg_sim.c b/openair3/NAS/NR_UE/nr_nas_msg_sim.c
index ae6587df8d..1271ba34fd 100644
--- a/openair3/NAS/NR_UE/nr_nas_msg_sim.c
+++ b/openair3/NAS/NR_UE/nr_nas_msg_sim.c
@@ -516,9 +516,9 @@ static void generateAuthenticationResp(nr_ue_nas_t *nas, as_nas_info_t *initialN
 {
   derive_ue_keys(buf, nas);
   /* todo: as of now, nia2 is hardcoded in derive_ue_keys(), remove this hardcoding, use NAS signalling for getting proper algorithm */
-  /* todo: deal with ciphering for this stream_security_container_create() (handle ciphering in general) */
+  /* todo: deal with ciphering for this stream_security_container_init() (handle ciphering in general) */
   /* todo: stream_security_container_delete() is not called anywhere, deal with that */
-  nas->security_container = stream_security_container_create(0, 2 /* hardcoded: nia2 */, NULL, nas->security.knas_int);
+  nas->security_container = stream_security_container_init(0, 2 /* hardcoded: nia2 */, NULL, nas->security.knas_int);
   OctetString res;
   res.length = 16;
   res.value = calloc(1,16);
diff --git a/openair3/NAS/UE/EMM/SecurityModeControl.c b/openair3/NAS/UE/EMM/SecurityModeControl.c
index a068b65d68..2a18763f50 100644
--- a/openair3/NAS/UE/EMM/SecurityModeControl.c
+++ b/openair3/NAS/UE/EMM/SecurityModeControl.c
@@ -267,7 +267,7 @@ int emm_proc_security_mode_command(nas_user_t *user, int native_ksi, int ksi,
           /* Set new security context indicator */
           security_context_is_new = true;
           /* create contexts */
-          user->emm_data->security->security_container = stream_security_container_create(
+          user->emm_data->security->security_container = stream_security_container_init(
                   seea,
                   seia,
                   user->emm_data->non_current->knas_enc.value,
diff --git a/openair3/SECU/secu_defs.c b/openair3/SECU/secu_defs.c
index 47dc3affc4..17e3ca96ec 100644
--- a/openair3/SECU/secu_defs.c
+++ b/openair3/SECU/secu_defs.c
@@ -104,10 +104,10 @@ void stream_ciphering_free(int ciphering_algorithm, stream_security_context_t *c
   }
 }
 
-stream_security_container_t *stream_security_container_create(int ciphering_algorithm,
-                                                              int integrity_algorithm,
-                                                              const uint8_t *ciphering_key,
-                                                              const uint8_t *integrity_key)
+stream_security_container_t *stream_security_container_init(int ciphering_algorithm,
+                                                            int integrity_algorithm,
+                                                            const uint8_t *ciphering_key,
+                                                            const uint8_t *integrity_key)
 {
   stream_security_container_t *container = calloc(1, sizeof(*container));
   AssertFatal(container != NULL, "out of memory\n");
diff --git a/openair3/SECU/secu_defs.h b/openair3/SECU/secu_defs.h
index 3dd4cb7cfd..e47804fd3f 100644
--- a/openair3/SECU/secu_defs.h
+++ b/openair3/SECU/secu_defs.h
@@ -58,10 +58,10 @@ stream_security_context_t *stream_ciphering_init(int ciphering_algorithm, const
 void stream_integrity_free(int integrity_algorithm, stream_security_context_t *integrity_context);
 void stream_ciphering_free(int ciphering_algorithm, stream_security_context_t *ciphering_context);
 
-stream_security_container_t *stream_security_container_create(int ciphering_algorithm,
-                                                              int integrity_algorithm,
-                                                              const uint8_t *ciphering_key,
-                                                              const uint8_t *integrity_key);
+stream_security_container_t *stream_security_container_init(int ciphering_algorithm,
+                                                            int integrity_algorithm,
+                                                            const uint8_t *ciphering_key,
+                                                            const uint8_t *integrity_key);
 void stream_security_container_delete(stream_security_container_t *container);
 
 /*!