diff --git a/android/src/main/java/com/margelo/nitro/rive/HybridRiveView.kt b/android/src/main/java/com/margelo/nitro/rive/HybridRiveView.kt
index 45cb9e51..5bca170b 100644
--- a/android/src/main/java/com/margelo/nitro/rive/HybridRiveView.kt
+++ b/android/src/main/java/com/margelo/nitro/rive/HybridRiveView.kt
@@ -46,6 +46,10 @@ object DefaultConfiguration {
 @Keep
 @DoNotStrip
 class HybridRiveView(val context: ThemedReactContext) : HybridRiveViewSpec() {
+  companion object {
+    private const val TAG = "HybridRiveView"
+  }
+
   //region State
   override val view: RiveReactNativeView = RiveReactNativeView(context)
   private var needsReload = false
diff --git a/example/ios/Podfile.lock b/example/ios/Podfile.lock
index f8ed5f9d..d66f46dd 100644
--- a/example/ios/Podfile.lock
+++ b/example/ios/Podfile.lock
@@ -1357,32 +1357,6 @@ PODS:
     - React-jsiexecutor
     - React-RCTFBReactNativeSpec
     - ReactCommon/turbomodule/core
-  - react-native-rive (0.1.0):
-    - DoubleConversion
-    - glog
-    - hermes-engine
-    - NitroModules
-    - RCT-Folly (= 2024.11.18.00)
-    - RCTRequired
-    - RCTTypeSafety
-    - React-Core
-    - React-debug
-    - React-Fabric
-    - React-featureflags
-    - React-graphics
-    - React-hermes
-    - React-ImageManager
-    - React-jsi
-    - React-NativeModulesApple
-    - React-RCTFabric
-    - React-renderercss
-    - React-rendererdebug
-    - React-utils
-    - ReactCodegen
-    - ReactCommon/turbomodule/bridging
-    - ReactCommon/turbomodule/core
-    - RiveRuntime (= 6.12.0)
-    - Yoga
   - react-native-safe-area-context (5.6.2):
     - DoubleConversion
     - glog
@@ -1713,6 +1687,32 @@ PODS:
     - React-debug
     - React-hermes
     - React-jsi (= 0.79.2)
+  - react_native_rive (0.1.0):
+    - DoubleConversion
+    - glog
+    - hermes-engine
+    - NitroModules
+    - RCT-Folly (= 2024.11.18.00)
+    - RCTRequired
+    - RCTTypeSafety
+    - React-Core
+    - React-debug
+    - React-Fabric
+    - React-featureflags
+    - React-graphics
+    - React-hermes
+    - React-ImageManager
+    - React-jsi
+    - React-NativeModulesApple
+    - React-RCTFabric
+    - React-renderercss
+    - React-rendererdebug
+    - React-utils
+    - ReactCodegen
+    - ReactCommon/turbomodule/bridging
+    - ReactCommon/turbomodule/core
+    - RiveRuntime (= 6.12.0)
+    - Yoga
   - ReactAppDependencyProvider (0.79.2):
     - ReactCodegen
   - ReactCodegen (0.79.2):
@@ -1874,7 +1874,6 @@ DEPENDENCIES:
   - React-logger (from `../node_modules/react-native/ReactCommon/logger`)
   - React-Mapbuffer (from `../node_modules/react-native/ReactCommon`)
   - React-microtasksnativemodule (from `../node_modules/react-native/ReactCommon/react/nativemodule/microtasks`)
-  - react-native-rive (from `../..`)
   - react-native-safe-area-context (from `../node_modules/react-native-safe-area-context`)
   - React-NativeModulesApple (from `../node_modules/react-native/ReactCommon/react/nativemodule/core/platform/ios`)
   - React-oscompat (from `../node_modules/react-native/ReactCommon/oscompat`)
@@ -1904,6 +1903,7 @@ DEPENDENCIES:
   - React-runtimescheduler (from `../node_modules/react-native/ReactCommon/react/renderer/runtimescheduler`)
   - React-timing (from `../node_modules/react-native/ReactCommon/react/timing`)
   - React-utils (from `../node_modules/react-native/ReactCommon/react/utils`)
+  - react_native_rive (from `../..`)
   - ReactAppDependencyProvider (from `build/generated/ios`)
   - ReactCodegen (from `build/generated/ios`)
   - ReactCommon/turbomodule/core (from `../node_modules/react-native/ReactCommon`)
@@ -1996,8 +1996,6 @@ EXTERNAL SOURCES:
     :path: "../node_modules/react-native/ReactCommon"
   React-microtasksnativemodule:
     :path: "../node_modules/react-native/ReactCommon/react/nativemodule/microtasks"
-  react-native-rive:
-    :path: "../.."
   react-native-safe-area-context:
     :path: "../node_modules/react-native-safe-area-context"
   React-NativeModulesApple:
@@ -2056,6 +2054,8 @@ EXTERNAL SOURCES:
     :path: "../node_modules/react-native/ReactCommon/react/timing"
   React-utils:
     :path: "../node_modules/react-native/ReactCommon/react/utils"
+  react_native_rive:
+    :path: "../.."
   ReactAppDependencyProvider:
     :path: build/generated/ios
   ReactCodegen:
@@ -2109,7 +2109,6 @@ SPEC CHECKSUMS:
   React-logger: 368570a253f00879a1e4fea24ed4047e72e7bbf3
   React-Mapbuffer: c04fcda1c6281fc0a6824c7dcc1633dd217ac1ec
   React-microtasksnativemodule: ca2804a25fdcefffa0aa942aa23ab53b99614a34
-  react-native-rive: 7e008c7a01eba3d71d98813f77b4221699290990
   react-native-safe-area-context: bc59472155ffb889a1ffe16c19a04c0cd451562b
   React-NativeModulesApple: 452b86b29fae99ed0a4015dca3ad9cd222f88abf
   React-oscompat: ef5df1c734f19b8003e149317d041b8ce1f7d29c
@@ -2139,6 +2138,7 @@ SPEC CHECKSUMS:
   React-runtimescheduler: e917ab17ae08c204af1ebf8f669b7e411b0220c8
   React-timing: a90f4654cbda9c628614f9bee68967f1768bd6a5
   React-utils: 51c4e71608b8133fecc9a15801d244ae7bdf3758
+  react_native_rive: a6e6aa9ef2826c95aeaa7e40619a04f3887c8ac7
   ReactAppDependencyProvider: d5dcc564f129632276bd3184e60f053fcd574d6b
   ReactCodegen: fda99a79c866370190e162083a35602fdc314e5d
   ReactCommon: 4d0da92a5eb8da86c08e3ec34bd23ab439fb2461
diff --git a/lefthook.yml b/lefthook.yml
deleted file mode 100644
index 9695c129..00000000
--- a/lefthook.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-pre-commit:
-  parallel: true
-  commands:
-    lint:
-      glob: "*.{js,ts,jsx,tsx}"
-      run: npx eslint {staged_files}
-    types:
-      glob: "*.{js,ts, jsx, tsx}"
-      run: npx tsc
-commit-msg:
-  parallel: true
-  commands:
-    commitlint:
-      run: npx commitlint --edit
diff --git a/nitro.json b/nitro.json
index 9c98b656..e1051a17 100644
--- a/nitro.json
+++ b/nitro.json
@@ -2,7 +2,7 @@
   "$schema": "https://nitro.margelo.com/nitro.schema.json",
   "cxxNamespace": ["rive"],
   "ios": {
-    "iosModuleName": "Rive"
+    "iosModuleName": "react_native_rive"
   },
   "android": {
     "androidNamespace": ["rive"],
diff --git a/nitrogen/generated/ios/c++/HybridRiveFileFactorySpecSwift.hpp b/nitrogen/generated/ios/c++/HybridRiveFileFactorySpecSwift.hpp
index 098ab3ea..27323c9d 100644
--- a/nitrogen/generated/ios/c++/HybridRiveFileFactorySpecSwift.hpp
+++ b/nitrogen/generated/ios/c++/HybridRiveFileFactorySpecSwift.hpp
@@ -10,7 +10,7 @@
 #include "HybridRiveFileFactorySpec.hpp"
 
 // Forward declaration of `HybridRiveFileFactorySpec_cxx` to properly resolve imports.
-namespace Rive { class HybridRiveFileFactorySpec_cxx; }
+namespace react_native_rive { class HybridRiveFileFactorySpec_cxx; }
 
 // Forward declaration of `HybridRiveFileSpec` to properly resolve imports.
 namespace margelo::nitro::rive { class HybridRiveFileSpec; }
@@ -32,7 +32,7 @@ namespace NitroModules { class ArrayBufferHolder; }
 #include <NitroModules/ArrayBuffer.hpp>
 #include <NitroModules/ArrayBufferHolder.hpp>
 
-#include "Rive-Swift-Cxx-Umbrella.hpp"
+#include "react_native_rive-Swift-Cxx-Umbrella.hpp"
 
 namespace margelo::nitro::rive {
 
@@ -49,13 +49,13 @@ namespace margelo::nitro::rive {
   class HybridRiveFileFactorySpecSwift: public virtual HybridRiveFileFactorySpec {
   public:
     // Constructor from a Swift instance
-    explicit HybridRiveFileFactorySpecSwift(const Rive::HybridRiveFileFactorySpec_cxx& swiftPart):
+    explicit HybridRiveFileFactorySpecSwift(const react_native_rive::HybridRiveFileFactorySpec_cxx& swiftPart):
       HybridObject(HybridRiveFileFactorySpec::TAG),
       _swiftPart(swiftPart) { }
 
   public:
     // Get the Swift part
-    inline Rive::HybridRiveFileFactorySpec_cxx& getSwiftPart() noexcept {
+    inline react_native_rive::HybridRiveFileFactorySpec_cxx& getSwiftPart() noexcept {
       return _swiftPart;
     }
 
@@ -110,7 +110,7 @@ namespace margelo::nitro::rive {
     }
 
   private:
-    Rive::HybridRiveFileFactorySpec_cxx _swiftPart;
+    react_native_rive::HybridRiveFileFactorySpec_cxx _swiftPart;
   };
 
 } // namespace margelo::nitro::rive
diff --git a/nitrogen/generated/ios/c++/HybridRiveFileSpecSwift.hpp b/nitrogen/generated/ios/c++/HybridRiveFileSpecSwift.hpp
index e2dae7ae..b5c79485 100644
--- a/nitrogen/generated/ios/c++/HybridRiveFileSpecSwift.hpp
+++ b/nitrogen/generated/ios/c++/HybridRiveFileSpecSwift.hpp
@@ -10,7 +10,7 @@
 #include "HybridRiveFileSpec.hpp"
 
 // Forward declaration of `HybridRiveFileSpec_cxx` to properly resolve imports.
-namespace Rive { class HybridRiveFileSpec_cxx; }
+namespace react_native_rive { class HybridRiveFileSpec_cxx; }
 
 // Forward declaration of `HybridViewModelSpec` to properly resolve imports.
 namespace margelo::nitro::rive { class HybridViewModelSpec; }
@@ -33,7 +33,7 @@ namespace margelo::nitro::rive { struct ResolvedReferencedAsset; }
 #include "ResolvedReferencedAsset.hpp"
 #include <unordered_map>
 
-#include "Rive-Swift-Cxx-Umbrella.hpp"
+#include "react_native_rive-Swift-Cxx-Umbrella.hpp"
 
 namespace margelo::nitro::rive {
 
@@ -50,13 +50,13 @@ namespace margelo::nitro::rive {
   class HybridRiveFileSpecSwift: public virtual HybridRiveFileSpec {
   public:
     // Constructor from a Swift instance
-    explicit HybridRiveFileSpecSwift(const Rive::HybridRiveFileSpec_cxx& swiftPart):
+    explicit HybridRiveFileSpecSwift(const react_native_rive::HybridRiveFileSpec_cxx& swiftPart):
       HybridObject(HybridRiveFileSpec::TAG),
       _swiftPart(swiftPart) { }
 
   public:
     // Get the Swift part
-    inline Rive::HybridRiveFileSpec_cxx& getSwiftPart() noexcept {
+    inline react_native_rive::HybridRiveFileSpec_cxx& getSwiftPart() noexcept {
       return _swiftPart;
     }
 
@@ -118,7 +118,7 @@ namespace margelo::nitro::rive {
     }
 
   private:
-    Rive::HybridRiveFileSpec_cxx _swiftPart;
+    react_native_rive::HybridRiveFileSpec_cxx _swiftPart;
   };
 
 } // namespace margelo::nitro::rive
diff --git a/nitrogen/generated/ios/c++/HybridRiveSpecSwift.hpp b/nitrogen/generated/ios/c++/HybridRiveSpecSwift.hpp
index b8cfe56d..a23e6642 100644
--- a/nitrogen/generated/ios/c++/HybridRiveSpecSwift.hpp
+++ b/nitrogen/generated/ios/c++/HybridRiveSpecSwift.hpp
@@ -10,13 +10,13 @@
 #include "HybridRiveSpec.hpp"
 
 // Forward declaration of `HybridRiveSpec_cxx` to properly resolve imports.
-namespace Rive { class HybridRiveSpec_cxx; }
+namespace react_native_rive { class HybridRiveSpec_cxx; }
 
 
 
 
 
-#include "Rive-Swift-Cxx-Umbrella.hpp"
+#include "react_native_rive-Swift-Cxx-Umbrella.hpp"
 
 namespace margelo::nitro::rive {
 
@@ -33,13 +33,13 @@ namespace margelo::nitro::rive {
   class HybridRiveSpecSwift: public virtual HybridRiveSpec {
   public:
     // Constructor from a Swift instance
-    explicit HybridRiveSpecSwift(const Rive::HybridRiveSpec_cxx& swiftPart):
+    explicit HybridRiveSpecSwift(const react_native_rive::HybridRiveSpec_cxx& swiftPart):
       HybridObject(HybridRiveSpec::TAG),
       _swiftPart(swiftPart) { }
 
   public:
     // Get the Swift part
-    inline Rive::HybridRiveSpec_cxx& getSwiftPart() noexcept {
+    inline react_native_rive::HybridRiveSpec_cxx& getSwiftPart() noexcept {
       return _swiftPart;
     }
 
@@ -70,7 +70,7 @@ namespace margelo::nitro::rive {
     }
 
   private:
-    Rive::HybridRiveSpec_cxx _swiftPart;
+    react_native_rive::HybridRiveSpec_cxx _swiftPart;
   };
 
 } // namespace margelo::nitro::rive
diff --git a/nitrogen/generated/ios/c++/HybridRiveViewSpecSwift.hpp b/nitrogen/generated/ios/c++/HybridRiveViewSpecSwift.hpp
index 686546f1..d13488e9 100644
--- a/nitrogen/generated/ios/c++/HybridRiveViewSpecSwift.hpp
+++ b/nitrogen/generated/ios/c++/HybridRiveViewSpecSwift.hpp
@@ -10,7 +10,7 @@
 #include "HybridRiveViewSpec.hpp"
 
 // Forward declaration of `HybridRiveViewSpec_cxx` to properly resolve imports.
-namespace Rive { class HybridRiveViewSpec_cxx; }
+namespace react_native_rive { class HybridRiveViewSpec_cxx; }
 
 // Forward declaration of `HybridRiveFileSpec` to properly resolve imports.
 namespace margelo::nitro::rive { class HybridRiveFileSpec; }
@@ -45,7 +45,7 @@ namespace margelo::nitro::rive { enum class RiveEventType; }
 #include "RiveEventType.hpp"
 #include <unordered_map>
 
-#include "Rive-Swift-Cxx-Umbrella.hpp"
+#include "react_native_rive-Swift-Cxx-Umbrella.hpp"
 
 namespace margelo::nitro::rive {
 
@@ -62,13 +62,13 @@ namespace margelo::nitro::rive {
   class HybridRiveViewSpecSwift: public virtual HybridRiveViewSpec {
   public:
     // Constructor from a Swift instance
-    explicit HybridRiveViewSpecSwift(const Rive::HybridRiveViewSpec_cxx& swiftPart):
+    explicit HybridRiveViewSpecSwift(const react_native_rive::HybridRiveViewSpec_cxx& swiftPart):
       HybridObject(HybridRiveViewSpec::TAG),
       _swiftPart(swiftPart) { }
 
   public:
     // Get the Swift part
-    inline Rive::HybridRiveViewSpec_cxx& getSwiftPart() noexcept {
+    inline react_native_rive::HybridRiveViewSpec_cxx& getSwiftPart() noexcept {
       return _swiftPart;
     }
 
@@ -240,7 +240,7 @@ namespace margelo::nitro::rive {
     }
 
   private:
-    Rive::HybridRiveViewSpec_cxx _swiftPart;
+    react_native_rive::HybridRiveViewSpec_cxx _swiftPart;
   };
 
 } // namespace margelo::nitro::rive
diff --git a/nitrogen/generated/ios/c++/HybridViewModelBooleanPropertySpecSwift.hpp b/nitrogen/generated/ios/c++/HybridViewModelBooleanPropertySpecSwift.hpp
index d1d3d83f..b8812007 100644
--- a/nitrogen/generated/ios/c++/HybridViewModelBooleanPropertySpecSwift.hpp
+++ b/nitrogen/generated/ios/c++/HybridViewModelBooleanPropertySpecSwift.hpp
@@ -10,7 +10,7 @@
 #include "HybridViewModelBooleanPropertySpec.hpp"
 
 // Forward declaration of `HybridViewModelBooleanPropertySpec_cxx` to properly resolve imports.
-namespace Rive { class HybridViewModelBooleanPropertySpec_cxx; }
+namespace react_native_rive { class HybridViewModelBooleanPropertySpec_cxx; }
 
 // Forward declaration of `HybridViewModelPropertySpecSwift` to properly resolve imports.
 namespace margelo::nitro::rive { class HybridViewModelPropertySpecSwift; }
@@ -18,7 +18,7 @@ namespace margelo::nitro::rive { class HybridViewModelPropertySpecSwift; }
 #include <functional>
 #include "HybridViewModelPropertySpecSwift.hpp"
 
-#include "Rive-Swift-Cxx-Umbrella.hpp"
+#include "react_native_rive-Swift-Cxx-Umbrella.hpp"
 
 namespace margelo::nitro::rive {
 
@@ -35,14 +35,14 @@ namespace margelo::nitro::rive {
   class HybridViewModelBooleanPropertySpecSwift: public virtual HybridViewModelBooleanPropertySpec, public virtual HybridViewModelPropertySpecSwift {
   public:
     // Constructor from a Swift instance
-    explicit HybridViewModelBooleanPropertySpecSwift(const Rive::HybridViewModelBooleanPropertySpec_cxx& swiftPart):
+    explicit HybridViewModelBooleanPropertySpecSwift(const react_native_rive::HybridViewModelBooleanPropertySpec_cxx& swiftPart):
       HybridObject(HybridViewModelBooleanPropertySpec::TAG),
       HybridViewModelPropertySpecSwift(swiftPart),
       _swiftPart(swiftPart) { }
 
   public:
     // Get the Swift part
-    inline Rive::HybridViewModelBooleanPropertySpec_cxx& getSwiftPart() noexcept {
+    inline react_native_rive::HybridViewModelBooleanPropertySpec_cxx& getSwiftPart() noexcept {
       return _swiftPart;
     }
 
@@ -82,7 +82,7 @@ namespace margelo::nitro::rive {
     }
 
   private:
-    Rive::HybridViewModelBooleanPropertySpec_cxx _swiftPart;
+    react_native_rive::HybridViewModelBooleanPropertySpec_cxx _swiftPart;
   };
 
 } // namespace margelo::nitro::rive
diff --git a/nitrogen/generated/ios/c++/HybridViewModelColorPropertySpecSwift.hpp b/nitrogen/generated/ios/c++/HybridViewModelColorPropertySpecSwift.hpp
index 3c9840d4..58b46736 100644
--- a/nitrogen/generated/ios/c++/HybridViewModelColorPropertySpecSwift.hpp
+++ b/nitrogen/generated/ios/c++/HybridViewModelColorPropertySpecSwift.hpp
@@ -10,7 +10,7 @@
 #include "HybridViewModelColorPropertySpec.hpp"
 
 // Forward declaration of `HybridViewModelColorPropertySpec_cxx` to properly resolve imports.
-namespace Rive { class HybridViewModelColorPropertySpec_cxx; }
+namespace react_native_rive { class HybridViewModelColorPropertySpec_cxx; }
 
 // Forward declaration of `HybridViewModelPropertySpecSwift` to properly resolve imports.
 namespace margelo::nitro::rive { class HybridViewModelPropertySpecSwift; }
@@ -18,7 +18,7 @@ namespace margelo::nitro::rive { class HybridViewModelPropertySpecSwift; }
 #include <functional>
 #include "HybridViewModelPropertySpecSwift.hpp"
 
-#include "Rive-Swift-Cxx-Umbrella.hpp"
+#include "react_native_rive-Swift-Cxx-Umbrella.hpp"
 
 namespace margelo::nitro::rive {
 
@@ -35,14 +35,14 @@ namespace margelo::nitro::rive {
   class HybridViewModelColorPropertySpecSwift: public virtual HybridViewModelColorPropertySpec, public virtual HybridViewModelPropertySpecSwift {
   public:
     // Constructor from a Swift instance
-    explicit HybridViewModelColorPropertySpecSwift(const Rive::HybridViewModelColorPropertySpec_cxx& swiftPart):
+    explicit HybridViewModelColorPropertySpecSwift(const react_native_rive::HybridViewModelColorPropertySpec_cxx& swiftPart):
       HybridObject(HybridViewModelColorPropertySpec::TAG),
       HybridViewModelPropertySpecSwift(swiftPart),
       _swiftPart(swiftPart) { }
 
   public:
     // Get the Swift part
-    inline Rive::HybridViewModelColorPropertySpec_cxx& getSwiftPart() noexcept {
+    inline react_native_rive::HybridViewModelColorPropertySpec_cxx& getSwiftPart() noexcept {
       return _swiftPart;
     }
 
@@ -82,7 +82,7 @@ namespace margelo::nitro::rive {
     }
 
   private:
-    Rive::HybridViewModelColorPropertySpec_cxx _swiftPart;
+    react_native_rive::HybridViewModelColorPropertySpec_cxx _swiftPart;
   };
 
 } // namespace margelo::nitro::rive
diff --git a/nitrogen/generated/ios/c++/HybridViewModelEnumPropertySpecSwift.hpp b/nitrogen/generated/ios/c++/HybridViewModelEnumPropertySpecSwift.hpp
index 9a934321..628e6f10 100644
--- a/nitrogen/generated/ios/c++/HybridViewModelEnumPropertySpecSwift.hpp
+++ b/nitrogen/generated/ios/c++/HybridViewModelEnumPropertySpecSwift.hpp
@@ -10,7 +10,7 @@
 #include "HybridViewModelEnumPropertySpec.hpp"
 
 // Forward declaration of `HybridViewModelEnumPropertySpec_cxx` to properly resolve imports.
-namespace Rive { class HybridViewModelEnumPropertySpec_cxx; }
+namespace react_native_rive { class HybridViewModelEnumPropertySpec_cxx; }
 
 // Forward declaration of `HybridViewModelPropertySpecSwift` to properly resolve imports.
 namespace margelo::nitro::rive { class HybridViewModelPropertySpecSwift; }
@@ -19,7 +19,7 @@ namespace margelo::nitro::rive { class HybridViewModelPropertySpecSwift; }
 #include <functional>
 #include "HybridViewModelPropertySpecSwift.hpp"
 
-#include "Rive-Swift-Cxx-Umbrella.hpp"
+#include "react_native_rive-Swift-Cxx-Umbrella.hpp"
 
 namespace margelo::nitro::rive {
 
@@ -36,14 +36,14 @@ namespace margelo::nitro::rive {
   class HybridViewModelEnumPropertySpecSwift: public virtual HybridViewModelEnumPropertySpec, public virtual HybridViewModelPropertySpecSwift {
   public:
     // Constructor from a Swift instance
-    explicit HybridViewModelEnumPropertySpecSwift(const Rive::HybridViewModelEnumPropertySpec_cxx& swiftPart):
+    explicit HybridViewModelEnumPropertySpecSwift(const react_native_rive::HybridViewModelEnumPropertySpec_cxx& swiftPart):
       HybridObject(HybridViewModelEnumPropertySpec::TAG),
       HybridViewModelPropertySpecSwift(swiftPart),
       _swiftPart(swiftPart) { }
 
   public:
     // Get the Swift part
-    inline Rive::HybridViewModelEnumPropertySpec_cxx& getSwiftPart() noexcept {
+    inline react_native_rive::HybridViewModelEnumPropertySpec_cxx& getSwiftPart() noexcept {
       return _swiftPart;
     }
 
@@ -84,7 +84,7 @@ namespace margelo::nitro::rive {
     }
 
   private:
-    Rive::HybridViewModelEnumPropertySpec_cxx _swiftPart;
+    react_native_rive::HybridViewModelEnumPropertySpec_cxx _swiftPart;
   };
 
 } // namespace margelo::nitro::rive
diff --git a/nitrogen/generated/ios/c++/HybridViewModelInstanceSpecSwift.hpp b/nitrogen/generated/ios/c++/HybridViewModelInstanceSpecSwift.hpp
index 128ec856..4cfa00fe 100644
--- a/nitrogen/generated/ios/c++/HybridViewModelInstanceSpecSwift.hpp
+++ b/nitrogen/generated/ios/c++/HybridViewModelInstanceSpecSwift.hpp
@@ -10,7 +10,7 @@
 #include "HybridViewModelInstanceSpec.hpp"
 
 // Forward declaration of `HybridViewModelInstanceSpec_cxx` to properly resolve imports.
-namespace Rive { class HybridViewModelInstanceSpec_cxx; }
+namespace react_native_rive { class HybridViewModelInstanceSpec_cxx; }
 
 // Forward declaration of `HybridViewModelNumberPropertySpec` to properly resolve imports.
 namespace margelo::nitro::rive { class HybridViewModelNumberPropertySpec; }
@@ -35,7 +35,7 @@ namespace margelo::nitro::rive { class HybridViewModelTriggerPropertySpec; }
 #include "HybridViewModelEnumPropertySpec.hpp"
 #include "HybridViewModelTriggerPropertySpec.hpp"
 
-#include "Rive-Swift-Cxx-Umbrella.hpp"
+#include "react_native_rive-Swift-Cxx-Umbrella.hpp"
 
 namespace margelo::nitro::rive {
 
@@ -52,13 +52,13 @@ namespace margelo::nitro::rive {
   class HybridViewModelInstanceSpecSwift: public virtual HybridViewModelInstanceSpec {
   public:
     // Constructor from a Swift instance
-    explicit HybridViewModelInstanceSpecSwift(const Rive::HybridViewModelInstanceSpec_cxx& swiftPart):
+    explicit HybridViewModelInstanceSpecSwift(const react_native_rive::HybridViewModelInstanceSpec_cxx& swiftPart):
       HybridObject(HybridViewModelInstanceSpec::TAG),
       _swiftPart(swiftPart) { }
 
   public:
     // Get the Swift part
-    inline Rive::HybridViewModelInstanceSpec_cxx& getSwiftPart() noexcept {
+    inline react_native_rive::HybridViewModelInstanceSpec_cxx& getSwiftPart() noexcept {
       return _swiftPart;
     }
 
@@ -132,7 +132,7 @@ namespace margelo::nitro::rive {
     }
 
   private:
-    Rive::HybridViewModelInstanceSpec_cxx _swiftPart;
+    react_native_rive::HybridViewModelInstanceSpec_cxx _swiftPart;
   };
 
 } // namespace margelo::nitro::rive
diff --git a/nitrogen/generated/ios/c++/HybridViewModelNumberPropertySpecSwift.hpp b/nitrogen/generated/ios/c++/HybridViewModelNumberPropertySpecSwift.hpp
index 908cedb3..08677579 100644
--- a/nitrogen/generated/ios/c++/HybridViewModelNumberPropertySpecSwift.hpp
+++ b/nitrogen/generated/ios/c++/HybridViewModelNumberPropertySpecSwift.hpp
@@ -10,7 +10,7 @@
 #include "HybridViewModelNumberPropertySpec.hpp"
 
 // Forward declaration of `HybridViewModelNumberPropertySpec_cxx` to properly resolve imports.
-namespace Rive { class HybridViewModelNumberPropertySpec_cxx; }
+namespace react_native_rive { class HybridViewModelNumberPropertySpec_cxx; }
 
 // Forward declaration of `HybridViewModelPropertySpecSwift` to properly resolve imports.
 namespace margelo::nitro::rive { class HybridViewModelPropertySpecSwift; }
@@ -18,7 +18,7 @@ namespace margelo::nitro::rive { class HybridViewModelPropertySpecSwift; }
 #include <functional>
 #include "HybridViewModelPropertySpecSwift.hpp"
 
-#include "Rive-Swift-Cxx-Umbrella.hpp"
+#include "react_native_rive-Swift-Cxx-Umbrella.hpp"
 
 namespace margelo::nitro::rive {
 
@@ -35,14 +35,14 @@ namespace margelo::nitro::rive {
   class HybridViewModelNumberPropertySpecSwift: public virtual HybridViewModelNumberPropertySpec, public virtual HybridViewModelPropertySpecSwift {
   public:
     // Constructor from a Swift instance
-    explicit HybridViewModelNumberPropertySpecSwift(const Rive::HybridViewModelNumberPropertySpec_cxx& swiftPart):
+    explicit HybridViewModelNumberPropertySpecSwift(const react_native_rive::HybridViewModelNumberPropertySpec_cxx& swiftPart):
       HybridObject(HybridViewModelNumberPropertySpec::TAG),
       HybridViewModelPropertySpecSwift(swiftPart),
       _swiftPart(swiftPart) { }
 
   public:
     // Get the Swift part
-    inline Rive::HybridViewModelNumberPropertySpec_cxx& getSwiftPart() noexcept {
+    inline react_native_rive::HybridViewModelNumberPropertySpec_cxx& getSwiftPart() noexcept {
       return _swiftPart;
     }
 
@@ -82,7 +82,7 @@ namespace margelo::nitro::rive {
     }
 
   private:
-    Rive::HybridViewModelNumberPropertySpec_cxx _swiftPart;
+    react_native_rive::HybridViewModelNumberPropertySpec_cxx _swiftPart;
   };
 
 } // namespace margelo::nitro::rive
diff --git a/nitrogen/generated/ios/c++/HybridViewModelPropertySpecSwift.hpp b/nitrogen/generated/ios/c++/HybridViewModelPropertySpecSwift.hpp
index 91b71d94..b8b90e16 100644
--- a/nitrogen/generated/ios/c++/HybridViewModelPropertySpecSwift.hpp
+++ b/nitrogen/generated/ios/c++/HybridViewModelPropertySpecSwift.hpp
@@ -10,13 +10,13 @@
 #include "HybridViewModelPropertySpec.hpp"
 
 // Forward declaration of `HybridViewModelPropertySpec_cxx` to properly resolve imports.
-namespace Rive { class HybridViewModelPropertySpec_cxx; }
+namespace react_native_rive { class HybridViewModelPropertySpec_cxx; }
 
 
 
 
 
-#include "Rive-Swift-Cxx-Umbrella.hpp"
+#include "react_native_rive-Swift-Cxx-Umbrella.hpp"
 
 namespace margelo::nitro::rive {
 
@@ -33,13 +33,13 @@ namespace margelo::nitro::rive {
   class HybridViewModelPropertySpecSwift: public virtual HybridViewModelPropertySpec {
   public:
     // Constructor from a Swift instance
-    explicit HybridViewModelPropertySpecSwift(const Rive::HybridViewModelPropertySpec_cxx& swiftPart):
+    explicit HybridViewModelPropertySpecSwift(const react_native_rive::HybridViewModelPropertySpec_cxx& swiftPart):
       HybridObject(HybridViewModelPropertySpec::TAG),
       _swiftPart(swiftPart) { }
 
   public:
     // Get the Swift part
-    inline Rive::HybridViewModelPropertySpec_cxx& getSwiftPart() noexcept {
+    inline react_native_rive::HybridViewModelPropertySpec_cxx& getSwiftPart() noexcept {
       return _swiftPart;
     }
 
@@ -63,7 +63,7 @@ namespace margelo::nitro::rive {
     
 
   private:
-    Rive::HybridViewModelPropertySpec_cxx _swiftPart;
+    react_native_rive::HybridViewModelPropertySpec_cxx _swiftPart;
   };
 
 } // namespace margelo::nitro::rive
diff --git a/nitrogen/generated/ios/c++/HybridViewModelSpecSwift.hpp b/nitrogen/generated/ios/c++/HybridViewModelSpecSwift.hpp
index cbcd0b66..d00d191c 100644
--- a/nitrogen/generated/ios/c++/HybridViewModelSpecSwift.hpp
+++ b/nitrogen/generated/ios/c++/HybridViewModelSpecSwift.hpp
@@ -10,7 +10,7 @@
 #include "HybridViewModelSpec.hpp"
 
 // Forward declaration of `HybridViewModelSpec_cxx` to properly resolve imports.
-namespace Rive { class HybridViewModelSpec_cxx; }
+namespace react_native_rive { class HybridViewModelSpec_cxx; }
 
 // Forward declaration of `HybridViewModelInstanceSpec` to properly resolve imports.
 namespace margelo::nitro::rive { class HybridViewModelInstanceSpec; }
@@ -20,7 +20,7 @@ namespace margelo::nitro::rive { class HybridViewModelInstanceSpec; }
 #include "HybridViewModelInstanceSpec.hpp"
 #include <optional>
 
-#include "Rive-Swift-Cxx-Umbrella.hpp"
+#include "react_native_rive-Swift-Cxx-Umbrella.hpp"
 
 namespace margelo::nitro::rive {
 
@@ -37,13 +37,13 @@ namespace margelo::nitro::rive {
   class HybridViewModelSpecSwift: public virtual HybridViewModelSpec {
   public:
     // Constructor from a Swift instance
-    explicit HybridViewModelSpecSwift(const Rive::HybridViewModelSpec_cxx& swiftPart):
+    explicit HybridViewModelSpecSwift(const react_native_rive::HybridViewModelSpec_cxx& swiftPart):
       HybridObject(HybridViewModelSpec::TAG),
       _swiftPart(swiftPart) { }
 
   public:
     // Get the Swift part
-    inline Rive::HybridViewModelSpec_cxx& getSwiftPart() noexcept {
+    inline react_native_rive::HybridViewModelSpec_cxx& getSwiftPart() noexcept {
       return _swiftPart;
     }
 
@@ -107,7 +107,7 @@ namespace margelo::nitro::rive {
     }
 
   private:
-    Rive::HybridViewModelSpec_cxx _swiftPart;
+    react_native_rive::HybridViewModelSpec_cxx _swiftPart;
   };
 
 } // namespace margelo::nitro::rive
diff --git a/nitrogen/generated/ios/c++/HybridViewModelStringPropertySpecSwift.hpp b/nitrogen/generated/ios/c++/HybridViewModelStringPropertySpecSwift.hpp
index 33e421af..ff4d125b 100644
--- a/nitrogen/generated/ios/c++/HybridViewModelStringPropertySpecSwift.hpp
+++ b/nitrogen/generated/ios/c++/HybridViewModelStringPropertySpecSwift.hpp
@@ -10,7 +10,7 @@
 #include "HybridViewModelStringPropertySpec.hpp"
 
 // Forward declaration of `HybridViewModelStringPropertySpec_cxx` to properly resolve imports.
-namespace Rive { class HybridViewModelStringPropertySpec_cxx; }
+namespace react_native_rive { class HybridViewModelStringPropertySpec_cxx; }
 
 // Forward declaration of `HybridViewModelPropertySpecSwift` to properly resolve imports.
 namespace margelo::nitro::rive { class HybridViewModelPropertySpecSwift; }
@@ -19,7 +19,7 @@ namespace margelo::nitro::rive { class HybridViewModelPropertySpecSwift; }
 #include <functional>
 #include "HybridViewModelPropertySpecSwift.hpp"
 
-#include "Rive-Swift-Cxx-Umbrella.hpp"
+#include "react_native_rive-Swift-Cxx-Umbrella.hpp"
 
 namespace margelo::nitro::rive {
 
@@ -36,14 +36,14 @@ namespace margelo::nitro::rive {
   class HybridViewModelStringPropertySpecSwift: public virtual HybridViewModelStringPropertySpec, public virtual HybridViewModelPropertySpecSwift {
   public:
     // Constructor from a Swift instance
-    explicit HybridViewModelStringPropertySpecSwift(const Rive::HybridViewModelStringPropertySpec_cxx& swiftPart):
+    explicit HybridViewModelStringPropertySpecSwift(const react_native_rive::HybridViewModelStringPropertySpec_cxx& swiftPart):
       HybridObject(HybridViewModelStringPropertySpec::TAG),
       HybridViewModelPropertySpecSwift(swiftPart),
       _swiftPart(swiftPart) { }
 
   public:
     // Get the Swift part
-    inline Rive::HybridViewModelStringPropertySpec_cxx& getSwiftPart() noexcept {
+    inline react_native_rive::HybridViewModelStringPropertySpec_cxx& getSwiftPart() noexcept {
       return _swiftPart;
     }
 
@@ -84,7 +84,7 @@ namespace margelo::nitro::rive {
     }
 
   private:
-    Rive::HybridViewModelStringPropertySpec_cxx _swiftPart;
+    react_native_rive::HybridViewModelStringPropertySpec_cxx _swiftPart;
   };
 
 } // namespace margelo::nitro::rive
diff --git a/nitrogen/generated/ios/c++/HybridViewModelTriggerPropertySpecSwift.hpp b/nitrogen/generated/ios/c++/HybridViewModelTriggerPropertySpecSwift.hpp
index 906190a3..e147f2f1 100644
--- a/nitrogen/generated/ios/c++/HybridViewModelTriggerPropertySpecSwift.hpp
+++ b/nitrogen/generated/ios/c++/HybridViewModelTriggerPropertySpecSwift.hpp
@@ -10,7 +10,7 @@
 #include "HybridViewModelTriggerPropertySpec.hpp"
 
 // Forward declaration of `HybridViewModelTriggerPropertySpec_cxx` to properly resolve imports.
-namespace Rive { class HybridViewModelTriggerPropertySpec_cxx; }
+namespace react_native_rive { class HybridViewModelTriggerPropertySpec_cxx; }
 
 // Forward declaration of `HybridViewModelPropertySpecSwift` to properly resolve imports.
 namespace margelo::nitro::rive { class HybridViewModelPropertySpecSwift; }
@@ -18,7 +18,7 @@ namespace margelo::nitro::rive { class HybridViewModelPropertySpecSwift; }
 #include <functional>
 #include "HybridViewModelPropertySpecSwift.hpp"
 
-#include "Rive-Swift-Cxx-Umbrella.hpp"
+#include "react_native_rive-Swift-Cxx-Umbrella.hpp"
 
 namespace margelo::nitro::rive {
 
@@ -35,14 +35,14 @@ namespace margelo::nitro::rive {
   class HybridViewModelTriggerPropertySpecSwift: public virtual HybridViewModelTriggerPropertySpec, public virtual HybridViewModelPropertySpecSwift {
   public:
     // Constructor from a Swift instance
-    explicit HybridViewModelTriggerPropertySpecSwift(const Rive::HybridViewModelTriggerPropertySpec_cxx& swiftPart):
+    explicit HybridViewModelTriggerPropertySpecSwift(const react_native_rive::HybridViewModelTriggerPropertySpec_cxx& swiftPart):
       HybridObject(HybridViewModelTriggerPropertySpec::TAG),
       HybridViewModelPropertySpecSwift(swiftPart),
       _swiftPart(swiftPart) { }
 
   public:
     // Get the Swift part
-    inline Rive::HybridViewModelTriggerPropertySpec_cxx& getSwiftPart() noexcept {
+    inline react_native_rive::HybridViewModelTriggerPropertySpec_cxx& getSwiftPart() noexcept {
       return _swiftPart;
     }
 
@@ -83,7 +83,7 @@ namespace margelo::nitro::rive {
     }
 
   private:
-    Rive::HybridViewModelTriggerPropertySpec_cxx _swiftPart;
+    react_native_rive::HybridViewModelTriggerPropertySpec_cxx _swiftPart;
   };
 
 } // namespace margelo::nitro::rive
diff --git a/nitrogen/generated/ios/c++/views/HybridRiveViewComponent.mm b/nitrogen/generated/ios/c++/views/HybridRiveViewComponent.mm
index 0c4d01bd..01607d5b 100644
--- a/nitrogen/generated/ios/c++/views/HybridRiveViewComponent.mm
+++ b/nitrogen/generated/ios/c++/views/HybridRiveViewComponent.mm
@@ -15,7 +15,7 @@
 #import <UIKit/UIKit.h>
 
 #import "HybridRiveViewSpecSwift.hpp"
-#import "Rive-Swift-Cxx-Umbrella.hpp"
+#import "react_native_rive-Swift-Cxx-Umbrella.hpp"
 
 using namespace facebook;
 using namespace margelo::nitro::rive;
@@ -42,7 +42,7 @@ + (void) load {
 
 - (instancetype) init {
   if (self = [super init]) {
-    std::shared_ptr<HybridRiveViewSpec> hybridView = Rive::RiveAutolinking::createRiveView();
+    std::shared_ptr<HybridRiveViewSpec> hybridView = react_native_rive::react_native_riveAutolinking::createRiveView();
     _hybridView = std::dynamic_pointer_cast<HybridRiveViewSpecSwift>(hybridView);
     [self updateView];
   }
@@ -51,7 +51,7 @@ - (instancetype) init {
 
 - (void) updateView {
   // 1. Get Swift part
-  Rive::HybridRiveViewSpec_cxx& swiftPart = _hybridView->getSwiftPart();
+  react_native_rive::HybridRiveViewSpec_cxx& swiftPart = _hybridView->getSwiftPart();
 
   // 2. Get UIView*
   void* viewUnsafe = swiftPart.getView();
@@ -66,7 +66,7 @@ - (void) updateProps:(const std::shared_ptr<const react::Props>&)props
   // 1. Downcast props
   const auto& newViewPropsConst = *std::static_pointer_cast<HybridRiveViewProps const>(props);
   auto& newViewProps = const_cast<HybridRiveViewProps&>(newViewPropsConst);
-  Rive::HybridRiveViewSpec_cxx& swiftPart = _hybridView->getSwiftPart();
+  react_native_rive::HybridRiveViewSpec_cxx& swiftPart = _hybridView->getSwiftPart();
 
   // 2. Update each prop individually
   swiftPart.beforeUpdate();
diff --git a/nitrogen/generated/ios/Rive+autolinking.rb b/nitrogen/generated/ios/react_native_rive+autolinking.rb
similarity index 87%
rename from nitrogen/generated/ios/Rive+autolinking.rb
rename to nitrogen/generated/ios/react_native_rive+autolinking.rb
index 1c13c510..a5ccfcac 100644
--- a/nitrogen/generated/ios/Rive+autolinking.rb
+++ b/nitrogen/generated/ios/react_native_rive+autolinking.rb
@@ -1,5 +1,5 @@
 #
-# Rive+autolinking.rb
+# react_native_rive+autolinking.rb
 # This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 # https://github.com/mrousavy/nitro
 # Copyright © 2025 Marc Rousavy @ Margelo
@@ -14,13 +14,13 @@
 #   # ...
 #
 #   # Add all files generated by Nitrogen
-#   load 'nitrogen/generated/ios/Rive+autolinking.rb'
+#   load 'nitrogen/generated/ios/react_native_rive+autolinking.rb'
 #   add_nitrogen_files(spec)
 # end
 # ```
 
 def add_nitrogen_files(spec)
-  Pod::UI.puts "[NitroModules] 🔥 Rive is boosted by nitro!"
+  Pod::UI.puts "[NitroModules] 🔥 react_native_rive is boosted by nitro!"
 
   spec.dependency "NitroModules"
 
@@ -37,7 +37,7 @@ def add_nitrogen_files(spec)
     # Generated specs
     "nitrogen/generated/shared/**/*.{h,hpp}",
     # Swift to C++ bridging helpers
-    "nitrogen/generated/ios/Rive-Swift-Cxx-Bridge.hpp"
+    "nitrogen/generated/ios/react_native_rive-Swift-Cxx-Bridge.hpp"
   ]
 
   current_private_header_files = Array(spec.attributes_hash['private_header_files'])
diff --git a/nitrogen/generated/ios/Rive-Swift-Cxx-Bridge.cpp b/nitrogen/generated/ios/react_native_rive-Swift-Cxx-Bridge.cpp
similarity index 78%
rename from nitrogen/generated/ios/Rive-Swift-Cxx-Bridge.cpp
rename to nitrogen/generated/ios/react_native_rive-Swift-Cxx-Bridge.cpp
index 9d3686b8..4ce34ca9 100644
--- a/nitrogen/generated/ios/Rive-Swift-Cxx-Bridge.cpp
+++ b/nitrogen/generated/ios/react_native_rive-Swift-Cxx-Bridge.cpp
@@ -1,11 +1,11 @@
 ///
-/// Rive-Swift-Cxx-Bridge.cpp
+/// react_native_rive-Swift-Cxx-Bridge.cpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
 /// Copyright © 2025 Marc Rousavy @ Margelo
 ///
 
-#include "Rive-Swift-Cxx-Bridge.hpp"
+#include "react_native_rive-Swift-Cxx-Bridge.hpp"
 
 // Include C++ implementation defined types
 #include "HybridRiveFileFactorySpecSwift.hpp"
@@ -21,13 +21,13 @@
 #include "HybridViewModelSpecSwift.hpp"
 #include "HybridViewModelStringPropertySpecSwift.hpp"
 #include "HybridViewModelTriggerPropertySpecSwift.hpp"
-#include "Rive-Swift-Cxx-Umbrella.hpp"
+#include "react_native_rive-Swift-Cxx-Umbrella.hpp"
 
 namespace margelo::nitro::rive::bridge::swift {
 
   // pragma MARK: std::shared_ptr<HybridRiveSpec>
   std::shared_ptr<HybridRiveSpec> create_std__shared_ptr_HybridRiveSpec_(void* NON_NULL swiftUnsafePointer) noexcept {
-    Rive::HybridRiveSpec_cxx swiftPart = Rive::HybridRiveSpec_cxx::fromUnsafe(swiftUnsafePointer);
+    react_native_rive::HybridRiveSpec_cxx swiftPart = react_native_rive::HybridRiveSpec_cxx::fromUnsafe(swiftUnsafePointer);
     return std::make_shared<margelo::nitro::rive::HybridRiveSpecSwift>(swiftPart);
   }
   void* NON_NULL get_std__shared_ptr_HybridRiveSpec_(std__shared_ptr_HybridRiveSpec_ cppType) {
@@ -37,13 +37,13 @@ namespace margelo::nitro::rive::bridge::swift {
       throw std::runtime_error("Class \"HybridRiveSpec\" is not implemented in Swift!");
     }
     #endif
-    Rive::HybridRiveSpec_cxx& swiftPart = swiftWrapper->getSwiftPart();
+    react_native_rive::HybridRiveSpec_cxx& swiftPart = swiftWrapper->getSwiftPart();
     return swiftPart.toUnsafe();
   }
   
   // pragma MARK: std::shared_ptr<HybridViewModelSpec>
   std::shared_ptr<HybridViewModelSpec> create_std__shared_ptr_HybridViewModelSpec_(void* NON_NULL swiftUnsafePointer) noexcept {
-    Rive::HybridViewModelSpec_cxx swiftPart = Rive::HybridViewModelSpec_cxx::fromUnsafe(swiftUnsafePointer);
+    react_native_rive::HybridViewModelSpec_cxx swiftPart = react_native_rive::HybridViewModelSpec_cxx::fromUnsafe(swiftUnsafePointer);
     return std::make_shared<margelo::nitro::rive::HybridViewModelSpecSwift>(swiftPart);
   }
   void* NON_NULL get_std__shared_ptr_HybridViewModelSpec_(std__shared_ptr_HybridViewModelSpec_ cppType) {
@@ -53,13 +53,13 @@ namespace margelo::nitro::rive::bridge::swift {
       throw std::runtime_error("Class \"HybridViewModelSpec\" is not implemented in Swift!");
     }
     #endif
-    Rive::HybridViewModelSpec_cxx& swiftPart = swiftWrapper->getSwiftPart();
+    react_native_rive::HybridViewModelSpec_cxx& swiftPart = swiftWrapper->getSwiftPart();
     return swiftPart.toUnsafe();
   }
   
   // pragma MARK: std::shared_ptr<HybridRiveFileSpec>
   std::shared_ptr<HybridRiveFileSpec> create_std__shared_ptr_HybridRiveFileSpec_(void* NON_NULL swiftUnsafePointer) noexcept {
-    Rive::HybridRiveFileSpec_cxx swiftPart = Rive::HybridRiveFileSpec_cxx::fromUnsafe(swiftUnsafePointer);
+    react_native_rive::HybridRiveFileSpec_cxx swiftPart = react_native_rive::HybridRiveFileSpec_cxx::fromUnsafe(swiftUnsafePointer);
     return std::make_shared<margelo::nitro::rive::HybridRiveFileSpecSwift>(swiftPart);
   }
   void* NON_NULL get_std__shared_ptr_HybridRiveFileSpec_(std__shared_ptr_HybridRiveFileSpec_ cppType) {
@@ -69,13 +69,13 @@ namespace margelo::nitro::rive::bridge::swift {
       throw std::runtime_error("Class \"HybridRiveFileSpec\" is not implemented in Swift!");
     }
     #endif
-    Rive::HybridRiveFileSpec_cxx& swiftPart = swiftWrapper->getSwiftPart();
+    react_native_rive::HybridRiveFileSpec_cxx& swiftPart = swiftWrapper->getSwiftPart();
     return swiftPart.toUnsafe();
   }
   
   // pragma MARK: std::function<void(const std::shared_ptr<HybridRiveFileSpec>& /* result */)>
   Func_void_std__shared_ptr_HybridRiveFileSpec_ create_Func_void_std__shared_ptr_HybridRiveFileSpec_(void* NON_NULL swiftClosureWrapper) noexcept {
-    auto swiftClosure = Rive::Func_void_std__shared_ptr_HybridRiveFileSpec_::fromUnsafe(swiftClosureWrapper);
+    auto swiftClosure = react_native_rive::Func_void_std__shared_ptr_HybridRiveFileSpec_::fromUnsafe(swiftClosureWrapper);
     return [swiftClosure = std::move(swiftClosure)](const std::shared_ptr<HybridRiveFileSpec>& result) mutable -> void {
       swiftClosure.call(result);
     };
@@ -83,7 +83,7 @@ namespace margelo::nitro::rive::bridge::swift {
   
   // pragma MARK: std::function<void(const std::exception_ptr& /* error */)>
   Func_void_std__exception_ptr create_Func_void_std__exception_ptr(void* NON_NULL swiftClosureWrapper) noexcept {
-    auto swiftClosure = Rive::Func_void_std__exception_ptr::fromUnsafe(swiftClosureWrapper);
+    auto swiftClosure = react_native_rive::Func_void_std__exception_ptr::fromUnsafe(swiftClosureWrapper);
     return [swiftClosure = std::move(swiftClosure)](const std::exception_ptr& error) mutable -> void {
       swiftClosure.call(error);
     };
@@ -91,7 +91,7 @@ namespace margelo::nitro::rive::bridge::swift {
   
   // pragma MARK: std::shared_ptr<HybridRiveFileFactorySpec>
   std::shared_ptr<HybridRiveFileFactorySpec> create_std__shared_ptr_HybridRiveFileFactorySpec_(void* NON_NULL swiftUnsafePointer) noexcept {
-    Rive::HybridRiveFileFactorySpec_cxx swiftPart = Rive::HybridRiveFileFactorySpec_cxx::fromUnsafe(swiftUnsafePointer);
+    react_native_rive::HybridRiveFileFactorySpec_cxx swiftPart = react_native_rive::HybridRiveFileFactorySpec_cxx::fromUnsafe(swiftUnsafePointer);
     return std::make_shared<margelo::nitro::rive::HybridRiveFileFactorySpecSwift>(swiftPart);
   }
   void* NON_NULL get_std__shared_ptr_HybridRiveFileFactorySpec_(std__shared_ptr_HybridRiveFileFactorySpec_ cppType) {
@@ -101,13 +101,13 @@ namespace margelo::nitro::rive::bridge::swift {
       throw std::runtime_error("Class \"HybridRiveFileFactorySpec\" is not implemented in Swift!");
     }
     #endif
-    Rive::HybridRiveFileFactorySpec_cxx& swiftPart = swiftWrapper->getSwiftPart();
+    react_native_rive::HybridRiveFileFactorySpec_cxx& swiftPart = swiftWrapper->getSwiftPart();
     return swiftPart.toUnsafe();
   }
   
   // pragma MARK: std::shared_ptr<HybridViewModelInstanceSpec>
   std::shared_ptr<HybridViewModelInstanceSpec> create_std__shared_ptr_HybridViewModelInstanceSpec_(void* NON_NULL swiftUnsafePointer) noexcept {
-    Rive::HybridViewModelInstanceSpec_cxx swiftPart = Rive::HybridViewModelInstanceSpec_cxx::fromUnsafe(swiftUnsafePointer);
+    react_native_rive::HybridViewModelInstanceSpec_cxx swiftPart = react_native_rive::HybridViewModelInstanceSpec_cxx::fromUnsafe(swiftUnsafePointer);
     return std::make_shared<margelo::nitro::rive::HybridViewModelInstanceSpecSwift>(swiftPart);
   }
   void* NON_NULL get_std__shared_ptr_HybridViewModelInstanceSpec_(std__shared_ptr_HybridViewModelInstanceSpec_ cppType) {
@@ -117,13 +117,13 @@ namespace margelo::nitro::rive::bridge::swift {
       throw std::runtime_error("Class \"HybridViewModelInstanceSpec\" is not implemented in Swift!");
     }
     #endif
-    Rive::HybridViewModelInstanceSpec_cxx& swiftPart = swiftWrapper->getSwiftPart();
+    react_native_rive::HybridViewModelInstanceSpec_cxx& swiftPart = swiftWrapper->getSwiftPart();
     return swiftPart.toUnsafe();
   }
   
   // pragma MARK: std::function<void(bool /* result */)>
   Func_void_bool create_Func_void_bool(void* NON_NULL swiftClosureWrapper) noexcept {
-    auto swiftClosure = Rive::Func_void_bool::fromUnsafe(swiftClosureWrapper);
+    auto swiftClosure = react_native_rive::Func_void_bool::fromUnsafe(swiftClosureWrapper);
     return [swiftClosure = std::move(swiftClosure)](bool result) mutable -> void {
       swiftClosure.call(result);
     };
@@ -131,7 +131,7 @@ namespace margelo::nitro::rive::bridge::swift {
   
   // pragma MARK: std::function<void(const UnifiedRiveEvent& /* event */)>
   Func_void_UnifiedRiveEvent create_Func_void_UnifiedRiveEvent(void* NON_NULL swiftClosureWrapper) noexcept {
-    auto swiftClosure = Rive::Func_void_UnifiedRiveEvent::fromUnsafe(swiftClosureWrapper);
+    auto swiftClosure = react_native_rive::Func_void_UnifiedRiveEvent::fromUnsafe(swiftClosureWrapper);
     return [swiftClosure = std::move(swiftClosure)](const UnifiedRiveEvent& event) mutable -> void {
       swiftClosure.call(event);
     };
@@ -139,7 +139,7 @@ namespace margelo::nitro::rive::bridge::swift {
   
   // pragma MARK: std::shared_ptr<HybridRiveViewSpec>
   std::shared_ptr<HybridRiveViewSpec> create_std__shared_ptr_HybridRiveViewSpec_(void* NON_NULL swiftUnsafePointer) noexcept {
-    Rive::HybridRiveViewSpec_cxx swiftPart = Rive::HybridRiveViewSpec_cxx::fromUnsafe(swiftUnsafePointer);
+    react_native_rive::HybridRiveViewSpec_cxx swiftPart = react_native_rive::HybridRiveViewSpec_cxx::fromUnsafe(swiftUnsafePointer);
     return std::make_shared<margelo::nitro::rive::HybridRiveViewSpecSwift>(swiftPart);
   }
   void* NON_NULL get_std__shared_ptr_HybridRiveViewSpec_(std__shared_ptr_HybridRiveViewSpec_ cppType) {
@@ -149,13 +149,13 @@ namespace margelo::nitro::rive::bridge::swift {
       throw std::runtime_error("Class \"HybridRiveViewSpec\" is not implemented in Swift!");
     }
     #endif
-    Rive::HybridRiveViewSpec_cxx& swiftPart = swiftWrapper->getSwiftPart();
+    react_native_rive::HybridRiveViewSpec_cxx& swiftPart = swiftWrapper->getSwiftPart();
     return swiftPart.toUnsafe();
   }
   
   // pragma MARK: std::shared_ptr<HybridViewModelPropertySpec>
   std::shared_ptr<HybridViewModelPropertySpec> create_std__shared_ptr_HybridViewModelPropertySpec_(void* NON_NULL swiftUnsafePointer) noexcept {
-    Rive::HybridViewModelPropertySpec_cxx swiftPart = Rive::HybridViewModelPropertySpec_cxx::fromUnsafe(swiftUnsafePointer);
+    react_native_rive::HybridViewModelPropertySpec_cxx swiftPart = react_native_rive::HybridViewModelPropertySpec_cxx::fromUnsafe(swiftUnsafePointer);
     return std::make_shared<margelo::nitro::rive::HybridViewModelPropertySpecSwift>(swiftPart);
   }
   void* NON_NULL get_std__shared_ptr_HybridViewModelPropertySpec_(std__shared_ptr_HybridViewModelPropertySpec_ cppType) {
@@ -165,13 +165,13 @@ namespace margelo::nitro::rive::bridge::swift {
       throw std::runtime_error("Class \"HybridViewModelPropertySpec\" is not implemented in Swift!");
     }
     #endif
-    Rive::HybridViewModelPropertySpec_cxx& swiftPart = swiftWrapper->getSwiftPart();
+    react_native_rive::HybridViewModelPropertySpec_cxx& swiftPart = swiftWrapper->getSwiftPart();
     return swiftPart.toUnsafe();
   }
   
   // pragma MARK: std::shared_ptr<HybridViewModelNumberPropertySpec>
   std::shared_ptr<HybridViewModelNumberPropertySpec> create_std__shared_ptr_HybridViewModelNumberPropertySpec_(void* NON_NULL swiftUnsafePointer) noexcept {
-    Rive::HybridViewModelNumberPropertySpec_cxx swiftPart = Rive::HybridViewModelNumberPropertySpec_cxx::fromUnsafe(swiftUnsafePointer);
+    react_native_rive::HybridViewModelNumberPropertySpec_cxx swiftPart = react_native_rive::HybridViewModelNumberPropertySpec_cxx::fromUnsafe(swiftUnsafePointer);
     return std::make_shared<margelo::nitro::rive::HybridViewModelNumberPropertySpecSwift>(swiftPart);
   }
   void* NON_NULL get_std__shared_ptr_HybridViewModelNumberPropertySpec_(std__shared_ptr_HybridViewModelNumberPropertySpec_ cppType) {
@@ -181,13 +181,13 @@ namespace margelo::nitro::rive::bridge::swift {
       throw std::runtime_error("Class \"HybridViewModelNumberPropertySpec\" is not implemented in Swift!");
     }
     #endif
-    Rive::HybridViewModelNumberPropertySpec_cxx& swiftPart = swiftWrapper->getSwiftPart();
+    react_native_rive::HybridViewModelNumberPropertySpec_cxx& swiftPart = swiftWrapper->getSwiftPart();
     return swiftPart.toUnsafe();
   }
   
   // pragma MARK: std::shared_ptr<HybridViewModelStringPropertySpec>
   std::shared_ptr<HybridViewModelStringPropertySpec> create_std__shared_ptr_HybridViewModelStringPropertySpec_(void* NON_NULL swiftUnsafePointer) noexcept {
-    Rive::HybridViewModelStringPropertySpec_cxx swiftPart = Rive::HybridViewModelStringPropertySpec_cxx::fromUnsafe(swiftUnsafePointer);
+    react_native_rive::HybridViewModelStringPropertySpec_cxx swiftPart = react_native_rive::HybridViewModelStringPropertySpec_cxx::fromUnsafe(swiftUnsafePointer);
     return std::make_shared<margelo::nitro::rive::HybridViewModelStringPropertySpecSwift>(swiftPart);
   }
   void* NON_NULL get_std__shared_ptr_HybridViewModelStringPropertySpec_(std__shared_ptr_HybridViewModelStringPropertySpec_ cppType) {
@@ -197,13 +197,13 @@ namespace margelo::nitro::rive::bridge::swift {
       throw std::runtime_error("Class \"HybridViewModelStringPropertySpec\" is not implemented in Swift!");
     }
     #endif
-    Rive::HybridViewModelStringPropertySpec_cxx& swiftPart = swiftWrapper->getSwiftPart();
+    react_native_rive::HybridViewModelStringPropertySpec_cxx& swiftPart = swiftWrapper->getSwiftPart();
     return swiftPart.toUnsafe();
   }
   
   // pragma MARK: std::shared_ptr<HybridViewModelBooleanPropertySpec>
   std::shared_ptr<HybridViewModelBooleanPropertySpec> create_std__shared_ptr_HybridViewModelBooleanPropertySpec_(void* NON_NULL swiftUnsafePointer) noexcept {
-    Rive::HybridViewModelBooleanPropertySpec_cxx swiftPart = Rive::HybridViewModelBooleanPropertySpec_cxx::fromUnsafe(swiftUnsafePointer);
+    react_native_rive::HybridViewModelBooleanPropertySpec_cxx swiftPart = react_native_rive::HybridViewModelBooleanPropertySpec_cxx::fromUnsafe(swiftUnsafePointer);
     return std::make_shared<margelo::nitro::rive::HybridViewModelBooleanPropertySpecSwift>(swiftPart);
   }
   void* NON_NULL get_std__shared_ptr_HybridViewModelBooleanPropertySpec_(std__shared_ptr_HybridViewModelBooleanPropertySpec_ cppType) {
@@ -213,13 +213,13 @@ namespace margelo::nitro::rive::bridge::swift {
       throw std::runtime_error("Class \"HybridViewModelBooleanPropertySpec\" is not implemented in Swift!");
     }
     #endif
-    Rive::HybridViewModelBooleanPropertySpec_cxx& swiftPart = swiftWrapper->getSwiftPart();
+    react_native_rive::HybridViewModelBooleanPropertySpec_cxx& swiftPart = swiftWrapper->getSwiftPart();
     return swiftPart.toUnsafe();
   }
   
   // pragma MARK: std::shared_ptr<HybridViewModelColorPropertySpec>
   std::shared_ptr<HybridViewModelColorPropertySpec> create_std__shared_ptr_HybridViewModelColorPropertySpec_(void* NON_NULL swiftUnsafePointer) noexcept {
-    Rive::HybridViewModelColorPropertySpec_cxx swiftPart = Rive::HybridViewModelColorPropertySpec_cxx::fromUnsafe(swiftUnsafePointer);
+    react_native_rive::HybridViewModelColorPropertySpec_cxx swiftPart = react_native_rive::HybridViewModelColorPropertySpec_cxx::fromUnsafe(swiftUnsafePointer);
     return std::make_shared<margelo::nitro::rive::HybridViewModelColorPropertySpecSwift>(swiftPart);
   }
   void* NON_NULL get_std__shared_ptr_HybridViewModelColorPropertySpec_(std__shared_ptr_HybridViewModelColorPropertySpec_ cppType) {
@@ -229,13 +229,13 @@ namespace margelo::nitro::rive::bridge::swift {
       throw std::runtime_error("Class \"HybridViewModelColorPropertySpec\" is not implemented in Swift!");
     }
     #endif
-    Rive::HybridViewModelColorPropertySpec_cxx& swiftPart = swiftWrapper->getSwiftPart();
+    react_native_rive::HybridViewModelColorPropertySpec_cxx& swiftPart = swiftWrapper->getSwiftPart();
     return swiftPart.toUnsafe();
   }
   
   // pragma MARK: std::shared_ptr<HybridViewModelEnumPropertySpec>
   std::shared_ptr<HybridViewModelEnumPropertySpec> create_std__shared_ptr_HybridViewModelEnumPropertySpec_(void* NON_NULL swiftUnsafePointer) noexcept {
-    Rive::HybridViewModelEnumPropertySpec_cxx swiftPart = Rive::HybridViewModelEnumPropertySpec_cxx::fromUnsafe(swiftUnsafePointer);
+    react_native_rive::HybridViewModelEnumPropertySpec_cxx swiftPart = react_native_rive::HybridViewModelEnumPropertySpec_cxx::fromUnsafe(swiftUnsafePointer);
     return std::make_shared<margelo::nitro::rive::HybridViewModelEnumPropertySpecSwift>(swiftPart);
   }
   void* NON_NULL get_std__shared_ptr_HybridViewModelEnumPropertySpec_(std__shared_ptr_HybridViewModelEnumPropertySpec_ cppType) {
@@ -245,13 +245,13 @@ namespace margelo::nitro::rive::bridge::swift {
       throw std::runtime_error("Class \"HybridViewModelEnumPropertySpec\" is not implemented in Swift!");
     }
     #endif
-    Rive::HybridViewModelEnumPropertySpec_cxx& swiftPart = swiftWrapper->getSwiftPart();
+    react_native_rive::HybridViewModelEnumPropertySpec_cxx& swiftPart = swiftWrapper->getSwiftPart();
     return swiftPart.toUnsafe();
   }
   
   // pragma MARK: std::shared_ptr<HybridViewModelTriggerPropertySpec>
   std::shared_ptr<HybridViewModelTriggerPropertySpec> create_std__shared_ptr_HybridViewModelTriggerPropertySpec_(void* NON_NULL swiftUnsafePointer) noexcept {
-    Rive::HybridViewModelTriggerPropertySpec_cxx swiftPart = Rive::HybridViewModelTriggerPropertySpec_cxx::fromUnsafe(swiftUnsafePointer);
+    react_native_rive::HybridViewModelTriggerPropertySpec_cxx swiftPart = react_native_rive::HybridViewModelTriggerPropertySpec_cxx::fromUnsafe(swiftUnsafePointer);
     return std::make_shared<margelo::nitro::rive::HybridViewModelTriggerPropertySpecSwift>(swiftPart);
   }
   void* NON_NULL get_std__shared_ptr_HybridViewModelTriggerPropertySpec_(std__shared_ptr_HybridViewModelTriggerPropertySpec_ cppType) {
@@ -261,13 +261,13 @@ namespace margelo::nitro::rive::bridge::swift {
       throw std::runtime_error("Class \"HybridViewModelTriggerPropertySpec\" is not implemented in Swift!");
     }
     #endif
-    Rive::HybridViewModelTriggerPropertySpec_cxx& swiftPart = swiftWrapper->getSwiftPart();
+    react_native_rive::HybridViewModelTriggerPropertySpec_cxx& swiftPart = swiftWrapper->getSwiftPart();
     return swiftPart.toUnsafe();
   }
   
   // pragma MARK: std::function<void(double /* value */)>
   Func_void_double create_Func_void_double(void* NON_NULL swiftClosureWrapper) noexcept {
-    auto swiftClosure = Rive::Func_void_double::fromUnsafe(swiftClosureWrapper);
+    auto swiftClosure = react_native_rive::Func_void_double::fromUnsafe(swiftClosureWrapper);
     return [swiftClosure = std::move(swiftClosure)](double value) mutable -> void {
       swiftClosure.call(value);
     };
@@ -275,7 +275,7 @@ namespace margelo::nitro::rive::bridge::swift {
   
   // pragma MARK: std::function<void(const std::string& /* value */)>
   Func_void_std__string create_Func_void_std__string(void* NON_NULL swiftClosureWrapper) noexcept {
-    auto swiftClosure = Rive::Func_void_std__string::fromUnsafe(swiftClosureWrapper);
+    auto swiftClosure = react_native_rive::Func_void_std__string::fromUnsafe(swiftClosureWrapper);
     return [swiftClosure = std::move(swiftClosure)](const std::string& value) mutable -> void {
       swiftClosure.call(value);
     };
@@ -283,7 +283,7 @@ namespace margelo::nitro::rive::bridge::swift {
   
   // pragma MARK: std::function<void()>
   Func_void create_Func_void(void* NON_NULL swiftClosureWrapper) noexcept {
-    auto swiftClosure = Rive::Func_void::fromUnsafe(swiftClosureWrapper);
+    auto swiftClosure = react_native_rive::Func_void::fromUnsafe(swiftClosureWrapper);
     return [swiftClosure = std::move(swiftClosure)]() mutable -> void {
       swiftClosure.call();
     };
diff --git a/nitrogen/generated/ios/Rive-Swift-Cxx-Bridge.hpp b/nitrogen/generated/ios/react_native_rive-Swift-Cxx-Bridge.hpp
similarity index 98%
rename from nitrogen/generated/ios/Rive-Swift-Cxx-Bridge.hpp
rename to nitrogen/generated/ios/react_native_rive-Swift-Cxx-Bridge.hpp
index 1a78f1ca..cd00009e 100644
--- a/nitrogen/generated/ios/Rive-Swift-Cxx-Bridge.hpp
+++ b/nitrogen/generated/ios/react_native_rive-Swift-Cxx-Bridge.hpp
@@ -1,5 +1,5 @@
 ///
-/// Rive-Swift-Cxx-Bridge.hpp
+/// react_native_rive-Swift-Cxx-Bridge.hpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
 /// Copyright © 2025 Marc Rousavy @ Margelo
@@ -57,31 +57,31 @@ namespace margelo::nitro::rive { struct UnifiedRiveEvent; }
 
 // Forward declarations of Swift defined types
 // Forward declaration of `HybridRiveFileFactorySpec_cxx` to properly resolve imports.
-namespace Rive { class HybridRiveFileFactorySpec_cxx; }
+namespace react_native_rive { class HybridRiveFileFactorySpec_cxx; }
 // Forward declaration of `HybridRiveFileSpec_cxx` to properly resolve imports.
-namespace Rive { class HybridRiveFileSpec_cxx; }
+namespace react_native_rive { class HybridRiveFileSpec_cxx; }
 // Forward declaration of `HybridRiveSpec_cxx` to properly resolve imports.
-namespace Rive { class HybridRiveSpec_cxx; }
+namespace react_native_rive { class HybridRiveSpec_cxx; }
 // Forward declaration of `HybridRiveViewSpec_cxx` to properly resolve imports.
-namespace Rive { class HybridRiveViewSpec_cxx; }
+namespace react_native_rive { class HybridRiveViewSpec_cxx; }
 // Forward declaration of `HybridViewModelBooleanPropertySpec_cxx` to properly resolve imports.
-namespace Rive { class HybridViewModelBooleanPropertySpec_cxx; }
+namespace react_native_rive { class HybridViewModelBooleanPropertySpec_cxx; }
 // Forward declaration of `HybridViewModelColorPropertySpec_cxx` to properly resolve imports.
-namespace Rive { class HybridViewModelColorPropertySpec_cxx; }
+namespace react_native_rive { class HybridViewModelColorPropertySpec_cxx; }
 // Forward declaration of `HybridViewModelEnumPropertySpec_cxx` to properly resolve imports.
-namespace Rive { class HybridViewModelEnumPropertySpec_cxx; }
+namespace react_native_rive { class HybridViewModelEnumPropertySpec_cxx; }
 // Forward declaration of `HybridViewModelInstanceSpec_cxx` to properly resolve imports.
-namespace Rive { class HybridViewModelInstanceSpec_cxx; }
+namespace react_native_rive { class HybridViewModelInstanceSpec_cxx; }
 // Forward declaration of `HybridViewModelNumberPropertySpec_cxx` to properly resolve imports.
-namespace Rive { class HybridViewModelNumberPropertySpec_cxx; }
+namespace react_native_rive { class HybridViewModelNumberPropertySpec_cxx; }
 // Forward declaration of `HybridViewModelPropertySpec_cxx` to properly resolve imports.
-namespace Rive { class HybridViewModelPropertySpec_cxx; }
+namespace react_native_rive { class HybridViewModelPropertySpec_cxx; }
 // Forward declaration of `HybridViewModelSpec_cxx` to properly resolve imports.
-namespace Rive { class HybridViewModelSpec_cxx; }
+namespace react_native_rive { class HybridViewModelSpec_cxx; }
 // Forward declaration of `HybridViewModelStringPropertySpec_cxx` to properly resolve imports.
-namespace Rive { class HybridViewModelStringPropertySpec_cxx; }
+namespace react_native_rive { class HybridViewModelStringPropertySpec_cxx; }
 // Forward declaration of `HybridViewModelTriggerPropertySpec_cxx` to properly resolve imports.
-namespace Rive { class HybridViewModelTriggerPropertySpec_cxx; }
+namespace react_native_rive { class HybridViewModelTriggerPropertySpec_cxx; }
 
 // Include C++ defined types
 #include "Alignment.hpp"
diff --git a/nitrogen/generated/ios/Rive-Swift-Cxx-Umbrella.hpp b/nitrogen/generated/ios/react_native_rive-Swift-Cxx-Umbrella.hpp
similarity index 81%
rename from nitrogen/generated/ios/Rive-Swift-Cxx-Umbrella.hpp
rename to nitrogen/generated/ios/react_native_rive-Swift-Cxx-Umbrella.hpp
index 3b0f52e3..407dffac 100644
--- a/nitrogen/generated/ios/Rive-Swift-Cxx-Umbrella.hpp
+++ b/nitrogen/generated/ios/react_native_rive-Swift-Cxx-Umbrella.hpp
@@ -1,5 +1,5 @@
 ///
-/// Rive-Swift-Cxx-Umbrella.hpp
+/// react_native_rive-Swift-Cxx-Umbrella.hpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
 /// Copyright © 2025 Marc Rousavy @ Margelo
@@ -91,7 +91,7 @@ namespace margelo::nitro::rive { struct UnifiedRiveEvent; }
 #include <variant>
 
 // C++ helpers for Swift
-#include "Rive-Swift-Cxx-Bridge.hpp"
+#include "react_native_rive-Swift-Cxx-Bridge.hpp"
 
 // Common C++ types used in Swift
 #include <NitroModules/ArrayBufferHolder.hpp>
@@ -101,40 +101,40 @@ namespace margelo::nitro::rive { struct UnifiedRiveEvent; }
 
 // Forward declarations of Swift defined types
 // Forward declaration of `HybridRiveFileFactorySpec_cxx` to properly resolve imports.
-namespace Rive { class HybridRiveFileFactorySpec_cxx; }
+namespace react_native_rive { class HybridRiveFileFactorySpec_cxx; }
 // Forward declaration of `HybridRiveFileSpec_cxx` to properly resolve imports.
-namespace Rive { class HybridRiveFileSpec_cxx; }
+namespace react_native_rive { class HybridRiveFileSpec_cxx; }
 // Forward declaration of `HybridRiveSpec_cxx` to properly resolve imports.
-namespace Rive { class HybridRiveSpec_cxx; }
+namespace react_native_rive { class HybridRiveSpec_cxx; }
 // Forward declaration of `HybridRiveViewSpec_cxx` to properly resolve imports.
-namespace Rive { class HybridRiveViewSpec_cxx; }
+namespace react_native_rive { class HybridRiveViewSpec_cxx; }
 // Forward declaration of `HybridViewModelBooleanPropertySpec_cxx` to properly resolve imports.
-namespace Rive { class HybridViewModelBooleanPropertySpec_cxx; }
+namespace react_native_rive { class HybridViewModelBooleanPropertySpec_cxx; }
 // Forward declaration of `HybridViewModelColorPropertySpec_cxx` to properly resolve imports.
-namespace Rive { class HybridViewModelColorPropertySpec_cxx; }
+namespace react_native_rive { class HybridViewModelColorPropertySpec_cxx; }
 // Forward declaration of `HybridViewModelEnumPropertySpec_cxx` to properly resolve imports.
-namespace Rive { class HybridViewModelEnumPropertySpec_cxx; }
+namespace react_native_rive { class HybridViewModelEnumPropertySpec_cxx; }
 // Forward declaration of `HybridViewModelInstanceSpec_cxx` to properly resolve imports.
-namespace Rive { class HybridViewModelInstanceSpec_cxx; }
+namespace react_native_rive { class HybridViewModelInstanceSpec_cxx; }
 // Forward declaration of `HybridViewModelNumberPropertySpec_cxx` to properly resolve imports.
-namespace Rive { class HybridViewModelNumberPropertySpec_cxx; }
+namespace react_native_rive { class HybridViewModelNumberPropertySpec_cxx; }
 // Forward declaration of `HybridViewModelPropertySpec_cxx` to properly resolve imports.
-namespace Rive { class HybridViewModelPropertySpec_cxx; }
+namespace react_native_rive { class HybridViewModelPropertySpec_cxx; }
 // Forward declaration of `HybridViewModelSpec_cxx` to properly resolve imports.
-namespace Rive { class HybridViewModelSpec_cxx; }
+namespace react_native_rive { class HybridViewModelSpec_cxx; }
 // Forward declaration of `HybridViewModelStringPropertySpec_cxx` to properly resolve imports.
-namespace Rive { class HybridViewModelStringPropertySpec_cxx; }
+namespace react_native_rive { class HybridViewModelStringPropertySpec_cxx; }
 // Forward declaration of `HybridViewModelTriggerPropertySpec_cxx` to properly resolve imports.
-namespace Rive { class HybridViewModelTriggerPropertySpec_cxx; }
+namespace react_native_rive { class HybridViewModelTriggerPropertySpec_cxx; }
 
 // Include Swift defined types
-#if __has_include("Rive-Swift.h")
+#if __has_include("react_native_rive-Swift.h")
 // This header is generated by Xcode/Swift on every app build.
-// If it cannot be found, make sure the Swift module's name (= podspec name) is actually "Rive".
-#include "Rive-Swift.h"
+// If it cannot be found, make sure the Swift module's name (= podspec name) is actually "react_native_rive".
+#include "react_native_rive-Swift.h"
 // Same as above, but used when building with frameworks (`use_frameworks`)
-#elif __has_include(<Rive/Rive-Swift.h>)
-#include <Rive/Rive-Swift.h>
+#elif __has_include(<react_native_rive/react_native_rive-Swift.h>)
+#include <react_native_rive/react_native_rive-Swift.h>
 #else
-#error Rive's autogenerated Swift header cannot be found! Make sure the Swift module's name (= podspec name) is actually "Rive", and try building the app first.
+#error react_native_rive's autogenerated Swift header cannot be found! Make sure the Swift module's name (= podspec name) is actually "react_native_rive", and try building the app first.
 #endif
diff --git a/nitrogen/generated/ios/RiveAutolinking.mm b/nitrogen/generated/ios/react_native_riveAutolinking.mm
similarity index 71%
rename from nitrogen/generated/ios/RiveAutolinking.mm
rename to nitrogen/generated/ios/react_native_riveAutolinking.mm
index 8cea8cdb..638dfa72 100644
--- a/nitrogen/generated/ios/RiveAutolinking.mm
+++ b/nitrogen/generated/ios/react_native_riveAutolinking.mm
@@ -1,5 +1,5 @@
 ///
-/// RiveAutolinking.mm
+/// react_native_riveAutolinking.mm
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
 /// Copyright © 2025 Marc Rousavy @ Margelo
@@ -7,7 +7,7 @@
 
 #import <Foundation/Foundation.h>
 #import <NitroModules/HybridObjectRegistry.hpp>
-#import "Rive-Swift-Cxx-Umbrella.hpp"
+#import "react_native_rive-Swift-Cxx-Umbrella.hpp"
 #import <type_traits>
 
 #include "HybridRiveSpecSwift.hpp"
@@ -23,10 +23,10 @@
 #include "HybridViewModelTriggerPropertySpecSwift.hpp"
 #include "HybridRiveViewSpecSwift.hpp"
 
-@interface RiveAutolinking : NSObject
+@interface react_native_riveAutolinking : NSObject
 @end
 
-@implementation RiveAutolinking
+@implementation react_native_riveAutolinking
 
 + (void) load {
   using namespace margelo::nitro;
@@ -35,84 +35,84 @@ + (void) load {
   HybridObjectRegistry::registerHybridObjectConstructor(
     "Rive",
     []() -> std::shared_ptr<HybridObject> {
-      std::shared_ptr<HybridRiveSpec> hybridObject = Rive::RiveAutolinking::createRive();
+      std::shared_ptr<HybridRiveSpec> hybridObject = react_native_rive::react_native_riveAutolinking::createRive();
       return hybridObject;
     }
   );
   HybridObjectRegistry::registerHybridObjectConstructor(
     "RiveFileFactory",
     []() -> std::shared_ptr<HybridObject> {
-      std::shared_ptr<HybridRiveFileFactorySpec> hybridObject = Rive::RiveAutolinking::createRiveFileFactory();
+      std::shared_ptr<HybridRiveFileFactorySpec> hybridObject = react_native_rive::react_native_riveAutolinking::createRiveFileFactory();
       return hybridObject;
     }
   );
   HybridObjectRegistry::registerHybridObjectConstructor(
     "RiveFile",
     []() -> std::shared_ptr<HybridObject> {
-      std::shared_ptr<HybridRiveFileSpec> hybridObject = Rive::RiveAutolinking::createRiveFile();
+      std::shared_ptr<HybridRiveFileSpec> hybridObject = react_native_rive::react_native_riveAutolinking::createRiveFile();
       return hybridObject;
     }
   );
   HybridObjectRegistry::registerHybridObjectConstructor(
     "ViewModel",
     []() -> std::shared_ptr<HybridObject> {
-      std::shared_ptr<HybridViewModelSpec> hybridObject = Rive::RiveAutolinking::createViewModel();
+      std::shared_ptr<HybridViewModelSpec> hybridObject = react_native_rive::react_native_riveAutolinking::createViewModel();
       return hybridObject;
     }
   );
   HybridObjectRegistry::registerHybridObjectConstructor(
     "ViewModelInstance",
     []() -> std::shared_ptr<HybridObject> {
-      std::shared_ptr<HybridViewModelInstanceSpec> hybridObject = Rive::RiveAutolinking::createViewModelInstance();
+      std::shared_ptr<HybridViewModelInstanceSpec> hybridObject = react_native_rive::react_native_riveAutolinking::createViewModelInstance();
       return hybridObject;
     }
   );
   HybridObjectRegistry::registerHybridObjectConstructor(
     "ViewModelNumberProperty",
     []() -> std::shared_ptr<HybridObject> {
-      std::shared_ptr<HybridViewModelNumberPropertySpec> hybridObject = Rive::RiveAutolinking::createViewModelNumberProperty();
+      std::shared_ptr<HybridViewModelNumberPropertySpec> hybridObject = react_native_rive::react_native_riveAutolinking::createViewModelNumberProperty();
       return hybridObject;
     }
   );
   HybridObjectRegistry::registerHybridObjectConstructor(
     "ViewModelStringProperty",
     []() -> std::shared_ptr<HybridObject> {
-      std::shared_ptr<HybridViewModelStringPropertySpec> hybridObject = Rive::RiveAutolinking::createViewModelStringProperty();
+      std::shared_ptr<HybridViewModelStringPropertySpec> hybridObject = react_native_rive::react_native_riveAutolinking::createViewModelStringProperty();
       return hybridObject;
     }
   );
   HybridObjectRegistry::registerHybridObjectConstructor(
     "ViewModelBooleanProperty",
     []() -> std::shared_ptr<HybridObject> {
-      std::shared_ptr<HybridViewModelBooleanPropertySpec> hybridObject = Rive::RiveAutolinking::createViewModelBooleanProperty();
+      std::shared_ptr<HybridViewModelBooleanPropertySpec> hybridObject = react_native_rive::react_native_riveAutolinking::createViewModelBooleanProperty();
       return hybridObject;
     }
   );
   HybridObjectRegistry::registerHybridObjectConstructor(
     "ViewModelColorProperty",
     []() -> std::shared_ptr<HybridObject> {
-      std::shared_ptr<HybridViewModelColorPropertySpec> hybridObject = Rive::RiveAutolinking::createViewModelColorProperty();
+      std::shared_ptr<HybridViewModelColorPropertySpec> hybridObject = react_native_rive::react_native_riveAutolinking::createViewModelColorProperty();
       return hybridObject;
     }
   );
   HybridObjectRegistry::registerHybridObjectConstructor(
     "ViewModelEnumProperty",
     []() -> std::shared_ptr<HybridObject> {
-      std::shared_ptr<HybridViewModelEnumPropertySpec> hybridObject = Rive::RiveAutolinking::createViewModelEnumProperty();
+      std::shared_ptr<HybridViewModelEnumPropertySpec> hybridObject = react_native_rive::react_native_riveAutolinking::createViewModelEnumProperty();
       return hybridObject;
     }
   );
   HybridObjectRegistry::registerHybridObjectConstructor(
     "ViewModelTriggerProperty",
     []() -> std::shared_ptr<HybridObject> {
-      std::shared_ptr<HybridViewModelTriggerPropertySpec> hybridObject = Rive::RiveAutolinking::createViewModelTriggerProperty();
+      std::shared_ptr<HybridViewModelTriggerPropertySpec> hybridObject = react_native_rive::react_native_riveAutolinking::createViewModelTriggerProperty();
       return hybridObject;
     }
   );
   HybridObjectRegistry::registerHybridObjectConstructor(
     "RiveView",
     []() -> std::shared_ptr<HybridObject> {
-      std::shared_ptr<HybridRiveViewSpec> hybridObject = Rive::RiveAutolinking::createRiveView();
+      std::shared_ptr<HybridRiveViewSpec> hybridObject = react_native_rive::react_native_riveAutolinking::createRiveView();
       return hybridObject;
     }
   );
diff --git a/nitrogen/generated/ios/RiveAutolinking.swift b/nitrogen/generated/ios/react_native_riveAutolinking.swift
similarity index 98%
rename from nitrogen/generated/ios/RiveAutolinking.swift
rename to nitrogen/generated/ios/react_native_riveAutolinking.swift
index b182e00f..d138e73b 100644
--- a/nitrogen/generated/ios/RiveAutolinking.swift
+++ b/nitrogen/generated/ios/react_native_riveAutolinking.swift
@@ -1,11 +1,11 @@
 ///
-/// RiveAutolinking.swift
+/// react_native_riveAutolinking.swift
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
 /// Copyright © 2025 Marc Rousavy @ Margelo
 ///
 
-public final class RiveAutolinking {
+public final class react_native_riveAutolinking {
   public typealias bridge = margelo.nitro.rive.bridge.swift
 
   /**
diff --git a/nitrogen/generated/ios/swift/HybridRiveFileFactorySpec_cxx.swift b/nitrogen/generated/ios/swift/HybridRiveFileFactorySpec_cxx.swift
index 7a1fd7df..cc9cdfbc 100644
--- a/nitrogen/generated/ios/swift/HybridRiveFileFactorySpec_cxx.swift
+++ b/nitrogen/generated/ios/swift/HybridRiveFileFactorySpec_cxx.swift
@@ -21,7 +21,7 @@ import NitroModules
 open class HybridRiveFileFactorySpec_cxx {
   /**
    * The Swift <> C++ bridge's namespace (`margelo::nitro::rive::bridge::swift`)
-   * from `Rive-Swift-Cxx-Bridge.hpp`.
+   * from `react_native_rive-Swift-Cxx-Bridge.hpp`.
    * This contains specialized C++ templates, and C++ helper functions that can be accessed from Swift.
    */
   public typealias bridge = margelo.nitro.rive.bridge.swift
diff --git a/nitrogen/generated/ios/swift/HybridRiveFileSpec_cxx.swift b/nitrogen/generated/ios/swift/HybridRiveFileSpec_cxx.swift
index 210149f4..a2900a92 100644
--- a/nitrogen/generated/ios/swift/HybridRiveFileSpec_cxx.swift
+++ b/nitrogen/generated/ios/swift/HybridRiveFileSpec_cxx.swift
@@ -20,7 +20,7 @@ import NitroModules
 open class HybridRiveFileSpec_cxx {
   /**
    * The Swift <> C++ bridge's namespace (`margelo::nitro::rive::bridge::swift`)
-   * from `Rive-Swift-Cxx-Bridge.hpp`.
+   * from `react_native_rive-Swift-Cxx-Bridge.hpp`.
    * This contains specialized C++ templates, and C++ helper functions that can be accessed from Swift.
    */
   public typealias bridge = margelo.nitro.rive.bridge.swift
diff --git a/nitrogen/generated/ios/swift/HybridRiveSpec_cxx.swift b/nitrogen/generated/ios/swift/HybridRiveSpec_cxx.swift
index baf8a25c..8f2e4cab 100644
--- a/nitrogen/generated/ios/swift/HybridRiveSpec_cxx.swift
+++ b/nitrogen/generated/ios/swift/HybridRiveSpec_cxx.swift
@@ -20,7 +20,7 @@ import NitroModules
 open class HybridRiveSpec_cxx {
   /**
    * The Swift <> C++ bridge's namespace (`margelo::nitro::rive::bridge::swift`)
-   * from `Rive-Swift-Cxx-Bridge.hpp`.
+   * from `react_native_rive-Swift-Cxx-Bridge.hpp`.
    * This contains specialized C++ templates, and C++ helper functions that can be accessed from Swift.
    */
   public typealias bridge = margelo.nitro.rive.bridge.swift
diff --git a/nitrogen/generated/ios/swift/HybridRiveViewSpec_cxx.swift b/nitrogen/generated/ios/swift/HybridRiveViewSpec_cxx.swift
index aad03ff9..486f0b04 100644
--- a/nitrogen/generated/ios/swift/HybridRiveViewSpec_cxx.swift
+++ b/nitrogen/generated/ios/swift/HybridRiveViewSpec_cxx.swift
@@ -21,7 +21,7 @@ import NitroModules
 open class HybridRiveViewSpec_cxx {
   /**
    * The Swift <> C++ bridge's namespace (`margelo::nitro::rive::bridge::swift`)
-   * from `Rive-Swift-Cxx-Bridge.hpp`.
+   * from `react_native_rive-Swift-Cxx-Bridge.hpp`.
    * This contains specialized C++ templates, and C++ helper functions that can be accessed from Swift.
    */
   public typealias bridge = margelo.nitro.rive.bridge.swift
diff --git a/nitrogen/generated/ios/swift/HybridViewModelBooleanPropertySpec_cxx.swift b/nitrogen/generated/ios/swift/HybridViewModelBooleanPropertySpec_cxx.swift
index 6e2ae00b..a568b3cc 100644
--- a/nitrogen/generated/ios/swift/HybridViewModelBooleanPropertySpec_cxx.swift
+++ b/nitrogen/generated/ios/swift/HybridViewModelBooleanPropertySpec_cxx.swift
@@ -20,7 +20,7 @@ import NitroModules
 open class HybridViewModelBooleanPropertySpec_cxx : HybridViewModelPropertySpec_cxx {
   /**
    * The Swift <> C++ bridge's namespace (`margelo::nitro::rive::bridge::swift`)
-   * from `Rive-Swift-Cxx-Bridge.hpp`.
+   * from `react_native_rive-Swift-Cxx-Bridge.hpp`.
    * This contains specialized C++ templates, and C++ helper functions that can be accessed from Swift.
    */
   public typealias bridge = margelo.nitro.rive.bridge.swift
diff --git a/nitrogen/generated/ios/swift/HybridViewModelColorPropertySpec_cxx.swift b/nitrogen/generated/ios/swift/HybridViewModelColorPropertySpec_cxx.swift
index 7d03f1ab..9180f036 100644
--- a/nitrogen/generated/ios/swift/HybridViewModelColorPropertySpec_cxx.swift
+++ b/nitrogen/generated/ios/swift/HybridViewModelColorPropertySpec_cxx.swift
@@ -20,7 +20,7 @@ import NitroModules
 open class HybridViewModelColorPropertySpec_cxx : HybridViewModelPropertySpec_cxx {
   /**
    * The Swift <> C++ bridge's namespace (`margelo::nitro::rive::bridge::swift`)
-   * from `Rive-Swift-Cxx-Bridge.hpp`.
+   * from `react_native_rive-Swift-Cxx-Bridge.hpp`.
    * This contains specialized C++ templates, and C++ helper functions that can be accessed from Swift.
    */
   public typealias bridge = margelo.nitro.rive.bridge.swift
diff --git a/nitrogen/generated/ios/swift/HybridViewModelEnumPropertySpec_cxx.swift b/nitrogen/generated/ios/swift/HybridViewModelEnumPropertySpec_cxx.swift
index d4de4a70..a51b081e 100644
--- a/nitrogen/generated/ios/swift/HybridViewModelEnumPropertySpec_cxx.swift
+++ b/nitrogen/generated/ios/swift/HybridViewModelEnumPropertySpec_cxx.swift
@@ -20,7 +20,7 @@ import NitroModules
 open class HybridViewModelEnumPropertySpec_cxx : HybridViewModelPropertySpec_cxx {
   /**
    * The Swift <> C++ bridge's namespace (`margelo::nitro::rive::bridge::swift`)
-   * from `Rive-Swift-Cxx-Bridge.hpp`.
+   * from `react_native_rive-Swift-Cxx-Bridge.hpp`.
    * This contains specialized C++ templates, and C++ helper functions that can be accessed from Swift.
    */
   public typealias bridge = margelo.nitro.rive.bridge.swift
diff --git a/nitrogen/generated/ios/swift/HybridViewModelInstanceSpec_cxx.swift b/nitrogen/generated/ios/swift/HybridViewModelInstanceSpec_cxx.swift
index 50a5025f..d7cf5e1f 100644
--- a/nitrogen/generated/ios/swift/HybridViewModelInstanceSpec_cxx.swift
+++ b/nitrogen/generated/ios/swift/HybridViewModelInstanceSpec_cxx.swift
@@ -20,7 +20,7 @@ import NitroModules
 open class HybridViewModelInstanceSpec_cxx {
   /**
    * The Swift <> C++ bridge's namespace (`margelo::nitro::rive::bridge::swift`)
-   * from `Rive-Swift-Cxx-Bridge.hpp`.
+   * from `react_native_rive-Swift-Cxx-Bridge.hpp`.
    * This contains specialized C++ templates, and C++ helper functions that can be accessed from Swift.
    */
   public typealias bridge = margelo.nitro.rive.bridge.swift
diff --git a/nitrogen/generated/ios/swift/HybridViewModelNumberPropertySpec_cxx.swift b/nitrogen/generated/ios/swift/HybridViewModelNumberPropertySpec_cxx.swift
index 085bf730..62d647e8 100644
--- a/nitrogen/generated/ios/swift/HybridViewModelNumberPropertySpec_cxx.swift
+++ b/nitrogen/generated/ios/swift/HybridViewModelNumberPropertySpec_cxx.swift
@@ -20,7 +20,7 @@ import NitroModules
 open class HybridViewModelNumberPropertySpec_cxx : HybridViewModelPropertySpec_cxx {
   /**
    * The Swift <> C++ bridge's namespace (`margelo::nitro::rive::bridge::swift`)
-   * from `Rive-Swift-Cxx-Bridge.hpp`.
+   * from `react_native_rive-Swift-Cxx-Bridge.hpp`.
    * This contains specialized C++ templates, and C++ helper functions that can be accessed from Swift.
    */
   public typealias bridge = margelo.nitro.rive.bridge.swift
diff --git a/nitrogen/generated/ios/swift/HybridViewModelPropertySpec_cxx.swift b/nitrogen/generated/ios/swift/HybridViewModelPropertySpec_cxx.swift
index 67d9a6e3..348444d1 100644
--- a/nitrogen/generated/ios/swift/HybridViewModelPropertySpec_cxx.swift
+++ b/nitrogen/generated/ios/swift/HybridViewModelPropertySpec_cxx.swift
@@ -20,7 +20,7 @@ import NitroModules
 open class HybridViewModelPropertySpec_cxx {
   /**
    * The Swift <> C++ bridge's namespace (`margelo::nitro::rive::bridge::swift`)
-   * from `Rive-Swift-Cxx-Bridge.hpp`.
+   * from `react_native_rive-Swift-Cxx-Bridge.hpp`.
    * This contains specialized C++ templates, and C++ helper functions that can be accessed from Swift.
    */
   public typealias bridge = margelo.nitro.rive.bridge.swift
diff --git a/nitrogen/generated/ios/swift/HybridViewModelSpec_cxx.swift b/nitrogen/generated/ios/swift/HybridViewModelSpec_cxx.swift
index fd01e83c..4329def2 100644
--- a/nitrogen/generated/ios/swift/HybridViewModelSpec_cxx.swift
+++ b/nitrogen/generated/ios/swift/HybridViewModelSpec_cxx.swift
@@ -20,7 +20,7 @@ import NitroModules
 open class HybridViewModelSpec_cxx {
   /**
    * The Swift <> C++ bridge's namespace (`margelo::nitro::rive::bridge::swift`)
-   * from `Rive-Swift-Cxx-Bridge.hpp`.
+   * from `react_native_rive-Swift-Cxx-Bridge.hpp`.
    * This contains specialized C++ templates, and C++ helper functions that can be accessed from Swift.
    */
   public typealias bridge = margelo.nitro.rive.bridge.swift
diff --git a/nitrogen/generated/ios/swift/HybridViewModelStringPropertySpec_cxx.swift b/nitrogen/generated/ios/swift/HybridViewModelStringPropertySpec_cxx.swift
index 82b8f869..c9d5142c 100644
--- a/nitrogen/generated/ios/swift/HybridViewModelStringPropertySpec_cxx.swift
+++ b/nitrogen/generated/ios/swift/HybridViewModelStringPropertySpec_cxx.swift
@@ -20,7 +20,7 @@ import NitroModules
 open class HybridViewModelStringPropertySpec_cxx : HybridViewModelPropertySpec_cxx {
   /**
    * The Swift <> C++ bridge's namespace (`margelo::nitro::rive::bridge::swift`)
-   * from `Rive-Swift-Cxx-Bridge.hpp`.
+   * from `react_native_rive-Swift-Cxx-Bridge.hpp`.
    * This contains specialized C++ templates, and C++ helper functions that can be accessed from Swift.
    */
   public typealias bridge = margelo.nitro.rive.bridge.swift
diff --git a/nitrogen/generated/ios/swift/HybridViewModelTriggerPropertySpec_cxx.swift b/nitrogen/generated/ios/swift/HybridViewModelTriggerPropertySpec_cxx.swift
index e0e5168e..9125cee6 100644
--- a/nitrogen/generated/ios/swift/HybridViewModelTriggerPropertySpec_cxx.swift
+++ b/nitrogen/generated/ios/swift/HybridViewModelTriggerPropertySpec_cxx.swift
@@ -20,7 +20,7 @@ import NitroModules
 open class HybridViewModelTriggerPropertySpec_cxx : HybridViewModelPropertySpec_cxx {
   /**
    * The Swift <> C++ bridge's namespace (`margelo::nitro::rive::bridge::swift`)
-   * from `Rive-Swift-Cxx-Bridge.hpp`.
+   * from `react_native_rive-Swift-Cxx-Bridge.hpp`.
    * This contains specialized C++ templates, and C++ helper functions that can be accessed from Swift.
    */
   public typealias bridge = margelo.nitro.rive.bridge.swift
diff --git a/package.json b/package.json
index b1355ec5..60467008 100644
--- a/package.json
+++ b/package.json
@@ -71,7 +71,6 @@
     "@eslint/compat": "^1.2.7",
     "@eslint/eslintrc": "^3.3.0",
     "@eslint/js": "^9.22.0",
-    "@evilmartians/lefthook": "^1.5.0",
     "@react-native/babel-preset": "0.79.2",
     "@react-native/eslint-config": "^0.78.0",
     "@release-it/conventional-changelog": "^9.0.2",
diff --git a/react-native-rive.podspec b/react_native_rive.podspec
similarity index 94%
rename from react-native-rive.podspec
rename to react_native_rive.podspec
index 126df3ca..4961eee5 100644
--- a/react-native-rive.podspec
+++ b/react_native_rive.podspec
@@ -31,7 +31,7 @@ end
 Pod::UI.puts "react-native-rive: Rive iOS SDK #{rive_ios_version}"
 
 Pod::Spec.new do |s|
-  s.name         = "react-native-rive"
+  s.name         = "react_native_rive"
   s.version      = package["version"]
   s.summary      = package["description"]
   s.homepage     = package["homepage"]
@@ -44,7 +44,7 @@ Pod::Spec.new do |s|
   s.source_files = "ios/**/*.{h,m,mm,swift}"
 
   s.public_header_files = ['ios/RCTSwiftLog.h']
-  load 'nitrogen/generated/ios/Rive+autolinking.rb'
+  load 'nitrogen/generated/ios/react_native_rive+autolinking.rb'
   add_nitrogen_files(s)
 
   s.dependency "RiveRuntime", rive_ios_version
diff --git a/yarn.lock b/yarn.lock
index 8ce5d784..a3630334 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1928,16 +1928,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@evilmartians/lefthook@npm:^1.5.0":
-  version: 1.13.6
-  resolution: "@evilmartians/lefthook@npm:1.13.6"
-  bin:
-    lefthook: bin/index.js
-  checksum: 6cceca3e874015678f50818ae14a74d959816cfaba6638f8852d007332404d6819b15c71538985a3650a1ef057aa6975c17fadfe43ece7a0da1aeb9faaf02946
-  conditions: (os=darwin | os=linux | os=win32) & (cpu=x64 | cpu=arm64 | cpu=ia32)
-  languageName: node
-  linkType: hard
-
 "@expo/cli@npm:54.0.16":
   version: 54.0.16
   resolution: "@expo/cli@npm:54.0.16"
@@ -13919,7 +13909,6 @@ __metadata:
     "@eslint/compat": ^1.2.7
     "@eslint/eslintrc": ^3.3.0
     "@eslint/js": ^9.22.0
-    "@evilmartians/lefthook": ^1.5.0
     "@react-native/babel-preset": 0.79.2
     "@react-native/eslint-config": ^0.78.0
     "@release-it/conventional-changelog": ^9.0.2