diff --git a/tools/gencfg/processors/boards/stm32f4xx/templates/board.h.ftl b/tools/gencfg/processors/boards/stm32f4xx/templates/board.h.ftl
index 59790e41e..f424822fd 100644
--- a/tools/gencfg/processors/boards/stm32f4xx/templates/board.h.ftl
+++ b/tools/gencfg/processors/boards/stm32f4xx/templates/board.h.ftl
@@ -165,11 +165,11 @@
     [#if mode == "Input"]
       [#assign out = "PIN_MODE_INPUT(" + port_name + "_" + name + ")" /]
     [#elseif mode == "Output"]
-      [#assign out = "PIN_MODE_OUTPUT(" + port_name + "_" + pin_name + ")" /]
+      [#assign out = "PIN_MODE_OUTPUT(" + port_name + "_" + name + ")" /]
     [#elseif mode == "Alternate"]
-      [#assign out = "PIN_MODE_ALTERNATE(" + port_name + "_" + pin_name + ")" /]
+      [#assign out = "PIN_MODE_ALTERNATE(" + port_name + "_" + name + ")" /]
     [#else]
-      [#assign out = "PIN_MODE_ANALOG(" + port_name + "_" + pin_name + ")" /]
+      [#assign out = "PIN_MODE_ANALOG(" + port_name + "_" + name + ")" /]
     [/#if]
     [#if pinidx == 0]
       [#assign line = "#define VAL_" + port_name + "_MODER             (" + out /]