diff --git a/src/dynarmic/CMakeLists.txt b/src/dynarmic/CMakeLists.txt
index d3eecb16..b5f9b176 100644
--- a/src/dynarmic/CMakeLists.txt
+++ b/src/dynarmic/CMakeLists.txt
@@ -64,10 +64,10 @@ add_library(dynarmic
     common/variant_util.h
     common/x64_disassemble.cpp
     common/x64_disassemble.h
-    frontend/A32/types.cpp
-    frontend/A32/types.h
-    frontend/A64/types.cpp
-    frontend/A64/types.h
+    frontend/A32/a32_types.cpp
+    frontend/A32/a32_types.h
+    frontend/A64/a64_types.cpp
+    frontend/A64/a64_types.h
     frontend/decoder/decoder_detail.h
     frontend/decoder/matcher.h
     frontend/imm.cpp
@@ -115,12 +115,19 @@ if ("A32" IN_LIST DYNARMIC_FRONTENDS)
         frontend/A32/disassembler/disassembler_arm.cpp
         frontend/A32/disassembler/disassembler_thumb.cpp
         frontend/A32/FPSCR.h
-        frontend/A32/ir_emitter.cpp
-        frontend/A32/ir_emitter.h
+        frontend/A32/a32_ir_emitter.cpp
+        frontend/A32/a32_ir_emitter.h
+        frontend/A32/a32_location_descriptor.cpp
+        frontend/A32/a32_location_descriptor.h
         frontend/A32/ITState.h
-        frontend/A32/location_descriptor.cpp
-        frontend/A32/location_descriptor.h
         frontend/A32/PSR.h
+        frontend/A32/translate/a32_translate.cpp
+        frontend/A32/translate/a32_translate.h
+        frontend/A32/translate/impl/a32_branch.cpp
+        frontend/A32/translate/impl/a32_crc32.cpp
+        frontend/A32/translate/impl/a32_exception_generating.cpp
+        frontend/A32/translate/impl/a32_translate_impl.cpp
+        frontend/A32/translate/impl/a32_translate_impl.h
         frontend/A32/translate/conditional_state.cpp
         frontend/A32/translate/conditional_state.h
         frontend/A32/translate/impl/asimd_load_store_structures.cpp
@@ -131,12 +138,9 @@ if ("A32" IN_LIST DYNARMIC_FRONTENDS)
         frontend/A32/translate/impl/asimd_two_regs_scalar.cpp
         frontend/A32/translate/impl/asimd_two_regs_shift.cpp
         frontend/A32/translate/impl/barrier.cpp
-        frontend/A32/translate/impl/branch.cpp
         frontend/A32/translate/impl/coprocessor.cpp
-        frontend/A32/translate/impl/crc32.cpp
         frontend/A32/translate/impl/data_processing.cpp
         frontend/A32/translate/impl/divide.cpp
-        frontend/A32/translate/impl/exception_generating.cpp
         frontend/A32/translate/impl/extension.cpp
         frontend/A32/translate/impl/hint.cpp
         frontend/A32/translate/impl/load_store.cpp
@@ -166,11 +170,7 @@ if ("A32" IN_LIST DYNARMIC_FRONTENDS)
         frontend/A32/translate/impl/thumb32_multiply.cpp
         frontend/A32/translate/impl/thumb32_parallel.cpp
         frontend/A32/translate/impl/thumb32_store_single_data_item.cpp
-        frontend/A32/translate/impl/translate.cpp
-        frontend/A32/translate/impl/translate.h
         frontend/A32/translate/impl/vfp.cpp
-        frontend/A32/translate/translate.cpp
-        frontend/A32/translate/translate.h
         frontend/A32/translate/translate_arm.cpp
         frontend/A32/translate/translate_thumb.cpp
         interface/A32/a32.h
@@ -186,13 +186,16 @@ endif()
 
 if ("A64" IN_LIST DYNARMIC_FRONTENDS)
     target_sources(dynarmic PRIVATE
+        frontend/A64/a64_ir_emitter.cpp
+        frontend/A64/a64_ir_emitter.h
+        frontend/A64/a64_location_descriptor.cpp
+        frontend/A64/a64_location_descriptor.h
         frontend/A64/decoder/a64.h
         frontend/A64/decoder/a64.inc
-        frontend/A64/ir_emitter.cpp
-        frontend/A64/ir_emitter.h
-        frontend/A64/location_descriptor.cpp
-        frontend/A64/location_descriptor.h
-        frontend/A64/translate/impl/branch.cpp
+        frontend/A64/translate/a64_translate.cpp
+        frontend/A64/translate/a64_translate.h
+        frontend/A64/translate/impl/a64_branch.cpp
+        frontend/A64/translate/impl/a64_exception_generating.cpp
         frontend/A64/translate/impl/data_processing_addsub.cpp
         frontend/A64/translate/impl/data_processing_bitfield.cpp
         frontend/A64/translate/impl/data_processing_conditional_compare.cpp
@@ -203,7 +206,6 @@ if ("A64" IN_LIST DYNARMIC_FRONTENDS)
         frontend/A64/translate/impl/data_processing_pcrel.cpp
         frontend/A64/translate/impl/data_processing_register.cpp
         frontend/A64/translate/impl/data_processing_shift.cpp
-        frontend/A64/translate/impl/exception_generating.cpp
         frontend/A64/translate/impl/floating_point_compare.cpp
         frontend/A64/translate/impl/floating_point_conditional_compare.cpp
         frontend/A64/translate/impl/floating_point_conditional_select.cpp
@@ -251,8 +253,6 @@ if ("A64" IN_LIST DYNARMIC_FRONTENDS)
         frontend/A64/translate/impl/system.cpp
         frontend/A64/translate/impl/system_flag_format.cpp
         frontend/A64/translate/impl/system_flag_manipulation.cpp
-        frontend/A64/translate/translate.cpp
-        frontend/A64/translate/translate.h
         interface/A64/a64.h
         interface/A64/config.h
         ir/opt/a64_callback_config_pass.cpp
diff --git a/src/dynarmic/backend/x64/a32_emit_x64.cpp b/src/dynarmic/backend/x64/a32_emit_x64.cpp
index 4c09621d..e8ddbce6 100644
--- a/src/dynarmic/backend/x64/a32_emit_x64.cpp
+++ b/src/dynarmic/backend/x64/a32_emit_x64.cpp
@@ -27,8 +27,8 @@
 #include "dynarmic/common/scope_exit.h"
 #include "dynarmic/common/variant_util.h"
 #include "dynarmic/common/x64_disassemble.h"
-#include "dynarmic/frontend/A32/location_descriptor.h"
-#include "dynarmic/frontend/A32/types.h"
+#include "dynarmic/frontend/A32/a32_location_descriptor.h"
+#include "dynarmic/frontend/A32/a32_types.h"
 #include "dynarmic/interface/A32/coprocessor.h"
 #include "dynarmic/interface/exclusive_monitor.h"
 #include "dynarmic/ir/basic_block.h"
diff --git a/src/dynarmic/backend/x64/a32_emit_x64.h b/src/dynarmic/backend/x64/a32_emit_x64.h
index 93ab4b87..6684835f 100644
--- a/src/dynarmic/backend/x64/a32_emit_x64.h
+++ b/src/dynarmic/backend/x64/a32_emit_x64.h
@@ -15,7 +15,7 @@
 #include "dynarmic/backend/x64/a32_jitstate.h"
 #include "dynarmic/backend/x64/block_range_information.h"
 #include "dynarmic/backend/x64/emit_x64.h"
-#include "dynarmic/frontend/A32/location_descriptor.h"
+#include "dynarmic/frontend/A32/a32_location_descriptor.h"
 #include "dynarmic/interface/A32/a32.h"
 #include "dynarmic/interface/A32/config.h"
 #include "dynarmic/ir/terminal.h"
diff --git a/src/dynarmic/backend/x64/a32_interface.cpp b/src/dynarmic/backend/x64/a32_interface.cpp
index 24b48c03..49c7e8d0 100644
--- a/src/dynarmic/backend/x64/a32_interface.cpp
+++ b/src/dynarmic/backend/x64/a32_interface.cpp
@@ -20,7 +20,7 @@
 #include "dynarmic/common/common_types.h"
 #include "dynarmic/common/scope_exit.h"
 #include "dynarmic/common/x64_disassemble.h"
-#include "dynarmic/frontend/A32/translate/translate.h"
+#include "dynarmic/frontend/A32/translate/a32_translate.h"
 #include "dynarmic/interface/A32/a32.h"
 #include "dynarmic/interface/A32/context.h"
 #include "dynarmic/ir/basic_block.h"
diff --git a/src/dynarmic/backend/x64/a32_jitstate.cpp b/src/dynarmic/backend/x64/a32_jitstate.cpp
index 4d9cf07b..2d844780 100644
--- a/src/dynarmic/backend/x64/a32_jitstate.cpp
+++ b/src/dynarmic/backend/x64/a32_jitstate.cpp
@@ -10,7 +10,7 @@
 #include "dynarmic/common/assert.h"
 #include "dynarmic/common/bit_util.h"
 #include "dynarmic/common/common_types.h"
-#include "dynarmic/frontend/A32/location_descriptor.h"
+#include "dynarmic/frontend/A32/a32_location_descriptor.h"
 
 namespace Dynarmic::Backend::X64 {
 
diff --git a/src/dynarmic/backend/x64/a64_emit_x64.cpp b/src/dynarmic/backend/x64/a64_emit_x64.cpp
index 6690e68e..de54a444 100644
--- a/src/dynarmic/backend/x64/a64_emit_x64.cpp
+++ b/src/dynarmic/backend/x64/a64_emit_x64.cpp
@@ -24,8 +24,8 @@
 #include "dynarmic/common/common_types.h"
 #include "dynarmic/common/scope_exit.h"
 #include "dynarmic/common/x64_disassemble.h"
-#include "dynarmic/frontend/A64/location_descriptor.h"
-#include "dynarmic/frontend/A64/types.h"
+#include "dynarmic/frontend/A64/a64_location_descriptor.h"
+#include "dynarmic/frontend/A64/a64_types.h"
 #include "dynarmic/interface/exclusive_monitor.h"
 #include "dynarmic/ir/basic_block.h"
 #include "dynarmic/ir/cond.h"
diff --git a/src/dynarmic/backend/x64/a64_emit_x64.h b/src/dynarmic/backend/x64/a64_emit_x64.h
index 32c14a6b..32ab24e8 100644
--- a/src/dynarmic/backend/x64/a64_emit_x64.h
+++ b/src/dynarmic/backend/x64/a64_emit_x64.h
@@ -12,7 +12,7 @@
 #include "dynarmic/backend/x64/a64_jitstate.h"
 #include "dynarmic/backend/x64/block_range_information.h"
 #include "dynarmic/backend/x64/emit_x64.h"
-#include "dynarmic/frontend/A64/location_descriptor.h"
+#include "dynarmic/frontend/A64/a64_location_descriptor.h"
 #include "dynarmic/interface/A64/a64.h"
 #include "dynarmic/interface/A64/config.h"
 #include "dynarmic/ir/terminal.h"
diff --git a/src/dynarmic/backend/x64/a64_interface.cpp b/src/dynarmic/backend/x64/a64_interface.cpp
index cb4ed12a..c19c4939 100644
--- a/src/dynarmic/backend/x64/a64_interface.cpp
+++ b/src/dynarmic/backend/x64/a64_interface.cpp
@@ -17,7 +17,7 @@
 #include "dynarmic/common/assert.h"
 #include "dynarmic/common/scope_exit.h"
 #include "dynarmic/common/x64_disassemble.h"
-#include "dynarmic/frontend/A64/translate/translate.h"
+#include "dynarmic/frontend/A64/translate/a64_translate.h"
 #include "dynarmic/interface/A64/a64.h"
 #include "dynarmic/ir/basic_block.h"
 #include "dynarmic/ir/opt/passes.h"
diff --git a/src/dynarmic/backend/x64/a64_jitstate.cpp b/src/dynarmic/backend/x64/a64_jitstate.cpp
index c0e7a1c6..c7d0e597 100644
--- a/src/dynarmic/backend/x64/a64_jitstate.cpp
+++ b/src/dynarmic/backend/x64/a64_jitstate.cpp
@@ -6,7 +6,7 @@
 #include "dynarmic/backend/x64/a64_jitstate.h"
 
 #include "dynarmic/common/bit_util.h"
-#include "dynarmic/frontend/A64/location_descriptor.h"
+#include "dynarmic/frontend/A64/a64_location_descriptor.h"
 
 namespace Dynarmic::Backend::X64 {
 
diff --git a/src/dynarmic/backend/x64/a64_jitstate.h b/src/dynarmic/backend/x64/a64_jitstate.h
index bd3d8989..a0e20cff 100644
--- a/src/dynarmic/backend/x64/a64_jitstate.h
+++ b/src/dynarmic/backend/x64/a64_jitstate.h
@@ -9,7 +9,7 @@
 
 #include "dynarmic/backend/x64/nzcv_util.h"
 #include "dynarmic/common/common_types.h"
-#include "dynarmic/frontend/A64/location_descriptor.h"
+#include "dynarmic/frontend/A64/a64_location_descriptor.h"
 
 namespace Dynarmic::Backend::X64 {
 
diff --git a/src/dynarmic/frontend/A32/ir_emitter.cpp b/src/dynarmic/frontend/A32/a32_ir_emitter.cpp
similarity index 99%
rename from src/dynarmic/frontend/A32/ir_emitter.cpp
rename to src/dynarmic/frontend/A32/a32_ir_emitter.cpp
index c948a78f..8363f81f 100644
--- a/src/dynarmic/frontend/A32/ir_emitter.cpp
+++ b/src/dynarmic/frontend/A32/a32_ir_emitter.cpp
@@ -3,10 +3,10 @@
  * SPDX-License-Identifier: 0BSD
  */
 
-#include "dynarmic/frontend/A32/ir_emitter.h"
+#include "dynarmic/frontend/A32/a32_ir_emitter.h"
 
 #include "dynarmic/common/assert.h"
-#include "dynarmic/frontend/A32/types.h"
+#include "dynarmic/frontend/A32/a32_types.h"
 #include "dynarmic/interface/A32/arch_version.h"
 #include "dynarmic/ir/opcodes.h"
 
diff --git a/src/dynarmic/frontend/A32/ir_emitter.h b/src/dynarmic/frontend/A32/a32_ir_emitter.h
similarity index 98%
rename from src/dynarmic/frontend/A32/ir_emitter.h
rename to src/dynarmic/frontend/A32/a32_ir_emitter.h
index 9377a5c8..7b6b1b03 100644
--- a/src/dynarmic/frontend/A32/ir_emitter.h
+++ b/src/dynarmic/frontend/A32/a32_ir_emitter.h
@@ -8,7 +8,7 @@
 #include <utility>
 
 #include "dynarmic/common/common_types.h"
-#include "dynarmic/frontend/A32/location_descriptor.h"
+#include "dynarmic/frontend/A32/a32_location_descriptor.h"
 #include "dynarmic/ir/ir_emitter.h"
 #include "dynarmic/ir/value.h"
 
diff --git a/src/dynarmic/frontend/A32/location_descriptor.cpp b/src/dynarmic/frontend/A32/a32_location_descriptor.cpp
similarity index 91%
rename from src/dynarmic/frontend/A32/location_descriptor.cpp
rename to src/dynarmic/frontend/A32/a32_location_descriptor.cpp
index e3cd3bc1..62a94113 100644
--- a/src/dynarmic/frontend/A32/location_descriptor.cpp
+++ b/src/dynarmic/frontend/A32/a32_location_descriptor.cpp
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: 0BSD
  */
 
-#include "dynarmic/frontend/A32/location_descriptor.h"
+#include "dynarmic/frontend/A32/a32_location_descriptor.h"
 
 #include <ostream>
 
diff --git a/src/dynarmic/frontend/A32/location_descriptor.h b/src/dynarmic/frontend/A32/a32_location_descriptor.h
similarity index 100%
rename from src/dynarmic/frontend/A32/location_descriptor.h
rename to src/dynarmic/frontend/A32/a32_location_descriptor.h
diff --git a/src/dynarmic/frontend/A32/types.cpp b/src/dynarmic/frontend/A32/a32_types.cpp
similarity index 98%
rename from src/dynarmic/frontend/A32/types.cpp
rename to src/dynarmic/frontend/A32/a32_types.cpp
index b0c77d95..04628627 100644
--- a/src/dynarmic/frontend/A32/types.cpp
+++ b/src/dynarmic/frontend/A32/a32_types.cpp
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: 0BSD
  */
 
-#include "dynarmic/frontend/A32/types.h"
+#include "dynarmic/frontend/A32/a32_types.h"
 
 #include <array>
 #include <ostream>
diff --git a/src/dynarmic/frontend/A32/types.h b/src/dynarmic/frontend/A32/a32_types.h
similarity index 100%
rename from src/dynarmic/frontend/A32/types.h
rename to src/dynarmic/frontend/A32/a32_types.h
diff --git a/src/dynarmic/frontend/A32/disassembler/disassembler_arm.cpp b/src/dynarmic/frontend/A32/disassembler/disassembler_arm.cpp
index 9b0157a8..b42600dc 100644
--- a/src/dynarmic/frontend/A32/disassembler/disassembler_arm.cpp
+++ b/src/dynarmic/frontend/A32/disassembler/disassembler_arm.cpp
@@ -11,10 +11,10 @@
 
 #include "dynarmic/common/bit_util.h"
 #include "dynarmic/common/string_util.h"
+#include "dynarmic/frontend/A32/a32_types.h"
 #include "dynarmic/frontend/A32/decoder/arm.h"
 #include "dynarmic/frontend/A32/decoder/vfp.h"
 #include "dynarmic/frontend/A32/disassembler/disassembler.h"
-#include "dynarmic/frontend/A32/types.h"
 #include "dynarmic/frontend/imm.h"
 
 namespace Dynarmic::A32 {
diff --git a/src/dynarmic/frontend/A32/disassembler/disassembler_thumb.cpp b/src/dynarmic/frontend/A32/disassembler/disassembler_thumb.cpp
index b2225513..d5f43cb8 100644
--- a/src/dynarmic/frontend/A32/disassembler/disassembler_thumb.cpp
+++ b/src/dynarmic/frontend/A32/disassembler/disassembler_thumb.cpp
@@ -11,9 +11,9 @@
 
 #include "dynarmic/common/bit_util.h"
 #include "dynarmic/common/string_util.h"
+#include "dynarmic/frontend/A32/a32_types.h"
 #include "dynarmic/frontend/A32/decoder/thumb16.h"
 #include "dynarmic/frontend/A32/disassembler/disassembler.h"
-#include "dynarmic/frontend/A32/types.h"
 #include "dynarmic/frontend/imm.h"
 
 namespace Dynarmic::A32 {
diff --git a/src/dynarmic/frontend/A32/translate/translate.cpp b/src/dynarmic/frontend/A32/translate/a32_translate.cpp
similarity index 90%
rename from src/dynarmic/frontend/A32/translate/translate.cpp
rename to src/dynarmic/frontend/A32/translate/a32_translate.cpp
index 5780b24f..97a7f11a 100644
--- a/src/dynarmic/frontend/A32/translate/translate.cpp
+++ b/src/dynarmic/frontend/A32/translate/a32_translate.cpp
@@ -3,9 +3,9 @@
  * SPDX-License-Identifier: 0BSD
  */
 
-#include "dynarmic/frontend/A32/translate/translate.h"
+#include "dynarmic/frontend/A32/translate/a32_translate.h"
 
-#include "dynarmic/frontend/A32/location_descriptor.h"
+#include "dynarmic/frontend/A32/a32_location_descriptor.h"
 #include "dynarmic/ir/basic_block.h"
 
 namespace Dynarmic::A32 {
diff --git a/src/dynarmic/frontend/A32/translate/translate.h b/src/dynarmic/frontend/A32/translate/a32_translate.h
similarity index 100%
rename from src/dynarmic/frontend/A32/translate/translate.h
rename to src/dynarmic/frontend/A32/translate/a32_translate.h
diff --git a/src/dynarmic/frontend/A32/translate/conditional_state.cpp b/src/dynarmic/frontend/A32/translate/conditional_state.cpp
index 916e756b..9488e628 100644
--- a/src/dynarmic/frontend/A32/translate/conditional_state.cpp
+++ b/src/dynarmic/frontend/A32/translate/conditional_state.cpp
@@ -9,8 +9,8 @@
 
 #include "dynarmic/common/assert.h"
 #include "dynarmic/common/common_types.h"
-#include "dynarmic/frontend/A32/ir_emitter.h"
-#include "dynarmic/frontend/A32/translate/impl/translate.h"
+#include "dynarmic/frontend/A32/a32_ir_emitter.h"
+#include "dynarmic/frontend/A32/translate/impl/a32_translate_impl.h"
 #include "dynarmic/interface/A32/config.h"
 #include "dynarmic/ir/cond.h"
 
diff --git a/src/dynarmic/frontend/A32/translate/impl/branch.cpp b/src/dynarmic/frontend/A32/translate/impl/a32_branch.cpp
similarity index 97%
rename from src/dynarmic/frontend/A32/translate/impl/branch.cpp
rename to src/dynarmic/frontend/A32/translate/impl/a32_branch.cpp
index 0a004f2c..41beea7b 100644
--- a/src/dynarmic/frontend/A32/translate/impl/branch.cpp
+++ b/src/dynarmic/frontend/A32/translate/impl/a32_branch.cpp
@@ -4,7 +4,7 @@
  */
 
 #include "dynarmic/common/bit_util.h"
-#include "dynarmic/frontend/A32/translate/impl/translate.h"
+#include "dynarmic/frontend/A32/translate/impl/a32_translate_impl.h"
 
 namespace Dynarmic::A32 {
 
diff --git a/src/dynarmic/frontend/A32/translate/impl/crc32.cpp b/src/dynarmic/frontend/A32/translate/impl/a32_crc32.cpp
similarity index 97%
rename from src/dynarmic/frontend/A32/translate/impl/crc32.cpp
rename to src/dynarmic/frontend/A32/translate/impl/a32_crc32.cpp
index 0dca5b84..8ee54410 100644
--- a/src/dynarmic/frontend/A32/translate/impl/crc32.cpp
+++ b/src/dynarmic/frontend/A32/translate/impl/a32_crc32.cpp
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: 0BSD
  */
 
-#include "dynarmic/frontend/A32/translate/impl/translate.h"
+#include "dynarmic/frontend/A32/translate/impl/a32_translate_impl.h"
 
 namespace Dynarmic::A32 {
 
diff --git a/src/dynarmic/frontend/A32/translate/impl/exception_generating.cpp b/src/dynarmic/frontend/A32/translate/impl/a32_exception_generating.cpp
similarity index 94%
rename from src/dynarmic/frontend/A32/translate/impl/exception_generating.cpp
rename to src/dynarmic/frontend/A32/translate/impl/a32_exception_generating.cpp
index f4b81777..c9616b08 100644
--- a/src/dynarmic/frontend/A32/translate/impl/exception_generating.cpp
+++ b/src/dynarmic/frontend/A32/translate/impl/a32_exception_generating.cpp
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: 0BSD
  */
 
-#include "dynarmic/frontend/A32/translate/impl/translate.h"
+#include "dynarmic/frontend/A32/translate/impl/a32_translate_impl.h"
 #include "dynarmic/interface/A32/config.h"
 
 namespace Dynarmic::A32 {
diff --git a/src/dynarmic/frontend/A32/translate/impl/translate.cpp b/src/dynarmic/frontend/A32/translate/impl/a32_translate_impl.cpp
similarity index 98%
rename from src/dynarmic/frontend/A32/translate/impl/translate.cpp
rename to src/dynarmic/frontend/A32/translate/impl/a32_translate_impl.cpp
index b898147f..e85231a4 100644
--- a/src/dynarmic/frontend/A32/translate/impl/translate.cpp
+++ b/src/dynarmic/frontend/A32/translate/impl/a32_translate_impl.cpp
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: 0BSD
  */
 
-#include "dynarmic/frontend/A32/translate/impl/translate.h"
+#include "dynarmic/frontend/A32/translate/impl/a32_translate_impl.h"
 
 #include "dynarmic/common/assert.h"
 #include "dynarmic/interface/A32/config.h"
diff --git a/src/dynarmic/frontend/A32/translate/impl/translate.h b/src/dynarmic/frontend/A32/translate/impl/a32_translate_impl.h
similarity index 99%
rename from src/dynarmic/frontend/A32/translate/impl/translate.h
rename to src/dynarmic/frontend/A32/translate/impl/a32_translate_impl.h
index 3b978f6a..76243b31 100644
--- a/src/dynarmic/frontend/A32/translate/impl/translate.h
+++ b/src/dynarmic/frontend/A32/translate/impl/a32_translate_impl.h
@@ -7,11 +7,11 @@
 
 #include "dynarmic/common/assert.h"
 #include "dynarmic/common/bit_util.h"
-#include "dynarmic/frontend/A32/ir_emitter.h"
-#include "dynarmic/frontend/A32/location_descriptor.h"
+#include "dynarmic/frontend/A32/a32_ir_emitter.h"
+#include "dynarmic/frontend/A32/a32_location_descriptor.h"
+#include "dynarmic/frontend/A32/a32_types.h"
+#include "dynarmic/frontend/A32/translate/a32_translate.h"
 #include "dynarmic/frontend/A32/translate/conditional_state.h"
-#include "dynarmic/frontend/A32/translate/translate.h"
-#include "dynarmic/frontend/A32/types.h"
 #include "dynarmic/frontend/imm.h"
 
 namespace Dynarmic::A32 {
diff --git a/src/dynarmic/frontend/A32/translate/impl/asimd_load_store_structures.cpp b/src/dynarmic/frontend/A32/translate/impl/asimd_load_store_structures.cpp
index 54412f1b..ec56443d 100644
--- a/src/dynarmic/frontend/A32/translate/impl/asimd_load_store_structures.cpp
+++ b/src/dynarmic/frontend/A32/translate/impl/asimd_load_store_structures.cpp
@@ -7,7 +7,7 @@
 #include <tuple>
 
 #include "dynarmic/common/bit_util.h"
-#include "dynarmic/frontend/A32/translate/impl/translate.h"
+#include "dynarmic/frontend/A32/translate/impl/a32_translate_impl.h"
 
 namespace Dynarmic::A32 {
 
diff --git a/src/dynarmic/frontend/A32/translate/impl/asimd_misc.cpp b/src/dynarmic/frontend/A32/translate/impl/asimd_misc.cpp
index d911ac3a..aae0018b 100644
--- a/src/dynarmic/frontend/A32/translate/impl/asimd_misc.cpp
+++ b/src/dynarmic/frontend/A32/translate/impl/asimd_misc.cpp
@@ -5,7 +5,7 @@
 
 #include "dynarmic/common/assert.h"
 #include "dynarmic/common/bit_util.h"
-#include "dynarmic/frontend/A32/translate/impl/translate.h"
+#include "dynarmic/frontend/A32/translate/impl/a32_translate_impl.h"
 
 namespace Dynarmic::A32 {
 
diff --git a/src/dynarmic/frontend/A32/translate/impl/asimd_one_reg_modified_immediate.cpp b/src/dynarmic/frontend/A32/translate/impl/asimd_one_reg_modified_immediate.cpp
index 7796cd7b..a0fda631 100644
--- a/src/dynarmic/frontend/A32/translate/impl/asimd_one_reg_modified_immediate.cpp
+++ b/src/dynarmic/frontend/A32/translate/impl/asimd_one_reg_modified_immediate.cpp
@@ -5,7 +5,7 @@
 
 #include "dynarmic/common/assert.h"
 #include "dynarmic/common/bit_util.h"
-#include "dynarmic/frontend/A32/translate/impl/translate.h"
+#include "dynarmic/frontend/A32/translate/impl/a32_translate_impl.h"
 
 namespace Dynarmic::A32 {
 
diff --git a/src/dynarmic/frontend/A32/translate/impl/asimd_three_regs.cpp b/src/dynarmic/frontend/A32/translate/impl/asimd_three_regs.cpp
index dd485a63..44d616dc 100644
--- a/src/dynarmic/frontend/A32/translate/impl/asimd_three_regs.cpp
+++ b/src/dynarmic/frontend/A32/translate/impl/asimd_three_regs.cpp
@@ -4,7 +4,7 @@
  */
 
 #include "dynarmic/common/bit_util.h"
-#include "dynarmic/frontend/A32/translate/impl/translate.h"
+#include "dynarmic/frontend/A32/translate/impl/a32_translate_impl.h"
 
 namespace Dynarmic::A32 {
 namespace {
diff --git a/src/dynarmic/frontend/A32/translate/impl/asimd_two_regs_misc.cpp b/src/dynarmic/frontend/A32/translate/impl/asimd_two_regs_misc.cpp
index b618088d..20807ce2 100644
--- a/src/dynarmic/frontend/A32/translate/impl/asimd_two_regs_misc.cpp
+++ b/src/dynarmic/frontend/A32/translate/impl/asimd_two_regs_misc.cpp
@@ -6,7 +6,7 @@
 #include <array>
 
 #include "dynarmic/common/bit_util.h"
-#include "dynarmic/frontend/A32/translate/impl/translate.h"
+#include "dynarmic/frontend/A32/translate/impl/a32_translate_impl.h"
 
 namespace Dynarmic::A32 {
 namespace {
diff --git a/src/dynarmic/frontend/A32/translate/impl/asimd_two_regs_scalar.cpp b/src/dynarmic/frontend/A32/translate/impl/asimd_two_regs_scalar.cpp
index 4a03b7a2..9b097965 100644
--- a/src/dynarmic/frontend/A32/translate/impl/asimd_two_regs_scalar.cpp
+++ b/src/dynarmic/frontend/A32/translate/impl/asimd_two_regs_scalar.cpp
@@ -7,7 +7,7 @@
 
 #include "dynarmic/common/assert.h"
 #include "dynarmic/common/bit_util.h"
-#include "dynarmic/frontend/A32/translate/impl/translate.h"
+#include "dynarmic/frontend/A32/translate/impl/a32_translate_impl.h"
 
 namespace Dynarmic::A32 {
 namespace {
diff --git a/src/dynarmic/frontend/A32/translate/impl/asimd_two_regs_shift.cpp b/src/dynarmic/frontend/A32/translate/impl/asimd_two_regs_shift.cpp
index a8cf1b40..f1d8e621 100644
--- a/src/dynarmic/frontend/A32/translate/impl/asimd_two_regs_shift.cpp
+++ b/src/dynarmic/frontend/A32/translate/impl/asimd_two_regs_shift.cpp
@@ -5,7 +5,7 @@
 
 #include "dynarmic/common/assert.h"
 #include "dynarmic/common/bit_util.h"
-#include "dynarmic/frontend/A32/translate/impl/translate.h"
+#include "dynarmic/frontend/A32/translate/impl/a32_translate_impl.h"
 
 namespace Dynarmic::A32 {
 namespace {
diff --git a/src/dynarmic/frontend/A32/translate/impl/barrier.cpp b/src/dynarmic/frontend/A32/translate/impl/barrier.cpp
index b509cd0e..7d9e7459 100644
--- a/src/dynarmic/frontend/A32/translate/impl/barrier.cpp
+++ b/src/dynarmic/frontend/A32/translate/impl/barrier.cpp
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: 0BSD
  */
 
-#include "dynarmic/frontend/A32/translate/impl/translate.h"
+#include "dynarmic/frontend/A32/translate/impl/a32_translate_impl.h"
 
 namespace Dynarmic::A32 {
 
diff --git a/src/dynarmic/frontend/A32/translate/impl/coprocessor.cpp b/src/dynarmic/frontend/A32/translate/impl/coprocessor.cpp
index 402efd4b..29748a6e 100644
--- a/src/dynarmic/frontend/A32/translate/impl/coprocessor.cpp
+++ b/src/dynarmic/frontend/A32/translate/impl/coprocessor.cpp
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: 0BSD
  */
 
-#include "dynarmic/frontend/A32/translate/impl/translate.h"
+#include "dynarmic/frontend/A32/translate/impl/a32_translate_impl.h"
 
 namespace Dynarmic::A32 {
 
diff --git a/src/dynarmic/frontend/A32/translate/impl/data_processing.cpp b/src/dynarmic/frontend/A32/translate/impl/data_processing.cpp
index 55f140a0..69d0a946 100644
--- a/src/dynarmic/frontend/A32/translate/impl/data_processing.cpp
+++ b/src/dynarmic/frontend/A32/translate/impl/data_processing.cpp
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: 0BSD
  */
 
-#include "dynarmic/frontend/A32/translate/impl/translate.h"
+#include "dynarmic/frontend/A32/translate/impl/a32_translate_impl.h"
 
 namespace Dynarmic::A32 {
 
diff --git a/src/dynarmic/frontend/A32/translate/impl/divide.cpp b/src/dynarmic/frontend/A32/translate/impl/divide.cpp
index e144f03b..f13a257d 100644
--- a/src/dynarmic/frontend/A32/translate/impl/divide.cpp
+++ b/src/dynarmic/frontend/A32/translate/impl/divide.cpp
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: 0BSD
  */
 
-#include "dynarmic/frontend/A32/translate/impl/translate.h"
+#include "dynarmic/frontend/A32/translate/impl/a32_translate_impl.h"
 
 namespace Dynarmic::A32 {
 namespace {
diff --git a/src/dynarmic/frontend/A32/translate/impl/extension.cpp b/src/dynarmic/frontend/A32/translate/impl/extension.cpp
index 9cd672b5..3ee6a670 100644
--- a/src/dynarmic/frontend/A32/translate/impl/extension.cpp
+++ b/src/dynarmic/frontend/A32/translate/impl/extension.cpp
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: 0BSD
  */
 
-#include "dynarmic/frontend/A32/translate/impl/translate.h"
+#include "dynarmic/frontend/A32/translate/impl/a32_translate_impl.h"
 
 namespace Dynarmic::A32 {
 
diff --git a/src/dynarmic/frontend/A32/translate/impl/hint.cpp b/src/dynarmic/frontend/A32/translate/impl/hint.cpp
index 72b58f3e..0ec6aeff 100644
--- a/src/dynarmic/frontend/A32/translate/impl/hint.cpp
+++ b/src/dynarmic/frontend/A32/translate/impl/hint.cpp
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: 0BSD
  */
 
-#include "dynarmic/frontend/A32/translate/impl/translate.h"
+#include "dynarmic/frontend/A32/translate/impl/a32_translate_impl.h"
 #include "dynarmic/interface/A32/config.h"
 
 namespace Dynarmic::A32 {
diff --git a/src/dynarmic/frontend/A32/translate/impl/load_store.cpp b/src/dynarmic/frontend/A32/translate/impl/load_store.cpp
index da606409..b511e441 100644
--- a/src/dynarmic/frontend/A32/translate/impl/load_store.cpp
+++ b/src/dynarmic/frontend/A32/translate/impl/load_store.cpp
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: 0BSD
  */
 
-#include "dynarmic/frontend/A32/translate/impl/translate.h"
+#include "dynarmic/frontend/A32/translate/impl/a32_translate_impl.h"
 
 namespace Dynarmic::A32 {
 
diff --git a/src/dynarmic/frontend/A32/translate/impl/misc.cpp b/src/dynarmic/frontend/A32/translate/impl/misc.cpp
index f4969cd7..8adab9ca 100644
--- a/src/dynarmic/frontend/A32/translate/impl/misc.cpp
+++ b/src/dynarmic/frontend/A32/translate/impl/misc.cpp
@@ -4,7 +4,7 @@
  */
 
 #include "dynarmic/common/bit_util.h"
-#include "dynarmic/frontend/A32/translate/impl/translate.h"
+#include "dynarmic/frontend/A32/translate/impl/a32_translate_impl.h"
 
 namespace Dynarmic::A32 {
 
diff --git a/src/dynarmic/frontend/A32/translate/impl/multiply.cpp b/src/dynarmic/frontend/A32/translate/impl/multiply.cpp
index 0c497a87..adcf6ddb 100644
--- a/src/dynarmic/frontend/A32/translate/impl/multiply.cpp
+++ b/src/dynarmic/frontend/A32/translate/impl/multiply.cpp
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: 0BSD
  */
 
-#include "dynarmic/frontend/A32/translate/impl/translate.h"
+#include "dynarmic/frontend/A32/translate/impl/a32_translate_impl.h"
 
 namespace Dynarmic::A32 {
 
diff --git a/src/dynarmic/frontend/A32/translate/impl/packing.cpp b/src/dynarmic/frontend/A32/translate/impl/packing.cpp
index 651af188..5cb88fe4 100644
--- a/src/dynarmic/frontend/A32/translate/impl/packing.cpp
+++ b/src/dynarmic/frontend/A32/translate/impl/packing.cpp
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: 0BSD
  */
 
-#include "dynarmic/frontend/A32/translate/impl/translate.h"
+#include "dynarmic/frontend/A32/translate/impl/a32_translate_impl.h"
 
 namespace Dynarmic::A32 {
 
diff --git a/src/dynarmic/frontend/A32/translate/impl/parallel.cpp b/src/dynarmic/frontend/A32/translate/impl/parallel.cpp
index 921c8b12..2bbb010b 100644
--- a/src/dynarmic/frontend/A32/translate/impl/parallel.cpp
+++ b/src/dynarmic/frontend/A32/translate/impl/parallel.cpp
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: 0BSD
  */
 
-#include "dynarmic/frontend/A32/translate/impl/translate.h"
+#include "dynarmic/frontend/A32/translate/impl/a32_translate_impl.h"
 
 namespace Dynarmic::A32 {
 
diff --git a/src/dynarmic/frontend/A32/translate/impl/reversal.cpp b/src/dynarmic/frontend/A32/translate/impl/reversal.cpp
index c6d2c7f3..4bf59491 100644
--- a/src/dynarmic/frontend/A32/translate/impl/reversal.cpp
+++ b/src/dynarmic/frontend/A32/translate/impl/reversal.cpp
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: 0BSD
  */
 
-#include "dynarmic/frontend/A32/translate/impl/translate.h"
+#include "dynarmic/frontend/A32/translate/impl/a32_translate_impl.h"
 
 namespace Dynarmic::A32 {
 
diff --git a/src/dynarmic/frontend/A32/translate/impl/saturated.cpp b/src/dynarmic/frontend/A32/translate/impl/saturated.cpp
index 43dcf105..51e7e1b6 100644
--- a/src/dynarmic/frontend/A32/translate/impl/saturated.cpp
+++ b/src/dynarmic/frontend/A32/translate/impl/saturated.cpp
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: 0BSD
  */
 
-#include "dynarmic/frontend/A32/translate/impl/translate.h"
+#include "dynarmic/frontend/A32/translate/impl/a32_translate_impl.h"
 
 namespace Dynarmic::A32 {
 
diff --git a/src/dynarmic/frontend/A32/translate/impl/status_register_access.cpp b/src/dynarmic/frontend/A32/translate/impl/status_register_access.cpp
index 866fa516..d2df86e8 100644
--- a/src/dynarmic/frontend/A32/translate/impl/status_register_access.cpp
+++ b/src/dynarmic/frontend/A32/translate/impl/status_register_access.cpp
@@ -4,7 +4,7 @@
  */
 
 #include "dynarmic/common/bit_util.h"
-#include "dynarmic/frontend/A32/translate/impl/translate.h"
+#include "dynarmic/frontend/A32/translate/impl/a32_translate_impl.h"
 
 namespace Dynarmic::A32 {
 
diff --git a/src/dynarmic/frontend/A32/translate/impl/synchronization.cpp b/src/dynarmic/frontend/A32/translate/impl/synchronization.cpp
index 689e0572..653732b4 100644
--- a/src/dynarmic/frontend/A32/translate/impl/synchronization.cpp
+++ b/src/dynarmic/frontend/A32/translate/impl/synchronization.cpp
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: 0BSD
  */
 
-#include "dynarmic/frontend/A32/translate/impl/translate.h"
+#include "dynarmic/frontend/A32/translate/impl/a32_translate_impl.h"
 
 namespace Dynarmic::A32 {
 
diff --git a/src/dynarmic/frontend/A32/translate/impl/thumb16.cpp b/src/dynarmic/frontend/A32/translate/impl/thumb16.cpp
index 13abc206..d5797115 100644
--- a/src/dynarmic/frontend/A32/translate/impl/thumb16.cpp
+++ b/src/dynarmic/frontend/A32/translate/impl/thumb16.cpp
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: 0BSD
  */
 
-#include "dynarmic/frontend/A32/translate/impl/translate.h"
+#include "dynarmic/frontend/A32/translate/impl/a32_translate_impl.h"
 #include "dynarmic/interface/A32/config.h"
 
 namespace Dynarmic::A32 {
diff --git a/src/dynarmic/frontend/A32/translate/impl/thumb32_branch.cpp b/src/dynarmic/frontend/A32/translate/impl/thumb32_branch.cpp
index 82c07b20..83734f5c 100644
--- a/src/dynarmic/frontend/A32/translate/impl/thumb32_branch.cpp
+++ b/src/dynarmic/frontend/A32/translate/impl/thumb32_branch.cpp
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: 0BSD
  */
 
-#include "dynarmic/frontend/A32/translate/impl/translate.h"
+#include "dynarmic/frontend/A32/translate/impl/a32_translate_impl.h"
 
 namespace Dynarmic::A32 {
 
diff --git a/src/dynarmic/frontend/A32/translate/impl/thumb32_control.cpp b/src/dynarmic/frontend/A32/translate/impl/thumb32_control.cpp
index 52cc6e5a..aa039373 100644
--- a/src/dynarmic/frontend/A32/translate/impl/thumb32_control.cpp
+++ b/src/dynarmic/frontend/A32/translate/impl/thumb32_control.cpp
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: 0BSD
  */
 
-#include "dynarmic/frontend/A32/translate/impl/translate.h"
+#include "dynarmic/frontend/A32/translate/impl/a32_translate_impl.h"
 
 namespace Dynarmic::A32 {
 
diff --git a/src/dynarmic/frontend/A32/translate/impl/thumb32_coprocessor.cpp b/src/dynarmic/frontend/A32/translate/impl/thumb32_coprocessor.cpp
index 71f108f9..ab7c5399 100644
--- a/src/dynarmic/frontend/A32/translate/impl/thumb32_coprocessor.cpp
+++ b/src/dynarmic/frontend/A32/translate/impl/thumb32_coprocessor.cpp
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: 0BSD
  */
 
-#include "dynarmic/frontend/A32/translate/impl/translate.h"
+#include "dynarmic/frontend/A32/translate/impl/a32_translate_impl.h"
 
 namespace Dynarmic::A32 {
 
diff --git a/src/dynarmic/frontend/A32/translate/impl/thumb32_data_processing_modified_immediate.cpp b/src/dynarmic/frontend/A32/translate/impl/thumb32_data_processing_modified_immediate.cpp
index ff871c69..f2cb202b 100644
--- a/src/dynarmic/frontend/A32/translate/impl/thumb32_data_processing_modified_immediate.cpp
+++ b/src/dynarmic/frontend/A32/translate/impl/thumb32_data_processing_modified_immediate.cpp
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: 0BSD
  */
 
-#include "dynarmic/frontend/A32/translate/impl/translate.h"
+#include "dynarmic/frontend/A32/translate/impl/a32_translate_impl.h"
 
 namespace Dynarmic::A32 {
 
diff --git a/src/dynarmic/frontend/A32/translate/impl/thumb32_data_processing_plain_binary_immediate.cpp b/src/dynarmic/frontend/A32/translate/impl/thumb32_data_processing_plain_binary_immediate.cpp
index be4040d1..358b7d7b 100644
--- a/src/dynarmic/frontend/A32/translate/impl/thumb32_data_processing_plain_binary_immediate.cpp
+++ b/src/dynarmic/frontend/A32/translate/impl/thumb32_data_processing_plain_binary_immediate.cpp
@@ -5,7 +5,7 @@
 
 #include "dynarmic/common/assert.h"
 #include "dynarmic/common/bit_util.h"
-#include "dynarmic/frontend/A32/translate/impl/translate.h"
+#include "dynarmic/frontend/A32/translate/impl/a32_translate_impl.h"
 
 namespace Dynarmic::A32 {
 static IR::U32 Pack2x16To1x32(A32::IREmitter& ir, IR::U32 lo, IR::U32 hi) {
diff --git a/src/dynarmic/frontend/A32/translate/impl/thumb32_data_processing_register.cpp b/src/dynarmic/frontend/A32/translate/impl/thumb32_data_processing_register.cpp
index 0ef5403d..04f5803c 100644
--- a/src/dynarmic/frontend/A32/translate/impl/thumb32_data_processing_register.cpp
+++ b/src/dynarmic/frontend/A32/translate/impl/thumb32_data_processing_register.cpp
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: 0BSD
  */
 
-#include "dynarmic/frontend/A32/translate/impl/translate.h"
+#include "dynarmic/frontend/A32/translate/impl/a32_translate_impl.h"
 
 namespace Dynarmic::A32 {
 namespace {
diff --git a/src/dynarmic/frontend/A32/translate/impl/thumb32_data_processing_shifted_register.cpp b/src/dynarmic/frontend/A32/translate/impl/thumb32_data_processing_shifted_register.cpp
index efb6750d..ee62bb52 100644
--- a/src/dynarmic/frontend/A32/translate/impl/thumb32_data_processing_shifted_register.cpp
+++ b/src/dynarmic/frontend/A32/translate/impl/thumb32_data_processing_shifted_register.cpp
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: 0BSD
  */
 
-#include "dynarmic/frontend/A32/translate/impl/translate.h"
+#include "dynarmic/frontend/A32/translate/impl/a32_translate_impl.h"
 
 namespace Dynarmic::A32 {
 
diff --git a/src/dynarmic/frontend/A32/translate/impl/thumb32_load_byte.cpp b/src/dynarmic/frontend/A32/translate/impl/thumb32_load_byte.cpp
index b83f8ee7..3f00efa8 100644
--- a/src/dynarmic/frontend/A32/translate/impl/thumb32_load_byte.cpp
+++ b/src/dynarmic/frontend/A32/translate/impl/thumb32_load_byte.cpp
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: 0BSD
  */
 
-#include "dynarmic/frontend/A32/translate/impl/translate.h"
+#include "dynarmic/frontend/A32/translate/impl/a32_translate_impl.h"
 #include "dynarmic/interface/A32/config.h"
 
 namespace Dynarmic::A32 {
diff --git a/src/dynarmic/frontend/A32/translate/impl/thumb32_load_halfword.cpp b/src/dynarmic/frontend/A32/translate/impl/thumb32_load_halfword.cpp
index 8a589b99..f1bba517 100644
--- a/src/dynarmic/frontend/A32/translate/impl/thumb32_load_halfword.cpp
+++ b/src/dynarmic/frontend/A32/translate/impl/thumb32_load_halfword.cpp
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: 0BSD
  */
 
-#include "dynarmic/frontend/A32/translate/impl/translate.h"
+#include "dynarmic/frontend/A32/translate/impl/a32_translate_impl.h"
 
 namespace Dynarmic::A32 {
 
diff --git a/src/dynarmic/frontend/A32/translate/impl/thumb32_load_store_dual.cpp b/src/dynarmic/frontend/A32/translate/impl/thumb32_load_store_dual.cpp
index 7232954f..e417e2d8 100644
--- a/src/dynarmic/frontend/A32/translate/impl/thumb32_load_store_dual.cpp
+++ b/src/dynarmic/frontend/A32/translate/impl/thumb32_load_store_dual.cpp
@@ -4,7 +4,7 @@
  */
 
 #include "dynarmic/common/bit_util.h"
-#include "dynarmic/frontend/A32/translate/impl/translate.h"
+#include "dynarmic/frontend/A32/translate/impl/a32_translate_impl.h"
 
 namespace Dynarmic::A32 {
 static bool ITBlockCheck(const A32::IREmitter& ir) {
diff --git a/src/dynarmic/frontend/A32/translate/impl/thumb32_load_store_multiple.cpp b/src/dynarmic/frontend/A32/translate/impl/thumb32_load_store_multiple.cpp
index f7c8490c..da6e6e65 100644
--- a/src/dynarmic/frontend/A32/translate/impl/thumb32_load_store_multiple.cpp
+++ b/src/dynarmic/frontend/A32/translate/impl/thumb32_load_store_multiple.cpp
@@ -4,7 +4,7 @@
  */
 
 #include "dynarmic/common/bit_util.h"
-#include "dynarmic/frontend/A32/translate/impl/translate.h"
+#include "dynarmic/frontend/A32/translate/impl/a32_translate_impl.h"
 
 namespace Dynarmic::A32 {
 static bool ITBlockCheck(const A32::IREmitter& ir) {
diff --git a/src/dynarmic/frontend/A32/translate/impl/thumb32_load_word.cpp b/src/dynarmic/frontend/A32/translate/impl/thumb32_load_word.cpp
index b8288c25..caa370ad 100644
--- a/src/dynarmic/frontend/A32/translate/impl/thumb32_load_word.cpp
+++ b/src/dynarmic/frontend/A32/translate/impl/thumb32_load_word.cpp
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: 0BSD
  */
 
-#include "dynarmic/frontend/A32/translate/impl/translate.h"
+#include "dynarmic/frontend/A32/translate/impl/a32_translate_impl.h"
 
 namespace Dynarmic::A32 {
 static bool ITBlockCheck(const A32::IREmitter& ir) {
diff --git a/src/dynarmic/frontend/A32/translate/impl/thumb32_long_multiply.cpp b/src/dynarmic/frontend/A32/translate/impl/thumb32_long_multiply.cpp
index 210248b2..0a0cdd9f 100644
--- a/src/dynarmic/frontend/A32/translate/impl/thumb32_long_multiply.cpp
+++ b/src/dynarmic/frontend/A32/translate/impl/thumb32_long_multiply.cpp
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: 0BSD
  */
 
-#include "dynarmic/frontend/A32/translate/impl/translate.h"
+#include "dynarmic/frontend/A32/translate/impl/a32_translate_impl.h"
 
 namespace Dynarmic::A32 {
 namespace {
diff --git a/src/dynarmic/frontend/A32/translate/impl/thumb32_misc.cpp b/src/dynarmic/frontend/A32/translate/impl/thumb32_misc.cpp
index b772fe3d..bab2d158 100644
--- a/src/dynarmic/frontend/A32/translate/impl/thumb32_misc.cpp
+++ b/src/dynarmic/frontend/A32/translate/impl/thumb32_misc.cpp
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: 0BSD
  */
 
-#include "dynarmic/frontend/A32/translate/impl/translate.h"
+#include "dynarmic/frontend/A32/translate/impl/a32_translate_impl.h"
 
 namespace Dynarmic::A32 {
 
diff --git a/src/dynarmic/frontend/A32/translate/impl/thumb32_multiply.cpp b/src/dynarmic/frontend/A32/translate/impl/thumb32_multiply.cpp
index 6db559d1..a40e67e1 100644
--- a/src/dynarmic/frontend/A32/translate/impl/thumb32_multiply.cpp
+++ b/src/dynarmic/frontend/A32/translate/impl/thumb32_multiply.cpp
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: 0BSD
  */
 
-#include "dynarmic/frontend/A32/translate/impl/translate.h"
+#include "dynarmic/frontend/A32/translate/impl/a32_translate_impl.h"
 
 namespace Dynarmic::A32 {
 
diff --git a/src/dynarmic/frontend/A32/translate/impl/thumb32_parallel.cpp b/src/dynarmic/frontend/A32/translate/impl/thumb32_parallel.cpp
index e511060f..65494096 100644
--- a/src/dynarmic/frontend/A32/translate/impl/thumb32_parallel.cpp
+++ b/src/dynarmic/frontend/A32/translate/impl/thumb32_parallel.cpp
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: 0BSD
  */
 
-#include "dynarmic/frontend/A32/translate/impl/translate.h"
+#include "dynarmic/frontend/A32/translate/impl/a32_translate_impl.h"
 
 namespace Dynarmic::A32 {
 static IR::U32 Pack2x16To1x32(A32::IREmitter& ir, IR::U32 lo, IR::U32 hi) {
diff --git a/src/dynarmic/frontend/A32/translate/impl/thumb32_store_single_data_item.cpp b/src/dynarmic/frontend/A32/translate/impl/thumb32_store_single_data_item.cpp
index 963fb3c2..9a977423 100644
--- a/src/dynarmic/frontend/A32/translate/impl/thumb32_store_single_data_item.cpp
+++ b/src/dynarmic/frontend/A32/translate/impl/thumb32_store_single_data_item.cpp
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: 0BSD
  */
 
-#include "dynarmic/frontend/A32/translate/impl/translate.h"
+#include "dynarmic/frontend/A32/translate/impl/a32_translate_impl.h"
 
 namespace Dynarmic::A32 {
 
diff --git a/src/dynarmic/frontend/A32/translate/impl/vfp.cpp b/src/dynarmic/frontend/A32/translate/impl/vfp.cpp
index 0ca54108..651b7d61 100644
--- a/src/dynarmic/frontend/A32/translate/impl/vfp.cpp
+++ b/src/dynarmic/frontend/A32/translate/impl/vfp.cpp
@@ -5,7 +5,7 @@
 
 #include <array>
 
-#include "dynarmic/frontend/A32/translate/impl/translate.h"
+#include "dynarmic/frontend/A32/translate/impl/a32_translate_impl.h"
 
 namespace Dynarmic::A32 {
 
diff --git a/src/dynarmic/frontend/A32/translate/translate_arm.cpp b/src/dynarmic/frontend/A32/translate/translate_arm.cpp
index 24c7ced8..384fa677 100644
--- a/src/dynarmic/frontend/A32/translate/translate_arm.cpp
+++ b/src/dynarmic/frontend/A32/translate/translate_arm.cpp
@@ -4,15 +4,15 @@
  */
 
 #include "dynarmic/common/assert.h"
+#include "dynarmic/frontend/A32/a32_location_descriptor.h"
+#include "dynarmic/frontend/A32/a32_types.h"
 #include "dynarmic/frontend/A32/decoder/arm.h"
 #include "dynarmic/frontend/A32/decoder/asimd.h"
 #include "dynarmic/frontend/A32/decoder/vfp.h"
-#include "dynarmic/frontend/A32/location_descriptor.h"
+#include "dynarmic/frontend/A32/translate/a32_translate.h"
 #include "dynarmic/frontend/A32/translate/conditional_state.h"
-#include "dynarmic/frontend/A32/translate/impl/translate.h"
-#include "dynarmic/frontend/A32/translate/translate.h"
+#include "dynarmic/frontend/A32/translate/impl/a32_translate_impl.h"
 #include "dynarmic/frontend/A32/translate/translate_callbacks.h"
-#include "dynarmic/frontend/A32/types.h"
 #include "dynarmic/interface/A32/config.h"
 #include "dynarmic/ir/basic_block.h"
 
diff --git a/src/dynarmic/frontend/A32/translate/translate_thumb.cpp b/src/dynarmic/frontend/A32/translate/translate_thumb.cpp
index 4d040bd3..08bbbadc 100644
--- a/src/dynarmic/frontend/A32/translate/translate_thumb.cpp
+++ b/src/dynarmic/frontend/A32/translate/translate_thumb.cpp
@@ -7,15 +7,15 @@
 
 #include "dynarmic/common/assert.h"
 #include "dynarmic/common/bit_util.h"
+#include "dynarmic/frontend/A32/a32_ir_emitter.h"
+#include "dynarmic/frontend/A32/a32_location_descriptor.h"
 #include "dynarmic/frontend/A32/decoder/asimd.h"
 #include "dynarmic/frontend/A32/decoder/thumb16.h"
 #include "dynarmic/frontend/A32/decoder/thumb32.h"
 #include "dynarmic/frontend/A32/decoder/vfp.h"
-#include "dynarmic/frontend/A32/ir_emitter.h"
-#include "dynarmic/frontend/A32/location_descriptor.h"
+#include "dynarmic/frontend/A32/translate/a32_translate.h"
 #include "dynarmic/frontend/A32/translate/conditional_state.h"
-#include "dynarmic/frontend/A32/translate/impl/translate.h"
-#include "dynarmic/frontend/A32/translate/translate.h"
+#include "dynarmic/frontend/A32/translate/impl/a32_translate_impl.h"
 #include "dynarmic/frontend/A32/translate/translate_callbacks.h"
 #include "dynarmic/frontend/imm.h"
 #include "dynarmic/interface/A32/config.h"
diff --git a/src/dynarmic/frontend/A64/ir_emitter.cpp b/src/dynarmic/frontend/A64/a64_ir_emitter.cpp
similarity index 99%
rename from src/dynarmic/frontend/A64/ir_emitter.cpp
rename to src/dynarmic/frontend/A64/a64_ir_emitter.cpp
index 7975b2a8..8e9df1d6 100644
--- a/src/dynarmic/frontend/A64/ir_emitter.cpp
+++ b/src/dynarmic/frontend/A64/a64_ir_emitter.cpp
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: 0BSD
  */
 
-#include "dynarmic/frontend/A64/ir_emitter.h"
+#include "dynarmic/frontend/A64/a64_ir_emitter.h"
 
 #include "dynarmic/common/assert.h"
 #include "dynarmic/ir/opcodes.h"
diff --git a/src/dynarmic/frontend/A64/ir_emitter.h b/src/dynarmic/frontend/A64/a64_ir_emitter.h
similarity index 97%
rename from src/dynarmic/frontend/A64/ir_emitter.h
rename to src/dynarmic/frontend/A64/a64_ir_emitter.h
index deca27d5..9928e03b 100644
--- a/src/dynarmic/frontend/A64/ir_emitter.h
+++ b/src/dynarmic/frontend/A64/a64_ir_emitter.h
@@ -8,8 +8,8 @@
 #include <optional>
 
 #include "dynarmic/common/common_types.h"
-#include "dynarmic/frontend/A64/location_descriptor.h"
-#include "dynarmic/frontend/A64/types.h"
+#include "dynarmic/frontend/A64/a64_location_descriptor.h"
+#include "dynarmic/frontend/A64/a64_types.h"
 #include "dynarmic/interface/A64/config.h"
 #include "dynarmic/ir/ir_emitter.h"
 #include "dynarmic/ir/value.h"
diff --git a/src/dynarmic/frontend/A64/location_descriptor.cpp b/src/dynarmic/frontend/A64/a64_location_descriptor.cpp
similarity index 88%
rename from src/dynarmic/frontend/A64/location_descriptor.cpp
rename to src/dynarmic/frontend/A64/a64_location_descriptor.cpp
index 53c8d35b..81c6cafe 100644
--- a/src/dynarmic/frontend/A64/location_descriptor.cpp
+++ b/src/dynarmic/frontend/A64/a64_location_descriptor.cpp
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: 0BSD
  */
 
-#include "dynarmic/frontend/A64/location_descriptor.h"
+#include "dynarmic/frontend/A64/a64_location_descriptor.h"
 
 #include <ostream>
 
diff --git a/src/dynarmic/frontend/A64/location_descriptor.h b/src/dynarmic/frontend/A64/a64_location_descriptor.h
similarity index 100%
rename from src/dynarmic/frontend/A64/location_descriptor.h
rename to src/dynarmic/frontend/A64/a64_location_descriptor.h
diff --git a/src/dynarmic/frontend/A64/types.cpp b/src/dynarmic/frontend/A64/a64_types.cpp
similarity index 95%
rename from src/dynarmic/frontend/A64/types.cpp
rename to src/dynarmic/frontend/A64/a64_types.cpp
index b0dbfb2e..822cf123 100644
--- a/src/dynarmic/frontend/A64/types.cpp
+++ b/src/dynarmic/frontend/A64/a64_types.cpp
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: 0BSD
  */
 
-#include "dynarmic/frontend/A64/types.h"
+#include "dynarmic/frontend/A64/a64_types.h"
 
 #include <array>
 #include <ostream>
diff --git a/src/dynarmic/frontend/A64/types.h b/src/dynarmic/frontend/A64/a64_types.h
similarity index 100%
rename from src/dynarmic/frontend/A64/types.h
rename to src/dynarmic/frontend/A64/a64_types.h
diff --git a/src/dynarmic/frontend/A64/translate/translate.cpp b/src/dynarmic/frontend/A64/translate/a64_translate.cpp
similarity index 94%
rename from src/dynarmic/frontend/A64/translate/translate.cpp
rename to src/dynarmic/frontend/A64/translate/a64_translate.cpp
index 4f7d3efc..84c5201a 100644
--- a/src/dynarmic/frontend/A64/translate/translate.cpp
+++ b/src/dynarmic/frontend/A64/translate/a64_translate.cpp
@@ -3,10 +3,10 @@
  * SPDX-License-Identifier: 0BSD
  */
 
-#include "dynarmic/frontend/A64/translate/translate.h"
+#include "dynarmic/frontend/A64/translate/a64_translate.h"
 
+#include "dynarmic/frontend/A64/a64_location_descriptor.h"
 #include "dynarmic/frontend/A64/decoder/a64.h"
-#include "dynarmic/frontend/A64/location_descriptor.h"
 #include "dynarmic/frontend/A64/translate/impl/impl.h"
 #include "dynarmic/ir/basic_block.h"
 #include "dynarmic/ir/terminal.h"
diff --git a/src/dynarmic/frontend/A64/translate/translate.h b/src/dynarmic/frontend/A64/translate/a64_translate.h
similarity index 100%
rename from src/dynarmic/frontend/A64/translate/translate.h
rename to src/dynarmic/frontend/A64/translate/a64_translate.h
diff --git a/src/dynarmic/frontend/A64/translate/impl/branch.cpp b/src/dynarmic/frontend/A64/translate/impl/a64_branch.cpp
similarity index 100%
rename from src/dynarmic/frontend/A64/translate/impl/branch.cpp
rename to src/dynarmic/frontend/A64/translate/impl/a64_branch.cpp
diff --git a/src/dynarmic/frontend/A64/translate/impl/exception_generating.cpp b/src/dynarmic/frontend/A64/translate/impl/a64_exception_generating.cpp
similarity index 100%
rename from src/dynarmic/frontend/A64/translate/impl/exception_generating.cpp
rename to src/dynarmic/frontend/A64/translate/impl/a64_exception_generating.cpp
diff --git a/src/dynarmic/frontend/A64/translate/impl/impl.h b/src/dynarmic/frontend/A64/translate/impl/impl.h
index e51f811e..86bc534d 100644
--- a/src/dynarmic/frontend/A64/translate/impl/impl.h
+++ b/src/dynarmic/frontend/A64/translate/impl/impl.h
@@ -7,10 +7,10 @@
 
 #include <optional>
 
-#include "dynarmic/frontend/A64/ir_emitter.h"
-#include "dynarmic/frontend/A64/location_descriptor.h"
-#include "dynarmic/frontend/A64/translate/translate.h"
-#include "dynarmic/frontend/A64/types.h"
+#include "dynarmic/frontend/A64/a64_ir_emitter.h"
+#include "dynarmic/frontend/A64/a64_location_descriptor.h"
+#include "dynarmic/frontend/A64/a64_types.h"
+#include "dynarmic/frontend/A64/translate/a64_translate.h"
 #include "dynarmic/frontend/imm.h"
 
 namespace Dynarmic::A64 {
diff --git a/src/dynarmic/ir/basic_block.cpp b/src/dynarmic/ir/basic_block.cpp
index 0e22cadf..c1f66ef3 100644
--- a/src/dynarmic/ir/basic_block.cpp
+++ b/src/dynarmic/ir/basic_block.cpp
@@ -15,8 +15,8 @@
 
 #include "dynarmic/common/assert.h"
 #include "dynarmic/common/memory_pool.h"
-#include "dynarmic/frontend/A32/types.h"
-#include "dynarmic/frontend/A64/types.h"
+#include "dynarmic/frontend/A32/a32_types.h"
+#include "dynarmic/frontend/A64/a64_types.h"
 #include "dynarmic/ir/cond.h"
 #include "dynarmic/ir/opcodes.h"
 
diff --git a/src/dynarmic/ir/opt/a32_get_set_elimination_pass.cpp b/src/dynarmic/ir/opt/a32_get_set_elimination_pass.cpp
index 7bb1fd97..2731037c 100644
--- a/src/dynarmic/ir/opt/a32_get_set_elimination_pass.cpp
+++ b/src/dynarmic/ir/opt/a32_get_set_elimination_pass.cpp
@@ -7,7 +7,7 @@
 
 #include "dynarmic/common/assert.h"
 #include "dynarmic/common/common_types.h"
-#include "dynarmic/frontend/A32/types.h"
+#include "dynarmic/frontend/A32/a32_types.h"
 #include "dynarmic/ir/basic_block.h"
 #include "dynarmic/ir/opcodes.h"
 #include "dynarmic/ir/opt/passes.h"
diff --git a/src/dynarmic/ir/opt/a64_callback_config_pass.cpp b/src/dynarmic/ir/opt/a64_callback_config_pass.cpp
index e49fdebd..5535c502 100644
--- a/src/dynarmic/ir/opt/a64_callback_config_pass.cpp
+++ b/src/dynarmic/ir/opt/a64_callback_config_pass.cpp
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: 0BSD
  */
 
-#include "dynarmic/frontend/A64/ir_emitter.h"
+#include "dynarmic/frontend/A64/a64_ir_emitter.h"
 #include "dynarmic/interface/A64/config.h"
 #include "dynarmic/ir/basic_block.h"
 #include "dynarmic/ir/microinstruction.h"
diff --git a/src/dynarmic/ir/opt/a64_get_set_elimination_pass.cpp b/src/dynarmic/ir/opt/a64_get_set_elimination_pass.cpp
index a2f14bd7..2248a3c1 100644
--- a/src/dynarmic/ir/opt/a64_get_set_elimination_pass.cpp
+++ b/src/dynarmic/ir/opt/a64_get_set_elimination_pass.cpp
@@ -6,7 +6,7 @@
 #include <array>
 
 #include "dynarmic/common/common_types.h"
-#include "dynarmic/frontend/A64/types.h"
+#include "dynarmic/frontend/A64/a64_types.h"
 #include "dynarmic/ir/basic_block.h"
 #include "dynarmic/ir/opcodes.h"
 #include "dynarmic/ir/opt/passes.h"
diff --git a/src/dynarmic/ir/opt/a64_merge_interpret_blocks.cpp b/src/dynarmic/ir/opt/a64_merge_interpret_blocks.cpp
index ccf15c59..af4e4bef 100644
--- a/src/dynarmic/ir/opt/a64_merge_interpret_blocks.cpp
+++ b/src/dynarmic/ir/opt/a64_merge_interpret_blocks.cpp
@@ -6,8 +6,8 @@
 #include <boost/variant/get.hpp>
 
 #include "dynarmic/common/common_types.h"
-#include "dynarmic/frontend/A64/location_descriptor.h"
-#include "dynarmic/frontend/A64/translate/translate.h"
+#include "dynarmic/frontend/A64/a64_location_descriptor.h"
+#include "dynarmic/frontend/A64/translate/a64_translate.h"
 #include "dynarmic/interface/A64/config.h"
 #include "dynarmic/ir/basic_block.h"
 #include "dynarmic/ir/opt/passes.h"
diff --git a/tests/A32/fuzz_arm.cpp b/tests/A32/fuzz_arm.cpp
index de1e5b33..d2af960c 100644
--- a/tests/A32/fuzz_arm.cpp
+++ b/tests/A32/fuzz_arm.cpp
@@ -22,9 +22,9 @@
 #include "dynarmic/common/llvm_disassemble.h"
 #include "dynarmic/common/scope_exit.h"
 #include "dynarmic/frontend/A32/ITState.h"
-#include "dynarmic/frontend/A32/location_descriptor.h"
-#include "dynarmic/frontend/A32/translate/translate.h"
-#include "dynarmic/frontend/A32/types.h"
+#include "dynarmic/frontend/A32/a32_location_descriptor.h"
+#include "dynarmic/frontend/A32/a32_types.h"
+#include "dynarmic/frontend/A32/translate/a32_translate.h"
 #include "dynarmic/interface/A32/a32.h"
 #include "dynarmic/ir/basic_block.h"
 #include "dynarmic/ir/location_descriptor.h"
diff --git a/tests/A32/fuzz_thumb.cpp b/tests/A32/fuzz_thumb.cpp
index e67b21bb..a7b04a57 100644
--- a/tests/A32/fuzz_thumb.cpp
+++ b/tests/A32/fuzz_thumb.cpp
@@ -21,9 +21,9 @@
 #include "dynarmic/common/common_types.h"
 #include "dynarmic/frontend/A32/FPSCR.h"
 #include "dynarmic/frontend/A32/PSR.h"
+#include "dynarmic/frontend/A32/a32_location_descriptor.h"
 #include "dynarmic/frontend/A32/disassembler/disassembler.h"
-#include "dynarmic/frontend/A32/location_descriptor.h"
-#include "dynarmic/frontend/A32/translate/translate.h"
+#include "dynarmic/frontend/A32/translate/a32_translate.h"
 #include "dynarmic/interface/A32/a32.h"
 #include "dynarmic/ir/basic_block.h"
 #include "dynarmic/ir/opt/passes.h"
diff --git a/tests/A32/test_arm_instructions.cpp b/tests/A32/test_arm_instructions.cpp
index 85b1093e..123283a5 100644
--- a/tests/A32/test_arm_instructions.cpp
+++ b/tests/A32/test_arm_instructions.cpp
@@ -6,7 +6,7 @@
 #include <catch2/catch.hpp>
 
 #include "./testenv.h"
-#include "dynarmic/frontend/A32/location_descriptor.h"
+#include "dynarmic/frontend/A32/a32_location_descriptor.h"
 #include "dynarmic/interface/A32/a32.h"
 
 using namespace Dynarmic;
diff --git a/tests/A64/fuzz_with_unicorn.cpp b/tests/A64/fuzz_with_unicorn.cpp
index 0b438d27..433f8ca9 100644
--- a/tests/A64/fuzz_with_unicorn.cpp
+++ b/tests/A64/fuzz_with_unicorn.cpp
@@ -19,10 +19,10 @@
 #include "dynarmic/common/fp/fpsr.h"
 #include "dynarmic/common/llvm_disassemble.h"
 #include "dynarmic/common/scope_exit.h"
+#include "dynarmic/frontend/A64/a64_location_descriptor.h"
+#include "dynarmic/frontend/A64/a64_types.h"
 #include "dynarmic/frontend/A64/decoder/a64.h"
-#include "dynarmic/frontend/A64/location_descriptor.h"
-#include "dynarmic/frontend/A64/translate/translate.h"
-#include "dynarmic/frontend/A64/types.h"
+#include "dynarmic/frontend/A64/translate/a64_translate.h"
 #include "dynarmic/ir/basic_block.h"
 #include "dynarmic/ir/opcodes.h"
 #include "dynarmic/ir/opt/passes.h"
diff --git a/tests/decoder_tests.cpp b/tests/decoder_tests.cpp
index 1657bb20..b4b12273 100644
--- a/tests/decoder_tests.cpp
+++ b/tests/decoder_tests.cpp
@@ -11,7 +11,7 @@
 
 #include "dynarmic/common/assert.h"
 #include "dynarmic/frontend/A32/decoder/asimd.h"
-#include "dynarmic/frontend/A32/translate/impl/translate.h"
+#include "dynarmic/frontend/A32/translate/impl/a32_translate_impl.h"
 #include "dynarmic/interface/A32/config.h"
 #include "dynarmic/ir/opcodes.h"
 
diff --git a/tests/print_info.cpp b/tests/print_info.cpp
index ac108b5e..c20ac371 100644
--- a/tests/print_info.cpp
+++ b/tests/print_info.cpp
@@ -18,16 +18,16 @@
 #include "dynarmic/common/bit_util.h"
 #include "dynarmic/common/common_types.h"
 #include "dynarmic/common/llvm_disassemble.h"
+#include "dynarmic/frontend/A32/a32_location_descriptor.h"
 #include "dynarmic/frontend/A32/decoder/arm.h"
 #include "dynarmic/frontend/A32/decoder/asimd.h"
 #include "dynarmic/frontend/A32/decoder/vfp.h"
-#include "dynarmic/frontend/A32/location_descriptor.h"
-#include "dynarmic/frontend/A32/translate/impl/translate.h"
-#include "dynarmic/frontend/A32/translate/translate.h"
+#include "dynarmic/frontend/A32/translate/a32_translate.h"
+#include "dynarmic/frontend/A32/translate/impl/a32_translate_impl.h"
+#include "dynarmic/frontend/A64/a64_location_descriptor.h"
 #include "dynarmic/frontend/A64/decoder/a64.h"
-#include "dynarmic/frontend/A64/location_descriptor.h"
+#include "dynarmic/frontend/A64/translate/a64_translate.h"
 #include "dynarmic/frontend/A64/translate/impl/impl.h"
-#include "dynarmic/frontend/A64/translate/translate.h"
 #include "dynarmic/interface/A32/a32.h"
 #include "dynarmic/interface/A32/disassembler.h"
 #include "dynarmic/ir/basic_block.h"