diff --git a/source/6LoWPAN/Thread/thread_neighbor_class.c b/source/6LoWPAN/Thread/thread_neighbor_class.c
index e2186866e90..fc5bbfdf603 100644
--- a/source/6LoWPAN/Thread/thread_neighbor_class.c
+++ b/source/6LoWPAN/Thread/thread_neighbor_class.c
@@ -137,7 +137,7 @@ bool thread_neighbor_class_request_full_data_setup(thread_neighbor_class_t *clas
 
 }
 
-bool thread_neighbor_class_request_secured_data_request(thread_neighbor_class_t *class_ptr, uint8_t attribute_index)
+bool thread_neighbor_class_secured_data_request(thread_neighbor_class_t *class_ptr, uint8_t attribute_index)
 {
     thread_neigh_table_entry_t *entry = thread_neighbor_class_table_entry_get(class_ptr,attribute_index);
     if (!entry) {
@@ -154,7 +154,7 @@ void thread_neighbor_class_request_full_data_setup_set(thread_neighbor_class_t *
     }
 }
 
-void thread_neighbor_class_request_secured_data_request_set(thread_neighbor_class_t *class_ptr, uint8_t attribute_index, bool value)
+void thread_neighbor_class_secured_data_request_set(thread_neighbor_class_t *class_ptr, uint8_t attribute_index, bool value)
 {
     thread_neigh_table_entry_t *entry = thread_neighbor_class_table_entry_get(class_ptr,attribute_index);
     if (entry) {
diff --git a/source/6LoWPAN/Thread/thread_neighbor_class.h b/source/6LoWPAN/Thread/thread_neighbor_class.h
index 2d12b9ce072..cab5c6e48a7 100644
--- a/source/6LoWPAN/Thread/thread_neighbor_class.h
+++ b/source/6LoWPAN/Thread/thread_neighbor_class.h
@@ -46,7 +46,7 @@ bool thread_neighbor_class_mleid_compare(struct thread_neighbor_class_s *class_p
 
 bool thread_neighbor_class_request_full_data_setup(struct thread_neighbor_class_s *class_ptr, uint8_t attribute_index);
 
-bool thread_neighbor_class_request_secured_data_request(struct thread_neighbor_class_s *class_ptr, uint8_t attribute_index);
+bool thread_neighbor_class_secured_data_request(struct thread_neighbor_class_s *class_ptr, uint8_t attribute_index);
 
 void thread_neighbor_class_mode_parse_to_entry(struct thread_neighbor_class_s *class_ptr, uint8_t attribute_index, uint8_t mode);
 
@@ -54,7 +54,7 @@ uint8_t thread_neighbor_class_mode_write_from_entry(struct thread_neighbor_class
 
 void thread_neighbor_class_request_full_data_setup_set(struct thread_neighbor_class_s *class_ptr, uint8_t attribute_index, bool value);
 
-void thread_neighbor_class_request_secured_data_request_set(struct thread_neighbor_class_s *class_ptr, uint8_t attribute_index, bool value);
+void thread_neighbor_class_secured_data_request_set(struct thread_neighbor_class_s *class_ptr, uint8_t attribute_index, bool value);
 
 void thread_neighbor_class_entry_remove(struct thread_neighbor_class_s *class_ptr, uint8_t attribute_index);
 
diff --git a/test/nanostack/unittest/stub/thread_neighbor_class_stub.c b/test/nanostack/unittest/stub/thread_neighbor_class_stub.c
index a62c4c652a8..23150d23e4f 100644
--- a/test/nanostack/unittest/stub/thread_neighbor_class_stub.c
+++ b/test/nanostack/unittest/stub/thread_neighbor_class_stub.c
@@ -84,7 +84,7 @@ bool thread_neighbor_class_request_full_data_setup(struct thread_neighbor_class_
     return true;
 }
 
-bool thread_neighbor_class_request_secured_data_request(struct thread_neighbor_class_s *class_ptr, uint8_t attribute_index)
+bool thread_neighbor_class_secured_data_request(struct thread_neighbor_class_s *class_ptr, uint8_t attribute_index)
 {
     return false;
 }
@@ -104,7 +104,7 @@ void thread_neighbor_class_request_full_data_setup_set(struct thread_neighbor_cl
 
 }
 
-void thread_neighbor_class_request_secured_data_request_set(struct thread_neighbor_class_s *class_ptr, uint8_t attribute_index, bool value)
+void thread_neighbor_class_secured_data_request_set(struct thread_neighbor_class_s *class_ptr, uint8_t attribute_index, bool value)
 {
 
 }