diff --git a/drivers/infiniband/core/addr.c b/drivers/infiniband/core/addr.c
index d2bb5a9a303fcb7d86f3a38deea2e33e7d8e9c2c..a91001c59b69d66a57770457c2c464ea0c5d14ff 100644
--- a/drivers/infiniband/core/addr.c
+++ b/drivers/infiniband/core/addr.c
@@ -373,7 +373,7 @@ static struct notifier_block nb = {
 
 static int addr_init(void)
 {
-	addr_wq = create_singlethread_workqueue("ib_addr_wq");
+	addr_wq = create_singlethread_workqueue("ib_addr");
 	if (!addr_wq)
 		return -ENOMEM;
 
diff --git a/drivers/infiniband/core/cma.c b/drivers/infiniband/core/cma.c
index bc31b54e9cac4f590cdd793e4abab994ddc1686c..db88e609bf429f6a1fb9f37527f0c21651d14320 100644
--- a/drivers/infiniband/core/cma.c
+++ b/drivers/infiniband/core/cma.c
@@ -2494,7 +2494,7 @@ static int cma_init(void)
 	next_port = (next_port % (sysctl_local_port_range[1] -
 				  sysctl_local_port_range[0])) +
 		    sysctl_local_port_range[0];
-	cma_wq = create_singlethread_workqueue("rdma_cm_wq");
+	cma_wq = create_singlethread_workqueue("rdma_cm");
 	if (!cma_wq)
 		return -ENOMEM;