diff --git a/arch/arm/src/armv7-a/arm_cpupause.c b/arch/arm/src/armv7-a/arm_cpupause.c
index efb2fc04f6..2a584ebec5 100644
--- a/arch/arm/src/armv7-a/arm_cpupause.c
+++ b/arch/arm/src/armv7-a/arm_cpupause.c
@@ -81,7 +81,7 @@ static volatile spinlock_t g_cpu_resumed[CONFIG_SMP_NCPUS];
 
 bool up_cpu_pausereq(int cpu)
 {
-  return spin_islocked(&g_cpu_paused[cpu]);
+  return spin_is_locked(&g_cpu_paused[cpu]);
 }
 
 /****************************************************************************
@@ -264,7 +264,7 @@ int up_cpu_pause(int cpu)
    * request.
    */
 
-  DEBUGASSERT(!spin_islocked(&g_cpu_paused[cpu]));
+  DEBUGASSERT(!spin_is_locked(&g_cpu_paused[cpu]));
 
   spin_lock(&g_cpu_wait[cpu]);
   spin_lock(&g_cpu_paused[cpu]);
@@ -322,8 +322,8 @@ int up_cpu_resume(int cpu)
    * established thread.
    */
 
-  DEBUGASSERT(spin_islocked(&g_cpu_wait[cpu]) &&
-              !spin_islocked(&g_cpu_paused[cpu]));
+  DEBUGASSERT(spin_is_locked(&g_cpu_wait[cpu]) &&
+              !spin_is_locked(&g_cpu_paused[cpu]));
 
   spin_unlock(&g_cpu_wait[cpu]);
 
diff --git a/arch/arm/src/armv7-r/arm_cpupause.c b/arch/arm/src/armv7-r/arm_cpupause.c
index 61a455fc96..4554ac1c51 100644
--- a/arch/arm/src/armv7-r/arm_cpupause.c
+++ b/arch/arm/src/armv7-r/arm_cpupause.c
@@ -81,7 +81,7 @@ static volatile spinlock_t g_cpu_resumed[CONFIG_SMP_NCPUS];
 
 bool up_cpu_pausereq(int cpu)
 {
-  return spin_islocked(&g_cpu_paused[cpu]);
+  return spin_is_locked(&g_cpu_paused[cpu]);
 }
 
 /****************************************************************************
@@ -264,7 +264,7 @@ int up_cpu_pause(int cpu)
    * request.
    */
 
-  DEBUGASSERT(!spin_islocked(&g_cpu_paused[cpu]));
+  DEBUGASSERT(!spin_is_locked(&g_cpu_paused[cpu]));
 
   spin_lock(&g_cpu_wait[cpu]);
   spin_lock(&g_cpu_paused[cpu]);
@@ -322,8 +322,8 @@ int up_cpu_resume(int cpu)
    * established thread.
    */
 
-  DEBUGASSERT(spin_islocked(&g_cpu_wait[cpu]) &&
-              !spin_islocked(&g_cpu_paused[cpu]));
+  DEBUGASSERT(spin_is_locked(&g_cpu_wait[cpu]) &&
+              !spin_is_locked(&g_cpu_paused[cpu]));
 
   spin_unlock(&g_cpu_wait[cpu]);
 
diff --git a/arch/arm/src/cxd56xx/cxd56_cpupause.c b/arch/arm/src/cxd56xx/cxd56_cpupause.c
index c69f8035b8..66edd36912 100644
--- a/arch/arm/src/cxd56xx/cxd56_cpupause.c
+++ b/arch/arm/src/cxd56xx/cxd56_cpupause.c
@@ -163,7 +163,7 @@ static bool handle_irqreq(int cpu)
 
 bool up_cpu_pausereq(int cpu)
 {
-  return spin_islocked(&g_cpu_paused[cpu]);
+  return spin_is_locked(&g_cpu_paused[cpu]);
 }
 
 /****************************************************************************
@@ -361,7 +361,7 @@ int up_cpu_pause(int cpu)
    * request.
    */
 
-  DEBUGASSERT(!spin_islocked(&g_cpu_paused[cpu]));
+  DEBUGASSERT(!spin_is_locked(&g_cpu_paused[cpu]));
 
   spin_lock(&g_cpu_wait[cpu]);
   spin_lock(&g_cpu_paused[cpu]);
