diff --git a/boards/shields/mikroe_weather_click/doc/index.rst b/boards/shields/mikroe_weather_click/doc/index.rst
index 0554444b3c5..3042ff87521 100644
--- a/boards/shields/mikroe_weather_click/doc/index.rst
+++ b/boards/shields/mikroe_weather_click/doc/index.rst
@@ -1,4 +1,4 @@
-.. _mikroe_weather_click_shield:
+.. _mikroe_weather_click:
 
 MikroElektronika Weather Click
 ##############################
diff --git a/boards/shields/reyax_lora/doc/index.rst b/boards/shields/reyax_lora/doc/index.rst
index aa5cc1a781d..b16f95bc7bd 100644
--- a/boards/shields/reyax_lora/doc/index.rst
+++ b/boards/shields/reyax_lora/doc/index.rst
@@ -1,4 +1,4 @@
-.. lora_reyax:
+.. _reyax_lora:
 
 Reyax LoRa RYLR896 and RYLR915 Modules
 ######################################
diff --git a/boards/shields/st_b_lcd40_dsi1_mb1166/doc/index.rst b/boards/shields/st_b_lcd40_dsi1_mb1166/doc/index.rst
index fbe990a9b6d..2713d49a2e2 100644
--- a/boards/shields/st_b_lcd40_dsi1_mb1166/doc/index.rst
+++ b/boards/shields/st_b_lcd40_dsi1_mb1166/doc/index.rst
@@ -1,4 +1,4 @@
-.. _st_b_lcd40_dsi1_mb1166_shield:
+.. _st_b_lcd40_dsi1_mb1166:
 
 ST B-LCD40-DSI1
 ###############
diff --git a/boards/shields/waveshare_epaper/doc/index.rst b/boards/shields/waveshare_epaper/doc/index.rst
index 25c4ecd955e..2e96db4a139 100644
--- a/boards/shields/waveshare_epaper/doc/index.rst
+++ b/boards/shields/waveshare_epaper/doc/index.rst
@@ -1,4 +1,4 @@
-.. _waveshare_e_paper_raw_panel_shield:
+.. _waveshare_epaper:
 
 WAVESHARE e-Paper Raw Panel Shield
 ##################################
diff --git a/boards/shields/x_nucleo_bnrg2a1/doc/index.rst b/boards/shields/x_nucleo_bnrg2a1/doc/index.rst
index 8d71361d84a..03bd0b98c3b 100644
--- a/boards/shields/x_nucleo_bnrg2a1/doc/index.rst
+++ b/boards/shields/x_nucleo_bnrg2a1/doc/index.rst
@@ -1,4 +1,4 @@
-.. _x-nucleo-bnrg2a1:
+.. _x_nucleo_bnrg2a1:
 
 X-NUCLEO-BNRG2A1: BLE expansion board
 #####################################
diff --git a/samples/drivers/display/README.rst b/samples/drivers/display/README.rst
index 68a25e1b996..4b8ff6b6375 100644
--- a/samples/drivers/display/README.rst
+++ b/samples/drivers/display/README.rst
@@ -45,4 +45,4 @@ List of Arduino-based display shields
 - :ref:`adafruit_2_8_tft_touch_v2`
 - :ref:`ssd1306_128_shield`
 - :ref:`st7789v_generic`
-- :ref:`waveshare_e_paper_raw_panel_shield`
+- :ref:`waveshare_epaper`