diff --git a/boards/arc/em_starterkit/doc/ARC_EM_Starter_Kit_Board_Photo.jpg b/boards/arc/em_starterkit/doc/em_starterkit.jpg
similarity index 100%
rename from boards/arc/em_starterkit/doc/ARC_EM_Starter_Kit_Board_Photo.jpg
rename to boards/arc/em_starterkit/doc/em_starterkit.jpg
diff --git a/boards/arc/em_starterkit/doc/index.rst b/boards/arc/em_starterkit/doc/index.rst
index a8624eb2d08..7d239983376 100644
--- a/boards/arc/em_starterkit/doc/index.rst
+++ b/boards/arc/em_starterkit/doc/index.rst
@@ -12,7 +12,7 @@ for the ARC EM Family of processors. The EM Family includes the EM4, EM6,
 EM5D, EM7D, EM9D, and EM11D cores. The Zephyr RTOS can be used with the
 EM Starter Kit.
 
-.. image:: ARC_EM_Starter_Kit_Board_Photo.jpg
+.. image:: ./em_starterkit.jpg
    :width: 442px
    :align: center
    :alt: DesignWare(R) ARC(R) EM Starter Kit (synopsys.com)
diff --git a/boards/arc/iotdk/doc/index.rst b/boards/arc/iotdk/doc/index.rst
index 37f8f882b97..cad73d4ec6e 100644
--- a/boards/arc/iotdk/doc/index.rst
+++ b/boards/arc/iotdk/doc/index.rst
@@ -14,7 +14,7 @@ implementation of the ARC Data Fusion IP Subsystem running at 144 MHz on
 SMIC's 55-nm ultra-low power process, and a rich set of peripherals commonly
 used in IoT designs such as USB, UART, SPI, I2C, PWM, SDIO, and ADCs.
 
-.. image:: iotdk_board.jpg
+.. image:: ./iotdk.jpg
    :width: 442px
    :align: center
    :alt: DesignWare(R) ARC(R)IoT Development Kit (synopsys.com)
diff --git a/boards/arc/iotdk/doc/iotdk_board.jpg b/boards/arc/iotdk/doc/iotdk.jpg
similarity index 100%
rename from boards/arc/iotdk/doc/iotdk_board.jpg
rename to boards/arc/iotdk/doc/iotdk.jpg
diff --git a/boards/arm/96b_argonkey/doc/img/96b-argonkey-front.jpg b/boards/arm/96b_argonkey/doc/img/96b_argonkey.jpg
similarity index 100%
rename from boards/arm/96b_argonkey/doc/img/96b-argonkey-front.jpg
rename to boards/arm/96b_argonkey/doc/img/96b_argonkey.jpg
diff --git a/boards/arm/96b_argonkey/doc/index.rst b/boards/arm/96b_argonkey/doc/index.rst
index 93347b86d82..9b21857128a 100644
--- a/boards/arm/96b_argonkey/doc/index.rst
+++ b/boards/arm/96b_argonkey/doc/index.rst
@@ -12,7 +12,7 @@ Cortex M4 CPU.
 This board acts as a sensor hub platform for all 96Boards compliant
 family products. It can also be used as a standalone board.
 
-.. figure:: img/96b-argonkey-front.jpg
+.. figure:: img/96b_argonkey.jpg
      :width: 557px
      :align: center
      :height: 480px
diff --git a/boards/arm/96b_carbon/doc/img/96b-carbon-front.png b/boards/arm/96b_carbon/doc/img/96b_carbon.png
similarity index 100%
rename from boards/arm/96b_carbon/doc/img/96b-carbon-front.png
rename to boards/arm/96b_carbon/doc/img/96b_carbon.png
diff --git a/boards/arm/96b_carbon/doc/index.rst b/boards/arm/96b_carbon/doc/index.rst
index 1b1b8f65e47..436648c6194 100644
--- a/boards/arm/96b_carbon/doc/index.rst
+++ b/boards/arm/96b_carbon/doc/index.rst
@@ -35,7 +35,7 @@ After you have flashed your nRF51, you can perform basic validation
 of this Bluetooth setup using the instructions
 :ref:`below <96b_carbon_verify_bluetooth>`.
 
-.. figure:: img/96b-carbon-front.png
+.. figure:: img/96b_carbon.png
      :width: 487px
      :align: center
      :alt: 96Boards Carbon
diff --git a/boards/arm/96b_carbon_nrf51/doc/img/96b-carbon-nrf51-debug.png b/boards/arm/96b_carbon_nrf51/doc/img/96b_carbon_nrf51.png
similarity index 100%
rename from boards/arm/96b_carbon_nrf51/doc/img/96b-carbon-nrf51-debug.png
rename to boards/arm/96b_carbon_nrf51/doc/img/96b_carbon_nrf51.png
diff --git a/boards/arm/96b_carbon_nrf51/doc/index.rst b/boards/arm/96b_carbon_nrf51/doc/index.rst
index 7470417f5ec..168e13603f8 100644
--- a/boards/arm/96b_carbon_nrf51/doc/index.rst
+++ b/boards/arm/96b_carbon_nrf51/doc/index.rst
@@ -82,7 +82,7 @@ debugger, via the debug header labeled "BLE" on the board's
 silkscreen. The header is not populated; 0.1" male header must be
 soldered on first.
 
-.. figure:: img/96b-carbon-nrf51-debug.png
+.. figure:: img/96b_carbon_nrf51.png
      :align: center
      :alt: 96Boards Carbon nRF51 Debug
 
diff --git a/boards/arm/96b_neonkey/doc/img/96b-neonkey-front.jpg b/boards/arm/96b_neonkey/doc/img/96b_neonkey.jpg
similarity index 100%
rename from boards/arm/96b_neonkey/doc/img/96b-neonkey-front.jpg
rename to boards/arm/96b_neonkey/doc/img/96b_neonkey.jpg
diff --git a/boards/arm/96b_neonkey/doc/index.rst b/boards/arm/96b_neonkey/doc/index.rst
index 59446270f17..46ad82c0981 100644
--- a/boards/arm/96b_neonkey/doc/index.rst
+++ b/boards/arm/96b_neonkey/doc/index.rst
@@ -9,7 +9,7 @@ Overview
 96Boards Neonkey board is based on the STMicroelectronics STM32F411CE
 Cortex M4 CPU.
 
-.. figure:: img/96b-neonkey-front.jpg
+.. figure:: img/96b_neonkey.jpg
      :width: 500px
      :align: center
      :height: 330px
diff --git a/boards/arm/96b_nitrogen/doc/img/96b-nitrogen-front.png b/boards/arm/96b_nitrogen/doc/img/96b_nitrogen.png
similarity index 100%
rename from boards/arm/96b_nitrogen/doc/img/96b-nitrogen-front.png
rename to boards/arm/96b_nitrogen/doc/img/96b_nitrogen.png
diff --git a/boards/arm/96b_nitrogen/doc/index.rst b/boards/arm/96b_nitrogen/doc/index.rst
index f92bc391a66..04e3b521bf0 100644
--- a/boards/arm/96b_nitrogen/doc/index.rst
+++ b/boards/arm/96b_nitrogen/doc/index.rst
@@ -9,7 +9,7 @@ Overview
 The 96Boards Nitrogen hardware provides support for the Nordic Semiconductor
 nRF52832 ARM Cortex-M4F CPU.
 
-.. figure:: img/96b-nitrogen-front.png
+.. figure:: img/96b_nitrogen.png
      :width: 487px
      :align: center
      :alt: 96Boards Nitrogen
diff --git a/boards/arm/atsamd20_xpro/doc/img/ATSAMD20-XPRO.jpg b/boards/arm/atsamd20_xpro/doc/img/atsamd20_xpro.jpg
similarity index 100%
rename from boards/arm/atsamd20_xpro/doc/img/ATSAMD20-XPRO.jpg
rename to boards/arm/atsamd20_xpro/doc/img/atsamd20_xpro.jpg
diff --git a/boards/arm/atsamd20_xpro/doc/index.rst b/boards/arm/atsamd20_xpro/doc/index.rst
index b837720165d..2a9c065197f 100644
--- a/boards/arm/atsamd20_xpro/doc/index.rst
+++ b/boards/arm/atsamd20_xpro/doc/index.rst
@@ -12,7 +12,7 @@ microcontrollers. The kit includes Atmel’s Embedded Debugger (EDBG),
 which provides a full debug interface without the need for additional
 hardware.
 
-.. image:: img/ATSAMD20-XPRO.jpg
+.. image:: img/atsamd20_xpro.jpg
      :width: 500px
      :align: center
      :alt: ATSAMD20-XPRO
diff --git a/boards/arm/atsamd21_xpro/doc/img/ATSAMD21-XPRO.png b/boards/arm/atsamd21_xpro/doc/img/atsamd21_xpro.png
similarity index 100%
rename from boards/arm/atsamd21_xpro/doc/img/ATSAMD21-XPRO.png
rename to boards/arm/atsamd21_xpro/doc/img/atsamd21_xpro.png
diff --git a/boards/arm/atsamd21_xpro/doc/index.rst b/boards/arm/atsamd21_xpro/doc/index.rst
index 3f003e9a183..aa9afae4d28 100644
--- a/boards/arm/atsamd21_xpro/doc/index.rst
+++ b/boards/arm/atsamd21_xpro/doc/index.rst
@@ -12,7 +12,7 @@ microcontrollers. The kit includes Atmel’s Embedded Debugger (EDBG),
 which provides a full debug interface without the need for additional
 hardware.
 
-.. image:: img/ATSAMD21-XPRO.png
+.. image:: img/atsamd21_xpro.png
      :width: 500px
      :align: center
      :alt: ATSAMD21-XPRO
diff --git a/boards/arm/b_l072z_lrwan1/doc/img/b-l072z-lrwan1.png b/boards/arm/b_l072z_lrwan1/doc/img/b_l072z_lrwan1.png
similarity index 100%
rename from boards/arm/b_l072z_lrwan1/doc/img/b-l072z-lrwan1.png
rename to boards/arm/b_l072z_lrwan1/doc/img/b_l072z_lrwan1.png
diff --git a/boards/arm/b_l072z_lrwan1/doc/index.rst b/boards/arm/b_l072z_lrwan1/doc/index.rst
index 18ee753c89a..490af24982d 100644
--- a/boards/arm/b_l072z_lrwan1/doc/index.rst
+++ b/boards/arm/b_l072z_lrwan1/doc/index.rst
@@ -53,7 +53,7 @@ This kit provides:
         - 2 push-buttons (user and reset)
 - Arduino* Uno V3 connectors
 
-.. image:: img/b-l072z-lrwan1.png
+.. image:: img/b_l072z_lrwan1.png
      :width: 500px
      :align: center
      :height: 325px
diff --git a/boards/arm/bbc_microbit/doc/img/microbit-hardware.png b/boards/arm/bbc_microbit/doc/img/bbc_microbit.png
similarity index 100%
rename from boards/arm/bbc_microbit/doc/img/microbit-hardware.png
rename to boards/arm/bbc_microbit/doc/img/bbc_microbit.png
diff --git a/boards/arm/bbc_microbit/doc/index.rst b/boards/arm/bbc_microbit/doc/index.rst
index afc8ffb2abf..fafbbdc6afd 100644
--- a/boards/arm/bbc_microbit/doc/index.rst
+++ b/boards/arm/bbc_microbit/doc/index.rst
@@ -23,7 +23,7 @@ connectors that are part of the 23-pin edge connector.
 * FLASH
 * RADIO (Bluetooth Low Energy)
 