@@ -421,8 +421,8 @@ int up_cpu_resume(int cpu)
    * established thread.
    */
 
-  DEBUGASSERT(spin_islocked(&g_cpu_wait[cpu]) &&
-              !spin_islocked(&g_cpu_paused[cpu]));
+  DEBUGASSERT(spin_is_locked(&g_cpu_wait[cpu]) &&
+              !spin_is_locked(&g_cpu_paused[cpu]));
 
   spin_unlock(&g_cpu_wait[cpu]);
 
diff --git a/arch/arm/src/lc823450/lc823450_cpupause.c b/arch/arm/src/lc823450/lc823450_cpupause.c
index 13116367d2..477b8bc79f 100644
--- a/arch/arm/src/lc823450/lc823450_cpupause.c
+++ b/arch/arm/src/lc823450/lc823450_cpupause.c
@@ -91,7 +91,7 @@ volatile spinlock_t g_cpu_resumed[CONFIG_SMP_NCPUS];
 
 bool up_cpu_pausereq(int cpu)
 {
-  return spin_islocked(&g_cpu_paused[cpu]);
+  return spin_is_locked(&g_cpu_paused[cpu]);
 }
 
 /****************************************************************************
@@ -278,7 +278,7 @@ int up_cpu_pause(int cpu)
    * request.
    */
 
-  DEBUGASSERT(!spin_islocked(&g_cpu_paused[cpu]));
+  DEBUGASSERT(!spin_is_locked(&g_cpu_paused[cpu]));
 
   spin_lock(&g_cpu_wait[cpu]);
   spin_lock(&g_cpu_paused[cpu]);
@@ -346,8 +346,8 @@ int up_cpu_resume(int cpu)
    * established thread.
    */
 
-  DEBUGASSERT(spin_islocked(&g_cpu_wait[cpu]) &&
-              !spin_islocked(&g_cpu_paused[cpu]));
+  DEBUGASSERT(spin_is_locked(&g_cpu_wait[cpu]) &&
+              !spin_is_locked(&g_cpu_paused[cpu]));
 
   spin_unlock(&g_cpu_wait[cpu]);
 
diff --git a/arch/arm/src/rp2040/rp2040_cpupause.c b/arch/arm/src/rp2040/rp2040_cpupause.c
index 1f573016c0..36c433f2bb 100644
--- a/arch/arm/src/rp2040/rp2040_cpupause.c
+++ b/arch/arm/src/rp2040/rp2040_cpupause.c
@@ -131,7 +131,7 @@ static void rp2040_handle_irqreq(int irqreq)
 
 bool up_cpu_pausereq(int cpu)
 {
-  return spin_islocked(&g_cpu_paused[cpu]);
+  return spin_is_locked(&g_cpu_paused[cpu]);
 }
 
 /****************************************************************************
@@ -332,7 +332,7 @@ int up_cpu_pause(int cpu)
    * request.
    */
 
-  DEBUGASSERT(!spin_islocked(&g_cpu_paused[cpu]));
+  DEBUGASSERT(!spin_is_locked(&g_cpu_paused[cpu]));
 
   spin_lock(&g_cpu_wait[cpu]);
   spin_lock(&g_cpu_paused[cpu]);
@@ -396,8 +396,8 @@ int up_cpu_resume(int cpu)
    * established thread.
    */
 
-  DEBUGASSERT(spin_islocked(&g_cpu_wait[cpu]) &&
-              !spin_islocked(&g_cpu_paused[cpu]));
+  DEBUGASSERT(spin_is_locked(&g_cpu_wait[cpu]) &&
+              !spin_is_locked(&g_cpu_paused[cpu]));
 
   spin_unlock(&g_cpu_wait[cpu]);
 
