diff --git a/src/commands/bitmap_command.rs b/src/commands/bitmap_command.rs
index 6018b33..24400c7 100644
--- a/src/commands/bitmap_command.rs
+++ b/src/commands/bitmap_command.rs
@@ -45,8 +45,8 @@ pub unsafe extern "C" fn sp_cmd_bitmap_try_into_packet(
     heap_move_ok(unsafe { heap_remove(command) }.try_into())
 }
 
-wrap_clone!(BitmapCommand, sp_cmd_bitmap);
-wrap_free!(BitmapCommand, sp_cmd_bitmap);
+wrap_clone!(sp_cmd_bitmap::BitmapCommand);
+wrap_free!(sp_cmd_bitmap::BitmapCommand);
 
 /// Returns a pointer to the provided `BitmapCommand`.
 ///
diff --git a/src/commands/bitvec_command.rs b/src/commands/bitvec_command.rs
index b3eb843..aeff1cd 100644
--- a/src/commands/bitvec_command.rs
+++ b/src/commands/bitvec_command.rs
@@ -45,8 +45,8 @@ pub unsafe extern "C" fn sp_cmd_bitvec_try_into_packet(
     heap_move_ok(unsafe { heap_remove(command) }.try_into())
 }
 
-wrap_clone!(BitVecCommand, sp_cmd_bitvec);
-wrap_free!(BitVecCommand, sp_cmd_bitvec);
+wrap_clone!(sp_cmd_bitvec::BitVecCommand);
+wrap_free!(sp_cmd_bitvec::BitVecCommand);
 
 /// Returns a pointer to the [BitVec] contained in the [BitVecCommand].
 #[no_mangle]
diff --git a/src/commands/brightness_grid_command.rs b/src/commands/brightness_grid_command.rs
index 7803486..9c5069e 100644
--- a/src/commands/brightness_grid_command.rs
+++ b/src/commands/brightness_grid_command.rs
@@ -41,8 +41,8 @@ pub unsafe extern "C" fn sp_cmd_brightness_grid_into_packet(
     heap_move_ok(unsafe { heap_remove(command) }.try_into())
 }
 
-wrap_clone!(BrightnessGridCommand, sp_cmd_brightness_grid);
-wrap_free!(BrightnessGridCommand, sp_cmd_brightness_grid);
+wrap_clone!(sp_cmd_brightness_grid::BrightnessGridCommand);
+wrap_free!(sp_cmd_brightness_grid::BrightnessGridCommand);
 
 /// Moves the provided [BrightnessGrid] to be contained in the [BrightnessGridCommand].
 #[no_mangle]
diff --git a/src/commands/cc_only_commands.rs b/src/commands/cc_only_commands.rs
index 0acfa68..fc73303 100644
--- a/src/commands/cc_only_commands.rs
+++ b/src/commands/cc_only_commands.rs
@@ -12,7 +12,7 @@ pub unsafe extern "C" fn sp_cmd_clear_new() -> NonNull<ClearCommand> {
     heap_move_nonnull(ClearCommand)
 }
 
-wrap_free!(ClearCommand, sp_cmd_clear);
+wrap_free!(sp_cmd_clear::ClearCommand);
 
 /// Kills the udp daemon on the display, which usually results in a restart.
 ///
@@ -24,7 +24,7 @@ pub unsafe extern "C" fn sp_cmd_hard_reset_new() -> NonNull<HardResetCommand> {
     heap_move_nonnull(HardResetCommand)
 }
 
-wrap_free!(HardResetCommand, sp_cmd_hard_reset);
+wrap_free!(sp_cmd_hard_reset::HardResetCommand);
 
 /// A yet-to-be-tested command.
 ///
@@ -34,4 +34,4 @@ pub unsafe extern "C" fn sp_cmd_fade_out_new() -> NonNull<FadeOutCommand> {
     heap_move_nonnull(FadeOutCommand)
 }
 
-wrap_free!(FadeOutCommand, sp_cmd_fade_out);
+wrap_free!(sp_cmd_fade_out::FadeOutCommand);
diff --git a/src/commands/char_grid_command.rs b/src/commands/char_grid_command.rs
index 8a6c07c..b895718 100644
--- a/src/commands/char_grid_command.rs
+++ b/src/commands/char_grid_command.rs
@@ -41,8 +41,8 @@ pub unsafe extern "C" fn sp_cmd_char_grid_try_into_packet(
     heap_move_ok(unsafe { heap_remove(command) }.try_into())
 }
 
-wrap_clone!(CharGridCommand, sp_cmd_char_grid);
-wrap_free!(CharGridCommand, sp_cmd_char_grid);
+wrap_clone!(sp_cmd_char_grid::CharGridCommand);
+wrap_free!(sp_cmd_char_grid::CharGridCommand);
 
 /// Moves the provided [CharGrid] to be contained in the [CharGridCommand].
 #[no_mangle]
