diff --git a/soc/altera/qemu_nios2/CMakeLists.txt b/soc/altr/qemu_nios2/CMakeLists.txt
similarity index 100%
rename from soc/altera/qemu_nios2/CMakeLists.txt
rename to soc/altr/qemu_nios2/CMakeLists.txt
diff --git a/soc/altera/qemu_nios2/Kconfig b/soc/altr/qemu_nios2/Kconfig
similarity index 100%
rename from soc/altera/qemu_nios2/Kconfig
rename to soc/altr/qemu_nios2/Kconfig
diff --git a/soc/altera/qemu_nios2/Kconfig.defconfig b/soc/altr/qemu_nios2/Kconfig.defconfig
similarity index 100%
rename from soc/altera/qemu_nios2/Kconfig.defconfig
rename to soc/altr/qemu_nios2/Kconfig.defconfig
diff --git a/soc/altera/qemu_nios2/Kconfig.soc b/soc/altr/qemu_nios2/Kconfig.soc
similarity index 100%
rename from soc/altera/qemu_nios2/Kconfig.soc
rename to soc/altr/qemu_nios2/Kconfig.soc
diff --git a/soc/altera/qemu_nios2/include/layout.h b/soc/altr/qemu_nios2/include/layout.h
similarity index 100%
rename from soc/altera/qemu_nios2/include/layout.h
rename to soc/altr/qemu_nios2/include/layout.h
diff --git a/soc/altera/qemu_nios2/include/linker.h b/soc/altr/qemu_nios2/include/linker.h
similarity index 100%
rename from soc/altera/qemu_nios2/include/linker.h
rename to soc/altr/qemu_nios2/include/linker.h
diff --git a/soc/altera/qemu_nios2/include/system.h b/soc/altr/qemu_nios2/include/system.h
similarity index 100%
rename from soc/altera/qemu_nios2/include/system.h
rename to soc/altr/qemu_nios2/include/system.h
diff --git a/soc/altera/qemu_nios2/linker.ld b/soc/altr/qemu_nios2/linker.ld
similarity index 100%
rename from soc/altera/qemu_nios2/linker.ld
rename to soc/altr/qemu_nios2/linker.ld
diff --git a/soc/altera/qemu_nios2/soc.h b/soc/altr/qemu_nios2/soc.h
similarity index 100%
rename from soc/altera/qemu_nios2/soc.h
rename to soc/altr/qemu_nios2/soc.h
diff --git a/soc/altera/qemu_nios2/soc.yml b/soc/altr/qemu_nios2/soc.yml
similarity index 100%
rename from soc/altera/qemu_nios2/soc.yml
rename to soc/altr/qemu_nios2/soc.yml
diff --git a/soc/altera/zephyr_nios2f/CMakeLists.txt b/soc/altr/zephyr_nios2f/CMakeLists.txt
similarity index 100%
rename from soc/altera/zephyr_nios2f/CMakeLists.txt
rename to soc/altr/zephyr_nios2f/CMakeLists.txt
diff --git a/soc/altera/zephyr_nios2f/Kconfig b/soc/altr/zephyr_nios2f/Kconfig
similarity index 100%
rename from soc/altera/zephyr_nios2f/Kconfig
rename to soc/altr/zephyr_nios2f/Kconfig
diff --git a/soc/altera/zephyr_nios2f/Kconfig.defconfig b/soc/altr/zephyr_nios2f/Kconfig.defconfig
similarity index 100%
rename from soc/altera/zephyr_nios2f/Kconfig.defconfig
rename to soc/altr/zephyr_nios2f/Kconfig.defconfig
diff --git a/soc/altera/zephyr_nios2f/Kconfig.soc b/soc/altr/zephyr_nios2f/Kconfig.soc
similarity index 100%
rename from soc/altera/zephyr_nios2f/Kconfig.soc
rename to soc/altr/zephyr_nios2f/Kconfig.soc
diff --git a/soc/altera/zephyr_nios2f/cpu/README b/soc/altr/zephyr_nios2f/cpu/README
similarity index 100%
rename from soc/altera/zephyr_nios2f/cpu/README
rename to soc/altr/zephyr_nios2f/cpu/README
diff --git a/soc/altera/zephyr_nios2f/cpu/ghrd_10m50da.qpf b/soc/altr/zephyr_nios2f/cpu/ghrd_10m50da.qpf
similarity index 100%
rename from soc/altera/zephyr_nios2f/cpu/ghrd_10m50da.qpf
rename to soc/altr/zephyr_nios2f/cpu/ghrd_10m50da.qpf
diff --git a/soc/altera/zephyr_nios2f/cpu/ghrd_10m50da.qsf b/soc/altr/zephyr_nios2f/cpu/ghrd_10m50da.qsf
similarity index 100%
rename from soc/altera/zephyr_nios2f/cpu/ghrd_10m50da.qsf
rename to soc/altr/zephyr_nios2f/cpu/ghrd_10m50da.qsf
diff --git a/soc/altera/zephyr_nios2f/cpu/ghrd_10m50da.qsys b/soc/altr/zephyr_nios2f/cpu/ghrd_10m50da.qsys
similarity index 100%
rename from soc/altera/zephyr_nios2f/cpu/ghrd_10m50da.qsys
rename to soc/altr/zephyr_nios2f/cpu/ghrd_10m50da.qsys
diff --git a/soc/altera/zephyr_nios2f/cpu/ghrd_10m50da.sof b/soc/altr/zephyr_nios2f/cpu/ghrd_10m50da.sof
similarity index 100%
rename from soc/altera/zephyr_nios2f/cpu/ghrd_10m50da.sof
rename to soc/altr/zephyr_nios2f/cpu/ghrd_10m50da.sof
diff --git a/soc/altera/zephyr_nios2f/cpu/ghrd_10m50da.sopcinfo b/soc/altr/zephyr_nios2f/cpu/ghrd_10m50da.sopcinfo
similarity index 100%
rename from soc/altera/zephyr_nios2f/cpu/ghrd_10m50da.sopcinfo
rename to soc/altr/zephyr_nios2f/cpu/ghrd_10m50da.sopcinfo
diff --git a/soc/altera/zephyr_nios2f/cpu/ghrd_10m50da_top.v b/soc/altr/zephyr_nios2f/cpu/ghrd_10m50da_top.v
similarity index 100%
rename from soc/altera/zephyr_nios2f/cpu/ghrd_10m50da_top.v
rename to soc/altr/zephyr_nios2f/cpu/ghrd_10m50da_top.v
diff --git a/soc/altera/zephyr_nios2f/cpu/ghrd_timing.sdc b/soc/altr/zephyr_nios2f/cpu/ghrd_timing.sdc
similarity index 100%
rename from soc/altera/zephyr_nios2f/cpu/ghrd_timing.sdc
rename to soc/altr/zephyr_nios2f/cpu/ghrd_timing.sdc
diff --git a/soc/altera/zephyr_nios2f/include/layout.h b/soc/altr/zephyr_nios2f/include/layout.h
similarity index 100%
rename from soc/altera/zephyr_nios2f/include/layout.h
rename to soc/altr/zephyr_nios2f/include/layout.h
diff --git a/soc/altera/zephyr_nios2f/include/linker.h b/soc/altr/zephyr_nios2f/include/linker.h
similarity index 100%
rename from soc/altera/zephyr_nios2f/include/linker.h
rename to soc/altr/zephyr_nios2f/include/linker.h
diff --git a/soc/altera/zephyr_nios2f/include/system.h b/soc/altr/zephyr_nios2f/include/system.h
similarity index 100%
rename from soc/altera/zephyr_nios2f/include/system.h
rename to soc/altr/zephyr_nios2f/include/system.h
diff --git a/soc/altera/zephyr_nios2f/linker.ld b/soc/altr/zephyr_nios2f/linker.ld
similarity index 100%
rename from soc/altera/zephyr_nios2f/linker.ld
rename to soc/altr/zephyr_nios2f/linker.ld
diff --git a/soc/altera/zephyr_nios2f/soc.h b/soc/altr/zephyr_nios2f/soc.h
similarity index 100%
rename from soc/altera/zephyr_nios2f/soc.h
rename to soc/altr/zephyr_nios2f/soc.h
diff --git a/soc/altera/zephyr_nios2f/soc.yml b/soc/altr/zephyr_nios2f/soc.yml
similarity index 100%
rename from soc/altera/zephyr_nios2f/soc.yml
rename to soc/altr/zephyr_nios2f/soc.yml