diff --git a/asc2log.c b/asc2log.c
index 0596498..b14e7db 100644
--- a/asc2log.c
+++ b/asc2log.c
@@ -270,7 +270,7 @@ void eval_canfd(char* buf, struct timeval *date_tvp, char timestamps, int dplace
 		extra_info = " T\n";
 
 	/* don't trust ASCII content - sanitize data length */
-	if (dlen != can_dlc2len(can_len2dlc(dlen)))
+	if (dlen != can_fd_dlc2len(can_fd_len2dlc(dlen)))
 		return;
 
 	get_can_id(&cf, tmp1, 16);
diff --git a/cangen.c b/cangen.c
index 300690e..0b8b102 100644
--- a/cangen.c
+++ b/cangen.c
@@ -367,7 +367,7 @@ int main(int argc, char **argv)
 		}
 
 		/* ensure discrete CAN FD length values 0..8, 12, 16, 20, 24, 32, 64 */
-		frame.len = can_dlc2len(can_len2dlc(frame.len));
+		frame.len = can_fd_dlc2len(can_fd_len2dlc(frame.len));
 	} else {
 		/* sanitize Classical CAN 2.0 frame length */
 		if (len8_dlc) {
@@ -425,7 +425,7 @@ int main(int argc, char **argv)
 		if (dlc_mode == MODE_RANDOM) {
 
 			if (canfd)
-				frame.len = can_dlc2len(random() & 0xF);
+				frame.len = can_fd_dlc2len(random() & 0xF);
 			else {
 				frame.len = random() & 0xF;
 
@@ -519,7 +519,7 @@ resend:
 			incdlc %= CAN_MAX_RAW_DLC + 1;
 
 			if (canfd && !mix)
-				frame.len = can_dlc2len(incdlc);
+				frame.len = can_fd_dlc2len(incdlc);
 			else if (len8_dlc) {
 				if (incdlc > CAN_MAX_DLEN) {
 					frame.len = CAN_MAX_DLEN;
diff --git a/cansend.c b/cansend.c
index 3708d3e..ae031d9 100644
--- a/cansend.c
+++ b/cansend.c
@@ -147,7 +147,7 @@ int main(int argc, char **argv)
 		}
 
 		/* ensure discrete CAN FD length values 0..8, 12, 16, 20, 24, 32, 64 */
-		frame.len = can_dlc2len(can_len2dlc(frame.len));
+		frame.len = can_fd_dlc2len(can_fd_len2dlc(frame.len));
 	}
 
 	/* disable default receive filter on this RAW socket */
diff --git a/lib.c b/lib.c
index aed3734..935270b 100644
--- a/lib.c
+++ b/lib.c
@@ -84,10 +84,10 @@ static inline void _put_id(char *buf, int end_offset, canid_t id)
 static const unsigned char dlc2len[] = {0, 1, 2, 3, 4, 5, 6, 7,
 					8, 12, 16, 20, 24, 32, 48, 64};
 
-/* get data length from can_dlc with sanitized can_dlc */
-unsigned char can_dlc2len(unsigned char can_dlc)
+/* get data length from raw data length code (DLC) */
+unsigned char can_fd_dlc2len(unsigned char dlc)
 {
-	return dlc2len[can_dlc & 0x0F];
+	return dlc2len[dlc & 0x0F];
 }
 
 static const unsigned char len2dlc[] = {0, 1, 2, 3, 4, 5, 6, 7, 8,		/* 0 - 8 */
@@ -102,7 +102,7 @@ static const unsigned char len2dlc[] = {0, 1, 2, 3, 4, 5, 6, 7, 8,		/* 0 - 8 */
 					15, 15, 15, 15, 15, 15, 15, 15};	/* 57 - 64 */
 
 /* map the sanitized data length to an appropriate data length code */
-unsigned char can_len2dlc(unsigned char len)
+unsigned char can_fd_len2dlc(unsigned char len)
 {
 	if (len > 64)
 		return 0xF;
diff --git a/lib.h b/lib.h
index e0a0e1c..a4d3ce5 100644
--- a/lib.h
+++ b/lib.h
@@ -61,11 +61,11 @@
 
 /* CAN DLC to real data length conversion helpers especially for CAN FD */
 
-/* get data length from can_dlc with sanitized can_dlc */
-unsigned char can_dlc2len(unsigned char can_dlc);
+/* get data length from raw data length code (DLC) */
+unsigned char can_fd_dlc2len(unsigned char dlc);
 
 /* map the sanitized data length to an appropriate data length code */
-unsigned char can_len2dlc(unsigned char len);
+unsigned char can_fd_len2dlc(unsigned char len);
 
 unsigned char asc2nibble(char c);
 /*
diff --git a/log2asc.c b/log2asc.c
index 6970869..2bbd05c 100644
--- a/log2asc.c
+++ b/log2asc.c
@@ -116,7 +116,7 @@ void canfd_asc(struct canfd_frame *cf, int devno, int mtu, char *extra_info, FIL
 	char *dir = "Rx";
 	unsigned int flags = 0;
 	unsigned int dlen = cf->len;
-	unsigned int dlc = can_len2dlc(dlen);
+	unsigned int dlc = can_fd_len2dlc(dlen);
 
 	/* relevant flags in Flags field */
 #define ASC_F_RTR 0x00000010