-.. figure:: img/microbit-hardware.png
+.. figure:: img/bbc_microbit.png
      :width: 442px
      :align: center
      :alt: BBC Micro Bit
diff --git a/boards/arm/cc2650_sensortag/doc/img/sensortag.jpg b/boards/arm/cc2650_sensortag/doc/img/cc2650_sensortag.jpg
similarity index 100%
rename from boards/arm/cc2650_sensortag/doc/img/sensortag.jpg
rename to boards/arm/cc2650_sensortag/doc/img/cc2650_sensortag.jpg
diff --git a/boards/arm/cc2650_sensortag/doc/index.rst b/boards/arm/cc2650_sensortag/doc/index.rst
index 8648154f54c..854ab919774 100644
--- a/boards/arm/cc2650_sensortag/doc/index.rst
+++ b/boards/arm/cc2650_sensortag/doc/index.rst
@@ -10,7 +10,7 @@ The SimpleLink CC2650 SensorTag is a Texas Instruments board based
 on the CC2650 wireless MCU. It contains multiple sensors and provides
 Bluetooth and IEEE 802.15.4 connectivity.
 
-.. image:: img/sensortag.jpg
+.. image:: img/cc2650_sensortag.jpg
   :width:  600px
   :height: 600px
   :align:  center
diff --git a/boards/arm/colibri_imx7d_m4/doc/colibri_imx7d.png b/boards/arm/colibri_imx7d_m4/doc/colibri_imx7d_m4.png
similarity index 100%
rename from boards/arm/colibri_imx7d_m4/doc/colibri_imx7d.png
rename to boards/arm/colibri_imx7d_m4/doc/colibri_imx7d_m4.png
diff --git a/boards/arm/colibri_imx7d_m4/doc/index.rst b/boards/arm/colibri_imx7d_m4/doc/index.rst
index c5cdefe0106..3b0b6ce29c1 100644
--- a/boards/arm/colibri_imx7d_m4/doc/index.rst
+++ b/boards/arm/colibri_imx7d_m4/doc/index.rst
@@ -12,7 +12,7 @@ Zephyr was ported to run on the M4 core. In a later release, it will also
 communicate with the A7 core (running Linux) via RPmsg.
 
 
-.. image:: colibri_imx7d.png
+.. image:: ./colibri_imx7d_m4.png
    :width: 720px
    :align: center
    :alt: Colibri-iMX7
diff --git a/boards/arm/cy8ckit_062_wifi_bt_m0/doc/img/cy8ckit_062_wifi_bt.png b/boards/arm/cy8ckit_062_wifi_bt_m0/doc/img/cy8ckit_062_wifi_bt_m0.png
similarity index 100%
rename from boards/arm/cy8ckit_062_wifi_bt_m0/doc/img/cy8ckit_062_wifi_bt.png
rename to boards/arm/cy8ckit_062_wifi_bt_m0/doc/img/cy8ckit_062_wifi_bt_m0.png
diff --git a/boards/arm/cy8ckit_062_wifi_bt_m0/doc/index.rst b/boards/arm/cy8ckit_062_wifi_bt_m0/doc/index.rst
index f542d9194af..d16ab29f6df 100644
--- a/boards/arm/cy8ckit_062_wifi_bt_m0/doc/index.rst
+++ b/boards/arm/cy8ckit_062_wifi_bt_m0/doc/index.rst
@@ -21,7 +21,7 @@ The PSoC 6 WiFi-BT Pioneer board offers compatibility with Arduino shields.
 The Cortex-M0+ is a primary core on the board's SoC. It starts first and
 enables the CM4 core.
 
-.. image:: img/cy8ckit_062_wifi_bt.png
+.. image:: img/cy8ckit_062_wifi_bt_m0.png
      :width: 887px
      :align: center
      :alt: CY8CKIT_062_WIFI_BT
diff --git a/boards/arm/dragino_lsn50/doc/img/lsn50.png b/boards/arm/dragino_lsn50/doc/img/dragino_lsn50.png
similarity index 100%
rename from boards/arm/dragino_lsn50/doc/img/lsn50.png
rename to boards/arm/dragino_lsn50/doc/img/dragino_lsn50.png
diff --git a/boards/arm/dragino_lsn50/doc/index.rst b/boards/arm/dragino_lsn50/doc/index.rst
index bac37777bc2..4389b9a6973 100644
--- a/boards/arm/dragino_lsn50/doc/index.rst
+++ b/boards/arm/dragino_lsn50/doc/index.rst
@@ -23,7 +23,7 @@ This kit provides:
 - GPIOs exposed via screw terminals on the carrier board
 - Housing
 
-.. image:: img/lsn50.png
+.. image:: img/dragino_lsn50.png
      :width: 531px
      :align: center
      :height: 354px
diff --git a/boards/arm/efm32hg_slstk3400a/doc/happy-gecko-starter-kit.jpg b/boards/arm/efm32hg_slstk3400a/doc/efm32hg_slstk3400a.jpg
similarity index 100%
rename from boards/arm/efm32hg_slstk3400a/doc/happy-gecko-starter-kit.jpg
rename to boards/arm/efm32hg_slstk3400a/doc/efm32hg_slstk3400a.jpg
diff --git a/boards/arm/efm32hg_slstk3400a/doc/index.rst b/boards/arm/efm32hg_slstk3400a/doc/index.rst
index 92b55ad448a..2d9c9ac9fe0 100644
--- a/boards/arm/efm32hg_slstk3400a/doc/index.rst
+++ b/boards/arm/efm32hg_slstk3400a/doc/index.rst
@@ -10,7 +10,7 @@ The EFM32 Happy Gecko Starter Kit EFM32HG-SLSTK3400A contains a MCU from the
 EFM32HG family built on ARM® Cortex®-M0+ processor with excellent low
 power capabilities.
 
-.. figure:: happy-gecko-starter-kit.jpg
+.. figure:: ./efm32hg_slstk3400a.jpg
    :width: 375px
    :align: center
    :alt: EFM32HG-SLSTK3400A
diff --git a/boards/arm/efm32pg_stk3402a/doc/slstk3402a-pearl-gecko-pg12-stk.png b/boards/arm/efm32pg_stk3402a/doc/efm32pg_stk3402a.png
similarity index 100%
rename from boards/arm/efm32pg_stk3402a/doc/slstk3402a-pearl-gecko-pg12-stk.png
rename to boards/arm/efm32pg_stk3402a/doc/efm32pg_stk3402a.png
diff --git a/boards/arm/efm32pg_stk3402a/doc/index.rst b/boards/arm/efm32pg_stk3402a/doc/index.rst
index 3a9a775321d..105f16ee711 100644
--- a/boards/arm/efm32pg_stk3402a/doc/index.rst
+++ b/boards/arm/efm32pg_stk3402a/doc/index.rst
@@ -10,7 +10,7 @@ The EFM32 Pearl Gecko Starter Kit EFM32PG-STK3402A contains an MCU from the
 EFM32PG family built on an ARM® Cortex®-M4F processor with excellent low
 power capabilities.
 
-.. figure:: slstk3402a-pearl-gecko-pg12-stk.png
+.. figure:: ./efm32pg_stk3402a.png
    :width: 375px
    :align: center
    :alt: EFM32PG-SLSTK3402A
diff --git a/boards/arm/efm32wg_stk3800/doc/index.rst b/boards/arm/efm32wg_stk3800/doc/index.rst
index 24b2b3b2b68..c6eabb674a8 100644
--- a/boards/arm/efm32wg_stk3800/doc/index.rst
+++ b/boards/arm/efm32wg_stk3800/doc/index.rst
@@ -10,7 +10,7 @@ The EFM32 Wonder Gecko Starter Kit EFM32WG-STK3800 contains a MCU from the
 EFM32WG family built on ARM® Cortex®-M4F processor with excellent low
 power capabilities.
 
-.. figure:: efm32wg_stk3800.jpg
+.. figure:: ./efm32wg_stk3800.jpg
    :width: 375px
    :align: center
    :alt: EFM32WG-STK3800
diff --git a/boards/arm/efr32_slwstk6061a/doc/efr32-flex-gecko-starter-kit.png b/boards/arm/efr32_slwstk6061a/doc/efr32_slwstk6061a.png
similarity index 100%
rename from boards/arm/efr32_slwstk6061a/doc/efr32-flex-gecko-starter-kit.png
rename to boards/arm/efr32_slwstk6061a/doc/efr32_slwstk6061a.png
diff --git a/boards/arm/efr32_slwstk6061a/doc/index.rst b/boards/arm/efr32_slwstk6061a/doc/index.rst
index 22766e888f6..9062b0f6c2d 100644
--- a/boards/arm/efr32_slwstk6061a/doc/index.rst
+++ b/boards/arm/efr32_slwstk6061a/doc/index.rst
@@ -10,7 +10,7 @@ The EFR32 Flex Gecko Wireless Starter Kit SLWSTK6061A contains a Wireless
 System-On-Chip from the EFR32FG family built on an ARM® Cortex®-M4F processor
 with excellent low power capabilities.
 
-.. figure:: efr32-flex-gecko-starter-kit.png
+.. figure:: ./efr32_slwstk6061a.png
    :width: 375px
    :align: center
    :alt: EFR32-SLWSTK6061A
diff --git a/boards/arm/efr32mg_sltb004a/doc/index.rst b/boards/arm/efr32mg_sltb004a/doc/index.rst
index ef25e05e465..6a36ea065e9 100644
--- a/boards/arm/efr32mg_sltb004a/doc/index.rst
+++ b/boards/arm/efr32mg_sltb004a/doc/index.rst
@@ -10,7 +10,7 @@ The EFR32™ Mighty Gecko Starter Kit EFR32MG-SLTB004A (a.k.a Thunderboard
 Sense 2) contains a MCU from the EFR32MG family built on ARM® Cortex®-M4F
 processor with low power capabilities.
 
-.. image:: efr32mg_sltb004a.jpg
+.. image:: ./efr32mg_sltb004a.jpg
    :width: 640px
    :align: center
    :alt: EFR32MG-SLTB004A
diff --git a/boards/arm/frdm_k64f/doc/index.rst b/boards/arm/frdm_k64f/doc/index.rst
index 1f9748930aa..aa674a8375f 100644
--- a/boards/arm/frdm_k64f/doc/index.rst
+++ b/boards/arm/frdm_k64f/doc/index.rst
@@ -19,7 +19,7 @@ K63, and K24 MCUs.
   running an open source bootloader, offers options for serial communication,
   flash programming, and run-control debugging
 
-.. image:: frdm_k64f.jpg
+.. image:: ./frdm_k64f.jpg
    :width: 720px
    :align: center
    :alt: FRDM-K64F
diff --git a/boards/arm/frdm_kl25z/doc/index.rst b/boards/arm/frdm_kl25z/doc/index.rst
index e5c625d3a19..a9af668780c 100644
--- a/boards/arm/frdm_kl25z/doc/index.rst
+++ b/boards/arm/frdm_kl25z/doc/index.rst
@@ -15,7 +15,7 @@ low-power operation, a standard-based form factor with expansion board
 options and a built-in debug interface for flash programming and run-control.
 
 
