diff --git a/drivers/gpu/drm/amd/ras/Makefile b/drivers/gpu/drm/amd/ras/Makefile
index bbdaba811d34..803e250d1666 100644
--- a/drivers/gpu/drm/amd/ras/Makefile
+++ b/drivers/gpu/drm/amd/ras/Makefile
@@ -23,10 +23,10 @@ ifeq ($(AMD_GPU_RAS_MGR),)
 	AMD_GPU_RAS_MGR := ras_mgr
 endif
 
-subdir-ccflags-y += -I$(AMD_GPU_RAS_FULL_PATH)/rascore
+subdir-ccflags-y += -I$(AMD_GPU_RAS_FULL_PATH)/core
 subdir-ccflags-y += -I$(AMD_GPU_RAS_FULL_PATH)/$(AMD_GPU_RAS_MGR)
 
-RAS_LIBS = $(AMD_GPU_RAS_MGR) rascore
+RAS_LIBS = $(AMD_GPU_RAS_MGR) core
 
 AMD_RAS = $(addsuffix /Makefile, $(addprefix $(AMD_GPU_RAS_FULL_PATH)/,$(RAS_LIBS)))
 
diff --git a/drivers/gpu/drm/amd/ras/rascore/Makefile b/drivers/gpu/drm/amd/ras/core/Makefile
similarity index 95%
rename from drivers/gpu/drm/amd/ras/rascore/Makefile
rename to drivers/gpu/drm/amd/ras/core/Makefile
index 06b265ec1cde..454f83f62930 100644
--- a/drivers/gpu/drm/amd/ras/rascore/Makefile
+++ b/drivers/gpu/drm/amd/ras/core/Makefile
@@ -40,6 +40,6 @@ RAS_CORE_FILES = ras_core.o \
 			ras_eeprom_fw.o
 
 
-RAS_CORE = $(addprefix $(AMD_GPU_RAS_PATH)/rascore/,$(RAS_CORE_FILES))
+RAS_CORE = $(addprefix $(AMD_GPU_RAS_PATH)/core/,$(RAS_CORE_FILES))
 
 AMD_GPU_RAS_FILES += $(RAS_CORE)
