diff --git a/test/nanostack/unittest/Bootstraps/protocol_6lowpan_bootstrap/Makefile b/test/nanostack/unittest/Bootstraps/protocol_6lowpan_bootstrap/Makefile
index ca9952e9abf1..102b9359485c 100644
--- a/test/nanostack/unittest/Bootstraps/protocol_6lowpan_bootstrap/Makefile
+++ b/test/nanostack/unittest/Bootstraps/protocol_6lowpan_bootstrap/Makefile
@@ -41,6 +41,7 @@ TEST_SRC_FILES = \
         ../../stub/pana_stub.c \
         ../../stub/pana_client_stub.c \
         ../../stub/net_load_balance_stub.c \
+        ../../stub/mac_neighbor_table_stub.c \
 
 include ../../MakefileWorker.mk
 
diff --git a/test/nanostack/unittest/Bootstraps/protocol_6lowpan_interface/Makefile b/test/nanostack/unittest/Bootstraps/protocol_6lowpan_interface/Makefile
index bc55e8dc314c..6ec895326490 100644
--- a/test/nanostack/unittest/Bootstraps/protocol_6lowpan_interface/Makefile
+++ b/test/nanostack/unittest/Bootstraps/protocol_6lowpan_interface/Makefile
@@ -25,6 +25,7 @@ TEST_SRC_FILES = \
         ../../stub/cipv6_fragmenter_stub.c \
         ../../stub/pana_stub.c \
         ../../stub/net_load_balance_stub.c \
+        ../../stub/mac_neighbor_table_stub.c \
 
 include ../../MakefileWorker.mk
 
diff --git a/test/nanostack/unittest/nwk_interface/protocol_core/Makefile b/test/nanostack/unittest/nwk_interface/protocol_core/Makefile
index e58967aa13c0..94975e7a1d12 100644
--- a/test/nanostack/unittest/nwk_interface/protocol_core/Makefile
+++ b/test/nanostack/unittest/nwk_interface/protocol_core/Makefile
@@ -49,6 +49,7 @@ TEST_SRC_FILES = \
         ../../stub/pan_blacklist_stub.c \
         ../../stub/ipv6_routing_table_stub.c \
         ../../stub/ipv6_stub.c \
+        ../../stub/mac_neighbor_table_stub.c \
 
 include ../../MakefileWorker.mk
 
diff --git a/test/nanostack/unittest/stub/mac_neighbor_table_stub.c b/test/nanostack/unittest/stub/mac_neighbor_table_stub.c
index 06e9baa0efdd..ba51b010c738 100644
--- a/test/nanostack/unittest/stub/mac_neighbor_table_stub.c
+++ b/test/nanostack/unittest/stub/mac_neighbor_table_stub.c
@@ -27,35 +27,35 @@
 
 mac_neighbor_table_stub_def mac_neighbor_table_stub;
 
-mac_neighbor_table__t *mac_neighbor_table_create(uint8_t table_size, neighbor_entry_remove_notify *remove_cb, neighbor_entry_nud_notify *nud_cb, void *user_indentifier, uint32_t nud_threshold)
+mac_neighbor_table_t *mac_neighbor_table_create(uint8_t table_size, neighbor_entry_remove_notify *remove_cb, neighbor_entry_nud_notify *nud_cb, void *user_indentifier, uint32_t nud_threshold)
 {
     return mac_neighbor_table_stub.test_class;
 }
 
-void neighbor_table_neighbor_table_class_delete(mac_neighbor_table_t *table_class)
+void mac_neighbor_table_delete(mac_neighbor_table_t *table_class)
 {
 
 }
 
 
-void neighbor_table_class_neighbor_list_clean(mac_neighbor_table_t *table_class)
+void mac_neighbor_table_neighbor_list_clean(mac_neighbor_table_t *table_class)
 {
 
 }
 
 
-void neighbor_table_class_neighbor_timeout_update(mac_neighbor_table_t *table_class, uint32_t time_update)
+void mac_neighbor_table_neighbor_timeout_update(mac_neighbor_table_t *table_class, uint32_t time_update)
 {
 
 }
 
 
-mac_neighbor_table_entry_t *neighbor_table_class_entry_allocate(mac_neighbor_table_t *table_class, const uint8_t *mac64)
+mac_neighbor_table_entry_t *mac_neighbor_table_entry_allocate(mac_neighbor_table_t *table_class, const uint8_t *mac64)
 {
     return mac_neighbor_table_stub.test_neigh;
 }
 
-void neighbor_table_class_neighbor_remove(mac_neighbor_table_t *table_class, mac_neighbor_table_entry_t *neighbor_entry)
+void mac_neighbor_table_neighbor_remove(mac_neighbor_table_t *table_class, mac_neighbor_table_entry_t *neighbor_entry)
 {
 
 }