-.. image:: frdm_kl25z.jpg
+.. image:: ./frdm_kl25z.jpg
    :width: 272px
    :align: center
    :alt: FRDM-KL25Z
diff --git a/boards/arm/frdm_kw41z/doc/index.rst b/boards/arm/frdm_kw41z/doc/index.rst
index 1e73a7a4ecf..85cd40eb7e6 100644
--- a/boards/arm/frdm_kw41z/doc/index.rst
+++ b/boards/arm/frdm_kw41z/doc/index.rst
@@ -22,7 +22,7 @@ F-antenna which can be bypassed to test via SMA connection, multiple power
 supply options, push/capacitive touch buttons, switches, LEDs and integrated
 sensors.
 
-.. image:: frdm_kw41z.jpg
+.. image:: ./frdm_kw41z.jpg
    :width: 720px
    :align: center
    :alt: FRDM-KW41Z
diff --git a/boards/arm/hexiwear_k64/doc/index.rst b/boards/arm/hexiwear_k64/doc/index.rst
index 2085d5fb806..3514e0ead8f 100644
--- a/boards/arm/hexiwear_k64/doc/index.rst
+++ b/boards/arm/hexiwear_k64/doc/index.rst
@@ -22,7 +22,7 @@ capacitive buttons with haptic feedback.
 - Flexibility to let you add the sensors of your choice nearly 200 additional
   sensors through click boards.
 
-.. image:: hexiwear_k64.jpg
+.. image:: ./hexiwear_k64.jpg
    :width: 442px
    :align: center
    :alt: Hexiwear
diff --git a/boards/arm/lpcxpresso54114/doc/index.rst b/boards/arm/lpcxpresso54114/doc/index.rst
index b312bb49863..a86e0d654ee 100644
--- a/boards/arm/lpcxpresso54114/doc/index.rst
+++ b/boards/arm/lpcxpresso54114/doc/index.rst
@@ -13,7 +13,7 @@ NXP supporting NXP's ARM-based microcontrollers. LPCXpresso is an end-to-end
 solution enabling embedded engineers to develop their applications from initial
 evaluation to final production.
 
-.. image:: lpcxpresso54114.png
+.. image:: ./lpcxpresso54114_m4.png
    :width: 720px
    :align: center
    :alt: LPCXPRESSO54114
diff --git a/boards/arm/lpcxpresso54114/doc/lpcxpresso54114.png b/boards/arm/lpcxpresso54114/doc/lpcxpresso54114_m4.png
similarity index 100%
rename from boards/arm/lpcxpresso54114/doc/lpcxpresso54114.png
rename to boards/arm/lpcxpresso54114/doc/lpcxpresso54114_m4.png
diff --git a/boards/arm/mec2016evb_assy6797/doc/index.rst b/boards/arm/mec2016evb_assy6797/doc/index.rst
index 4c669540ddd..ed7f3ad9799 100644
--- a/boards/arm/mec2016evb_assy6797/doc/index.rst
+++ b/boards/arm/mec2016evb_assy6797/doc/index.rst
@@ -10,7 +10,7 @@ The MEC2016EVB_ASSY6797 kit is a development platform to evaluate the
 Microchip MEC1701X series microcontrollers. This board needs to be mated with
 part number MEC170X 144WFBA SOLDER DC ASSY 6801(cpu board) in order to operate.
 
-.. image:: mec2016evb_assy6797.jpg
+.. image:: ./mec2016evb_assy6797.jpg
      :width: 500px
      :align: center
      :alt: MEC2016 EVB ASSY 6797
diff --git a/boards/arm/mimxrt1020_evk/doc/index.rst b/boards/arm/mimxrt1020_evk/doc/index.rst
index 28ecc4dc3ab..e13e3685b7c 100644
--- a/boards/arm/mimxrt1020_evk/doc/index.rst
+++ b/boards/arm/mimxrt1020_evk/doc/index.rst
@@ -11,7 +11,7 @@ high-performance feature set in low-cost LQFP packages, further simplifying
 board design and layout for customers. The i.MX RT1020 runs on the Arm®
 Cortex®-M7 core at 500 MHz.
 
-.. image:: mimxrt1020_evk.jpg
+.. image:: ./mimxrt1020_evk.jpg
    :width: 720px
    :align: center
    :alt: MIMXRT1020-EVK
diff --git a/boards/arm/mimxrt1050_evk/doc/index.rst b/boards/arm/mimxrt1050_evk/doc/index.rst
index 26454393f27..7fa4aa949a2 100644
--- a/boards/arm/mimxrt1050_evk/doc/index.rst
+++ b/boards/arm/mimxrt1050_evk/doc/index.rst
@@ -18,7 +18,7 @@ basic 2D graphics, camera interface, SPDIF, and I2S audio interface.
 The following document refers to the discontinued MIMXRT1050-EVK board. For the
 MIMXRT1050-EVKB board, refer to `Board Revisions`_ section.
 
-.. image:: mimxrt1050_evk.jpg
+.. image:: ./mimxrt1050_evk.jpg
    :width: 720px
    :align: center
    :alt: MIMXRT1050-EVK
diff --git a/boards/arm/mimxrt1060_evk/doc/index.rst b/boards/arm/mimxrt1060_evk/doc/index.rst
index 8f1d01aa4dc..a8ae1b92c7d 100644
--- a/boards/arm/mimxrt1060_evk/doc/index.rst
+++ b/boards/arm/mimxrt1060_evk/doc/index.rst
@@ -14,7 +14,7 @@ ideal for real-time applications such as High-Speed GPIO, CAN-FD, and
 synchronous parallel NAND/NOR/PSRAM controller. The i.MX RT1060 runs on the
 Arm® Cortex-M7® core at 600 MHz.
 
-.. image:: mimxrt1060_evk.jpg
+.. image:: ./mimxrt1060_evk.jpg
    :width: 720px
    :align: center
    :alt: MIMXRT1060-EVK
diff --git a/boards/arm/mimxrt1064_evk/doc/index.rst b/boards/arm/mimxrt1064_evk/doc/index.rst
index e5413c1292b..220ee645e6c 100644
--- a/boards/arm/mimxrt1064_evk/doc/index.rst
+++ b/boards/arm/mimxrt1064_evk/doc/index.rst
@@ -14,7 +14,7 @@ ideal for real-time applications such as High-Speed GPIO, CAN-FD, and
 synchronous parallel NAND/NOR/PSRAM controller. The i.MX RT1064 runs on the
 Arm® Cortex-M7® core at 600 MHz.
 
-.. image:: mimxrt1064_evk.jpg
+.. image:: ./mimxrt1064_evk.jpg
    :width: 720px
    :align: center
    :alt: MIMXRT1064-EVK
diff --git a/boards/arm/mps2_an385/doc/img/mps2.png b/boards/arm/mps2_an385/doc/img/mps2_an385.png
similarity index 100%
rename from boards/arm/mps2_an385/doc/img/mps2.png
rename to boards/arm/mps2_an385/doc/img/mps2_an385.png
diff --git a/boards/arm/mps2_an385/doc/index.rst b/boards/arm/mps2_an385/doc/index.rst
index 18d20f6d7fd..2605e434a86 100644
--- a/boards/arm/mps2_an385/doc/index.rst
+++ b/boards/arm/mps2_an385/doc/index.rst
@@ -14,7 +14,7 @@ the following devices:
 - System Tick System Clock (SYSTICK)
 - Cortex-M System Design Kit UART
 
-.. image:: img/mps2.png
+.. image:: img/mps2_an385.png
      :width: 442px
      :align: center
      :height: 335px
diff --git a/boards/arm/nrf51_ble400/doc/img/BLE400-intro.jpg b/boards/arm/nrf51_ble400/doc/img/nrf51_ble400.jpg
similarity index 100%
rename from boards/arm/nrf51_ble400/doc/img/BLE400-intro.jpg
rename to boards/arm/nrf51_ble400/doc/img/nrf51_ble400.jpg
diff --git a/boards/arm/nrf51_ble400/doc/index.rst b/boards/arm/nrf51_ble400/doc/index.rst
index bb540f5312c..e6e7f41be71 100644
--- a/boards/arm/nrf51_ble400/doc/index.rst
+++ b/boards/arm/nrf51_ble400/doc/index.rst
@@ -62,7 +62,7 @@ Connections and IOs
 Motherboard
 ------------
 
-.. image:: img/BLE400-intro.jpg
+.. image:: img/nrf51_ble400.jpg
    :width: 500px
    :align: center
    :alt: BLE400
diff --git a/boards/arm/nrf51_blenano/doc/img/nano.png b/boards/arm/nrf51_blenano/doc/img/nrf51_blenano.png
similarity index 100%
rename from boards/arm/nrf51_blenano/doc/img/nano.png
rename to boards/arm/nrf51_blenano/doc/img/nrf51_blenano.png
diff --git a/boards/arm/nrf51_blenano/doc/index.rst b/boards/arm/nrf51_blenano/doc/index.rst
index 2bffc295043..69c5ed0ea83 100644
--- a/boards/arm/nrf51_blenano/doc/index.rst
+++ b/boards/arm/nrf51_blenano/doc/index.rst
@@ -43,7 +43,7 @@ Connections and IOs
 
 BLE nano pinout
 
-.. image:: img/nano.png
+.. image:: img/nrf51_blenano.png
    :width: 500px
    :align: center
    :alt: BLE Nano
diff --git a/boards/arm/nrf52_adafruit_feather/doc/img/nRF52Feather.png b/boards/arm/nrf52_adafruit_feather/doc/img/nrf52_adafruit_feather.png
similarity index 100%
rename from boards/arm/nrf52_adafruit_feather/doc/img/nRF52Feather.png
rename to boards/arm/nrf52_adafruit_feather/doc/img/nrf52_adafruit_feather.png
diff --git a/boards/arm/nrf52_adafruit_feather/doc/index.rst b/boards/arm/nrf52_adafruit_feather/doc/index.rst
index 8ec9b60f0d0..566244141a3 100644
--- a/boards/arm/nrf52_adafruit_feather/doc/index.rst
+++ b/boards/arm/nrf52_adafruit_feather/doc/index.rst
@@ -18,7 +18,7 @@ the following devices:
 * RADIO (Bluetooth Low Energy)
 * Segger RTT (RTT Console)
 
-.. figure:: img/nRF52Feather.png
+.. figure:: img/nrf52_adafruit_feather.png
      :width: 442px
      :align: center
      :alt: nRF52 Adafruit Feather Board
diff --git a/boards/arm/nrf52_blenano2/doc/index.rst b/boards/arm/nrf52_blenano2/doc/index.rst
index 7baec62b3dc..e21a9fd42f8 100644
--- a/boards/arm/nrf52_blenano2/doc/index.rst
+++ b/boards/arm/nrf52_blenano2/doc/index.rst
@@ -45,7 +45,7 @@ Connections and IOs
 
 BLE nano v2 pinout
 
-.. image:: nano2.png
+.. image:: ./nrf52_blenano2.png
    :width: 680px
    :align: center
    :alt: NANO2