diff --git a/drivers/gpu/drm/amd/ras/rascore/ras.h b/drivers/gpu/drm/amd/ras/core/ras.h
similarity index 100%
rename from drivers/gpu/drm/amd/ras/rascore/ras.h
rename to drivers/gpu/drm/amd/ras/core/ras.h
diff --git a/drivers/gpu/drm/amd/ras/rascore/ras_aca.c b/drivers/gpu/drm/amd/ras/core/ras_aca.c
similarity index 100%
rename from drivers/gpu/drm/amd/ras/rascore/ras_aca.c
rename to drivers/gpu/drm/amd/ras/core/ras_aca.c
diff --git a/drivers/gpu/drm/amd/ras/rascore/ras_aca.h b/drivers/gpu/drm/amd/ras/core/ras_aca.h
similarity index 100%
rename from drivers/gpu/drm/amd/ras/rascore/ras_aca.h
rename to drivers/gpu/drm/amd/ras/core/ras_aca.h
diff --git a/drivers/gpu/drm/amd/ras/rascore/ras_aca_v1_0.c b/drivers/gpu/drm/amd/ras/core/ras_aca_v1_0.c
similarity index 100%
rename from drivers/gpu/drm/amd/ras/rascore/ras_aca_v1_0.c
rename to drivers/gpu/drm/amd/ras/core/ras_aca_v1_0.c
diff --git a/drivers/gpu/drm/amd/ras/rascore/ras_aca_v1_0.h b/drivers/gpu/drm/amd/ras/core/ras_aca_v1_0.h
similarity index 100%
rename from drivers/gpu/drm/amd/ras/rascore/ras_aca_v1_0.h
rename to drivers/gpu/drm/amd/ras/core/ras_aca_v1_0.h
diff --git a/drivers/gpu/drm/amd/ras/rascore/ras_cmd.c b/drivers/gpu/drm/amd/ras/core/ras_cmd.c
similarity index 100%
rename from drivers/gpu/drm/amd/ras/rascore/ras_cmd.c
rename to drivers/gpu/drm/amd/ras/core/ras_cmd.c
diff --git a/drivers/gpu/drm/amd/ras/rascore/ras_cmd.h b/drivers/gpu/drm/amd/ras/core/ras_cmd.h
similarity index 100%
rename from drivers/gpu/drm/amd/ras/rascore/ras_cmd.h
rename to drivers/gpu/drm/amd/ras/core/ras_cmd.h
diff --git a/drivers/gpu/drm/amd/ras/rascore/ras_core.c b/drivers/gpu/drm/amd/ras/core/ras_core.c
similarity index 100%
rename from drivers/gpu/drm/amd/ras/rascore/ras_core.c
rename to drivers/gpu/drm/amd/ras/core/ras_core.c
diff --git a/drivers/gpu/drm/amd/ras/rascore/ras_core_status.h b/drivers/gpu/drm/amd/ras/core/ras_core_status.h
similarity index 100%
rename from drivers/gpu/drm/amd/ras/rascore/ras_core_status.h
rename to drivers/gpu/drm/amd/ras/core/ras_core_status.h
diff --git a/drivers/gpu/drm/amd/ras/rascore/ras_cper.c b/drivers/gpu/drm/amd/ras/core/ras_cper.c
similarity index 100%
rename from drivers/gpu/drm/amd/ras/rascore/ras_cper.c
rename to drivers/gpu/drm/amd/ras/core/ras_cper.c
diff --git a/drivers/gpu/drm/amd/ras/rascore/ras_cper.h b/drivers/gpu/drm/amd/ras/core/ras_cper.h
similarity index 100%
rename from drivers/gpu/drm/amd/ras/rascore/ras_cper.h
rename to drivers/gpu/drm/amd/ras/core/ras_cper.h
diff --git a/drivers/gpu/drm/amd/ras/rascore/ras_eeprom.c b/drivers/gpu/drm/amd/ras/core/ras_eeprom.c
similarity index 100%
rename from drivers/gpu/drm/amd/ras/rascore/ras_eeprom.c
rename to drivers/gpu/drm/amd/ras/core/ras_eeprom.c
diff --git a/drivers/gpu/drm/amd/ras/rascore/ras_eeprom.h b/drivers/gpu/drm/amd/ras/core/ras_eeprom.h
similarity index 100%
rename from drivers/gpu/drm/amd/ras/rascore/ras_eeprom.h
rename to drivers/gpu/drm/amd/ras/core/ras_eeprom.h
diff --git a/drivers/gpu/drm/amd/ras/rascore/ras_eeprom_fw.c b/drivers/gpu/drm/amd/ras/core/ras_eeprom_fw.c
similarity index 100%
rename from drivers/gpu/drm/amd/ras/rascore/ras_eeprom_fw.c
rename to drivers/gpu/drm/amd/ras/core/ras_eeprom_fw.c
diff --git a/drivers/gpu/drm/amd/ras/rascore/ras_eeprom_fw.h b/drivers/gpu/drm/amd/ras/core/ras_eeprom_fw.h
similarity index 100%
rename from drivers/gpu/drm/amd/ras/rascore/ras_eeprom_fw.h
rename to drivers/gpu/drm/amd/ras/core/ras_eeprom_fw.h
diff --git a/drivers/gpu/drm/amd/ras/rascore/ras_gfx.c b/drivers/gpu/drm/amd/ras/core/ras_gfx.c
similarity index 100%
rename from drivers/gpu/drm/amd/ras/rascore/ras_gfx.c
rename to drivers/gpu/drm/amd/ras/core/ras_gfx.c
diff --git a/drivers/gpu/drm/amd/ras/rascore/ras_gfx.h b/drivers/gpu/drm/amd/ras/core/ras_gfx.h
similarity index 100%
rename from drivers/gpu/drm/amd/ras/rascore/ras_gfx.h
rename to drivers/gpu/drm/amd/ras/core/ras_gfx.h
diff --git a/drivers/gpu/drm/amd/ras/rascore/ras_gfx_v9_0.c b/drivers/gpu/drm/amd/ras/core/ras_gfx_v9_0.c
similarity index 100%
rename from drivers/gpu/drm/amd/ras/rascore/ras_gfx_v9_0.c
rename to drivers/gpu/drm/amd/ras/core/ras_gfx_v9_0.c
diff --git a/drivers/gpu/drm/amd/ras/rascore/ras_gfx_v9_0.h b/drivers/gpu/drm/amd/ras/core/ras_gfx_v9_0.h
similarity index 100%
rename from drivers/gpu/drm/amd/ras/rascore/ras_gfx_v9_0.h
rename to drivers/gpu/drm/amd/ras/core/ras_gfx_v9_0.h
diff --git a/drivers/gpu/drm/amd/ras/rascore/ras_log_ring.c b/drivers/gpu/drm/amd/ras/core/ras_log_ring.c
similarity index 100%
rename from drivers/gpu/drm/amd/ras/rascore/ras_log_ring.c
rename to drivers/gpu/drm/amd/ras/core/ras_log_ring.c
diff --git a/drivers/gpu/drm/amd/ras/rascore/ras_log_ring.h b/drivers/gpu/drm/amd/ras/core/ras_log_ring.h
similarity index 100%
rename from drivers/gpu/drm/amd/ras/rascore/ras_log_ring.h
rename to drivers/gpu/drm/amd/ras/core/ras_log_ring.h
diff --git a/drivers/gpu/drm/amd/ras/rascore/ras_mp1.c b/drivers/gpu/drm/amd/ras/core/ras_mp1.c
similarity index 100%
rename from drivers/gpu/drm/amd/ras/rascore/ras_mp1.c
rename to drivers/gpu/drm/amd/ras/core/ras_mp1.c
diff --git a/drivers/gpu/drm/amd/ras/rascore/ras_mp1.h b/drivers/gpu/drm/amd/ras/core/ras_mp1.h
similarity index 100%
rename from drivers/gpu/drm/amd/ras/rascore/ras_mp1.h
rename to drivers/gpu/drm/amd/ras/core/ras_mp1.h
diff --git a/drivers/gpu/drm/amd/ras/rascore/ras_mp1_v13_0.c b/drivers/gpu/drm/amd/ras/core/ras_mp1_v13_0.c
similarity index 100%
rename from drivers/gpu/drm/amd/ras/rascore/ras_mp1_v13_0.c
rename to drivers/gpu/drm/amd/ras/core/ras_mp1_v13_0.c
diff --git a/drivers/gpu/drm/amd/ras/rascore/ras_mp1_v13_0.h b/drivers/gpu/drm/amd/ras/core/ras_mp1_v13_0.h
similarity index 100%
rename from drivers/gpu/drm/amd/ras/rascore/ras_mp1_v13_0.h
rename to drivers/gpu/drm/amd/ras/core/ras_mp1_v13_0.h
diff --git a/drivers/gpu/drm/amd/ras/rascore/ras_nbio.c b/drivers/gpu/drm/amd/ras/core/ras_nbio.c
similarity index 100%
rename from drivers/gpu/drm/amd/ras/rascore/ras_nbio.c
rename to drivers/gpu/drm/amd/ras/core/ras_nbio.c
diff --git a/drivers/gpu/drm/amd/ras/rascore/ras_nbio.h b/drivers/gpu/drm/amd/ras/core/ras_nbio.h
similarity index 100%
rename from drivers/gpu/drm/amd/ras/rascore/ras_nbio.h
rename to drivers/gpu/drm/amd/ras/core/ras_nbio.h
diff --git a/drivers/gpu/drm/amd/ras/rascore/ras_nbio_v7_9.c b/drivers/gpu/drm/amd/ras/core/ras_nbio_v7_9.c
similarity index 100%
rename from drivers/gpu/drm/amd/ras/rascore/ras_nbio_v7_9.c
rename to drivers/gpu/drm/amd/ras/core/ras_nbio_v7_9.c
diff --git a/drivers/gpu/drm/amd/ras/rascore/ras_nbio_v7_9.h b/drivers/gpu/drm/amd/ras/core/ras_nbio_v7_9.h
similarity index 100%
rename from drivers/gpu/drm/amd/ras/rascore/ras_nbio_v7_9.h
rename to drivers/gpu/drm/amd/ras/core/ras_nbio_v7_9.h
diff --git a/drivers/gpu/drm/amd/ras/rascore/ras_process.c b/drivers/gpu/drm/amd/ras/core/ras_process.c
similarity index 100%
rename from drivers/gpu/drm/amd/ras/rascore/ras_process.c
rename to drivers/gpu/drm/amd/ras/core/ras_process.c
diff --git a/drivers/gpu/drm/amd/ras/rascore/ras_process.h b/drivers/gpu/drm/amd/ras/core/ras_process.h
similarity index 100%
rename from drivers/gpu/drm/amd/ras/rascore/ras_process.h
rename to drivers/gpu/drm/amd/ras/core/ras_process.h
diff --git a/drivers/gpu/drm/amd/ras/rascore/ras_psp.c b/drivers/gpu/drm/amd/ras/core/ras_psp.c
similarity index 100%
rename from drivers/gpu/drm/amd/ras/rascore/ras_psp.c
rename to drivers/gpu/drm/amd/ras/core/ras_psp.c
diff --git a/drivers/gpu/drm/amd/ras/rascore/ras_psp.h b/drivers/gpu/drm/amd/ras/core/ras_psp.h
similarity index 100%
rename from drivers/gpu/drm/amd/ras/rascore/ras_psp.h
rename to drivers/gpu/drm/amd/ras/core/ras_psp.h
diff --git a/drivers/gpu/drm/amd/ras/rascore/ras_psp_v13_0.c b/drivers/gpu/drm/amd/ras/core/ras_psp_v13_0.c
similarity index 100%
rename from drivers/gpu/drm/amd/ras/rascore/ras_psp_v13_0.c
rename to drivers/gpu/drm/amd/ras/core/ras_psp_v13_0.c
diff --git a/drivers/gpu/drm/amd/ras/rascore/ras_psp_v13_0.h b/drivers/gpu/drm/amd/ras/core/ras_psp_v13_0.h
similarity index 100%
rename from drivers/gpu/drm/amd/ras/rascore/ras_psp_v13_0.h
rename to drivers/gpu/drm/amd/ras/core/ras_psp_v13_0.h
diff --git a/drivers/gpu/drm/amd/ras/rascore/ras_ta_if.h b/drivers/gpu/drm/amd/ras/core/ras_ta_if.h
similarity index 100%
rename from drivers/gpu/drm/amd/ras/rascore/ras_ta_if.h
rename to drivers/gpu/drm/amd/ras/core/ras_ta_if.h
diff --git a/drivers/gpu/drm/amd/ras/rascore/ras_umc.c b/drivers/gpu/drm/amd/ras/core/ras_umc.c
similarity index 100%
rename from drivers/gpu/drm/amd/ras/rascore/ras_umc.c
rename to drivers/gpu/drm/amd/ras/core/ras_umc.c
diff --git a/drivers/gpu/drm/amd/ras/rascore/ras_umc.h b/drivers/gpu/drm/amd/ras/core/ras_umc.h
similarity index 100%
rename from drivers/gpu/drm/amd/ras/rascore/ras_umc.h
rename to drivers/gpu/drm/amd/ras/core/ras_umc.h
diff --git a/drivers/gpu/drm/amd/ras/rascore/ras_umc_v12_0.c b/drivers/gpu/drm/amd/ras/core/ras_umc_v12_0.c
similarity index 100%
rename from drivers/gpu/drm/amd/ras/rascore/ras_umc_v12_0.c
rename to drivers/gpu/drm/amd/ras/core/ras_umc_v12_0.c
diff --git a/drivers/gpu/drm/amd/ras/rascore/ras_umc_v12_0.h b/drivers/gpu/drm/amd/ras/core/ras_umc_v12_0.h
similarity index 100%
rename from drivers/gpu/drm/amd/ras/rascore/ras_umc_v12_0.h
rename to drivers/gpu/drm/amd/ras/core/ras_umc_v12_0.h