diff --git a/l3kernel/testfiles/m3clist002.lvt b/l3kernel/testfiles/m3clist002.lvt
index ad1a1595f1..cc0151d7e3 100644
--- a/l3kernel/testfiles/m3clist002.lvt
+++ b/l3kernel/testfiles/m3clist002.lvt
@@ -36,21 +36,21 @@
   {
     \clist_clear:N \l_a_clist
     \clist_gclear:N \g_b_clist
-    \TYPE { \tex_meaning:D \l_a_clist }
+    \TYPE { \cs_meaning:N \l_a_clist }
   }
-  \TYPE { \tex_meaning:D \l_a_clist }
-  \TYPE { \tex_meaning:D \g_b_clist }
+  \TYPE { \cs_meaning:N \l_a_clist }
+  \TYPE { \cs_meaning:N \g_b_clist }
   \SEPARATOR
   {
-    \TYPE { \tex_meaning:D \l_undefined_clist }
-    \TYPE { \tex_meaning:D \g_undefined_clist }
+    \TYPE { \cs_meaning:N \l_undefined_clist }
+    \TYPE { \cs_meaning:N \g_undefined_clist }
     \clist_clear:N \l_undefined_clist
     \clist_clear:N \g_undefined_clist
-    \TYPE { \tex_meaning:D \l_undefined_clist }
-    \TYPE { \tex_meaning:D \g_undefined_clist }
+    \TYPE { \cs_meaning:N \l_undefined_clist }
+    \TYPE { \cs_meaning:N \g_undefined_clist }
   }
-  \TYPE { \tex_meaning:D \l_undefined_clist }
-  \TYPE { \tex_meaning:D \g_undefined_clist }
+  \TYPE { \cs_meaning:N \l_undefined_clist }
+  \TYPE { \cs_meaning:N \g_undefined_clist }
 }
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -63,13 +63,13 @@
     \clist_clear_new:N  \l_c_clist % previously undefined
     \clist_gclear_new:N \g_b_clist
     \clist_gclear_new:N \g_d_clist % previously undefined
-    \TYPE { \tex_meaning:D \l_a_clist }
-    \TYPE { \tex_meaning:D \l_c_clist }
+    \TYPE { \cs_meaning:N \l_a_clist }
+    \TYPE { \cs_meaning:N \l_c_clist }
   }
-  \TYPE { \tex_meaning:D \l_a_clist }
-  \TYPE { \tex_meaning:D \l_c_clist }% STILL UNDEFINED?!
-  \TYPE { \tex_meaning:D \g_b_clist }
-  \TYPE { \tex_meaning:D \g_d_clist }
+  \TYPE { \cs_meaning:N \l_a_clist }
+  \TYPE { \cs_meaning:N \l_c_clist }% STILL UNDEFINED?!
+  \TYPE { \cs_meaning:N \g_b_clist }
+  \TYPE { \cs_meaning:N \g_d_clist }
 }
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -83,18 +83,18 @@
     \clist_set_eq:NN  \l_e_clist  \l_tmpa_clist % previously undefined
     \clist_gset_eq:NN \g_b_clist  \l_tmpa_clist
     \clist_gset_eq:NN \g_f_clist  \l_tmpa_clist % previously undefined
-    \TYPE{ \tex_meaning:D \l_tmpa_clist }
-    \TYPE{ \tex_meaning:D \l_e_clist    }
-    \TYPE{ \tex_meaning:D \l_a_clist    }
+    \TYPE{ \cs_meaning:N \l_tmpa_clist }
+    \TYPE{ \cs_meaning:N \l_e_clist    }
+    \TYPE{ \cs_meaning:N \l_a_clist    }
     \SEPARATOR
   }
-  \TYPE{ \tex_meaning:D \l_tmpa_clist }
-  \TYPE{ \tex_meaning:D \l_e_clist    }
-  \TYPE{ \tex_meaning:D \l_a_clist    }
+  \TYPE{ \cs_meaning:N \l_tmpa_clist }
+  \TYPE{ \cs_meaning:N \l_e_clist    }
+  \TYPE{ \cs_meaning:N \l_a_clist    }
   \SEPARATOR
-  \TYPE{ \tex_meaning:D \l_tmpa_clist }
-  \TYPE{ \tex_meaning:D \g_f_clist    }
-  \TYPE{ \tex_meaning:D \g_b_clist    }
+  \TYPE{ \cs_meaning:N \l_tmpa_clist }
+  \TYPE{ \cs_meaning:N \g_f_clist    }
+  \TYPE{ \cs_meaning:N \g_b_clist    }
 }
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -108,9 +108,9 @@
     \clist_put_left:Nn \l_a_clist    {xyz}
     \clist_put_left:Nn \l_a_clist    {uvw}
     \clist_concat:NNN \l_c_clist \l_tmpa_clist \l_a_clist