diff --git a/arch/arm/src/sam34/sam4cm_cpupause.c b/arch/arm/src/sam34/sam4cm_cpupause.c
index 48b7944abb..5116c15d6f 100644
--- a/arch/arm/src/sam34/sam4cm_cpupause.c
+++ b/arch/arm/src/sam34/sam4cm_cpupause.c
@@ -93,7 +93,7 @@ static volatile spinlock_t g_cpu_resumed[CONFIG_SMP_NCPUS];
 
 bool up_cpu_pausereq(int cpu)
 {
-  return spin_islocked(&g_cpu_paused[cpu]);
+  return spin_is_locked(&g_cpu_paused[cpu]);
 }
 
 /****************************************************************************
@@ -218,7 +218,7 @@ int arm_pause_handler(int irq, void *c, void *arg)
    * interrupt by calling up_cpu_paused.
    */
 
-  if (spin_islocked(&g_cpu_paused[cpu]))
+  if (spin_is_locked(&g_cpu_paused[cpu]))
     {
       return up_cpu_paused(cpu);
     }
@@ -267,7 +267,7 @@ int up_cpu_pause(int cpu)
    * request.
    */
 
-  DEBUGASSERT(!spin_islocked(&g_cpu_paused[cpu]));
+  DEBUGASSERT(!spin_is_locked(&g_cpu_paused[cpu]));
 
   spin_lock(&g_cpu_wait[cpu]);
   spin_lock(&g_cpu_paused[cpu]);
@@ -336,8 +336,8 @@ int up_cpu_resume(int cpu)
    * established thread.
    */
 
-  DEBUGASSERT(spin_islocked(&g_cpu_wait[cpu]) &&
-              !spin_islocked(&g_cpu_paused[cpu]));
+  DEBUGASSERT(spin_is_locked(&g_cpu_wait[cpu]) &&
+              !spin_is_locked(&g_cpu_paused[cpu]));
 
   spin_unlock(&g_cpu_wait[cpu]);
 
diff --git a/arch/arm64/src/common/arm64_cpupause.c b/arch/arm64/src/common/arm64_cpupause.c
index 1692521bef..8c3a5dc320 100644
--- a/arch/arm64/src/common/arm64_cpupause.c
+++ b/arch/arm64/src/common/arm64_cpupause.c
@@ -80,7 +80,7 @@ static volatile spinlock_t g_cpu_resumed[CONFIG_SMP_NCPUS];
 
 bool up_cpu_pausereq(int cpu)
 {
-  return spin_islocked(&g_cpu_paused[cpu]);
+  return spin_is_locked(&g_cpu_paused[cpu]);
 }
 
 /****************************************************************************
@@ -265,7 +265,7 @@ int up_cpu_pause(int cpu)
    * request.
    */
 
-  DEBUGASSERT(!spin_islocked(&g_cpu_paused[cpu]));
+  DEBUGASSERT(!spin_is_locked(&g_cpu_paused[cpu]));
 
   spin_lock(&g_cpu_wait[cpu]);
   spin_lock(&g_cpu_paused[cpu]);
@@ -332,8 +332,8 @@ int up_cpu_resume(int cpu)
    * established thread.
    */
 
-  DEBUGASSERT(spin_islocked(&g_cpu_wait[cpu]) &&
-              !spin_islocked(&g_cpu_paused[cpu]));
+  DEBUGASSERT(spin_is_locked(&g_cpu_wait[cpu]) &&
+              !spin_is_locked(&g_cpu_paused[cpu]));
 
   spin_unlock(&g_cpu_wait[cpu]);
 
diff --git a/arch/risc-v/src/common/riscv_cpupause.c b/arch/risc-v/src/common/riscv_cpupause.c
index 87412f7ad4..059b2e580f 100644
--- a/arch/risc-v/src/common/riscv_cpupause.c
+++ b/arch/risc-v/src/common/riscv_cpupause.c
@@ -81,7 +81,7 @@ volatile spinlock_t g_cpu_resumed[CONFIG_SMP_NCPUS];
 
 bool up_cpu_pausereq(int cpu)
 {
-  return spin_islocked(&g_cpu_paused[cpu]);
+  return spin_is_locked(&g_cpu_paused[cpu]);
 }
 
 /****************************************************************************
@@ -258,7 +258,7 @@ int up_cpu_pause(int cpu)
    * request.
    */
 
-  DEBUGASSERT(!spin_islocked(&g_cpu_paused[cpu]));
+  DEBUGASSERT(!spin_is_locked(&g_cpu_paused[cpu]));
 
   spin_lock(&g_cpu_wait[cpu]);
   spin_lock(&g_cpu_paused[cpu]);