diff --git a/src/commands/cp437_grid_command.rs b/src/commands/cp437_grid_command.rs
index fc32f05..3f1fa9f 100644
--- a/src/commands/cp437_grid_command.rs
+++ b/src/commands/cp437_grid_command.rs
@@ -41,8 +41,8 @@ pub unsafe extern "C" fn sp_cmd_cp437_grid_try_into_packet(
     heap_move_ok(unsafe { heap_remove(command) }.try_into())
 }
 
-wrap_clone!(Cp437GridCommand, sp_cmd_cp437_grid);
-wrap_free!(Cp437GridCommand, sp_cmd_cp437_grid);
+wrap_clone!(sp_cmd_cp437_grid::Cp437GridCommand);
+wrap_free!(sp_cmd_cp437_grid::Cp437GridCommand);
 
 /// Moves the provided bitmap into the provided command.
 ///
diff --git a/src/commands/global_brightness_command.rs b/src/commands/global_brightness_command.rs
index 48d21d7..20a350a 100644
--- a/src/commands/global_brightness_command.rs
+++ b/src/commands/global_brightness_command.rs
@@ -22,8 +22,8 @@ pub unsafe extern "C" fn sp_cmd_brightness_global_into_packet(
     heap_move_nonnull(unsafe { heap_remove(command) }.into())
 }
 
-wrap_clone!(GlobalBrightnessCommand, sp_cmd_brightness_global);
-wrap_free!(GlobalBrightnessCommand, sp_cmd_brightness_global);
+wrap_clone!(sp_cmd_brightness_global::GlobalBrightnessCommand);
+wrap_free!(sp_cmd_brightness_global::GlobalBrightnessCommand);
 
 /// Moves the provided bitmap to be contained in the command.
 #[no_mangle]
diff --git a/src/containers/bitmap.rs b/src/containers/bitmap.rs
index ae97597..9b96d10 100644
--- a/src/containers/bitmap.rs
+++ b/src/containers/bitmap.rs
@@ -80,11 +80,11 @@ pub unsafe extern "C" fn sp_bitmap_from_bitvec(
     heap_move_ok(Bitmap::from_bitvec(width, bitvec))
 }
 
