diff --git a/kernel/bpf/btf.c b/kernel/bpf/btf.c
index b3940c605aac..0f4090837908 100644
--- a/kernel/bpf/btf.c
+++ b/kernel/bpf/btf.c
@@ -1410,14 +1410,15 @@ __printf(4, 5) static void __btf_verifier_log_type(struct btf_verifier_env *env,
 	if (log->level == BPF_LOG_KERNEL && !fmt)
 		return;
 
-	__btf_verifier_log(log, "[%u] %s %s%s",
+	__btf_verifier_log(log, "[%u] %s",
 			   env->log_type_id,
-			   btf_type_str(t),
-			   __btf_name_by_offset(btf, t->name_off),
-			   log_details ? " " : "");
+			   btf_type_str(t));
 
-	if (log_details)
+	if (log_details) {
+		__btf_verifier_log(log, " %s",
+				   __btf_name_by_offset(btf, t->name_off));
 		btf_type_ops(t)->log_details(env, t);
+	}
 
 	if (fmt && *fmt) {
 		__btf_verifier_log(log, " ");
@@ -3897,7 +3898,7 @@ static s32 btf_func_proto_check_meta(struct btf_verifier_env *env,
 	}
 
 	if (t->name_off) {
-		btf_verifier_log_type(env, t, "Invalid name");
+		btf_verifier_log_basic(env, t, "Should not have a name");
 		return -EINVAL;
 	}