@@ -319,8 +319,8 @@ int up_cpu_resume(int cpu)
    * established thread.
    */
 
-  DEBUGASSERT(spin_islocked(&g_cpu_wait[cpu]) &&
-              !spin_islocked(&g_cpu_paused[cpu]));
+  DEBUGASSERT(spin_is_locked(&g_cpu_wait[cpu]) &&
+              !spin_is_locked(&g_cpu_paused[cpu]));
 
   spin_unlock(&g_cpu_wait[cpu]);
 
diff --git a/arch/sim/src/sim/sim_smpsignal.c b/arch/sim/src/sim/sim_smpsignal.c
index 4246dd5fd5..646d9ed019 100644
--- a/arch/sim/src/sim/sim_smpsignal.c
+++ b/arch/sim/src/sim/sim_smpsignal.c
@@ -124,7 +124,7 @@ static int sim_cpupause_handler(int irq, void *context, void *arg)
 
 bool up_cpu_pausereq(int cpu)
 {
-  return spin_islocked(&g_cpu_paused[cpu]);
+  return spin_is_locked(&g_cpu_paused[cpu]);
 }
 
 /****************************************************************************
@@ -338,8 +338,8 @@ int up_cpu_pause(int cpu)
    * the CPU is actually paused.
    */
 
-  DEBUGASSERT(!spin_islocked(&g_cpu_wait[cpu]) &&
-              !spin_islocked(&g_cpu_paused[cpu]));
+  DEBUGASSERT(!spin_is_locked(&g_cpu_wait[cpu]) &&
+              !spin_is_locked(&g_cpu_paused[cpu]));
 
   spin_lock(&g_cpu_wait[cpu]);
   spin_lock(&g_cpu_paused[cpu]);
@@ -397,8 +397,8 @@ int up_cpu_resume(int cpu)
    * established thread.
    */
 
-  DEBUGASSERT(spin_islocked(&g_cpu_wait[cpu]) &&
-              !spin_islocked(&g_cpu_paused[cpu]));
+  DEBUGASSERT(spin_is_locked(&g_cpu_wait[cpu]) &&
+              !spin_is_locked(&g_cpu_paused[cpu]));
 
   spin_unlock(&g_cpu_wait[cpu]);
 
diff --git a/arch/sparc/src/s698pm/s698pm_cpupause.c b/arch/sparc/src/s698pm/s698pm_cpupause.c
index b9480d1414..17a563d887 100644
--- a/arch/sparc/src/s698pm/s698pm_cpupause.c
+++ b/arch/sparc/src/s698pm/s698pm_cpupause.c
@@ -81,7 +81,7 @@ volatile spinlock_t g_cpu_resumed[CONFIG_SMP_NCPUS];
 
 bool up_cpu_pausereq(int cpu)
 {
-  return spin_islocked(&g_cpu_paused[cpu]);
+  return spin_is_locked(&g_cpu_paused[cpu]);
 }
 
 /****************************************************************************
@@ -260,7 +260,7 @@ int up_cpu_pause(int cpu)
    * request.
    */
 
-  DEBUGASSERT(!spin_islocked(&g_cpu_paused[cpu]));
+  DEBUGASSERT(!spin_is_locked(&g_cpu_paused[cpu]));
 
   spin_lock(&g_cpu_wait[cpu]);
   spin_lock(&g_cpu_paused[cpu]);
@@ -322,8 +322,8 @@ int up_cpu_resume(int cpu)
    * established thread.
    */
 
-  DEBUGASSERT(spin_islocked(&g_cpu_wait[cpu]) &&
-              !spin_islocked(&g_cpu_paused[cpu]));
+  DEBUGASSERT(spin_is_locked(&g_cpu_wait[cpu]) &&
+              !spin_is_locked(&g_cpu_paused[cpu]));
 
   spin_unlock(&g_cpu_wait[cpu]);
 
