diff --git a/build.zig b/build.zig
index 3b787fe..30cd9c9 100644
--- a/build.zig
+++ b/build.zig
@@ -1,5 +1,5 @@
 const std = @import("std");
-const microzig = @import("deps/microzig/src/main.zig");
+const microzig = @import("deps/microzig/build.zig");
 const boards = @import("src/boards.zig");
 const chips = @import("src/chips.zig");
 
diff --git a/deps/microzig b/deps/microzig
index 831cfff..11214ed 160000
--- a/deps/microzig
+++ b/deps/microzig
@@ -1 +1 @@
-Subproject commit 831cfff35c259d68ee023ba7bb94dae8b7b94bec
+Subproject commit 11214ed8ba05e380a516beef3f3f594571a1c732
diff --git a/src/boards.zig b/src/boards.zig
index 13f4c61..9f9c3fa 100644
--- a/src/boards.zig
+++ b/src/boards.zig
@@ -1,5 +1,5 @@
 const std = @import("std");
-const microzig = @import("../deps/microzig/src/main.zig");
+const microzig = @import("../deps/microzig/build.zig");
 const Board = microzig.Board;
 
 const chips = @import("chips.zig");
diff --git a/src/chips.zig b/src/chips.zig
index c492323..c7a2eda 100644
--- a/src/chips.zig
+++ b/src/chips.zig
@@ -1,5 +1,5 @@
 const std = @import("std");
-const microzig = @import("../deps/microzig/src/main.zig");
+const microzig = @import("../deps/microzig/build.zig");
 const Chip = microzig.Chip;
 const MemoryRegion = microzig.MemoryRegion;
 
diff --git a/src/hals/stm32f103.zig b/src/hals/STM32F103.zig
similarity index 100%
rename from src/hals/stm32f103.zig
rename to src/hals/STM32F103.zig
diff --git a/src/hals/stm32f303.zig b/src/hals/STM32F303.zig
similarity index 99%
rename from src/hals/stm32f303.zig
rename to src/hals/STM32F303.zig
index 272e8b1..5c470c8 100644
--- a/src/hals/stm32f303.zig
+++ b/src/hals/STM32F303.zig
@@ -441,7 +441,7 @@ pub fn I2CController(comptime index: usize, comptime pins: micro.i2c.Pins) type
 
                 if (runtime_safety) self.read_allowed = false;
 
-                for (buffer) |_, i| {
+                for (buffer, 0..) |_, i| {
                     // Wait for data to be received
                     while (I2C1.ISR.read().RXNE == 0) {
                         debug_print("I2C1 waiting for data (RXNE=0)\r\n", .{});
@@ -582,7 +582,7 @@ pub fn SpiBus(comptime index: usize) type {
 
         /// Read bytes to fill the given buffer exactly, writing arbitrary bytes (`undefined`).
         pub fn read_into(self: Self, buffer: []u8) !void {
-            for (buffer) |_, i| {
+            for (buffer, 0..) |_, i| {
                 try self.transceive_byte(null, &buffer[i]);
             }
         }
diff --git a/src/hals/stm32f407.zig b/src/hals/STM32F407.zig
similarity index 99%
rename from src/hals/stm32f407.zig
rename to src/hals/STM32F407.zig
index 6461bd8..f48e05c 100644
--- a/src/hals/stm32f407.zig
+++ b/src/hals/STM32F407.zig
@@ -592,7 +592,7 @@ pub fn I2CController(comptime index: usize, comptime pins: micro.i2c.Pins) type
                 // Read SR2 to clear address condition
                 _ = i2c_base.SR2.read();
 
-                for (buffer) |_, i| {
+                for (buffer, 0..) |_, i| {
                     if (i == buffer.len - 1) {
                         // Disable ACK
                         i2c_base.CR1.modify(.{ .ACK = 0 });
diff --git a/src/hals/stm32f429.zig b/src/hals/STM32F429.zig
similarity index 100%
rename from src/hals/stm32f429.zig
rename to src/hals/STM32F429.zig