-    \TYPE{ \tex_meaning:D \l_c_clist }
+    \TYPE{ \cs_meaning:N \l_c_clist }
   }
-  \TYPE{ \tex_meaning:D \l_c_clist }
+  \TYPE{ \cs_meaning:N \l_c_clist }
   \SEPARATOR
   \clist_clear:c {l_a_clist}
   \clist_clear:c {l_tmpa_clist}
@@ -120,9 +120,9 @@
     \clist_put_left:cn {l_a_clist}    {XYZ}
     \clist_put_left:cn {l_a_clist}    {UVW}
     \clist_concat:ccc  {l_c_clist} {l_tmpa_clist} {l_a_clist}
-    \TYPE{ \tex_meaning:D \l_c_clist }
+    \TYPE{ \cs_meaning:N \l_c_clist }
   }
-  \TYPE{ \tex_meaning:D \l_c_clist }
+  \TYPE{ \cs_meaning:N \l_c_clist }
 }
 
 
@@ -136,7 +136,7 @@
     \clist_put_left:Nn \l_a_clist    {uvw}
     \clist_gconcat:NNN \g_b_clist \l_tmpa_clist \l_a_clist
   }
-  \TYPE{ \tex_meaning:D \g_b_clist }
+  \TYPE{ \cs_meaning:N \g_b_clist }
   \SEPARATOR
   \clist_gclear:c {g_b_clist}
   \clist_clear:c {l_tmpa_clist}
@@ -148,7 +148,7 @@
     \clist_put_left:cn {l_a_clist}    {UVW}
     \clist_gconcat:ccc  {g_b_clist} {l_tmpa_clist} {l_a_clist}
   }
-  \TYPE{ \tex_meaning:D \g_b_clist }
+  \TYPE{ \cs_meaning:N \g_b_clist }
 }
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
diff --git a/l3kernel/testfiles/m3int002.lvt b/l3kernel/testfiles/m3int002.lvt
index f2a75b590b..c420fdfe43 100644
--- a/l3kernel/testfiles/m3int002.lvt
+++ b/l3kernel/testfiles/m3int002.lvt
@@ -301,16 +301,16 @@
   \TIMO
   \int_new:N \l_A_int
   \int_new:c { g_A_int }
-  \TYPE { \tex_meaning:D \l_A_int }
-  \TYPE { \tex_meaning:D \g_A_int }
+  \TYPE { \cs_meaning:N \l_A_int }
+  \TYPE { \cs_meaning:N \g_A_int }
   {
     \int_new:N \l_B_int
     \int_new:c { g_B_int }
-    \TYPE { \tex_meaning:D \l_B_int }
-    \TYPE { \tex_meaning:D \g_B_int }
+    \TYPE { \cs_meaning:N \l_B_int }
+    \TYPE { \cs_meaning:N \g_B_int }
   }
-  \TYPE { \tex_meaning:D \l_B_int }
-  \TYPE { \tex_meaning:D \g_B_int }
+  \TYPE { \cs_meaning:N \l_B_int }
+  \TYPE { \cs_meaning:N \g_B_int }
 }
 
 \TEST { Integer~creation~errors } {
@@ -326,14 +326,14 @@
 
 \TEST { Constant~integer~creation } {
   \int_const:Nn \c_A_int { 10 / 2 }
-  \TYPE { \tex_meaning:D \c_A_int }
+  \TYPE { \cs_meaning:N \c_A_int }
   \TYPE { \int_use:N \c_A_int }
   {
     \int_const:cn { c_B_int } { -10 }
-    \TYPE { \tex_meaning:D \c_B_int }
+    \TYPE { \cs_meaning:N \c_B_int }
     \TYPE { \int_use:N \c_B_int }
   }
-  \TYPE { \tex_meaning:D \c_B_int }
+  \TYPE { \cs_meaning:N \c_B_int }
   \TYPE { \int_use:N \c_B_int }
 }
 
diff --git a/l3kernel/testfiles/m3seq002.lvt b/l3kernel/testfiles/m3seq002.lvt
index 460aa07813..42f961bc28 100644
--- a/l3kernel/testfiles/m3seq002.lvt
+++ b/l3kernel/testfiles/m3seq002.lvt
@@ -23,8 +23,8 @@
     \cs_if_eq:NNTF \l_a_seq \c_empty_seq { \TRUE } { \ERROR }
     \cs_if_eq:NNTF \g_b_seq \c_empty_seq { \TRUE } { \ERROR }
   }