diff --git a/arch/xtensa/src/common/xtensa_cpupause.c b/arch/xtensa/src/common/xtensa_cpupause.c
index 3a87df0317..9a8697f3cf 100644
--- a/arch/xtensa/src/common/xtensa_cpupause.c
+++ b/arch/xtensa/src/common/xtensa_cpupause.c
@@ -66,7 +66,7 @@ static spinlock_t g_cpu_resumed[CONFIG_SMP_NCPUS];
 
 bool up_cpu_pausereq(int cpu)
 {
-  return spin_islocked(&g_cpu_paused[cpu]);
+  return spin_is_locked(&g_cpu_paused[cpu]);
 }
 
 /****************************************************************************
@@ -244,7 +244,7 @@ int up_cpu_pause(int cpu)
    * request.
    */
 
-  DEBUGASSERT(!spin_islocked(&g_cpu_paused[cpu]));
+  DEBUGASSERT(!spin_is_locked(&g_cpu_paused[cpu]));
 
   spin_lock(&g_cpu_wait[cpu]);
   spin_lock(&g_cpu_paused[cpu]);
@@ -311,8 +311,8 @@ int up_cpu_resume(int cpu)
    * established thread.
    */
 
-  DEBUGASSERT(spin_islocked(&g_cpu_wait[cpu]) &&
-              !spin_islocked(&g_cpu_paused[cpu]));
+  DEBUGASSERT(spin_is_locked(&g_cpu_wait[cpu]) &&
+              !spin_is_locked(&g_cpu_paused[cpu]));
 
   spin_unlock(&g_cpu_wait[cpu]);
 
diff --git a/include/nuttx/spinlock.h b/include/nuttx/spinlock.h
index c2a34a5008..d993d11670 100644
--- a/include/nuttx/spinlock.h
+++ b/include/nuttx/spinlock.h
@@ -292,7 +292,7 @@ void spin_unlock(FAR volatile spinlock_t *lock);
 void spin_unlock_wo_note(FAR volatile spinlock_t *lock);
 
 /****************************************************************************
- * Name: spin_islocked
+ * Name: spin_is_locked
  *
  * Description:
  *   Release one count on a non-reentrant spinlock.
@@ -307,9 +307,9 @@ void spin_unlock_wo_note(FAR volatile spinlock_t *lock);
 
 /* bool spin_islocked(FAR spinlock_t lock); */
 #ifdef CONFIG_TICKET_SPINLOCK
-#  define spin_islocked(l) ((*l).tickets.owner != (*l).tickets.next)
+#  define spin_is_locked(l) ((*l).tickets.owner != (*l).tickets.next)
 #else
-#  define spin_islocked(l) (*(l) == SP_LOCKED)
+#  define spin_is_locked(l) (*(l) == SP_LOCKED)
 #endif
 
 /****************************************************************************
diff --git a/libs/libc/pthread/pthread_spinlock.c b/libs/libc/pthread/pthread_spinlock.c
index d5c1a78a40..e4c14bfeb6 100644
--- a/libs/libc/pthread/pthread_spinlock.c
+++ b/libs/libc/pthread/pthread_spinlock.c
@@ -304,14 +304,14 @@ int pthread_spin_unlock(pthread_spinlock_t *lock)
   pthread_t me = pthread_self();
 
   DEBUGASSERT(lock != NULL &&
-              spin_islocked(&lock->sp_lock) &&
+              spin_is_locked(&lock->sp_lock) &&
               lock->sp_holder == me);
 
   if (lock == NULL)
     {
       return EINVAL;
     }
-  else if (!spin_islocked(&lock->sp_lock) || lock->sp_holder != me)
+  else if (!spin_is_locked(&lock->sp_lock) || lock->sp_holder != me)
     {
       return EPERM;
     }
diff --git a/sched/irq/irq_csection.c b/sched/irq/irq_csection.c
index b924355054..799182960d 100644
--- a/sched/irq/irq_csection.c
+++ b/sched/irq/irq_csection.c
@@ -241,7 +241,7 @@ try_again:
           cpu = this_cpu();
           if (g_cpu_nestcount[cpu] > 0)
             {
-              DEBUGASSERT(spin_islocked(&g_cpu_irqlock) &&
+              DEBUGASSERT(spin_is_locked(&g_cpu_irqlock) &&
                           g_cpu_nestcount[cpu] < UINT8_MAX);
               g_cpu_nestcount[cpu]++;
             }
@@ -330,7 +330,7 @@ try_again_in_irq:
                * and (2) this CPU should hold the lock.
                */
 
