diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 7c22c08622530ac5778292a28cfba1253529d0ff..052777f41617b705650c20de495899633874a8a3 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -21,7 +21,7 @@ Consequently, this indicates where an API should be added! Adding an API at a
 particular level in the hierarchy means that it is supported on all the child
 platforms of that level. For example, when adding a Unix API it should be added
 to `src/unix/mod.rs`, but when adding a Linux-only API it should be added to
-`src/unix/notbsd/linux/mod.rs`.
+`src/unix/linux_like/linux/mod.rs`.
 
 If you're not 100% sure at what level of the hierarchy an API should be added
 at, fear not! This crate has CI support which tests any binding against all
diff --git a/src/unix/bsd/freebsdlike/mod.rs b/src/unix/bsd/freebsdlike/mod.rs
index 9ddb6014d39e9bb500719989c7deae49ff885c2b..cfb8a4e1697353852aeedf49ed09c91df7ef3b85 100644
--- a/src/unix/bsd/freebsdlike/mod.rs
+++ b/src/unix/bsd/freebsdlike/mod.rs
@@ -1241,13 +1241,13 @@ extern "C" {
         mqd: ::mqd_t,
         msg_ptr: *mut ::c_char,
         msg_len: ::size_t,
-        msq_prio: *mut ::c_uint,
+        msg_prio: *mut ::c_uint,
     ) -> ::ssize_t;
     pub fn mq_send(
         mqd: ::mqd_t,
         msg_ptr: *const ::c_char,
         msg_len: ::size_t,
-        msq_prio: ::c_uint,
+        msg_prio: ::c_uint,
     ) -> ::c_int;
     pub fn mq_setattr(
         mqd: ::mqd_t,
@@ -1258,14 +1258,14 @@ extern "C" {
         mqd: ::mqd_t,
         msg_ptr: *mut ::c_char,
         msg_len: ::size_t,
-        msq_prio: *mut ::c_uint,
+        msg_prio: *mut ::c_uint,
         abs_timeout: *const ::timespec,
     ) -> ::ssize_t;
     pub fn mq_timedsend(
         mqd: ::mqd_t,
         msg_ptr: *const ::c_char,
         msg_len: ::size_t,
-        msq_prio: ::c_uint,
+        msg_prio: ::c_uint,
         abs_timeout: *const ::timespec,
     ) -> ::c_int;
     pub fn mq_unlink(name: *const ::c_char) -> ::c_int;
diff --git a/src/unix/bsd/netbsdlike/netbsd/mod.rs b/src/unix/bsd/netbsdlike/netbsd/mod.rs
index 5e3f0467ffe2b6045582b82daf25ed3a2df87a7c..ba28bce19e2da3e4bfd8f6adc5cfddfe361d08df 100644
--- a/src/unix/bsd/netbsdlike/netbsd/mod.rs
+++ b/src/unix/bsd/netbsdlike/netbsd/mod.rs
@@ -1627,13 +1627,13 @@ extern "C" {
         mqd: ::mqd_t,
         msg_ptr: *mut ::c_char,
         msg_len: ::size_t,
-        msq_prio: *mut ::c_uint,
+        msg_prio: *mut ::c_uint,
     ) -> ::ssize_t;
     pub fn mq_send(
         mqd: ::mqd_t,
         msg_ptr: *const ::c_char,
         msg_len: ::size_t,
-        msq_prio: ::c_uint,
+        msg_prio: ::c_uint,
     ) -> ::c_int;
     pub fn mq_setattr(
         mqd: ::mqd_t,
@@ -1645,7 +1645,7 @@ extern "C" {
         mqd: ::mqd_t,
         msg_ptr: *mut ::c_char,
         msg_len: ::size_t,
-        msq_prio: *mut ::c_uint,
+        msg_prio: *mut ::c_uint,
         abs_timeout: *const ::timespec,
     ) -> ::ssize_t;
     #[link_name = "__mq_timedsend50"]
@@ -1653,7 +1653,7 @@ extern "C" {
         mqd: ::mqd_t,
         msg_ptr: *const ::c_char,
         msg_len: ::size_t,
-        msq_prio: ::c_uint,
+        msg_prio: ::c_uint,
         abs_timeout: *const ::timespec,
     ) -> ::c_int;
     pub fn mq_unlink(name: *const ::c_char) -> ::c_int;
diff --git a/src/unix/linux_like/linux/mod.rs b/src/unix/linux_like/linux/mod.rs
index 87730a56aaecc4e996c86e1633ff99c1dd485e12..8e8223cda2933f29cc54bae675f5e403c4c60705 100644
--- a/src/unix/linux_like/linux/mod.rs
+++ b/src/unix/linux_like/linux/mod.rs
@@ -2535,26 +2535,26 @@ extern "C" {
         mqd: ::mqd_t,
         msg_ptr: *mut ::c_char,
         msg_len: ::size_t,
-        msq_prio: *mut ::c_uint,
+        msg_prio: *mut ::c_uint,
     ) -> ::ssize_t;
     pub fn mq_timedreceive(
         mqd: ::mqd_t,
         msg_ptr: *mut ::c_char,
         msg_len: ::size_t,
-        msq_prio: *mut ::c_uint,
+        msg_prio: *mut ::c_uint,
         abs_timeout: *const ::timespec,
     ) -> ::ssize_t;
     pub fn mq_send(
         mqd: ::mqd_t,
         msg_ptr: *const ::c_char,
         msg_len: ::size_t,
-        msq_prio: ::c_uint,
+        msg_prio: ::c_uint,
     ) -> ::c_int;
     pub fn mq_timedsend(
         mqd: ::mqd_t,
         msg_ptr: *const ::c_char,
         msg_len: ::size_t,
-        msq_prio: ::c_uint,
+        msg_prio: ::c_uint,
         abs_timeout: *const ::timespec,
     ) -> ::c_int;
     pub fn mq_getattr(mqd: ::mqd_t, attr: *mut ::mq_attr) -> ::c_int;
diff --git a/src/unix/solarish/mod.rs b/src/unix/solarish/mod.rs
index 353f1c6aa14126e887c5f40bcd5dfa4ca9428005..eaa43fe9001608c3aafbe88277c30d1c398c5f75 100644
--- a/src/unix/solarish/mod.rs
+++ b/src/unix/solarish/mod.rs
@@ -2094,26 +2094,26 @@ extern "C" {
         mqd: ::mqd_t,
         msg_ptr: *mut ::c_char,
         msg_len: ::size_t,
-        msq_prio: *mut ::c_uint,
+        msg_prio: *mut ::c_uint,
     ) -> ::ssize_t;
     pub fn mq_timedreceive(
         mqd: ::mqd_t,
         msg_ptr: *mut ::c_char,
         msg_len: ::size_t,
-        msq_prio: *mut ::c_uint,
+        msg_prio: *mut ::c_uint,
         abs_timeout: *const ::timespec,
     ) -> ::ssize_t;
     pub fn mq_send(
         mqd: ::mqd_t,
         msg_ptr: *const ::c_char,
         msg_len: ::size_t,
-        msq_prio: ::c_uint,
+        msg_prio: ::c_uint,
     ) -> ::c_int;
     pub fn mq_timedsend(
         mqd: ::mqd_t,
         msg_ptr: *const ::c_char,
         msg_len: ::size_t,
-        msq_prio: ::c_uint,
+        msg_prio: ::c_uint,
         abs_timeout: *const ::timespec,
     ) -> ::c_int;
     pub fn mq_getattr(mqd: ::mqd_t, attr: *mut ::mq_attr) -> ::c_int;
diff --git a/src/unix/uclibc/mod.rs b/src/unix/uclibc/mod.rs
index bf4d9772de5882e4d915a45e6664a0b826ea8fb7..986b05ca0b527887266a26bb72b0d2ddf940b0ab 100644
--- a/src/unix/uclibc/mod.rs
+++ b/src/unix/uclibc/mod.rs
@@ -2024,13 +2024,13 @@ extern "C" {
         mqd: ::mqd_t,
         msg_ptr: *mut ::c_char,
         msg_len: ::size_t,
-        msq_prio: *mut ::c_uint,
+        msg_prio: *mut ::c_uint,
     ) -> ::ssize_t;
     pub fn mq_send(
         mqd: ::mqd_t,
         msg_ptr: *const ::c_char,
         msg_len: ::size_t,
-        msq_prio: ::c_uint,
+        msg_prio: ::c_uint,
     ) -> ::c_int;
     pub fn mq_getattr(mqd: ::mqd_t, attr: *mut ::mq_attr) -> ::c_int;
     pub fn mq_setattr(