-  \TYPE { \tex_meaning:D \l_a_seq }
-  \TYPE { \tex_meaning:D \g_b_seq }
+  \TYPE { \cs_meaning:N \l_a_seq }
+  \TYPE { \cs_meaning:N \g_b_seq }
 }
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -35,21 +35,21 @@
   {
     \seq_clear:N \l_a_seq
     \seq_gclear:N \g_b_seq
-    \TYPE { \tex_meaning:D \l_a_seq }
+    \TYPE { \cs_meaning:N \l_a_seq }
   }
-  \TYPE { \tex_meaning:D \l_a_seq }
-  \TYPE { \tex_meaning:D \g_b_seq }
+  \TYPE { \cs_meaning:N \l_a_seq }
+  \TYPE { \cs_meaning:N \g_b_seq }
   \SEPARATOR
   {
-    \TYPE { \tex_meaning:D \l_undefined_seq }
-    \TYPE { \tex_meaning:D \g_undefined_seq }
+    \TYPE { \cs_meaning:N \l_undefined_seq }
+    \TYPE { \cs_meaning:N \g_undefined_seq }
     \seq_clear:N \l_undefined_seq
     \seq_gclear:N \g_undefined_seq
-    \TYPE { \tex_meaning:D \l_undefined_seq }
-    \TYPE { \tex_meaning:D \g_undefined_seq }
+    \TYPE { \cs_meaning:N \l_undefined_seq }
+    \TYPE { \cs_meaning:N \g_undefined_seq }
   }
-  \TYPE { \tex_meaning:D \l_undefined_seq }
-  \TYPE { \tex_meaning:D \g_undefined_seq }
+  \TYPE { \cs_meaning:N \l_undefined_seq }
+  \TYPE { \cs_meaning:N \g_undefined_seq }
 }
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -62,13 +62,13 @@
     \seq_clear_new:N  \l_c_seq % previously undefined
     \seq_gclear_new:N \g_b_seq
     \seq_gclear_new:N \g_d_seq % previously undefined
-    \TYPE { \tex_meaning:D \l_a_seq }
-    \TYPE { \tex_meaning:D \l_c_seq }
+    \TYPE { \cs_meaning:N \l_a_seq }
+    \TYPE { \cs_meaning:N \l_c_seq }
   }
-  \TYPE { \tex_meaning:D \l_a_seq }
-  \TYPE { \tex_meaning:D \l_c_seq }% STILL UNDEFINED?!
-  \TYPE { \tex_meaning:D \g_b_seq }
-  \TYPE { \tex_meaning:D \g_d_seq }
+  \TYPE { \cs_meaning:N \l_a_seq }
+  \TYPE { \cs_meaning:N \l_c_seq }% STILL UNDEFINED?!
+  \TYPE { \cs_meaning:N \g_b_seq }
+  \TYPE { \cs_meaning:N \g_d_seq }
 }
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -82,18 +82,18 @@
     \seq_set_eq:NN  \l_e_seq  \l_tmpa_seq % previously undefined
     \seq_gset_eq:NN \g_b_seq  \l_tmpa_seq
     \seq_gset_eq:NN \g_f_seq  \l_tmpa_seq % previously undefined
-    \TYPE{ \tex_meaning:D \l_tmpa_seq }
-    \TYPE{ \tex_meaning:D \l_e_seq    }
-    \TYPE{ \tex_meaning:D \l_a_seq    }
+    \TYPE{ \cs_meaning:N \l_tmpa_seq }
+    \TYPE{ \cs_meaning:N \l_e_seq    }
+    \TYPE{ \cs_meaning:N \l_a_seq    }
     \SEPARATOR
   }
-  \TYPE{ \tex_meaning:D \l_tmpa_seq }
-  \TYPE{ \tex_meaning:D \l_e_seq    }
-  \TYPE{ \tex_meaning:D \l_a_seq    }
+  \TYPE{ \cs_meaning:N \l_tmpa_seq }
+  \TYPE{ \cs_meaning:N \l_e_seq    }
+  \TYPE{ \cs_meaning:N \l_a_seq    }
   \SEPARATOR
-  \TYPE{ \tex_meaning:D \l_tmpa_seq }
-  \TYPE{ \tex_meaning:D \g_f_seq    }
-  \TYPE{ \tex_meaning:D \g_b_seq    }
+  \TYPE{ \cs_meaning:N \l_tmpa_seq }
+  \TYPE{ \cs_meaning:N \g_f_seq    }
+  \TYPE{ \cs_meaning:N \g_b_seq    }
 }
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%