-              DEBUGASSERT(spin_islocked(&g_cpu_irqlock) &&
+              DEBUGASSERT(spin_is_locked(&g_cpu_irqlock) &&
                           (g_cpu_irqset & (1 << this_cpu())) != 0 &&
                           rtcb->irqcount < INT16_MAX);
               rtcb->irqcount++;
@@ -471,7 +471,7 @@ void leave_critical_section(irqstate_t flags)
             {
               /* Yes.. then just decrement the nesting count */
 
-              DEBUGASSERT(spin_islocked(&g_cpu_irqlock));
+              DEBUGASSERT(spin_is_locked(&g_cpu_irqlock));
               g_cpu_nestcount[cpu]--;
             }
           else
@@ -480,7 +480,7 @@ void leave_critical_section(irqstate_t flags)
                * and release the spinlock (if necessary).
                */
 
-              DEBUGASSERT(spin_islocked(&g_cpu_irqlock) &&
+              DEBUGASSERT(spin_is_locked(&g_cpu_irqlock) &&
                           g_cpu_nestcount[cpu] == 1);
 
               FAR struct tcb_s *rtcb = current_task(cpu);
@@ -518,7 +518,7 @@ void leave_critical_section(irqstate_t flags)
             {
               /* Yes... the spinlock should remain set */
 
-              DEBUGASSERT(spin_islocked(&g_cpu_irqlock));
+              DEBUGASSERT(spin_is_locked(&g_cpu_irqlock));
               rtcb->irqcount--;
             }
           else
@@ -535,7 +535,7 @@ void leave_critical_section(irqstate_t flags)
                * released, then unlock the spinlock.
                */
 
-              DEBUGASSERT(spin_islocked(&g_cpu_irqlock) &&
+              DEBUGASSERT(spin_is_locked(&g_cpu_irqlock) &&
                           (g_cpu_irqset & (1 << cpu)) != 0);
 
               /* Check if releasing the lock held by this CPU will unlock the
diff --git a/sched/sched/sched.h b/sched/sched/sched.h
index 0b2dc5f8f6..c8e42b9e54 100644
--- a/sched/sched/sched.h
+++ b/sched/sched/sched.h
@@ -386,7 +386,7 @@ FAR struct tcb_s *this_task(void);
 int  nxsched_select_cpu(cpu_set_t affinity);
 int  nxsched_pause_cpu(FAR struct tcb_s *tcb);
 
-#  define nxsched_islocked_global() spin_islocked(&g_cpu_schedlock)
+#  define nxsched_islocked_global() spin_is_locked(&g_cpu_schedlock)
 #  define nxsched_islocked_tcb(tcb) nxsched_islocked_global()
 
 #else
diff --git a/sched/sched/sched_lock.c b/sched/sched/sched_lock.c
index b839fbb7e4..7d9dc49755 100644
--- a/sched/sched/sched_lock.c
+++ b/sched/sched/sched_lock.c
@@ -181,7 +181,7 @@ int sched_lock(void)
            * and g_cpu_lockset should include the bit setting for this CPU.
            */
 
-          DEBUGASSERT(spin_islocked(&g_cpu_schedlock) &&
+          DEBUGASSERT(spin_is_locked(&g_cpu_schedlock) &&
                       (g_cpu_lockset & (1 << this_cpu())) != 0);
         }
 
diff --git a/sched/sched/sched_unlock.c b/sched/sched/sched_unlock.c
index 18b12f53f3..eec27fd4a2 100644
--- a/sched/sched/sched_unlock.c
+++ b/sched/sched/sched_unlock.c
@@ -105,7 +105,7 @@ int sched_unlock(void)
            * release our hold on the lock.
            */
 
-          DEBUGASSERT(spin_islocked(&g_cpu_schedlock) &&
+          DEBUGASSERT(spin_is_locked(&g_cpu_schedlock) &&
                       (g_cpu_lockset & (1 << cpu)) != 0);
 
           spin_clrbit(&g_cpu_lockset, cpu, &g_cpu_locksetlock,