diff --git a/lib/gtp/v2/path.h b/lib/gtp/v2/path.h
index 332fcaf25..7b3aa6dda 100644
--- a/lib/gtp/v2/path.h
+++ b/lib/gtp/v2/path.h
@@ -32,7 +32,7 @@ typedef struct ogs_gtp_xact_s ogs_gtp_xact_t;
 
 int ogs_gtp2_send_user_plane(
         ogs_gtp_node_t *gnode,
-        ogs_gtp2_header_desc_t *hdesc,
+        ogs_gtp2_header_desc_t *header_desc,
         ogs_pkbuf_t *pkbuf);
 
 ogs_pkbuf_t *ogs_gtp2_handle_echo_req(ogs_pkbuf_t *pkb);
diff --git a/lib/sbi/nnrf-handler.c b/lib/sbi/nnrf-handler.c
index 57f7dedbc..36f2b6975 100644
--- a/lib/sbi/nnrf-handler.c
+++ b/lib/sbi/nnrf-handler.c
@@ -24,7 +24,7 @@ static void handle_nf_service(
 static void handle_smf_info(
         ogs_sbi_nf_instance_t *nf_instance, OpenAPI_smf_info_t *SmfInfo);
 static void handle_scp_info(
-        ogs_sbi_nf_instance_t *nf_instance, OpenAPI_scp_info_t *SeppInfo);
+        ogs_sbi_nf_instance_t *nf_instance, OpenAPI_scp_info_t *ScpInfo);
 static void handle_sepp_info(
         ogs_sbi_nf_instance_t *nf_instance, OpenAPI_sepp_info_t *SeppInfo);
 
diff --git a/src/hss/hss-s6a-path.c b/src/hss/hss-s6a-path.c
index d004a534f..3dc1ca3a0 100644
--- a/src/hss/hss-s6a-path.c
+++ b/src/hss/hss-s6a-path.c
@@ -1329,7 +1329,7 @@ static void hss_s6a_cla_cb(void *data, struct msg **msg)
 
 /* HSS Sends Insert Subscriber Data Request to MME */
 /* arguments: flags, subscriber data, imsi */
-int hss_s6a_send_idr(char *imsi_bcd, uint32_t idr_flags, uint32_t subdatamask)
+int hss_s6a_send_idr(char *imsi_bcd, uint32_t idr_flags, uint32_t subdata_mask)
 {
     int ret;
 
@@ -1360,7 +1360,7 @@ int hss_s6a_send_idr(char *imsi_bcd, uint32_t idr_flags, uint32_t subdatamask)
      * Subscriber-Status is SERVICE_GRANTED, since then the field has no
      * meaning and won't be sent through the wire, so nothing really changes
      * from the PoV of the peer. */
-    if (subdatamask == OGS_DIAM_S6A_SUBDATA_OP_DET_BARRING &&
+    if (subdata_mask == OGS_DIAM_S6A_SUBDATA_OP_DET_BARRING &&
         subscription_data.subscriber_status == OGS_SUBSCRIBER_STATUS_SERVICE_GRANTED) {
         ogs_debug("    [%s] Skip sending IDR: Only Operator-Determined-Barring changed while"
                  " Subscriber-Status is SERVICE_GRANTED.", imsi_bcd);
@@ -1447,9 +1447,9 @@ int hss_s6a_send_idr(char *imsi_bcd, uint32_t idr_flags, uint32_t subdatamask)
     /* Set the Subscription Data */
     ret = fd_msg_avp_new(ogs_diam_s6a_subscription_data, 0, &avp);
     ogs_assert(ret == 0);
-        if (subdatamask) {
+        if (subdata_mask) {
             ret = hss_s6a_avp_add_subscription_data(&subscription_data,
-                avp, subdatamask);
+                avp, subdata_mask);
             if (ret != OGS_OK) {
                 ogs_error("    [%s] Could not build Subscription-Data.",
                     imsi_bcd);
diff --git a/src/scp/sbi-path.c b/src/scp/sbi-path.c
index e0e8ef162..cca4fb4a4 100644
--- a/src/scp/sbi-path.c
+++ b/src/scp/sbi-path.c
@@ -38,7 +38,7 @@ static bool send_request(
 
 static void copy_request(
         ogs_sbi_request_t *target, ogs_sbi_request_t *source,
-        bool include_discovery);
+        bool do_not_remove_custom_header);
 
 int scp_sbi_open(void)
 {
diff --git a/src/sepp/sbi-path.c b/src/sepp/sbi-path.c
index 6c0b5c8a2..187e42a44 100644
--- a/src/sepp/sbi-path.c
+++ b/src/sepp/sbi-path.c
@@ -25,7 +25,7 @@ static int response_handler(
 
 static void copy_request(
         ogs_sbi_request_t *target, ogs_sbi_request_t *source,
-        bool include_discovery);
+        bool do_not_remove_custom_header);
 
 int sepp_sbi_open(void)
 {