diff --git a/clone.c b/clone.c
index bc02fa0e..d37e580f 100644
--- a/clone.c
+++ b/clone.c
@@ -91,8 +91,10 @@ SYS_FUNC(clone)
 		tprints("flags=");
 		if (!printflags64(clone_flags, flags & ~CSIGNAL, NULL))
 			sep = "";
-		if ((flags & CSIGNAL) != 0)
-			tprintf("%s%s", sep, signame(flags & CSIGNAL));
+		if ((flags & CSIGNAL) != 0) {
+			tprints(sep);
+			printsignal(flags & CSIGNAL);
+		}
 		if ((flags & (CLONE_PARENT_SETTID|CLONE_CHILD_SETTID
 			      |CLONE_CHILD_CLEARTID|CLONE_SETTLS)) == 0)
 			return 0;
diff --git a/fcntl.c b/fcntl.c
index 3b3b9153..0b4221ce 100644
--- a/fcntl.c
+++ b/fcntl.c
@@ -114,7 +114,7 @@ print_fcntl(struct tcb *tcp)
 		break;
 	case F_SETSIG:
 		tprints(", ");
-		tprints(signame(tcp->u_arg[2]));
+		printsignal(tcp->u_arg[2]);
 		break;
 	case F_GETOWN:
 	case F_GETPIPE_SZ:
diff --git a/prctl.c b/prctl.c
index 5830f112..669f2632 100644
--- a/prctl.c
+++ b/prctl.c
@@ -141,7 +141,7 @@ SYS_FUNC(prctl)
 			tprints(", ");
 		} else if (!umove_or_printaddr(tcp, arg2, &i)) {
 			tprints("[");
-			tprints(signame(i));
+			printsignal(i);
 			tprints("]");
 		}
 		break;
@@ -318,7 +318,7 @@ SYS_FUNC(prctl)
 		if (arg2 > 128)
 			tprintf("%" PRI_klu, arg2);
 		else
-			tprints(signame(arg2));
+			printsignal(arg2);
 		return RVAL_DECODED;
 
 	case PR_SET_PTRACER:
diff --git a/print_sigevent.c b/print_sigevent.c
index 65d370d3..96cb37cd 100644
--- a/print_sigevent.c
+++ b/print_sigevent.c
@@ -36,7 +36,7 @@ MPERS_PRINTER_DECL(void, print_sigevent,
 	case SIGEV_SIGNAL:
 	case SIGEV_THREAD:
 	case SIGEV_THREAD_ID:
-		tprints(signame(sev.sigev_signo));
+		printsignal(sev.sigev_signo);
 		break;
 	default:
 		tprintf("%u", sev.sigev_signo);
diff --git a/s390.c b/s390.c
index 91fdd069..7c20bdc3 100644
--- a/s390.c
+++ b/s390.c
@@ -1197,7 +1197,7 @@ SYS_FUNC(s390_runtime_instr)
 	switch (command) {
 	case S390_RUNTIME_INSTR_START:
 		tprints(", ");
-		tprints(signame(signum));
+		printsignal(signum);
 		break;
 
 	case S390_RUNTIME_INSTR_STOP:
diff --git a/signal.c b/signal.c
index 9e11013f..5e23aa03 100644
--- a/signal.c
+++ b/signal.c
@@ -442,19 +442,20 @@ SYS_FUNC(sigprocmask)
 
 SYS_FUNC(kill)
 {
-	tprintf("%d, %s",
-		(int) tcp->u_arg[0],
-		signame(tcp->u_arg[1]));
+	/* pid */
+	tprintf("%d, ", (int) tcp->u_arg[0]);
+	/* signal */
+	printsignal(tcp->u_arg[1]);
 
 	return RVAL_DECODED;
 }
 
 SYS_FUNC(tgkill)
 {
-	tprintf("%d, %d, %s",
-		(int) tcp->u_arg[0],
-		(int) tcp->u_arg[1],
-		signame(tcp->u_arg[2]));
+	/* tgid, tid */
+	tprintf("%d, %d, ", (int) tcp->u_arg[0], (int) tcp->u_arg[1]);
+	/* signal */
+	printsignal(tcp->u_arg[2]);
 
 	return RVAL_DECODED;
 }