diff --git a/src/classic/obex_srm_server.c b/src/classic/obex_srm_server.c
index 32fadf6b9..0a1c55390 100644
--- a/src/classic/obex_srm_server.c
+++ b/src/classic/obex_srm_server.c
@@ -49,19 +49,19 @@
 
 #include "classic/obex_srm_server.h"
 
-void obex_srm_init (obex_srm_t *obex_srm){
+void obex_srm_init (obex_srm_server_t *obex_srm){
     obex_srm->srm_value = OBEX_SRM_DISABLE;
     obex_srm->srmp_value = OBEX_SRMP_NEXT;
 
     obex_srm->srm_state = OBEX_SRM_STATE_DISABLED;
 }
 
-void obex_srm_header_store (obex_srm_t    *obex_srm,
-                            uint8_t        header_id,
-                            uint16_t       total_len,
-                            uint16_t       data_offset,
-                            const uint8_t *data_buffer,
-                            uint16_t       data_len)
+void obex_srm_server_header_store (obex_srm_server_t    *obex_srm,
+                                   uint8_t        header_id,
+                                   uint16_t       total_len,
+                                   uint16_t       data_offset,
+                                   const uint8_t *data_buffer,
+                                   uint16_t       data_len)
 {
     switch (header_id) {
         case OBEX_HEADER_SINGLE_RESPONSE_MODE:
@@ -75,7 +75,7 @@ void obex_srm_header_store (obex_srm_t    *obex_srm,
     }
 }
 
-static void obex_srm_handle_headers (obex_srm_t *obex_srm)
+static void obex_srm_handle_headers (obex_srm_server_t *obex_srm)
 {
     switch (obex_srm->srm_state) {
         case OBEX_SRM_STATE_DISABLED:
@@ -97,8 +97,8 @@ static void obex_srm_handle_headers (obex_srm_t *obex_srm)
     }
 }
 
-void obex_srm_add_srm_headers (obex_srm_t *obex_srm,
-                               uint16_t    goep_cid)
+void obex_srm_server_add_srm_headers (obex_srm_server_t *obex_srm,
+                                      uint16_t    goep_cid)
 {
     switch (obex_srm->srm_state) {
         case OBEX_SRM_STATE_SEND_CONFIRM:
@@ -114,7 +114,7 @@ void obex_srm_add_srm_headers (obex_srm_t *obex_srm,
     }
 }
 
-bool obex_srm_is_enabled (obex_srm_t *obex_srm)
+bool obex_srm_server_is_enabled (obex_srm_server_t *obex_srm)
 {
     obex_srm_handle_headers (obex_srm);
     return obex_srm->srm_state == OBEX_SRM_STATE_ENABLED;
diff --git a/src/classic/obex_srm_server.h b/src/classic/obex_srm_server.h
index 12c8394d6..684a245b0 100644
--- a/src/classic/obex_srm_server.h
+++ b/src/classic/obex_srm_server.h
@@ -50,25 +50,25 @@ typedef enum {
     OBEX_SRM_STATE_SEND_CONFIRM_WAIT,
     OBEX_SRM_STATE_ENABLED,
     OBEX_SRM_STATE_ENABLED_WAIT,
-} obex_srm_state_t;
+} obex_srm_server_state_t;
 
 typedef struct {
-    obex_srm_state_t srm_state;
+    obex_srm_server_state_t srm_state;
 
     uint8_t srm_value;
     uint8_t srmp_value;
-} obex_srm_t;
+} obex_srm_server_t;
 
-void obex_srm_init           (obex_srm_t    *obex_srm);
-void obex_srm_header_store   (obex_srm_t    *obex_srm,
-                              uint8_t        header_id,
-                              uint16_t       total_len,
-                              uint16_t       data_offset,
-                              const uint8_t *data_buffer,
-                              uint16_t       data_len);
-void obex_srm_add_srm_headers (obex_srm_t   *obex_srm,
-                               uint16_t      goep_cid);
-bool obex_srm_is_enabled      (obex_srm_t   *obex_srm);
+void obex_srm_server_init           (obex_srm_server_t    *obex_srm);
+void obex_srm_server_header_store   (obex_srm_server_t    *obex_srm,
+                                     uint8_t        header_id,
+                                     uint16_t       total_len,
+                                     uint16_t       data_offset,
+                                     const uint8_t *data_buffer,
+                                     uint16_t       data_len);
+void obex_srm_server_add_srm_headers (obex_srm_server_t   *obex_srm,
+                                      uint16_t      goep_cid);
+bool obex_srm_server_is_enabled      (obex_srm_server_t   *obex_srm);
 
 #if defined __cplusplus
 }