diff --git a/boards/arm/nrf52_blenano2/doc/nano2.png b/boards/arm/nrf52_blenano2/doc/nrf52_blenano2.png
similarity index 100%
rename from boards/arm/nrf52_blenano2/doc/nano2.png
rename to boards/arm/nrf52_blenano2/doc/nrf52_blenano2.png
diff --git a/boards/arm/nrf52_vbluno52/doc/img/nrf52_vbluno52_pinout.png b/boards/arm/nrf52_vbluno52/doc/img/nrf52_vbluno52.png
similarity index 100%
rename from boards/arm/nrf52_vbluno52/doc/img/nrf52_vbluno52_pinout.png
rename to boards/arm/nrf52_vbluno52/doc/img/nrf52_vbluno52.png
diff --git a/boards/arm/nrf52_vbluno52/doc/index.rst b/boards/arm/nrf52_vbluno52/doc/index.rst
index d61b9e120e2..f559c30bb55 100644
--- a/boards/arm/nrf52_vbluno52/doc/index.rst
+++ b/boards/arm/nrf52_vbluno52/doc/index.rst
@@ -18,7 +18,7 @@ the following devices:
 * FLASH
 * RADIO (Bluetooth Low Energy 5.0)
 
-.. figure:: img/nrf52_vbluno52_pinout.png
+.. figure:: img/nrf52_vbluno52.png
      :align: center
      :alt: nRF52 VBLUno52
 
diff --git a/boards/arm/nucleo_f030r8/doc/img/nucleo_f030r8_board.jpg b/boards/arm/nucleo_f030r8/doc/img/nucleo_f030r8.jpg
similarity index 100%
rename from boards/arm/nucleo_f030r8/doc/img/nucleo_f030r8_board.jpg
rename to boards/arm/nucleo_f030r8/doc/img/nucleo_f030r8.jpg
diff --git a/boards/arm/nucleo_f030r8/doc/index.rst b/boards/arm/nucleo_f030r8/doc/index.rst
index 94c7d7dc0c4..1ec53e7248d 100644
--- a/boards/arm/nucleo_f030r8/doc/index.rst
+++ b/boards/arm/nucleo_f030r8/doc/index.rst
@@ -20,7 +20,7 @@ The STM32 Nucleo board integrates the ST-LINK/V2-1 debugger and programmer.
 The STM32 Nucleo board comes with the STM32 comprehensive software HAL library together
 with various packaged software examples.
 
-.. image:: img/nucleo_f030r8_board.jpg
+.. image:: img/nucleo_f030r8.jpg
    :width: 500px
    :height: 367px
    :align: center
diff --git a/boards/arm/nucleo_f070rb/doc/img/nucleo_f070rb_board.jpg b/boards/arm/nucleo_f070rb/doc/img/nucleo_f070rb.jpg
similarity index 100%
rename from boards/arm/nucleo_f070rb/doc/img/nucleo_f070rb_board.jpg
rename to boards/arm/nucleo_f070rb/doc/img/nucleo_f070rb.jpg
diff --git a/boards/arm/nucleo_f070rb/doc/index.rst b/boards/arm/nucleo_f070rb/doc/index.rst
index a0f9bf851eb..39605d64f8f 100644
--- a/boards/arm/nucleo_f070rb/doc/index.rst
+++ b/boards/arm/nucleo_f070rb/doc/index.rst
@@ -20,7 +20,7 @@ The STM32 Nucleo board integrates the ST-LINK/V2-1 debugger and programmer.
 The STM32 Nucleo board comes with the STM32 comprehensive software HAL library together
 with various packaged software examples.
 
-.. image:: img/nucleo_f070rb_board.jpg
+.. image:: img/nucleo_f070rb.jpg
    :width: 500px
    :height: 367px
    :align: center
diff --git a/boards/arm/nucleo_f091rc/doc/img/nucleo_f091rc_board.jpg b/boards/arm/nucleo_f091rc/doc/img/nucleo_f091rc.jpg
similarity index 100%
rename from boards/arm/nucleo_f091rc/doc/img/nucleo_f091rc_board.jpg
rename to boards/arm/nucleo_f091rc/doc/img/nucleo_f091rc.jpg
diff --git a/boards/arm/nucleo_f091rc/doc/index.rst b/boards/arm/nucleo_f091rc/doc/index.rst
index 153b157026f..31adff67d4b 100644
--- a/boards/arm/nucleo_f091rc/doc/index.rst
+++ b/boards/arm/nucleo_f091rc/doc/index.rst
@@ -20,7 +20,7 @@ The STM32 Nucleo board integrates the ST-LINK/V2-1 debugger and programmer.
 The STM32 Nucleo board comes with the STM32 comprehensive software HAL library together
 with various packaged software examples.
 
-.. image:: img/nucleo_f091rc_board.jpg
+.. image:: img/nucleo_f091rc.jpg
    :width: 500px
    :height: 367px
    :align: center
diff --git a/boards/arm/nucleo_f103rb/doc/img/nucleo_f103rb_board.jpg b/boards/arm/nucleo_f103rb/doc/img/nucleo_f103rb.jpg
similarity index 100%
rename from boards/arm/nucleo_f103rb/doc/img/nucleo_f103rb_board.jpg
rename to boards/arm/nucleo_f103rb/doc/img/nucleo_f103rb.jpg
diff --git a/boards/arm/nucleo_f103rb/doc/index.rst b/boards/arm/nucleo_f103rb/doc/index.rst
index 26f17bbc176..e7c3065883a 100644
--- a/boards/arm/nucleo_f103rb/doc/index.rst
+++ b/boards/arm/nucleo_f103rb/doc/index.rst
@@ -20,7 +20,7 @@ The STM32 Nucleo board integrates the ST-LINK/V2-1 debugger and programmer.
 The STM32 Nucleo board comes with the STM32 comprehensive software HAL library together
 with various packaged software examples.
 
-.. image:: img/nucleo_f103rb_board.jpg
+.. image:: img/nucleo_f103rb.jpg
    :width: 500px
    :height: 367px
    :align: center
diff --git a/boards/arm/nucleo_f207zg/doc/img/Nucleo144_perf_logo_1024.png b/boards/arm/nucleo_f207zg/doc/img/nucleo_f207zg.png
similarity index 100%
rename from boards/arm/nucleo_f207zg/doc/img/Nucleo144_perf_logo_1024.png
rename to boards/arm/nucleo_f207zg/doc/img/nucleo_f207zg.png
diff --git a/boards/arm/nucleo_f207zg/doc/index.rst b/boards/arm/nucleo_f207zg/doc/index.rst
index 1aa42a32f9a..85c22b77e41 100644
--- a/boards/arm/nucleo_f207zg/doc/index.rst
+++ b/boards/arm/nucleo_f207zg/doc/index.rst
@@ -29,7 +29,7 @@ some highlights of the Nucleo F207ZG board:
 - Three user LEDs
 - Two push-buttons: USER and RESET
 
-.. image:: img/Nucleo144_perf_logo_1024.png
+.. image:: img/nucleo_f207zg.png
    :width: 720px
    :align: center
    :height: 720px
diff --git a/boards/arm/nucleo_f302r8/doc/img/nucleo_f302r8_board.jpg b/boards/arm/nucleo_f302r8/doc/img/nucleo_f302r8.jpg
similarity index 100%
rename from boards/arm/nucleo_f302r8/doc/img/nucleo_f302r8_board.jpg
rename to boards/arm/nucleo_f302r8/doc/img/nucleo_f302r8.jpg
diff --git a/boards/arm/nucleo_f302r8/doc/index.rst b/boards/arm/nucleo_f302r8/doc/index.rst
index 40e7f7d1bc7..a6006f8b3d1 100644
--- a/boards/arm/nucleo_f302r8/doc/index.rst
+++ b/boards/arm/nucleo_f302r8/doc/index.rst
@@ -27,7 +27,7 @@ Here are some highlights of the Nucleo F302R8 board:
 - One user LED
 - Two push-buttons: USER and RESET
 
-.. image:: img/nucleo_f302r8_board.jpg
+.. image:: img/nucleo_f302r8.jpg
    :width: 500px
    :height: 367px
    :align: center
diff --git a/boards/arm/nucleo_f334r8/doc/img/nucleo_f334r8_board.jpg b/boards/arm/nucleo_f334r8/doc/img/nucleo_f334r8.jpg
similarity index 100%
rename from boards/arm/nucleo_f334r8/doc/img/nucleo_f334r8_board.jpg
rename to boards/arm/nucleo_f334r8/doc/img/nucleo_f334r8.jpg
diff --git a/boards/arm/nucleo_f334r8/doc/index.rst b/boards/arm/nucleo_f334r8/doc/index.rst
index 9ed952c818e..40f792fa400 100644
--- a/boards/arm/nucleo_f334r8/doc/index.rst
+++ b/boards/arm/nucleo_f334r8/doc/index.rst
@@ -21,7 +21,7 @@ debugger and programmer.
 The STM32 Nucleo board comes with the STM32 comprehensive software HAL library together
 with various packaged software examples.
 
-.. image:: img/nucleo_f334r8_board.jpg
+.. image:: img/nucleo_f334r8.jpg
    :width: 500px
    :height: 367px
    :align: center
diff --git a/boards/arm/nucleo_f401re/doc/img/nucleo64_perf_logo_1024.png b/boards/arm/nucleo_f401re/doc/img/nucleo_f401re.png
similarity index 100%
rename from boards/arm/nucleo_f401re/doc/img/nucleo64_perf_logo_1024.png
rename to boards/arm/nucleo_f401re/doc/img/nucleo_f401re.png
diff --git a/boards/arm/nucleo_f401re/doc/index.rst b/boards/arm/nucleo_f401re/doc/index.rst
index a2e75601e08..536b3d8ab94 100644
--- a/boards/arm/nucleo_f401re/doc/index.rst
+++ b/boards/arm/nucleo_f401re/doc/index.rst
@@ -25,7 +25,7 @@ some highlights of the Nucleo F401RE board:
 - Three LEDs: USB communication (LD1), user LED (LD2), power LED (LD3)
 - Two push-buttons: USER and RESET
 
-.. image:: img/nucleo64_perf_logo_1024.png
+.. image:: img/nucleo_f401re.png
    :width: 720px
    :align: center
    :height: 720px
diff --git a/boards/arm/nucleo_f411re/doc/img/nucleo64_perf_logo_1024.png b/boards/arm/nucleo_f411re/doc/img/nucleo_f411re.png
similarity index 100%
rename from boards/arm/nucleo_f411re/doc/img/nucleo64_perf_logo_1024.png
rename to boards/arm/nucleo_f411re/doc/img/nucleo_f411re.png
diff --git a/boards/arm/nucleo_f411re/doc/index.rst b/boards/arm/nucleo_f411re/doc/index.rst
index 60039fd239a..c2b30c13e82 100644
--- a/boards/arm/nucleo_f411re/doc/index.rst
+++ b/boards/arm/nucleo_f411re/doc/index.rst
@@ -25,7 +25,7 @@ some highlights of the Nucleo F411RE board:
 - Three LEDs: USB communication (LD1), user LED (LD2), power LED (LD3)
 - Two push-buttons: USER and RESET
 
-.. image:: img/nucleo64_perf_logo_1024.png
+.. image:: img/nucleo_f411re.png
    :width: 720px
    :align: center
    :height: 720px
