diff --git a/test/l2cap-channel/Makefile b/test/l2cap-channel/Makefile
index a2a5edf37..4f088c0a1 100644
--- a/test/l2cap-channel/Makefile
+++ b/test/l2cap-channel/Makefile
@@ -43,8 +43,8 @@ COMMON_OBJ_ASAN     = $(addprefix build-asan/,    $(COMMON:.c=.o))
 
 
 all: \
-	build-coverage/le_data_channel_test build-asan/le_data_channel_test \
-	build-coverage/l2cap_enhanced_data_channel_test build-asan/l2cap_enhanced_data_channel_test \
+	build-coverage/l2cap_cbm_test build-asan/l2cap_cbm_test \
+	build-coverage/l2cap_ecbm_test build-asan/l2cap_ecbm_test \
 
 build-%:
 	mkdir -p $@
@@ -61,26 +61,26 @@ build-asan/%.o: %.c | build-asan
 build-asan/%.o: %.cpp | build-asan
 	${CXX} -c $(CFLAGS_ASAN) $< -o $@
 
-build-coverage/le_data_channel_test: ${COMMON_OBJ_COVERAGE} build-coverage/le_data_channel_test.o | build-coverage
+build-coverage/l2cap_cbm_test: ${COMMON_OBJ_COVERAGE} build-coverage/l2cap_cbm_test.o | build-coverage
 	${CXX} $^ ${LDFLAGS_COVERAGE} -o $@
 
-build-asan/le_data_channel_test: ${COMMON_OBJ_ASAN} build-asan/le_data_channel_test.o | build-asan
+build-asan/l2cap_cbm_test: ${COMMON_OBJ_ASAN} build-asan/l2cap_cbm_test.o | build-asan
 	${CXX} $^ ${LDFLAGS_ASAN} -o $@
 
-build-coverage/l2cap_enhanced_data_channel_test: ${COMMON_OBJ_COVERAGE} build-coverage/l2cap_enhanced_data_channel_test.o | build-coverage
+build-coverage/l2cap_ecbm_test: ${COMMON_OBJ_COVERAGE} build-coverage/l2cap_ecbm_test.o | build-coverage
 	${CXX} $^ ${LDFLAGS_COVERAGE} -o $@
 
-build-asan/l2cap_enhanced_data_channel_test: ${COMMON_OBJ_ASAN} build-asan/l2cap_enhanced_data_channel_test.o | build-asan
+build-asan/l2cap_ecbm_test: ${COMMON_OBJ_ASAN} build-asan/l2cap_ecbm_test.o | build-asan
 	${CXX} $^ ${LDFLAGS_ASAN} -o $@
 
 test: all
-	build-asan/le_data_channel_test
-	# build-asan/l2cap_enhanced_data_channel_test
+	build-asan/l2cap_cbm_test
+	# build-asan/l2cap_ecbm_test
 
 coverage: all
 	rm -f build-coverage/*.gcda
-	build-coverage/le_data_channel_test
-	build-coverage/l2cap_enhanced_data_channel_test
+	build-coverage/l2cap_cbm_test
+	build-coverage/l2cap_ecbm_test
 
 clean:
 	rm -rf build-coverage build-asan
diff --git a/test/l2cap-channel/le_data_channel_test.cpp b/test/l2cap-channel/l2cap_cbm_test.cpp
similarity index 100%
rename from test/l2cap-channel/le_data_channel_test.cpp
rename to test/l2cap-channel/l2cap_cbm_test.cpp
diff --git a/test/l2cap-channel/l2cap_enhanced_data_channel_test.cpp b/test/l2cap-channel/l2cap_ecbm_test.cpp
similarity index 100%
rename from test/l2cap-channel/l2cap_enhanced_data_channel_test.cpp
rename to test/l2cap-channel/l2cap_ecbm_test.cpp