diff --git a/src/pal/pal.h b/src/pal/pal.h
index ad74b771..85d41e8c 100644
--- a/src/pal/pal.h
+++ b/src/pal/pal.h
@@ -10,7 +10,7 @@ namespace snmalloc
 // If simultating OE, then we need the underlying platform
 #if !defined(OPEN_ENCLAVE) || defined(OPEN_ENCLAVE_SIMULATION)
 #  include "pal_apple.h"
-#  include "pal_free_bsd_kernel.h"
+#  include "pal_freebsd_kernel.h"
 #  include "pal_freebsd.h"
 #  include "pal_linux.h"
 #  include "pal_netbsd.h"
@@ -33,11 +33,11 @@ namespace snmalloc
 #  elif defined(FreeBSD_KERNEL)
     PALFreeBSDKernel;
 #  elif defined(__FreeBSD__)
-    PALFBSD;
+    PALFreeBSD;
 #  elif defined(__NetBSD__)
     PALNetBSD;
 #  elif defined(__OpenBSD__)
-    PALOBSD;
+    PALOpenBSD;
 #  else
 #    error Unsupported platform
 #  endif
diff --git a/src/pal/pal_freebsd.h b/src/pal/pal_freebsd.h
index 10eec07d..13d74aec 100644
--- a/src/pal/pal_freebsd.h
+++ b/src/pal/pal_freebsd.h
@@ -11,7 +11,7 @@ namespace snmalloc
    * This adds FreeBSD-specific aligned allocation to the generic BSD
    * implementation.
    */
-  class PALFBSD : public PALBSD_Aligned<PALFBSD>
+  class PALFreeBSD : public PALBSD_Aligned<PALFreeBSD>
   {
   public:
     /**
diff --git a/src/pal/pal_free_bsd_kernel.h b/src/pal/pal_freebsd_kernel.h
similarity index 100%
rename from src/pal/pal_free_bsd_kernel.h
rename to src/pal/pal_freebsd_kernel.h
diff --git a/src/pal/pal_openbsd.h b/src/pal/pal_openbsd.h
index 69651a98..fa157509 100644
--- a/src/pal/pal_openbsd.h
+++ b/src/pal/pal_openbsd.h
@@ -11,7 +11,7 @@ namespace snmalloc
    * OpenBSD behaves exactly like a generic BSD platform but this class exists
    * as a place to add OpenBSD-specific behaviour later, if required.
    */
-  class PALOBSD : public PALBSD<PALOBSD>
+  class PALOpenBSD : public PALBSD<PALOpenBSD>
   {
   public:
     /**