diff --git a/boards/arm/nucleo_f412zg/doc/img/Nucleo144_perf_logo_1024.png b/boards/arm/nucleo_f412zg/doc/img/nucleo_f412zg.png
similarity index 100%
rename from boards/arm/nucleo_f412zg/doc/img/Nucleo144_perf_logo_1024.png
rename to boards/arm/nucleo_f412zg/doc/img/nucleo_f412zg.png
diff --git a/boards/arm/nucleo_f412zg/doc/index.rst b/boards/arm/nucleo_f412zg/doc/index.rst
index b24e74fe5c1..32c93441bf0 100644
--- a/boards/arm/nucleo_f412zg/doc/index.rst
+++ b/boards/arm/nucleo_f412zg/doc/index.rst
@@ -28,7 +28,7 @@ some highlights of the Nucleo F412ZG board:
 - Three user LEDs
 - Two push-buttons: USER and RESET
 
-.. image:: img/Nucleo144_perf_logo_1024.png
+.. image:: img/nucleo_f412zg.png
    :width: 720px
    :align: center
    :height: 720px
diff --git a/boards/arm/nucleo_f413zh/doc/img/Nucleo144_perf_logo_1024.png b/boards/arm/nucleo_f413zh/doc/img/nucleo_f413zh.png
similarity index 100%
rename from boards/arm/nucleo_f413zh/doc/img/Nucleo144_perf_logo_1024.png
rename to boards/arm/nucleo_f413zh/doc/img/nucleo_f413zh.png
diff --git a/boards/arm/nucleo_f413zh/doc/index.rst b/boards/arm/nucleo_f413zh/doc/index.rst
index f2907fcf4f8..75f15c10bd0 100644
--- a/boards/arm/nucleo_f413zh/doc/index.rst
+++ b/boards/arm/nucleo_f413zh/doc/index.rst
@@ -28,7 +28,7 @@ some highlights of the Nucleo F413ZH board:
 - Three user LEDs
 - Two push-buttons: USER and RESET
 
-.. image:: img/Nucleo144_perf_logo_1024.png
+.. image:: img/nucleo_f413zh.png
    :width: 720px
    :align: center
    :height: 720px
diff --git a/boards/arm/nucleo_f429zi/doc/img/Nucleo144_perf_logo_1024.png b/boards/arm/nucleo_f429zi/doc/img/nucleo_f429zi.png
similarity index 100%
rename from boards/arm/nucleo_f429zi/doc/img/Nucleo144_perf_logo_1024.png
rename to boards/arm/nucleo_f429zi/doc/img/nucleo_f429zi.png
diff --git a/boards/arm/nucleo_f429zi/doc/index.rst b/boards/arm/nucleo_f429zi/doc/index.rst
index df957760bff..2ec4d82f52d 100644
--- a/boards/arm/nucleo_f429zi/doc/index.rst
+++ b/boards/arm/nucleo_f429zi/doc/index.rst
@@ -31,7 +31,7 @@ some highlights of the Nucleo F429ZI board:
 - Three user LEDs
 - Two push-buttons: USER and RESET
 
-.. image:: img/Nucleo144_perf_logo_1024.png
+.. image:: img/nucleo_f429zi.png
    :width: 720px
    :align: center
    :height: 720px
diff --git a/boards/arm/nucleo_f446re/doc/img/nucleo64_perf_logo_1024.png b/boards/arm/nucleo_f446re/doc/img/nucleo_f446re.png
similarity index 100%
rename from boards/arm/nucleo_f446re/doc/img/nucleo64_perf_logo_1024.png
rename to boards/arm/nucleo_f446re/doc/img/nucleo_f446re.png
diff --git a/boards/arm/nucleo_f446re/doc/index.rst b/boards/arm/nucleo_f446re/doc/index.rst
index 7699e644831..144a66edee5 100644
--- a/boards/arm/nucleo_f446re/doc/index.rst
+++ b/boards/arm/nucleo_f446re/doc/index.rst
@@ -25,7 +25,7 @@ some highlights of the Nucleo F446RE board:
 - Three LEDs: USB communication (LD1), user LED (LD2), power LED (LD3)
 - Two push-buttons: USER and RESET
 
-.. image:: img/nucleo64_perf_logo_1024.png
+.. image:: img/nucleo_f446re.png
    :width: 720px
    :align: center
    :height: 720px
diff --git a/boards/arm/nucleo_f746zg/doc/img/en.high-perf_nucleo-144_mbed.jpg b/boards/arm/nucleo_f746zg/doc/img/nucleo_f746zg.jpg
similarity index 100%
rename from boards/arm/nucleo_f746zg/doc/img/en.high-perf_nucleo-144_mbed.jpg
rename to boards/arm/nucleo_f746zg/doc/img/nucleo_f746zg.jpg
diff --git a/boards/arm/nucleo_f746zg/doc/index.rst b/boards/arm/nucleo_f746zg/doc/index.rst
index 13aeb651764..560b17fdbdb 100644
--- a/boards/arm/nucleo_f746zg/doc/index.rst
+++ b/boards/arm/nucleo_f746zg/doc/index.rst
@@ -44,7 +44,7 @@ Key Features
   STM32Cube MCU package.
 - Arm* Mbed Enabled* compliant (only for some Nucleo part numbers)
 
-.. image:: img/en.high-perf_nucleo-144_mbed.jpg
+.. image:: img/nucleo_f746zg.jpg
    :width: 720px
    :align: center
    :height: 720px
diff --git a/boards/arm/nucleo_f756zg/doc/img/en.high-perf_nucleo-144_mbed.jpg b/boards/arm/nucleo_f756zg/doc/img/nucleo_f756zg.jpg
similarity index 100%
rename from boards/arm/nucleo_f756zg/doc/img/en.high-perf_nucleo-144_mbed.jpg
rename to boards/arm/nucleo_f756zg/doc/img/nucleo_f756zg.jpg
diff --git a/boards/arm/nucleo_f756zg/doc/index.rst b/boards/arm/nucleo_f756zg/doc/index.rst
index 44606e9f9ed..dc053de2965 100644
--- a/boards/arm/nucleo_f756zg/doc/index.rst
+++ b/boards/arm/nucleo_f756zg/doc/index.rst
@@ -44,7 +44,7 @@ Key Features
 - STM32Cube MCU package.
 - Arm* Mbed Enabled* compliant (only for some Nucleo part numbers)
 
-.. image:: img/en.high-perf_nucleo-144_mbed.jpg
+.. image:: img/nucleo_f756zg.jpg
    :width: 720px
    :align: center
    :height: 720px
diff --git a/boards/arm/nucleo_l053r8/doc/img/nucleo_l053r8_board.jpg b/boards/arm/nucleo_l053r8/doc/img/nucleo_l053r8.jpg
similarity index 100%
rename from boards/arm/nucleo_l053r8/doc/img/nucleo_l053r8_board.jpg
rename to boards/arm/nucleo_l053r8/doc/img/nucleo_l053r8.jpg
diff --git a/boards/arm/nucleo_l053r8/doc/index.rst b/boards/arm/nucleo_l053r8/doc/index.rst
index beae9836cdd..034c70ab94a 100644
--- a/boards/arm/nucleo_l053r8/doc/index.rst
+++ b/boards/arm/nucleo_l053r8/doc/index.rst
@@ -20,7 +20,7 @@ The STM32 Nucleo board integrates the ST-LINK/V2-1 debugger and programmer.
 The STM32 Nucleo board comes with the STM32 comprehensive software HAL library together
 with various packaged software examples.
 
-.. image:: img/nucleo_l053r8_board.jpg
+.. image:: img/nucleo_l053r8.jpg
    :width: 500px
    :height: 367px
    :align: center
diff --git a/boards/arm/nucleo_l073rz/doc/img/nucleo_l073rz_board.jpg b/boards/arm/nucleo_l073rz/doc/img/nucleo_l073rz.jpg
similarity index 100%
rename from boards/arm/nucleo_l073rz/doc/img/nucleo_l073rz_board.jpg
rename to boards/arm/nucleo_l073rz/doc/img/nucleo_l073rz.jpg
diff --git a/boards/arm/nucleo_l073rz/doc/index.rst b/boards/arm/nucleo_l073rz/doc/index.rst
index 6d487587a1a..be8c71b51b0 100644
--- a/boards/arm/nucleo_l073rz/doc/index.rst
+++ b/boards/arm/nucleo_l073rz/doc/index.rst
@@ -20,7 +20,7 @@ The STM32 Nucleo board integrates the ST-LINK/V2-1 debugger and programmer.
 The STM32 Nucleo board comes with the STM32 comprehensive software HAL library together
 with various packaged software examples.
 
-.. image:: img/nucleo_l073rz_board.jpg
+.. image:: img/nucleo_l073rz.jpg
    :width: 500px
    :height: 367px
    :align: center
diff --git a/boards/arm/nucleo_l432kc/doc/img/nucleo32_ulp_logo.jpg b/boards/arm/nucleo_l432kc/doc/img/nucleo_l432kc.jpg
similarity index 100%
rename from boards/arm/nucleo_l432kc/doc/img/nucleo32_ulp_logo.jpg
rename to boards/arm/nucleo_l432kc/doc/img/nucleo_l432kc.jpg
diff --git a/boards/arm/nucleo_l432kc/doc/index.rst b/boards/arm/nucleo_l432kc/doc/index.rst
index 6a095ed256d..7fadf13c268 100644
--- a/boards/arm/nucleo_l432kc/doc/index.rst
+++ b/boards/arm/nucleo_l432kc/doc/index.rst
@@ -21,7 +21,7 @@ some highlights of the Nucleo L432KC board:
 - Three LEDs: USB communication (LD1), power LED (LD2), user LED (LD3)
 - One push-button: RESET
 
-.. image:: img/nucleo32_ulp_logo.jpg
+.. image:: img/nucleo_l432kc.jpg
   :width: 250px
   :align: center
   :height: 188px
diff --git a/boards/arm/nucleo_l476rg/doc/img/nucleo64_ulp_logo_1024.jpg b/boards/arm/nucleo_l476rg/doc/img/nucleo_l476rg.jpg
similarity index 100%
rename from boards/arm/nucleo_l476rg/doc/img/nucleo64_ulp_logo_1024.jpg
rename to boards/arm/nucleo_l476rg/doc/img/nucleo_l476rg.jpg
diff --git a/boards/arm/nucleo_l476rg/doc/index.rst b/boards/arm/nucleo_l476rg/doc/index.rst
index b026217efb9..9c8cdd276ce 100644
--- a/boards/arm/nucleo_l476rg/doc/index.rst
+++ b/boards/arm/nucleo_l476rg/doc/index.rst
@@ -26,7 +26,7 @@ some highlights of the Nucleo L476RG board:
 - Three LEDs: USB communication (LD1), user LED (LD2), power LED (LD3)
 - Two push-buttons: USER and RESET
 
-.. image:: img/nucleo64_ulp_logo_1024.jpg
+.. image:: img/nucleo_l476rg.jpg
    :width: 250px
    :align: center
    :height: 250px
