diff --git a/ompi/mca/osc/ucx/osc_ucx.h b/ompi/mca/osc/ucx/osc_ucx.h
index 13eeaf0fef..c245aa25ce 100644
--- a/ompi/mca/osc/ucx/osc_ucx.h
+++ b/ompi/mca/osc/ucx/osc_ucx.h
@@ -16,8 +16,8 @@
 #include "ompi/communicator/communicator.h"
 #include "opal/mca/common/ucx/common_ucx.h"
 
-#define OSC_UCX_ASSERT MCA_COMMON_UCX_ASSERT
-#define OSC_UCX_ERROR MCA_COMMON_UCX_ERROR
+#define OSC_UCX_ASSERT  MCA_COMMON_UCX_ASSERT
+#define OSC_UCX_ERROR   MCA_COMMON_UCX_ERROR
 #define OSC_UCX_VERBOSE MCA_COMMON_UCX_VERBOSE
 
 #define OMPI_OSC_UCX_POST_PEER_MAX 32
diff --git a/ompi/mca/pml/ucx/pml_ucx.h b/ompi/mca/pml/ucx/pml_ucx.h
index defc7c76e7..ed7d0746a4 100644
--- a/ompi/mca/pml/ucx/pml_ucx.h
+++ b/ompi/mca/pml/ucx/pml_ucx.h
@@ -22,8 +22,8 @@
 #include <ucp/api/ucp.h>
 #include "pml_ucx_freelist.h"
 
-#define PML_UCX_ASSERT MCA_COMMON_UCX_ASSERT
-#define PML_UCX_ERROR MCA_COMMON_UCX_ERROR
+#define PML_UCX_ASSERT  MCA_COMMON_UCX_ASSERT
+#define PML_UCX_ERROR   MCA_COMMON_UCX_ERROR
 #define PML_UCX_VERBOSE MCA_COMMON_UCX_VERBOSE
 
 
diff --git a/oshmem/mca/spml/ucx/spml_ucx.c b/oshmem/mca/spml/ucx/spml_ucx.c
index 83fe6c1db2..4ab429f296 100644
--- a/oshmem/mca/spml/ucx/spml_ucx.c
+++ b/oshmem/mca/spml/ucx/spml_ucx.c
@@ -150,7 +150,7 @@ int mca_spml_ucx_del_procs(ompi_proc_t** procs, size_t nprocs)
         if (dreq != NULL) {
             if (UCS_PTR_IS_ERR(dreq)) {
                 SPML_UCX_ERROR("ucp_disconnect_nb(%zu) failed: %s", n,
-                           ucs_status_string(UCS_PTR_STATUS(dreq)));
+                               ucs_status_string(UCS_PTR_STATUS(dreq)));
                 continue;
             } else {
                 dreqs[num_reqs++] = dreq;
@@ -292,7 +292,7 @@ int mca_spml_ucx_add_procs(ompi_proc_t** procs, size_t nprocs)
                             &mca_spml_ucx.ucp_peers[i].ucp_conn);
         if (UCS_OK != err) {
             SPML_UCX_ERROR("ucp_ep_create(proc=%zu/%zu) failed: %s", n, nprocs,
-                       ucs_status_string(err));
+                           ucs_status_string(err));
             goto error2;
         }
 
@@ -335,7 +335,7 @@ spml_ucx_mkey_t * mca_spml_ucx_get_mkey_slow(int pe, void *va, void **rva)
     r_mkey = mca_memheap_base_get_cached_mkey(pe, va, 0, rva);
     if (OPAL_UNLIKELY(!r_mkey)) {
         SPML_UCX_ERROR("pe=%d: %p is not address of symmetric variable",
-                   pe, va);
+                       pe, va);
         oshmem_shmem_abort(-1);
         return NULL;
     }
@@ -427,7 +427,7 @@ void mca_spml_ucx_memuse_hook(void *addr, size_t length)
     status = ucp_mem_advise(mca_spml_ucx.ucp_context, ucx_mkey->mem_h, &params);
     if (UCS_OK != status) {
         SPML_UCX_ERROR("ucp_mem_advise failed addr %p len %llu : %s",
-                   addr, (unsigned long long)length, ucs_status_string(status));
+                       addr, (unsigned long long)length, ucs_status_string(status));
     }
 }
 
diff --git a/oshmem/mca/spml/ucx/spml_ucx.h b/oshmem/mca/spml/ucx/spml_ucx.h
index 6210228fc1..b3809d1ff0 100644
--- a/oshmem/mca/spml/ucx/spml_ucx.h
+++ b/oshmem/mca/spml/ucx/spml_ucx.h
@@ -38,8 +38,8 @@
 
 BEGIN_C_DECLS
 
-#define SPML_UCX_ASSERT MCA_COMMON_UCX_ASSERT
-#define SPML_UCX_ERROR MCA_COMMON_UCX_ERROR
+#define SPML_UCX_ASSERT  MCA_COMMON_UCX_ASSERT
+#define SPML_UCX_ERROR   MCA_COMMON_UCX_ERROR
 #define SPML_UCX_VERBOSE MCA_COMMON_UCX_VERBOSE
 
 /**