diff --git a/src/Battling/Library/BattleLibrary.cpp b/src/Battling/Library/BattleLibrary.cpp
index 45ee3ac..252b98d 100644
--- a/src/Battling/Library/BattleLibrary.cpp
+++ b/src/Battling/Library/BattleLibrary.cpp
@@ -44,6 +44,6 @@ const std::unique_ptr<const DamageLibrary>& BattleLibrary::GetDamageLibrary() co
 
 const std::unique_ptr<const MiscLibrary>& BattleLibrary::GetMiscLibrary() const noexcept { return _miscLibrary; }
 
-Script* BattleLibrary::LoadScript(ScriptCategory category, const ArbUt::BasicStringView& scriptName) const {
+Script* BattleLibrary::LoadScript(ScriptCategory category, const ArbUt::StringView& scriptName) const {
     return _scriptResolver->LoadScript(category, scriptName);
 }
\ No newline at end of file
diff --git a/src/Battling/Library/BattleLibrary.hpp b/src/Battling/Library/BattleLibrary.hpp
index 1a4a335..81b151e 100644
--- a/src/Battling/Library/BattleLibrary.hpp
+++ b/src/Battling/Library/BattleLibrary.hpp
@@ -41,7 +41,7 @@ namespace CreatureLib::Battling {
             return _experienceLibrary;
         }
 
-        [[nodiscard]] Script* LoadScript(ScriptCategory category, const ArbUt::BasicStringView& scriptName) const;
+        [[nodiscard]] Script* LoadScript(ScriptCategory category, const ArbUt::StringView& scriptName) const;
     };
 }
 
diff --git a/src/Battling/Models/Battle.cpp b/src/Battling/Models/Battle.cpp
index 54fe5a2..e40f888 100644
--- a/src/Battling/Models/Battle.cpp
+++ b/src/Battling/Models/Battle.cpp
@@ -129,7 +129,7 @@ void Battle::ValidateBattleState() {
     this->_battleResult = BattleResult::Conclusive(winningSide);
     this->_hasEnded = true;
 }
-void Battle::AddVolatileScript(const ArbUt::BasicStringView& key) {
+void Battle::AddVolatileScript(const ArbUt::StringView& key) {
     auto script = _volatile.Get(key);
     if (script != nullptr) {
         script->Stack();
diff --git a/src/Battling/Models/Battle.hpp b/src/Battling/Models/Battle.hpp
index 1655d3b..9b65a01 100644
--- a/src/Battling/Models/Battle.hpp
+++ b/src/Battling/Models/Battle.hpp
@@ -85,7 +85,7 @@ namespace CreatureLib::Battling {
         const ArbUt::UniquePtrList<BattleSide>& GetSides() const noexcept { return _sides; }
         ArbUt::BorrowedPtr<Script> GetVolatileScript(const ArbUt::StringView& key) const { return _volatile.Get(key); }
         ArbUt::BorrowedPtr<Script> GetVolatileScript(uint32_t keyHash) const noexcept { return _volatile.Get(keyHash); }
-        void AddVolatileScript(const ArbUt::BasicStringView& key);
+        void AddVolatileScript(const ArbUt::StringView& key);
         void AddVolatileScript(Script* script);
         void RemoveVolatileScript(const ArbUt::BasicStringView& name) { _volatile.Remove(name); }
         void RemoveVolatileScript(uint32_t keyHash) { _volatile.Remove(keyHash); }
diff --git a/src/Battling/Models/Creature.cpp b/src/Battling/Models/Creature.cpp
index 1fd261b..4bc286f 100644
--- a/src/Battling/Models/Creature.cpp
+++ b/src/Battling/Models/Creature.cpp
@@ -239,7 +239,7 @@ void Battling::Creature::SetHeldItem(uint32_t itemNameHash) {
     _heldItem = item;
 }
 
-void Battling::Creature::AddVolatileScript(const ArbUt::BasicStringView& name) {
+void Battling::Creature::AddVolatileScript(const ArbUt::StringView& name) {
     auto script = _volatile.Get(name);
     if (script != nullptr) {
         script->Stack();
diff --git a/src/Battling/Models/Creature.hpp b/src/Battling/Models/Creature.hpp
index 4a40ef3..ab14354 100644
--- a/src/Battling/Models/Creature.hpp
+++ b/src/Battling/Models/Creature.hpp
@@ -128,7 +128,7 @@ namespace CreatureLib::Battling {
         size_t ScriptCount() const override;
         void GetActiveScripts(ArbUt::List<ScriptWrapper>& scripts) override;
         void ClearVolatileScripts();
-        void AddVolatileScript(const ArbUt::BasicStringView& name);
+        void AddVolatileScript(const ArbUt::StringView& name);
         void AddVolatileScript(Script* script);
         void RemoveVolatileScript(const ArbUt::BasicStringView& name);
         void RemoveVolatileScript(Script* script);
diff --git a/src/Battling/ScriptHandling/ScriptResolver.hpp b/src/Battling/ScriptHandling/ScriptResolver.hpp
index a3a83f5..eed4b3c 100644
--- a/src/Battling/ScriptHandling/ScriptResolver.hpp
+++ b/src/Battling/ScriptHandling/ScriptResolver.hpp
@@ -14,9 +14,7 @@ namespace CreatureLib::Battling {
         virtual ~ScriptResolver() = default;
 
         virtual void Initialize(BattleLibrary* library){};
-        virtual Script* LoadScript(ScriptCategory category, const ArbUt::BasicStringView& scriptName) {
-            return nullptr;
-        };
+        virtual Script* LoadScript(ScriptCategory category, const ArbUt::StringView& scriptName) { return nullptr; };
     };
 }