diff --git a/boards/arm/nucleo_l496zg/doc/img/en.nucleo-l496zg.jpg b/boards/arm/nucleo_l496zg/doc/img/nucleo_l496zg.jpg
similarity index 100%
rename from boards/arm/nucleo_l496zg/doc/img/en.nucleo-l496zg.jpg
rename to boards/arm/nucleo_l496zg/doc/img/nucleo_l496zg.jpg
diff --git a/boards/arm/nucleo_l496zg/doc/index.rst b/boards/arm/nucleo_l496zg/doc/index.rst
index 42ba3ac8bc4..c9d09e9986d 100644
--- a/boards/arm/nucleo_l496zg/doc/index.rst
+++ b/boards/arm/nucleo_l496zg/doc/index.rst
@@ -28,7 +28,7 @@ some highlights of the Nucleo L476ZG board:
   power fault(LD5), power LED (LD6), USB FS OTG (LD7, LD8)
 - 2 push buttons: USER and RESET
 
-.. image:: img/en.nucleo-l496zg.jpg
+.. image:: img/nucleo_l496zg.jpg
    :width: 250px
    :align: center
    :height: 250px
diff --git a/boards/arm/nucleo_l4r5zi/doc/img/nucleo144_ulp_logo_1024.jpg b/boards/arm/nucleo_l4r5zi/doc/img/nucleo_l4r5zi.jpg
similarity index 100%
rename from boards/arm/nucleo_l4r5zi/doc/img/nucleo144_ulp_logo_1024.jpg
rename to boards/arm/nucleo_l4r5zi/doc/img/nucleo_l4r5zi.jpg
diff --git a/boards/arm/nucleo_l4r5zi/doc/index.rst b/boards/arm/nucleo_l4r5zi/doc/index.rst
index f83af40c48d..339b1d178c0 100644
--- a/boards/arm/nucleo_l4r5zi/doc/index.rst
+++ b/boards/arm/nucleo_l4r5zi/doc/index.rst
@@ -26,7 +26,7 @@ some highlights of the Nucleo L4R5ZI board:
 - Three User LEDs: LD1 (Green), LD2 (Blue), LD3 (Red)
 - Two push-buttons: USER and RESET
 
-.. image:: img/nucleo144_ulp_logo_1024.jpg
+.. image:: img/nucleo_l4r5zi.jpg
      :width: 250px
      :align: center
      :height: 250px
diff --git a/boards/arm/olimex_stm32_e407/doc/img/olimex-stm32-e407.png b/boards/arm/olimex_stm32_e407/doc/img/olimex_stm32_e407.png
similarity index 100%
rename from boards/arm/olimex_stm32_e407/doc/img/olimex-stm32-e407.png
rename to boards/arm/olimex_stm32_e407/doc/img/olimex_stm32_e407.png
diff --git a/boards/arm/olimex_stm32_e407/doc/index.rst b/boards/arm/olimex_stm32_e407/doc/index.rst
index 08538878a80..87d7eb06aee 100644
--- a/boards/arm/olimex_stm32_e407/doc/index.rst
+++ b/boards/arm/olimex_stm32_e407/doc/index.rst
@@ -9,7 +9,7 @@ Overview
 The OLIMEX-STM32-E407 board is open source hardware and is based on
 the STMicroelectronics STM32F407ZG ARM Cortex-M4 CPU.
 
-.. figure:: img/olimex-stm32-e407.png
+.. figure:: img/olimex_stm32_e407.png
      :width: 540px
      :align: center
      :height: 454px
diff --git a/boards/arm/olimex_stm32_h407/doc/img/olimex-stm32-h407.png b/boards/arm/olimex_stm32_h407/doc/img/olimex_stm32_h407.png
similarity index 100%
rename from boards/arm/olimex_stm32_h407/doc/img/olimex-stm32-h407.png
rename to boards/arm/olimex_stm32_h407/doc/img/olimex_stm32_h407.png
diff --git a/boards/arm/olimex_stm32_h407/doc/index.rst b/boards/arm/olimex_stm32_h407/doc/index.rst
index 2aea3fe45f0..5b08c90c5af 100644
--- a/boards/arm/olimex_stm32_h407/doc/index.rst
+++ b/boards/arm/olimex_stm32_h407/doc/index.rst
@@ -9,7 +9,7 @@ Overview
 The OLIMEX-STM32-H407 is open source hardware and is based on
 the STMicroelectronics STM32F407ZG ARM Cortex-M4 CPU.
 
-.. figure:: img/olimex-stm32-h407.png
+.. figure:: img/olimex_stm32_h407.png
      :width: 540px
      :align: center
      :height: 454px
diff --git a/boards/arm/olimex_stm32_p405/doc/img/olimex-stm32-p405.png b/boards/arm/olimex_stm32_p405/doc/img/olimex_stm32_p405.png
similarity index 100%
rename from boards/arm/olimex_stm32_p405/doc/img/olimex-stm32-p405.png
rename to boards/arm/olimex_stm32_p405/doc/img/olimex_stm32_p405.png
diff --git a/boards/arm/olimex_stm32_p405/doc/index.rst b/boards/arm/olimex_stm32_p405/doc/index.rst
index 54e089a7d54..1099720b588 100644
--- a/boards/arm/olimex_stm32_p405/doc/index.rst
+++ b/boards/arm/olimex_stm32_p405/doc/index.rst
@@ -9,7 +9,7 @@ Overview
 The OLIMEX-STM32-P405 board is based on the STMicroelectronics STM32F405RG ARM
 Cortex-M4 CPU.
 
-.. figure:: img/olimex-stm32-p405.png
+.. figure:: img/olimex_stm32_p405.png
      :width: 540px
      :align: center
      :height: 454px
diff --git a/boards/arm/olimexino_stm32/doc/img/olimexino-stm32.png b/boards/arm/olimexino_stm32/doc/img/olimexino_stm32.png
similarity index 100%
rename from boards/arm/olimexino_stm32/doc/img/olimexino-stm32.png
rename to boards/arm/olimexino_stm32/doc/img/olimexino_stm32.png
diff --git a/boards/arm/olimexino_stm32/doc/index.rst b/boards/arm/olimexino_stm32/doc/index.rst
index ca24618773e..6c249a766ad 100644
--- a/boards/arm/olimexino_stm32/doc/index.rst
+++ b/boards/arm/olimexino_stm32/doc/index.rst
@@ -9,7 +9,7 @@ Overview
 The OLIMEXINO-STM32 board is based on the STMicroelectronics STM32F103RB ARM
 Cortex-M3 CPU.
 
-.. figure:: img/olimexino-stm32.png
+.. figure:: img/olimexino_stm32.png
      :width: 540px
      :align: center
      :height: 454px
diff --git a/boards/arm/particle_argon/doc/img/argon-top.png b/boards/arm/particle_argon/doc/img/particle_argon.png
similarity index 100%
rename from boards/arm/particle_argon/doc/img/argon-top.png
rename to boards/arm/particle_argon/doc/img/particle_argon.png
diff --git a/boards/arm/particle_argon/doc/index.rst b/boards/arm/particle_argon/doc/index.rst
index f01ab7ed5e5..509691b8c59 100644
--- a/boards/arm/particle_argon/doc/index.rst
+++ b/boards/arm/particle_argon/doc/index.rst
@@ -29,7 +29,7 @@ Hardware
 On the front of the board are RGB-LED, LED and LIPO circuitry.
 The RGB-LED is controlled by the nRF52840 via GPIO pins.
 
-.. figure:: img/argon-top.png
+.. figure:: img/particle_argon.png
      :width: 150px
      :align: center
      :alt: Particle Argon
diff --git a/boards/arm/particle_boron/doc/img/boron-top.png b/boards/arm/particle_boron/doc/img/particle_boron.png
similarity index 100%
rename from boards/arm/particle_boron/doc/img/boron-top.png
rename to boards/arm/particle_boron/doc/img/particle_boron.png
diff --git a/boards/arm/particle_boron/doc/index.rst b/boards/arm/particle_boron/doc/index.rst
index 56161246d74..f70b13bc5ae 100644
--- a/boards/arm/particle_boron/doc/index.rst
+++ b/boards/arm/particle_boron/doc/index.rst
@@ -29,7 +29,7 @@ Hardware
 On the front of the board are RGB-LED, LED and LIPO circuitry.
 The RGB-LED is controlled by the nRF52840 via GPIO pins.
 
-.. figure:: img/boron-top.png
+.. figure:: img/particle_boron.png
      :width: 150px
      :align: center
      :alt: Particle Boron
diff --git a/boards/arm/particle_xenon/doc/img/xenon-top.png b/boards/arm/particle_xenon/doc/img/particle_xenon.png
similarity index 100%
rename from boards/arm/particle_xenon/doc/img/xenon-top.png
rename to boards/arm/particle_xenon/doc/img/particle_xenon.png
diff --git a/boards/arm/particle_xenon/doc/index.rst b/boards/arm/particle_xenon/doc/index.rst
index da8804d8dde..df7b40c43dc 100644
--- a/boards/arm/particle_xenon/doc/index.rst
+++ b/boards/arm/particle_xenon/doc/index.rst
@@ -28,7 +28,7 @@ Hardware
 On the front of the board are RGB-LED, LED and LIPO circuitry.
 The RGB-LED is controlled by the nRF52840 via GPIO pins.
 
-.. figure:: img/xenon-top.png
+.. figure:: img/particle_xenon.png
      :width: 150px
      :align: center
      :alt: Particle Xenon
diff --git a/boards/arm/reel_board/doc/img/reel_board_descr_front.png b/boards/arm/reel_board/doc/img/reel_board.png
similarity index 100%
rename from boards/arm/reel_board/doc/img/reel_board_descr_front.png
rename to boards/arm/reel_board/doc/img/reel_board.png
diff --git a/boards/arm/reel_board/doc/index.rst b/boards/arm/reel_board/doc/index.rst
index df79c0a8bb7..fd06ea31bdd 100644
--- a/boards/arm/reel_board/doc/index.rst
+++ b/boards/arm/reel_board/doc/index.rst
@@ -48,7 +48,7 @@ MMA8652FC is a 12-bit Digital Accelerometer.
 All sensors are connected to the I2C bus and one GPIO pin each,
 which can be used as an interrupt source.
 
-.. figure:: img/reel_board_descr_front.png
+.. figure:: img/reel_board.png
      :width: 442px
      :align: center
      :alt: reel board front
diff --git a/boards/arm/stm3210c_eval/doc/img/stm3210c_eval_board.jpg b/boards/arm/stm3210c_eval/doc/img/stm3210c_eval.jpg
similarity index 100%
rename from boards/arm/stm3210c_eval/doc/img/stm3210c_eval_board.jpg
rename to boards/arm/stm3210c_eval/doc/img/stm3210c_eval.jpg
diff --git a/boards/arm/stm3210c_eval/doc/index.rst b/boards/arm/stm3210c_eval/doc/index.rst
index 031825bd1a8..ef7f4205df4 100644
--- a/boards/arm/stm3210c_eval/doc/index.rst
+++ b/boards/arm/stm3210c_eval/doc/index.rst
@@ -15,7 +15,7 @@ audio DAC, MEMS, EEPROM and more) and develop your own applications.
 Extension headers make it easy to connect a daughterboard or wrapping board for your specific
 application.
 
-.. image:: img/stm3210c_eval_board.jpg
+.. image:: img/stm3210c_eval.jpg
      :width: 660px
      :height: 792px
      :align: center
