diff --git a/src/detection/board/board.h b/src/detection/board/board.h
index f4065d103..bc232e244 100644
--- a/src/detection/board/board.h
+++ b/src/detection/board/board.h
@@ -7,9 +7,9 @@
 
 typedef struct FFBoardResult
 {
-    FFstrbuf boardName;
-    FFstrbuf boardVendor;
-    FFstrbuf boardVersion;
+    FFstrbuf name;
+    FFstrbuf vendor;
+    FFstrbuf version;
 } FFBoardResult;
 
 const char* ffDetectBoard(FFBoardResult* result);
diff --git a/src/detection/board/board_bsd.c b/src/detection/board/board_bsd.c
index 6650c8b5b..871cf87aa 100644
--- a/src/detection/board/board_bsd.c
+++ b/src/detection/board/board_bsd.c
@@ -4,11 +4,11 @@
 
 const char* ffDetectBoard(FFBoardResult* result)
 {
-    ffSettingsGetFreeBSDKenv("smbios.planar.product", &result->boardName);
-    ffCleanUpSmbiosValue(&result->boardName);
-    ffSettingsGetFreeBSDKenv("smbios.planar.maker", &result->boardVendor);
-    ffCleanUpSmbiosValue(&result->boardVendor);
-    ffSettingsGetFreeBSDKenv("smbios.planar.version", &result->boardVersion);
-    ffCleanUpSmbiosValue(&result->boardVersion);
+    ffSettingsGetFreeBSDKenv("smbios.planar.product", &result->name);
+    ffCleanUpSmbiosValue(&result->name);
+    ffSettingsGetFreeBSDKenv("smbios.planar.maker", &result->vendor);
+    ffCleanUpSmbiosValue(&result->vendor);
+    ffSettingsGetFreeBSDKenv("smbios.planar.version", &result->version);
+    ffCleanUpSmbiosValue(&result->version);
     return NULL;
 }
diff --git a/src/detection/board/board_linux.c b/src/detection/board/board_linux.c
index 011a1e5a5..a4d1225b7 100644
--- a/src/detection/board/board_linux.c
+++ b/src/detection/board/board_linux.c
@@ -19,8 +19,8 @@ static void getSmbiosValue(const char* devicesPath, const char* classPath, FFstr
 
 const char* ffDetectBoard(FFBoardResult* board)
 {
-    getSmbiosValue("/sys/devices/virtual/dmi/id/board_name", "/sys/class/dmi/id/board_name", &board->boardName);
-    getSmbiosValue("/sys/devices/virtual/dmi/id/board_vendor", "/sys/class/dmi/id/board_vendor", &board->boardVendor);
-    getSmbiosValue("/sys/devices/virtual/dmi/id/board_version", "/sys/class/dmi/id/board_version", &board->boardVersion);
+    getSmbiosValue("/sys/devices/virtual/dmi/id/board_name", "/sys/class/dmi/id/board_name", &board->name);
+    getSmbiosValue("/sys/devices/virtual/dmi/id/board_vendor", "/sys/class/dmi/id/board_vendor", &board->vendor);
+    getSmbiosValue("/sys/devices/virtual/dmi/id/board_version", "/sys/class/dmi/id/board_version", &board->version);
     return NULL;
 }
diff --git a/src/detection/board/board_windows.c b/src/detection/board/board_windows.c
index a027fb883..16db05161 100644
--- a/src/detection/board/board_windows.c
+++ b/src/detection/board/board_windows.c
@@ -8,11 +8,11 @@ const char* ffDetectBoard(FFBoardResult* board)
     if(!ffRegOpenKeyForRead(HKEY_LOCAL_MACHINE, L"HARDWARE\\DESCRIPTION\\System\\BIOS", &hKey, NULL))
         return "ffRegOpenKeyForRead(HKEY_LOCAL_MACHINE, L\"HARDWARE\\DESCRIPTION\\System\\BIOS\") failed";
 
-    if(!ffRegReadStrbuf(hKey, L"BaseBoardProduct", &board->boardName, NULL))
+    if(!ffRegReadStrbuf(hKey, L"BaseBoardProduct", &board->name, NULL))
         return "ffRegReadStrbuf(hKey, L\"BaseBoardProduct\") failed";
 
-    ffRegReadStrbuf(hKey, L"BaseBoardManufacturer", &board->boardVendor, NULL);
-    ffRegReadStrbuf(hKey, L"BaseBoardVersion", &board->boardVersion, NULL);
+    ffRegReadStrbuf(hKey, L"BaseBoardManufacturer", &board->vendor, NULL);
+    ffRegReadStrbuf(hKey, L"BaseBoardVersion", &board->version, NULL);
 
     return NULL;
 }
diff --git a/src/modules/board/board.c b/src/modules/board/board.c
index fe72f5b7d..68802c28e 100644
--- a/src/modules/board/board.c
+++ b/src/modules/board/board.c
@@ -9,9 +9,9 @@
 void ffPrintBoard(FFinstance* instance, FFBoardOptions* options)
 {
     FFBoardResult result;
-    ffStrbufInit(&result.boardName);
-    ffStrbufInit(&result.boardVendor);
-    ffStrbufInit(&result.boardVersion);
+    ffStrbufInit(&result.name);
+    ffStrbufInit(&result.vendor);
+    ffStrbufInit(&result.version);
     const char* error = ffDetectBoard(&result);
 
     if(error)
@@ -20,7 +20,7 @@ void ffPrintBoard(FFinstance* instance, FFBoardOptions* options)
         goto exit;
     }
 
-    if(result.boardName.length == 0)
+    if(result.name.length == 0)
     {
         ffPrintError(instance, FF_BOARD_MODULE_NAME, 0, &options->moduleArgs, "board_name is not set.");
         goto exit;
@@ -29,24 +29,24 @@ void ffPrintBoard(FFinstance* instance, FFBoardOptions* options)
     if(options->moduleArgs.outputFormat.length == 0)
     {
         ffPrintLogoAndKey(instance, FF_BOARD_MODULE_NAME, 0, &options->moduleArgs.key, &options->moduleArgs.keyColor);
-        ffStrbufWriteTo(&result.boardName, stdout);
-        if (result.boardVersion.length)
-            printf(" (%s)", result.boardVersion.chars);
+        ffStrbufWriteTo(&result.name, stdout);
+        if (result.version.length)
+            printf(" (%s)", result.version.chars);
         putchar('\n');
     }
     else
     {
         ffPrintFormat(instance, FF_BOARD_MODULE_NAME, 0, &options->moduleArgs, FF_BOARD_NUM_FORMAT_ARGS, (FFformatarg[]) {
-            {FF_FORMAT_ARG_TYPE_STRBUF, &result.boardName},
-            {FF_FORMAT_ARG_TYPE_STRBUF, &result.boardVendor},
-            {FF_FORMAT_ARG_TYPE_STRBUF, &result.boardVersion},
+            {FF_FORMAT_ARG_TYPE_STRBUF, &result.name},
+            {FF_FORMAT_ARG_TYPE_STRBUF, &result.vendor},
+            {FF_FORMAT_ARG_TYPE_STRBUF, &result.version},
         });
     }
 
 exit:
-    ffStrbufDestroy(&result.boardName);
-    ffStrbufDestroy(&result.boardVendor);
-    ffStrbufDestroy(&result.boardVersion);
+    ffStrbufDestroy(&result.name);
+    ffStrbufDestroy(&result.vendor);
+    ffStrbufDestroy(&result.version);
 }
 
 void ffInitBoardOptions(FFBoardOptions* options)