diff --git a/Cargo.lock b/Cargo.lock
index b08aacc5b..711df63cf 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3610,6 +3610,10 @@ dependencies = [
  "serde",
 ]
 
+[[package]]
+name = "sel4-bitfield-ops"
+version = "0.1.0"
+
 [[package]]
 name = "sel4-bitfield-parser"
 version = "0.1.0"
@@ -3628,10 +3632,6 @@ dependencies = [
  "sel4-bitfield-parser",
 ]
 
-[[package]]
-name = "sel4-bitfield-types"
-version = "0.1.0"
-
 [[package]]
 name = "sel4-bounce-buffer-allocator"
 version = "0.1.0"
@@ -4203,8 +4203,8 @@ dependencies = [
  "proc-macro2",
  "quote",
  "regex",
+ "sel4-bitfield-ops",
  "sel4-bitfield-parser",
- "sel4-bitfield-types",
  "sel4-build-env",
  "sel4-config",
  "sel4-config-data",
diff --git a/Cargo.toml b/Cargo.toml
index ef60b5aca..7d092cc81 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -110,9 +110,9 @@ members = [
     "crates/sel4-shared-ring-buffer/block-io/types",
     "crates/sel4-shared-ring-buffer/smoltcp",
     "crates/sel4-sync",
+    "crates/sel4/bitfield-ops",
     "crates/sel4/bitfield-parser",
     "crates/sel4/bitfield-parser/test",
-    "crates/sel4/bitfield-types",
     "crates/sel4/build-env",
     "crates/sel4/config",
     "crates/sel4/config/data",
diff --git a/crates/sel4/bitfield-types/Cargo.toml b/crates/sel4/bitfield-ops/Cargo.toml
similarity index 81%
rename from crates/sel4/bitfield-types/Cargo.toml
rename to crates/sel4/bitfield-ops/Cargo.toml
index f9cc4c007..0a2233e5c 100644
--- a/crates/sel4/bitfield-types/Cargo.toml
+++ b/crates/sel4/bitfield-ops/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "sel4-bitfield-types"
+name = "sel4-bitfield-ops"
 version = "0.1.0"
 authors = ["Nick Spinale <nick.spinale@coliasgroup.com>"]
 edition = "2021"
diff --git a/crates/sel4/bitfield-types/src/lib.rs b/crates/sel4/bitfield-ops/src/lib.rs
similarity index 100%
rename from crates/sel4/bitfield-types/src/lib.rs
rename to crates/sel4/bitfield-ops/src/lib.rs
diff --git a/crates/sel4/sys/Cargo.toml b/crates/sel4/sys/Cargo.toml
index 4882e9fb8..0ec0d2513 100644
--- a/crates/sel4/sys/Cargo.toml
+++ b/crates/sel4/sys/Cargo.toml
@@ -11,7 +11,7 @@ wrappers = []
 
 [dependencies]
 log = "0.4.17"
-sel4-bitfield-types = { path = "../bitfield-types" }
+sel4-bitfield-ops = { path = "../bitfield-ops" }
 sel4-config = { path = "../config" }
 
 [build-dependencies]
diff --git a/crates/sel4/sys/src/bf/types.rs b/crates/sel4/sys/src/bf/types.rs
index 306dd044e..2a97c1c8d 100644
--- a/crates/sel4/sys/src/bf/types.rs
+++ b/crates/sel4/sys/src/bf/types.rs
@@ -1,6 +1,6 @@
 use core::ops::Range;
 
-use sel4_bitfield_types::{get_bits, set_bits, UnsignedPrimInt};
+use sel4_bitfield_ops::{get_bits, set_bits, UnsignedPrimInt};
 
 #[repr(C)]
 #[derive(Copy, Clone, Eq, PartialEq, Ord, PartialOrd, Hash, Debug)]
diff --git a/crates/sel4/sys/src/ipc_buffer.rs b/crates/sel4/sys/src/ipc_buffer.rs
index 8ecf4e03e..8e2eb69f1 100644
--- a/crates/sel4/sys/src/ipc_buffer.rs
+++ b/crates/sel4/sys/src/ipc_buffer.rs
@@ -2,7 +2,7 @@ use core::mem;
 use core::ops::Range;
 use core::slice;
 
-use sel4_bitfield_types::{get_bits, set_bits, PrimInt};
+use sel4_bitfield_ops::{get_bits, set_bits, PrimInt};
 
 use crate::{seL4_CPtr, seL4_IPCBuffer, seL4_Word};
 
diff --git a/hacking/cargo-manifest-sources/crates/sel4/bitfield-ops/crate.nix b/hacking/cargo-manifest-sources/crates/sel4/bitfield-ops/crate.nix
new file mode 100644
index 000000000..0100bc7ab
--- /dev/null
+++ b/hacking/cargo-manifest-sources/crates/sel4/bitfield-ops/crate.nix
@@ -0,0 +1,5 @@
+{ mk }:
+
+mk {
+  package.name = "sel4-bitfield-ops";
+}
diff --git a/hacking/cargo-manifest-sources/crates/sel4/bitfield-types/crate.nix b/hacking/cargo-manifest-sources/crates/sel4/bitfield-types/crate.nix
deleted file mode 100644
index 381bfe743..000000000
--- a/hacking/cargo-manifest-sources/crates/sel4/bitfield-types/crate.nix
+++ /dev/null
@@ -1,5 +0,0 @@
-{ mk }:
-
-mk {
-  package.name = "sel4-bitfield-types";
-}
diff --git a/hacking/cargo-manifest-sources/crates/sel4/sys/crate.nix b/hacking/cargo-manifest-sources/crates/sel4/sys/crate.nix
index 4533ac1c7..36672bbff 100644
--- a/hacking/cargo-manifest-sources/crates/sel4/sys/crate.nix
+++ b/hacking/cargo-manifest-sources/crates/sel4/sys/crate.nix
@@ -20,7 +20,7 @@ mk {
   };
   nix.local.dependencies = with localCrates; [
     sel4-config
-    sel4-bitfield-types
+    sel4-bitfield-ops
   ];
   nix.local.build-dependencies = with localCrates; [
     sel4-build-env