-wrap_clone!(Bitmap, sp_bitmap);
-wrap_free!(Bitmap, sp_bitmap);
+wrap_clone!(sp_bitmap::Bitmap);
+wrap_free!(sp_bitmap::Bitmap);
 
 wrap_method!(
-    sp_bitmap :: Bitmap;
+    sp_bitmap::Bitmap;
     /// Gets the current value at the specified position.
     ///
     /// # Arguments
@@ -98,7 +98,7 @@ wrap_method!(
 );
 
 wrap_method!(
-    sp_bitmap :: Bitmap;
+    sp_bitmap::Bitmap;
     /// Sets the value of the specified position.
     ///
     /// # Arguments
@@ -113,7 +113,7 @@ wrap_method!(
 );
 
 wrap_method!(
-    sp_bitmap :: Bitmap;
+    sp_bitmap::Bitmap;
     /// Sets the state of all pixels in the [Bitmap].
     ///
     /// # Arguments
@@ -123,19 +123,19 @@ wrap_method!(
 );
 
 wrap_method!(
-    sp_bitmap :: Bitmap;
+    sp_bitmap::Bitmap;
     /// Gets the width in pixels.
     ref fn width() -> usize;
 );
 
 wrap_method!(
-    sp_bitmap :: Bitmap;
+    sp_bitmap::Bitmap;
     /// Gets the height in pixels.
     ref fn height() -> usize;
 );
 
 wrap_method!(
-    sp_bitmap :: Bitmap;
+    sp_bitmap::Bitmap;
     /// Gets an unsafe reference to the data of the [Bitmap] instance.
     ///
     /// The returned memory is valid for the lifetime of the bitmap.
diff --git a/src/containers/bitvec.rs b/src/containers/bitvec.rs
index ea0ca4b..aad2a88 100644
--- a/src/containers/bitvec.rs
+++ b/src/containers/bitvec.rs
@@ -35,11 +35,11 @@ pub unsafe extern "C" fn sp_bitvec_load(
     heap_move_nonnull(DisplayBitVec::from_slice(data))
 }
 
-wrap_clone!(DisplayBitVec, sp_bitvec);
-wrap_free!(DisplayBitVec, sp_bitvec);
+wrap_clone!(sp_bitvec::DisplayBitVec);
+wrap_free!(sp_bitvec::DisplayBitVec);
 
 wrap_method!(
-    sp_bitvec :: DisplayBitVec;
+    sp_bitvec::DisplayBitVec;
     /// Gets the value of a bit.
     ///
     /// # Arguments
@@ -57,7 +57,7 @@ wrap_method!(
 );
 
 wrap_method!(
-    sp_bitvec :: DisplayBitVec;
+    sp_bitvec::DisplayBitVec;
     /// Sets the value of a bit.
     ///
     /// # Arguments
@@ -72,7 +72,7 @@ wrap_method!(
 );
 
 wrap_method!(
-    sp_bitvec :: DisplayBitVec;
+    sp_bitvec::DisplayBitVec;
     /// Sets the value of all bits.
     ///
     /// # Arguments
@@ -82,19 +82,19 @@ wrap_method!(
 );
 
 wrap_method!(
-    sp_bitvec :: DisplayBitVec;
+    sp_bitvec::DisplayBitVec;
     /// Gets the length in bits.
     ref fn len() -> usize;
 );
 
 wrap_method!(
-    sp_bitvec :: DisplayBitVec;
+    sp_bitvec::DisplayBitVec;
     /// Returns true if length is 0.
     ref fn is_empty() -> bool;
 );
 
 wrap_method!(
-    sp_bitvec :: DisplayBitVec;
+    sp_bitvec::DisplayBitVec;
     /// Gets an unsafe reference to the data of the [DisplayBitVec] instance.
     ///
     /// The returned memory is valid for the lifetime of the bitvec.
diff --git a/src/containers/brightness_grid.rs b/src/containers/brightness_grid.rs
index a1a5e4e..54491c2 100644
--- a/src/containers/brightness_grid.rs
+++ b/src/containers/brightness_grid.rs
@@ -52,11 +52,11 @@ pub unsafe extern "C" fn sp_brightness_grid_load(
     )
 }
 
-wrap_clone!(BrightnessGrid, sp_brightness_grid);
-wrap_free!(BrightnessGrid, sp_brightness_grid);
+wrap_clone!(sp_brightness_grid::BrightnessGrid);
+wrap_free!(sp_brightness_grid::BrightnessGrid);
 
 wrap_method!(
-    sp_brightness_grid :: BrightnessGrid;
+    sp_brightness_grid::BrightnessGrid;
     /// Gets the current value at the specified position.
     ///
     /// # Arguments
@@ -71,7 +71,7 @@ wrap_method!(
 );
 
 wrap_method!(
-    sp_brightness_grid :: BrightnessGrid;
+    sp_brightness_grid::BrightnessGrid;
     /// Sets the value of the specified position.
     ///
     /// # Arguments
@@ -88,7 +88,7 @@ wrap_method!(
 );
 
 wrap_method!(
-    sp_brightness_grid :: BrightnessGrid;
+    sp_brightness_grid::BrightnessGrid;
     /// Sets the value of all cells.
     ///
     /// # Arguments
@@ -98,19 +98,19 @@ wrap_method!(
 );
 
 wrap_method!(
-    sp_brightness_grid :: BrightnessGrid;
+    sp_brightness_grid::BrightnessGrid;
     /// Gets the width of the grid.
     ref fn width() -> usize;
 );
 
 wrap_method!(
-    sp_brightness_grid :: BrightnessGrid;
+    sp_brightness_grid::BrightnessGrid;
     /// Gets the height of the grid.
     ref fn height() -> usize;
 );
 
 wrap_method!(
-    sp_brightness_grid :: BrightnessGrid;
+    sp_brightness_grid::BrightnessGrid;
     /// Gets an unsafe reference to the data of the instance.
     ///
     /// The returned memory is valid for the lifetime of the grid.
diff --git a/src/containers/char_grid.rs b/src/containers/char_grid.rs
index bc421b5..5db7897 100644
--- a/src/containers/char_grid.rs
+++ b/src/containers/char_grid.rs
@@ -39,11 +39,11 @@ pub unsafe extern "C" fn sp_char_grid_load(
     heap_move_ok(CharGrid::load_utf8(width, height, data.to_vec()))
 }
 
-wrap_clone!(CharGrid, sp_char_grid);
-wrap_free!(CharGrid, sp_char_grid);
+wrap_clone!(sp_char_grid::CharGrid);
+wrap_free!(sp_char_grid::CharGrid);
 
 wrap_method!(
-    sp_char_grid :: CharGrid;
+    sp_char_grid::CharGrid;
     /// Returns the current value at the specified position.
     ///
     /// # Arguments
@@ -58,7 +58,7 @@ wrap_method!(
 );
 
 wrap_method!(
-    sp_char_grid :: CharGrid;
+    sp_char_grid::CharGrid;
     /// Sets the value of the specified position in the grid.
     ///
     /// # Arguments
@@ -77,7 +77,7 @@ wrap_method!(
 );
 
 wrap_method!(
-    sp_char_grid :: CharGrid;
+    sp_char_grid::CharGrid;
     /// Sets the value of all cells in the grid.
     ///
     /// # Arguments
@@ -89,13 +89,13 @@ wrap_method!(
 );
 
 wrap_method!(
-    sp_char_grid :: CharGrid;
+    sp_char_grid::CharGrid;
     /// Gets the width of the grid.
     ref fn width() -> usize;
 );
 
 wrap_method!(
-    sp_char_grid :: CharGrid;
+    sp_char_grid::CharGrid;
     /// Gets the height of the grid.
     ref fn height() -> usize;
 );
diff --git a/src/containers/cp437_grid.rs b/src/containers/cp437_grid.rs
index 88fb2b0..ebf652e 100644
--- a/src/containers/cp437_grid.rs
+++ b/src/containers/cp437_grid.rs
@@ -30,11 +30,11 @@ pub unsafe extern "C" fn sp_cp437_grid_load(
     heap_move_some(Cp437Grid::load(width, height, data))
 }
 
-wrap_clone!(Cp437Grid, sp_cp437_grid);
-wrap_free!(Cp437Grid, sp_cp437_grid);
+wrap_clone!(sp_cp437_grid::Cp437Grid);
+wrap_free!(sp_cp437_grid::Cp437Grid);
 
 wrap_method!(
-    sp_cp437 :: Cp437Grid;
+    sp_cp437::Cp437Grid;
     /// Gets the current value at the specified position.
     ///
     /// # Arguments
@@ -48,7 +48,7 @@ wrap_method!(
 );
 
 wrap_method!(
-    sp_cp437 :: Cp437Grid;
+    sp_cp437::Cp437Grid;
     /// Sets the value at the specified position.
     ///
     /// # Arguments
@@ -65,7 +65,7 @@ wrap_method!(
 );
 
 wrap_method!(
-    sp_cp437 :: Cp437Grid;
+    sp_cp437::Cp437Grid;
     /// Sets the value of all cells in the grid.
     ///
     /// # Arguments
@@ -76,19 +76,19 @@ wrap_method!(
 );
 
 wrap_method!(
-    sp_cp437 :: Cp437Grid;
+    sp_cp437::Cp437Grid;
     /// Gets the width of the grid.
     ref fn width() -> usize;
 );
 
 wrap_method!(
-    sp_cp437 :: Cp437Grid;
+    sp_cp437::Cp437Grid;
     /// Gets the height of the grid.
     ref fn height() -> usize;
 );
 
 wrap_method!(
-    sp_cp437 :: Cp437Grid;
+    sp_cp437::Cp437Grid;
     /// Gets an unsafe reference to the data of the grid.
     ///
     /// The returned memory is valid for the lifetime of the instance.
diff --git a/src/macros.rs b/src/macros.rs
index c91248e..80256dd 100644
--- a/src/macros.rs
+++ b/src/macros.rs
@@ -1,5 +1,5 @@
 macro_rules! wrap_free {
-    ($typ:ty, $prefix:ident) => {
+    ($prefix:ident :: $typ:ty) => {
         paste::paste! {
             #[doc = concat!("Deallocates a [", stringify!($typ), "] instance.")]
             #[no_mangle]
@@ -11,7 +11,7 @@ macro_rules! wrap_free {
 }
 
 macro_rules! wrap_clone {
-    ($typ:ty, $prefix:ident) => {
+    ($prefix:ident :: $typ:ty) => {
         paste::paste! {
             #[doc = concat!("Clones a [", stringify!($typ), "] instance.")]
             #[no_mangle]
diff --git a/src/packet.rs b/src/packet.rs
index 658265c..a9b347c 100644
--- a/src/packet.rs
+++ b/src/packet.rs
@@ -91,8 +91,8 @@ pub unsafe extern "C" fn sp_packet_serialize_to(
     }
 }
 
-wrap_clone!(Packet, sp_packet);
-wrap_free!(Packet, sp_packet);
+wrap_clone!(sp_packet::Packet);
+wrap_free!(sp_packet::Packet);
 
 /// Converts u16 into [CommandCode].
 ///
diff --git a/src/udp.rs b/src/udp.rs
index eef82a8..e18476a 100644
--- a/src/udp.rs
+++ b/src/udp.rs
@@ -144,4 +144,4 @@ pub unsafe extern "C" fn sp_udp_send_header(
         .is_ok()
 }
 
-wrap_free!(UdpSocket, sp_udp);
+wrap_free!(sp_udp::UdpSocket);