diff --git a/.gitignore b/.gitignore
index d1a0a8edf..433f2aa0f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -29,6 +29,7 @@
 *.app
 *.hex
 *.otr
+*.o2r
 
 # Debug files
 *.dSYM/
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1fa0a5dc8..488caefd9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -590,8 +590,8 @@ add_custom_target(
     DEPENDS torch
     WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
     COMMAND ${TORCH_EXECUTABLE} header -o baserom.us.z64
-    COMMAND ${TORCH_EXECUTABLE} otr baserom.us.z64
-    COMMAND ${TORCH_EXECUTABLE} pack assets ship.otr
-    COMMAND ${CMAKE_COMMAND} -E copy_if_different "${CMAKE_SOURCE_DIR}/spaghetti.otr" "${CMAKE_BINARY_DIR}/spaghetti.otr"
-    COMMAND ${CMAKE_COMMAND} -E copy_if_different "${CMAKE_SOURCE_DIR}/ship.otr" "${CMAKE_BINARY_DIR}/ship.otr"
+    COMMAND ${TORCH_EXECUTABLE} o2r baserom.us.z64
+    COMMAND ${TORCH_EXECUTABLE} pack assets ship.o2r o2r
+    COMMAND ${CMAKE_COMMAND} -E copy_if_different "${CMAKE_SOURCE_DIR}/spaghetti.o2r" "${CMAKE_BINARY_DIR}/spaghetti.o2r"
+    COMMAND ${CMAKE_COMMAND} -E copy_if_different "${CMAKE_SOURCE_DIR}/ship.o2r" "${CMAKE_BINARY_DIR}/ship.o2r"
 )
diff --git a/config.yml b/config.yml
index d69e23ea9..e94c939eb 100644
--- a/config.yml
+++ b/config.yml
@@ -7,7 +7,7 @@
     enums: 
       - include/defines.h
     output:
-      binary: spaghetti.otr
+      binary: spaghetti.o2r
       headers: include/assets
       code: assets/code
   segments:
diff --git a/src/port/Engine.cpp b/src/port/Engine.cpp
index 23c5dbdbe..fd6db00b4 100644
--- a/src/port/Engine.cpp
+++ b/src/port/Engine.cpp
@@ -42,11 +42,11 @@ GameEngine* GameEngine::Instance;
 
 GameEngine::GameEngine() {
     std::vector<std::string> OTRFiles;
-    if (const std::string spaghetti_path = Ship::Context::GetPathRelativeToAppDirectory("spaghetti.otr");
+    if (const std::string spaghetti_path = Ship::Context::GetPathRelativeToAppDirectory("spaghetti.o2r");
         std::filesystem::exists(spaghetti_path)) {
         OTRFiles.push_back(spaghetti_path);
     }
-    if (const std::string ship_otr_path = Ship::Context::GetPathRelativeToAppBundle("ship.otr");
+    if (const std::string ship_otr_path = Ship::Context::GetPathRelativeToAppBundle("ship.o2r");
         std::filesystem::exists(ship_otr_path)) {
         OTRFiles.push_back(ship_otr_path);
     }
diff --git a/torch b/torch
index e466f58b2..3c42ac507 160000
--- a/torch
+++ b/torch
@@ -1 +1 @@
-Subproject commit e466f58b2cff026c37201154cc74096b1f7ac0ce
+Subproject commit 3c42ac507f587f9dbba51cbd8fa3135a92899088