diff --git a/boards/arm/stm32373c_eval/doc/img/stm32373c_eval_board.jpg b/boards/arm/stm32373c_eval/doc/img/stm32373c_eval.jpg
similarity index 100%
rename from boards/arm/stm32373c_eval/doc/img/stm32373c_eval_board.jpg
rename to boards/arm/stm32373c_eval/doc/img/stm32373c_eval.jpg
diff --git a/boards/arm/stm32373c_eval/doc/index.rst b/boards/arm/stm32373c_eval/doc/index.rst
index b891fa4b414..e13252b92b2 100644
--- a/boards/arm/stm32373c_eval/doc/index.rst
+++ b/boards/arm/stm32373c_eval/doc/index.rst
@@ -11,7 +11,7 @@ The full range of hardware features on the board can help the user evaluate all
 
 Extension headers make it possible to easily connect a daughter board or wrapping board for a specific application.
 
-.. image:: img/stm32373c_eval_board.jpg
+.. image:: img/stm32373c_eval.jpg
      :width: 350px
      :height: 489px
      :align: center
diff --git a/boards/arm/stm32f072b_disco/doc/img/en.stm32f072b_disco.jpg b/boards/arm/stm32f072b_disco/doc/img/stm32f072b_disco.jpg
similarity index 100%
rename from boards/arm/stm32f072b_disco/doc/img/en.stm32f072b_disco.jpg
rename to boards/arm/stm32f072b_disco/doc/img/stm32f072b_disco.jpg
diff --git a/boards/arm/stm32f072b_disco/doc/index.rst b/boards/arm/stm32f072b_disco/doc/index.rst
index 2a675b672e9..e074010c45b 100644
--- a/boards/arm/stm32f072b_disco/doc/index.rst
+++ b/boards/arm/stm32f072b_disco/doc/index.rst
@@ -29,7 +29,7 @@ started quickly. Here are some highlights of the STM32F072B-DISCO board:
 - One linear touch sensor or four touch keys
 - RF EEprom daughter board connector
 
-.. image:: img/en.stm32f072b_disco.jpg
+.. image:: img/stm32f072b_disco.jpg
      :width: 272px
      :align: center
      :height: 551px
diff --git a/boards/arm/stm32f0_disco/doc/img/en.stm32f0discovery.jpg b/boards/arm/stm32f0_disco/doc/img/stm32f0_disco.jpg
similarity index 100%
rename from boards/arm/stm32f0_disco/doc/img/en.stm32f0discovery.jpg
rename to boards/arm/stm32f0_disco/doc/img/stm32f0_disco.jpg
diff --git a/boards/arm/stm32f0_disco/doc/index.rst b/boards/arm/stm32f0_disco/doc/index.rst
index b298feab697..19b7ef99f61 100644
--- a/boards/arm/stm32f0_disco/doc/index.rst
+++ b/boards/arm/stm32f0_disco/doc/index.rst
@@ -11,7 +11,7 @@ integrates the ST-LINK/V2-1 debugger and programmer.  It also comes with a
 comprehensive STM32 software HAL library and various packaged software
 examples.
 
-.. image:: img/en.stm32f0discovery.jpg
+.. image:: img/stm32f0_disco.jpg
      :width: 350px
      :height: 404px
      :align: center
diff --git a/boards/arm/stm32f3_disco/doc/img/en.stm32f3discovery.jpg b/boards/arm/stm32f3_disco/doc/img/stm32f3_disco.jpg
similarity index 100%
rename from boards/arm/stm32f3_disco/doc/img/en.stm32f3discovery.jpg
rename to boards/arm/stm32f3_disco/doc/img/stm32f3_disco.jpg
diff --git a/boards/arm/stm32f3_disco/doc/index.rst b/boards/arm/stm32f3_disco/doc/index.rst
index f75bcc079b9..c0aa861da43 100644
--- a/boards/arm/stm32f3_disco/doc/index.rst
+++ b/boards/arm/stm32f3_disco/doc/index.rst
@@ -32,7 +32,7 @@ started quickly. Here are some highlights of the STM32F3DISCOVERY board:
 - LSM303DLHC, ST MEMS system-in-package featuring a 3D digital linear
   acceleration sensor and a 3D digital magnetic sensor
 
-.. image:: img/en.stm32f3discovery.jpg
+.. image:: img/stm32f3_disco.jpg
      :width: 350px
      :align: center
      :height: 531px
diff --git a/boards/arm/stm32f411e_disco/doc/img/en.stm32f411e-disco.jpg b/boards/arm/stm32f411e_disco/doc/img/stm32f411e_disco.jpg
similarity index 100%
rename from boards/arm/stm32f411e_disco/doc/img/en.stm32f411e-disco.jpg
rename to boards/arm/stm32f411e_disco/doc/img/stm32f411e_disco.jpg
diff --git a/boards/arm/stm32f411e_disco/doc/index.rst b/boards/arm/stm32f411e_disco/doc/index.rst
index 4651cca11ab..ae1daa5ba9f 100644
--- a/boards/arm/stm32f411e_disco/doc/index.rst
+++ b/boards/arm/stm32f411e_disco/doc/index.rst
@@ -29,7 +29,7 @@ Here are some highlights of the STM32F411E-DISCO board:
 - USB OTG with micro-AB connector
 - Extension header for LQFP100 I/Os for a quick connection to the prototyping board and an easy probing
 
-.. image:: img/en.stm32f411e-disco.jpg
+.. image:: img/stm32f411e_disco.jpg
      :width: 533px
      :align: center
      :height: 500px
diff --git a/boards/arm/stm32f412g_disco/doc/img/en.32F412GDISCOVERY.jpg b/boards/arm/stm32f412g_disco/doc/img/stm32f412g_disco.jpg
similarity index 100%
rename from boards/arm/stm32f412g_disco/doc/img/en.32F412GDISCOVERY.jpg
rename to boards/arm/stm32f412g_disco/doc/img/stm32f412g_disco.jpg
diff --git a/boards/arm/stm32f412g_disco/doc/index.rst b/boards/arm/stm32f412g_disco/doc/index.rst
index d88d8bb6183..1c40175cd3a 100644
--- a/boards/arm/stm32f412g_disco/doc/index.rst
+++ b/boards/arm/stm32f412g_disco/doc/index.rst
@@ -39,7 +39,7 @@ some highlights of the STM32F412G-DISCO board:
 - Extension connector for direct access to various features of STM32F412ZGT6 MCU
 - Comprehensive free software including a variety of examples, part of STM32Cube package
 
-.. image:: img/en.32F412GDISCOVERY.jpg
+.. image:: img/stm32f412g_disco.jpg
      :width: 700px
      :align: center
      :height: 522px
diff --git a/boards/arm/stm32f429i_disc1/doc/img/en.stm32f429i_disc1.png b/boards/arm/stm32f429i_disc1/doc/img/stm32f429i_disc1.png
similarity index 100%
rename from boards/arm/stm32f429i_disc1/doc/img/en.stm32f429i_disc1.png
rename to boards/arm/stm32f429i_disc1/doc/img/stm32f429i_disc1.png
diff --git a/boards/arm/stm32f429i_disc1/doc/index.rst b/boards/arm/stm32f429i_disc1/doc/index.rst
index 5b8f4d004f8..c0b8919140f 100644
--- a/boards/arm/stm32f429i_disc1/doc/index.rst
+++ b/boards/arm/stm32f429i_disc1/doc/index.rst
@@ -31,7 +31,7 @@ some highlights of the STM32F429I-DISC1 board:
 	- Two user LEDs: LD3 (green), LD4 (red)
 	- Two USB OTG LEDs: LD5 (green) VBUS and LD6 (red) OC (over-current)
 
-.. image:: img/en.stm32f429i_disc1.png
+.. image:: img/stm32f429i_disc1.png
      :width: 350px
      :align: center
      :height: 631px
diff --git a/boards/arm/stm32f469i_disco/doc/img/en.stm32f469i-disco.jpg b/boards/arm/stm32f469i_disco/doc/img/stm32f469i_disco.jpg
similarity index 100%
rename from boards/arm/stm32f469i_disco/doc/img/en.stm32f469i-disco.jpg
rename to boards/arm/stm32f469i_disco/doc/img/stm32f469i_disco.jpg
diff --git a/boards/arm/stm32f469i_disco/doc/index.rst b/boards/arm/stm32f469i_disco/doc/index.rst
index c457ba656a2..5dff89b4b2a 100644
--- a/boards/arm/stm32f469i_disco/doc/index.rst
+++ b/boards/arm/stm32f469i_disco/doc/index.rst
@@ -31,7 +31,7 @@ some highlights of the STM32F469I-DISCO board:
 - 128-Mbit Quad-SPI NOR Flash
 - Expansion connectors and Arduino UNO V3 connectors
 
-.. image:: img/en.stm32f469i-disco.jpg
+.. image:: img/stm32f469i_disco.jpg
      :width: 457px
      :align: center
      :height: 551px
diff --git a/boards/arm/stm32f4_disco/doc/img/en.stm32f4_discovery.jpg b/boards/arm/stm32f4_disco/doc/img/stm32f4_disco.jpg
similarity index 100%
rename from boards/arm/stm32f4_disco/doc/img/en.stm32f4_discovery.jpg
rename to boards/arm/stm32f4_disco/doc/img/stm32f4_disco.jpg
diff --git a/boards/arm/stm32f4_disco/doc/index.rst b/boards/arm/stm32f4_disco/doc/index.rst
index 742c8cc2408..472fdf53796 100644
--- a/boards/arm/stm32f4_disco/doc/index.rst
+++ b/boards/arm/stm32f4_disco/doc/index.rst
@@ -32,7 +32,7 @@ some highlights of the STM32F4DISCOVERY board:
 - MP45DT02 ST-MEMS audio sensor omni-directional digital microphone
 - CS43L22 audio DAC with integrated class D speaker driver
 
-.. image:: img/en.stm32f4_discovery.jpg
+.. image:: img/stm32f4_disco.jpg
      :width: 350px
      :align: center
      :height: 550px
diff --git a/boards/arm/stm32f723e_disco/doc/img/en.32f723ediscovery.jpg b/boards/arm/stm32f723e_disco/doc/img/stm32f723e_disco.jpg
similarity index 100%
rename from boards/arm/stm32f723e_disco/doc/img/en.32f723ediscovery.jpg
rename to boards/arm/stm32f723e_disco/doc/img/stm32f723e_disco.jpg
diff --git a/boards/arm/stm32f723e_disco/doc/index.rst b/boards/arm/stm32f723e_disco/doc/index.rst
index d811e9631ba..5e131081a30 100644
--- a/boards/arm/stm32f723e_disco/doc/index.rst
+++ b/boards/arm/stm32f723e_disco/doc/index.rst
@@ -23,7 +23,7 @@ and high-speed connectivity features. Important board features include:
 - USB OTG HS with Micro-AB connectors
 - USB OTG FS with Micro-AB connectors
 
-.. image:: img/en.32f723ediscovery.jpg
+.. image:: img/stm32f723e_disco.jpg
      :width: 400px
      :align: center
      :height: 261px
