diff --git a/src/scripts/common/GilShop.cpp b/src/scripts/common/GilShop.cpp
index f3ae1a21..a57a1ecd 100644
--- a/src/scripts/common/GilShop.cpp
+++ b/src/scripts/common/GilShop.cpp
@@ -31,7 +31,7 @@ private:
       // buy
       if( result.param2 == 1 )
       {
-        auto shopMgr = getFramework()->get< Sapphire::World::Manager::ShopMgr >();
+        auto shopMgr = framework()->get< Sapphire::World::Manager::ShopMgr >();
 
         shopMgr->purchaseGilShopItem( player, result.eventId, result.param3, result.param4 );
       }
diff --git a/src/scripts/common/aethernet/Aetheryte.cpp b/src/scripts/common/aethernet/Aetheryte.cpp
index 878bd61f..2ba4f14a 100644
--- a/src/scripts/common/aethernet/Aetheryte.cpp
+++ b/src/scripts/common/aethernet/Aetheryte.cpp
@@ -108,7 +108,7 @@ public:
 
   void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override
   {
-    auto pExdData = getFramework()->get< Sapphire::Data::ExdDataGenerated >();
+    auto pExdData = framework()->get< Sapphire::Data::ExdDataGenerated >();
     if( !pExdData )
       return;
 
diff --git a/src/scripts/common/aethernet/HousingAethernet.cpp b/src/scripts/common/aethernet/HousingAethernet.cpp
index 6375ea5b..1e49410b 100644
--- a/src/scripts/common/aethernet/HousingAethernet.cpp
+++ b/src/scripts/common/aethernet/HousingAethernet.cpp
@@ -21,7 +21,7 @@ public:
   {
     player.playScene( eventId, 0, HIDE_HOTBAR | NO_DEFAULT_CAMERA, [this, eventId]( Entity::Player& player, const Event::SceneResult& result )
     {
-      auto pExdData = getFramework()->get< Sapphire::Data::ExdDataGenerated >();
+      auto pExdData = framework()->get< Sapphire::Data::ExdDataGenerated >();
       if( !pExdData )
         return;
 
@@ -42,7 +42,7 @@ public:
       // moving a player inside an event will crash the game so we end it hre
       player.eventFinish( eventId, 1 );
 
-      auto playerMgr = getFramework()->get< Sapphire::World::Manager::PlayerMgr >();
+      auto playerMgr = framework()->get< Sapphire::World::Manager::PlayerMgr >();
       playerMgr->movePlayerToLandDestination( player, pHousingAethernet->level, housingZone->getWardNum() );
     } );
   }
diff --git a/src/scripts/common/eobj/HousingEstateEntrance.cpp b/src/scripts/common/eobj/HousingEstateEntrance.cpp
index f2e6856d..0c7733de 100644
--- a/src/scripts/common/eobj/HousingEstateEntrance.cpp
+++ b/src/scripts/common/eobj/HousingEstateEntrance.cpp
@@ -26,7 +26,7 @@ public:
       if( result.param2 != 1 )
         return;
 
-      auto terriMgr = getFramework()->get< Sapphire::World::Manager::TerritoryMgr >();
+      auto terriMgr = framework()->get< Sapphire::World::Manager::TerritoryMgr >();
       if( !terriMgr )
         return;
 
diff --git a/src/scripts/common/housing/CmnDefHousingSignboard.cpp b/src/scripts/common/housing/CmnDefHousingSignboard.cpp
index 8fed872e..941ebec7 100644
--- a/src/scripts/common/housing/CmnDefHousingSignboard.cpp
+++ b/src/scripts/common/housing/CmnDefHousingSignboard.cpp
@@ -26,7 +26,7 @@ public:
   {
     auto callback = [ this ]( Entity::Player& player, const Event::SceneResult& result )
     {
-      auto pFw = getFramework();
+      auto pFw = framework();
       if( !pFw )
         return LandPurchaseResult::ERR_INTERNAL;
       // Purchase Land
diff --git a/src/scripts/common/warptaxi/WarpTaxi.cpp b/src/scripts/common/warptaxi/WarpTaxi.cpp
index 4c772565..e867cb12 100644
--- a/src/scripts/common/warptaxi/WarpTaxi.cpp
+++ b/src/scripts/common/warptaxi/WarpTaxi.cpp
@@ -27,12 +27,12 @@ public:
       player.eventFinish( 1310721, 0 );
       player.eventFinish( getId(), 1 );
 
-      auto exdData = getFramework()->get< Sapphire::Data::ExdDataGenerated >();
+      auto exdData = framework()->get< Sapphire::Data::ExdDataGenerated >();
       auto warp = exdData->get< Sapphire::Data::Warp >( getId() );
       if( !warp )
         return;
 
-      auto playerMgr = getFramework()->get< Sapphire::World::Manager::PlayerMgr >();
+      auto playerMgr = framework()->get< Sapphire::World::Manager::PlayerMgr >();
       playerMgr->movePlayerToLandDestination( player, warp->level, result.param3 );
     }
     else
@@ -56,7 +56,7 @@ public:
 
   void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override
   {
-    auto exdData = getFramework()->get< Sapphire::Data::ExdDataGenerated >();
+    auto exdData = framework()->get< Sapphire::Data::ExdDataGenerated >();
     if( !exdData )
       return;
 
diff --git a/src/world/Script/NativeScriptApi.cpp b/src/world/Script/NativeScriptApi.cpp
index 4b45a333..6069c011 100644
--- a/src/world/Script/NativeScriptApi.cpp
+++ b/src/world/Script/NativeScriptApi.cpp
@@ -37,7 +37,7 @@ namespace Sapphire::ScriptAPI
     m_framework = fw;
   }
 
-  Sapphire::Framework* ScriptObject::getFramework() const
+  Sapphire::Framework* ScriptObject::framework() const
   {
     return m_framework;
   }
diff --git a/src/world/Script/NativeScriptApi.h b/src/world/Script/NativeScriptApi.h
index 9b2fdb6f..c534590e 100644
--- a/src/world/Script/NativeScriptApi.h
+++ b/src/world/Script/NativeScriptApi.h
@@ -61,7 +61,7 @@ namespace Sapphire::ScriptAPI
     *
     * @return A pointer to Core::Framework
     */
-    virtual Sapphire::Framework* getFramework() const;
+    virtual Sapphire::Framework* framework() const;
   };