diff --git a/boards/arm/stm32f746g_disco/doc/img/en.stm32f746g-disco.jpg b/boards/arm/stm32f746g_disco/doc/img/stm32f746g_disco.jpg
similarity index 100%
rename from boards/arm/stm32f746g_disco/doc/img/en.stm32f746g-disco.jpg
rename to boards/arm/stm32f746g_disco/doc/img/stm32f746g_disco.jpg
diff --git a/boards/arm/stm32f746g_disco/doc/index.rst b/boards/arm/stm32f746g_disco/doc/index.rst
index 293960b28a5..703eaa86df5 100644
--- a/boards/arm/stm32f746g_disco/doc/index.rst
+++ b/boards/arm/stm32f746g_disco/doc/index.rst
@@ -35,7 +35,7 @@ and high-speed connectivity features. Important board features include:
 - USB OTG FS with Micro-AB connectors
 - Ethernet connector compliant with IEEE-802.3-2002
 
-.. image:: img/en.stm32f746g-disco.jpg
+.. image:: img/stm32f746g_disco.jpg
      :width: 500px
      :align: center
      :height: 357px
diff --git a/boards/arm/stm32f769i_disco/doc/img/en.stm32f769i-disco.jpg b/boards/arm/stm32f769i_disco/doc/img/stm32f769i_disco.jpg
similarity index 100%
rename from boards/arm/stm32f769i_disco/doc/img/en.stm32f769i-disco.jpg
rename to boards/arm/stm32f769i_disco/doc/img/stm32f769i_disco.jpg
diff --git a/boards/arm/stm32f769i_disco/doc/index.rst b/boards/arm/stm32f769i_disco/doc/index.rst
index 65a699f8858..1565c8abfea 100644
--- a/boards/arm/stm32f769i_disco/doc/index.rst
+++ b/boards/arm/stm32f769i_disco/doc/index.rst
@@ -40,7 +40,7 @@ and high-speed connectivity features. Important board features include:
 - Comprehensive free software including a variety of examples, part of the STM32Cube package
 - Supported by a wide choice of integrated development environments
 
-.. image:: img/en.stm32f769i-disco.jpg
+.. image:: img/stm32f769i_disco.jpg
      :width: 500px
      :align: center
      :height: 260px
diff --git a/boards/arm/stm32l476g_disco/doc/img/en.stm32l476g-disco.jpg b/boards/arm/stm32l476g_disco/doc/img/stm32l476g_disco.jpg
similarity index 100%
rename from boards/arm/stm32l476g_disco/doc/img/en.stm32l476g-disco.jpg
rename to boards/arm/stm32l476g_disco/doc/img/stm32l476g_disco.jpg
diff --git a/boards/arm/stm32l476g_disco/doc/index.rst b/boards/arm/stm32l476g_disco/doc/index.rst
index fd8627b6a4d..279b0c8d8c4 100644
--- a/boards/arm/stm32l476g_disco/doc/index.rst
+++ b/boards/arm/stm32l476g_disco/doc/index.rst
@@ -42,7 +42,7 @@ some highlights of the STM32L476G Discovery board:
     - External 5 V
     - CR2032 battery (not provided)
 
-.. image:: img/en.stm32l476g-disco.jpg
+.. image:: img/stm32l476g_disco.jpg
      :width: 450px
      :align: center
      :height: 394px
diff --git a/boards/arm/stm32l496g_disco/doc/img/en.stm32l496g-disco.jpg b/boards/arm/stm32l496g_disco/doc/img/stm32l496g_disco.jpg
similarity index 100%
rename from boards/arm/stm32l496g_disco/doc/img/en.stm32l496g-disco.jpg
rename to boards/arm/stm32l496g_disco/doc/img/stm32l496g_disco.jpg
diff --git a/boards/arm/stm32l496g_disco/doc/index.rst b/boards/arm/stm32l496g_disco/doc/index.rst
index d020949a4fb..fabc40e47c6 100644
--- a/boards/arm/stm32l496g_disco/doc/index.rst
+++ b/boards/arm/stm32l496g_disco/doc/index.rst
@@ -41,7 +41,7 @@ some highlights of the STM32L496G Discovery board:
 - Reset push button
 - 4 direction-joystick with selection
 
-.. image:: img/en.stm32l496g-disco.jpg
+.. image:: img/stm32l496g_disco.jpg
      :width: 450px
      :align: center
      :height: 394px
diff --git a/boards/arm/udoo_neo_full_m4/doc/index.rst b/boards/arm/udoo_neo_full_m4/doc/index.rst
index 6a8c3476169..1c8f02e6801 100644
--- a/boards/arm/udoo_neo_full_m4/doc/index.rst
+++ b/boards/arm/udoo_neo_full_m4/doc/index.rst
@@ -13,7 +13,7 @@ core running up to 227 MHz for high CPU performance and real-time response.
 Zephyr was ported to run on the Cortex-M4 core only. In a future release, it
 will also communicate with the Cortex-A9 core (running Linux) via OpenAMP.
 
-.. figure:: udoo_neo_full.jpg
+.. figure:: ./udoo_neo_full_m4.jpg
    :width: 1715px
    :align: center
    :alt: UDOO-Neo-Full
diff --git a/boards/arm/udoo_neo_full_m4/doc/udoo_neo_full.jpg b/boards/arm/udoo_neo_full_m4/doc/udoo_neo_full_m4.jpg
similarity index 100%
rename from boards/arm/udoo_neo_full_m4/doc/udoo_neo_full.jpg
rename to boards/arm/udoo_neo_full_m4/doc/udoo_neo_full_m4.jpg
diff --git a/boards/arm/warp7_m4/doc/index.rst b/boards/arm/warp7_m4/doc/index.rst
index e0bf887d9d0..3a704baf79d 100644
--- a/boards/arm/warp7_m4/doc/index.rst
+++ b/boards/arm/warp7_m4/doc/index.rst
@@ -12,7 +12,7 @@ Zephyr was ported to run on the M4 core. In a later release, it will also
 communicate with the A7 core (running Linux) via RPmsg.
 
 
-.. image:: warp7_m4.png
+.. image:: ./warp7_m4.png
    :width: 470px
    :align: center
    :alt: WaRP7-iMX7S
diff --git a/boards/nios2/altera_max10/doc/img/max_10_dev_kit_top_photo.jpg b/boards/nios2/altera_max10/doc/img/altera_max10.jpg
similarity index 100%
rename from boards/nios2/altera_max10/doc/img/max_10_dev_kit_top_photo.jpg
rename to boards/nios2/altera_max10/doc/img/altera_max10.jpg
diff --git a/boards/nios2/altera_max10/doc/index.rst b/boards/nios2/altera_max10/doc/index.rst
index 0688b5b4471..64e60c9c501 100644
--- a/boards/nios2/altera_max10/doc/index.rst
+++ b/boards/nios2/altera_max10/doc/index.rst
@@ -10,7 +10,7 @@ Overview
 The Zephyr kernel is supported on the Altera MAX10 Rev C development kit, using
 the Nios II Gen 2 soft CPU.
 
-.. figure:: img/max_10_dev_kit_top_photo.jpg
+.. figure:: img/altera_max10.jpg
    :width: 442px
    :align: center
    :alt: Altera's MAX* 10
diff --git a/boards/x86/quark_d2000_crb/doc/index.rst b/boards/x86/quark_d2000_crb/doc/index.rst
index 1ba781ac371..1ee3d0573a4 100644
--- a/boards/x86/quark_d2000_crb/doc/index.rst
+++ b/boards/x86/quark_d2000_crb/doc/index.rst
@@ -9,7 +9,7 @@ Overview
 The Intel |reg| Quark |trade| microcontroller D2000 package is shipped as a 40-pin QFN
 component.
 
-.. image:: quark-d2000-developers-kit.png
+.. image:: ./quark_d2000_crb.png
    :width: 442px
    :align: center
    :alt: Quark D2000 Development Board
diff --git a/boards/x86/quark_d2000_crb/doc/quark-d2000-developers-kit.png b/boards/x86/quark_d2000_crb/doc/quark_d2000_crb.png
similarity index 100%
rename from boards/x86/quark_d2000_crb/doc/quark-d2000-developers-kit.png
rename to boards/x86/quark_d2000_crb/doc/quark_d2000_crb.png
diff --git a/boards/x86/tinytile/doc/index.rst b/boards/x86/tinytile/doc/index.rst
index 08f3c1c1fd3..1406caeb838 100644
--- a/boards/x86/tinytile/doc/index.rst
+++ b/boards/x86/tinytile/doc/index.rst
@@ -11,7 +11,7 @@ tinyTILE is an Intel Curie module based board, a miniaturized adaptation of the
 
 See :ref:`arduino_101` for information how to use the tinyTILE board with Zephyr.
 
-.. figure:: TINYTILE.jpg
+.. figure:: ./tinytile.jpg
    :width: 442px
    :align: center
    :alt: tinyTILE
diff --git a/boards/x86/tinytile/doc/TINYTILE.jpg b/boards/x86/tinytile/doc/tinytile.jpg
similarity index 100%
rename from boards/x86/tinytile/doc/TINYTILE.jpg
rename to boards/x86/tinytile/doc/tinytile.jpg
diff --git a/boards/xtensa/intel_s1000_crb/doc/index.rst b/boards/xtensa/intel_s1000_crb/doc/index.rst
index 6bb072127cf..c3a3028575b 100644
--- a/boards/xtensa/intel_s1000_crb/doc/index.rst
+++ b/boards/xtensa/intel_s1000_crb/doc/index.rst
@@ -13,7 +13,7 @@ simple SPI and I2S interfaces, to the microphone array via I2S or PDM
 interfaces, and to speakers via I2S. In addition, it has an I2C interface
 for controlling platform components such as ADCs, DACs, CODECs and PMICs.
 
-.. image:: IoT-SpeechEnablKit-banner-image.png
+.. image:: ./intel_s1000_crb.png
    :width: 442px
    :align: center
    :alt: Intel Speech Enabling Developer Kit
diff --git a/boards/xtensa/intel_s1000_crb/doc/IoT-SpeechEnablKit-banner-image.png b/boards/xtensa/intel_s1000_crb/doc/intel_s1000_crb.png
similarity index 100%
rename from boards/xtensa/intel_s1000_crb/doc/IoT-SpeechEnablKit-banner-image.png
rename to boards/xtensa/intel_s1000_crb/doc/intel_s1000_crb.png
diff --git a/boards/xtensa/xt-sim/doc/img/Xplorer-splash.png b/boards/xtensa/xt-sim/doc/img/xt-sim.png
similarity index 100%
rename from boards/xtensa/xt-sim/doc/img/Xplorer-splash.png
rename to boards/xtensa/xt-sim/doc/img/xt-sim.png
diff --git a/boards/xtensa/xt-sim/doc/index.rst b/boards/xtensa/xt-sim/doc/index.rst
index 6786d99089d..f49f152217f 100644
--- a/boards/xtensa/xt-sim/doc/index.rst
+++ b/boards/xtensa/xt-sim/doc/index.rst
@@ -13,7 +13,7 @@ addition to a base ISA to tailor the processor for a particular application.
 
 For more information, see https://ip.cadence.com/ipportfolio/tensilica-ip/xtensa-customizable
 
-.. figure:: img/Xplorer-splash.png
+.. figure:: img/xt-sim.png
      :width: 612px
      :align: center
      :alt: Xtensa Xplorer (Eclipse base frontend for xt-sim)